zeitlich 0.2.7 → 0.2.8

package/dist/{workflow-CyYHDbrr.d.cts → workflow-BdAuMMjY.d.cts}

@@ -116,7 +116,7 @@ interface ToolWithHandler<TName extends string = string, TSchema extends z$1.Zod
     strict?: boolean;
     max_uses?: number;
     /** Whether this tool is available to the agent (default: true). Disabled tools are excluded from definitions and rejected at parse time. */
-    enabled?: boolean;
+    enabled?: () => boolean;
     /** Per-tool lifecycle hooks (run in addition to global hooks) */
     hooks?: ToolHooks<z$1.infer<TSchema>, TResult>;
 }
@@ -135,7 +135,7 @@ type ToolMap = Record<string, {
     handler: ToolHandler<any, any, any>;
     strict?: boolean;
     max_uses?: number;
-    enabled?: boolean;
+    enabled?: () => boolean;
     hooks?: ToolHooks<any, any>;
 }>;
 /**
@@ -187,6 +187,8 @@ interface ToolHandlerResponse<TResult = null> {
      * payloads through Temporal's activity payload limit.
      */
     resultAppended?: boolean;
+    /** Token usage from the tool execution (e.g. child agent invocations) */
+    usage?: TokenUsage;
 }
 /**
  * Context passed to tool handlers for additional data beyond tool args.
@@ -237,6 +239,7 @@ interface ToolCallResult<TName extends string = string, TResult = unknown> {
     toolCallId: string;
     name: TName;
     data: TResult;
+    usage?: TokenUsage;
 }
 /**
  * Options for creating a tool router.
@@ -465,6 +468,10 @@ interface BaseAgentState {
     turns: number;
     tasks: Map<string, WorkflowTask>;
     systemPrompt: string;
+    totalInputTokens: number;
+    totalOutputTokens: number;
+    cachedWriteTokens: number;
+    cachedReadtTokens: number;
 }
 /**
  * File representation for agent workflows
@@ -481,17 +488,20 @@ interface AgentFile {
     /** MIME type of the file */
     mimeType?: string;
 }
+interface TokenUsage {
+    inputTokens?: number;
+    outputTokens?: number;
+    cachedWriteTokens?: number;
+    cachedReadTokens?: number;
+    reasonTokens?: number;
+}
 /**
  * Agent response from LLM invocation
  */
 interface AgentResponse<M = StoredMessage> {
     message: M;
     rawToolCalls: RawToolCall[];
-    usage?: {
-        input_tokens?: number;
-        output_tokens?: number;
-        total_tokens?: number;
-    };
+    usage?: TokenUsage;
 }
 /**
  * Thread operations required by a session.
@@ -566,9 +576,10 @@ interface SerializableToolDefinition {
 /**
  * Configuration passed to runAgent activity
  */
-interface RunAgentConfig {
+interface RunAgentConfig extends AgentConfig {
+    /** The thread ID to use for the session */
     threadId: string;
-    agentName: string;
+    /** Metadata for the session */
     metadata?: Record<string, unknown>;
 }
 /**
@@ -597,7 +608,7 @@ interface SubagentConfig<TResult extends z$1.ZodType = z$1.ZodType> {
     /** Description shown to the parent agent explaining what this subagent does */
     description: string;
     /** Whether this subagent is available (default: true). Disabled subagents are excluded from the Subagent tool. */
-    enabled?: boolean;
+    enabled?: () => boolean;
     /** Temporal workflow function or type name (used with executeChild) */
     workflow: string | Workflow;
     /** Optional task queue - defaults to parent's queue if not specified */
@@ -927,6 +938,23 @@ interface AgentStateManager<TCustom extends JsonSerializable<TCustom>> {
     deleteTask(id: string): boolean;
     /** Set the tools (converts Zod schemas to JSON Schema for serialization) */
     setTools(newTools: ToolDefinition[]): void;
+    /** Update the usage */
+    updateUsage(usage: {
+        inputTokens?: number;
+        outputTokens?: number;
+        cachedWriteTokens?: number;
+        cachedReadTokens?: number;
+        reasonTokens?: number;
+    }): void;
+    /** Get the total usage */
+    getTotalUsage(): {
+        totalInputTokens: number;
+        totalOutputTokens: number;
+        totalCachedWriteTokens: number;
+        totalCachedReadTokens: number;
+        totalReasonTokens: number;
+        turns: number;
+    };
 }
 /**
  * Creates an agent state manager for tracking workflow state.
@@ -954,7 +982,11 @@ declare const AGENT_HANDLER_NAMES: {
 interface ZeitlichSession<M = unknown> {
     runSession<T extends JsonSerializable<T>>(args: {
         stateManager: AgentStateManager<T>;
-    }): Promise<M | null>;
+    }): Promise<{
+        finalMessage: M | null;
+        exitReason: SessionExitReason;
+        usage: ReturnType<AgentStateManager<T>["getTotalUsage"]>;
+    }>;
 }
 /**
  * Session-level hooks for lifecycle events
@@ -965,7 +997,7 @@ interface SessionLifecycleHooks {
     /** Called when session ends */
     onSessionEnd?: SessionEndHook;
 }
