zeitlich 0.2.2 → 0.2.4

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var workflow = require('@temporalio/workflow');
-var z5 = require('zod');
+var z3 = require('zod');
 var plugin = require('@temporalio/plugin');
 var messages = require('@langchain/core/messages');
 var crypto = require('crypto');
@@ -10,50 +10,50 @@ var justBash = require('just-bash');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var z5__default = /*#__PURE__*/_interopDefault(z5);
+var z3__default = /*#__PURE__*/_interopDefault(z3);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 
 // src/lib/session.ts
-var TASK_TOOL = "Task";
-function buildTaskDescription(subagents) {
+var SUBAGENT_TOOL = "Subagent";
+function buildSubagentDescription(subagents) {
   const subagentList = subagents.map((s) => `- **${s.name}**: ${s.description}`).join("\n");
-  return `Launch a new agent to handle complex, multi-step tasks autonomously.
+  return `Launch a new agent to handle complex tasks autonomously.
 
-The ${TASK_TOOL} tool launches specialized agents (subprocesses) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.
+The ${SUBAGENT_TOOL} tool launches specialized agents (subprocesses) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.
 
 Available agent types:
 
 ${subagentList}
 
-When using the ${TASK_TOOL} tool, you must specify a subagent parameter to select which agent type to use.
+When using the ${SUBAGENT_TOOL} tool, you must specify a subagent parameter to select which agent type to use.
 
 Usage notes:
 
 - Always include a short description (3-5 words) summarizing what the agent will do
 - Launch multiple agents concurrently whenever possible, to maximize performance; to do that, use a single message with multiple tool uses
-- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.
+- When the agent is done, it will return a single message back to you.
 - Each invocation starts fresh - provide a detailed task description with all necessary context.
 - Provide clear, detailed prompts so the agent can work autonomously and return exactly the information you need.
 - The agent's outputs should generally be trusted
 - Clearly tell the agent what type of work you expect since it is not aware of the user's intent
 - If the agent description mentions that it should be used proactively, then you should try your best to use it without the user having to ask for it first. Use your judgement.`;
 }
-function createTaskTool(subagents) {
+function createSubagentTool(subagents) {
   if (subagents.length === 0) {
     throw new Error("createTaskTool requires at least one subagent");
   }
   const names = subagents.map((s) => s.name);
   return {
-    name: TASK_TOOL,
-    description: buildTaskDescription(subagents),
-    schema: z5__default.default.object({
-      subagent: z5__default.default.enum(names).describe("The type of subagent to launch"),
-      description: z5__default.default.string().describe("A short (3-5 word) description of the task"),
-      prompt: z5__default.default.string().describe("The task for the agent to perform")
+    name: SUBAGENT_TOOL,
+    description: buildSubagentDescription(subagents),
+    schema: z3__default.default.object({
+      subagent: z3__default.default.enum(names).describe("The type of subagent to launch"),
+      description: z3__default.default.string().describe("A short (3-5 word) description of the task"),
+      prompt: z3__default.default.string().describe("The task for the agent to perform")
     })
   };
 }
-function createTaskHandler(subagents) {
+function createSubagentHandler(subagents) {
   const { workflowId: parentWorkflowId, taskQueue: parentTaskQueue } = workflow.workflowInfo();
   return async (args) => {
     const config = subagents.find((s) => s.name === args.subagent);
@@ -72,128 +72,32 @@ function createTaskHandler(subagents) {
       args: [input],
       taskQueue: config.taskQueue ?? parentTaskQueue
     };
-    const childResult = typeof config.workflow === "string" ? await workflow.executeChild(config.workflow, childOpts) : await workflow.executeChild(config.workflow, childOpts);
-    const validated = config.resultSchema ? config.resultSchema.parse(childResult) : childResult;
-    const toolResponse = typeof validated === "string" ? validated : JSON.stringify(validated, null, 2);
+    const { toolResponse, data } = typeof config.workflow === "string" ? await workflow.executeChild(config.workflow, childOpts) : await workflow.executeChild(config.workflow, childOpts);
+    const validated = config.resultSchema ? config.resultSchema.parse(data) : null;
     return {
       toolResponse,
-      data: {
-        result: validated,
-        childWorkflowId
-      }
+      data: validated
     };
   };
 }
-var createBashToolDescription = ({
-  fileTree
-}) => `Execute shell commands in a bash environment.
-
-Use this tool to:
-- Run shell commands (ls, cat, grep, find, etc.)
-- Execute scripts and chain commands with pipes (|) or logical operators (&&, ||)
-- Inspect files and directories
-
-Current file tree:
-${fileTree}`;
-var bashTool = {
-  name: "Bash",
-  description: `Execute shell commands in a sandboxed bash environment.
-
-Use this tool to:
-- Run shell commands (ls, cat, grep, find, etc.)
-- Execute scripts and chain commands with pipes (|) or logical operators (&&, ||)
-- Inspect files and directories
-`,
-  schema: z5__default.default.object({
-    command: z5__default.default.string().describe(
-      "The bash command to execute. Can include pipes (|), redirects (>, >>), logical operators (&&, ||), and shell features like command substitution $(...)."
-    )
-  }),
-  strict: true
-};
-var taskCreateTool = {
-  name: "TaskCreate",
-  description: `Use this tool to create a structured task list for the control test. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
-  It also helps the user understand the progress of the task and overall progress of their requests.
-  
-  ## When to Use This Tool
-  
-  Use this tool proactively in these scenarios:
-  
-  - Complex multi-step tasks - When a task requires 3 or more distinct steps or actions
-  - Non-trivial and complex tasks - Tasks that require careful planning or multiple operations
-  - User explicitly requests todo list - When the user directly asks you to use the todo list
-  - User provides multiple tasks - When users provide a list of things to be done (numbered or comma-separated)
-  - After receiving new instructions - Immediately capture user requirements as tasks
-  - When you start working on a task - Mark it as in_progress BEFORE beginning work
-  - After completing a task - Mark it as completed and add any new follow-up tasks discovered during implementation
-  
-  ## When NOT to Use This Tool
-  
-  Skip using this tool when:
-  - There is only a single, straightforward task
-  - The task is trivial and tracking it provides no organizational benefit
-  - The task can be completed in less than 3 trivial steps
-  - The task is purely conversational or informational
-  
-  NOTE that you should not use this tool if there is only one trivial task to do. In this case you are better off just doing the task directly.
-  
-  ## Task Fields
-  
-  - **subject**: A brief, actionable title in imperative form (e.g., "Fix authentication bug in login flow")
-  - **description**: Detailed description of what needs to be done, including context and acceptance criteria
-  - **activeForm**: Present continuous form shown in spinner when task is in_progress (e.g., "Fixing authentication bug"). This is displayed to the user while you work on the task.
-  
-  **IMPORTANT**: Always provide activeForm when creating tasks. The subject should be imperative ("Run tests") while activeForm should be present continuous ("Running tests"). All tasks are created with status \`pending\`.
-  
-  ## Tips
-  
-  - Create tasks with clear, specific subjects that describe the outcome
-  - Include enough detail in the description for another agent to understand and complete the task
-  - After creating tasks, use TaskUpdate to set up dependencies (blocks/blockedBy) if needed
-  - Check TaskList first to avoid creating duplicate tasks`,
-  schema: z5__default.default.object({
-    subject: z5__default.default.string().describe(
-      'A brief, actionable title in imperative form (e.g., "Fix authentication bug in login flow")'
-    ),
-    description: z5__default.default.string().describe(
-      "Detailed description of what needs to be done, including context and acceptance criteria"
-    ),
-    activeForm: z5__default.default.string().describe(
-      'Present continuous form shown in spinner when task is in_progress (e.g., "Fixing authentication bug"). This is displayed to the user while you work on the task.'
-    ),
-    metadata: z5__default.default.record(z5__default.default.string(), z5__default.default.string()).describe("Arbitrary key-value pairs for tracking")
-  })
-};
 
 // src/lib/tool-router.ts
-var buildIntoolDefinitions = {
-  [bashTool.name]: bashTool,
-  [taskCreateTool.name]: taskCreateTool
-};
 function createToolRouter(options) {
-  const { appendToolResult } = workflow.proxyActivities({
-    startToCloseTimeout: "2m",
-    retry: {
-      maximumAttempts: 3,
-      initialInterval: "5s",
-      maximumInterval: "15m",
-      backoffCoefficient: 4
-    }
-  });
+  const { appendToolResult } = options;
   const toolMap = /* @__PURE__ */ new Map();
   for (const [_key, tool] of Object.entries(options.tools)) {
     toolMap.set(tool.name, tool);
   }
+  const isEnabled = (tool) => tool.enabled !== false;
   if (options.subagents) {
     const subagentHooksMap = /* @__PURE__ */ new Map();
     for (const s of options.subagents) {
       if (s.hooks) subagentHooksMap.set(s.name, s.hooks);
     }
     const resolveSubagentName = (args) => args.subagent;
-    toolMap.set("Task", {
-      ...createTaskTool(options.subagents),
-      handler: createTaskHandler(options.subagents),
+    toolMap.set("Subagent", {
+      ...createSubagentTool(options.subagents),
+      handler: createSubagentHandler(options.subagents),
       ...subagentHooksMap.size > 0 && {
         hooks: {
           onPreToolUse: async (ctx) => {
@@ -212,24 +116,6 @@ function createToolRouter(options) {
       }
     });
   }
-  if (options.buildInTools) {
-    for (const [key, value] of Object.entries(options.buildInTools)) {
-      if (key === bashTool.name) {
-        toolMap.set(key, {
-          ...buildIntoolDefinitions[key],
-          description: createBashToolDescription({
-            fileTree: options.fileTree
-          }),
-          handler: value
-        });
-      } else {
-        toolMap.set(key, {
-          ...buildIntoolDefinitions[key],
-          handler: value
-        });
-      }
-    }
-  }
   async function processToolCall(toolCall, turn, handlerContext) {
     const startTime = Date.now();
     const tool = toolMap.get(toolCall.name);
@@ -245,6 +131,7 @@ function createToolRouter(options) {
         await appendToolResult({
           threadId: options.threadId,
           toolCallId: toolCall.id,
+          toolName: toolCall.name,
           content: JSON.stringify({
             skipped: true,
             reason: "Skipped by PreToolUse hook"
@@ -266,6 +153,7 @@ function createToolRouter(options) {
         await appendToolResult({
           threadId: options.threadId,
           toolCallId: toolCall.id,
+          toolName: toolCall.name,
           content: JSON.stringify({
             skipped: true,
             reason: "Skipped by tool PreToolUse hook"
@@ -279,14 +167,22 @@ function createToolRouter(options) {
     }
     let result;
     let content;
+    let resultAppended = false;
     try {
       if (tool) {
+        const enrichedContext = {
+          ...handlerContext ?? {},
+          threadId: options.threadId,
+          toolCallId: toolCall.id,
+          toolName: toolCall.name
+        };
         const response = await tool.handler(
           effectiveArgs,
-          handlerContext ?? {}
+          enrichedContext
         );
         result = response.data;
         content = response.toolResponse;
+        resultAppended = response.resultAppended === true;
       } else {
         result = { error: `Unknown tool: ${toolCall.name}` };
         content = JSON.stringify(result, null, 2);
@@ -332,11 +228,14 @@ function createToolRouter(options) {
         throw error;
       }
     }
-    await appendToolResult({
-      threadId: options.threadId,
-      toolCallId: toolCall.id,
-      content
-    });
+    if (!resultAppended) {
+      await appendToolResult({
+        threadId: options.threadId,
+        toolCallId: toolCall.id,
+        toolName: toolCall.name,
+        content
+      });
+    }
     const toolResult = {
       toolCallId: toolCall.id,
       name: toolCall.name,
@@ -366,11 +265,11 @@ function createToolRouter(options) {
   return {
     // --- Methods from registry ---
     hasTools() {
-      return toolMap.size > 0;
+      return Array.from(toolMap.values()).some(isEnabled);
     },
     parseToolCall(toolCall) {
       const tool = toolMap.get(toolCall.name);
-      if (!tool) {
+      if (!tool || !isEnabled(tool)) {
         throw new Error(`Tool ${toolCall.name} not found`);
       }
       const parsedArgs = tool.schema.parse(toolCall.args);
@@ -381,13 +280,14 @@ function createToolRouter(options) {
       };
     },
     hasTool(name) {
-      return toolMap.has(name);
+      const tool = toolMap.get(name);
+      return tool !== void 0 && isEnabled(tool);
     },
     getToolNames() {
-      return Array.from(toolMap.keys());
+      return Array.from(toolMap.entries()).filter(([, tool]) => isEnabled(tool)).map(([name]) => name);
     },
     getToolDefinitions() {
-      return Array.from(toolMap).map(([name, tool]) => ({
+      return Array.from(toolMap).filter(([, tool]) => isEnabled(tool)).map(([name, tool]) => ({
         name,
         description: tool.description,
         schema: tool.schema,
@@ -426,19 +326,28 @@ function createToolRouter(options) {
       }
       const handlerContext = context?.handlerContext ?? {};
       const processOne = async (toolCall) => {
+        const enrichedContext = {
+          ...handlerContext ?? {},
+          threadId: options.threadId,
+          toolCallId: toolCall.id,
+          toolName: toolCall.name
+        };
         const response = await handler(
           toolCall.args,
-          handlerContext
+          enrichedContext
         );
-        await appendToolResult({
-          threadId: options.threadId,
-          toolCallId: toolCall.id,
-          content: response.toolResponse
-        });
+        if (!response.resultAppended) {
+          await appendToolResult({
+            threadId: options.threadId,
+            toolCallId: toolCall.id,
+            toolName: toolCall.name,
+            content: response.toolResponse
+          });
+        }
         return {
           toolCallId: toolCall.id,
           name: toolCall.name,
-          data: response.data ?? null
+          data: response.data
         };
       };
       if (options.parallel) {
@@ -464,6 +373,21 @@ function createToolRouter(options) {
     }
   };
 }
+function withAutoAppend(threadHandler, handler) {
+  return async (args, context) => {
+    const response = await handler(args, context);
+    const threadId = context.threadId;
+    const toolCallId = context.toolCallId;
+    const toolName = context.toolName;
+    await threadHandler({
+      threadId,
+      toolCallId,
+      toolName,
+      content: response.toolResponse
+    });
+    return { toolResponse: "", data: response.data, resultAppended: true };
+  };
+}
 function defineTool(tool) {
   return tool;
 }
@@ -475,51 +399,24 @@ function hasNoOtherToolCalls(toolCalls, excludeName) {
 }
 
 // src/lib/session.ts
-async function resolvePrompt(prompt) {
-  if (typeof prompt === "function") {
-    return prompt();
-  }
-  return prompt;
-}
 var createSession = async ({
   threadId,
   agentName,
   maxTurns = 50,
   metadata = {},
   runAgent,
-  baseSystemPrompt,
-  instructionsPrompt,
+  threadOps,
   buildContextMessage,
-  buildFileTree = async () => "",
   subagents,
   tools = {},
   processToolsInParallel = true,
-  buildInTools = {},
   hooks = {}
 }) => {
-  const {
-    initializeThread,
-    appendHumanMessage,
-    parseToolCalls,
-    appendToolResult,
-    appendSystemMessage
-  } = workflow.proxyActivities({
-    startToCloseTimeout: "30m",
-    retry: {
-      maximumAttempts: 6,
-      initialInterval: "5s",
-      maximumInterval: "15m",
-      backoffCoefficient: 4
-    },
-    heartbeatTimeout: "5m"
-  });
-  const fileTree = await buildFileTree();
   const toolRouter = createToolRouter({
     tools,
+    appendToolResult: threadOps.appendToolResult,
     threadId,
     hooks,
-    buildInTools,
-    fileTree,
     subagents,
     parallel: processToolsInParallel
   });
@@ -544,83 +441,41 @@ var createSession = async ({
         });
       }
       stateManager.setTools(toolRouter.getToolDefinitions());
-      await initializeThread(threadId);
-      await appendSystemMessage(
-        threadId,
-        [
-          await resolvePrompt(baseSystemPrompt),
-          await resolvePrompt(instructionsPrompt)
-        ].join("\n")
-      );
-      await appendHumanMessage(threadId, await buildContextMessage());
+      await threadOps.initializeThread(threadId);
+      await threadOps.appendHumanMessage(threadId, await buildContextMessage());
       let exitReason = "completed";
       try {
         while (stateManager.isRunning() && !stateManager.isTerminal() && stateManager.getTurns() < maxTurns) {
           stateManager.incrementTurns();
           const currentTurn = stateManager.getTurns();
-          const { message, stopReason } = await runAgent({
+          const { message, rawToolCalls } = await runAgent({
             threadId,
             agentName,
             metadata
           });
-          if (stopReason === "end_turn") {
-            stateManager.complete();
-            exitReason = "completed";
-            return message;
-          }
-          if (!toolRouter.hasTools()) {
+          if (!toolRouter.hasTools() || rawToolCalls.length === 0) {
             stateManager.complete();
             exitReason = "completed";
             return message;
           }
-          const rawToolCalls = await parseToolCalls(message);
           const parsedToolCalls = [];
-          for (const tc of rawToolCalls.filter(
-            (tc2) => tc2.name !== "Task"
-          )) {
+          for (const tc of rawToolCalls) {
             try {
               parsedToolCalls.push(toolRouter.parseToolCall(tc));
             } catch (error) {
-              await appendToolResult({
+              await threadOps.appendToolResult({
                 threadId,
                 toolCallId: tc.id ?? "",
+                toolName: tc.name,
                 content: JSON.stringify({
                   error: `Invalid tool call for "${tc.name}": ${error instanceof Error ? error.message : String(error)}`
                 })
               });
             }
           }
-          const taskToolCalls = [];
-          if (subagents && subagents.length > 0) {
-            for (const tc of rawToolCalls.filter(
-              (tc2) => tc2.name === "Task"
-            )) {
-              try {
-                const parsedArgs = createTaskTool(subagents).schema.parse(
-                  tc.args
-                );
-                taskToolCalls.push({
-                  id: tc.id ?? "",
-                  name: tc.name,
-                  args: parsedArgs
-                });
-              } catch (error) {
-                await appendToolResult({
-                  threadId,
-                  toolCallId: tc.id ?? "",
-                  content: JSON.stringify({
-                    error: `Invalid tool call for "Task": ${error instanceof Error ? error.message : String(error)}`
-                  })
-                });
-              }
-            }
-          }
-          await toolRouter.processToolCalls(
-            [...parsedToolCalls, ...taskToolCalls],
-            {
-              turn: currentTurn
-            }
-          );
+          await toolRouter.processToolCalls(parsedToolCalls, {
+            turn: currentTurn
+          });
           if (stateManager.getStatus() === "WAITING_FOR_INPUT") {
             exitReason = "waiting_for_input";
             break;
@@ -639,6 +494,25 @@ var createSession = async ({
     }
   };
 };
+function proxyDefaultThreadOps(options) {
+  const activities = workflow.proxyActivities(
+    options ?? {
+      startToCloseTimeout: "30m",
+      retry: {
+        maximumAttempts: 6,
+        initialInterval: "5s",
+        maximumInterval: "15m",
+        backoffCoefficient: 4
+      },
+      heartbeatTimeout: "5m"
+    }
+  );
+  return {
+    initializeThread: activities.initializeThread,
+    appendHumanMessage: activities.appendHumanMessage,
+    appendToolResult: activities.appendToolResult
+  };
+}
 
 // src/lib/types.ts
 function isTerminalStatus(status) {
@@ -741,7 +615,7 @@ function createAgentStateManager(initialState) {
       tools = newTools.map((tool) => ({
         name: tool.name,
         description: tool.description,
-        schema: z5.z.toJSONSchema(tool.schema),
+        schema: z3.z.toJSONSchema(tool.schema),
         strict: tool.strict,
         max_uses: tool.max_uses
       }));
@@ -775,18 +649,18 @@ Usage notes:
 * Use multiSelect: true to allow multiple answers to be selected for a question
 * If you recommend a specific option, make that the first option in the list and add "(Recommended)" at the end of the label
 `,
-  schema: z5__default.default.object({
-    questions: z5__default.default.array(
-      z5__default.default.object({
-        question: z5__default.default.string().describe("The full question text to display"),
-        header: z5__default.default.string().describe("Short label for the question (max 12 characters)"),
-        options: z5__default.default.array(
-          z5__default.default.object({
-            label: z5__default.default.string(),
-            description: z5__default.default.string()
+  schema: z3__default.default.object({
+    questions: z3__default.default.array(
+      z3__default.default.object({
+        question: z3__default.default.string().describe("The full question text to display"),
+        header: z3__default.default.string().describe("Short label for the question (max 12 characters)"),
+        options: z3__default.default.array(
+          z3__default.default.object({
+            label: z3__default.default.string(),
+            description: z3__default.default.string()
           })
         ).min(0).max(4).describe("Array of 0-4 choices, each with label and description"),
-        multiSelect: z5__default.default.boolean().describe("If true, users can select multiple options")
+        multiSelect: z3__default.default.boolean().describe("If true, users can select multiple options")
       })
     )
   }),
@@ -806,9 +680,9 @@ Examples:
 - "**/*.test.ts" - Find all test files recursively
 - "src/**/*.ts" - Find all TypeScript files in src directory
 `,
-  schema: z5.z.object({
-    pattern: z5.z.string().describe("Glob pattern to match files against"),
-    root: z5.z.string().optional().describe("Optional root directory to search from")
+  schema: z3.z.object({
+    pattern: z3.z.string().describe("Glob pattern to match files against"),
+    root: z3.z.string().optional().describe("Optional root directory to search from")
   }),
   strict: true
 };
@@ -826,13 +700,13 @@ Examples:
 - Search for function definitions with "function.*handleClick"
 - Search case-insensitively with ignoreCase: true
 `,
-  schema: z5.z.object({
-    pattern: z5.z.string().describe("Regex pattern to search for in file contents"),
-    ignoreCase: z5.z.boolean().optional().describe("Case-insensitive search (default: false)"),
-    maxMatches: z5.z.number().optional().describe("Maximum number of matches to return (default: 50)"),
-    includePatterns: z5.z.array(z5.z.string()).optional().describe("Glob patterns to include (e.g., ['*.ts', '*.js'])"),
-    excludePatterns: z5.z.array(z5.z.string()).optional().describe("Glob patterns to exclude (e.g., ['*.test.ts'])"),
-    contextLines: z5.z.number().optional().describe("Number of context lines to show around matches")
+  schema: z3.z.object({
+    pattern: z3.z.string().describe("Regex pattern to search for in file contents"),
+    ignoreCase: z3.z.boolean().optional().describe("Case-insensitive search (default: false)"),
+    maxMatches: z3.z.number().optional().describe("Maximum number of matches to return (default: 50)"),
+    includePatterns: z3.z.array(z3.z.string()).optional().describe("Glob patterns to include (e.g., ['*.ts', '*.js'])"),
+    excludePatterns: z3.z.array(z3.z.string()).optional().describe("Glob patterns to exclude (e.g., ['*.test.ts'])"),
+    contextLines: z3.z.number().optional().describe("Number of context lines to show around matches")
   }),
   strict: true
 };
@@ -850,12 +724,12 @@ The tool returns the file content in an appropriate format:
 - Images: Base64-encoded image data
 - PDFs: Extracted text content
 `,
-  schema: z5.z.object({
-    path: z5.z.string().describe("Virtual path to the file to read"),
-    offset: z5.z.number().optional().describe(
+  schema: z3.z.object({
+    path: z3.z.string().describe("Virtual path to the file to read"),
+    offset: z3.z.number().optional().describe(
       "Line number to start reading from (1-indexed, for text files)"
     ),
-    limit: z5.z.number().optional().describe("Maximum number of lines to read (for text files)")
+    limit: z3.z.number().optional().describe("Maximum number of lines to read (for text files)")
   }),
   strict: true
 };
@@ -864,7 +738,7 @@ var writeTool = {
   description: `Create or overwrite a file with new content.
 
 Usage:
-- Provide the absolute virtual path to the file
+- Provide the absolute path to the file
 - The file will be created if it doesn't exist
 - If the file exists, it will be completely overwritten
 
@@ -873,9 +747,9 @@ IMPORTANT:
 - This is an atomic write operation - the entire file is replaced
 - Path must be absolute (e.g., "/docs/readme.md", not "docs/readme.md")
 `,
-  schema: z5.z.object({
-    file_path: z5.z.string().describe("The absolute virtual path to the file to write"),
-    content: z5.z.string().describe("The content to write to the file")
+  schema: z3.z.object({
+    file_path: z3.z.string().describe("The absolute path to the file to write"),
+    content: z3.z.string().describe("The content to write to the file")
   }),
   strict: true
 };
@@ -895,18 +769,72 @@ IMPORTANT:
 - The operation fails if old_string is not found
 - old_string and new_string must be different
 `,
-  schema: z5.z.object({
-    file_path: z5.z.string().describe("The absolute virtual path to the file to modify"),
-    old_string: z5.z.string().describe("The exact text to replace"),
-    new_string: z5.z.string().describe(
+  schema: z3.z.object({
+    file_path: z3.z.string().describe("The absolute virtual path to the file to modify"),
+    old_string: z3.z.string().describe("The exact text to replace"),
+    new_string: z3.z.string().describe(
       "The text to replace it with (must be different from old_string)"
     ),
-    replace_all: z5.z.boolean().optional().describe(
+    replace_all: z3.z.boolean().optional().describe(
       "If true, replace all occurrences of old_string (default: false)"
     )
   }),
   strict: true
 };
+var taskCreateTool = {
+  name: "TaskCreate",
+  description: `Use this tool to create a structured task list for the control test. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
+  It also helps the user understand the progress of the task and overall progress of their requests.
+  
+  ## When to Use This Tool
+  
+  Use this tool proactively in these scenarios:
+  
+  - Complex multi-step tasks - When a task requires 3 or more distinct steps or actions
+  - Non-trivial and complex tasks - Tasks that require careful planning or multiple operations
+  - User explicitly requests todo list - When the user directly asks you to use the todo list
+  - User provides multiple tasks - When users provide a list of things to be done (numbered or comma-separated)
+  - After receiving new instructions - Immediately capture user requirements as tasks
+  - When you start working on a task - Mark it as in_progress BEFORE beginning work
+  - After completing a task - Mark it as completed and add any new follow-up tasks discovered during implementation
+  
+  ## When NOT to Use This Tool
+  
+  Skip using this tool when:
+  - There is only a single, straightforward task
+  - The task is trivial and tracking it provides no organizational benefit
+  - The task can be completed in less than 3 trivial steps
+  - The task is purely conversational or informational
+  
+  NOTE that you should not use this tool if there is only one trivial task to do. In this case you are better off just doing the task directly.
+  
+  ## Task Fields
+  
+  - **subject**: A brief, actionable title in imperative form (e.g., "Fix authentication bug in login flow")
+  - **description**: Detailed description of what needs to be done, including context and acceptance criteria
+  - **activeForm**: Present continuous form shown in spinner when task is in_progress (e.g., "Fixing authentication bug"). This is displayed to the user while you work on the task.
+  
+  **IMPORTANT**: Always provide activeForm when creating tasks. The subject should be imperative ("Run tests") while activeForm should be present continuous ("Running tests"). All tasks are created with status \`pending\`.
+  
+  ## Tips
+  
+  - Create tasks with clear, specific subjects that describe the outcome
+  - Include enough detail in the description for another agent to understand and complete the task
+  - After creating tasks, use TaskUpdate to set up dependencies (blocks/blockedBy) if needed
+  - Check TaskList first to avoid creating duplicate tasks`,
+  schema: z3__default.default.object({
+    subject: z3__default.default.string().describe(
+      'A brief, actionable title in imperative form (e.g., "Fix authentication bug in login flow")'
+    ),
+    description: z3__default.default.string().describe(
+      "Detailed description of what needs to be done, including context and acceptance criteria"
+    ),
+    activeForm: z3__default.default.string().describe(
+      'Present continuous form shown in spinner when task is in_progress (e.g., "Fixing authentication bug"). This is displayed to the user while you work on the task.'
+    ),
+    metadata: z3__default.default.record(z3__default.default.string(), z3__default.default.string()).describe("Arbitrary key-value pairs for tracking")
+  })
+};
 function createTaskCreateHandler(stateManager) {
   return (args) => {
     const task = {
@@ -929,8 +857,8 @@ function createTaskCreateHandler(stateManager) {
 var taskGetTool = {
   name: "TaskGet",
   description: `Retrieve full task details including dependencies.`,
-  schema: z5__default.default.object({
-    taskId: z5__default.default.string().describe("The ID of the task to get")
+  schema: z3__default.default.object({
+    taskId: z3__default.default.string().describe("The ID of the task to get")
   })
 };
 
@@ -953,12 +881,12 @@ function createTaskGetHandler(stateManager) {
 var taskListTool = {
   name: "TaskList",
   description: `List all tasks with current state.`,
-  schema: z5__default.default.object({})
+  schema: z3__default.default.object({})
 };
 
 // src/tools/task-list/handler.ts
 function createTaskListHandler(stateManager) {
-  return (_args) => {
+  return () => {
     const taskList = stateManager.getTasks();
     return {
       toolResponse: JSON.stringify(taskList, null, 2),
@@ -969,11 +897,11 @@ function createTaskListHandler(stateManager) {
 var taskUpdateTool = {
   name: "TaskUpdate",
   description: `Update status, add blockers, modify details.`,
-  schema: z5__default.default.object({
-    taskId: z5__default.default.string().describe("The ID of the task to get"),
-    status: z5__default.default.enum(["pending", "in_progress", "completed"]).describe("The status of the task"),
-    addBlockedBy: z5__default.default.array(z5__default.default.string()).describe("The IDs of the tasks that are blocking this task"),
-    addBlocks: z5__default.default.array(z5__default.default.string()).describe("The IDs of the tasks that this task is blocking")
+  schema: z3__default.default.object({
+    taskId: z3__default.default.string().describe("The ID of the task to get"),
+    status: z3__default.default.enum(["pending", "in_progress", "completed"]).describe("The status of the task"),
+    addBlockedBy: z3__default.default.array(z3__default.default.string()).describe("The IDs of the tasks that are blocking this task"),
+    addBlocks: z3__default.default.array(z3__default.default.string()).describe("The IDs of the tasks that this task is blocking")
   })
 };
 
@@ -1021,6 +949,33 @@ function createTaskUpdateHandler(stateManager) {
     };
   };
 }
+var createBashToolDescription = ({
+  fileTree
+}) => `Execute shell commands in a bash environment.
+
+Use this tool to:
+- Run shell commands (ls, cat, grep, find, etc.)
+- Execute scripts and chain commands with pipes (|) or logical operators (&&, ||)
+- Inspect files and directories
+
+Current file tree:
+${fileTree}`;
+var bashTool = {
+  name: "Bash",
+  description: `Execute shell commands in a sandboxed bash environment.
+
+Use this tool to:
+- Run shell commands (ls, cat, grep, find, etc.)
+- Execute scripts and chain commands with pipes (|) or logical operators (&&, ||)
+- Inspect files and directories
+`,
+  schema: z3__default.default.object({
+    command: z3__default.default.string().describe(
+      "The bash command to execute. Can include pipes (|), redirects (>, >>), logical operators (&&, ||), and shell features like command substitution $(...)."
+    )
+  }),
+  strict: true
+};
 
 // node_modules/uuid/dist/esm-node/stringify.js
 var byteToHex = [];
@@ -1069,25 +1024,33 @@ function getThreadKey(threadId, key) {
   return `thread:${threadId}:${key}`;
 }
 function createThreadManager(config) {
-  const { redis, threadId, key = "messages" } = config;
+  const {
+    redis,
+    threadId,
+    key = "messages",
+    serialize = (m) => JSON.stringify(m),
+    deserialize = (raw) => JSON.parse(raw)
+  } = config;
   const redisKey = getThreadKey(threadId, key);
-  return {
+  const base = {
     async initialize() {
       await redis.del(redisKey);
     },
     async load() {
       const data = await redis.lrange(redisKey, 0, -1);
-      return data.map((item) => JSON.parse(item));
+      return data.map(deserialize);
     },
     async append(messages) {
       if (messages.length > 0) {
-        await redis.rpush(redisKey, ...messages.map((m) => JSON.stringify(m)));
+        await redis.rpush(redisKey, ...messages.map(serialize));
         await redis.expire(redisKey, THREAD_TTL_SECONDS);
       }
     },
     async delete() {
       await redis.del(redisKey);
-    },
+    }
+  };
+  const helpers = {
     createHumanMessage(content) {
       return new messages.HumanMessage({
         id: v4_default(),
@@ -1107,40 +1070,29 @@ function createThreadManager(config) {
     },
     createToolMessage(content, toolCallId) {
       return new messages.ToolMessage({
-        // Cast needed due to langchain type compatibility
         content,
         tool_call_id: toolCallId
       }).toDict();
     },
-    createSystemMessage(content) {
-      return new messages.SystemMessage({
-        content
-      }).toDict();
-    },
-    async appendSystemMessage(content) {
-      const message = this.createSystemMessage(content);
-      await this.append([message]);
-    },
     async appendHumanMessage(content) {
-      const message = this.createHumanMessage(content);
-      await this.append([message]);
+      const message = helpers.createHumanMessage(content);
+      await base.append([message]);
     },
     async appendToolMessage(content, toolCallId) {
-      const message = this.createToolMessage(content, toolCallId);
-      await this.append([message]);
+      const message = helpers.createToolMessage(content, toolCallId);
+      await base.append([message]);
     },
     async appendAIMessage(content) {
-      const message = this.createAIMessage(content);
-      await this.append([message]);
+      const message = helpers.createAIMessage(content);
+      await base.append([message]);
     }
   };
+  return Object.assign(base, helpers);
 }
+
+// src/activities.ts
 function createSharedActivities(redis) {
   return {
-    async appendSystemMessage(threadId, content) {
-      const thread = createThreadManager({ redis, threadId });
-      await thread.appendSystemMessage(content);
-    },
     async appendToolResult(config) {
       const { threadId, toolCallId, content } = config;
       const thread = createThreadManager({ redis, threadId });
@@ -1157,15 +1109,6 @@ function createSharedActivities(redis) {
     async appendHumanMessage(threadId, content) {
       const thread = createThreadManager({ redis, threadId });
       await thread.appendHumanMessage(content);
-    },
-    async parseToolCalls(storedMessage) {
-      const message = messages.mapStoredMessageToChatMessage(storedMessage);
-      const toolCalls = message.tool_calls ?? [];
-      return toolCalls.map((toolCall) => ({
-        id: toolCall.id,
-        name: toolCall.name,
-        args: toolCall.args
-      }));
     }
   };
 }
@@ -1203,9 +1146,14 @@ async function invokeModel({
     }
   );
   await thread.append([response.toDict()]);
+  const toolCalls = response.tool_calls ?? [];
   return {
     message: response.toDict(),
-    stopReason: response.response_metadata?.stop_reason ?? null,
+    rawToolCalls: toolCalls.map((tc) => ({
+      id: tc.id,
+      name: tc.name,
+      args: tc.args
+    })),
     usage: {
       input_tokens: response.usage_metadata?.input_tokens,
       output_tokens: response.usage_metadata?.output_tokens,
@@ -1213,7 +1161,7 @@ async function invokeModel({
     }
   };
 }
-var handleAskUserQuestionToolResult = async (args) => {
+var createAskUserQuestionHandler = () => async (args) => {
   const messages$1 = args.questions.map(
     ({ question, header, options, multiSelect }) => new messages.AIMessage({
       content: question,
@@ -1226,99 +1174,79 @@ var handleAskUserQuestionToolResult = async (args) => {
   );
   return { toolResponse: "Question submitted", data: { chatMessages: messages$1 } };
 };
-async function globHandler(_args, fs) {
-  new justBash.Bash({ fs });
-  return Promise.resolve({
-    toolResponse: "Hello, world!",
-    data: { files: [] }
-  });
+function createGlobHandler(fs) {
+  return async (_args) => {
+    new justBash.Bash({ fs });
+    return {
+      toolResponse: "Hello, world!",
+      data: { files: [] }
+    };
+  };
 }
 
 // src/tools/edit/handler.ts
 function escapeRegExp(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-async function editHandler(args, fs) {
-  const { file_path, old_string, new_string, replace_all = false } = args;
-  if (old_string === new_string) {
-    return {
-      toolResponse: `Error: old_string and new_string must be different.`,
-      data: {
-        path: file_path,
-        success: false,
-        replacements: 0
-      }
-    };
-  }
-  try {
-    const exists = await fs.exists(file_path);
-    if (!exists) {
+function createEditHandler(fs) {
+  return async (args) => {
+    const { file_path, old_string, new_string, replace_all = false } = args;
+    if (old_string === new_string) {
       return {
-        toolResponse: `Error: File "${file_path}" does not exist.`,
-        data: {
-          path: file_path,
-          success: false,
-          replacements: 0
-        }
+        toolResponse: `Error: old_string and new_string must be different.`,
+        data: { path: file_path, success: false, replacements: 0 }
       };
     }
-    const content = await fs.readFile(file_path);
-    if (!content.includes(old_string)) {
+    try {
+      const exists = await fs.exists(file_path);
+      if (!exists) {
+        return {
+          toolResponse: `Error: File "${file_path}" does not exist.`,
+          data: { path: file_path, success: false, replacements: 0 }
+        };
+      }
+      const content = await fs.readFile(file_path);
+      if (!content.includes(old_string)) {
+        return {
+          toolResponse: `Error: Could not find the specified text in "${file_path}". Make sure old_string matches exactly (whitespace-sensitive).`,
+          data: { path: file_path, success: false, replacements: 0 }
+        };
+      }
+      const escapedOldString = escapeRegExp(old_string);
+      const globalRegex = new RegExp(escapedOldString, "g");
+      const occurrences = (content.match(globalRegex) || []).length;
+      if (!replace_all && occurrences > 1) {
+        return {
+          toolResponse: `Error: old_string appears ${occurrences} times in "${file_path}". Either provide more context to make it unique, or use replace_all: true.`,
+          data: { path: file_path, success: false, replacements: 0 }
+        };
+      }
+      let newContent;
+      let replacements;
+      if (replace_all) {
+        newContent = content.split(old_string).join(new_string);
+        replacements = occurrences;
+      } else {
+        const index = content.indexOf(old_string);
+        newContent = content.slice(0, index) + new_string + content.slice(index + old_string.length);
+        replacements = 1;
+      }
+      await fs.writeFile(file_path, newContent);
+      const summary = replace_all ? `Replaced ${replacements} occurrence(s)` : `Replaced 1 occurrence`;
       return {
-        toolResponse: `Error: Could not find the specified text in "${file_path}". Make sure old_string matches exactly (whitespace-sensitive).`,
-        data: {
-          path: file_path,
-          success: false,
-          replacements: 0
-        }
+        toolResponse: `${summary} in ${file_path}`,
+        data: { path: file_path, success: true, replacements }
       };
-    }
-    const escapedOldString = escapeRegExp(old_string);
-    const globalRegex = new RegExp(escapedOldString, "g");
-    const occurrences = (content.match(globalRegex) || []).length;
-    if (!replace_all && occurrences > 1) {
+    } catch (error) {
+      const message = error instanceof Error ? error.message : "Unknown error";
       return {
-        toolResponse: `Error: old_string appears ${occurrences} times in "${file_path}". Either provide more context to make it unique, or use replace_all: true.`,
-        data: {
-          path: file_path,
-          success: false,
-          replacements: 0
-        }
+        toolResponse: `Error editing file "${file_path}": ${message}`,
+        data: { path: file_path, success: false, replacements: 0 }
       };
     }
-    let newContent;
-    let replacements;
-    if (replace_all) {
-      newContent = content.split(old_string).join(new_string);
-      replacements = occurrences;
-    } else {
-      const index = content.indexOf(old_string);
-      newContent = content.slice(0, index) + new_string + content.slice(index + old_string.length);
-      replacements = 1;
-    }
-    await fs.writeFile(file_path, newContent);
-    const summary = replace_all ? `Replaced ${replacements} occurrence(s)` : `Replaced 1 occurrence`;
-    return {
-      toolResponse: `${summary} in ${file_path}`,
-      data: {
-        path: file_path,
-        success: true,
-        replacements
-      }
-    };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "Unknown error";
-    return {
-      toolResponse: `Error editing file "${file_path}": ${message}`,
-      data: {
-        path: file_path,
-        success: false,
-        replacements: 0
-      }
-    };
-  }
+  };
 }
-var handleBashTool = (bashOptions) => async (args, _context) => {
+var createBashHandler = (bashOptions) => async (args, _context) => {
   const { command } = args;
   const mergedOptions = {
     ...bashOptions,
@@ -1420,34 +1348,37 @@ exports.ZeitlichPlugin = ZeitlichPlugin;
 exports.askUserQuestionTool = askUserQuestionTool;
 exports.bashTool = bashTool;
 exports.createAgentStateManager = createAgentStateManager;
+exports.createAskUserQuestionHandler = createAskUserQuestionHandler;
+exports.createBashHandler = createBashHandler;
+exports.createBashToolDescription = createBashToolDescription;
+exports.createEditHandler = createEditHandler;
+exports.createGlobHandler = createGlobHandler;
 exports.createSession = createSession;
 exports.createSharedActivities = createSharedActivities;
+exports.createSubagentTool = createSubagentTool;
 exports.createTaskCreateHandler = createTaskCreateHandler;
 exports.createTaskGetHandler = createTaskGetHandler;
 exports.createTaskListHandler = createTaskListHandler;
-exports.createTaskTool = createTaskTool;
 exports.createTaskUpdateHandler = createTaskUpdateHandler;
 exports.createThreadManager = createThreadManager;
 exports.createToolRouter = createToolRouter;
 exports.defineSubagent = defineSubagent;
 exports.defineTool = defineTool;
-exports.editHandler = editHandler;
 exports.editTool = editTool;
 exports.getStateQuery = getStateQuery;
-exports.globHandler = globHandler;
 exports.globTool = globTool;
 exports.grepTool = grepTool;
-exports.handleAskUserQuestionToolResult = handleAskUserQuestionToolResult;
-exports.handleBashTool = handleBashTool;
 exports.hasNoOtherToolCalls = hasNoOtherToolCalls;
 exports.invokeModel = invokeModel;
 exports.isTerminalStatus = isTerminalStatus;
+exports.proxyDefaultThreadOps = proxyDefaultThreadOps;
 exports.readTool = readTool;
 exports.taskCreateTool = taskCreateTool;
 exports.taskGetTool = taskGetTool;
 exports.taskListTool = taskListTool;
 exports.taskUpdateTool = taskUpdateTool;
 exports.toTree = toTree;
+exports.withAutoAppend = withAutoAppend;
 exports.writeTool = writeTool;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map