coze_lab 0.1.52 → 0.1.53

package/index.js

@@ -96,6 +96,7 @@ const C = {
 };
 
 function log(prefix, color, msg) {
+  if (process.env.COZELAB_ONBOARD_VERBOSE !== '1') return;
   console.log(`${color}${prefix}${C.reset} ${msg}`);
 }
 const ok   = (msg) => log('[✓]', C.green,  msg);
@@ -123,6 +124,7 @@ function errorBox(lines) {
 }
 
 function warnBox(lines) {
+  if (process.env.COZELAB_ONBOARD_VERBOSE !== '1') return;
   box(lines, C.yellow);
 }
 
@@ -549,6 +551,48 @@ function isVersionAtLeast(version, minVersion) {
   return true;
 }
 
+// Codex docs now use [features].hooks as the canonical key; codex_hooks is a
+// deprecated alias. Keep the alias only for explicitly detected older CLIs.
+const CODEX_CANONICAL_HOOKS_FEATURE_MIN_VERSION = '0.134.0';
+
+function codexHooksFeatureKey(version) {
+  const hasKnownVersion = parseVersionNumbers(version).length > 0;
+  if (hasKnownVersion && !isVersionAtLeast(version, CODEX_CANONICAL_HOOKS_FEATURE_MIN_VERSION)) {
+    return 'codex_hooks';
+  }
+  return 'hooks';
+}
+
+function normalizeCodexHooksFeatureConfig(configToml, codexVersion) {
+  const featureKey = codexHooksFeatureKey(codexVersion);
+  const lines = String(configToml || '').replace(/\r\n/g, '\n').split('\n');
+  if (lines.length && lines[lines.length - 1] === '') lines.pop();
+
+  const featureHeaderRe = /^\s*\[features\]\s*(?:#.*)?$/;
+  const tableHeaderRe = /^\s*\[\[?[^\]]+\]\]?\s*(?:#.*)?$/;
+  const hookFeatureRe = /^\s*(hooks|codex_hooks)\s*=/;
+  const featureIdx = lines.findIndex((line) => featureHeaderRe.test(line));
+
+  if (featureIdx === -1) {
+    const out = [...lines];
+    if (out.length && out[out.length - 1].trim() !== '') out.push('');
+    out.push('[features]', `${featureKey} = true`);
+    return out.join('\n') + '\n';
+  }
+
+  let endIdx = featureIdx + 1;
+  while (endIdx < lines.length && !tableHeaderRe.test(lines[endIdx])) {
+    endIdx += 1;
+  }
+
+  const before = lines.slice(0, featureIdx);
+  const section = lines.slice(featureIdx, endIdx).filter((line, idx) => idx === 0 || !hookFeatureRe.test(line));
+  section.splice(1, 0, `${featureKey} = true`);
+  const after = lines.slice(endIdx);
+
+  return [...before, ...section, ...after].join('\n') + '\n';
+}
+
 // ─── 7. Hook writers ─────────────────────────────────────────────────────────
 const fs   = require('fs');
 const path = require('path');
@@ -729,13 +773,14 @@ function writeClaudeCodeHook(token, workspaceId, pythonCmd, configBaseDir, cloud
 // 传入动态目录（如 coze-bridge 的 /tmp/coze-bridge-codex-home-xxx）即可 per-agent 生效。
 // 本地 --agent-id 从 config.patToken 写入 token，并用 COZELOOP_TOKEN_SOURCE 标记来源。
 // cloud=true 时写 COZELAB_ONBOARD_CLOUD，并带入 sandbox 注入的 trace token。
-function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud, tokenSource) {
+function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud, tokenSource, codexVersion) {
   const home       = codexHome || path.join(os.homedir(), '.codex');
   const hooksDir   = path.join(home, 'hooks');
   const hookScript = path.join(hooksDir, 'cozeloop_hook.py');
   const envFile    = path.join(hooksDir, 'cozeloop.env');
   const logFile    = path.join(hooksDir, 'cozeloop.log');
   const hooksJson  = path.join(home, 'hooks.json');
+  const configToml = path.join(home, 'config.toml');
 
   // 1. Write Python hook script
   ensureDir(hooksDir);
@@ -810,9 +855,22 @@ function writeCodexHook(token, workspaceId, pythonCmd, codexHome, cloud, tokenSo
     errorBox([`ERROR: Cannot write ${hooksJson}`, '', e.message]);
   }
   ok(`Hook registered in ${hooksJson}`);
+
+  // 4. Normalize Codex hook feature flag. hooks.json carries hook definitions;
+  //    config.toml carries the on/off feature gate. Re-running onboard should
+  //    clean the deprecated codex_hooks alias for modern Codex versions.
+  const featureKey = codexHooksFeatureKey(codexVersion);
+  try {
+    const existingConfig = fs.existsSync(configToml) ? fs.readFileSync(configToml, 'utf8') : '';
+    const nextConfig = normalizeCodexHooksFeatureConfig(existingConfig, codexVersion);
+    atomicWriteFileSync(configToml, nextConfig);
+  } catch (e) {
+    errorBox([`ERROR: Cannot update ${configToml}`, '', e.message]);
+  }
+  ok(`Codex hooks feature enabled via [features].${featureKey} in ${configToml}`);
   warn('Codex hook trust: 首次启动 Codex 会提示 "Hooks need review"。在该提示按 t（Trust all and continue），或在会话内运行 /hooks 后按 t，即可一次性信任全部 hook 启用 trace 上报。');
 
-  return { hookScript, envFile, hooksJson, logFile };
+  return { hookScript, envFile, hooksJson, configToml, logFile };
 }
 
 function resolveCodexHome(args) {
@@ -1291,8 +1349,6 @@ except Exception as e:
   } else {
     warn(`trace 上报失败: SDK selfcheck exit ${result.code}`);
     info(`trace selfcheck api_base_url=${apiBase || COZE_API}, token_source=${tokenSource || 'unknown'}`);
-    const snippet = String(body || '').slice(0, 300);
-    if (snippet) console.log(snippet);
   }
   return { success, status: result.code || 0, body, traceId: '', pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: parsed?.logid || extractLogid(body) || '' };
 }
