coze_lab 0.1.51 → 0.1.53

package/index.js

@@ -20,12 +20,43 @@ class CloudAbort extends Error {}
 // 兼容两种形态：JSON 里的 "logid":"xxx" / detail.logid，以及裸 logid=xxx。
 function extractLogid(text) {
   if (!text) return '';
-  let m = text.match(/"logid"\s*:\s*"([a-zA-Z0-9]+)"/);
+  let m = text.match(/"logid"\s*:\s*"([a-zA-Z0-9._:-]+)"/);
   if (m) return m[1];
-  m = text.match(/logid[=:\s]+([a-zA-Z0-9]+)/i);
+  m = text.match(/"log_id"\s*:\s*"([a-zA-Z0-9._:-]+)"/);
+  if (m) return m[1];
+  m = text.match(/"Logid"\s*:\s*"([a-zA-Z0-9._:-]+)"/);
+  if (m) return m[1];
+  m = text.match(/logid[=:\s]+([a-zA-Z0-9._:-]+)/i);
   return m ? m[1] : '';
 }
 
+function headerString(value) {
+  if (Array.isArray(value)) return value.find(Boolean) || '';
+  return value ? String(value) : '';
+}
+
+function extractLogidFromHeaders(headers) {
+  if (!headers) return '';
+  const candidates = [
+    'x-tt-logid',
+    'x-tt-log-id',
+    'x-log-id',
+    'x-logid',
+    'x-request-id',
+    'x-tt-trace-id',
+    'trace-id',
+  ];
+  for (const key of candidates) {
+    const value = headerString(headers[key] || headers[key.toLowerCase()] || headers[key.toUpperCase()]);
+    if (value) return value;
+  }
+  return '';
+}
+
+function formatLogid(logid) {
+  return logid ? `, logid=${logid}` : ', logid=';
+}
+
 // 输出结构化结果行（仅云端模式）。
 function emitCloudResult() {
   if (!CLOUD_MODE) return;
@@ -65,6 +96,7 @@ const C = {
 };
 
 function log(prefix, color, msg) {
+  if (process.env.COZELAB_ONBOARD_VERBOSE !== '1') return;
   console.log(`${color}${prefix}${C.reset} ${msg}`);
 }
 const ok   = (msg) => log('[✓]', C.green,  msg);
@@ -92,6 +124,7 @@ function errorBox(lines) {
 }
 
 function warnBox(lines) {
+  if (process.env.COZELAB_ONBOARD_VERBOSE !== '1') return;
   box(lines, C.yellow);
 }
 
@@ -518,6 +551,48 @@ function isVersionAtLeast(version, minVersion) {
   return true;
 }
 
+// Codex docs now use [features].hooks as the canonical key; codex_hooks is a
+// deprecated alias. Keep the alias only for explicitly detected older CLIs.
+const CODEX_CANONICAL_HOOKS_FEATURE_MIN_VERSION = '0.134.0';
+
+function codexHooksFeatureKey(version) {
+  const hasKnownVersion = parseVersionNumbers(version).length > 0;
+  if (hasKnownVersion && !isVersionAtLeast(version, CODEX_CANONICAL_HOOKS_FEATURE_MIN_VERSION)) {
+    return 'codex_hooks';
+  }
+  return 'hooks';
+}
+
+function normalizeCodexHooksFeatureConfig(configToml, codexVersion) {
+  const featureKey = codexHooksFeatureKey(codexVersion);
+  const lines = String(configToml || '').replace(/\r\n/g, '\n').split('\n');
+  if (lines.length && lines[lines.length - 1] === '') lines.pop();
+
+  const featureHeaderRe = /^\s*\[features\]\s*(?:#.*)?$/;
+  const tableHeaderRe = /^\s*\[\[?[^\]]+\]\]?\s*(?:#.*)?$/;
+  const hookFeatureRe = /^\s*(hooks|codex_hooks)\s*=/;
+  const featureIdx = lines.findIndex((line) => featureHeaderRe.test(line));
+
+  if (featureIdx === -1) {
+    const out = [...lines];
+    if (out.length && out[out.length - 1].trim() !== '') out.push('');
+    out.push('[features]', `${featureKey} = true`);
+    return out.join('\n') + '\n';
+  }
+
+  let endIdx = featureIdx + 1;
+  while (endIdx < lines.length && !tableHeaderRe.test(lines[endIdx])) {
+    endIdx += 1;
+  }
+
+  const before = lines.slice(0, featureIdx);
+  const section = lines.slice(featureIdx, endIdx).filter((line, idx) => idx === 0 || !hookFeatureRe.test(line));
+  section.splice(1, 0, `${featureKey} = true`);
+  const after = lines.slice(endIdx);
+
+  return [...before, ...section, ...after].join('\n') + '\n';
+}
+
 // ─── 7. Hook writers ─────────────────────────────────────────────────────────
 const fs   = require('fs');
 const path = require('path');
@@ -698,13 +773,14 @@ function writeClaudeCodeHook(token, workspaceId, pythonCmd, configBaseDir, cloud
 // 传入动态目录（如 coze-bridge 的 /tmp/coze-bridge-codex-home-xxx）即可 per-agent 生效。
 // 本地 --agent-id 从 config.patToken 写入 token，并用 COZELOOP_TOKEN_SOURCE 标记来源。
 // cloud=true 时写 COZELAB_ONBOARD_CLOUD，并带入 sandbox 注入的 trace token。
-function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud, tokenSource) {
+function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud, tokenSource, codexVersion) {
   const home       = codexHome || path.join(os.homedir(), '.codex');
   const hooksDir   = path.join(home, 'hooks');
   const hookScript = path.join(hooksDir, 'cozeloop_hook.py');
   const envFile    = path.join(hooksDir, 'cozeloop.env');
   const logFile    = path.join(hooksDir, 'cozeloop.log');
   const hooksJson  = path.join(home, 'hooks.json');
+  const configToml = path.join(home, 'config.toml');
 
   // 1. Write Python hook script
   ensureDir(hooksDir);
@@ -779,9 +855,22 @@ function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud, tokenSo
     errorBox([`ERROR: Cannot write ${hooksJson}`, '', e.message]);
   }
   ok(`Hook registered in ${hooksJson}`);
+
+  // 4. Normalize Codex hook feature flag. hooks.json carries hook definitions;
+  //    config.toml carries the on/off feature gate. Re-running onboard should
+  //    clean the deprecated codex_hooks alias for modern Codex versions.
+  const featureKey = codexHooksFeatureKey(codexVersion);
+  try {
+    const existingConfig = fs.existsSync(configToml) ? fs.readFileSync(configToml, 'utf8') : '';
+    const nextConfig = normalizeCodexHooksFeatureConfig(existingConfig, codexVersion);
+    atomicWriteFileSync(configToml, nextConfig);
+  } catch (e) {
+    errorBox([`ERROR: Cannot update ${configToml}`, '', e.message]);
+  }
+  ok(`Codex hooks feature enabled via [features].${featureKey} in ${configToml}`);
   warn('Codex hook trust: 首次启动 Codex 会提示 "Hooks need review"。在该提示按 t（Trust all and continue），或在会话内运行 /hooks 后按 t，即可一次性信任全部 hook 启用 trace 上报。');
 
-  return { hookScript, envFile, hooksJson, logFile };
+  return { hookScript, envFile, hooksJson, configToml, logFile };
 }
 
 function resolveCodexHome(args) {
@@ -1108,7 +1197,7 @@ function httpsPost(url, body, extraHeaders) {
       (res) => {
         let buf = '';
         res.on('data', c => buf += c);
-        res.on('end', () => resolve({ status: res.statusCode, body: buf }));
+        res.on('end', () => resolve({ status: res.statusCode, body: buf, headers: res.headers || {}, logid: extractLogidFromHeaders(res.headers) || extractLogid(buf) }));
       }
     );
     req.on('error', reject);
@@ -1166,7 +1255,7 @@ def extract_logid(text):
     if idx >= 0:
         out = []
         for ch in text[idx + len(marker):]:
-            if ch.isalnum():
+            if ch.isalnum() or ch in "._:-":
                 out.append(ch)
             else:
                 break
@@ -1255,15 +1344,13 @@ except Exception as e:
   const body = parsed?.body || result.stderr || result.stdout || (result.timedOut ? 'SDK selfcheck timed out' : '');
   const success = result.code === 0 && parsed?.success === true;
   if (success) {
-    ok(`trace 上报成功 (pair_code=${pair})`);
+    ok(`trace 上报成功 (pair_code=${pair}${formatLogid(parsed?.logid || '')})`);
     info(`查询方可用 pair_code=${pair} 在 CozeLoop 回查确认该 trace 已落库。`);
   } else {
     warn(`trace 上报失败: SDK selfcheck exit ${result.code}`);
     info(`trace selfcheck api_base_url=${apiBase || COZE_API}, token_source=${tokenSource || 'unknown'}`);
-    const snippet = String(body || '').slice(0, 300);
-    if (snippet) console.log(snippet);
   }
-  return { success, status: result.code || 0, body, traceId: '', pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: parsed?.logid || '' };
+  return { success, status: result.code || 0, body, traceId: '', pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: parsed?.logid || extractLogid(body) || '' };
 }
 
 async function verifyCloudTraceReport(token, workspaceId, pairCode, tokenSource) {
@@ -1330,14 +1417,12 @@ async function verifyCloudTraceReport(token, workspaceId, pairCode, tokenSource)
     );
     const success = res.status >= 200 && res.status < 300;
     if (success) {
-      ok(`trace 上报成功 (traceId=${traceId}, pair_code=${pair})`);
+      ok(`trace 上报成功 (traceId=${traceId}, pair_code=${pair}${formatLogid(res.logid || '')})`);
       info(`查询方可用 pair_code=${pair} 在 CozeLoop 回查确认该 trace 已落库。`);
     } else {
-      warn(`trace 上报失败: HTTP ${res.status}`);
-      const snippet = (res.body || '').slice(0, 300);
-      if (snippet) console.log(snippet);
+      warn(`trace 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')}`);
     }
-    return { success, status: res.status, body: res.body || '', traceId, pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: extractLogid(res.body || '') };
+    return { success, status: res.status, body: res.body || '', traceId, pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: res.logid || extractLogid(res.body || '') };
   } catch (e) {
     warn(`trace 上报失败: ${e.message}`);
     return { success: false, status: 0, body: e.message, traceId, pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: extractLogid(e.message) };
@@ -1396,14 +1481,12 @@ async function verifyTraceReport(token, workspaceId, pairCode, tracesUrl) {
 
   const success = res.status >= 200 && res.status < 300;
   if (success) {
-    ok(`trace 上报成功 (traceId=${traceId}, pair_code=${pair})`);
+    ok(`trace 上报成功 (traceId=${traceId}, pair_code=${pair}${formatLogid(res.logid || '')})`);
     info(`查询方可用 pair_code=${pair} 在 CozeLoop 回查确认该 trace 已落库。`);
   } else {
-    warn(`trace 上报失败: HTTP ${res.status}`);
-    const snippet = (res.body || '').slice(0, 300);
-    if (snippet) console.log(snippet);
+    warn(`trace 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')}`);
   }
-  return { success, status: res.status, body: res.body, traceId, pairCode: pair };
+  return { success, status: res.status, body: res.body, traceId, pairCode: pair, logid: res.logid || extractLogid(res.body || '') };
 }
 
 // ── OpenClaw 专属上报链路校验 ──────────────────────────────────────────────
@@ -1500,11 +1583,9 @@ async function verifyOpenClawTraceLink(cloud, pairCode) {
   const tokenPrefix = authHeader.replace(/^Bearer\s+/i, '').slice(0, 12);
 
   if (success) {
-    ok(`openclaw 插件实际 token 上报正常 (token=${tokenPrefix}..., HTTP ${res.status})`);
+    ok(`openclaw 插件实际 token 上报正常 (token=${tokenPrefix}..., HTTP ${res.status}${formatLogid(res.logid || '')})`);
   } else {
-    warn(`openclaw 插件实际 token 上报失败: HTTP ${res.status} (token=${tokenPrefix}...)`);
-    const snippet = (res.body || '').slice(0, 300);
-    if (snippet) console.log(snippet);
+    warn(`openclaw 插件实际 token 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')} (token=${tokenPrefix}...)`);
     // 4100/401 = 该 token 已失效。指出根因与修复方式。
     if (res.status === 401 || /\b4100\b/.test(res.body || '')) {
       info('插件配置的 token 已失效。运行时上报会 401，span 会丢失。');
@@ -1512,7 +1593,7 @@ async function verifyOpenClawTraceLink(cloud, pairCode) {
     }
   }
 
-  return { success, status: res.status, body: res.body || '' };
+  return { success, status: res.status, body: res.body || '', logid: res.logid || extractLogid(res.body || '') };
 }
 
 function httpsGet(url, headers) {
@@ -1545,9 +1626,7 @@ function openClawNextStep(written) {
 }
 
 async function main() {
-  console.log('');
   info(`CozeLoop Onboard CLI starting... (coze_lab v${PACKAGE_VERSION})`);
-  console.log('');
 
   const args = validateArgs(parseArgs());
 
@@ -1576,7 +1655,6 @@ async function main() {
         '请确认 ~/.coze/agents/<id>/config.json 包含 patToken 后重试。',
       ]);
     }
-    console.log('');
     const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(false));
     // 若本机装了 openclaw 插件，额外校验插件【实际配置的静态 token】——通用 verify 用刚刷新的
     // token 测不到它。任一失败则整体判失败（exit 1）。
@@ -1586,14 +1664,28 @@ async function main() {
       try {
         const cfg = JSON.parse(fs.readFileSync(ocConfigPath, 'utf8'));
         if (cfg?.plugins?.entries?.['openclaw-cozeloop-trace']?.config?.authorization) {
-          console.log('');
           info('检测到 openclaw cozeloop-trace 插件，校验其实际 token...');
           const ocRes = await verifyOpenClawTraceLink(args.cloud, args.pairCode);
           ocOk = ocRes.success;
         }
       } catch { /* 读不了就跳过 openclaw 校验 */ }
     }
-    process.exit(result.success && ocOk ? 0 : 1);
+    if (result.success && ocOk) {
+      successBox([
+        `Verify:      coze_lab v${PACKAGE_VERSION}`,
+        `Trace:       OK (pair_code=${result.pairCode})`,
+      ]);
+      return;
+    }
+    errorBox([
+      'ERROR: trace 上报自检失败',
+      '',
+      `HTTP ${result.status}`,
+      `logid=${result.logid || extractLogid(result.body) || ''}`,
+      (result.body || '').slice(0, 300),
+      '',
+      '请确认 CozeLoop Token 具备 Trace ingest 权限，再重试。',
+    ]);
   }
 
   const { agent } = args;
