@chatpanel/bridge 0.10.9 → 0.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatpanel/bridge",
-  "version": "0.10.9",
+  "version": "0.10.10",
   "type": "module",
   "description": "Local bridge that exposes the AI coding agents installed on your machine — Claude Code (CLI), Codex (CLI), and Gemini CLI — to the ChatPanel Chrome extension over a localhost SSE endpoint. Bring your own agent.",
   "keywords": [

package/src/env.js

@@ -14,11 +14,11 @@ let enriched = false;
 
 // The agent CLIs the bridge shells out to. Claude has its own richer resolution
 // (resolveClaude: native / cli.js / WSL / SDK) below.
-const AGENT_CLIS = ['codex', 'claude', 'agy', 'pi', 'opencode', 'kiro-cli'];
+export const AGENT_CLIS = ['codex', 'claude', 'agy', 'pi', 'opencode', 'kiro-cli'];
 
 // Is `name` executable somewhere on the current PATH?
 function onPath(name) {
-  const dirs = (process.env.PATH || '').split(path.delimiter);
+  const dirs = splitPathList(process.env.PATH || '', process.platform);
   return dirs.some((d) => d && (existsSync(path.join(d, name)) || existsSync(path.join(d, name + '.exe'))));
 }
 
@@ -27,14 +27,9 @@ function onPath(name) {
 // "is it installed/findable", NOT "does `--version` exit 0" (which can fail for
 // reasons unrelated to installation, e.g. the CLI needs login).
 export function findAgentBin(name) {
-  // On Windows, CLIs are usually <name>.cmd / .exe / .bat (npm shims).
-  const exts = process.platform === 'win32' ? ['', '.cmd', '.exe', '.bat', '.ps1'] : [''];
-  const dirs = (process.env.PATH || '').split(path.delimiter);
-  for (const d of dirs) {
-    if (!d) continue;
-    for (const ext of exts) {
-      const p = path.join(d, name + ext);
-      if (existsSync(p)) return p;
+  for (const p of commandCandidateFiles(name)) {
+    if (existsSync(p)) {
+      return p;
     }
   }
   return shellWhich(name) || null;
@@ -152,20 +147,20 @@ export function resolveCommand(command) {
 // own Node/Bun — clean arg passing, no cmd.exe quoting), then a real .exe, then a
 // .cmd/.bat shim launched safely via cmd.exe.
 function findCommandWindows(name) {
-  const dirs = (process.env.PATH || '').split(path.delimiter);
-  for (const d of dirs) {
-    if (!d) continue;
-    const exts = ['', '.cmd', '.exe', '.ps1', '.bat'];
-    if (!exts.some((e) => existsSync(path.join(d, name + e)))) continue;
+  const p = pathFor('win32');
+  for (const candidate of commandCandidateFiles(name, os.homedir(), 'win32', process.env)) {
+    if (!existsSync(candidate)) continue;
+    const d = p.dirname(candidate);
+    const ext = p.extname(candidate).toLowerCase();
     // Running cli.js with our own interpreter only works under a real Node/Bun,
     // not inside a compiled single-file binary (which is not a JS interpreter).
     if (!isCompiledBinary()) {
       const js = (name === 'claude' && claudeCliJs(d)) || shimTarget(d, name);
       if (js) return { kind: 'script', script: js };
+      if (/^\.(c?js|mjs)$/.test(ext)) return { kind: 'script', script: candidate };
     }
-    if (existsSync(path.join(d, name + '.exe'))) return { kind: 'native', bin: path.join(d, name + '.exe') };
-    if (existsSync(path.join(d, name + '.cmd'))) return { kind: 'cmd', bin: path.join(d, name + '.cmd') };
-    if (existsSync(path.join(d, name + '.bat'))) return { kind: 'cmd', bin: path.join(d, name + '.bat') };
+    if (ext === '.exe' || ext === '') return { kind: 'native', bin: candidate };
+    if (ext === '.cmd' || ext === '.bat') return { kind: 'cmd', bin: candidate };
   }
   return null;
 }
@@ -290,14 +285,156 @@ function versionManagerBins(home) {
   return bins;
 }
 
-export function enrichPath() {
-  if (enriched || process.platform === 'win32') {
-    enriched = true;
-    return; // Windows scheduled tasks run as the user and inherit a fuller PATH.
+function pathFor(platform) {
+  return platform === 'win32' ? path.win32 : path;
+}
+
+function pathDelimiterFor(platform) {
+  return platform === 'win32' ? ';' : path.delimiter;
+}
+
+function splitPathList(value, platform) {
+  return (value || '').split(pathDelimiterFor(platform)).filter(Boolean);
+}
+
+function unique(items) {
+  return [...new Set(items.filter(Boolean))];
+}
+
+export function agentInstallDirs(home, platform = process.platform, env = process.env) {
+  const p = pathFor(platform);
+  if (platform === 'win32') {
+    const appData = env.APPDATA || p.join(home, 'AppData', 'Roaming');
+    const localAppData = env.LOCALAPPDATA || p.join(home, 'AppData', 'Local');
+    const programFiles = env.ProgramFiles || 'C:\\Program Files';
+    const programFilesX86 = env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)';
+    const programData = env.ProgramData || 'C:\\ProgramData';
+    return [
+      p.join(home, '.local', 'bin'),
+      p.join(home, '.codex', 'bin'),
+      p.join(home, '.claude', 'bin'),
+      p.join(home, '.claude', 'local'),
+      p.join(home, '.claude', 'local', 'bin'),
+      p.join(appData, 'npm'),
+      p.join(localAppData, 'pnpm'),
+      p.join(localAppData, 'Yarn', 'bin'),
+      p.join(localAppData, 'Volta', 'bin'),
+      p.join(home, '.yarn', 'bin'),
+      p.join(home, '.bun', 'bin'),
+      p.join(home, '.deno', 'bin'),
+      p.join(home, 'scoop', 'shims'),
+      p.join(programData, 'chocolatey', 'bin'),
+      p.join(localAppData, 'Microsoft', 'WindowsApps'),
+      p.join(localAppData, 'Programs', 'Claude Code'),
+      p.join(localAppData, 'Anthropic', 'Claude Code'),
+      p.join(programFiles, 'Claude Code'),
+      p.join(programFiles, 'Anthropic', 'Claude Code'),
+      p.join(programFilesX86, 'Claude Code'),
+      p.join(programFilesX86, 'Anthropic', 'Claude Code'),
+    ];
   }
+  return [
+    path.join(home, '.local', 'bin'),
+    path.join(home, '.opencode', 'bin'),
+    path.join(home, '.codex', 'bin'),
+    path.join(home, '.claude', 'bin'),
+    path.join(home, '.claude', 'local'),
+    path.join(home, '.claude', 'local', 'bin'),
+  ];
+}
+
+function claudeNativeBins(home, platform = process.platform) {
+  const p = pathFor(platform);
+  const versionsDir = p.join(home, '.local', 'share', 'claude', 'versions');
+  let versions = [];
+  try {
+    versions = readdirSync(versionsDir)
+      .filter((v) => /^\d+\.\d+\.\d+/.test(v))
+      .sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
+  } catch {
+    /* native installer may not be present */
+  }
+  return versions.map((v) => p.join(versionsDir, v));
+}
+
+function withWindowsExts(file, platform) {
+  if (platform !== 'win32') return [file];
+  if (/\.(cmd|exe|bat|ps1)$/i.test(file)) return [file];
+  return [file, `${file}.cmd`, `${file}.exe`, `${file}.bat`, `${file}.ps1`];
+}
+
+export function agentCandidateBins(name, home = os.homedir(), platform = process.platform, env = process.env) {
+  const p = pathFor(platform);
+  const local = p.join(home, '.local', 'bin', name);
+  const localAppData = platform === 'win32' ? env.LOCALAPPDATA || p.join(home, 'AppData', 'Local') : null;
+  const programFiles = platform === 'win32' ? env.ProgramFiles || 'C:\\Program Files' : null;
+  const programFilesX86 = platform === 'win32' ? env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)' : null;
+  const map = {
+    claude: [
+      local,
+      p.join(home, '.claude', 'bin', 'claude'),
+      p.join(home, '.claude', 'local', 'claude'),
+      p.join(home, '.claude', 'local', 'bin', 'claude'),
+      ...(platform === 'win32'
+        ? [
+            p.join(localAppData, 'Microsoft', 'WindowsApps', 'claude.exe'),
+            p.join(localAppData, 'Programs', 'Claude Code', 'claude.exe'),
+            p.join(localAppData, 'Anthropic', 'Claude Code', 'claude.exe'),
+            p.join(programFiles, 'Claude Code', 'claude.exe'),
+            p.join(programFiles, 'Anthropic', 'Claude Code', 'claude.exe'),
+            p.join(programFilesX86, 'Claude Code', 'claude.exe'),
+            p.join(programFilesX86, 'Anthropic', 'Claude Code', 'claude.exe'),
+            ...claudeNativeBins(home, platform),
+          ]
+        : claudeNativeBins(home, platform)),
+    ],
+    codex: [
+      local,
+      p.join(home, '.codex', 'bin', 'codex'),
+    ],
+    agy: [
+      local,
+      '/Applications/Antigravity.app/Contents/MacOS/agy',
+      '/Applications/Antigravity IDE.app/Contents/MacOS/agy',
+    ],
+    pi: [
+      local,
+    ],
+    opencode: [
+      p.join(home, '.opencode', 'bin', 'opencode'),
+      local,
+    ],
+    'kiro-cli': [
+      local,
+      '/Applications/Kiro CLI.app/Contents/MacOS/kiro-cli',
+    ],
+  };
+  return unique((map[name] || [local]).flatMap((file) => withWindowsExts(file, platform)));
+}
+
+export function commandCandidateFiles(name, home = os.homedir(), platform = process.platform, env = process.env) {
+  const p = pathFor(platform);
+  const fromDirs = unique([
+    ...splitPathList(env.PATH || '', platform),
+    ...agentInstallDirs(home, platform, env),
+  ]).flatMap((dir) => withWindowsExts(p.join(dir, name), platform));
+  return unique([...fromDirs, ...agentCandidateBins(name, home, platform, env)]);
+}
+
+export function enrichPath() {
+  if (enriched) return;
   enriched = true;
 
   const home = os.homedir();
+  if (process.platform === 'win32') {
+    const merged = unique([
+      ...splitPathList(process.env.PATH || '', 'win32'),
+      ...agentInstallDirs(home, 'win32', process.env),
+    ]);
+    process.env.PATH = merged.join(pathDelimiterFor('win32'));
+    return;
+  }
+
   const common = [
     '/opt/homebrew/bin',
     '/opt/homebrew/sbin',
@@ -312,7 +449,7 @@ export function enrichPath() {
     path.join(home, '.cargo', 'bin'),
     path.join(home, '.deno', 'bin'),
     path.join(home, '.bun', 'bin'),
-    path.join(home, '.opencode', 'bin'),
+    ...agentInstallDirs(home),
     ...versionManagerBins(home),
   ];
 

package/src/server.js

@@ -23,14 +23,14 @@ import * as antigravity from './engines/antigravity.js';
 import { pi, opencode, kiro } from './engines/cli-agents.js';
 import * as custom from './engines/custom.js';
 import { installService, uninstallService, serviceStatus, restartService } from './service.js';
-import { enrichPath, findAgentBin, resolveCommand } from './env.js';
+import { AGENT_CLIS, enrichPath, findAgentBin, resolveCommand } from './env.js';
 import { checkForUpdate, selfUpdate } from './update.js';
 import { callLocalMcp } from './mcp-local.js';
 
 // Hardcoded (not read from package.json) so it survives Bun's single-file
 // --compile, where package.json isn't on a readable FS. CI fails the publish if
 // this drifts from package.json, so the two can't silently diverge.
-const VERSION = '0.10.9';
+const VERSION = '0.10.10';
 const HOST = process.env.CHATPANEL_BRIDGE_HOST || '127.0.0.1';
 const PORT = Number(process.env.CHATPANEL_BRIDGE_PORT) || 4319;
 
@@ -438,8 +438,7 @@ const server = createServer(async (req, res) => {
       return json(res, 200, {
         version: VERSION,
         home: os.homedir(),
-        codex: findAgentBin('codex') || null,
-        agy: findAgentBin('agy') || null,
+        agents: Object.fromEntries(AGENT_CLIS.map((name) => [name, findAgentBin(name) || null])),
         path: process.env.PATH,
       });
     }