@@ -1365,8 +1421,6 @@ async function verifyCloudTraceReport(token, workspaceId, pairCode, tokenSource)
       info(`查询方可用 pair_code=${pair} 在 CozeLoop 回查确认该 trace 已落库。`);
     } else {
       warn(`trace 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')}`);
-      const snippet = (res.body || '').slice(0, 300);
-      if (snippet) console.log(snippet);
     }
     return { success, status: res.status, body: res.body || '', traceId, pairCode: pair, apiBaseUrl: apiBase, tokenSource, logid: res.logid || extractLogid(res.body || '') };
   } catch (e) {
@@ -1431,8 +1485,6 @@ async function verifyTraceReport(token, workspaceId, pairCode, tracesUrl) {
     info(`查询方可用 pair_code=${pair} 在 CozeLoop 回查确认该 trace 已落库。`);
   } else {
     warn(`trace 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')}`);
-    const snippet = (res.body || '').slice(0, 300);
-    if (snippet) console.log(snippet);
   }
   return { success, status: res.status, body: res.body, traceId, pairCode: pair, logid: res.logid || extractLogid(res.body || '') };
 }
@@ -1534,8 +1586,6 @@ async function verifyOpenClawTraceLink(cloud, pairCode) {
     ok(`openclaw 插件实际 token 上报正常 (token=${tokenPrefix}..., HTTP ${res.status}${formatLogid(res.logid || '')})`);
   } else {
     warn(`openclaw 插件实际 token 上报失败: HTTP ${res.status}${formatLogid(res.logid || '')} (token=${tokenPrefix}...)`);
-    const snippet = (res.body || '').slice(0, 300);
-    if (snippet) console.log(snippet);
     // 4100/401 = 该 token 已失效。指出根因与修复方式。
     if (res.status === 401 || /\b4100\b/.test(res.body || '')) {
       info('插件配置的 token 已失效。运行时上报会 401，span 会丢失。');
@@ -1576,9 +1626,7 @@ function openClawNextStep(written) {
 }
 
 async function main() {
-  console.log('');
   info(`CozeLoop Onboard CLI starting... (coze_lab v${PACKAGE_VERSION})`);
-  console.log('');
 
   const args = validateArgs(parseArgs());
 
@@ -1607,7 +1655,6 @@ async function main() {
         '请确认 ~/.coze/agents/<id>/config.json 包含 patToken 后重试。',
       ]);
     }
-    console.log('');
     const result = await verifyTraceReport(token, WORKSPACE_ID, args.pairCode, getOtelTracesUrl(false));
     // 若本机装了 openclaw 插件，额外校验插件【实际配置的静态 token】——通用 verify 用刚刷新的
     // token 测不到它。任一失败则整体判失败（exit 1）。
@@ -1617,14 +1664,28 @@ async function main() {
       try {
         const cfg = JSON.parse(fs.readFileSync(ocConfigPath, 'utf8'));
         if (cfg?.plugins?.entries?.['openclaw-cozeloop-trace']?.config?.authorization) {
-          console.log('');
           info('检测到 openclaw cozeloop-trace 插件，校验其实际 token...');
           const ocRes = await verifyOpenClawTraceLink(args.cloud, args.pairCode);
           ocOk = ocRes.success;
         }
       } catch { /* 读不了就跳过 openclaw 校验 */ }
     }
-    process.exit(result.success && ocOk ? 0 : 1);
+    if (result.success && ocOk) {
+      successBox([
+        `Verify:      coze_lab v${PACKAGE_VERSION}`,
+        `Trace:       OK (pair_code=${result.pairCode})`,
+      ]);
+      return;
+    }
+    errorBox([
+      'ERROR: trace 上报自检失败',
+      '',
+      `HTTP ${result.status}`,
+      `logid=${result.logid || extractLogid(result.body) || ''}`,
+      (result.body || '').slice(0, 300),
+      '',
+      '请确认 CozeLoop Token 具备 Trace ingest 权限，再重试。',
+    ]);
   }
 
   const { agent } = args;
