ai-lab-bridge 0.1.4 → 0.1.6

package/index.js

@@ -267,11 +267,40 @@ class Session {
     }
   }
 
+  /** 归一化后缓存 + 回传 usage：各家 CLI 字段名不同（input_tokens/input/prompt_tokens...），统一为平台口径 */
   emitUsage(usage) {
-    if (usage && typeof usage === "object") {
-      this.usage = usage;
-      this.emitEvent("usage", { usage });
+    const num = (v) => (typeof v === "number" && isFinite(v) ? v : undefined);
+    let raw = usage && typeof usage === "object" ? usage : null;
+    if (!raw) return;
+    // gemini 家族（qwen/iflow 同源）stats 为嵌套结构：
+    // {models: {"<模型名>": {tokens: {prompt, candidates, total, cached, thoughts}}}}
+    if (raw.models && typeof raw.models === "object") {
+      const first = Object.values(raw.models).find((m) => m && m.tokens && typeof m.tokens === "object");
+      const tk = first && first.tokens;
+      if (tk) {
+        raw = {
+          ...raw,
+          input: num(tk.prompt) ?? num(raw.input),
+          output: num(tk.candidates) ?? num(raw.output),
+          cache: { read: num(tk.cached) },
+        };
+      }
     }
+    // opencode 系: {input, output, cache:{read}} / claude: {input_tokens, output_tokens, cache_read_input_tokens}
+    // codex: {input_tokens, output_tokens, total_tokens} / gemini: {inputTokenCount, outputTokenCount, ...}
+    const input = num(raw.input_tokens) ?? num(raw.input) ?? num(raw.prompt_tokens) ?? num(raw.inputTokenCount);
+    const output =
+      num(raw.output_tokens) ?? num(raw.output) ?? num(raw.completion_tokens) ?? num(raw.outputTokenCount) ?? num(raw.candidatesTokenCount);
+    const cacheRead = num(raw.cache_read_input_tokens) ?? num(raw.cache && raw.cache.read) ?? num(raw.cachedContentTokenCount);
+    if (input === undefined && output === undefined && cacheRead === undefined) return;
+    const normalized = {
+      input_tokens: input ?? null,
+      output_tokens: output ?? null,
+      total_tokens: input !== undefined || output !== undefined ? (input ?? 0) + (output ?? 0) : null,
+      cache_read_input_tokens: cacheRead ?? null,
+    };
+    this.usage = normalized;
+    this.emitEvent("usage", { usage: normalized });
   }
 
   emitToolUse(summary) {
@@ -472,6 +501,9 @@ function handleOpencodeLine(session, obj) {
       session.emitToolUse(part.tool || part.name || (state && state.title));
     }
   }
+  // usage 提取：opencode 系在 step_finish 的 part.tokens / 顶层 usage 携带本轮 token 统计
+  const usageRaw = (part && (part.tokens || part.usage)) || obj.tokens || obj.usage;
+  if (usageRaw && typeof usageRaw === "object") session.emitUsage(usageRaw);
   if (obj.type === "error" || (obj.error && typeof obj.error === "object")) {
     const err = obj.error && typeof obj.error === "object" ? obj.error : null;
     // 提取可读错误消息（opencode 系: error.data.message / error.message；附带 name/ref 便于定位）
@@ -551,8 +583,10 @@ function handleCursorLine(session, obj) {
 
 /**
  * Gemini CLI 家族事件解析（gemini / qwen / iflow 的 `-p --output-format stream-json`，JSONL）。
- * 事件类型：init(session id) / message / tool_use / tool_result / result(stats)。
- * 各 fork 字段命名可能有差异，做宽松归一化；终态以进程退出码兜底。
+ * 事件格式两代并存，宽松归一化：
+ *   - Gemini 原生：message(text/content) / tool_use / result(response, stats)
+ *   - Claude 风格（qwen 0.24+ 同源仿制）：assistant(message.content[]) / tool_call / result(result, usage)
+ * 终态以进程退出码兜底。
  */
 function handleGeminiLine(session, obj) {
   if (!obj || typeof obj !== "object") return;
@@ -562,28 +596,50 @@ function handleGeminiLine(session, obj) {
   if (obj.type === "message" || obj.type === "assistant") {
     const role = obj.role || (obj.message && obj.message.role);
     if (role === "user") return;
+    // 文本提取顺序：obj.text → obj.content → obj.message.content[]（Claude 风格嵌套）
     let text = obj.text;
-    if (!text && obj.content) {
-      if (typeof obj.content === "string") text = obj.content;
-      else if (Array.isArray(obj.content)) {
-        text = obj.content
-          .filter((b) => (b && b.type === "text") || typeof b === "string")
-          .map((b) => (typeof b === "string" ? b : b.text))
-          .join("");
+    let blocks = obj.content;
+    if (!blocks && obj.message && Array.isArray(obj.message.content)) {
+      blocks = obj.message.content;
+    }
+    if (!text && blocks) {
+      if (typeof blocks === "string") text = blocks;
+      else if (Array.isArray(blocks)) {
+        const parts = [];
+        for (const b of blocks) {
+          if (!b) continue;
+          if (b.type === "text" && b.text) {
+            session.endThink();
+            parts.push(b.text);
+          } else if (b.type === "thinking" && b.thinking) {
+            session.emitThink(b.thinking);
+          } else if (typeof b === "string") {
+            parts.push(b);
+          }
+        }
+        text = parts.join("");
       }
     }
     if (text) session.emitText(text);
   } else if (obj.type === "tool_use" || obj.type === "tool_call") {
     session.emitToolUse(obj.name || obj.tool_name || obj.tool || "tool");
   } else if (obj.type === "result") {
-    session.emitUsage(obj.stats);
-    if (obj.error) {
-      const msg = typeof obj.error === "string" ? obj.error : (obj.error.message || JSON.stringify(obj.error));
+    // usage：gemini 原生在 stats，qwen/claude 风格在 usage
+    session.emitUsage(obj.stats || obj.usage);
+    const failed = obj.error || obj.is_error || (obj.subtype && obj.subtype !== "success");
+    if (failed) {
+      const msg = typeof obj.error === "string"
+        ? obj.error
+        : (obj.error && obj.error.message)
+          || (typeof obj.result === "string" ? obj.result : undefined)
+          || `执行异常: ${obj.subtype || "unknown"}`;
       session.finish("failed", msg);
       return;
     }
-    if (typeof obj.response === "string" && obj.response && !session.textParts.length) {
-      session.emitText(obj.response);
+    // 终态文本兜底：gemini 原生在 response，qwen/claude 风格在 result
+    const finalText = (typeof obj.response === "string" && obj.response) || (typeof obj.result === "string" && obj.result);
+    if (finalText && !session.textParts.length) {
+      session.emitText(finalText);
     }
     session.finish("completed");
   }
@@ -731,8 +787,10 @@ function startSession(message) {
 
   let promptViaStdin = true;
   let launch = null;
-  if (cli === "claude") {
-    argv = ["claude", ["-p", "--output-format", "stream-json", "--verbose"]];
+  if (cli === "claude" || cli === "qwen") {
+    // Qwen CLI 0.24+ 已重构为 Claude Code 同构架构（result 事件带 subtype/session_id/usage，
+    // 实测 0.24.6），stream-json 输出与 Claude Code 兼容，复用同一启动参数与解析器
+    argv = [cli, ["-p", "--output-format", "stream-json", "--verbose"]];
     if (sessionRef) argv[1].push("--resume", sessionRef);
     if (options.permission_mode) argv[1].push("--permission-mode", String(options.permission_mode));
     if (options.model) argv[1].push("--model", String(options.model));
@@ -803,10 +861,10 @@ function startSession(message) {
   session.child = child;
 
   const opencodeLike = cli === "opencode" || cli === "codefree-o";
-  const handler = cli === "claude" ? handleClaudeLine
+  const handler = (cli === "claude" || cli === "qwen") ? handleClaudeLine
     : cli === "codex" ? handleCodexLine
       : cli === "cursor" ? handleCursorLine
-        : (cli === "gemini" || cli === "qwen" || cli === "iflow") ? handleGeminiLine
+        : (cli === "gemini" || cli === "iflow") ? handleGeminiLine
           : (session, obj, rawLine) => {
             // OpenCode / codefree-o：JSON 事件宽松解析；非 JSON 行按纯文本兜底（不支持 --format json 的版本）。
             if (obj) handleOpencodeLine(session, obj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-lab-bridge",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "AI 开发平台设备桥接进程：反连平台 WebSocket，驱动本地 Claude Code / Codex CLI 执行任务并回传事件流",
   "license": "MIT",
   "files": [