@sanqianx/ai-coding-event-bridge-console 0.7.0 → 0.7.2

package/README.md

@@ -39,6 +39,13 @@ otherwise.
 | --- | --- |
 | `GET /api/health` | `{ ok, home, registeredProjects, first/lastSequence }` |
 | `GET /api/system/agents` | Detect installed agent tools (Claude Code / Codex / OpenCode: CLI, config, hook wiring) + bridge runtime info + consumers |
+
+Agent detection distinguishes a found command/config from installed capture.
+Consumer registration never installs an Agent hook. In a host-embedded console,
+“管理 Agent 采集” opens the host's connector installer. ZCode status requires both
+managed events and `hooks.enabled`; hooks installed under an explicit Bridge
+home read that home's runtime even when the external Agent inherits no home
+environment variable. ZCode's Claude-compatible payloads retain source `zcode`.
 | `POST /api/system/upgrade-runtime` | Materialize/activate the runtime at the core package version (designed same-major upgrade path) |
 | `GET /api/system/pick-folder` | Native folder dialog (win32; 501 elsewhere) |
 | `GET /api/projects` | Registered + auto-discovered projects with turn counts |

package/console/index.html

@@ -856,9 +856,9 @@ function renderSettings() {
     var agentsHtml = payload.agents.map(function (a) {
       var installed = a.cliFound || a.configFound;
       var chips =
-        '<span class="st-chip ' + (installed ? 'ok' : 'off') + '">' + (installed ? '已安装' : '未安装') + '</span>'
-        + '<span class="st-chip ' + (a.hookInstalled ? 'ok' : 'warn') + '">' + (a.hookInstalled ? '已接入采集' : '未接入') + '</span>';
-      var note = a.detail || (a.hookInstalled ? '' : installed ? '需要通过安装器 / consumer 注册 hook 后才会采集' : '未检测到该工具');
+        '<span class="st-chip ' + (installed ? 'ok' : 'off') + '">' + (a.cliFound ? '检测到命令' : a.configFound ? '检测到配置' : '未检测到') + '</span>'
+        + '<span class="st-chip ' + (a.hookInstalled ? 'ok' : 'warn') + '">' + (a.hookInstalled ? '已配置采集' : '未接入') + '</span>';
+      var note = a.detail || (a.hookInstalled ? '采集配置已存在；实际记录请查看开发会话' : installed ? '需要安装采集 Hook；注册消费者不能代替 Hook' : '后台未发现命令或默认配置，请检查安装路径与运行用户');
       return '<div class="agent-row"><span class="an">' + escapeText(a.label) + '</span>' + chips
         + '<span class="note">' + escapeText(note) + '</span></div>';
     }).join('');
@@ -881,9 +881,13 @@ function renderSettings() {
 
     body.innerHTML =
       '<div class="set-section">AI 编程工具</div>' + agentsHtml
+      + (embedded ? '<button class="btn-upg" id="capture-setup-btn">管理 Agent 采集</button>' : '')
       + '<div class="set-section">Bridge 运行时</div>' + runtimeHtml
       + '<div class="set-section">消费方</div>' + consumersHtml;
 
+    var captureSetup = document.getElementById('capture-setup-btn');
+    if (captureSetup) captureSetup.addEventListener('click', function () { settingsModal.classList.remove('open'); window.parent.postMessage({ type: 'kb:open-integrations', app: 'event-bridge' }, location.origin); });
+
     var upg = document.getElementById('upgrade-btn');
     if (upg) {
       upg.addEventListener('click', function () {
@@ -926,6 +930,7 @@ window.addEventListener('message', async function (ev) {
   if (d.type === 'kb:theme') { document.body.dataset.kbTheme = d.theme === 'dark' ? 'dark' : 'light'; return; }
   if (d.type === 'kb:visibility') { embedVisible = d.visible === true; return; }
   if (d.type === 'kb:refresh' && embedVisible && state.project) { fetchTurns(); refreshHist(); return; }
+  if (d.type === 'kb:refresh-agents') { if (settingsModal.classList.contains('open')) renderSettings(); return; }
   if (d.type === 'kb:select-project') {
     var requestEpoch = ++selectionEpoch;
     var find = function () { return state.projects.find(function (p) { return p.id === d.project || p.path === d.project; }); };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanqianx/ai-coding-event-bridge-console",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Durable AI coding event bridge, all in one: capture connectors and installers (Claude Code, Codex, OpenCode, ZCode), journal with commit boundaries and per-commit conversation sealing, headless query, and a local conversation explorer console.",
   "license": "MIT",
   "private": false,

package/src/agent-detect.js

@@ -44,7 +44,7 @@ function mentionsShim(text) {
   return typeof text === 'string' && (text.includes('bridge-hook.cjs') || text.includes('--bridge-base64'));
 }
 
-async function detectAgents({ claudeSettingsFile, codexConfigFile, opencodePluginsDir, zcodeConfigFile } = {}) {
+async function detectAgents({ homeDir, claudeSettingsFile, codexConfigFile, opencodePluginsDir, zcodeConfigFile } = {}) {
   const home = os.homedir();
 
   const claudeFiles = [
@@ -52,18 +52,19 @@ async function detectAgents({ claudeSettingsFile, codexConfigFile, opencodePlugi
     path.join(path.dirname(claudeSettingsFile || path.join(home, '.claude', 'settings.json')), 'settings.local.json')
   ];
   const claudeStatus = await core.installers.claudeCode.statusClaudeCodeHook({
+    homeDir,
     settingsFile: claudeFiles[0]
   });
   const claudeConfigFound = claudeFiles.some(fileExists);
   const claudeTextHooked = claudeFiles.some((file) => mentionsShim(readTextIfAny(file)));
 
   const codexFile = codexConfigFile || path.join(home, '.codex', 'config.toml');
-  const codexStatus = await core.installers.codex.statusCodexNotify({ configFile: codexFile });
+  const codexStatus = await core.installers.codex.statusCodexNotify({ homeDir, configFile: codexFile });
   const codexConfigFound = fileExists(codexFile);
   const codexTextHooked = mentionsShim(readTextIfAny(codexFile));
 
   const opencodeDir = opencodePluginsDir || path.join(home, '.config', 'opencode', 'plugin');
-  const opencodeStatus = await core.installers.openCode.statusOpenCodePlugin({ pluginsDir: opencodeDir });
+  const opencodeStatus = await core.installers.openCode.statusOpenCodePlugin({ homeDir, pluginsDir: opencodeDir });
   let opencodePluginHooked = Boolean(opencodeStatus.installed);
   if (!opencodePluginHooked) {
     try {
@@ -79,8 +80,7 @@ async function detectAgents({ claudeSettingsFile, codexConfigFile, opencodePlugi
   }
 
   const zcodeFile = zcodeConfigFile || path.join(home, '.zcode', 'cli', 'config.json');
-  const zcodeStatus = await core.installers.zcode.statusZcodeHook({ configFile: zcodeFile });
-  const zcodeConfigText = readTextIfAny(zcodeFile);
+  const zcodeStatus = await core.installers.zcode.statusZcodeHook({ homeDir, configFile: zcodeFile });
 
   return [
     {
@@ -118,7 +118,7 @@ async function detectAgents({ claudeSettingsFile, codexConfigFile, opencodePlugi
       label: 'ZCode',
       cliFound: commandExists('zcode'),
       configFound: fileExists(zcodeFile),
-      hookInstalled: Boolean(zcodeStatus.installed) || mentionsShim(zcodeConfigText),
+      hookInstalled: Boolean(zcodeStatus.installed),
       managed: Boolean(zcodeStatus.installed),
       detail: zcodeStatus.thirdPartyCount ? `配置中另有 ${zcodeStatus.thirdPartyCount} 条第三方 hook（保留不动）` : null
     }

package/src/bridge/connectors/claude-code/hook-entry.js

@@ -13,14 +13,14 @@ const { notifyConsumers } = require('./notify');
  * Internal host SDK sessions (AI_CODING_EVENT_BRIDGE_CAPTURE=0) are ignored
  * before any Git/journal work happens.
  */
-async function main({ home, payload }) {
+async function main({ home, payload, source }) {
   if (isCaptureDisabled(process.env, payload)) {
     return captureDisabledResult();
   }
   if (!payload || typeof payload !== 'object') {
     return { status: 'ignored' };
   }
-  const event = normalizeClaudeCode(payload);
+  const event = normalizeClaudeCode(payload, source);
   if (!event) {
     return { status: 'ignored' };
   }
@@ -38,8 +38,8 @@ async function main({ home, payload }) {
   return { status: 'captured', sequence: appended.sequence, turnId: appended.turnId };
 }
 
-function mainFailOpen({ home, payload }) {
-  return main({ home, payload }).catch(() => ({ status: 'fail-open' }));
+function mainFailOpen({ home, payload, source }) {
+  return main({ home, payload, source }).catch(() => ({ status: 'fail-open' }));
 }
 
 module.exports = { main, mainFailOpen };

package/src/bridge/core/normalizer.js

@@ -22,9 +22,9 @@ function hookEventName(raw) {
   return raw.hook_event_name || raw.hookName || raw.hook_name || null;
 }
 
-function normalizeClaudeCode(raw) {
+function normalizeClaudeCode(raw, source = 'claude-code') {
   if (!raw || typeof raw !== 'object') return null;
-  const base = { source: 'claude-code' };
+  const base = { source: source === 'zcode' ? 'zcode' : 'claude-code' };
   if (hookEventName(raw) === 'UserPromptSubmit' || raw.eventType === 'user_prompt') {
     const content = typeof raw.prompt === 'string' ? raw.prompt : null;
     const event = {

package/src/bridge/core/repo-context.js

@@ -110,7 +110,7 @@ function buildRepoIdentityV1({ workspaceRoot, commonDir = null, remote = null })
  * 1. `git rev-parse --show-toplevel` (authoritative Git working tree root)
  * 2. realpath + canonical separators for the display root
  * 3. workspaceId = sha256 over the comparison form (case-insensitive on win32)
- * 4. commonDir from `git rev-parse --path-format=absolute --git-common-dir`
+ * 4. commonDir from `git rev-parse --git-common-dir`, resolved against cwd
  *    (metadata: worktrees share it, but their workspaceIds differ)
  * 5. normalized origin URL as metadata only — never the primary identity
  *
@@ -135,8 +135,11 @@ async function resolveRepoContext(cwd, { runGit = runGitDefault } = {}) {
 
   let commonDir = null;
   try {
-    const rawCommonDir = await runGit(['rev-parse', '--path-format=absolute', '--git-common-dir'], cwd);
-    if (rawCommonDir) commonDir = path.resolve(realpathBestEffort(rawCommonDir) || rawCommonDir);
+    const rawCommonDir = String(await runGit(['rev-parse', '--git-common-dir'], cwd)).trim();
+    if (rawCommonDir && !/[\r\n\0]/.test(rawCommonDir) && !rawCommonDir.startsWith('--')) {
+      const absoluteCommonDir = path.resolve(cwd, rawCommonDir);
+      commonDir = realpathBestEffort(absoluteCommonDir) || absoluteCommonDir;
+    }
   } catch (_) {
     commonDir = null;
   }

package/src/bridge/core/runtime-home.js

@@ -15,10 +15,9 @@ const SHIM_SOURCE = `#!/usr/bin/env node
 'use strict';
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 
 function home() {
-  return process.env.AI_CODING_EVENT_BRIDGE_HOME || path.join(os.homedir(), '.ai-coding-event-bridge');
+  return process.env.AI_CODING_EVENT_BRIDGE_HOME || path.resolve(__dirname, '..');
 }
 
 function readStdin() {
@@ -76,7 +75,9 @@ async function main({ payload, home, argv, env }) {
     // connector — never fall through to Codex just because session_id exists.
     if (payload.hookName || payload.hook_event_name || payload.hook_name) {
       const claudeEntry = require('./bridge/connectors/claude-code/hook-entry.js');
-      return claudeEntry.mainFailOpen({ home, payload, argv, env });
+      const sourceIndex = Array.isArray(argv) ? argv.indexOf('--source') : -1;
+      const source = sourceIndex >= 0 && argv[sourceIndex + 1] === 'zcode' ? 'zcode' : 'claude-code';
+      return claudeEntry.mainFailOpen({ home, payload, source, argv, env });
     }
     if (payload.type === 'user' || payload.type === 'assistant') {
       const opencodeEntry = require('./bridge/connectors/opencode/hook-entry.js');

package/src/bridge/installers/zcode/installer.js

@@ -27,7 +27,7 @@ function shimPathFor(homeDir) {
 // process hooks (argument vector, no shell) are the portable form; bare
 // `node` survives Node upgrades, unlike a baked-in absolute executable path.
 function managedHook(shimPath) {
-  return { type: 'process', command: 'node', args: [shimPath], timeoutMs: 15000 };
+  return { type: 'process', command: 'node', args: [shimPath, '--source', 'zcode'], timeoutMs: 15000 };
 }
 
 function isManagedHook(hook, shimPath) {
@@ -69,9 +69,15 @@ function upsertManagedEntries(config, shimPath) {
     if (!Array.isArray(events[eventName])) {
       events[eventName] = [];
     }
-    const alreadyManaged = events[eventName].some(
-      (group) => group && Array.isArray(group.hooks) && group.hooks.some((hook) => isManagedHook(hook, shimPath))
-    );
+    let alreadyManaged = false;
+    for (const group of events[eventName]) {
+      if (!group || !Array.isArray(group.hooks)) continue;
+      group.hooks = group.hooks.map(hook => {
+        if (!isManagedHook(hook, shimPath)) return hook;
+        alreadyManaged = true;
+        return managedHook(shimPath);
+      });
+    }
     if (alreadyManaged) continue;
     events[eventName].push({ hooks: [managedHook(shimPath)] });
     changed.push(eventName);
@@ -87,11 +93,15 @@ function removeManagedEntries(config, shimPath) {
   for (const eventName of Object.keys(config.hooks.events)) {
     const groups = config.hooks.events[eventName];
     if (!Array.isArray(groups)) continue;
-    const kept = groups.filter(
-      (group) =>
-        !(group && Array.isArray(group.hooks) && group.hooks.some((hook) => isManagedHook(hook, shimPath)))
-    );
-    if (kept.length !== groups.length) removed.push(eventName);
+    let changed = false;
+    const kept = groups.map(group => {
+      if (!group || !Array.isArray(group.hooks)) return group;
+      const hooks = group.hooks.filter(hook => !isManagedHook(hook, shimPath));
+      if (hooks.length === group.hooks.length) return group;
+      changed = true;
+      return hooks.length ? { ...group, hooks } : null;
+    }).filter(group => group !== null);
+    if (changed) removed.push(eventName);
     if (kept.length === 0) {
       delete config.hooks.events[eventName];
     } else {
@@ -107,12 +117,14 @@ async function installZcodeHook({ homeDir, consumerName, consumerMeta = {}, regi
   const home = homeDir || path.join(os.homedir(), '.ai-coding-event-bridge');
   const target = configFile || path.join(os.homedir(), '.zcode', 'cli', 'config.json');
   const runtime = await ensureRuntimeHome({ homeDir: home, version });
+  if (runtime.conflict) throw new InstallerError('Bridge 运行版本冲突，未修改 ZCode 配置。');
   const registry = new ConsumerRegistry(home);
   if (consumerName && registerConsumer) {
     await registry.registerConsumer(consumerName, consumerMeta);
   }
   const config = readConfig(target);
   const added = upsertManagedEntries(config, shimPathFor(home));
+  fs.mkdirSync(path.dirname(target), { recursive: true });
   writeJsonAtomicSync(target, config);
   return { added, configFile: target, runtime, consumers: (await registry.getConsumers()).map((c) => c.name) };
 }
@@ -161,7 +173,7 @@ async function uninstallZcodeHook({ homeDir, consumerName, unregisterConsumer =
   const registry = new ConsumerRegistry(home);
   const config = readConfig(target);
   const removed = config.hooks && config.hooks.events ? removeManagedEntries(config, shimPathFor(home)) : [];
-  writeJsonAtomicSync(target, config);
+  if (removed.length) writeJsonAtomicSync(target, config);
   let consumerUnregistered = false;
   if (consumerName && unregisterConsumer) {
     await registry.unregisterConsumer(consumerName);

package/src/server.js

@@ -536,7 +536,7 @@ function createConsoleServer({ home, runtimeToken }) {
     }
 
     if (route === 'GET /api/system/agents') {
-      const agents = await detectAgents();
+      const agents = await detectAgents({ homeDir: home });
       let activeRuntimeVersion = null;
       let runtimeVersions = [];
       const runtimeRoot = path.join(home, 'runtime');