zeitlich 0.2.6 → 0.2.8

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var workflow = require('@temporalio/workflow');
-var z3 = require('zod');
+var z13 = require('zod');
 var plugin = require('@temporalio/plugin');
 var messages = require('@langchain/core/messages');
 var crypto = require('crypto');
@@ -10,7 +10,7 @@ var justBash = require('just-bash');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var z3__default = /*#__PURE__*/_interopDefault(z3);
+var z13__default = /*#__PURE__*/_interopDefault(z13);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 
 // src/lib/session.ts
@@ -46,10 +46,10 @@ function createSubagentTool(subagents) {
   return {
     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")
+    schema: z13__default.default.object({
+      subagent: z13__default.default.enum(names).describe("The type of subagent to launch"),
+      description: z13__default.default.string().describe("A short (3-5 word) description of the task"),
+      prompt: z13__default.default.string().describe("The task for the agent to perform")
     })
   };
 }
@@ -72,11 +72,12 @@ function createSubagentHandler(subagents) {
       args: [input],
       taskQueue: config.taskQueue ?? parentTaskQueue
     };
-    const { toolResponse, data } = typeof config.workflow === "string" ? await workflow.executeChild(config.workflow, childOpts) : await workflow.executeChild(config.workflow, childOpts);
+    const { toolResponse, data, usage } = 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: validated
+      data: validated,
+      ...usage && { usage }
     };
   };
 }
