Merge remote-tracking branch 'origin/main' into brandon/plan-ux

Author: brandonkachen

.agents/base2/base2.ts

@@ -289,20 +289,23 @@ It should not include:
 
 This is more like an extremely short PRD which describes the end result of what the user wants. Think of it like fleshing out the user's prompt to make it more precise, although it should be as short as possible.
 
-## Questions
+## Follow-up questions
 
-After closing the <PLAN> tags, the last optional section is Questions, which is a Questions header with a numbered list of questions and alternate choices demarcated by letters.
+After closing the <PLAN> tags, the last optional section is Follow-up questions, which has a numbered list of questions and alternate choices demarcated by letters to clarify and improve upon the spec. These questions are optional for to complete for the user.
 
-For example, here is a nice short question, where the options are helpfully written out for the user:
+For example, here is a nice short follow-up question, where the options are helpfully written out for the user, with the answers a) and b) indented with two spaces for readability:
 
-Questions:
+<example>
+## Optional follow-up questions:
 
 1. Do you want to:
-  a) (DEFAULT) Keep Express and integrate Bun WebSockets
+  a) (CURRENT) Keep Express and integrate Bun WebSockets
   b) Migrate the entire HTTP server to Bun.serve()
+</example>
 
 Try to have as few questions as possible (even none), and focus on the most important decisions or assumptions that it would be helpful to clarify with the user.
-You should also let them know what you plan to do by default, and let them know that they can choose a different option if they want to.
+
+You should also let them know what the plan currently does by default by labeling that option with "(CURRENT)", and let them know that they can choose a different option if they want to.
 
 The questions section should be last and there should be no summary or further elaboration. Just end your turn.
 

.agents/researcher/researcher-docs.ts

@@ -23,7 +23,7 @@ const definition: SecretAgentDefinition = {
   instructionsPrompt: `Instructions:
 1. Use the read_docs tool to get detailed documentation relevant to the user's question.
 2. Repeat the read_docs tool call until you have gathered all the relevant documentation.
-3. Write up a comprehensive report of the documentation. Include key findings, relevant insights, and actionable recommendations.
+3. Write up a concise report of the documentation. Include key findings for the user's prompt.
   `.trim(),
 }
 

.agents/researcher/researcher-web.ts

