Merge origin/main into brandon/tui

Thoughtfully merged changes in backend/src/run-programmatic-step.ts:
- From origin/main: HandleStepsLogChunkFn, handleStepsLogChunk, sendSubagentChunk, fromHandleSteps param
- From brandon/tui: parentAgentId wrapping logic for nested agent events
- Combined both sets of changes for full functionality

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>

Author: brandonkachen

.agents/planners/generate-plan-max.ts …-graveyard/planners/generate-plan-max.ts.agents/planners/generate-plan-max.ts renamed to .agents-graveyard/planners/generate-plan-max.ts .agents/planners/generate-plan-max.ts renamed to .agents-graveyard/planners/generate-plan-max.ts

@@ -1,5 +1,5 @@
-import { publisher } from '../constants'
-import { type SecretAgentDefinition } from '../types/secret-agent-definition'
+import { publisher } from '../../.agents/constants'
+import { type SecretAgentDefinition } from '../../.agents/types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   id: 'generate-plan-max',

.agents-graveyard/planners/generate-plan-thinking.ts

@@ -0,0 +1,57 @@
+import { publisher } from '../../.agents/constants'
+import {
+  PLACEHOLDER,
+  type SecretAgentDefinition,
+} from '../../.agents/types/secret-agent-definition'
+
+const definition: SecretAgentDefinition = {
+  id: 'generate-plan-thinking',
+  publisher,
+  model: 'anthropic/claude-sonnet-4.5',
+  displayName: 'Plan Generator Thinking',
+  spawnerPrompt:
+    'Thinks, then generates 5 alternative plans for a user request, analyzes them, and selects the best and simplest one that meets all requirements.',
+  inputSchema: {},
+  outputMode: 'structured_output',
+  toolNames: ['spawn_agents', 'read_files', 'set_output'],
+  spawnableAgents: ['decomposing-thinker', 'independent-thinker'],
+
+  includeMessageHistory: true,
+  inheritParentSystemPrompt: true,
+
+  instructionsPrompt: `For reference, here is the original user request:
+<user_message>
+${PLACEHOLDER.USER_INPUT_PROMPT}
+</user_message>
+
+You are the generate-plan-thinking agent. You are an expert planning agent that generates multiple plan alternatives and selects the optimal one.
+
+IMPORTANT: You do not have access to any editing tools. You can only analyze and write out plans. Your goal is to generate the best plan for the user's request.
+
+Your task is to:
+1. Spawn thinking agents (decomposing-thinker and independent-thinker) to deep dive and weigh alternative approaches to the user's request.
+2. Write out 5 distinct alternative plans for the user's request. Each plan should be complete and actionable but approach the problem differently.
+3. After generating all 5 plans, analyze each one against the original user requirements.
+4. Select the plan that:
+   - Most closely matches all the original user requirements
+   - Is the simplest and most straightforward to implement
+   - Has the fewest dependencies and moving parts
+   - Touches the fewest files
+   - Reuses existing helper functions and other code whenever possible
+   - Is most maintainable
+
+Output format:
+- Spawn parallel thinking agents
+- Write out all 5 plans clearly labeled as "Plan 1:", "Plan 2:", etc.
+- Then write an analysis section comparing the plans against the requirements
+- Finally, call set_output with a 'plan' field containing the best plan, which you are free to rewrite (doesn't have to be one of the five already selected).
+
+The selected plan in set_output should be:
+- Written in clear, actionable steps
+- Free of unnecessary complexity
+- Easy to understand and follow
+- Complete and addresses all the specific user requirements
+- Just the plan text itself, without labels or meta-commentary`,
+}
+
+export default definition

.agents/planners/plan-selector.ts …nners/plan-selector-for-generate-plan.ts.agents/planners/plan-selector.ts renamed to .agents-graveyard/planners/plan-selector-for-generate-plan.ts .agents/planners/plan-selector.ts renamed to .agents-graveyard/planners/plan-selector-for-generate-plan.ts

@@ -1,8 +1,8 @@
-import { publisher } from '../constants'
+import { publisher } from '../../.agents/constants'
 import {
   PLACEHOLDER,
   type SecretAgentDefinition,
-} from '../types/secret-agent-definition'
+} from '../../.agents/types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   id: 'plan-selector',

.agents/__tests__/context-pruner.test.ts

