@bgicli/bgicli 2.2.16 → 2.3.0

package/dist/bgi.js

@@ -14218,7 +14218,7 @@ ${shortSummary}`);
 }
 
 // src/chat.ts
-async function chat(messages, config, systemPrompt2) {
+async function chat(messages, config, systemPrompt2, stats, signal) {
   const prov = PROVIDERS[config.provider];
   if (!prov) throw new Error(`Unknown provider: ${config.provider}`);
   if (config.provider === "custom") {
@@ -14235,13 +14235,28 @@ async function chat(messages, config, systemPrompt2) {
     { role: "system", content: systemPrompt2 },
     ...messages
   ];
-  return await streamLoop(client, fullMessages, config.model);
+  return await streamLoop(client, fullMessages, config.model, stats, signal);
 }
-async function streamLoop(client, messages, model) {
+async function streamLoop(client, messages, model, stats, signal) {
   let finalText = "";
   for (let round = 0; round < 20; round++) {
+    if (signal?.aborted) break;
     messages = deduplicateSkillInjections(trimToolOutputs(messages));
-    const { text, toolCalls, finishReason } = await streamOnce(client, messages, model);
+    let streamResult;
+    try {
+      streamResult = await streamOnce(client, messages, model, signal);
+    } catch (err) {
+      if (signal?.aborted || err instanceof Error && (err.name === "AbortError" || err.message.includes("abort"))) {
+        process.stdout.write(source_default.yellow("\n  [\u4EFB\u52A1\u5DF2\u4E2D\u65AD]\n"));
+        break;
+      }
+      throw err;
+    }
+    const { text, toolCalls, finishReason, inputTokens, outputTokens } = streamResult;
+    if (stats) {
+      stats.inputTokens += inputTokens;
+      stats.outputTokens += outputTokens;
+    }
     if (text) finalText = text;
     if (finishReason === "tool_calls" && toolCalls.length > 0) {
       messages.push({
@@ -14307,6 +14322,10 @@ ${label} `);
           }
         } : void 0;
         const result = await executeTool(tc.name, args, onStream);
+        if (stats) {
+          if (result.error) stats.failCmds++;
+          else stats.successCmds++;
+        }
         clearSpinner();
         const elapsed = ((Date.now() - t0) / 1e3).toFixed(1);
         const doneIcon = result.error ? source_default.yellow("\u2717") : source_default.green("\u2713");