-declare const createSession: <T extends ToolMap, M = unknown>({ threadId, agentName, maxTurns, metadata, runAgent, threadOps, buildContextMessage, subagents, tools, processToolsInParallel, hooks, appendSystemPrompt, systemPrompt, waitForInputTimeout, }: SessionConfig<T, M> & AgentConfig) => Promise<ZeitlichSession<M>>;
+declare const createSession: <T extends ToolMap, M = unknown>({ threadId, agentName, description, maxTurns, metadata, runAgent, threadOps, buildContextMessage, subagents, tools, processToolsInParallel, hooks, appendSystemPrompt, systemPrompt, waitForInputTimeout, }: SessionConfig<T, M> & AgentConfig) => Promise<ZeitlichSession<M>>;
 /**
  * Proxy the default ZeitlichSharedActivities as ThreadOps<StoredMessage>.
  * Call this in workflow code for the standard LangChain/StoredMessage setup.

package/dist/{workflow-CyYHDbrr.d.ts → workflow-BdAuMMjY.d.ts}

@@ -116,7 +116,7 @@ interface ToolWithHandler<TName extends string = string, TSchema extends z$1.Zod
     strict?: boolean;
     max_uses?: number;
     /** Whether this tool is available to the agent (default: true). Disabled tools are excluded from definitions and rejected at parse time. */
-    enabled?: boolean;
+    enabled?: () => boolean;
     /** Per-tool lifecycle hooks (run in addition to global hooks) */
     hooks?: ToolHooks<z$1.infer<TSchema>, TResult>;
 }
@@ -135,7 +135,7 @@ type ToolMap = Record<string, {
     handler: ToolHandler<any, any, any>;
     strict?: boolean;
     max_uses?: number;
-    enabled?: boolean;
+    enabled?: () => boolean;
     hooks?: ToolHooks<any, any>;
 }>;
 /**
@@ -187,6 +187,8 @@ interface ToolHandlerResponse<TResult = null> {
      * payloads through Temporal's activity payload limit.
      */
     resultAppended?: boolean;
+    /** Token usage from the tool execution (e.g. child agent invocations) */
+    usage?: TokenUsage;
 }
 /**
  * Context passed to tool handlers for additional data beyond tool args.
@@ -237,6 +239,7 @@ interface ToolCallResult<TName extends string = string, TResult = unknown> {
     toolCallId: string;
     name: TName;
     data: TResult;
+    usage?: TokenUsage;
 }
 /**
  * Options for creating a tool router.
@@ -465,6 +468,10 @@ interface BaseAgentState {
     turns: number;
     tasks: Map<string, WorkflowTask>;
     systemPrompt: string;
+    totalInputTokens: number;
+    totalOutputTokens: number;
+    cachedWriteTokens: number;
+    cachedReadtTokens: number;
 }
 /**
  * File representation for agent workflows
@@ -481,17 +488,20 @@ interface AgentFile {
     /** MIME type of the file */
     mimeType?: string;
 }
+interface TokenUsage {
+    inputTokens?: number;
+    outputTokens?: number;
+    cachedWriteTokens?: number;
+    cachedReadTokens?: number;
+    reasonTokens?: number;
+}
 /**
  * Agent response from LLM invocation
  */
 interface AgentResponse<M = StoredMessage> {
     message: M;
     rawToolCalls: RawToolCall[];
-    usage?: {
-        input_tokens?: number;
-        output_tokens?: number;
-        total_tokens?: number;
-    };
+    usage?: TokenUsage;
 }
 /**
  * Thread operations required by a session.
@@ -566,9 +576,10 @@ interface SerializableToolDefinition {
 /**
  * Configuration passed to runAgent activity
  */
