coze_lab 0.1.20 → 0.1.22

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 {}
@@ -4471,8 +4472,6 @@ function shellEnvLine(key, value) {
 // writeClaudeCodeHook 配置 Claude Code 的 hook。
 // configBaseDir 缺省 process.cwd()（全局/项目级）；传入 agent 的 workspace 则 per-agent：
 // settings.json + 凭证写进 <configBaseDir>/.claude，仅该 agent（以此为 cwd 启动）生效。
-// cloud=true 时不把明文 token 写进 settings.local.json —— 云端 hook 运行时直接读
-// 环境变量 COZE_API_TOKEN（见 scripts/claude-code/cozeloop_hook.py 的 get_fresh_token）。
 function writeClaudeCodeHook(patToken, workspaceId, pythonCmd, configBaseDir, cloud) {
   const hooksDir    = path.join(os.homedir(), '.claude', 'hooks');
   const hookScript  = path.join(hooksDir, 'cozeloop_hook.py');
@@ -4526,12 +4525,24 @@ function writeClaudeCodeHook(patToken, workspaceId, pythonCmd, configBaseDir, cl
   const localSettings = mergeJson(localSettingsPath, (existing) => {
     if (!existing.env) existing.env = {};
     existing.env.COZELOOP_WORKSPACE_ID = workspaceId;
-    // 云端：token 由 sandbox 注入到环境变量 COZE_API_TOKEN，hook 运行时直接读，
-    // 不在配置文件落明文 token。本地：写入 OAuth 拿到的 token。
     if (cloud) {
-      delete existing.env.COZELOOP_API_TOKEN;
+      if (process.env.COZELOOP_API_TOKEN) {
+        existing.env.COZELOOP_API_TOKEN = process.env.COZELOOP_API_TOKEN;
+        delete existing.env.COZE_API_TOKEN;
+      } else if (process.env.COZE_API_TOKEN) {
+        existing.env.COZE_API_TOKEN = process.env.COZE_API_TOKEN;
+        delete existing.env.COZELOOP_API_TOKEN;
+      }
     } else {
       existing.env.COZELOOP_API_TOKEN = patToken;
+      delete existing.env.COZE_API_TOKEN;
+    }
+    if (process.env.COZELOOP_API_BASE_URL) {
+      existing.env.COZELOOP_API_BASE_URL = process.env.COZELOOP_API_BASE_URL;
+      delete existing.env.OTEL_ENDPOINT;
+    } else if (process.env.OTEL_ENDPOINT) {
+      existing.env.OTEL_ENDPOINT = process.env.OTEL_ENDPOINT;
+      delete existing.env.COZELOOP_API_BASE_URL;
     }
     // PPE 泳道：cozeloop SDK 读这两个环境变量，自动注入 x-tt-env / x-use-ppe header
     existing.env.x_tt_env  = PPE_TT_ENV;
@@ -4874,6 +4885,103 @@ function httpsPost(url, body, extraHeaders) {
   });
 }
 
+function runCommand(input) {
+  return new Promise((resolve) => {
+    const { spawn } = require('child_process');
+    const child = spawn(input.cmd, input.args || [], {
+      env: input.env || process.env,
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    let stdout = '';
+    let stderr = '';
+    let timedOut = false;
+    const timer = setTimeout(() => {
+      timedOut = true;
+      child.kill('SIGKILL');
+    }, input.timeoutMs || 30000);
+    child.stdout.on('data', chunk => { stdout += chunk.toString(); });
+    child.stderr.on('data', chunk => { stderr += chunk.toString(); });
+    child.on('close', code => {
+      clearTimeout(timer);
+      resolve({ code: timedOut ? -1 : code, stdout, stderr, timedOut });
+    });
+    child.stdin.end(input.stdin || '');
+  });
+}
+
+async function verifyTraceReportViaSdk(token, workspaceId, pairCode, pythonCmd) {
+  const pair = pairCode || crypto.randomBytes(6).toString('hex');
+  const script = `
+import json
+import os
+import sys
+
+events = []
+
+def finish_event(info):
+    if getattr(info, "is_event_fail", False):
+        events.append(getattr(info, "detail_msg", "") or "trace export failed")
+
+try:
+    import cozeloop
+    kwargs = {
+        "workspace_id": os.environ["COZELOOP_WORKSPACE_ID"],
+        "api_token": os.environ["COZELOOP_API_TOKEN"],
+        "upload_timeout": 30,
+        "trace_finish_event_processor": finish_event,
+    }
+    api_base_url = os.environ.get("COZELOOP_API_BASE_URL", "").strip()
+    if api_base_url:
+        kwargs["api_base_url"] = api_base_url
+    client = cozeloop.new_client(**kwargs)
+    with client.start_span(name="cozelab-onboard-selfcheck", span_type="main", start_new_trace=True) as span:
+        span.set_tags({"pair_code": os.environ.get("COZELOOP_PAIR_CODE", ""), "source": "cozelab-onboard"})
+        span.set_input("cozelab-onboard selfcheck")
+        span.set_output("ok")
+    client.flush()
+    client.close()
+    if events:
+        print(json.dumps({"success": False, "body": "\\n".join(events)}, ensure_ascii=False))
+        sys.exit(1)
+    print(json.dumps({"success": True, "body": ""}, ensure_ascii=False))
+except Exception as e:
+    print(json.dumps({"success": False, "body": str(e)}, ensure_ascii=False))
+    sys.exit(1)
+`;
+  const env = {
+    ...process.env,
+    COZELOOP_WORKSPACE_ID: workspaceId,
+    COZELOOP_API_TOKEN: token,
+    COZELOOP_PAIR_CODE: pair,
+    x_tt_env: PPE_TT_ENV,
+    x_use_ppe: PPE_USE_PPE,
+  };
+  const apiBase = getCozeloopApiBaseUrl(true);
+  if (apiBase) env.COZELOOP_API_BASE_URL = apiBase;
+  const result = await runCommand({
+    cmd: pythonCmd || 'python3',
+    args: ['-c', script],
+    env,
+    timeoutMs: 45000,
+  });
+  let parsed = null;
+  const out = (result.stdout || '').trim().split(/\n/).filter(Boolean).pop();
+  if (out) {
+    try { parsed = JSON.parse(out); } catch { /* keep null */ }
+  }
+  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})`);
+    info(`查询方可用 pair_code=${pair} 在 CozeLoop 回查确认该 trace 已落库。`);
+  } else {
+    warn(`trace 上报失败: SDK selfcheck exit ${result.code}`);
+    const snippet = String(body || '').slice(0, 300);
+    if (snippet) console.log(snippet);
+  }
+  return { success, status: result.code || 0, body, traceId: '', pairCode: pair };
+}
+
 // 真实发一条最小 OTLP trace 到 CozeLoop，验证上报链路是否打通。
 // 只看 HTTP 状态码（2xx=通），不回查 trace 是否落库——回查由外部查询方完成。
 // pairCode 写进 span 的 pair_code attribute，供查询方按该字段过滤回查；缺省自动生成。
@@ -5201,7 +5309,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());
@@ -5357,6 +5465,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}`);
@@ -5387,7 +5496,9 @@ 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, getOtelTracesUrl(args.cloud));
+  const verifyResult = args.cloud
+    ? await verifyTraceReportViaSdk(token, WORKSPACE_ID, args.pairCode, pythonCmd || 'python3')
+    : await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(false));
   if (verifyResult.success) {
     cloudResult.verify = 'ok';
   } else if (CLOUD_MODE) {

package/package.json

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

package/scripts/claude-code/cozeloop_hook.py

@@ -82,6 +82,7 @@ else:
 DEBUG = os.environ.get("CC_COZELOOP_DEBUG", "").lower() == "true"
 _COZELOOP_CLIENT_ID = "46371084383473718052118955183420.app.coze"
 _COZE_API = "https://api.coze.cn"
+_OTEL_SUFFIX = "/v1/loop/opentelemetry"
 _REFRESH_THRESHOLD = 10 * 60  # refresh when < 10 minutes remain
 _DEFAULT_WORKSPACE_ID = "7644910356078837760"  # hardcoded spaceID fallback
 
@@ -247,8 +248,32 @@ def _refresh_token(refresh_token: str) -> Optional[str]:
         debug_log(f"Token refresh failed: {e}")
     return None
 
+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
+
+def get_api_base_url() -> str:
+    return _normalize_api_base_url(
+        os.environ.get("COZELOOP_API_BASE_URL", "") or os.environ.get("OTEL_ENDPOINT", "")
+    )
+
 def get_fresh_token() -> Optional[str]:
     """Return a valid access token, refreshing if needed. Falls back to env var."""
+    api_base_url = get_api_base_url()
+    env_token = os.environ.get("COZELOOP_API_TOKEN")
+    env_coze_token = os.environ.get("COZE_API_TOKEN")
+    if api_base_url and (env_token or env_coze_token):
+        return env_token or env_coze_token
     creds = _load_credentials()
     if creds:
         expires_at_sec = creds.get("expires_at", 0) / 1000
@@ -262,8 +287,13 @@ def get_fresh_token() -> Optional[str]:
             if new_token:
                 return new_token
             debug_log("Refresh failed, falling back to env var.")
-    # Cloud sandbox: token lives in COZE_API_TOKEN (no credentials.json / refresh).
-    return os.environ.get("COZELOOP_API_TOKEN") or os.environ.get("COZE_API_TOKEN")
+    if env_token:
+        return env_token
+    if api_base_url:
+        return env_coze_token
+    if env_coze_token:
+        debug_log("COZE_API_TOKEN present but ignored without COZELOOP_API_BASE_URL or OTEL_ENDPOINT")
+    return None
 
 # -------------------------------------------------------------------------
 
@@ -873,6 +903,9 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, history
         client_kwargs["workspace_id"] = workspace_id
     if token:
         client_kwargs["api_token"] = token
+    api_base_url = get_api_base_url()
+    if api_base_url:
+        client_kwargs["api_base_url"] = api_base_url
     client = cozeloop.new_client(**client_kwargs)
 
     try:
@@ -1448,5 +1481,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-

package/scripts/codex/cozeloop_hook.py

@@ -230,6 +230,11 @@ def get_api_base_url() -> str:
 
 
 def get_fresh_token():
+    api_base_url = get_api_base_url()
+    env_token = os.environ.get("COZELOOP_API_TOKEN")
+    env_coze_token = os.environ.get("COZE_API_TOKEN")
+    if api_base_url and (env_token or env_coze_token):
+        return env_token or env_coze_token
     creds = _load_credentials()
     if creds:
         remaining = creds.get("expires_at", 0) / 1000 - time.time()
@@ -239,12 +244,11 @@ def get_fresh_token():
             new_token = _refresh_token(creds["refresh_token"])
             if new_token:
                 return new_token
-    token = os.environ.get("COZELOOP_API_TOKEN")
-    if token:
-        return token
-    if get_api_base_url():
-        return os.environ.get("COZE_API_TOKEN")
-    if os.environ.get("COZE_API_TOKEN"):
+    if env_token:
+        return env_token
+    if api_base_url:
+        return env_coze_token
+    if env_coze_token:
         hook_log("COZE_API_TOKEN present but ignored without COZELOOP_API_BASE_URL or OTEL_ENDPOINT")
     return None
 # -------------------------------------------------------------------------