@withtruing/companion 0.13.2 → 0.13.3

package/README.md

@@ -215,7 +215,7 @@ truing connect \
 the companion's own Codex home. This is separate from your normal Codex login:
 
 ```powershell
-New-Item -ItemType Directory -Force "$HOME\.product-console-companion\codex-home" | Out-Null; $env:CODEX_HOME="$HOME\.product-console-companion\codex-home"; codex login; Remove-Item Env:CODEX_HOME
+New-Item -ItemType Directory -Force "$HOME\.product-console-companion\codex-home" | Out-Null; $env:CODEX_HOME="$HOME\.product-console-companion\codex-home"; codex.cmd login; Remove-Item Env:CODEX_HOME
 ```
 
 ```bash

package/dist/cli.js

@@ -461,7 +461,7 @@ export function codexReadinessLines(status) {
     }
     return [
         'Codex needs a one-time login for the companion\'s own home:',
-        '  Windows PowerShell: New-Item -ItemType Directory -Force "$HOME\\.product-console-companion\\codex-home" | Out-Null; $env:CODEX_HOME="$HOME\\.product-console-companion\\codex-home"; codex login; Remove-Item Env:CODEX_HOME',
+        '  Windows PowerShell: New-Item -ItemType Directory -Force "$HOME\\.product-console-companion\\codex-home" | Out-Null; $env:CODEX_HOME="$HOME\\.product-console-companion\\codex-home"; codex.cmd login; Remove-Item Env:CODEX_HOME',
         '  macOS/Linux: mkdir -p "$HOME/.product-console-companion/codex-home" && CODEX_HOME="$HOME/.product-console-companion/codex-home" codex login',
         'This separate login keeps your own ~/.codex instructions out of the companion\'s calls.',
     ];

package/dist/codex-binary.js

@@ -0,0 +1,96 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, isAbsolute, join, resolve, sep } from 'node:path';
+const defaultFs = { existsSync, readFileSync };
+let cachedCommand = null;
+let cachedPath;
+let cachedPathExt;
+function envValue(env, name) {
+    const key = Object.keys(env).find((candidate) => candidate.toLowerCase() === name.toLowerCase());
+    return key ? env[key] : undefined;
+}
+function windowsPathEntries(env) {
+    return (envValue(env, 'PATH') ?? '')
+        .split(';')
+        .map((entry) => entry.trim().replace(/^"|"$/g, ''))
+        .filter(Boolean);
+}
+function windowsExtensions(env) {
+    const pathExt = envValue(env, 'PATHEXT') || '.COM;.EXE;.BAT;.CMD';
+    return pathExt
+        .split(';')
+        .map((extension) => extension.trim().toLowerCase())
+        .filter(Boolean)
+        .map((extension) => extension.startsWith('.') ? extension : `.${extension}`);
+}
+function existingCandidate(directory, extension, fs) {
+    const lowerCaseCandidate = join(directory, `codex${extension.toLowerCase()}`);
+    if (fs.existsSync(lowerCaseCandidate))
+        return resolve(lowerCaseCandidate);
+    const originalCaseCandidate = join(directory, `codex${extension}`);
+    return fs.existsSync(originalCaseCandidate) ? resolve(originalCaseCandidate) : null;
+}
+function parsedShimScript(shimPath, fs) {
+    let contents;
+    try {
+        contents = fs.readFileSync(shimPath, 'utf8');
+    }
+    catch {
+        return null;
+    }
+    const shimDirectory = dirname(shimPath);
+    for (const match of contents.matchAll(/"([^"\r\n]*codex\.js)"/gi)) {
+        let target = match[1].replace(/%(?:~dp0|dp0)%?/gi, shimDirectory);
+        // Tests inject win32 while running on Linux CI; normalizing both separator forms keeps the
+        // resolver testable with a real temporary filesystem and is a no-op for native Windows paths.
+        target = target.replace(/[\\/]/g, sep);
+        if (!isAbsolute(target))
+            target = resolve(shimDirectory, target);
+        if (fs.existsSync(target))
+            return resolve(target);
+    }
+    return null;
+}
+function scriptForShim(shimPath, fs) {
+    const parsed = parsedShimScript(shimPath, fs);
+    if (parsed)
+        return parsed;
+    const conventional = join(dirname(shimPath), 'node_modules', '@openai', 'codex', 'bin', 'codex.js');
+    return fs.existsSync(conventional) ? resolve(conventional) : null;
+}
+function resolveUncached(platform, env, fs) {
+    if (platform !== 'win32')
+        return { command: 'codex', prefixArgs: [] };
+    const extensions = windowsExtensions(env);
+    for (const directory of windowsPathEntries(env)) {
+        for (const extension of extensions) {
+            if (extension !== '.cmd' && extension !== '.exe')
+                continue;
+            const candidate = existingCandidate(directory, extension, fs);
+            if (!candidate)
+                continue;
+            if (extension === '.exe')
+                return { command: candidate, prefixArgs: [] };
+            const script = scriptForShim(candidate, fs);
+            if (script)
+                return { command: process.execPath, prefixArgs: [script] };
+        }
+    }
+    return { command: 'codex', prefixArgs: [] };
+}
+/** Cache each production environment. Injected dependencies bypass the cache so Linux CI can
+ * exercise the Windows lookup rules without mutating process globals or depending on Windows
+ * filesystem semantics. */
+export function resolveCodexCommand(options = {}) {
+    const injected = options.platform !== undefined || options.env !== undefined || options.fs !== undefined;
+    const path = envValue(process.env, 'PATH');
+    const pathExt = envValue(process.env, 'PATHEXT');
+    if (!injected && cachedCommand && path === cachedPath && pathExt === cachedPathExt)
+        return cachedCommand;
+    const command = resolveUncached(options.platform ?? process.platform, options.env ?? process.env, options.fs ?? defaultFs);
+    if (!injected) {
+        cachedCommand = command;
+        cachedPath = path;
+        cachedPathExt = pathExt;
+    }
+    return command;
+}

package/dist/codex-cli-caller.js

@@ -9,6 +9,7 @@ import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:pat
 import { createInterface } from 'node:readline';
 import { StringDecoder } from 'node:string_decoder';
 import { assertSingleLineArguments } from './cli-arguments.js';
+import { resolveCodexCommand } from './codex-binary.js';
 import { gitErrorMessage } from './sandbox.js';
 import { stripIntroducedNulls, toCodexStrictSchema } from './strict-schema.js';
 const WALL_CLOCK_TIMEOUT_MS = 10 * 60 * 1000;
@@ -347,7 +348,8 @@ removeDirectory = rm) {
         let firstUnparseableLineFirst = '';
         let firstUnparseableLineLast = '';
         const typeCounts = new Map();
-        const child = spawn('codex', args, {
+        const { command, prefixArgs } = resolveCodexCommand();
+        const child = spawn(command, [...prefixArgs, ...args], {
             cwd: invocationCwd,
             env: buildCodexEnvironment(codexHome),
             windowsHide: true,
@@ -522,7 +524,8 @@ export async function checkCodexLogin(codexHome) {
         throw error;
     }
     return new Promise((resolvePromise) => {
-        const child = spawn('codex', ['login', 'status'], {
+        const { command, prefixArgs } = resolveCodexCommand();
+        const child = spawn(command, [...prefixArgs, 'login', 'status'], {
             env: buildCodexEnvironment(validatedHome),
             windowsHide: true,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withtruing/companion",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "The Truing companion: reads your code and runs AI on your own computer, for Truing.",
   "type": "module",
   "license": "MIT",