@@ -14339,18 +14358,25 @@ OUTPUT: ${result.output}` : result.output
   }
   return finalText;
 }
-async function streamOnce(client, messages, model) {
+async function streamOnce(client, messages, model, signal) {
   const stream = await client.chat.completions.create({
     model,
     messages,
     tools: TOOL_DEFINITIONS,
-    stream: true
-  });
+    stream: true,
+    stream_options: { include_usage: true }
+  }, { signal });
   let text = "";
   const toolCallMap = {};
   let finishReason = null;
+  let inputTokens = 0;
+  let outputTokens = 0;
   process.stdout.write(source_default.green("BGI \u203A "));
   for await (const chunk of stream) {
+    if (chunk.usage) {
+      inputTokens = chunk.usage.prompt_tokens ?? 0;
+      outputTokens = chunk.usage.completion_tokens ?? 0;
+    }
     const choice = chunk.choices[0];
     if (!choice) continue;
     const delta = choice.delta;
@@ -14381,7 +14407,9 @@ async function streamOnce(client, messages, model) {
   return {
     text,
     toolCalls: Object.values(toolCallMap),
-    finishReason
+    finishReason,
+    inputTokens,
+    outputTokens
   };
 }
 function estimateTokens(messages) {
@@ -15882,7 +15910,7 @@ function clearCheckpoints(sessionId) {
 
 // src/index.ts
 var import_fs7 = require("fs");
-var VERSION2 = "2.2.16";
+var VERSION2 = "2.3.0";
 var SKILLHUB_HUBS = {
   bgi: { label: "BGI\u5185\u7F51", apiBase: "https://clawhub.ai", backend: "clawhub" },
   clawhub: { label: "clawhub.ai", apiBase: "https://clawhub.ai", backend: "clawhub" },
@@ -17526,10 +17554,8 @@ async function main() {
     historySize: 100
   });
   rl.on("close", () => {
-    console.log(source_default.dim("\n\u518D\u89C1\uFF01"));
     process.exit(0);
   });
-  process.on("SIGINT", () => rl.close());
   await firstRunIfNeeded(rl);
   const cfg = loadConfig();
   const prov = PROVIDERS[cfg.provider];
@@ -17587,6 +17613,79 @@ async function main() {
   }
   let lastCheckpointMsgCount = 0;
   const CHECKPOINT_INTERVAL = 6;
+  const sessionStartTime = Date.now();
+  const sessionStats = { inputTokens: 0, outputTokens: 0, successCmds: 0, failCmds: 0 };
+  let lastSigintTime = 0;
+  let currentAbortController = null;
+  let exiting = false;
+  function formatDuration(ms) {
+    const s2 = Math.floor(ms / 1e3);
+    const h2 = Math.floor(s2 / 3600);
+    const m2 = Math.floor(s2 % 3600 / 60);
+    const sec = s2 % 60;
+    if (h2 > 0) return `${h2}h ${m2}m ${sec}s`;
+    if (m2 > 0) return `${m2}m ${sec}s`;
+    return `${sec}s`;
+  }
+  function saveSessionMemory() {
+    const memDir = (0, import_path6.join)(BGI_DIR, "memory");
+    if (!(0, import_fs6.existsSync)(memDir)) (0, import_fs6.mkdirSync)(memDir, { recursive: true });
+    const dateStr = new Date(sessionStartTime).toISOString().slice(0, 10);
+    const filename = (0, import_path6.join)(memDir, `${dateStr}-${sessionId}.md`);
+    const lines = [
+      `# \u4F1A\u8BDD\u8BB0\u5FC6 ${new Date(sessionStartTime).toLocaleString("zh-CN")}`,
+      ``,
+      `- \u6A21\u578B: ${loadConfig().model}`,
+      `- Token: \u8F93\u5165 ${sessionStats.inputTokens} / \u8F93\u51FA ${sessionStats.outputTokens}`,
+      `- \u547D\u4EE4: ${sessionStats.successCmds} \u6210\u529F / ${sessionStats.failCmds} \u5931\u8D25`,
+      ``
+    ];
+    let turnCount = 0;
+    for (let i2 = 0; i2 < history.length; i2++) {
+      const msg = history[i2];
+      if (msg.role === "user" && typeof msg.content === "string") {
+        turnCount++;
+        const content = msg.content.slice(0, 500) + (msg.content.length > 500 ? "..." : "");
+        lines.push(`## \u5BF9\u8BDD ${turnCount}`);
+        lines.push(`**\u7528\u6237**: ${content}`);
+      } else if (msg.role === "assistant" && typeof msg.content === "string") {
+        const content = msg.content.slice(0, 500) + (msg.content.length > 500 ? "..." : "");
+        lines.push(`**BGI**: ${content}`);
+        lines.push(``);
+      }
+    }
+    (0, import_fs6.writeFileSync)(filename, lines.join("\n"), "utf8");
+    console.log(source_default.green(`  \u2713 \u8BB0\u5FC6\u5DF2\u4FDD\u5B58: ${filename}`));
+  }
+  async function exitWithReport() {
+    if (exiting) return;
+    exiting = true;
+    const runtime = formatDuration(Date.now() - sessionStartTime);
+    console.log("\n" + source_default.bold.cyan("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550 \u4F1A\u8BDD\u62A5\u544A \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"));
+    console.log(`  \u8FD0\u884C\u65F6\u95F4:   ${source_default.white(runtime)}`);
+    console.log(`  \u6D88\u8017 Token: ${source_default.yellow("\u8F93\u5165")} ${source_default.bold(String(sessionStats.inputTokens))}  |  ${source_default.green("\u8F93\u51FA")} ${source_default.bold(String(sessionStats.outputTokens))}`);
+    console.log(`  \u6267\u884C\u547D\u4EE4:   ${source_default.green("\u2713 " + sessionStats.successCmds + " \u6210\u529F")}  ${sessionStats.failCmds > 0 ? source_default.yellow("\u2717 " + sessionStats.failCmds + " \u5931\u8D25") : source_default.dim("\u2717 0 \u5931\u8D25")}`);
+    console.log(source_default.bold.cyan("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"));
+    try {
+      const ans = await question(rl, source_default.cyan("\n  \u662F\u5426\u4FDD\u5B58\u672C\u6B21\u4F1A\u8BDD\u8BB0\u5FC6\uFF1F[y/N] "));
+      if (ans.trim().toLowerCase() === "y") saveSessionMemory();
+    } catch {
+    }
+    console.log(source_default.dim("\n\u518D\u89C1\uFF01"));
+    process.exit(0);
+  }
+  process.on("SIGINT", () => {
+    const now = Date.now();
+    if (now - lastSigintTime < 2e3) {
+      exitWithReport().catch(() => process.exit(0));
+    } else {
+      lastSigintTime = now;
+      if (currentAbortController) {
+        currentAbortController.abort();
+      }
+      process.stdout.write(source_default.yellow("\n\n  [\u4EFB\u52A1\u5DF2\u4E2D\u65AD] \u518D\u6309\u4E00\u6B21 Ctrl+C \u9000\u51FA\n\n"));
+    }
+  });
   while (true) {
     let input;
     const thinkIndicator = thinkMode ? source_default.yellow("[\u601D\u8003]") + " " : "";
@@ -17598,9 +17697,8 @@ async function main() {
     const trimmed = input.trim();
     if (!trimmed) continue;
     if (["exit", "quit", "q", "/exit", "/quit"].includes(trimmed.toLowerCase())) {
-      console.log(source_default.dim("\u518D\u89C1\uFF01"));
-      rl.close();
-      break;
+      await exitWithReport();
+      return;
     }
     if (trimmed.startsWith("/")) {
       const result = await handleCommand(trimmed, rl, history, thinkMode, injectedSkills);
@@ -17656,7 +17754,14 @@ ${expanded}` : expanded;
     history.push({ role: "user", content: userContent });
     try {
       const currentCfg = loadConfig();
-      const reply = await chat(history, currentCfg, systemPrompt2);
+      currentAbortController = new AbortController();
+      const reply = await chat(history, currentCfg, systemPrompt2, sessionStats, currentAbortController.signal);
+      currentAbortController = null;
+      if (!reply && history[history.length - 1]?.role === "user") {
+        history.pop();
+        console.log();
+        continue;
+      }
       history.push({ role: "assistant", content: reply });
       history = await maybeCompact(history, currentCfg);
       autoSaveSession();
@@ -17671,7 +17776,13 @@ ${expanded}` : expanded;
   [\u6FC0\u6D3B Skill: ${ids}]`));
       }
     } catch (err) {
+      currentAbortController = null;
       const msg = err instanceof Error ? err.message : String(err);
+      if (err instanceof Error && (err.name === "AbortError" || msg.toLowerCase().includes("abort"))) {
+        history.pop();
+        console.log();
+        continue;
+      }
       console.error(source_default.red(`
 \u9519\u8BEF: ${msg}
 `));
@@ -17679,6 +17790,7 @@ ${expanded}` : expanded;
     }
     console.log();
   }
+  await exitWithReport();
 }
 function question(rl, prompt) {
   return new Promise((resolve4, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgicli/bgicli",
-  "version": "2.2.16",
+  "version": "2.3.0",
   "description": "BGI CLI — Bioinformatics AI terminal for Chinese researchers (百炼/DeepSeek/Kimi/Qwen)",
   "bin": {
     "bgi": "dist/bgi.js"