coze_lab 0.1.51 → 0.1.52

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;
@@ -1108,7 +1139,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 +1197,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,7 +1286,7 @@ 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}`);
@@ -1263,7 +1294,7 @@ except Exception as e:
     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 +1361,14 @@ 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}`);
+      warn(`trace 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')}`);
       const snippet = (res.body || '').slice(0, 300);
       if (snippet) console.log(snippet);
     }
-    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 +1427,14 @@ 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}`);
+    warn(`trace 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')}`);
     const snippet = (res.body || '').slice(0, 300);
     if (snippet) console.log(snippet);
   }
-  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,9 +1531,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}...)`);
+    warn(`openclaw 插件实际 token 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')} (token=${tokenPrefix}...)`);
     const snippet = (res.body || '').slice(0, 300);
     if (snippet) console.log(snippet);
     // 4100/401 = 该 token 已失效。指出根因与修复方式。
@@ -1512,7 +1543,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) {
@@ -1745,6 +1776,7 @@ 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';
@@ -1760,6 +1792,7 @@ async function main() {
       'ERROR: trace 上报自检失败',
       '',
       `HTTP ${verifyResult.status}`,
+      `logid=${verifyResult.logid || extractLogid(verifyResult.body) || ''}`,
       (verifyResult.body || '').slice(0, 300),
       '',
       'hook 配置已写入，但上报链路未打通。',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coze_lab",
-  "version": "0.1.51",
+  "version": "0.1.52",
   "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",