@@ -65,7 +65,12 @@ describe('context-pruner handleSteps', () => {
   })
 
   const runHandleSteps = (messages: Message[]) => {
-    mockAgentState.messageHistory = messages
+    // Add instructions prompt that will be removed by context-pruner
+    const messagesWithInstructions = [
+      ...messages,
+      createMessage('user', 'Instructions prompt'),
+    ]
+    mockAgentState.messageHistory = messagesWithInstructions
     const mockLogger = {
       debug: () => {},
       info: () => {},
@@ -332,7 +337,12 @@ describe('context-pruner edge cases', () => {
   })
 
   const runHandleSteps = (messages: Message[]) => {
-    mockAgentState.messageHistory = messages
+    // Add instructions prompt that will be removed by context-pruner
+    const messagesWithInstructions = [
+      ...messages,
+      createMessage('user', 'Instructions prompt'),
+    ]
+    mockAgentState.messageHistory = messagesWithInstructions
     const mockLogger = {
       debug: () => {},
       info: () => {},
@@ -502,15 +512,15 @@ describe('context-pruner edge cases', () => {
       },
       {
         content: 'spawn_agent_inline call for "context-pruner" with quotes',
-        shouldRemove: true, // Has context-pruner and 3 total messages
+        shouldRemove: true, // Has context-pruner and 3 total messages before instructions
       },
       {
         content: 'spawn_agent_inline\n  "agent_type": "context-pruner"',
-        shouldRemove: true, // Has context-pruner and 3 total messages
+        shouldRemove: true, // Has context-pruner and 3 total messages before instructions
       },
       {
         content: 'Multiple spawn_agent_inline calls, one for context-pruner',
-        shouldRemove: true, // Has context-pruner and 3 total messages
+        shouldRemove: true, // Has context-pruner and 3 total messages before instructions
       },
     ]
 
@@ -531,7 +541,7 @@ describe('context-pruner edge cases', () => {
           createMessage('user', 'Hello'),
         )
       } else {
-        // Should preserve all messages
+        // Should preserve all messages (4 original messages)
         expect((results[0] as any).input.messages).toHaveLength(4)
       }
     })

.agents/agent-builder.ts

@@ -22,24 +22,19 @@ const researcherGrok4FastExampleContent = readFileSync(
   join(__dirname, 'researcher', 'researcher-grok-4-fast.ts'),
   'utf8',
 )
-const implementationPlannerExampleContent = readFileSync(
+const generatePlanExampleContent = readFileSync(
   join(__dirname, 'planners', 'generate-plan.ts'),
   'utf8',
 )
-const planSelectorExampleContent = readFileSync(
-  join(__dirname, 'planners', 'plan-selector.ts'),
-  'utf8',
-)
-const implementationPlannerMaxExampleContent = readFileSync(
-  join(__dirname, 'planners', 'generate-plan-max.ts'),
+const reviewerExampleContent = readFileSync(
+  join(__dirname, 'reviewer', 'reviewer.ts'),
   'utf8',
 )
 const examplesAgentsContent = [
   researcherDocExampleContent,
   researcherGrok4FastExampleContent,
-  implementationPlannerExampleContent,
-  planSelectorExampleContent,
-  implementationPlannerMaxExampleContent,
+  generatePlanExampleContent,
+  reviewerExampleContent,
 ]
 
 const definition: AgentDefinition = {

.agents/base/base-max.ts

@@ -12,7 +12,7 @@ const definition: SecretAgentDefinition = {
     'find-all-referencer',
     'researcher-web-sonnet',
     'researcher-docs-sonnet',
-    'decomposing-planner',
+    'generate-plan',
     'decomposing-thinker',
     'reviewer',
     'context-pruner',

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

@@ -0,0 +1,31 @@
+import { createBase2 } from './base2'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
+
+const definition: SecretAgentDefinition = {
+  ...createBase2('normal'),
+  id: 'base2-gpt-5-single-step',
+  model: 'openai/gpt-5',
+  reasoningOptions: {
+    enabled: true,
+    effort: 'medium',
+    exclude: false,
+  },
+
+  inputSchema: {},
+
+  handleSteps: function* ({ params }) {
+    // Run context-pruner before each step
+    yield {
+      toolName: 'spawn_agent_inline',
+      input: {
+        agent_type: 'context-pruner',
+        params: params ?? {},
+      },
+      includeToolCall: false,
+    } as any
+
+    yield 'STEP'
+  },
+}
+
+export default definition

.agents/base2/base2-gpt-5.ts

@@ -0,0 +1,23 @@
+import { buildArray } from '@codebuff/common/util/array'
+import { createBase2 } from './base2'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
+
+const base = createBase2('normal')
+
+const definition: SecretAgentDefinition = {
+  ...base,
+  id: 'base2-gpt-5',
+  model: 'openai/gpt-5',
+  spawnableAgents: buildArray(
+    'file-picker',
+    'find-all-referencer',
+    'researcher-web',
+    'researcher-docs',
+    'commander',
+    'reviewer-gpt-5',
+    'editor-gpt-5',
+    'context-pruner',
+  ),
+}
+
+export default definition

.agents/base2/base2-max.ts

@@ -1,5 +1,37 @@
 import { createBase2 } from './base2'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 
-const definition = { ...createBase2('max'), id: 'base2-max' }
+const base2 = createBase2('max')
+const definition: SecretAgentDefinition = {
+  ...base2,
+  id: 'base2-max',
+  spawnableAgents: [
+    ...(base2.spawnableAgents ?? []),
+    'base2-gpt-5-single-step',
+  ],
+  handleSteps: function* ({ params }) {
+    while (true) {
+      // Run context-pruner before each step
+      yield {
+        toolName: 'spawn_agent_inline',
+        input: {
+          agent_type: 'context-pruner',
+          params: params ?? {},
+        },
+        includeToolCall: false,
+      } as any
+
+      const { stepsComplete } = yield 'STEP'
+      if (stepsComplete) break
+
+      yield {
+        toolName: 'spawn_agent_inline',
+        input: {
+          agent_type: 'base2-gpt-5-single-step',
+        },
+      }
+    }
+  },
+}
 
 export default definition