@@ -1638,7 +1699,6 @@ async function main() {
   }
   if (args.agentId) {
     info(`目标 agent: ${args.agentId} (framework=${agent}, workspace=${agentWorkspace || 'N/A'}, deploy=${args.cloud ? 'cloud' : 'local'}, reason=${args.deployReason || 'n/a'})`);
-    console.log('');
   }
 
   // Step 1: Resolve trace token.
@@ -1683,12 +1743,9 @@ async function main() {
       ]);
     }
   }
-  console.log('');
-
   // Step 2: Detect agent binary
   info('Step 2/5: Detecting agent...');
   const version = detectAgent(agent, args.cloud);
-  console.log('');
 
   // Step 3: Environment checks
   info('Step 3/5: Checking environment...');
@@ -1698,7 +1755,6 @@ async function main() {
     checkCozeloopSdk(pythonCmd, { cloud: args.cloud });
   }
   checkVersionWhitelist(agent, version);
-  console.log('');
 
   // Step 4: Write hook configuration
   info('Step 4/5: Writing hook configuration...');
@@ -1723,14 +1779,13 @@ async function main() {
       info(`已创建云端 Codex 配置目录: ${codexHome}`);
     }
     if (codexHome) info(`Codex 配置目录: ${codexHome}`);
-    written = writeCodexHook(token, WORKSPACE_ID, pythonCmd, codexHome, args.cloud, tokenSource);
+    written = writeCodexHook(token, WORKSPACE_ID, pythonCmd, codexHome, args.cloud, tokenSource, version);
   } else {
     // openclaw：云端用 traceAgentIds allowlist 做 per-agent 放行。
     written = writeOpenClawHook(token, WORKSPACE_ID, args.agentId, args.cloud, args.force, tokenSource) || {};
   }
   // 走到这里说明 detectAgent / 环境检查 / 写 hook 配置全部成功 → 注入成功。
   cloudResult.inject = 'ok';
-  console.log('');
 
   // Success summary（用实际写入路径，per-agent / 自定义 CODEX_HOME 时也准确）
   const summaryLines = [
@@ -1745,6 +1800,7 @@ async function main() {
   } else if (agent === 'codex') {
     summaryLines.push(`Hook script: ${written.hookScript || '~/.codex/hooks/cozeloop_hook.py'}`);
     summaryLines.push(`Config:      ${written.hooksJson || '~/.codex/hooks.json'}`);
+    if (written.configToml) summaryLines.push(`Feature:     ${written.configToml}`);
     summaryLines.push(`Credentials: ${written.envFile || '~/.codex/hooks/cozeloop.env'}`);
     if (written.logFile) summaryLines.push(`Hook log:    ${written.logFile}`);
   } else {
@@ -1755,13 +1811,10 @@ async function main() {
 
   // Enterprise policy note for Claude Code
   if (agent === 'claude-code') {
-    console.log('');
     info('注意：企业托管模式下若 allowManagedHooksOnly=true，需管理员在策略中放行本地 hook。');
   }
   // Trace permission reminder for all agents
-  console.log('');
   info('确保 CozeLoop Token 具备 Trace ingest 权限，否则 hook 触发但上报会失败。');
-  console.log('');
 
   // Step 5: Verify trace reporting end-to-end
   info('Step 5/5: 验证 trace 上报链路...');
@@ -1783,7 +1836,6 @@ async function main() {
     cloudResult.logid = verifyResult.logid || extractLogid(verifyResult.body) || cloudResult.logid;
     cloudResult.message = `trace 上报自检失败 HTTP ${verifyResult.status}: ${(verifyResult.body || '').slice(0, 200)}`;
     warn('trace 上报自检失败，但 hook 配置已写入（云端放行）。');
-    console.log('');
     emitCloudResult();
     successBox(summaryLines);
     return;
@@ -1799,7 +1851,6 @@ async function main() {
       '请确认 CozeLoop Token 具备 Trace ingest 权限，再重试。',
     ]);   // errorBox 内部 process.exit(1)
   }
-  console.log('');
 
   emitCloudResult();
   successBox(summaryLines);
@@ -1833,5 +1884,7 @@ module.exports = {
   atomicWriteFileSync,
   VERSION_WHITELIST,
   VERSION_SUPPORT,
+  codexHooksFeatureKey,
+  normalizeCodexHooksFeatureConfig,
   isVersionAtLeast,
 };

package/package.json

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