coze_lab 0.1.18 → 0.1.20

package/index.js

@@ -4464,6 +4464,10 @@ function mergeJson(filepath, mergeFn) {
   return mergeFn(existing);
 }
 
+function shellEnvLine(key, value) {
+  return `${key}='${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
 // writeClaudeCodeHook 配置 Claude Code 的 hook。
 // configBaseDir 缺省 process.cwd()（全局/项目级）；传入 agent 的 workspace 则 per-agent：
 // settings.json + 凭证写进 <configBaseDir>/.claude，仅该 agent（以此为 cwd 启动）生效。
@@ -4565,24 +4569,29 @@ function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud) {
   writeHookScript(refreshScript, readScript('shared/cozeloop_refresh.py'));
 
   // 2. Write env file with chmod 600
-  //    云端（cloud）：不落明文 token，hook 运行时从环境变量 COZE_API_TOKEN 读取。
   const envLines = [
-    `COZELOOP_WORKSPACE_ID=${workspaceId}`,
+    shellEnvLine('COZELOOP_WORKSPACE_ID', workspaceId),
   ];
-  if (!cloud) {
-    envLines.push(`COZELOOP_API_TOKEN=${token}`);
+  if (cloud) {
+    if (process.env.COZELOOP_API_TOKEN) {
+      envLines.push(shellEnvLine('COZELOOP_API_TOKEN', process.env.COZELOOP_API_TOKEN));
+    } else if (process.env.COZE_API_TOKEN) {
+      envLines.push(shellEnvLine('COZE_API_TOKEN', process.env.COZE_API_TOKEN));
+    }
+  } else {
+    envLines.push(shellEnvLine('COZELOOP_API_TOKEN', token));
   }
-  envLines.push(`CODEX_HOME=${home}`);
-  envLines.push(`COZELOOP_HOOK_LOG=${logFile}`);
+  envLines.push(shellEnvLine('CODEX_HOME', home));
+  envLines.push(shellEnvLine('COZELOOP_HOOK_LOG', logFile));
   envLines.push('TRACE_TO_COZELOOP=true');
   if (process.env.COZELOOP_API_BASE_URL) {
-    envLines.push(`COZELOOP_API_BASE_URL=${process.env.COZELOOP_API_BASE_URL}`);
+    envLines.push(shellEnvLine('COZELOOP_API_BASE_URL', process.env.COZELOOP_API_BASE_URL));
   } else if (process.env.OTEL_ENDPOINT) {
-    envLines.push(`OTEL_ENDPOINT=${process.env.OTEL_ENDPOINT}`);
+    envLines.push(shellEnvLine('OTEL_ENDPOINT', process.env.OTEL_ENDPOINT));
   }
   // PPE 泳道：cozeloop SDK 读这两个环境变量，自动注入 x-tt-env / x-use-ppe header
-  envLines.push(`x_tt_env=${PPE_TT_ENV}`);
-  envLines.push(`x_use_ppe=${PPE_USE_PPE}`);
+  envLines.push(shellEnvLine('x_tt_env', PPE_TT_ENV));
+  envLines.push(shellEnvLine('x_use_ppe', PPE_USE_PPE));
   const envContent = envLines.join('\n') + '\n';
   try {
     fs.writeFileSync(envFile, envContent, { mode: 0o600 });
@@ -4660,10 +4669,38 @@ function normalizeTraceAgentIds(ids) {
     .filter(Boolean);
 }
 
-function getOpenClawEndpoint(cloud) {
-  return (cloud && process.env.COZELOOP_API_BASE_URL)
-    ? process.env.COZELOOP_API_BASE_URL.replace(/\/+$/, '') + '/v1/loop/opentelemetry'
-    : 'https://api.coze.cn/v1/loop/opentelemetry';
+function getCloudCozeloopApiBaseUrl() {
+  const raw = process.env.COZELOOP_API_BASE_URL || process.env.OTEL_ENDPOINT || '';
+  const base = raw.trim().replace(/\/+$/, '');
+  if (!base) return '';
+  if (base.endsWith('/v1/loop/opentelemetry/v1/traces')) {
+    return base.slice(0, -'/v1/loop/opentelemetry/v1/traces'.length).replace(/\/+$/, '');
+  }
+  if (base.endsWith('/api/v1/loop/opentelemetry/v1/traces')) {
+    return base.slice(0, -'/v1/loop/opentelemetry/v1/traces'.length).replace(/\/+$/, '');
+  }
+  if (base.endsWith('/v1/loop/opentelemetry')) {
+    return base.slice(0, -'/v1/loop/opentelemetry'.length).replace(/\/+$/, '');
+  }
+  if (base.endsWith('/api/v1/loop/opentelemetry')) {
+    return base.slice(0, -'/loop/opentelemetry'.length).replace(/\/+$/, '');
+  }
+  if (base.endsWith('/api/v1')) {
+    return base.slice(0, -'/v1'.length).replace(/\/+$/, '');
+  }
+  return base;
+}
+
+function getCozeloopApiBaseUrl(cloud) {
+  return cloud ? (getCloudCozeloopApiBaseUrl() || COZE_API) : COZE_API;
+}
+
+function getOtelEndpointBase(cloud) {
+  return `${getCozeloopApiBaseUrl(cloud).replace(/\/+$/, '')}/v1/loop/opentelemetry`;
+}
+
+function getOtelTracesUrl(cloud) {
+  return `${getOtelEndpointBase(cloud).replace(/\/+$/, '')}/v1/traces`;
 }
 
 function applyOpenClawPluginConfig(existing, token, workspaceId, agentId, cloud) {
@@ -4685,7 +4722,7 @@ function applyOpenClawPluginConfig(existing, token, workspaceId, agentId, cloud)
   if (!existing.plugins.entries[PLUGIN].config) existing.plugins.entries[PLUGIN].config = {};
   const pcfg = existing.plugins.entries[PLUGIN].config;
   pcfg.authorization = `Bearer ${token}`;
-  pcfg.endpoint      = getOpenClawEndpoint(cloud);
+  pcfg.endpoint      = getOtelEndpointBase(cloud);
   pcfg.workspaceId   = workspaceId;
   pcfg.debug         = true;
   // per-agent trace 放行：把当前 agentId 并入 traceAgentIds（去重、归一为小写，
@@ -4820,7 +4857,7 @@ function httpsPost(url, body, extraHeaders) {
     const data = JSON.stringify(body);
     const u = new URL(url);
     const req = https.request(
-      { hostname: u.hostname, path: u.pathname + u.search, method: 'POST',
+      { hostname: u.hostname, port: u.port || undefined, path: u.pathname + u.search, method: 'POST',
         headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(data),
                    'x-tt-env': PPE_TT_ENV, 'x-use-ppe': PPE_USE_PPE,
                    ...(extraHeaders || {}) } },
@@ -4841,7 +4878,7 @@ function httpsPost(url, body, extraHeaders) {
 // 只看 HTTP 状态码（2xx=通），不回查 trace 是否落库——回查由外部查询方完成。
 // pairCode 写进 span 的 pair_code attribute，供查询方按该字段过滤回查；缺省自动生成。
 // 不在函数内退出，退出行为交给调用方（主流程 Step 6 / 独立命令 --verify）。
-async function verifyTraceReport(token, workspaceId, pairCode, baseUrl) {
+async function verifyTraceReport(token, workspaceId, pairCode, tracesUrl) {
   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 时间（字符串）
@@ -4874,12 +4911,10 @@ async function verifyTraceReport(token, workspaceId, pairCode, baseUrl) {
   };
 
   let res;
-  // 云端：上报走 sandbox 注入的 COZELOOP_API_BASE_URL 代理（vefaas token 经它鉴权转换）；
-  // 缺省回退到 api.coze.cn 直连。base 已去尾部斜杠。
-  const apiBase = (baseUrl || COZE_API).replace(/\/+$/, '');
+  const url = tracesUrl || getOtelTracesUrl(false);
   try {
     res = await httpsPost(
-      `${apiBase}/v1/loop/opentelemetry/v1/traces`,
+      url,
       otlpBody,
       { Authorization: `Bearer ${token}`, 'cozeloop-workspace-id': workspaceId },
     );
@@ -5230,7 +5265,7 @@ async function main() {
     info('验证 trace 上报链路...');
     const token = await getValidToken();   // 无凭证会自动走登录/刷新
     console.log('');
-    const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, process.env.COZELOOP_API_BASE_URL || undefined);
+    const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(false));
     process.exit(result.success ? 0 : 1);
   }
 
@@ -5352,7 +5387,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, args.cloud ? process.env.COZELOOP_API_BASE_URL : undefined);
+  const verifyResult = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(args.cloud));
   if (verifyResult.success) {
     cloudResult.verify = 'ok';
   } else if (CLOUD_MODE) {

package/package.json

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

package/scripts/codex/cozeloop_hook.py

@@ -210,8 +210,16 @@ def _refresh_token(refresh_tok: str):
 
 def _normalize_api_base_url(url: str) -> str:
     base = (url or "").strip().rstrip("/")
+    if base.endswith(_OTEL_SUFFIX + "/v1/traces"):
+        return base[:-len(_OTEL_SUFFIX + "/v1/traces")].rstrip("/")
+    if base.endswith("/api/v1/loop/opentelemetry/v1/traces"):
+        return base[:-len("/v1/loop/opentelemetry/v1/traces")].rstrip("/")
     if base.endswith(_OTEL_SUFFIX):
         return base[:-len(_OTEL_SUFFIX)].rstrip("/")
+    if base.endswith("/api/v1/loop/opentelemetry"):
+        return base[:-len("/v1/loop/opentelemetry")].rstrip("/")
+    if base.endswith("/api/v1"):
+        return base[:-len("/v1")].rstrip("/")
     return base
 
 
@@ -850,7 +858,12 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, model_n
         hook_log(f"token resolved prefix={token[:12]}...")
         print(f"[CozeLoop] Token 获取成功 ({token[:12]}...)", file=sys.stderr)
     else:
-        hook_log("token missing")
+        hook_log(
+            "token missing "
+            f"has_cozeloop_token={bool(os.environ.get('COZELOOP_API_TOKEN'))} "
+            f"has_coze_token={bool(os.environ.get('COZE_API_TOKEN'))} "
+            f"api_base_url={bool(get_api_base_url())}"
+        )
         print("[CozeLoop] 警告: 未找到有效 Token，上报可能失败", file=sys.stderr)
     creds = _load_credentials()
     workspace_id = (creds or {}).get("workspace_id") or os.environ.get("COZELOOP_WORKSPACE_ID", "") or _DEFAULT_WORKSPACE_ID