Merge branch 'main' into subscription-client

Author: jahooma

agents/editor/best-of-n/editor-implementor.ts

@@ -42,7 +42,7 @@ IMPORTANT: Use propose_str_replace and propose_write_file tools to make your edi
 You can make multiple tool calls across multiple steps to complete the implementation. Only the file changes will be passed on, so you can say whatever you want to help you think. Do not write any final summary as that would be a waste of tokens because no one is reading it.
 <codebuff_tool_call>
 {
-  "cb_tool_name": "str_replace",
+  "cb_tool_name": "propose_str_replace",
   "path": "path/to/file",
   "replacements": [
     {
@@ -61,7 +61,7 @@ OR for new files or major rewrites:
 
 <codebuff_tool_call>
 {
-  "cb_tool_name": "write_file",
+  "cb_tool_name": "propose_write_file",
   "path": "path/to/file",
   "instructions": "What the change does",
   "content": "Complete file content or edit snippet"

cli/release/package.json

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

cli/src/chat.tsx

@@ -16,6 +16,7 @@ import { AdBanner } from './components/ad-banner'
 import { BottomStatusLine } from './components/bottom-status-line'
 import { ChatInputBar } from './components/chat-input-bar'
 import { LoadPreviousButton } from './components/load-previous-button'
+import { ReviewScreen } from './components/review-screen'
 import { MessageWithAgents } from './components/message-with-agents'
 import { areCreditsRestored } from './components/out-of-credits-banner'
 import { PendingBashMessage } from './components/pending-bash-message'
@@ -47,6 +48,7 @@ import { WEBSITE_URL } from './login/constants'
 import { getProjectRoot } from './project-files'
 import { useChatHistoryStore } from './state/chat-history-store'
 import { useChatStore } from './state/chat-store'
+import { useReviewStore } from './state/review-store'
 import { useFeedbackStore } from './state/feedback-store'
 import { useMessageBlockStore } from './state/message-block-store'
 import { usePublishStore } from './state/publish-store'
@@ -635,6 +637,13 @@ export const Chat = ({
       })),
     )
 
+  const { reviewMode, closeReviewScreen } = useReviewStore(
+    useShallow((state) => ({
+      reviewMode: state.reviewMode,
+      closeReviewScreen: state.closeReviewScreen,
+    })),
+  )
+
   const publishMutation = usePublishMutation()
 
   const handleCommandResult = useCallback(
@@ -666,6 +675,10 @@ export const Chat = ({
       if (result.openChatHistory) {
         useChatHistoryStore.getState().openChatHistory()
       }
+
+      if (result.openReviewScreen) {
+        useReviewStore.getState().openReviewScreen()
+      }
     },
     [
       saveCurrentInput,
@@ -792,6 +805,26 @@ export const Chat = ({
     setInputFocused(true)
   }, [closePublish, setInputFocused])
 
+  const handleReviewOptionSelect = useCallback(
+    (reviewText: string) => {
+      closeReviewScreen()
+      setInputFocused(true)
+      // Submit the review request
+      onSubmitPrompt(reviewText, agentMode)
+        .then((result) => handleCommandResult(result))
+        .catch((error) => {
+          logger.error({ error }, '[review] Failed to submit review prompt')
+          showClipboardMessage('Failed to send review request', { durationMs: 3000 })
+        })
+    },
+    [closeReviewScreen, setInputFocused, onSubmitPrompt, agentMode, handleCommandResult],
+  )
+
+  const handleCloseReviewScreen = useCallback(() => {
+    closeReviewScreen()
+    setInputFocused(true)
+  }, [closeReviewScreen, setInputFocused])
+
   const handlePublish = useCallback(
     async (agentIds: string[]) => {
       await publishMutation.mutateAsync(agentIds)
@@ -1144,7 +1177,7 @@ export const Chat = ({
   useChatKeyboard({
     state: chatKeyboardState,
     handlers: chatKeyboardHandlers,
-    disabled: askUserState !== null,
+    disabled: askUserState !== null || reviewMode,
   })
 
   // Sync message block context to zustand store for child components
@@ -1399,64 +1432,71 @@ export const Chat = ({
 
         {ad && getAdsEnabled() && <AdBanner ad={ad} />}
 
-        <ChatInputBar
-          inputValue={inputValue}
-          cursorPosition={cursorPosition}
-          setInputValue={setInputValue}
-          inputFocused={inputFocused}
-          inputRef={inputRef}
-          inputPlaceholder={inputPlaceholder}
-          lastEditDueToNav={lastEditDueToNav}
-          agentMode={agentMode}
-          toggleAgentMode={toggleAgentMode}
-          setAgentMode={setAgentMode}
-          hasSlashSuggestions={hasSlashSuggestions}
-          hasMentionSuggestions={hasMentionSuggestions}
-          hasSuggestionMenu={hasSuggestionMenu}
-          slashSuggestionItems={slashSuggestionItems}
-          agentSuggestionItems={agentSuggestionItems}
-          fileSuggestionItems={fileSuggestionItems}
-          slashSelectedIndex={slashSelectedIndex}
-          agentSelectedIndex={agentSelectedIndex}
-          onSlashItemClick={handleSlashItemClick}
-          onMentionItemClick={handleMentionItemClick}
-          theme={theme}
-          terminalHeight={terminalHeight}
-          separatorWidth={separatorWidth}
-          shouldCenterInputVertically={shouldCenterInputVertically}
-          inputBoxTitle={inputBoxTitle}
-          isCompactHeight={isCompactHeight}
-          isNarrowWidth={isNarrowWidth}
-          feedbackMode={feedbackMode}
-          handleExitFeedback={handleExitFeedback}
-          publishMode={publishMode}
-          handleExitPublish={handleExitPublish}
-          handlePublish={handlePublish}
-          handleSubmit={handleSubmit}
-          onPaste={createPasteHandler({
-            text: inputValue,
-            cursorPosition,
-            onChange: setInputValue,
-            onPasteImage: chatKeyboardHandlers.onPasteImage,
-            onPasteImagePath: chatKeyboardHandlers.onPasteImagePath,
-            onPasteLongText: (pastedText) => {
-              const id = crypto.randomUUID()
-              const preview = pastedText.slice(0, 100).replace(/\n/g, ' ')
-              useChatStore.getState().addPendingTextAttachment({
-                id,
-                content: pastedText,
-                preview,
-                charCount: pastedText.length,
-              })
-              // Show temporary status message
-              showClipboardMessage(
-                `📋 Pasted text (${pastedText.length.toLocaleString()} chars)`,
-                { durationMs: 5000 },
-              )
-            },
-            cwd: getProjectRoot() ?? process.cwd(),
-          })}
-        />
+        {reviewMode ? (
+          <ReviewScreen
+            onSelectOption={handleReviewOptionSelect}
+            onCancel={handleCloseReviewScreen}
+          />
+        ) : (
+          <ChatInputBar
+            inputValue={inputValue}
+            cursorPosition={cursorPosition}
+            setInputValue={setInputValue}
+            inputFocused={inputFocused}
+            inputRef={inputRef}
+            inputPlaceholder={inputPlaceholder}
+            lastEditDueToNav={lastEditDueToNav}
+            agentMode={agentMode}
+            toggleAgentMode={toggleAgentMode}
+            setAgentMode={setAgentMode}
+            hasSlashSuggestions={hasSlashSuggestions}
+            hasMentionSuggestions={hasMentionSuggestions}
+            hasSuggestionMenu={hasSuggestionMenu}
+            slashSuggestionItems={slashSuggestionItems}
+            agentSuggestionItems={agentSuggestionItems}
+            fileSuggestionItems={fileSuggestionItems}
+            slashSelectedIndex={slashSelectedIndex}
+            agentSelectedIndex={agentSelectedIndex}
+            onSlashItemClick={handleSlashItemClick}
+            onMentionItemClick={handleMentionItemClick}
+            theme={theme}
+            terminalHeight={terminalHeight}
+            separatorWidth={separatorWidth}
+            shouldCenterInputVertically={shouldCenterInputVertically}
+            inputBoxTitle={inputBoxTitle}
+            isCompactHeight={isCompactHeight}
+            isNarrowWidth={isNarrowWidth}
+            feedbackMode={feedbackMode}
+            handleExitFeedback={handleExitFeedback}
+            publishMode={publishMode}
+            handleExitPublish={handleExitPublish}
+            handlePublish={handlePublish}
+            handleSubmit={handleSubmit}
+            onPaste={createPasteHandler({
+              text: inputValue,
+              cursorPosition,
+              onChange: setInputValue,
+              onPasteImage: chatKeyboardHandlers.onPasteImage,
+              onPasteImagePath: chatKeyboardHandlers.onPasteImagePath,
+              onPasteLongText: (pastedText) => {
+                const id = crypto.randomUUID()
+                const preview = pastedText.slice(0, 100).replace(/\n/g, ' ')
+                useChatStore.getState().addPendingTextAttachment({
+                  id,
+                  content: pastedText,
+                  preview,
+                  charCount: pastedText.length,
+                })
+                // Show temporary status message
+                showClipboardMessage(
+                  `📋 Pasted text (${pastedText.length.toLocaleString()} chars)`,
+                  { durationMs: 5000 },
+                )
+              },
+              cwd: getProjectRoot() ?? process.cwd(),
+            })}
+          />
+        )}
 
         <BottomStatusLine
           isClaudeConnected={isClaudeOAuthActive}

cli/src/commands/command-registry.ts

@@ -1,6 +1,7 @@
 import open from 'open'
 
 import { handleAdsEnable, handleAdsDisable } from './ads'
+import { useThemeStore } from '../hooks/use-theme'
 import { handleHelpCommand } from './help'
 import { handleImageCommand } from './image'
 import { handleInitializationFlowLocally } from './init'
@@ -56,6 +57,7 @@ export type CommandResult = {
   openFeedbackMode?: boolean
   openPublishMode?: boolean
   openChatHistory?: boolean
+  openReviewScreen?: boolean
   preSelectAgents?: string[]
 } | void
 
@@ -495,6 +497,45 @@ export const COMMAND_REGISTRY: CommandDefinition[] = [
       return { openChatHistory: true }
     },
   }),
+  defineCommandWithArgs({
+    name: 'review',
+    handler: (params, args) => {
+      const trimmedArgs = args.trim()
+
+      params.saveToHistory(params.inputValue.trim())
+      clearInput(params)
+
+      // If user provided review text directly, send it immediately without showing the screen
+      if (trimmedArgs) {
+        const reviewPrompt = `@GPT-5 Agent Please review: ${trimmedArgs}`
+        params.sendMessage({
+          content: reviewPrompt,
+          agentMode: params.agentMode,
+        })
+        setTimeout(() => {
+          params.scrollToLatest()
+        }, 0)
+        return
+      }
+
+      // Otherwise open the selection UI
+      return { openReviewScreen: true }
+    },
+  }),
+  defineCommand({
+    name: 'theme:toggle',
+    handler: (params) => {
+      const { theme, setThemeName } = useThemeStore.getState()
+      const newTheme = theme.name === 'dark' ? 'light' : 'dark'
+      setThemeName(newTheme)
+      params.setMessages((prev) => [
+        ...prev,
+        getUserMessage(params.inputValue.trim()),
+        getSystemMessage(`Switched to ${newTheme} theme.`),
+      ])
+      clearInput(params)
+    },
+  }),
 ]
 
 export function findCommand(cmd: string): CommandDefinition | undefined {

cli/src/components/chat-input-bar.tsx

@@ -115,6 +115,9 @@ export const ChatInputBar = ({
   const modeConfig = getInputModeConfig(inputMode)
   const askUserState = useChatStore((state) => state.askUserState)
   const hasAnyPreview = hasSuggestionMenu
+
+  // Increase menu size on larger screen heights
+  const normalModeMaxVisible = terminalHeight > 35 ? 15 : 10
   const { submitAnswers, skip } = useAskUserBridge()
   const [askUserTitle] = React.useState(' Some questions for you ')
 
@@ -388,7 +391,7 @@ export const ChatInputBar = ({
           <SuggestionMenu
             items={slashSuggestionItems}
             selectedIndex={slashSelectedIndex}
-            maxVisible={10}
+            maxVisible={normalModeMaxVisible}
             prefix="/"
             onItemClick={onSlashItemClick}
           />
@@ -397,7 +400,7 @@ export const ChatInputBar = ({
           <SuggestionMenu
             items={[...agentSuggestionItems, ...fileSuggestionItems]}
             selectedIndex={agentSelectedIndex}
-            maxVisible={10}
+            maxVisible={normalModeMaxVisible}
             prefix="@"
             onItemClick={onMentionItemClick}
           />