coze_lab 0.1.11 → 0.1.13

package/index.js

@@ -4622,7 +4622,7 @@ function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud) {
 // agentId 非空时并入 plugins.entries[...].config.traceAgentIds allowlist —— 插件运行时
 // 用 resolveAgentIdFromHookCtx 取当前 agentId，仅 allowlist 内的 agent 才上报 trace。
 // allowlist 为空（本地全局模式）= 全部放行，向后兼容。
-function writeOpenClawHook(token, workspaceId, agentId) {
+function writeOpenClawHook(token, workspaceId, agentId, cloud) {
   const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
   const pluginDir  = path.join(os.homedir(), '.cozeloop', 'openclaw-plugin');
 
@@ -4703,7 +4703,12 @@ function writeOpenClawHook(token, workspaceId, agentId) {
     if (!existing.plugins.entries[PLUGIN].config) existing.plugins.entries[PLUGIN].config = {};
     const pcfg = existing.plugins.entries[PLUGIN].config;
     pcfg.authorization = `Bearer ${token}`;
-    pcfg.endpoint      = 'https://api.coze.cn/v1/loop/opentelemetry';
+    // 云端：endpoint 走 sandbox 注入的 COZELOOP_API_BASE_URL 代理（token 经它鉴权）；
+    // 缺省回退 api.coze.cn 直连。插件 exporter 会在此基础上拼 /v1/traces。
+    const ocBase = (cloud && process.env.COZELOOP_API_BASE_URL)
+      ? process.env.COZELOOP_API_BASE_URL.replace(/\/+$/, '') + '/v1/loop/opentelemetry'
+      : 'https://api.coze.cn/v1/loop/opentelemetry';
+    pcfg.endpoint      = ocBase;
     pcfg.workspaceId   = workspaceId;
     pcfg.debug         = true;
     // per-agent trace 放行：把当前 agentId 并入 traceAgentIds（去重、归一为小写，
@@ -4772,7 +4777,7 @@ function httpsPost(url, body, extraHeaders) {
 // 只看 HTTP 状态码（2xx=通），不回查 trace 是否落库——回查由外部查询方完成。
 // pairCode 写进 span 的 pair_code attribute，供查询方按该字段过滤回查；缺省自动生成。
 // 不在函数内退出，退出行为交给调用方（主流程 Step 6 / 独立命令 --verify）。
-async function verifyTraceReport(token, workspaceId, pairCode) {
+async function verifyTraceReport(token, workspaceId, pairCode, baseUrl) {
   const traceId = crypto.randomBytes(16).toString('hex'); // 32 hex chars
   const spanId  = crypto.randomBytes(8).toString('hex');  // 16 hex chars
   const nowNs   = String(Date.now() * 1_000_000);         // OTLP 要求纳秒 unix 时间（字符串）
@@ -4805,9 +4810,12 @@ async function verifyTraceReport(token, workspaceId, pairCode) {
   };
 
   let res;
+  // 云端：上报走 sandbox 注入的 COZELOOP_API_BASE_URL 代理（vefaas token 经它鉴权转换）；
+  // 缺省回退到 api.coze.cn 直连。base 已去尾部斜杠。
+  const apiBase = (baseUrl || COZE_API).replace(/\/+$/, '');
   try {
     res = await httpsPost(
-      `${COZE_API}/v1/loop/opentelemetry/v1/traces`,
+      `${apiBase}/v1/loop/opentelemetry/v1/traces`,
       otlpBody,
       { Authorization: `Bearer ${token}`, 'cozeloop-workspace-id': workspaceId },
     );
@@ -5158,7 +5166,7 @@ async function main() {
     info('验证 trace 上报链路...');
     const token = await getValidToken();   // 无凭证会自动走登录/刷新
     console.log('');
-    const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode);
+    const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, process.env.COZELOOP_API_BASE_URL || undefined);
     process.exit(result.success ? 0 : 1);
   }
 
@@ -5239,7 +5247,7 @@ async function main() {
     written = writeCodexHook(token, WORKSPACE_ID, pythonCmd, codexHome, args.cloud);
   } else {
     // openclaw：云端用 traceAgentIds allowlist 做 per-agent 放行。
-    written = writeOpenClawHook(token, WORKSPACE_ID, args.agentId) || {};
+    written = writeOpenClawHook(token, WORKSPACE_ID, args.agentId, args.cloud) || {};
   }
   // 走到这里说明 detectAgent / 环境检查 / 写 hook 配置全部成功 → 注入成功。
   cloudResult.inject = 'ok';
@@ -5276,7 +5284,7 @@ async function main() {
 
   // Step 5: Verify trace reporting end-to-end
   info('Step 5/5: 验证 trace 上报链路...');
-  const verifyResult = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode);
+  const verifyResult = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, args.cloud ? process.env.COZELOOP_API_BASE_URL : undefined);
   if (verifyResult.success) {
     cloudResult.verify = 'ok';
   } else if (CLOUD_MODE) {

package/package.json

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

package/scripts/claude-code/cozeloop_hook.py

@@ -1385,14 +1385,16 @@ def main():
     # Group messages into turns and send to CozeLoop — only if coze-context present.
     turns = group_messages_into_turns(new_messages)
     if turns:
-        has_coze_ctx = any(
-            coze_context_tags(
+        # coze-context 只出现在首条用户消息里（cozelab 注入的 agent 才有）。增量 hook 触发时，
+        # 新消息往往全是工具调用/结果（不带 coze-context），故必须连同历史 turns 一起判断——
+        # 只要整个会话出现过 coze-context，就说明是被注入的 agent，后续增量都应上报。
+        def _turn_has_ctx(turn):
+            return bool(coze_context_tags(
                 (turn.get("user_message", {}).get("message", {}) or {}).get("content")
-            )
-            for turn in turns
-        )
+            ))
+        has_coze_ctx = any(_turn_has_ctx(t) for t in turns) or any(_turn_has_ctx(t) for t in history_turns)
         if not has_coze_ctx:
-            debug_log("No coze-context found in any turn, skipping upload.")
+            debug_log("No coze-context found in any turn (incl. history), skipping upload.")
             return
         print(f"[CozeLoop] 开始上报: session={session_id}, turns={len(turns)}", file=sys.stderr)
         send_turns_to_cozeloop(turns, session_id, history_turns)