coze_lab 0.1.19 → 0.1.21

package/index.js

@@ -9,6 +9,7 @@ const PPE_TT_ENV  = 'ppe_cozelab';
 const PPE_USE_PPE = '1';
 const COZE_API    = 'https://api.coze.cn';
 const CREDS_PATH  = require('path').join(require('os').homedir(), '.cozeloop', 'credentials.json');
+const PACKAGE_VERSION = require('./package.json').version;
 // Refresh when less than 10 minutes remain
 const REFRESH_THRESHOLD_MS = 10 * 60 * 1000;
 
@@ -16,7 +17,7 @@ const REFRESH_THRESHOLD_MS = 10 * 60 * 1000;
 // 云端（--cloud）模式：在 stdout 输出一行机器可读结果 COZE_LAB_RESULT={...}，
 // 供管理后台解析判定（inject/verify/logid/message），不依赖中文文案。
 let CLOUD_MODE = false;
-const cloudResult = { inject: 'skip', verify: 'skip', logid: '', message: '' };
+const cloudResult = { version: PACKAGE_VERSION, inject: 'skip', verify: 'skip', logid: '', message: '' };
 
 // errorBox 在云端模式下抛此异常（而非 process.exit），由 main 外层统一收尾。
 class CloudAbort extends Error {}
@@ -4669,15 +4670,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 getCloudCozeloopBaseUrl() {
-  const endpoint = process.env.COZELOOP_API_BASE_URL || process.env.OTEL_ENDPOINT || '';
-  return endpoint.replace(/\/v1\/loop\/opentelemetry\/?$/, '').replace(/\/+$/, '') || undefined;
+function getOtelTracesUrl(cloud) {
+  return `${getOtelEndpointBase(cloud).replace(/\/+$/, '')}/v1/traces`;
 }
 
 function applyOpenClawPluginConfig(existing, token, workspaceId, agentId, cloud) {
@@ -4699,7 +4723,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（去重、归一为小写，
@@ -4855,7 +4879,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 时间（字符串）
@@ -4888,12 +4912,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 },
     );
@@ -5180,7 +5202,7 @@ const NEXT_STEP = {
 
 async function main() {
   console.log('');
-  info('CozeLoop Onboard CLI starting...');
+  info(`CozeLoop Onboard CLI starting... (coze_lab v${PACKAGE_VERSION})`);
   console.log('');
 
   const args = validateArgs(parseArgs());
@@ -5244,7 +5266,7 @@ async function main() {
     info('验证 trace 上报链路...');
     const token = await getValidToken();   // 无凭证会自动走登录/刷新
     console.log('');
-    const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getCloudCozeloopBaseUrl());
+    const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(false));
     process.exit(result.success ? 0 : 1);
   }
 
@@ -5336,6 +5358,7 @@ async function main() {
 
   // Success summary（用实际写入路径，per-agent / 自定义 CODEX_HOME 时也准确）
   const summaryLines = [
+    `Onboard:     coze_lab v${PACKAGE_VERSION}`,
     `Agent:       ${agent} v${version}`,
   ];
   if (args.agentId) summaryLines.push(`Agent ID:    ${args.agentId}`);
@@ -5366,7 +5389,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 ? getCloudCozeloopBaseUrl() : 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.19",
+  "version": "0.1.21",
   "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