Add thinker

Author: jahooma

.agents/base2/base2.ts

@@ -64,6 +64,7 @@ export function createBase2(
       'researcher-web',
       'researcher-docs',
       isLite ? 'commander-lite' : 'commander',
+      isDefault && 'thinker',
       isLite && 'editor-gpt-5',
       isDefault && 'editor',
       isMax && 'editor-best-of-n-max',

.agents/thinker/thinker.ts

@@ -5,34 +5,76 @@ import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   id: 'thinker',
   publisher,
-  model: 'anthropic/claude-sonnet-4.5',
+  model: 'anthropic/claude-opus-4.5',
   displayName: 'Theo the Theorizer',
   spawnerPrompt:
-    'Does deep thinking given the current messages and a specific prompt to focus on. Use this to help you solve a specific problem.',
+    'Does deep thinking given the current conversation history and a specific prompt to focus on. Use this to help you solve a specific problem. It is better to gather any relevant context before spawning this agent.',
   inputSchema: {
     prompt: {
       type: 'string',
       description: 'The problem you are trying to solve',
     },
   },
-  outputMode: 'last_message',
+  outputSchema: {
+    type: 'object',
+    properties: {
+      message: {
+        type: 'string',
+        description: "The response to the user's request",
+      },
+    },
+  },
+  outputMode: 'structured_output',
   inheritParentSystemPrompt: true,
   includeMessageHistory: true,
   spawnableAgents: [],
+  toolNames: [],
 
   instructionsPrompt: `
-Think deeply, step by step, about the user request and how best to approach it.
+You are a thinker agent. Use the <think> tag to think deeply about the user request.
 
-Consider edge cases, potential issues, and alternative approaches. Also, propose reading files or spawning agents to get more context that would be helpful for solving the problem.
+When satisfied, write out a brief response to the user's request. The parent agent will see your response -- no need to call any tools. DO NOT call the set_output tool, as that will be done for you.
+`.trim(),
 
-Come up with a list of insights that would help someone arrive at the best solution.
+  handleSteps: function* () {
+    const { agentState } = yield 'STEP'
 
-Try not to be too prescriptive or confident in one solution. Instead, give clear arguments and reasoning.
+    // Find the last assistant message
+    const lastAssistantMessage = [...agentState.messageHistory]
+      .reverse()
+      .find((m) => m.role === 'assistant')
 
-You must be extremely concise and to the point.
+    if (!lastAssistantMessage) {
+      yield {
+        toolName: 'set_output',
+        input: { message: 'No response generated' },
+      }
+      return
+    }
 
-**Important**: Do not use any tools! You are only thinking!
-`.trim(),
+    // Extract text content from the assistant message
+    const content = lastAssistantMessage.content
+    let textContent = ''
+    if (typeof content === 'string') {
+      textContent = content
+    } else if (Array.isArray(content)) {
+      textContent = content
+        .filter((part) => part.type === 'text')
+        .map((part) => part.text)
+        .join('')
+    }
+
+    // Remove text within <think> tags (including the tags themselves)
+    const cleanedText = textContent
+      .replace(/<think>[\s\S]*?<\/think>/g, '')
+      .trim()
+
+    yield {
+      toolName: 'set_output',
+      input: { message: cleanedText },
+      includeToolCall: false,
+    }
+  },
 }
 
 export default definition

common/src/types/dynamic-agent-template.ts

@@ -227,23 +227,24 @@ export const DynamicAgentTemplateSchema = DynamicAgentDefinitionSchema.extend({
       path: ['outputMode'],
     },
   )
-  .refine(
-    (data) => {
-      // If outputMode is 'structured_output', 'set_output' tool must be included
-      if (
-        data.outputMode === 'structured_output' &&
-        !data.toolNames.includes('set_output')
-      ) {
-        return false
-      }
-      return true
-    },
-    {
-      message:
-        "outputMode 'structured_output' requires the 'set_output' tool. Add 'set_output' to toolNames.",
-      path: ['toolNames'],
-    },
-  )
+  // Note(James): Disabled so that handleSteps could use set_output while the llm does not see or have access to the set_output tool.
+  // .refine(
+  //   (data) => {
+  //     // If outputMode is 'structured_output', 'set_output' tool must be included
+  //     if (
+  //       data.outputMode === 'structured_output' &&
+  //       !data.toolNames.includes('set_output')
+  //     ) {
+  //       return false
+  //     }
+  //     return true
+  //   },
+  //   {
+  //     message:
+  //       "outputMode 'structured_output' requires the 'set_output' tool. Add 'set_output' to toolNames.",
+  //     path: ['toolNames'],
+  //   },
+  // )
   // Note(James): Disabled so that a parent agent can have set_output tool and 'last_message' outputMode while its subagents use 'structured_output'. (The set_output tool must be included in parent to preserver prompt caching.)
   // .refine(
   //   (data) => {