coze_lab 0.1.12 → 0.1.14

package/index.js

@@ -4622,19 +4622,107 @@ function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud) {
 // agentId 非空时并入 plugins.entries[...].config.traceAgentIds allowlist —— 插件运行时
 // 用 resolveAgentIdFromHookCtx 取当前 agentId，仅 allowlist 内的 agent 才上报 trace。
 // allowlist 为空（本地全局模式）= 全部放行，向后兼容。
-function writeOpenClawHook(token, workspaceId, agentId) {
-  const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
-  const pluginDir  = path.join(os.homedir(), '.cozeloop', 'openclaw-plugin');
+// resolveHomeDir 解析 home 目录。云端 SandboxShellExec 执行环境的 $HOME 可能缺失/不一致，
+// 导致 os.homedir() 解析不到真实 home（如 /root）。云端模式下做兜底探测。
+function resolveHomeDir(cloud) {
+  const h = os.homedir();
+  if (!cloud) return h;
+  // 优先 $HOME，其次 os.homedir()，再回退云端常见 root home。
+  const candidates = [process.env.HOME, h, '/root'].filter(Boolean);
+  for (const c of candidates) {
+    try {
+      if (fs.existsSync(path.join(c, '.coze')) || fs.existsSync(path.join(c, '.openclaw'))) {
+        return c;
+      }
+    } catch { /* ignore */ }
+  }
+  return h || '/root';
+}
+
+function normalizeTraceAgentIds(ids) {
+  return (Array.isArray(ids) ? ids : [])
+    .map((s) => String(s).trim().toLowerCase())
+    .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 applyOpenClawPluginConfig(existing, token, workspaceId, agentId, cloud) {
+  if (!existing.plugins)         existing.plugins = {};
+  if (!existing.plugins.allow)   existing.plugins.allow = [];
+  if (!existing.plugins.entries) existing.plugins.entries = {};
+
+  const PLUGIN = 'openclaw-cozeloop-trace';
+  if (!existing.plugins.allow.includes(PLUGIN)) {
+    existing.plugins.allow.push(PLUGIN);
+  }
+  // Preserve existing entry structure, only update config.
+  if (!existing.plugins.entries[PLUGIN]) {
+    existing.plugins.entries[PLUGIN] = { enabled: true };
+  }
+  existing.plugins.entries[PLUGIN].enabled = true;
+  // hooks.allowConversationAccess required for 2026.5+ to access session content.
+  existing.plugins.entries[PLUGIN].hooks = { allowConversationAccess: true };
+  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.workspaceId   = workspaceId;
+  pcfg.debug         = true;
+  // per-agent trace 放行：把当前 agentId 并入 traceAgentIds（去重、归一为小写，
+  // 与插件侧 resolveAgentIdFromHookCtx 的归一一致）。无 agentId（全局模式）则不动
+  // allowlist —— 空 allowlist 表示全部放行。
+  if (agentId) {
+    const norm = String(agentId).trim().toLowerCase();
+    const list = normalizeTraceAgentIds(pcfg.traceAgentIds);
+    if (norm && !list.includes(norm)) list.push(norm);
+    pcfg.traceAgentIds = list;
+  }
+  return existing;
+}
+
+function isOpenClawAlreadyInjected(configPath, pluginDir, token, workspaceId, agentId, cloud) {
+  if (!fs.existsSync(pluginDir)) return false;
+  let existing;
+  try {
+    existing = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  } catch {
+    return false;
+  }
+  const desired = applyOpenClawPluginConfig(
+    JSON.parse(JSON.stringify(existing)),
+    token,
+    workspaceId,
+    agentId,
+    cloud,
+  );
+  return JSON.stringify(existing) === JSON.stringify(desired);
+}
+
+function writeOpenClawHook(token, workspaceId, agentId, cloud) {
+  const home       = resolveHomeDir(cloud);
+  const configPath = path.join(home, '.openclaw', 'openclaw.json');
+  const pluginDir  = path.join(home, '.cozeloop', 'openclaw-plugin');
 
   if (!fs.existsSync(configPath)) {
     errorBox([
-      'ERROR: ~/.openclaw/openclaw.json not found',
+      `ERROR: openclaw.json not found at ${configPath}`,
       '',
       'Make sure OpenClaw is installed and has been run at least once.',
-      'Install: npm install -g openclaw',
+      `(home=${home}, $HOME=${process.env.HOME || 'unset'})`,
     ]);
   }
 
+  if (isOpenClawAlreadyInjected(configPath, pluginDir, token, workspaceId, agentId, cloud)) {
+    ok(`OpenClaw plugin already configured in ${configPath}`);
+    info('OpenClaw gateway restart skipped (configuration unchanged).');
+    return { configPath, pluginDir, unchanged: true };
+  }
+
   // 1. Write plugin files to ~/.cozeloop/openclaw-plugin/
   ensureDir(pluginDir);
   ensureDir(path.join(pluginDir, 'dist'));
@@ -4685,41 +4773,7 @@ function writeOpenClawHook(token, workspaceId, agentId) {
 
   // 4. Update openclaw.json with token and workspace
   const config = mergeJson(configPath, (existing) => {
-    if (!existing.plugins)         existing.plugins = {};
-    if (!existing.plugins.allow)   existing.plugins.allow = [];
-    if (!existing.plugins.entries) existing.plugins.entries = {};
-
-    const PLUGIN = 'openclaw-cozeloop-trace';
-    if (!existing.plugins.allow.includes(PLUGIN)) {
-      existing.plugins.allow.push(PLUGIN);
-    }
-    // Preserve existing entry structure, only update config
-    if (!existing.plugins.entries[PLUGIN]) {
-      existing.plugins.entries[PLUGIN] = { enabled: true };
-    }
-    existing.plugins.entries[PLUGIN].enabled = true;
-    // hooks.allowConversationAccess required for 2026.5+ to access session content
-    existing.plugins.entries[PLUGIN].hooks = { allowConversationAccess: true };
-    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';
-    pcfg.workspaceId   = workspaceId;
-    pcfg.debug         = true;
-    // per-agent trace 放行：把当前 agentId 并入 traceAgentIds（去重、归一为小写，
-    // 与插件侧 resolveAgentIdFromHookCtx 的归一一致）。无 agentId（全局模式）则不动
-    // allowlist —— 空 allowlist 表示全部放行。
-    if (agentId) {
-      const norm = String(agentId).trim().toLowerCase();
-      // 读 existing 时一并归一（小写、去空），与插件侧 resolveAgentIdFromHookCtx 一致，
-      // 防手工编辑混入大写条目导致去重失效。
-      const list = (Array.isArray(pcfg.traceAgentIds) ? pcfg.traceAgentIds : [])
-        .map((s) => String(s).trim().toLowerCase())
-        .filter(Boolean);
-      if (norm && !list.includes(norm)) list.push(norm);
-      pcfg.traceAgentIds = list;
-    }
-    return existing;
+    return applyOpenClawPluginConfig(existing, token, workspaceId, agentId, cloud);
   });
 
   try {
@@ -4772,7 +4826,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 +4859,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 +5215,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 +5296,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 +5333,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.12",
+  "version": "0.1.14",
   "description": "Configure local AI agents (Claude Code, Codex, OpenClaw) to report traces to CozeLoop",
   "keywords": [
     "cozeloop",