zeitlich 0.2.7 → 0.2.9

package/dist/index.cjs

@@ -14,18 +14,18 @@ var z13__default = /*#__PURE__*/_interopDefault(z13);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 
 // src/lib/session.ts
-var SUBAGENT_TOOL = "Subagent";
+var SUBAGENT_TOOL_NAME = "Subagent";
 function buildSubagentDescription(subagents) {
   const subagentList = subagents.map((s) => `- **${s.agentName}**: ${s.description}`).join("\n");
   return `Launch a new agent to handle complex tasks autonomously.
 
-The ${SUBAGENT_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_NAME} 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 ${SUBAGENT_TOOL} tool, you must specify a subagent parameter to select which agent type to use.
+When using the ${SUBAGENT_TOOL_NAME} tool, you must specify a subagent parameter to select which agent type to use.
 
 Usage notes:
 
@@ -44,7 +44,7 @@ function createSubagentTool(subagents) {
   }
   const names = subagents.map((s) => s.agentName);
   return {
-    name: SUBAGENT_TOOL,
+    name: SUBAGENT_TOOL_NAME,
     description: buildSubagentDescription(subagents),
     schema: z13__default.default.object({
       subagent: z13__default.default.enum(names).describe("The type of subagent to launch"),
@@ -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),
+      toolMap.set(SUBAGENT_TOOL_NAME, {
+        ...createSubagentTool(options.subagents),
+        handler: createSubagentHandler(options.subagents),
         ...subagentHooksMap.size > 0 && {
           hooks: {
             onPreToolUse: async (ctx) => {
@@ -292,13 +290,19 @@ function createToolRouter(options) {
       return Array.from(toolMap.entries()).filter(([, tool]) => isEnabled(tool)).map(([name]) => name);
     },
     getToolDefinitions() {
-      return Array.from(toolMap).filter(([, tool]) => isEnabled(tool)).map(([name, tool]) => ({
-        name,
-        description: tool.description,
-        schema: tool.schema,
-        strict: tool.strict,
-        max_uses: tool.max_uses
-      }));
+      const activeSubagents = options.subagents?.filter((subagent) => isEnabled(subagent)) ?? [];
+      return [
+        ...Array.from(toolMap).filter(
+          ([, tool]) => isEnabled(tool) && tool.name !== SUBAGENT_TOOL_NAME
+        ).map(([name, tool]) => ({
+          name,
+          description: tool.description,
+          schema: tool.schema,
+          strict: tool.strict,
+          max_uses: tool.max_uses
+        })),
+        ...activeSubagents.length > 0 ? [createSubagentTool(activeSubagents)] : []
+      ];
     },
     // --- Methods for processing tool calls ---
     async processToolCalls(toolCalls, context) {
@@ -411,6 +415,7 @@ function hasNoOtherToolCalls(toolCalls, excludeName) {
 var createSession = async ({
   threadId,
   agentName,
+  description,
   maxTurns = 50,
   metadata = {},
   runAgent,
@@ -450,7 +455,9 @@ var createSession = async ({
     }
   };
   return {
-    runSession: async ({ stateManager }) => {
+    runSession: async ({
+      stateManager
+    }) => {
       workflow.setHandler(
         workflow.defineUpdate(`add${agentName}Message`),
         async (message) => {
@@ -477,7 +484,6 @@ var createSession = async ({
           metadata
         });
       }
-      stateManager.setTools(toolRouter.getToolDefinitions());
       await initializeThread(threadId);
       if (appendSystemPrompt && systemPrompt && systemPrompt.trim() !== "") {
         await appendSystemMessage(threadId, systemPrompt);
@@ -488,15 +494,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) {
@@ -513,9 +529,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",
@@ -537,7 +561,11 @@ var createSession = async ({
       } finally {
         await callSessionEnd(exitReason, stateManager.getTurns());
       }
-      return null;
+      return {
+        finalMessage: null,
+        exitReason,
+        usage: stateManager.getTotalUsage()
+      };
     }
   };
 };
@@ -574,6 +602,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: _,
@@ -688,6 +721,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
+      };
     }
   };
 }
@@ -740,7 +790,7 @@ Examples:
   }),
   strict: true
 };
-var readTool = {
+var readFileTool = {
   name: "FileRead",
   description: `Read file contents with optional pagination.
 
@@ -763,22 +813,21 @@ The tool returns the file content in an appropriate format:
   }),
   strict: true
 };
-var writeTool = {
+var writeFileTool = {
   name: "FileWrite",
   description: `Create or overwrite a file with new content.
 
 Usage:
-- 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
 
 IMPORTANT:
 - You must read the file first (in this session) before writing to it
 - This is an atomic write operation - the entire file is replaced
-- Path must be absolute (e.g., "/docs/readme.md", not "docs/readme.md")
+- Path must be relative to the root of the file system (e.g., "docs/readme.md", not "/docs/readme.md")
 `,
   schema: z13.z.object({
-    file_path: z13.z.string().describe("The absolute path to the file to write"),
+    file_path: z13.z.string().describe("The path to the file to write"),
     content: z13.z.string().describe("The content to write to the file")
   }),
   strict: true
@@ -1040,7 +1089,7 @@ Usage notes:
 };
 
 // src/tools/ask-user-question/handler.ts
-var createAskUserQuestionHandler = () => (args) => {
+var createAskUserQuestionHandler = () => async (args) => {
   return {
     toolResponse: "Question submitted",
     data: { questions: args.questions }
@@ -1239,9 +1288,11 @@ 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
     }
   };
 }
@@ -1442,13 +1493,13 @@ exports.hasNoOtherToolCalls = hasNoOtherToolCalls;
 exports.invokeModel = invokeModel;
 exports.isTerminalStatus = isTerminalStatus;
 exports.proxyDefaultThreadOps = proxyDefaultThreadOps;
-exports.readTool = readTool;
+exports.readFileTool = readFileTool;
 exports.taskCreateTool = taskCreateTool;
 exports.taskGetTool = taskGetTool;
 exports.taskListTool = taskListTool;
 exports.taskUpdateTool = taskUpdateTool;
 exports.toTree = toTree;
 exports.withAutoAppend = withAutoAppend;
-exports.writeTool = writeTool;
+exports.writeFileTool = writeFileTool;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map