@@ -1607,7 +1699,6 @@ async function main() {
   }
   if (args.agentId) {
     info(`目标 agent: ${args.agentId} (framework=${agent}, workspace=${agentWorkspace || 'N/A'}, deploy=${args.cloud ? 'cloud' : 'local'}, reason=${args.deployReason || 'n/a'})`);
-    console.log('');
   }
 
   // Step 1: Resolve trace token.
@@ -1652,12 +1743,9 @@ async function main() {
       ]);
     }
   }
-  console.log('');
-
   // Step 2: Detect agent binary
   info('Step 2/5: Detecting agent...');
   const version = detectAgent(agent, args.cloud);
-  console.log('');
 
   // Step 3: Environment checks
   info('Step 3/5: Checking environment...');
@@ -1667,7 +1755,6 @@ async function main() {
     checkCozeloopSdk(pythonCmd, { cloud: args.cloud });
   }
   checkVersionWhitelist(agent, version);
-  console.log('');
 
   // Step 4: Write hook configuration
   info('Step 4/5: Writing hook configuration...');
@@ -1692,14 +1779,13 @@ async function main() {
       info(`已创建云端 Codex 配置目录: ${codexHome}`);
     }
     if (codexHome) info(`Codex 配置目录: ${codexHome}`);
-    written = writeCodexHook(token, WORKSPACE_ID, pythonCmd, codexHome, args.cloud, tokenSource);
+    written = writeCodexHook(token, WORKSPACE_ID, pythonCmd, codexHome, args.cloud, tokenSource, version);
   } else {
     // openclaw：云端用 traceAgentIds allowlist 做 per-agent 放行。
     written = writeOpenClawHook(token, WORKSPACE_ID, args.agentId, args.cloud, args.force, tokenSource) || {};
   }
   // 走到这里说明 detectAgent / 环境检查 / 写 hook 配置全部成功 → 注入成功。
   cloudResult.inject = 'ok';