@@ -88,20 +89,17 @@ function createToolRouter(options) {
   for (const [_key, tool] of Object.entries(options.tools)) {
     toolMap.set(tool.name, tool);
   }
-  const isEnabled = (tool) => tool.enabled !== false;
+  const isEnabled = (tool) => tool.enabled?.() ?? true;
   if (options.subagents) {
-    const enabledSubagents = options.subagents.filter(
-      (s) => s.enabled !== false
-    );
-    if (enabledSubagents.length > 0) {
+    if (options.subagents.length > 0) {
       const subagentHooksMap = /* @__PURE__ */ new Map();
-      for (const s of enabledSubagents) {
+      for (const s of options.subagents) {
         if (s.hooks) subagentHooksMap.set(s.agentName, s.hooks);
       }
       const resolveSubagentName = (args) => args.subagent;
       toolMap.set("Subagent", {
-        ...createSubagentTool(enabledSubagents),
-        handler: createSubagentHandler(enabledSubagents),
+        ...createSubagentTool(options.subagents),
+        handler: createSubagentHandler(options.subagents),
         ...subagentHooksMap.size > 0 && {
           hooks: {
             onPreToolUse: async (ctx) => {
@@ -411,6 +409,7 @@ function hasNoOtherToolCalls(toolCalls, excludeName) {
 var createSession = async ({
   threadId,
   agentName,
+  description,
   maxTurns = 50,
   metadata = {},
   runAgent,
@@ -421,7 +420,8 @@ var createSession = async ({
   processToolsInParallel = true,
   hooks = {},
   appendSystemPrompt = true,
-  systemPrompt
+  systemPrompt,
+  waitForInputTimeout = "48h"
 }) => {
   const {
     appendToolResult,
@@ -449,7 +449,28 @@ var createSession = async ({
     }
   };
   return {
-    runSession: async ({ stateManager }) => {
+    runSession: async ({
+      stateManager
+    }) => {
+      workflow.setHandler(
+        workflow.defineUpdate(`add${agentName}Message`),
+        async (message) => {
+          if (hooks.onPreHumanMessageAppend) {
+            await hooks.onPreHumanMessageAppend({
+              message,
+              threadId
+            });
+          }
+          await appendHumanMessage(threadId, message);
+          if (hooks.onPostHumanMessageAppend) {
+            await hooks.onPostHumanMessageAppend({
+              message,
+              threadId
+            });
+          }
+          stateManager.run();
+        }
+      );
       if (hooks.onSessionStart) {
         await hooks.onSessionStart({
           threadId,
@@ -457,7 +478,6 @@ var createSession = async ({
           metadata
         });
       }
-      stateManager.setTools(toolRouter.getToolDefinitions());
       await initializeThread(threadId);
       if (appendSystemPrompt && systemPrompt && systemPrompt.trim() !== "") {
         await appendSystemMessage(threadId, systemPrompt);
@@ -468,15 +488,25 @@ var createSession = async ({
         while (stateManager.isRunning() && !stateManager.isTerminal() && stateManager.getTurns() < maxTurns) {
           stateManager.incrementTurns();
           const currentTurn = stateManager.getTurns();
-          const { message, rawToolCalls } = await runAgent({
+          stateManager.setTools(toolRouter.getToolDefinitions());
+          const { message, rawToolCalls, usage } = await runAgent({
             threadId,
             agentName,
-            metadata
+            metadata,
+            systemPrompt,
+            description
           });
+          if (usage) {
+            stateManager.updateUsage(usage);
+          }
           if (!toolRouter.hasTools() || rawToolCalls.length === 0) {
             stateManager.complete();
             exitReason = "completed";
-            return message;
+            return {
+              finalMessage: message,
+              exitReason,
+              usage: stateManager.getTotalUsage()
+            };
           }
           const parsedToolCalls = [];
           for (const tc of rawToolCalls) {
@@ -493,12 +523,27 @@ var createSession = async ({
               });
             }
           }
-          await toolRouter.processToolCalls(parsedToolCalls, {
-            turn: currentTurn
-          });
+          const toolCallResults = await toolRouter.processToolCalls(
+            parsedToolCalls,
+            {
+              turn: currentTurn
+            }
+          );
+          for (const result of toolCallResults) {
+            if (result.usage) {
+              stateManager.updateUsage(result.usage);
+            }
+          }
           if (stateManager.getStatus() === "WAITING_FOR_INPUT") {
-            exitReason = "waiting_for_input";
-            break;
+            const conditionMet = await workflow.condition(
+              () => stateManager.getStatus() === "RUNNING",
+              waitForInputTimeout
+            );
+            if (!conditionMet) {
+              stateManager.cancel();
+              await workflow.condition(() => false, "2s");
+              break;
+            }
           }
         }
         if (stateManager.getTurns() >= maxTurns && stateManager.isRunning()) {
@@ -510,7 +555,11 @@ var createSession = async ({
       } finally {
         await callSessionEnd(exitReason, stateManager.getTurns());
       }
-      return null;
+      return {
+        finalMessage: null,
+        exitReason,
+        usage: stateManager.getTotalUsage()
+      };
     }
   };
 };
@@ -539,12 +588,19 @@ function proxyDefaultThreadOps(options) {
 function isTerminalStatus(status) {
   return status === "COMPLETED" || status === "FAILED" || status === "CANCELLED";
 }
-var getStateQuery = workflow.defineQuery("getState");
-function createAgentStateManager(initialState) {
+function createAgentStateManager({
+  initialState,
+  agentConfig
+}) {
   let status = initialState?.status ?? "RUNNING";
   let version = initialState?.version ?? 0;
   let turns = initialState?.turns ?? 0;
   let tools = initialState?.tools ?? [];
+  let totalInputTokens = 0;
+  let totalOutputTokens = 0;
+  let totalCachedWriteTokens = 0;
+  let totalCachedReadTokens = 0;
+  let totalReasonTokens = 0;
   const tasks = new Map(initialState?.tasks);
   const {
     status: _,
@@ -564,9 +620,21 @@ function createAgentStateManager(initialState) {
       ...customState
     };
   }
-  workflow.setHandler(getStateQuery, () => {
+  workflow.setHandler(workflow.defineQuery(`get${agentConfig.agentName}State`), () => {
     return buildState();
   });
+  workflow.setHandler(
+    workflow.defineUpdate(
+      `waitFor${agentConfig.agentName}StateChange`
+    ),
+    async (lastKnownVersion) => {
+      await workflow.condition(
+        () => version > lastKnownVersion || isTerminalStatus(status),
+        "55s"
+      );
+      return buildState();
+    }
+  );
   return {
     getStatus() {
       return status;
@@ -636,7 +704,7 @@ function createAgentStateManager(initialState) {
       tools = newTools.map((tool) => ({
         name: tool.name,
         description: tool.description,
-        schema: z3.z.toJSONSchema(tool.schema),
+        schema: z13.z.toJSONSchema(tool.schema),
         strict: tool.strict,
         max_uses: tool.max_uses
       }));
@@ -647,6 +715,23 @@ function createAgentStateManager(initialState) {
         version++;
       }
       return deleted;
+    },
+    updateUsage(usage) {
+      totalInputTokens += usage.inputTokens ?? 0;
+      totalOutputTokens += usage.outputTokens ?? 0;
+      totalCachedWriteTokens += usage.cachedWriteTokens ?? 0;
+      totalCachedReadTokens += usage.cachedReadTokens ?? 0;
+      totalReasonTokens += usage.reasonTokens ?? 0;
+    },
+    getTotalUsage() {
+      return {
+        totalInputTokens,
+        totalOutputTokens,
+        totalCachedWriteTokens,
+        totalCachedReadTokens,
+        totalReasonTokens,
+        turns
+      };
     }
   };
 }
@@ -655,38 +740,6 @@ var AGENT_HANDLER_NAMES = {
   waitForStateChange: "waitForStateChange",
   addMessage: "addMessage"
 };
-var askUserQuestionTool = {
-  name: "AskUserQuestion",
-  description: `Use this tool when you need to ask the user questions during execution. This allows you to:
-
-1. Gather user preferences or requirements
-2. Clarify ambiguous instructions
-3. Get decisions on implementation choices as you work
-4. Offer choices to the user about what direction to take.
-
-Usage notes:
-
-* Users will always be able to select "Other" to provide custom text input
-* 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: 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: z3__default.default.boolean().describe("If true, users can select multiple options")
-      })
-    )
-  }),
-  strict: true
-};
 var globTool = {
   name: "Glob",
   description: `Search for files matching a glob pattern within the available file system.
@@ -701,9 +754,9 @@ Examples:
 - "**/*.test.ts" - Find all test files recursively
 - "src/**/*.ts" - Find all TypeScript files in src directory
 `,
-  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")
+  schema: z13.z.object({
+    pattern: z13.z.string().describe("Glob pattern to match files against"),
+    root: z13.z.string().optional().describe("Optional root directory to search from")
   }),
   strict: true
 };
@@ -721,13 +774,13 @@ Examples:
 - Search for function definitions with "function.*handleClick"
 - Search case-insensitively with ignoreCase: true
 `,
-  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")
+  schema: z13.z.object({
+    pattern: z13.z.string().describe("Regex pattern to search for in file contents"),
+    ignoreCase: z13.z.boolean().optional().describe("Case-insensitive search (default: false)"),
+    maxMatches: z13.z.number().optional().describe("Maximum number of matches to return (default: 50)"),
+    includePatterns: z13.z.array(z13.z.string()).optional().describe("Glob patterns to include (e.g., ['*.ts', '*.js'])"),
+    excludePatterns: z13.z.array(z13.z.string()).optional().describe("Glob patterns to exclude (e.g., ['*.test.ts'])"),
+    contextLines: z13.z.number().optional().describe("Number of context lines to show around matches")
   }),
   strict: true
 };
@@ -745,12 +798,12 @@ The tool returns the file content in an appropriate format:
 - Images: Base64-encoded image data
 - PDFs: Extracted text content
 `,
-  schema: z3.z.object({
-    path: z3.z.string().describe("Virtual path to the file to read"),
-    offset: z3.z.number().optional().describe(
+  schema: z13.z.object({
+    path: z13.z.string().describe("Virtual path to the file to read"),
+    offset: z13.z.number().optional().describe(
       "Line number to start reading from (1-indexed, for text files)"
     ),
-    limit: z3.z.number().optional().describe("Maximum number of lines to read (for text files)")
+    limit: z13.z.number().optional().describe("Maximum number of lines to read (for text files)")
   }),
   strict: true
 };
@@ -768,9 +821,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: 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")
+  schema: z13.z.object({
+    file_path: z13.z.string().describe("The absolute path to the file to write"),
+    content: z13.z.string().describe("The content to write to the file")
   }),
   strict: true
 };
@@ -790,13 +843,13 @@ IMPORTANT:
 - The operation fails if old_string is not found
 - old_string and new_string must be different
 `,
-  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(
+  schema: z13.z.object({
+    file_path: z13.z.string().describe("The absolute virtual path to the file to modify"),
+    old_string: z13.z.string().describe("The exact text to replace"),
+    new_string: z13.z.string().describe(
       "The text to replace it with (must be different from old_string)"
     ),
-    replace_all: z3.z.boolean().optional().describe(
+    replace_all: z13.z.boolean().optional().describe(
       "If true, replace all occurrences of old_string (default: false)"
     )
   }),
@@ -843,17 +896,17 @@ var taskCreateTool = {
   - 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(
+  schema: z13__default.default.object({
+    subject: z13__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(
+    description: z13__default.default.string().describe(
       "Detailed description of what needs to be done, including context and acceptance criteria"
     ),
-    activeForm: z3__default.default.string().describe(
+    activeForm: z13__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")
+    metadata: z13__default.default.record(z13__default.default.string(), z13__default.default.string()).describe("Arbitrary key-value pairs for tracking")
   })
 };
 function createTaskCreateHandler(stateManager) {
@@ -878,8 +931,8 @@ function createTaskCreateHandler(stateManager) {
 var taskGetTool = {
   name: "TaskGet",
   description: `Retrieve full task details including dependencies.`,
-  schema: z3__default.default.object({
-    taskId: z3__default.default.string().describe("The ID of the task to get")
+  schema: z13__default.default.object({
+    taskId: z13__default.default.string().describe("The ID of the task to get")
   })
 };
 
@@ -902,7 +955,7 @@ function createTaskGetHandler(stateManager) {
 var taskListTool = {
   name: "TaskList",
   description: `List all tasks with current state.`,
-  schema: z3__default.default.object({})
+  schema: z13__default.default.object({})
 };
 
 // src/tools/task-list/handler.ts
@@ -918,11 +971,11 @@ function createTaskListHandler(stateManager) {
 var taskUpdateTool = {
   name: "TaskUpdate",
   description: `Update status, add blockers, modify details.`,
-  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")
+  schema: z13__default.default.object({
+    taskId: z13__default.default.string().describe("The ID of the task to get"),
+    status: z13__default.default.enum(["pending", "in_progress", "completed"]).describe("The status of the task"),
+    addBlockedBy: z13__default.default.array(z13__default.default.string()).describe("The IDs of the tasks that are blocking this task"),
+    addBlocks: z13__default.default.array(z13__default.default.string()).describe("The IDs of the tasks that this task is blocking")
   })
 };
 
@@ -990,13 +1043,53 @@ Use this tool to:
 - 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(
+  schema: z13__default.default.object({
+    command: z13__default.default.string().describe(
       "The bash command to execute. Can include pipes (|), redirects (>, >>), logical operators (&&, ||), and shell features like command substitution $(...)."
     )
   }),
   strict: true
 };
+var askUserQuestionTool = {
+  name: "AskUserQuestion",
+  description: `Use this tool when you need to ask the user questions during execution. This allows you to:
+
+1. Gather user preferences or requirements
+2. Clarify ambiguous instructions
+3. Get decisions on implementation choices as you work
+4. Offer choices to the user about what direction to take.
+
+Usage notes:
+
+* Users will always be able to select "Other" to provide custom text input
+* 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: z13__default.default.object({
+    questions: z13__default.default.array(
+      z13__default.default.object({
+        question: z13__default.default.string().describe("The full question text to display"),
+        header: z13__default.default.string().describe("Short label for the question (max 12 characters)"),
+        options: z13__default.default.array(
+          z13__default.default.object({
+            label: z13__default.default.string(),
+            description: z13__default.default.string()
+          })
+        ).min(0).max(4).describe("Array of 0-4 choices, each with label and description"),
+        multiSelect: z13__default.default.boolean().describe("If true, users can select multiple options")
+      })
+    )
+  }),
+  strict: true
+};
+
+// src/tools/ask-user-question/handler.ts
+var createAskUserQuestionHandler = () => (args) => {
+  return {
+    toolResponse: "Question submitted",
+    data: { questions: args.questions }
+  };
+};
 
 // node_modules/uuid/dist/esm-node/stringify.js
 var byteToHex = [];
@@ -1169,7 +1262,7 @@ async function invokeModel({
   const parentWorkflowId = info.workflowExecution.workflowId;
   const parentRunId = info.workflowExecution.runId;
   const handle = client.getHandle(parentWorkflowId, parentRunId);
-  const { tools } = await handle.query(getStateQuery);
+  const { tools } = await handle.query(`get${agentName}State`);
   const messages$1 = await thread.load();
   const response = await model.invoke(
     [...messages.mapStoredMessagesToChatMessages(messages$1)],
@@ -1190,25 +1283,14 @@ async function invokeModel({
       args: tc.args
     })),
     usage: {
-      input_tokens: response.usage_metadata?.input_tokens,
-      output_tokens: response.usage_metadata?.output_tokens,
-      total_tokens: response.usage_metadata?.total_tokens
+      inputTokens: response.usage_metadata?.input_tokens,
+      outputTokens: response.usage_metadata?.output_tokens,
+      reasonTokens: response.usage_metadata?.output_token_details?.reasoning,
+      cachedWriteTokens: response.usage_metadata?.input_token_details?.cache_creation,
+      cachedReadTokens: response.usage_metadata?.input_token_details?.cache_read
     }
   };
 }
-var createAskUserQuestionHandler = () => async (args) => {
-  const messages$1 = args.questions.map(
-    ({ question, header, options, multiSelect }) => new messages.AIMessage({
-      content: question,
-      additional_kwargs: {
-        header,
-        options,
-        multiSelect
-      }
-    }).toDict()
-  );
-  return { toolResponse: "Question submitted", data: { chatMessages: messages$1 } };
-};
 function createGlobHandler(fs) {
   return async (_args) => {
     new justBash.Bash({ fs });
@@ -1400,7 +1482,6 @@ exports.createToolRouter = createToolRouter;
 exports.defineSubagent = defineSubagent;
 exports.defineTool = defineTool;
 exports.editTool = editTool;
-exports.getStateQuery = getStateQuery;
 exports.globTool = globTool;
 exports.grepTool = grepTool;
 exports.hasNoOtherToolCalls = hasNoOtherToolCalls;