Merge origin/main into branch; keep upstream visual tweaks and our Button wrapper behavior in BuildModeButtons

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.
 

cli/src/components/build-mode-buttons.tsx

@@ -3,6 +3,7 @@ import type { ChatTheme } from '../types/theme-system'
 import { BORDER_CHARS } from '../utils/ui-constants'
 import { useTerminalDimensions } from '../hooks/use-terminal-dimensions'
 import { Button } from './button'
+
 export const BuildModeButtons = ({
   theme,
   onBuildFast,
@@ -17,21 +18,20 @@ export const BuildModeButtons = ({
   )
   const { terminalWidth } = useTerminalDimensions()
   const isNarrow = terminalWidth < 55
+
   return (
     <box
       style={{
-        flexDirection: 'row',
-        gap: 1,
+        flexDirection: 'column',
+        gap: 0,
         paddingTop: 0,
         paddingBottom: 0,
         paddingLeft: 1,
-        alignItems: 'center',
-        justifyContent: 'space-between',
       }}
     >
       {isNarrow ? null : (
-        <text style={{ wrapMode: 'none' }} selectable={false}>
-          <span fg={theme.secondary}>Ready to build?</span>
+        <text style={{ wrapMode: 'none' }}>
+          <span fg={theme.secondary}>Choose an option to build this plan:</span>
         </text>
       )}
       <box

cli/src/hooks/use-send-message.ts

@@ -2,7 +2,11 @@ import { has, isEqual } from 'lodash'
 import { useCallback, useEffect, useRef } from 'react'
 
 import { getCodebuffClient, formatToolOutput } from '../utils/codebuff-client'
-import { MAIN_AGENT_ID, shouldHideAgent } from '../utils/constants'
+import {
+  MAIN_AGENT_ID,
+  shouldHideAgent,
+  shouldCollapseByDefault,
+} from '../utils/constants'
 import { createValidationErrorBlocks } from '../utils/create-validation-error-blocks'
 import { getErrorObject } from '../utils/error'
 import { formatTimestamp } from '../utils/helpers'
@@ -1130,10 +1134,13 @@ export const useSendMessage = ({
                     setCollapsedAgents((prev) => {
                       const next = new Set(prev)
                       next.delete(tempId)
-                      // Only collapse if parent is NOT main agent (i.e., it's a nested agent)
+                      // Collapse if:
+                      // 1. Parent is NOT main agent (nested agent), OR
+                      // 2. Agent type is in the collapsed-by-default list
                       if (
-                        event.parentAgentId &&
-                        event.parentAgentId !== MAIN_AGENT_ID
+                        (event.parentAgentId &&
+                          event.parentAgentId !== MAIN_AGENT_ID) ||
+                        shouldCollapseByDefault(event.agentType)
                       ) {
                         next.add(event.agentId)
                       }
@@ -1233,10 +1240,13 @@ export const useSendMessage = ({
                   )
 
                   setStreamingAgents((prev) => new Set(prev).add(event.agentId))
-                  // Only collapse if parent is NOT main agent (i.e., it's a nested agent)
+                  // Collapse if:
+                  // 1. Parent is NOT main agent (nested agent), OR
+                  // 2. Agent type is in the collapsed-by-default list
                   if (
-                    event.parentAgentId &&
-                    event.parentAgentId !== MAIN_AGENT_ID
+                    (event.parentAgentId &&
+                      event.parentAgentId !== MAIN_AGENT_ID) ||
+                    shouldCollapseByDefault(event.agentType)
                   ) {
                     setCollapsedAgents((prev) =>
                       new Set(prev).add(event.agentId),

cli/src/hooks/use-suggestion-menu-handlers.ts

@@ -179,7 +179,7 @@ export const useSuggestionMenuHandlers = ({
         selectAgentItem(agentSelectedIndex) || selectAgentItem(0)
 
       if (key.name === 'down' && !hasModifier(key)) {
-        if (agentSelectedIndex === totalMatches - 1) return false
+        if (agentSelectedIndex === totalMatches - 1) return true
         setAgentSelectedIndex((prev) => prev + 1)
         return true
       }

cli/src/utils/constants.ts

@@ -8,6 +8,18 @@ export const shouldHideAgent = (agentId: string): boolean => {
   return HIDDEN_AGENT_IDS.some((hiddenId) => agentId.includes(hiddenId))
 }
 
+// Agent IDs that should be collapsed by default when they start
+export const COLLAPSED_BY_DEFAULT_AGENT_IDS = ['file-picker'] as const
+
+/**
+ * Check if an agent should be collapsed by default
+ */
+export const shouldCollapseByDefault = (agentType: string): boolean => {
+  return COLLAPSED_BY_DEFAULT_AGENT_IDS.some((collapsedId) =>
+    agentType.includes(collapsedId),
+  )
+}
+
 /**
  * The parent agent ID for all root-level agents
  */

npm-app/release/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebuff",
-  "version": "1.0.509",
+  "version": "1.0.510",
   "description": "AI coding agent",
   "license": "MIT",
   "bin": {