-  console.log('');
 
   // Success summary（用实际写入路径，per-agent / 自定义 CODEX_HOME 时也准确）
   const summaryLines = [
@@ -1714,6 +1800,7 @@ async function main() {
   } else if (agent === 'codex') {
     summaryLines.push(`Hook script: ${written.hookScript || '~/.codex/hooks/cozeloop_hook.py'}`);
     summaryLines.push(`Config:      ${written.hooksJson || '~/.codex/hooks.json'}`);
+    if (written.configToml) summaryLines.push(`Feature:     ${written.configToml}`);
     summaryLines.push(`Credentials: ${written.envFile || '~/.codex/hooks/cozeloop.env'}`);
     if (written.logFile) summaryLines.push(`Hook log:    ${written.logFile}`);
   } else {
@@ -1724,13 +1811,10 @@ async function main() {
 
   // Enterprise policy note for Claude Code
   if (agent === 'claude-code') {
-    console.log('');
     info('注意：企业托管模式下若 allowManagedHooksOnly=true，需管理员在策略中放行本地 hook。');
   }
   // Trace permission reminder for all agents
-  console.log('');
   info('确保 CozeLoop Token 具备 Trace ingest 权限，否则 hook 触发但上报会失败。');
-  console.log('');
 
   // Step 5: Verify trace reporting end-to-end
   info('Step 5/5: 验证 trace 上报链路...');
@@ -1745,13 +1829,13 @@ async function main() {
       : await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(false));
   if (verifyResult.success) {
     cloudResult.verify = 'ok';
+    cloudResult.logid = verifyResult.logid || extractLogid(verifyResult.body) || cloudResult.logid;
   } else if (CLOUD_MODE) {
     // 云端：注入已成功，验证失败不阻断（放行），记录结果供后台弹 warning。
     cloudResult.verify = 'fail';
     cloudResult.logid = verifyResult.logid || extractLogid(verifyResult.body) || cloudResult.logid;
     cloudResult.message = `trace 上报自检失败 HTTP ${verifyResult.status}: ${(verifyResult.body || '').slice(0, 200)}`;
     warn('trace 上报自检失败，但 hook 配置已写入（云端放行）。');
-    console.log('');
     emitCloudResult();
     successBox(summaryLines);
     return;
@@ -1760,13 +1844,13 @@ async function main() {
       'ERROR: trace 上报自检失败',
       '',
       `HTTP ${verifyResult.status}`,
+      `logid=${verifyResult.logid || extractLogid(verifyResult.body) || ''}`,
       (verifyResult.body || '').slice(0, 300),
       '',
       'hook 配置已写入，但上报链路未打通。',
       '请确认 CozeLoop Token 具备 Trace ingest 权限，再重试。',
     ]);   // errorBox 内部 process.exit(1)
   }
-  console.log('');
 
   emitCloudResult();
   successBox(summaryLines);
@@ -1800,5 +1884,7 @@ module.exports = {
   atomicWriteFileSync,
   VERSION_WHITELIST,
   VERSION_SUPPORT,
+  codexHooksFeatureKey,
+  normalizeCodexHooksFeatureConfig,
   isVersionAtLeast,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coze_lab",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "description": "Configure local AI agents (Claude Code, Codex, OpenClaw) to report traces to CozeLoop",
   "keywords": [
     "cozeloop",

package/scripts/openclaw/dist/cozeloop-exporter.js

@@ -47,6 +47,48 @@ function fileLog(logFile, message) {
         /* best-effort, never throw from logging */
     }
 }
+function headerString(value) {
+    if (Array.isArray(value))
+        return value.find(Boolean) || "";
+    return value ? String(value) : "";
+}
+function extractLogidFromHeaders(headers) {
+    if (!headers)
+        return "";
+    const candidates = [
+        "x-tt-logid",
+        "x-tt-log-id",
+        "x-log-id",
+        "x-logid",
+        "x-request-id",
+        "x-tt-trace-id",
+        "trace-id",
+    ];
+    for (const key of candidates) {
+        const value = headerString(headers[key] || headers[key.toLowerCase()] || headers[key.toUpperCase()]);
+        if (value)
+            return value;
+    }
+    return "";
+}
+function extractLogid(text) {
+    if (!text)
+        return "";
+    let m = text.match(/"logid"\s*:\s*"([a-zA-Z0-9._:-]+)"/);
+    if (m)
+        return m[1];
+    m = text.match(/"log_id"\s*:\s*"([a-zA-Z0-9._:-]+)"/);
+    if (m)
+        return m[1];
+    m = text.match(/"Logid"\s*:\s*"([a-zA-Z0-9._:-]+)"/);
+    if (m)
+        return m[1];
+    m = text.match(/logid[=:\s]+([a-zA-Z0-9._:-]+)/i);
+    return m ? m[1] : "";
+}
+function formatLogid(logid) {
+    return logid ? ` logid=${logid}` : " logid=";
+}
 
 function normalizeApiBaseUrl(endpoint) {
     const base = String(endpoint || "").replace(/\/+$/, "");
@@ -215,7 +257,12 @@ function postJson(url, body, headers) {
         }, (res) => {
             let buf = "";
             res.on("data", c => buf += c);
-            res.on("end", () => resolve({ status: res.statusCode || 0, body: buf }));
+            res.on("end", () => resolve({
+                status: res.statusCode || 0,
+                body: buf,
+                headers: res.headers || {},
+                logid: extractLogidFromHeaders(res.headers) || extractLogid(buf),
+            }));
         });
         req.on("error", reject);
         req.setTimeout(15000, () => req.destroy(new Error("CozeLoop ingest export timed out")));
@@ -305,8 +352,8 @@ class CozeloopIngestExporter {
         const res = await postJson(this.url, body, this.headers);
         if (res.status < 200 || res.status >= 300) {
             const snippet = String(res.body || "").slice(0, 300);
-            fileLog(this.logFile, `[ingest] HTTP ${res.status} url=${this.url}${snippet ? ` body=${snippet}` : ""}`);
-            throw new Error(`HTTP ${res.status}${snippet ? `: ${snippet}` : ""}`);
+            fileLog(this.logFile, `[ingest] HTTP ${res.status}${formatLogid(res.logid)} url=${this.url}${snippet ? ` body=${snippet}` : ""}`);
+            throw new Error(`HTTP ${res.status}${formatLogid(res.logid)}${snippet ? `: ${snippet}` : ""}`);
         }
         if (res.body) {
             try {
@@ -322,7 +369,7 @@ class CozeloopIngestExporter {
                 }
             }
         }
-        fileLog(this.logFile, `[ingest] OK HTTP ${res.status} spans=${body.spans.length}${retry ? " retry=1" : ""}`);
+        fileLog(this.logFile, `[ingest] OK HTTP ${res.status}${formatLogid(res.logid)} spans=${body.spans.length}${retry ? " retry=1" : ""}`);
     }
     async forceFlush() {
         // Wait for every in-flight POST to settle. allSettled (not all) so one

package/scripts/openclaw/dist/index.js

@@ -196,6 +196,54 @@ function formatAssistantOutput(content, stopReason) {
         ],
     };
 }
+function usageInt(usage, keys) {
+    if (!usage || typeof usage !== "object")
+        return 0;
+    for (const key of keys) {
+        const value = usage[key];
+        if (value === undefined || value === null || value === "")
+            continue;
+        const n = typeof value === "number" ? value : Number(value);
+        if (Number.isFinite(n) && n > 0)
+            return Math.trunc(n);
+    }
+    return 0;
+}
+function readTokenUsage(...usages) {
+    const inputKeys = [
+        "input",
+        "input_tokens",
+        "inputTokens",
+        "prompt_tokens",
+        "promptTokens",
+        "prompt",
+    ];
+    const outputKeys = [
+        "output",
+        "output_tokens",
+        "outputTokens",
+        "completion_tokens",
+        "completionTokens",
+        "completion",
+    ];
+    const totalKeys = ["total", "total_tokens", "totalTokens"];
+    let input = 0;
+    let output = 0;
+    let total = 0;
+    for (const usage of usages) {
+        if (!usage || typeof usage !== "object")
+            continue;
+        if (input === 0)
+            input = usageInt(usage, inputKeys);
+        if (output === 0)
+            output = usageInt(usage, outputKeys);
+        if (total === 0)
+            total = usageInt(usage, totalKeys);
+        if (input > 0 && output > 0 && total > 0)
+            break;
+    }
+    return { input, output, total };
+}
 function convertAssistantContentForMessages(content) {
     if (!Array.isArray(content))
         return [{ type: "text", text: String(content ?? "") }];
@@ -901,11 +949,15 @@ const cozeloopTracePlugin = {
                         const model = entry.model || ctx.lastModelId || "unknown";
                         const spanStartTime = prevWrittenAt;
                         const spanEndTime = entryWrittenAt;
+                        const tokenUsage = readTokenUsage(entry.usage);
                         const modelSpan = createSpan(ctx, channelId, `${provider}/${model}`, "model", spanStartTime, spanEndTime, {
                             "gen_ai.provider.name": provider,
                             "gen_ai.request.model": model,
-                            "gen_ai.usage.input_tokens": entry.usage?.input ?? 0,
-                            "gen_ai.usage.output_tokens": entry.usage?.output ?? 0,
+                            "gen_ai.usage.input_tokens": tokenUsage.input,
+                            "gen_ai.usage.output_tokens": tokenUsage.output,
+                            "gen_ai.usage.total_tokens": tokenUsage.total || tokenUsage.input + tokenUsage.output,
+                            "input_tokens": tokenUsage.input,
+                            "output_tokens": tokenUsage.output,
                             "react_round": reactRound,
                         }, { messages: reactMessages.map((msg) => safeClone(msg)) }, formatAssistantOutput(entry.content, entry.stopReason));
                         await exporter.export(modelSpan);
@@ -1269,13 +1321,15 @@ const cozeloopTracePlugin = {
                         }
                     }
                     const lastAssistantUsage = event.lastAssistant?.usage;
-                    const inputTokens = event.usage?.input ?? lastAssistantUsage?.input ?? 0;
-                    const outputTokens = event.usage?.output ?? lastAssistantUsage?.output ?? 0;
+                    const tokenUsage = readTokenUsage(event.usage, lastAssistantUsage);
                     const spanAttributes = {
                         "gen_ai.provider.name": event.provider,
                         "gen_ai.request.model": event.model,
-                        "gen_ai.usage.input_tokens": inputTokens,
-                        "gen_ai.usage.output_tokens": outputTokens,
+                        "gen_ai.usage.input_tokens": tokenUsage.input,
+                        "gen_ai.usage.output_tokens": tokenUsage.output,
+                        "gen_ai.usage.total_tokens": tokenUsage.total || tokenUsage.input + tokenUsage.output,
+                        "input_tokens": tokenUsage.input,
+                        "output_tokens": tokenUsage.output,
                     };
                     const finalOutput = formatAssistantOutput(event.assistantTexts?.map((t) => ({ type: "text", text: t })) ?? [], "stop");
                     const span = createSpan(ctx, channelId, `${event.provider}/${event.model}`, "model", startTime, now, spanAttributes, llmInput, finalOutput);
@@ -1595,11 +1649,12 @@ const cozeloopTracePlugin = {
                 const active = resolveActiveAgentContext(hookCtx, rawChannelId);
                 const ctx = active?.ctx || getOrCreateContext(rawChannelId, undefined, "agent_end").ctx;
                 const channelId = active?.channelId || rawChannelId;
+                const tokenUsage = readTokenUsage(event.usage);
                 finalizeTrace(ctx, channelId, {
                     "agent.duration_ms": event.durationMs || 0,
                     "agent.message_count": event.messageCount || 0,
                     "agent.tool_call_count": event.toolCallCount || 0,
-                    "agent.total_tokens": event.usage?.total || 0,
+                    "agent.total_tokens": tokenUsage.total || tokenUsage.input + tokenUsage.output,
                 }, { usage: event.usage, cost: event.cost });
             });
         }

package/scripts/openclaw/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openclaw-cozeloop-trace",
   "name": "OpenClaw CozeLoop Trace",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Report OpenClaw execution traces to CozeLoop via OpenTelemetry",
   "type": "plugin",
   "entry": "./dist/index.js",

package/scripts/openclaw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cozeloop/openclaw-cozeloop-trace",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "OpenClaw Plugin for reporting traces to CozeLoop via OpenTelemetry",
   "type": "module",
   "main": "dist/index.js",