Merge origin/main into brandon/feedback

Preserved feedback feature and UI improvements:
- Feedback input mode component and functionality
- Ctrl+F shortcut for opening feedback
- Blinking cursor feature in multiline input
- Tab handling fix to avoid â character

Integrated all changes from main including:
- New StatusBar component replacing StatusIndicator
- Queue controls and UI improvements
- Multiple agent and tool updates
- Test improvements and new features

Author: brandonkachen

.agents-graveyard/scout.ts

@@ -7,7 +7,7 @@ import {
 const definition: SecretAgentDefinition = {
   id: 'scout',
   publisher,
-  model: 'openai/gpt-5-chat',
+  model: 'openai/gpt-5.1-chat',
   displayName: 'Lewis & Clark',
   spawnableAgents: ['file-explorer', 'researcher-web', 'researcher-docs'],
   toolNames: ['spawn_agents', 'read_files', 'code_search', 'end_turn'],

.agents/base/ask.ts

@@ -9,7 +9,7 @@ import { PLACEHOLDER } from '../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   id: 'ask',
   publisher,
-  model: 'openai/gpt-5',
+  model: 'openai/gpt-5.1',
   displayName: 'Ask Buffy',
   spawnerPrompt: 'Base ask-mode agent that orchestrates the full response.',
   inputSchema: {

.agents/base/base-lite.ts

@@ -7,7 +7,7 @@ import { baseAgentAgentStepPrompt } from './base-prompts.ts'
 const definition: SecretAgentDefinition = {
   id: 'base-lite',
   publisher,
-  ...base('openai/gpt-5', 'lite'),
+  ...base('openai/gpt-5.1', 'lite'),
   reasoningOptions: {
     enabled: true,
     effort: 'medium',
@@ -33,7 +33,7 @@ const definition: SecretAgentDefinition = {
   ],
 
   stepPrompt:
-    baseAgentAgentStepPrompt('openai/gpt-5') +
+    baseAgentAgentStepPrompt('openai/gpt-5.1') +
     ` Don't forget to spawn any helper agents as you go: file-explorer, find-all-referencer, researcher-web, researcher-docs, thinker, reviewer-lite`,
 }
 

.agents/base/base-quick.ts

@@ -6,7 +6,7 @@ import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   id: 'base-quick',
   publisher,
-  ...base('openai/gpt-5-chat', 'lite'),
+  ...base('openai/gpt-5.1-chat', 'lite'),
   toolNames: [
     'create_plan',
     'run_terminal_command',

.agents/base2/alloy/base2-gpt-5-single-step.ts

@@ -4,7 +4,7 @@ import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   ...createBase2('default'),
   id: 'base2-gpt-5-single-step',
-  model: 'openai/gpt-5',
+  model: 'openai/gpt-5.1',
   reasoningOptions: {
     enabled: true,
     effort: 'medium',

.agents/base2/alloy2/base2-plan-step-gpt-5.ts

@@ -4,7 +4,7 @@ import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   ...planStep,
   id: 'base2-plan-step-gpt-5',
-  model: 'openai/gpt-5',
+  model: 'openai/gpt-5.1',
 }
 
 export default definition

.agents/base2/base2-max-with-decision-maker.ts

@@ -0,0 +1,8 @@
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('max', { withDecisionMaker: true }),
+  id: 'base2-max-with-decision-maker',
+  displayName: 'Buffy the Max Decision Maker Orchestrator',
+}
+export default definition

.agents/base2/base2-with-editor-implementor-gpt-5.ts

@@ -0,0 +1,8 @@
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('default', { withImplementorGpt5: true }),
+  id: 'base2-with-editor-implementor-gpt-5',
+  displayName: 'Buffy the Editor Implementor GPT-5 Orchestrator',
+}
+export default definition

.agents/base2/base2.ts

@@ -13,13 +13,17 @@ export function createBase2(
     planOnly?: boolean
     hasCodeReviewer?: boolean
     hasCodeReviewerBestOfN?: boolean
+    withImplementorGpt5?: boolean
+    withDecisionMaker?: boolean
   },
 ): Omit<SecretAgentDefinition, 'id'> {
   const {
-    hasNoValidation = false,
+    hasNoValidation = mode === 'fast',
     planOnly = false,
     hasCodeReviewer = false,
     hasCodeReviewerBestOfN = false,
+    withImplementorGpt5 = false,
+    withDecisionMaker = false,
   } = options ?? {}
   const isDefault = mode === 'default'
   const isFast = mode === 'fast'
@@ -30,13 +34,9 @@ export function createBase2(
 
   return {
     publisher,
-    model: isGpt5
-      ? 'openai/gpt-5'
-      : isFast
-        ? 'z-ai/glm-4.6:nitro'
-        : 'anthropic/claude-sonnet-4.5',
+    model: isGpt5 ? 'openai/gpt-5.1' : 'anthropic/claude-sonnet-4.5',
     ...(isGpt5 && {
-      reasoningModel: {
+      reasoningOptions: {
         effort: 'high',
       },
     }),
@@ -64,7 +64,7 @@ export function createBase2(
       'spawn_agents',
       'read_files',
       'read_subtree',
-      'write_todos',
+      !isFast && 'write_todos',
       'str_replace',
       'write_file',
       isGpt5 && 'task_completed',
@@ -77,8 +77,10 @@ export function createBase2(
       'researcher-web',
       'researcher-docs',
       'commander',
-      isDefault && 'editor-best-of-n',
-      isGpt5 && 'editor-best-of-n-gpt-5',
+      withDecisionMaker && 'decision-maker',
+      withImplementorGpt5 && 'editor-implementor-gpt-5',
+      isDefault && !withImplementorGpt5 && 'editor-best-of-n',
+      isGpt5 && !withImplementorGpt5 && 'editor-best-of-n-gpt-5',
       isDefault && 'thinker-best-of-n',
       isGpt5 && 'thinker-best-of-n-gpt-5',
       hasCodeReviewer && (isGpt5 ? 'code-reviewer-gpt-5' : 'code-reviewer'),
@@ -133,7 +135,10 @@ Use the spawn_agents tool to spawn specialized agents to help you complete the u
 - **Sequence agents properly:** Keep in mind dependencies when spawning different agents. Don't spawn agents in parallel that depend on each other.
   ${buildArray(
     '- Spawn context-gathering agents (file pickers, code-searcher, directory-lister, glob-matcher, and web/docs researchers) before making edits.',
-    `- Spawn a ${isGpt5 ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement the changes after you have gathered all the context you need. Don't spawn the editor in parallel with context-gathering agents.`,
+    !withImplementorGpt5 &&
+      `- Spawn a ${isGpt5 ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement the changes after you have gathered all the context you need. You must spawn this agent for non-trivial changes, since it writes much better code than you would with the str_replace or write_file tools. Don't spawn the editor in parallel with context-gathering agents.`,
+    withImplementorGpt5 &&
+      `- Spawn a editor-implementor-gpt-5 agent to implement the changes after you have gathered all the context you need. You must spawn this agent for non-trivial changes, since it writes much better code than you would with the str_replace or write_file tools.`,
     '- Spawn commanders sequentially if the second command depends on the the first.',
     hasCodeReviewer &&
       '- Spawn a code-reviewer agent to review the code changes after you have made them.',
@@ -155,8 +160,11 @@ For other questions, you can direct them to codebuff.com, or especially codebuff
 # Other response guidelines
 
 ${buildArray(
-  '- Your goal is to produce the highest quality results, even if it comes at the cost of more credits used.',
-  '- Speed is a secondary goal.',
+  !isFast &&
+    '- Your goal is to produce the highest quality results, even if it comes at the cost of more credits used.',
+  !isFast && '- Speed is important, but a secondary goal.',
+  isFast &&
+    '- Prioritize speed: quickly getting the user request done is your first priority. Do not call any unnecessary tools. Spawn more agents in parallel to speed up the process. Be extremely concise in your responses. Use 2 words where you would have used 2 sentences.',
   '- If a tool fails, try again, or try a different tool or approach.',
   '- Context is managed for you. The context-pruner agent will automatically run as needed. Gather as much context as you need without worrying about it.',
   isSonnet &&
@@ -186,14 +194,18 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           hasNoValidation,
           hasCodeReviewer,
           hasCodeReviewerBestOfN,
+          withImplementorGpt5,
+          withDecisionMaker,
         }),
     stepPrompt: planOnly
       ? buildPlanOnlyStepPrompt({})
       : buildImplementationStepPrompt({
+          isFast,
           isMax,
           isGpt5,
           hasNoValidation,
           isSonnet,
+          withImplementorGpt5,
         }),
 
     handleSteps: function* ({ params }) {
@@ -228,6 +240,8 @@ function buildImplementationInstructionsPrompt({
   hasNoValidation,
   hasCodeReviewer,
   hasCodeReviewerBestOfN,
+  withImplementorGpt5,
+  withDecisionMaker,
 }: {
   isSonnet: boolean
   isGpt5: boolean
@@ -237,6 +251,8 @@ function buildImplementationInstructionsPrompt({
   hasNoValidation: boolean
   hasCodeReviewer: boolean
   hasCodeReviewerBestOfN: boolean
+  withImplementorGpt5: boolean
+  withDecisionMaker: boolean
 }) {
   return `Act as a helpful assistant and freely respond to the user's request however would be most helpful to the user. Use your judgement to orchestrate the completion of the user's request using your specialized sub-agents and tools as needed. Take your time and be comprehensive.
 
@@ -246,10 +262,21 @@ The user asks you to implement a new feature. You respond in multiple steps:
 
 ${buildArray(
   EXPLORE_PROMPT,
-  `- Important: Read as many files as could possibly be relevant to the task over several steps to improve your understanding of the user's request and produce the best possible code changes. Find more examples within the codebase similar to the user's request, dependencies that help with understanding how things work, tests, etc. This is frequently 12-20 files, depending on the task.`,
-  `- For any task requiring 3+ steps, use the write_todos tool to write out your step-by-step implementation plan. Include ALL of the applicable tasks in the list.${hasCodeReviewer ? ' Include a step to review the code changes with the code-reviewer agent after you have made them.' : ''}${hasCodeReviewerBestOfN ? ' Include a step to review the code changes with the code-reviewer-best-of-n agent after you have made them.' : ''}${hasNoValidation ? '' : ' You should include at least one step to validate/test your changes: be specific about whether to typecheck, run tests, run lints, etc.'} Skip write_todos for simple tasks like quick edits or answering questions.`,
   !isFast &&
-    `- You must spawn the ${isGpt5 ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious.`,
+    `- Important: Read as many files as could possibly be relevant to the task over several steps to improve your understanding of the user's request and produce the best possible code changes. Find more examples within the codebase similar to the user's request, dependencies that help with understanding how things work, tests, etc. This is frequently 12-20 files, depending on the task.`,
+  withDecisionMaker &&
+    `- Before planning or implementing, spawn decision-maker agents for a few of the most important decisions that need to be made. This will improve the quality of your decisions and your implementation.`,
+  !isFast &&
+    `- For any task requiring 3+ steps, use the write_todos tool to write out your step-by-step implementation plan. Include ALL of the applicable tasks in the list.${hasCodeReviewer ? ' Include a step to review the code changes with the code-reviewer agent after you have made them.' : ''}${hasCodeReviewerBestOfN ? ' Include a step to review the code changes with the code-reviewer-best-of-n agent after you have made them.' : ''}${hasNoValidation ? '' : ' You should include at least one step to validate/test your changes: be specific about whether to typecheck, run tests, run lints, etc.'} Skip write_todos for simple tasks like quick edits or answering questions.`,
+  isFast &&
+    '- Implement the changes in one go. Pause after making all the changes to see the tool results of your edits.',
+  isFast &&
+    '- Do a single typecheck targeted for your changes at most (if applicable for the project). Or skip this step if the change was small.',
+  !isFast &&
+    !withImplementorGpt5 &&
+    `- IMPORTANT: You must spawn the ${isGpt5 ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious.`,
+  withImplementorGpt5 &&
+    `- IMPORTANT: You must spawn the editor-implementor-gpt-5 agent to implement non-trivial code changes, since it will generate the best code changes using a smarter reasoning model. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious.`,
   hasCodeReviewer &&
     `- Spawn a code-reviewer agent to review the code changes after you have made them. You can skip this step for small changes that are obvious and don't require a review.`,
   hasCodeReviewerBestOfN &&
@@ -262,22 +289,28 @@ ${buildArray(
 }
 
 function buildImplementationStepPrompt({
+  isFast,
   isMax,
   isGpt5,
   hasNoValidation,
   isSonnet,
+  withImplementorGpt5,
 }: {
+  isFast: boolean
   isMax: boolean
   isGpt5: boolean
   hasNoValidation: boolean
   isSonnet: boolean
+  withImplementorGpt5: boolean
 }) {
   return buildArray(
     isMax &&
       `Keep working until the user's request is completely satisfied${!hasNoValidation ? ' and validated' : ''}, or until you require more information from the user.`,
-    `After completing the user request, summarize your changes in a sentence or a few short bullet points.${isSonnet ? " Don't create any summary markdown files or example documentation files, unless asked by the user." : ''}. Don't repeat yourself.`,
+    !isFast &&
+      `You must spawn the ${withImplementorGpt5 ? 'editor-implementor-gpt-5' : isGpt5 ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement code changes, since it will generate the best code changes.`,
+    `After completing the user request, summarize your changes in a sentence${isFast ? '' : ' or a few short bullet points'}.${isSonnet ? " Don't create any summary markdown files or example documentation files, unless asked by the user." : ''}. Don't repeat yourself -- especially if you already summarized your changes then just end your turn.`,
     isGpt5 &&
-      `IMPORTANT: You should include at least one tool call ("<codebuff_tool_call>") per message response. If you are completely done with the user's request or require more information from the user, you must call the task_completed tool to end your turn.`,
+      `IMPORTANT: You must include at least one tool call ("<codebuff_tool_call>") per message response. If you are completely done with the user's request or require more information from the user, you must call the task_completed tool to end your turn.`,
   ).join('\n')
 }