@@ -23,7 +23,7 @@ const definition: SecretAgentDefinition = {
 
 Use web_search to find current information. Repeat the web_search tool call until you have gathered all the relevant information.
 
-Then, write up a report that includes key findings, relevant insights, and actionable recommendations for the user's prompt.
+Then, write up a concise report that includes key findings for the user's prompt.
 `.trim(),
 
   handleSteps: function* ({ agentState, prompt, params }) {

bun.lock

@@ -240,12 +240,30 @@ async function downloadBinary(version) {
     throw new Error(`Unsupported platform: ${process.platform} ${process.arch}`)
   }
 
-  const downloadUrl = `${process.env.NEXT_PUBLIC_CODEBUFF_APP_URL || 'https://codebuff.com'}/api/releases/download/${version}/${fileName}`
+  const downloadUrl = `${
+    process.env.NEXT_PUBLIC_CODEBUFF_APP_URL || 'https://codebuff.com'
+  }/api/releases/download/${version}/${fileName}`
 
   fs.mkdirSync(CONFIG.configDir, { recursive: true })
 
   if (fs.existsSync(CONFIG.binaryPath)) {
-    fs.unlinkSync(CONFIG.binaryPath)
+    try {
+      fs.unlinkSync(CONFIG.binaryPath)
+    } catch (err) {
+      // Fallback: try renaming the locked/undeletable binary
+      const backupPath = CONFIG.binaryPath + `.old.${Date.now()}`
+
+      try {
+        fs.renameSync(CONFIG.binaryPath, backupPath)
+      } catch (renameErr) {
+        // If we can't unlink OR rename, we can't safely proceed
+        throw new Error(
+          `Failed to replace existing binary. ` +
+            `unlink error: ${err.code || err.message}, ` +
+            `rename error: ${renameErr.code || renameErr.message}`,
+        )
+      }
+    }
   }
 
   term.write('Downloading...')

cli/release-staging/index.js

@@ -10,6 +10,7 @@ import {
 import type { ChatTheme } from '../../types/theme-system'
 
 const theme: ChatTheme = {
+  name: 'dark',
   // Core
   primary: '#ff0',
   secondary: '#888',

cli/src/__tests__/unit/segmented-control.test.ts

@@ -13,6 +13,8 @@ import { createValidationErrorBlocks } from './utils/create-validation-error-blo
 import { openFileAtPath } from './utils/open-file'
 import { pluralize } from '@codebuff/common/util/string'
 
+import type { FileTreeNode } from '@codebuff/common/util/file'
+
 interface AppProps {
   initialPrompt: string | null
   agentId?: string
@@ -23,6 +25,7 @@ interface AppProps {
     agentsDir: string
   } | null
   validationErrors: Array<{ id: string; message: string }>
+  fileTree: FileTreeNode[]
 }
 
 export const App = ({
@@ -32,6 +35,7 @@ export const App = ({
   hasInvalidCredentials,
   loadedAgentsData,
   validationErrors,
+  fileTree,
 }: AppProps) => {
   const { contentMaxWidth, separatorWidth } = useTerminalDimensions()
   const theme = useTheme()
@@ -169,16 +173,15 @@ export const App = ({
   ])
 
   return (
-    <box style={{ flexDirection: 'column', gap: 0, flexGrow: 1 }}>
-      <Chat
-        headerContent={headerContent}
-        initialPrompt={initialPrompt}
-        agentId={agentId}
-        requireAuth={requireAuth}
-        hasInvalidCredentials={hasInvalidCredentials}
-        loadedAgentsData={loadedAgentsData}
-        validationErrors={validationErrors}
-      />
-    </box>
+    <Chat
+      headerContent={headerContent}
+      initialPrompt={initialPrompt}
+      agentId={agentId}
+      requireAuth={requireAuth}
+      hasInvalidCredentials={hasInvalidCredentials}
+      loadedAgentsData={loadedAgentsData}
+      validationErrors={validationErrors}
+      fileTree={fileTree}
+    />
   )
 }

cli/src/app.tsx

@@ -44,10 +44,10 @@ import { computeInputLayoutMetrics } from './utils/text-layout'
 import { createMarkdownPalette } from './utils/theme-system'
 import { BORDER_CHARS } from './utils/ui-constants'
 
-import type { SendMessageTimerEvent } from './hooks/use-send-message'
 import type { ContentBlock } from './types/chat'
 import type { SendMessageFn } from './types/contracts/send-message'
 import type { ScrollBoxRenderable } from '@opentui/core'
+import type { FileTreeNode } from '@codebuff/common/util/file'
 
 const DEFAULT_AGENT_IDS = {
   DEFAULT: 'base2',
@@ -63,6 +63,7 @@ export const Chat = ({
   hasInvalidCredentials,
   loadedAgentsData,
   validationErrors,
+  fileTree,
 }: {
   headerContent: React.ReactNode
   initialPrompt: string | null
@@ -74,6 +75,7 @@ export const Chat = ({
     agentsDir: string
   } | null
   validationErrors: Array<{ id: string; message: string }>
+  fileTree: FileTreeNode[]
 }) => {
   const scrollRef = useRef<ScrollBoxRenderable | null>(null)
   const inputRef = useRef<MultilineInputHandle | null>(null)
@@ -119,6 +121,7 @@ export const Chat = ({
     setHasReceivedPlanResponse,
     lastMessageMode,
     setLastMessageMode,
+    addSessionCredits,
     resetChatStore,
   } = useChatStore(
     useShallow((store) => ({
@@ -151,6 +154,7 @@ export const Chat = ({
       setHasReceivedPlanResponse: store.setHasReceivedPlanResponse,
       lastMessageMode: store.lastMessageMode,
       setLastMessageMode: store.setLastMessageMode,
+      addSessionCredits: store.addSessionCredits,
       resetChatStore: store.reset,
     })),
   )
@@ -291,12 +295,15 @@ export const Chat = ({
     mentionContext,
     slashMatches,
     agentMatches,
+    fileMatches,
     slashSuggestionItems,
     agentSuggestionItems,
+    fileSuggestionItems,
   } = useSuggestionEngine({
     inputValue,
     slashCommands: SLASH_COMMANDS,
     localAgents,
+    fileTree,
   })
 
   // Reset suggestion menu indexes when context changes
@@ -326,19 +333,21 @@ export const Chat = ({
   }, [mentionContext.active, mentionContext.query, setAgentSelectedIndex])
 
   useEffect(() => {
-    if (agentMatches.length > 0 && agentSelectedIndex >= agentMatches.length) {
-      setAgentSelectedIndex(agentMatches.length - 1)
+    const totalMatches = agentMatches.length + fileMatches.length
+    if (totalMatches > 0 && agentSelectedIndex >= totalMatches) {
+      setAgentSelectedIndex(totalMatches - 1)
     }
-    if (agentMatches.length === 0 && agentSelectedIndex !== 0) {
+    if (totalMatches === 0 && agentSelectedIndex !== 0) {
       setAgentSelectedIndex(0)
     }
-  }, [agentMatches.length, agentSelectedIndex, setAgentSelectedIndex])
+  }, [agentMatches.length, fileMatches.length, agentSelectedIndex, setAgentSelectedIndex])
 
   const { handleSuggestionMenuKey } = useSuggestionMenuHandlers({
     slashContext,
     mentionContext,
     slashMatches,
     agentMatches,
+    fileMatches,
     slashSelectedIndex,
     agentSelectedIndex,
     inputValue,
@@ -403,6 +412,7 @@ export const Chat = ({
     setHasReceivedPlanResponse,
     lastMessageMode,
     setLastMessageMode,
+    addSessionCredits,
   })
 
   sendMessageRef.current = sendMessage
@@ -456,6 +466,7 @@ export const Chat = ({
     ],
   )
 
+  const totalMentionMatches = agentMatches.length + fileMatches.length
   const historyNavUpEnabled =
     lastEditDueToNav ||
     (cursorPosition === 0 &&
@@ -468,7 +479,7 @@ export const Chat = ({
       ((slashContext.active &&
         slashSelectedIndex === slashMatches.length - 1) ||
         (mentionContext.active &&
-          agentSelectedIndex === agentMatches.length - 1) ||
+          agentSelectedIndex === totalMentionMatches - 1) ||
         (!slashContext.active && !mentionContext.active)))
 
   useKeyboardHandlers({
@@ -523,7 +534,7 @@ export const Chat = ({
   const hasMentionSuggestions =
     !slashContext.active &&
     mentionContext.active &&
-    agentSuggestionItems.length > 0
+    (agentSuggestionItems.length > 0 || fileSuggestionItems.length > 0)
   const hasSuggestionMenu = hasSlashSuggestions || hasMentionSuggestions
   const showAgentStatusLine = showAgentDisplayName && loadedAgentsData
 
@@ -593,78 +604,64 @@ export const Chat = ({
         flexGrow: 1,
       }}
     >
-      <box
+      <scrollbox
+        ref={scrollRef}
+        stickyScroll
+        stickyStart="bottom"
+        scrollX={false}
+        scrollbarOptions={{ visible: false }}
+        {...appliedScrollboxProps}
         style={{
-          flexDirection: 'column',
           flexGrow: 1,
-          paddingLeft: 0,
-          paddingRight: 0,
-          paddingTop: 0,
-          paddingBottom: 0,
-          backgroundColor: 'transparent',
+          rootOptions: {
+            flexGrow: 1,
+            padding: 0,
+            gap: 0,
+            flexDirection: 'column',
+            shouldFill: true,
+            backgroundColor: 'transparent',
+          },
+          wrapperOptions: {
+            flexGrow: 1,
+            border: false,
+            shouldFill: true,
+            backgroundColor: 'transparent',
+          },
+          contentOptions: {
+            flexDirection: 'column',
+            gap: 0,
+            shouldFill: true,
+            justifyContent: 'flex-end',
+            backgroundColor: 'transparent',
+          },
         }}
       >
-        <scrollbox
-          ref={scrollRef}
-          stickyScroll
-          stickyStart="bottom"
-          scrollX={false}
-          scrollbarOptions={{ visible: false }}
-          {...appliedScrollboxProps}
-          style={{
-            flexGrow: 1,
-            rootOptions: {
-              flexGrow: 1,
-              padding: 0,
-              gap: 0,
-              flexDirection: 'column',
-              shouldFill: true,
-              backgroundColor: 'transparent',
-            },
-            wrapperOptions: {
-              flexGrow: 1,
-              border: false,
-              shouldFill: true,
-              backgroundColor: 'transparent',
-            },
-            contentOptions: {
-              flexDirection: 'column',
-              gap: 0,
-              shouldFill: true,
-              justifyContent: 'flex-end',
-              backgroundColor: 'transparent',
-            },
-          }}
-        >
-          {headerContent}
-          {virtualizationNotice}
-          <MessageRenderer
-            messages={messages}
-            messageTree={messageTree}
-            topLevelMessages={virtualTopLevelMessages}
-            availableWidth={separatorWidth}
-            theme={theme}
-            markdownPalette={markdownPalette}
-            collapsedAgents={collapsedAgents}
-            streamingAgents={streamingAgents}
-            isWaitingForResponse={isWaitingForResponse}
-            timerStartTime={timerStartTime}
-            onCollapseToggle={handleCollapseToggle}
-            setCollapsedAgents={setCollapsedAgents}
-            setFocusedAgentId={setFocusedAgentId}
-            userOpenedAgents={userOpenedAgents}
-            setUserOpenedAgents={setUserOpenedAgents}
-            onBuildFast={handleBuildFast}
-            onBuildMax={handleBuildMax}
-          />
-        </scrollbox>
-      </box>
+        {headerContent}
+        {virtualizationNotice}
+        <MessageRenderer
+          messages={messages}
+          messageTree={messageTree}
+          topLevelMessages={virtualTopLevelMessages}
+          availableWidth={separatorWidth}
+          theme={theme}
+          markdownPalette={markdownPalette}
+          collapsedAgents={collapsedAgents}
+          streamingAgents={streamingAgents}
+          isWaitingForResponse={isWaitingForResponse}
+          timerStartTime={timerStartTime}
+          onCollapseToggle={handleCollapseToggle}
+          setCollapsedAgents={setCollapsedAgents}
+          setFocusedAgentId={setFocusedAgentId}
+          userOpenedAgents={userOpenedAgents}
+          setUserOpenedAgents={setUserOpenedAgents}
+          onBuildFast={handleBuildFast}
+          onBuildMax={handleBuildMax}
+        />
+      </scrollbox>
 
       <box
         style={{
           flexShrink: 0,
-          paddingLeft: 0,
-          paddingRight: 0,
           backgroundColor: 'transparent',
         }}
       >
@@ -765,7 +762,7 @@ export const Chat = ({
           ) : null}
           {hasMentionSuggestions ? (
             <SuggestionMenu
-              items={agentSuggestionItems}
+              items={[...agentSuggestionItems, ...fileSuggestionItems]}
               selectedIndex={agentSelectedIndex}
               maxVisible={10}
               prefix="@"