@gakim-digital/dexter-bridge 0.5.9 → 0.5.10

package/README.md

@@ -53,6 +53,22 @@ npx @gakim-digital/dexter-bridge doctor
 npx @gakim-digital/dexter-bridge logout
 ```
 
+On Windows, the bridge checks the native Claude Code install at
+`%USERPROFILE%\.local\bin\claude.exe` in addition to `PATH`. Before pairing,
+verify the same PowerShell window can run:
+
+```powershell
+claude --version
+claude auth status
+```
+
+If Claude Code is installed in a custom directory, set its absolute path for
+that PowerShell session before running the Dexter command:
+
+```powershell
+$env:DEXTER_BRIDGE_CLAUDE_BIN = "C:\path\to\claude.exe"
+```
+
 `dry-run` verifies pairing, run polling, and event delivery without editing the
 canvas. `claude-code` executes through its local CLI. Codex uses one persistent
 `codex app-server` process for authentication, threads, usage, and cancellation:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gakim-digital/dexter-bridge",
-  "version": "0.5.9",
+  "version": "0.5.10",
   "description": "Local Companion bridge for the Dexter Framer plugin — runs Codex or Claude Code on your machine.",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -102,7 +102,7 @@ export const AGENT_DEFINITIONS = {
 
 export const AGENT_AUTHENTICATION_REQUIRED_CODE = 'DEXTER_AGENT_AUTHENTICATION_REQUIRED';
 export const CLAUDE_AUTHENTICATION_REQUIRED_MESSAGE =
-  'Claude Code sign-in has expired. Run `claude auth login` on this Mac, complete sign-in, then try again.';
+  'Claude Code sign-in has expired. Run `claude auth login` on this computer, complete sign-in, then try again.';
 
 function nowIso() {
   return new Date().toISOString();
@@ -498,16 +498,28 @@ export function mergePathEntries(paths, platform = process.platform) {
     .join(delimiter);
 }
 
-function processEnvWithCliPath(platform = process.platform) {
+export function processEnvWithCliPath(baseEnv = process.env, platform = process.platform) {
+  const pathApi = platform === 'win32' ? path.win32 : path.posix;
+  const homeDirectory = platform === 'win32'
+    ? String(
+      baseEnv.USERPROFILE
+      || baseEnv.HOME
+      || (process.platform === 'win32' ? os.homedir() : ''),
+    ).trim()
+    : String(baseEnv.HOME || (platform === process.platform ? os.homedir() : '')).trim();
   const fallbackPath = platform === 'win32'
-    ? [path.join(process.env.APPDATA || '', 'npm'), path.join(process.env.LOCALAPPDATA || '', 'Programs')]
+    ? [
+      homeDirectory ? pathApi.join(homeDirectory, '.local', 'bin') : '',
+      baseEnv.APPDATA ? pathApi.join(baseEnv.APPDATA, 'npm') : '',
+      baseEnv.LOCALAPPDATA ? pathApi.join(baseEnv.LOCALAPPDATA, 'Programs') : '',
+    ]
     : ['/opt/homebrew/bin', '/usr/local/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin'];
-  const shellEnv = loginShellEnv();
-  const existingPath = String(process.env.PATH || '');
+  const shellEnv = platform === 'win32' ? {} : loginShellEnv();
+  const existingPath = String(baseEnv.PATH || '');
   const mergedPath = mergePathEntries([shellEnv.PATH, existingPath, ...fallbackPath], platform);
   return {
     ...shellEnv,
-    ...process.env,
+    ...baseEnv,
     PATH: mergedPath,
   };
 }
@@ -600,6 +612,9 @@ export function selectAgentRuntime(inspections, definition, modelDefinition) {
     return {
       ok: false,
       command: first?.command || definition.fallbackCommand,
+      code: first?.code === 'ENOENT'
+        ? 'DEXTER_AGENT_NOT_FOUND'
+        : first?.code,
       error: first?.error || `${definition.label} is not installed or could not be started.`,
       candidates: inspections,
     };
@@ -712,7 +727,7 @@ function runProcess(command, args, stdin, {
     // output) so slow-but-streaming model turns are not killed mid-generation;
     // hardDeadlineMs bounds total wall-clock time regardless of activity.
     const hardDeadlineMs = Math.max(maxDurationMs || timeoutMs * 5, 10);
-    const childEnv = providedChildEnv || processEnvWithCliPath(platform);
+    const childEnv = processEnvWithCliPath(providedChildEnv || process.env, platform);
     const cwd = resolveAgentCwd(childEnv, process.cwd(), platform);
     const invocation = processInvocation(command, args, childEnv, platform);
     trace?.info('agent_process_spawn', {
@@ -974,7 +989,7 @@ async function callProviderAdapter(adapter, input, {
 
 export async function resolveAgentRuntime(definition, modelDefinition, options = {}) {
   const platform = options.platform || process.platform;
-  const childEnv = options.env || processEnvWithCliPath(platform);
+  const childEnv = processEnvWithCliPath(options.env || process.env, platform);
   const configuredCommand = commandFromEnv(definition.commandEnv, definition.fallbackCommand, childEnv);
   const candidates = executableCandidates(
     configuredCommand,
@@ -1000,6 +1015,7 @@ export async function resolveAgentRuntime(definition, modelDefinition, options =
       return {
         ok: false,
         command,
+        code: error?.code,
         error: error?.message || String(error || ''),
       };
     }
@@ -1059,7 +1075,7 @@ export async function checkAgentAuthentication(agent, runtime, options = {}) {
   }
 
   const platform = options.platform || process.platform;
-  const childEnv = options.env || processEnvWithCliPath(platform);
+  const childEnv = processEnvWithCliPath(options.env || process.env, platform);
   const inspect = options.inspect || inspectClaudeAuthentication;
   try {
     const authentication = await inspect(runtime.command, { childEnv, platform });

package/src/cli.js

@@ -154,7 +154,8 @@ function agentEnvironment(config = {}, baseEnv = process.env) {
 async function inspectAvailability(config = {}) {
   try {
     const checks = await checkAllAgents({ env: agentEnvironment(config) });
-    const available = checks.agents.filter((check) => check.ok);
+    const allChecks = [...checks.agents, checks.dryRun];
+    const available = allChecks.filter((check) => check.ok);
     return {
       metadata: {
         availableAgents: available.map((check) => check.agent).join(','),
@@ -165,19 +166,27 @@ async function inspectAvailability(config = {}) {
         bridgeBuildFingerprint: BRIDGE_BUILD_FINGERPRINT,
       },
       agentCommands: Object.fromEntries(
-        available
+        checks.agents
+          .filter((check) => check.ok)
           .filter((check) => typeof check.command === 'string' && check.command.trim())
           .map((check) => [check.agent, check.command]),
       ),
+      agents: checks.agents,
+      dryRun: checks.dryRun,
     };
   } catch {
     return {
       metadata: {
+        availableAgents: '',
+        availableModels: '',
+        agentVersions: '',
         bridgeCapabilities: BRIDGE_CAPABILITIES.join(','),
         bridgeVersion: BRIDGE_VERSION,
         bridgeBuildFingerprint: BRIDGE_BUILD_FINGERPRINT,
       },
       agentCommands: {},
+      agents: [],
+      dryRun: null,
     };
   }
 }
@@ -186,6 +195,31 @@ async function availabilityMetadata(config = {}) {
   return (await inspectAvailability(config)).metadata;
 }
 
+function selectedAgentCheck(availability, agent) {
+  if (agent === 'dry-run') return availability.dryRun;
+  return availability.agents.find((check) => check.agent === agent) || null;
+}
+
+function requireAvailableAgent(availability, agent, platform = process.platform) {
+  const check = selectedAgentCheck(availability, agent);
+  if (check?.ok) return check;
+
+  const label = agent === 'claude-code' ? 'Claude Code' : agent === 'codex' ? 'Codex' : 'The selected agent';
+  let message = check?.error || `${label} is not installed or could not be started.`;
+  if (agent === 'claude-code' && check?.status === 'authentication_required') {
+    message = check.error || 'Claude Code is not signed in. Run `claude auth login`, then try again.';
+  } else if (agent === 'claude-code' && (check?.code === 'DEXTER_AGENT_NOT_FOUND' || !check)) {
+    message = platform === 'win32'
+      ? 'Claude Code was not found. In PowerShell, run `claude --version`. Dexter also checks `%USERPROFILE%\\.local\\bin\\claude.exe`. If Claude is installed elsewhere, set `DEXTER_BRIDGE_CLAUDE_BIN` to its full path, then run the Dexter connection command again.'
+      : 'Claude Code was not found. Run `claude --version` in this terminal. If Claude is installed elsewhere, set `DEXTER_BRIDGE_CLAUDE_BIN` to its full path, then run the Dexter connection command again.';
+  }
+
+  const error = new Error(message);
+  error.code = check?.code || 'DEXTER_AGENT_NOT_FOUND';
+  error.exitCode = 2;
+  throw error;
+}
+
 async function pairCommand({ apiBaseUrl, args, flags, configDir }) {
   const codeOrToken = args[0];
   if (!codeOrToken) throw new Error('Pairing code or token is required.');
@@ -194,6 +228,7 @@ async function pairCommand({ apiBaseUrl, args, flags, configDir }) {
   const agent = resolveAgentName({ flagValue: flags.agent, config });
   const model = resolveCompanionModelName({ flagValue: flags.model, config, agent });
   const availability = await inspectAvailability(config);
+  requireAvailableAgent(availability, agent);
   const result = await claimPairing(apiBaseUrl, {
     pairingCode: isToken ? undefined : codeOrToken,
     pairingToken: isToken ? codeOrToken : undefined,
@@ -239,6 +274,7 @@ async function statusCommand({ apiBaseUrl, config, configDir }) {
 }
 
 async function startCommand({ apiBaseUrl, config, flags, configDir }) {
+  let activeConfig = config;
   let deviceToken = config.deviceToken;
   if (!deviceToken) {
     // First run: pair interactively so `npx @gakim-digital/dexter-bridge` alone is
@@ -249,14 +285,17 @@ async function startCommand({ apiBaseUrl, config, flags, configDir }) {
     const code = await promptForPairingCode();
     if (!code) requireDeviceToken(config);
     await pairCommand({ apiBaseUrl, args: [code], flags, configDir });
-    deviceToken = readConfig(configDir).deviceToken;
+    activeConfig = readConfig(configDir);
+    deviceToken = activeConfig.deviceToken;
   }
-  const agent = resolveAgentName({ flagValue: flags.agent, config });
-  const model = resolveCompanionModelName({ flagValue: flags.model, config, agent });
+  const agent = resolveAgentName({ flagValue: flags.agent, config: activeConfig });
+  const model = resolveCompanionModelName({ flagValue: flags.model, config: activeConfig, agent });
   const waitMs = Number(flags['wait-ms'] || 25000);
   const once = Boolean(flags.once);
-  const bridgeEnv = agentEnvironment(config);
-  const metadata = await availabilityMetadata(config);
+  const bridgeEnv = agentEnvironment(activeConfig);
+  const availability = await inspectAvailability(activeConfig);
+  requireAvailableAgent(availability, agent);
+  const metadata = availability.metadata;
   const pollLogger = createRunLogger({ runId: 'bridge-poll' });
   const providerAdapters = new Map();
   const providerAdapterForAgent = (runAgent) => {
@@ -390,5 +429,7 @@ export const __private__ = {
   isInvalidPairingError,
   parseArgv,
   pollBackoffMs,
+  requireAvailableAgent,
+  selectedAgentCheck,
   usage,
 };