Merge branch 'main' into openai-native

Author: jahooma

.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-code-reviewer-best-of-n.ts

@@ -0,0 +1,8 @@
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('max', { hasCodeReviewerBestOfN: true }),
+  id: 'base2-max-with-code-reviewer-best-of-n',
+  displayName: 'Buffy the Code Reviewing Best-of-N Max Orchestrator',
+}
+export default definition

.agents/base2/base2-with-code-reviewer-best-of-n.ts

@@ -0,0 +1,8 @@
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('default', { hasCodeReviewerBestOfN: true }),
+  id: 'base2-with-code-reviewer-best-of-n',
+  displayName: 'Buffy the Code Reviewing Best-of-N Orchestrator',
+}
+export default definition

.agents/base2/base2-with-code-reviewer.ts

@@ -0,0 +1,8 @@
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('default', { hasCodeReviewer: true }),
+  id: 'base2-with-code-reviewer',
+  displayName: 'Buffy the Code Reviewing Orchestrator',
+}
+export default definition

.agents/base2/base2.ts

@@ -11,9 +11,16 @@ export function createBase2(
   options?: {
     hasNoValidation?: boolean
     planOnly?: boolean
+    hasCodeReviewer?: boolean
+    hasCodeReviewerBestOfN?: boolean
   },
 ): Omit<SecretAgentDefinition, 'id'> {
-  const { hasNoValidation = false, planOnly = false } = options ?? {}
+  const {
+    hasNoValidation = false,
+    planOnly = false,
+    hasCodeReviewer = false,
+    hasCodeReviewerBestOfN = false,
+  } = options ?? {}
   const isDefault = mode === 'default'
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
@@ -24,7 +31,7 @@ export function createBase2(
   return {
     publisher,
     model: isGpt5
-      ? 'openai/gpt-5'
+      ? 'openai/gpt-5.1'
       : isFast
         ? 'z-ai/glm-4.6:nitro'
         : 'anthropic/claude-sonnet-4.5',
@@ -74,6 +81,9 @@ export function createBase2(
       isGpt5 && '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'),
+      hasCodeReviewerBestOfN &&
+        (isGpt5 ? 'code-reviewer-best-of-n-gpt-5' : 'code-reviewer-best-of-n'),
       'context-pruner',
     ),
 
@@ -123,8 +133,12 @@ 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.`,
+    `- 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.`,
     '- 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.',
+    hasCodeReviewerBestOfN &&
+      '- Spawn a code-reviewer-best-of-n agent to review the code changes after you have made them.',
   ).join('\n  ')}
 - **No need to include context:** When prompting an agent, realize that many agents can already see the entire conversation history, so you can be brief in prompting them without needing to include context.
 
@@ -170,10 +184,13 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           isDefault,
           isMax,
           hasNoValidation,
+          hasCodeReviewer,
+          hasCodeReviewerBestOfN,
         }),
     stepPrompt: planOnly
       ? buildPlanOnlyStepPrompt({})
       : buildImplementationStepPrompt({
+          isFast,
           isMax,
           isGpt5,
           hasNoValidation,
@@ -210,13 +227,17 @@ function buildImplementationInstructionsPrompt({
   isDefault,
   isMax,
   hasNoValidation,
+  hasCodeReviewer,
+  hasCodeReviewerBestOfN,
 }: {
   isSonnet: boolean
   isGpt5: boolean
   isFast: boolean
   isDefault: boolean
   isMax: boolean
   hasNoValidation: boolean
+  hasCodeReviewer: boolean
+  hasCodeReviewerBestOfN: 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.
 
@@ -227,9 +248,13 @@ 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.${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.`,
+  `- 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: 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.`,
+  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 &&
+    `- Spawn a code-reviewer-best-of-n 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.`,
   !hasNoValidation &&
     `- Test your changes${isMax ? '' : ' briefly'} by running appropriate validation commands for the project (e.g. typechecks, tests, lints, etc.).${isMax ? ' Start by type checking the specific area of the project that you are editing and then test the entire project if necessary.' : ' If you can, only typecheck/test the area of the project that you are editing, rather than the entire project.'} You may have to explore the project to find the appropriate commands. Don't skip this step!`,
   `- Inform the user that you have completed the task in one sentence or a few short bullet points.${isSonnet ? " Don't create any markdown summary files or example documentation files, unless asked by the user." : ''}`,
@@ -238,11 +263,13 @@ ${buildArray(
 }
 
 function buildImplementationStepPrompt({
+  isFast,
   isMax,
   isGpt5,
   hasNoValidation,
   isSonnet,
 }: {
+  isFast: boolean
   isMax: boolean
   isGpt5: boolean
   hasNoValidation: boolean
@@ -251,9 +278,11 @@ function buildImplementationStepPrompt({
   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 ${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 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')
 }
 
@@ -289,20 +318,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.