Merge branch 'main' into cli-scroll-ux-improvements

Author: brandonkachen

.agents/base2/alloy/base2-alloy.ts

@@ -1,7 +1,7 @@
 import { createBase2 } from '../base2'
 import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
 
-const base2 = createBase2('fast')
+const base2 = createBase2('default')
 const definition: SecretAgentDefinition = {
   ...base2,
   id: 'base2-alloy',

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

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

.agents/base2/alloy2/base2-alloy2.ts

@@ -2,7 +2,7 @@ import { createBase2 } from '../base2'
 import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
 import { ToolCall } from '../../types/agent-definition'
 
-const base2 = createBase2('fast')
+const base2 = createBase2('default')
 const definition: SecretAgentDefinition = {
   ...base2,
   id: 'base2-alloy2',

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

@@ -1,7 +1,7 @@
 import { createBase2 } from '../base2'
 import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
 
-const base2 = createBase2('fast')
+const base2 = createBase2('default')
 const definition: SecretAgentDefinition = {
   ...base2,
   id: 'base2-plan-step',

.agents/base2/base2-plan.ts

@@ -1,7 +1,7 @@
 import { createBase2 } from './base2'
 
 const definition = {
-  ...createBase2('fast', { planOnly: true }),
+  ...createBase2('default', { planOnly: true }),
   id: 'base2-plan',
   displayName: 'Buffy the Plan-Only Orchestrator',
 }

.agents/base2/base2-read-moar.ts

@@ -3,7 +3,7 @@ import { createBase2 } from './base2'
 import { type SecretAgentDefinition } from '../types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
-  ...createBase2('fast'),
+  ...createBase2('default'),
   id: 'base2-read-moar',
   displayName: 'Buffy Needs Moar Files',
 

.agents/base2/base2.ts

@@ -252,7 +252,7 @@ function buildImplementationStepPrompt({
       `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.`,
     isGpt5 &&
-      `IMPORTANT: 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 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.`,
   ).join('\n')
 }
 
@@ -297,8 +297,8 @@ For example, here is a nice short question, where the options are helpfully writ
 Questions:
 
 1. Do you want to:
-a) (DEFAULT) Keep Express and integrate Bun WebSockets
-b) Migrate the entire HTTP server to Bun.serve()
+  a) (DEFAULT) Keep Express and integrate Bun WebSockets
+  b) Migrate the entire HTTP server to Bun.serve()
 
 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.

.agents/base2/task-researcher/base2-with-file-researcher.ts

@@ -1,7 +1,7 @@
 import { type SecretAgentDefinition } from '../../types/secret-agent-definition'
 import { createBase2 } from 'base2/base2'
 
-const base2 = createBase2('fast')
+const base2 = createBase2('default')
 const definition: SecretAgentDefinition = {
   ...base2,
   id: 'base2-with-file-researcher',

.github/workflows/ci.yml

@@ -92,6 +92,7 @@ jobs:
             packages/agent-runtime,
             packages/billing,
             packages/internal,
+            sdk,
             web,
           ]
         include:
@@ -103,6 +104,7 @@ jobs:
           - package: packages/agent-runtime
           - package: packages/billing
           - package: packages/internal
+          - package: sdk
           - package: web
     name: test-${{ matrix.package }}
     runs-on: ubuntu-latest
@@ -180,6 +182,7 @@ jobs:
             packages/agent-runtime,
             packages/billing,
             packages/internal,
+            sdk,
             web,
           ]
         include:
@@ -191,6 +194,7 @@ jobs:
           - package: packages/agent-runtime
           - package: packages/billing
           - package: packages/internal
+          - package: sdk
           - package: web
     name: test-integration-${{ matrix.package }}
     runs-on: ubuntu-latest
@@ -241,9 +245,9 @@ jobs:
           command: |
             cd ${{ matrix.package }}
             if [ "${{ matrix.package }}" = ".agents" ]; then
-              find __tests__ -name '*.integration.test.ts' 2>/dev/null | sort | xargs -I {} bun test {} || echo "No integration tests found in .agents"
+              find __tests__ -name '*.integration.test.ts' 2>/dev/null | sort | xargs -I {} bun test --timeout=60000 {} || echo "No integration tests found in .agents"
             else
-              find src -name '*.integration.test.ts' | sort | xargs -I {} bun test {}
+              find src -name '*.integration.test.ts' | sort | xargs -I {} bun test --timeout=60000 {}
             fi
 
   # E2E tests for web intentionally omitted for now.