ai-lab-bridge 0.1.5 → 0.1.6

package/index.js

@@ -270,8 +270,22 @@ class Session {
   /** 归一化后缓存 + 回传 usage：各家 CLI 字段名不同（input_tokens/input/prompt_tokens...），统一为平台口径 */
   emitUsage(usage) {
     const num = (v) => (typeof v === "number" && isFinite(v) ? v : undefined);
-    const raw = usage && typeof usage === "object" ? usage : null;
+    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);
@@ -773,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));
@@ -845,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.5",
+  "version": "0.1.6",
   "description": "AI 开发平台设备桥接进程：反连平台 WebSocket，驱动本地 Claude Code / Codex CLI 执行任务并回传事件流",
   "license": "MIT",
   "files": [