-interface RunAgentConfig {
+interface RunAgentConfig extends AgentConfig {
+    /** The thread ID to use for the session */
     threadId: string;
-    agentName: string;
+    /** Metadata for the session */
     metadata?: Record<string, unknown>;
 }
 /**
@@ -597,7 +608,7 @@ interface SubagentConfig<TResult extends z$1.ZodType = z$1.ZodType> {
     /** Description shown to the parent agent explaining what this subagent does */
     description: string;
     /** Whether this subagent is available (default: true). Disabled subagents are excluded from the Subagent tool. */
-    enabled?: boolean;
+    enabled?: () => boolean;
     /** Temporal workflow function or type name (used with executeChild) */
     workflow: string | Workflow;
     /** Optional task queue - defaults to parent's queue if not specified */
@@ -927,6 +938,23 @@ interface AgentStateManager<TCustom extends JsonSerializable<TCustom>> {
     deleteTask(id: string): boolean;
     /** Set the tools (converts Zod schemas to JSON Schema for serialization) */
     setTools(newTools: ToolDefinition[]): void;
+    /** Update the usage */
+    updateUsage(usage: {
+        inputTokens?: number;
+        outputTokens?: number;
+        cachedWriteTokens?: number;
+        cachedReadTokens?: number;
+        reasonTokens?: number;
+    }): void;
+    /** Get the total usage */
+    getTotalUsage(): {
+        totalInputTokens: number;
+        totalOutputTokens: number;
+        totalCachedWriteTokens: number;
+        totalCachedReadTokens: number;
+        totalReasonTokens: number;
+        turns: number;
+    };
 }
 /**
  * Creates an agent state manager for tracking workflow state.
@@ -954,7 +982,11 @@ declare const AGENT_HANDLER_NAMES: {
 interface ZeitlichSession<M = unknown> {
     runSession<T extends JsonSerializable<T>>(args: {
         stateManager: AgentStateManager<T>;
-    }): Promise<M | null>;
+    }): Promise<{
+        finalMessage: M | null;
+        exitReason: SessionExitReason;
+        usage: ReturnType<AgentStateManager<T>["getTotalUsage"]>;
+    }>;
 }
 /**
  * Session-level hooks for lifecycle events
@@ -965,7 +997,7 @@ interface SessionLifecycleHooks {
     /** Called when session ends */
     onSessionEnd?: SessionEndHook;
 }
-declare const createSession: <T extends ToolMap, M = unknown>({ threadId, agentName, maxTurns, metadata, runAgent, threadOps, buildContextMessage, subagents, tools, processToolsInParallel, hooks, appendSystemPrompt, systemPrompt, waitForInputTimeout, }: SessionConfig<T, M> & AgentConfig) => Promise<ZeitlichSession<M>>;
+declare const createSession: <T extends ToolMap, M = unknown>({ threadId, agentName, description, maxTurns, metadata, runAgent, threadOps, buildContextMessage, subagents, tools, processToolsInParallel, hooks, appendSystemPrompt, systemPrompt, waitForInputTimeout, }: SessionConfig<T, M> & AgentConfig) => Promise<ZeitlichSession<M>>;
 /**
  * Proxy the default ZeitlichSharedActivities as ThreadOps<StoredMessage>.
  * Call this in workflow code for the standard LangChain/StoredMessage setup.

package/dist/workflow.cjs

@@ -66,11 +66,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 }
     };
   };
 }
@@ -82,20 +83,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) => {
@@ -386,6 +384,7 @@ function hasNoOtherToolCalls(toolCalls, excludeName) {
 var createSession = async ({
   threadId,
   agentName,
+  description,
   maxTurns = 50,
   metadata = {},
   runAgent,
@@ -425,7 +424,9 @@ var createSession = async ({
     }
   };
   return {
-    runSession: async ({ stateManager }) => {
+    runSession: async ({
+      stateManager
+    }) => {
       workflow.setHandler(
         workflow.defineUpdate(`add${agentName}Message`),
         async (message) => {
@@ -452,7 +453,6 @@ var createSession = async ({
           metadata
         });
       }
-      stateManager.setTools(toolRouter.getToolDefinitions());
       await initializeThread(threadId);
       if (appendSystemPrompt && systemPrompt && systemPrompt.trim() !== "") {
         await appendSystemMessage(threadId, systemPrompt);
@@ -463,15 +463,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) {
@@ -488,9 +498,17 @@ 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") {
             const conditionMet = await workflow.condition(
               () => stateManager.getStatus() === "RUNNING",
@@ -512,7 +530,11 @@ var createSession = async ({
       } finally {
         await callSessionEnd(exitReason, stateManager.getTurns());
       }
-      return null;
+      return {
+        finalMessage: null,
+        exitReason,
+        usage: stateManager.getTotalUsage()
+      };
     }
   };
 };
@@ -549,6 +571,11 @@ function createAgentStateManager({
   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: _,
@@ -663,6 +690,23 @@ function createAgentStateManager({
         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
+      };
     }
   };
 }