coze_lab 0.1.17 → 0.1.19

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,19 +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(shellEnvLine('COZELOOP_API_BASE_URL', process.env.COZELOOP_API_BASE_URL));
+  } else if (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 });
@@ -4661,6 +4675,11 @@ function getOpenClawEndpoint(cloud) {
     : 'https://api.coze.cn/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 applyOpenClawPluginConfig(existing, token, workspaceId, agentId, cloud) {
   if (!existing.plugins)         existing.plugins = {};
   if (!existing.plugins.allow)   existing.plugins.allow = [];
@@ -4815,7 +4834,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 || {}) } },
@@ -5225,7 +5244,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, getCloudCozeloopBaseUrl());
     process.exit(result.success ? 0 : 1);
   }
 
@@ -5347,7 +5366,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, args.cloud ? getCloudCozeloopBaseUrl() : undefined);
   if (verifyResult.success) {
     cloudResult.verify = 'ok';
   } else if (CLOUD_MODE) {

package/package.json

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

package/scripts/codex/cozeloop_hook.py

@@ -46,6 +46,7 @@ _COZELOOP_CLIENT_ID = "46371084383473718052118955183420.app.coze"
 _COZE_API = "https://api.coze.cn"
 _REFRESH_THRESHOLD = 10 * 60
 _DEFAULT_WORKSPACE_ID = "7644910356078837760"  # hardcoded spaceID fallback
+_OTEL_SUFFIX = "/v1/loop/opentelemetry"
 
 
 # --- coze-context parsing -------------------------------------------------
@@ -98,6 +99,22 @@ def coze_context_tags(text: str) -> Dict[str, str]:
     return {f"coze_{k}": v for k, v in parse_coze_context(text).items()}
 
 
+def turn_coze_context(turn: Dict[str, Any]) -> Dict[str, str]:
+    """Extract coze-context from a grouped turn with fallbacks for Codex rollout shapes."""
+    texts = [turn.get("user_message_text", "")]
+    for msg in turn.get("input_messages", []):
+        if isinstance(msg, dict):
+            texts.append(str(msg.get("content", "")))
+    user_payload = turn.get("user_message")
+    if isinstance(user_payload, dict):
+        texts.append(extract_message_content_text(user_payload))
+    for text in texts:
+        ctx = parse_coze_context(text)
+        if ctx:
+            return ctx
+    return {}
+
+
 # --- trace upload failure / logid capture ---------------------------------
 def _extract_logid(msg: str) -> str:
     """Pull the server logid out of an SDK error message, if present.
@@ -190,6 +207,20 @@ def _refresh_token(refresh_tok: str):
         pass
     return None
 
+
+def _normalize_api_base_url(url: str) -> str:
+    base = (url or "").strip().rstrip("/")
+    if base.endswith(_OTEL_SUFFIX):
+        return base[:-len(_OTEL_SUFFIX)].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():
     creds = _load_credentials()
     if creds:
@@ -200,8 +231,14 @@ def get_fresh_token():
             new_token = _refresh_token(creds["refresh_token"])
             if new_token:
                 return new_token
-    # 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")
+    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"):
+        hook_log("COZE_API_TOKEN present but ignored without COZELOOP_API_BASE_URL or OTEL_ENDPOINT")
+    return None
 # -------------------------------------------------------------------------
 
 # --- SDK Import ---
@@ -516,6 +553,8 @@ def is_real_user_message(payload: Dict[str, Any]) -> bool:
         if item.get("type") != "input_text":
             continue
         text = item.get("text", "")
+        if parse_coze_context(text):
+            return True
         if text.startswith("<environment_context>"):
             continue
         if text.startswith("<permissions instructions>"):
@@ -534,9 +573,10 @@ def extract_user_text(payload: Dict[str, Any]) -> str:
     for item in payload.get("content", []):
         if isinstance(item, dict) and item.get("type") == "input_text":
             text = item.get("text", "")
-            if (not text.startswith("<environment_context>") and
+            if (parse_coze_context(text) or
+                    (not text.startswith("<environment_context>") and
                     not text.startswith("<permissions instructions>") and
-                    not text.startswith("<turn_aborted>")):
+                    not text.startswith("<turn_aborted>"))):
                 parts.append(text)
     return "\n".join(parts)
 
@@ -810,7 +850,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
@@ -821,6 +866,10 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, model_n
         "upload_timeout": 120,
         "trace_finish_event_processor": _make_finish_event_processor(),
     }
+    api_base_url = get_api_base_url()
+    if api_base_url:
+        client_kwargs["api_base_url"] = api_base_url
+        hook_log(f"api_base_url={api_base_url}")
     if workspace_id:
         client_kwargs["workspace_id"] = workspace_id
     if token:
@@ -859,7 +908,7 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, model_n
             # Inject coze-context kv (last occurrence across turns wins).
             coze_tags = {}
             for turn in turns:
-                t = coze_context_tags(turn.get("user_message_text", ""))
+                t = {f"coze_{k}": v for k, v in turn_coze_context(turn).items()}
                 if t:
                     coze_tags = t
             if coze_tags:
@@ -1276,7 +1325,7 @@ def main():
     # Send turns to CozeLoop — only if at least one turn carries coze-context.
     if turns:
         has_coze_ctx = any(
-            parse_coze_context(t.get("user_message_text", ""))
+            turn_coze_context(t)
             for t in turns
         )
         if not has_coze_ctx:

package/scripts/openclaw/dist/index.js

@@ -22,7 +22,11 @@ function safeClone(value) {
 // --- coze-context parsing ---------------------------------------------------
 // User input may embed a <coze-context>...</coze-context> block with key:value
 // lines (agent_id, session_id, message_id, account_id, ...). Parse the LAST
-// block and inject the pairs (prefixed "coze.") into the root span attributes.
+// block and inject the pairs (prefixed "coze_") into the root span attributes.
+// NOTE: prefix MUST be "coze_" (underscore) to match the cozelab backend trace
+// query field names (coze_message_id / coze_agent_id) and stay consistent with
+// the claude-code / codex hooks. Do NOT use "coze." (dot) — backend Eq filter
+// matches tag keys exactly and would never hit dotted keys.
 const COZE_CTX_OPEN = "<coze-context>";
 const COZE_CTX_CLOSE = "</coze-context>";
 function cozeInputToText(input) {
@@ -67,7 +71,7 @@ function parseCozeContext(input) {
         const key = line.slice(0, sep).trim();
         const value = line.slice(sep + 1).trim();
         if (key)
-            out["coze." + key] = value;
+            out["coze_" + key] = value;
     }
     return out;
 }