zencode-cli 0.2.2 → 0.2.3

package/dist/bin/zencode.js

@@ -56,6 +56,7 @@ var init_client = __esm({
           params.tools = tools;
           params.tool_choice = "auto";
         }
+        params.stream_options = { include_usage: true };
         const abortController = new AbortController();
         this.activeAbortController = abortController;
         try {
@@ -67,7 +68,16 @@ var init_client = __esm({
           let reasoningStarted = false;
           let reasoningEnded = false;
           const toolCallMap = /* @__PURE__ */ new Map();
+          let usageInfo = null;
           for await (const chunk of stream) {
+            const chunkUsage = chunk.usage;
+            if (chunkUsage && chunkUsage.total_tokens) {
+              usageInfo = {
+                prompt_tokens: chunkUsage.prompt_tokens ?? 0,
+                completion_tokens: chunkUsage.completion_tokens ?? 0,
+                total_tokens: chunkUsage.total_tokens
+              };
+            }
             const choice = chunk.choices[0];
             if (!choice) continue;
             const delta = choice.delta;
@@ -140,6 +150,9 @@ var init_client = __esm({
           if (toolCalls.length > 0) {
             assistantMessage.tool_calls = toolCalls;
           }
+          if (usageInfo) {
+            assistantMessage.usage = usageInfo;
+          }
           callbacks.onFinish?.(assistantMessage);
           return assistantMessage;
         } catch (error) {
@@ -193,6 +206,13 @@ var init_client = __esm({
             }
           }));
         }
+        if (response.usage) {
+          result.usage = {
+            prompt_tokens: response.usage.prompt_tokens,
+            completion_tokens: response.usage.completion_tokens,
+            total_tokens: response.usage.total_tokens
+          };
+        }
         return result;
       }
       get modelName() {
@@ -1600,7 +1620,8 @@ var init_sub_agent = __esm({
       allowedTools;
       maxTurns;
       timeoutMs;
-      constructor(client, registry, config, task, allowedTools = ["read-file", "glob", "grep"], maxTurns = 10, timeoutMs = DEFAULT_TIMEOUT_MS) {
+      tracker;
+      constructor(client, registry, config, task, allowedTools = ["read-file", "glob", "grep"], maxTurns = 10, timeoutMs = DEFAULT_TIMEOUT_MS, tracker) {
         this.client = client;
         this.registry = registry;
         this.config = config;
@@ -1608,6 +1629,7 @@ var init_sub_agent = __esm({
         this.allowedTools = allowedTools.filter((t) => t !== "spawn-agents" && t !== "todo");
         this.maxTurns = Math.min(maxTurns, 15);
         this.timeoutMs = timeoutMs;
+        this.tracker = tracker;
       }
       async run() {
         return Promise.race([
@@ -1637,6 +1659,9 @@ var init_sub_agent = __esm({
             conversation.getMessages(),
             tools.length > 0 ? tools : void 0
           );
+          if (assistantMsg.usage && this.tracker) {
+            this.tracker.addTokens(assistantMsg.usage.total_tokens);
+          }
           conversation.addAssistantMessage(assistantMsg);
           if (!assistantMsg.tool_calls || assistantMsg.tool_calls.length === 0) {
             lastContent = assistantMsg.content || "";
@@ -1760,7 +1785,7 @@ function createSpawnAgentsTool(client, registry, config, tracker) {
         if (tools.length === 0) {
           tools = DEFAULT_TOOLS.filter((t) => autoTools.includes(t));
         }
-        return new SubAgent(client, registry, config, task.description, tools, maxTurns);
+        return new SubAgent(client, registry, config, task.description, tools, maxTurns, void 0, tracker);
       });
       const wrappedRuns = agents.map(
         (agent) => agent.run().then(
@@ -1929,11 +1954,13 @@ var init_runner = __esm({
       registry;
       config;
       agentConfig;
-      constructor(client, registry, config, agentConfig) {
+      tracker;
+      constructor(client, registry, config, agentConfig, tracker) {
         this.client = client;
         this.registry = registry;
         this.config = config;
         this.agentConfig = agentConfig;
+        this.tracker = tracker;
       }
       /**
        * 执行子 Agent 任务
@@ -1974,6 +2001,9 @@ ${context}`;
             tools.length > 0 ? tools : void 0,
             callbacks
           );
+          if (assistantMsg.usage && this.tracker) {
+            this.tracker.addTokens(assistantMsg.usage.total_tokens);
+          }
           conversation.addAssistantMessage(assistantMsg);
           if (!assistantMsg.tool_calls || assistantMsg.tool_calls.length === 0) {
             lastContent = assistantMsg.content || "";
@@ -2058,7 +2088,7 @@ ${context}`;
 });
 
 // src/tools/dispatch.ts
-function createDispatchTool(defaultClient, toolRegistry, config, agentRegistry, callbacks) {
+function createDispatchTool(defaultClient, toolRegistry, config, agentRegistry, tracker, callbacks) {
   return {
     name: "dispatch",
     description: "\u8C03\u5EA6\u5B50 Agent \u6267\u884C\u4E13\u95E8\u4EFB\u52A1\u3002\u5B50 Agent \u6709\u72EC\u7ACB\u5BF9\u8BDD\u548C\u4E13\u5C5E\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0C\u9002\u7528\u4E8E\u9700\u8981\u4E13\u4E1A\u89D2\u8272\u7684\u573A\u666F\u3002",
@@ -2100,11 +2130,14 @@ function createDispatchTool(defaultClient, toolRegistry, config, agentRegistry,
           maxTokens: config.max_tokens
         });
       }
-      const runner = new SubAgentRunner(client, toolRegistry, config, agentConfig);
+      const runner = new SubAgentRunner(client, toolRegistry, config, agentConfig, tracker);
+      tracker?.start([`${agentName}: ${task.slice(0, 60)}`]);
       try {
         const result = await runner.execute(task, context, callbacks?.() ?? {});
+        tracker?.finish();
         return { content: result || "\uFF08\u5B50 Agent \u6267\u884C\u5B8C\u6210\uFF0C\u65E0\u8F93\u51FA\uFF09" };
       } catch (err) {
+        tracker?.finish();
         const msg = err instanceof Error ? err.message : String(err);
         return { content: `\u5B50 Agent \u6267\u884C\u9519\u8BEF\uFF1A${msg}` };
       }
@@ -2407,7 +2440,8 @@ var init_sub_agent_tracker = __esm({
           total: descriptions.length,
           completed: 0,
           failed: 0,
-          descriptions
+          descriptions,
+          tokens: 0
         };
         this.notify();
       }
@@ -2421,6 +2455,11 @@ var init_sub_agent_tracker = __esm({
         this.progress = { ...this.progress, failed: this.progress.failed + 1 };
         this.notify();
       }
+      addTokens(count) {
+        if (!this.progress) return;
+        this.progress = { ...this.progress, tokens: this.progress.tokens + count };
+        this.notify();
+      }
       finish() {
         this.progress = null;
         this.notify();
@@ -2712,9 +2751,21 @@ function getToolParamSummary(name, params) {
     case "glob":
     case "grep":
       return String(params["pattern"] || "");
+    case "spawn-agents": {
+      const tasks = params["tasks"];
+      if (!tasks || tasks.length === 0) return "";
+      return `${tasks.length} tasks: ${tasks.map((t) => t.description || "?").join(" | ").slice(0, 100)}`;
+    }
+    case "dispatch":
+      return `${params["agent"] || "?"}: ${String(params["task"] || "").slice(0, 80)}`;
     default:
       const keys = Object.keys(params);
-      return keys.length > 0 ? String(params[keys[0]] || "").slice(0, 60) : "";
+      if (keys.length === 0) return "";
+      const val = params[keys[0]];
+      if (val === null || val === void 0) return "";
+      if (typeof val === "string") return val.slice(0, 60);
+      if (typeof val === "number" || typeof val === "boolean") return String(val);
+      return JSON.stringify(val).slice(0, 60);
   }
 }
 function truncateContent(text, maxLines) {
@@ -2972,6 +3023,11 @@ var init_InputArea = __esm({
 // src/cli/tui/components/StatusBar.tsx
 import { Box as Box5, Text as Text4 } from "ink";
 import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+function formatTokens(n) {
+  if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
+  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}K`;
+  return String(n);
+}
 function StatusBar({ isRunning, modelName, todoPlan, subAgentProgress }) {
   const todoProgress = todoPlan ? `${todoPlan.items.filter((i) => i.status === "completed").length}/${todoPlan.items.length}` : null;
   return /* @__PURE__ */ jsxs4(Box5, { marginTop: 1, children: [
@@ -2985,16 +3041,21 @@ function StatusBar({ isRunning, modelName, todoPlan, subAgentProgress }) {
       subAgentProgress && /* @__PURE__ */ jsxs4(Fragment2, { children: [
         /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: " \u2502 " }),
         /* @__PURE__ */ jsxs4(Text4, { color: "#b8bb26", children: [
-          "\u{1F916} Agents: ",
+          "Agents: ",
           subAgentProgress.completed + subAgentProgress.failed,
           "/",
           subAgentProgress.total
+        ] }),
+        /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: " \u2502 " }),
+        /* @__PURE__ */ jsxs4(Text4, { color: "#83a598", children: [
+          "tokens: ",
+          formatTokens(subAgentProgress.tokens)
         ] })
       ] }),
       todoProgress && /* @__PURE__ */ jsxs4(Fragment2, { children: [
         /* @__PURE__ */ jsx5(Text4, { color: "#ebdbb2", children: " \u2502 " }),
         /* @__PURE__ */ jsxs4(Text4, { color: "#fabd2f", children: [
-          "\u{1F4CB} Plan: ",
+          "Plan: ",
           todoProgress
         ] })
       ] })
@@ -3687,7 +3748,7 @@ async function startTui(options) {
   if (config.features.todo === "on") {
     registry.register(createTodoTool(todoStore));
   }
-  registry.register(createDispatchTool(client, registry, config, agentRegistry));
+  registry.register(createDispatchTool(client, registry, config, agentRegistry, subAgentTracker));
   const agent = new Agent(client, registry, config, systemPrompt);
   const { waitUntilExit } = render(
     /* @__PURE__ */ jsx10(
@@ -4234,7 +4295,7 @@ async function runOnce(prompt, config) {
 }
 function createCli() {
   const program2 = new Command();
-  program2.name("zencode").description("\u6781\u7B80 CLI AI \u7F16\u7A0B\u5DE5\u5177").version("0.2.1").option("-m, --model <model>", "\u6307\u5B9A\u6A21\u578B\u540D\u79F0").option("-k, --api-key <key>", "API \u5BC6\u94A5").option("-u, --base-url <url>", "API \u57FA\u7840 URL").option("--simple", "\u4F7F\u7528\u7B80\u5355 REPL \u6A21\u5F0F\uFF08\u975E\u5168\u5C4F TUI\uFF09").argument("[prompt...]", "\u76F4\u63A5\u6267\u884C\u7684\u63D0\u793A\u8BCD\uFF08\u975E\u4EA4\u4E92\u5F0F\uFF09").action(async (promptParts, opts) => {
+  program2.name("zencode").description("\u6781\u7B80 CLI AI \u7F16\u7A0B\u5DE5\u5177").version("0.2.3").option("-m, --model <model>", "\u6307\u5B9A\u6A21\u578B\u540D\u79F0").option("-k, --api-key <key>", "API \u5BC6\u94A5").option("-u, --base-url <url>", "API \u57FA\u7840 URL").option("--simple", "\u4F7F\u7528\u7B80\u5355 REPL \u6A21\u5F0F\uFF08\u975E\u5168\u5C4F TUI\uFF09").argument("[prompt...]", "\u76F4\u63A5\u6267\u884C\u7684\u63D0\u793A\u8BCD\uFF08\u975E\u4EA4\u4E92\u5F0F\uFF09").action(async (promptParts, opts) => {
     const config = loadConfig(opts);
     if (!config.api_key) {
       printError("\u672A\u8BBE\u7F6E API \u5BC6\u94A5\u3002\u8BF7\u901A\u8FC7\u4EE5\u4E0B\u65B9\u5F0F\u4E4B\u4E00\u8BBE\u7F6E\uFF1A");