@gotcos/glasses-server 6.36.12 → 6.36.13

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## Unreleased
 
+## 6.36.13
+- **Codex was spawned by bare name in four places, and it only worked here by accident.**
+  `codex` on PATH is a shell alias to `/Applications/Codex.app`, which does not exist; the real
+  binary lives in ChatGPT.app. Every bare `spawn('codex', …)` resolved through a PATH that COS
+  Control injects into the managed plist — so it worked on this machine and was ENOENT for every
+  public npx user, and for anything launchd- or Finder-spawned. The sites: the model catalog, the
+  `--add-dir` capability probe, the health probe, and `callCodexStreaming`, which is the **live
+  turn-execution path**. Each now resolves first, and each refuses in the way that suits it: the
+  live turn throws with the reason, the catalog rejects to its existing `cli-default` degradation,
+  the capability probe reports unsupported, and the health probe reports `unresolved (…)` instead
+  of collapsing "cannot find it" and "found it and it errored" into one `error`.
+- **Binary resolution moved to its own leaf module.** `provider-binary.ts` imports nothing from the
+  repo, deliberately: reaching the resolver through `attached-provider-adapter.ts` would close the
+  cycle adapter → codex-run-ledger → codex-model-catalog → adapter. The adapter re-exports it, so
+  no existing importer changed.
+- **Three source-text assertions replaced with fixtures.** Two tests asserted on this repo's own
+  characters — `not.toMatch('AGENT_SESSION_MAX_FILE_BYTES')` and `toMatch('end = HEAD_BYTES - 1')`
+  — which go stale on any refactor and cannot observe the property they name. A Codex rollout is
+  now made genuinely larger than the 32 MB gate (sparse, via `truncateSync`) and asserted to still
+  be listed. Verified by mutation: adding that gate to `listCodexSessions` fails the new test.
+
 ## 6.36.12
 - **Claude and Codex now rank candidates by recency before spending the budget.** Both
   walked in raw `readdir` order, so which sessions were reachable came down to filesystem

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotcos/glasses-server",
-  "version": "6.36.12",
+  "version": "6.36.13",
   "description": "COS Glasses — self-hosted AI heads-up-display server for Even G2 smart glasses, powered by Claude Code, Codex, or Cursor Agent CLI",
   "type": "module",
   "bin": {

package/server/lib/attached-provider-adapter.ts

@@ -227,173 +227,28 @@ export function attachedDeliveryAmbiguous(result: AttachedTurnResult): boolean {
 // ---------------------------------------------------------------------------
 // Binary resolution
 // ---------------------------------------------------------------------------
+//
+// MOVED to ./provider-binary.js so codex-bridge, codex-model-catalog and
+// health-static-probes can resolve without importing this module -- doing so would close
+// the cycle adapter -> codex-run-ledger -> codex-model-catalog -> adapter.
+// Re-exported here so existing importers and tests are unaffected.
+
+import {
+  resolveProviderBinary,
+  type BinaryResolution,
+} from './provider-binary.js'
+
+export {
+  STALE_SHIM_PREFIXES,
+  isKnownStaleShimPath,
+  providerBinarySpec,
+  resolveProviderBinary,
+  resolveBinaryFromSpec,
+  type BinaryResolution,
+  type BinaryResolutionFailure,
+  type BinarySpec,
+} from './provider-binary.js'
 
-export type BinaryResolutionFailure = 'env_override_unusable' | 'not_found'
-
-export type BinaryResolution =
-  | { ok: true; path: string; source: 'env' | 'absolute' | 'path' }
-  | { ok: false; binary: string; detail: BinaryResolutionFailure }
-
-/**
- * Path prefixes that can never be a usable provider binary.
- *
- * `codex` resolved through PATH (or a shell alias) points at
- * `/Applications/Codex.app/Contents/Resources/codex` on this machine, and that
- * app no longer exists. Today the shim is dangling, so an existence check
- * already rejects it — but a reinstalled or partially-removed Codex.app puts a
- * real, executable file back on that path, and then only this list stands
- * between an attached turn and a binary that cannot serve it.
- */
-export const STALE_SHIM_PREFIXES: readonly string[] = ['/Applications/Codex.app/']
-
-export function isKnownStaleShimPath(
-  candidate: string,
-  prefixes: readonly string[] = STALE_SHIM_PREFIXES,
-): boolean {
-  // A non-array argument falls back to the known list rather than to "exclude
-  // nothing" — the classic version of this bug is `list.some(isKnownStaleShimPath)`,
-  // where `.some` passes the INDEX as the second argument and every exclusion
-  // silently disappears.
-  const list = Array.isArray(prefixes) ? prefixes : STALE_SHIM_PREFIXES
-  return list.some(prefix => typeof prefix === 'string' && prefix.length > 0 && candidate.startsWith(prefix))
-}
-
-function isUsableExecutable(
-  candidate: string,
-  excludePrefixes: readonly string[] = STALE_SHIM_PREFIXES,
-): boolean {
-  try {
-    if (!isAbsolute(candidate) || candidate.includes('\0')) return false
-    if (isKnownStaleShimPath(candidate, excludePrefixes)) return false
-    if (!statSync(candidate).isFile()) return false
-    accessSync(candidate, fsConstants.X_OK)
-    return true
-  } catch {
-    return false
-  }
-}
-
-export interface BinarySpec {
-  name: string
-  envKeys: readonly string[]
-  /** Tried in order, BEFORE any PATH scan. */
-  absolutes: readonly string[]
-  /**
-   * Paths that must never be selected, from any source. Defaults to
-   * `STALE_SHIM_PREFIXES`.
-   *
-   * On the spec rather than hardcoded because the exclusion is the only guard
-   * standing between resolution and a known-bad binary, and a guard whose input
-   * cannot be constructed is a guard nobody can prove works: the real prefix
-   * lives under `/Applications`, which no fixture can write to.
-   */
-  excludePrefixes?: readonly string[]
-}
-
-/**
- * Where each provider's binary is looked for, in precedence order.
- *
- * Exported as data rather than kept private so the precedence itself is
- * testable: on a machine where a stale shim sits on PATH, "ChatGPT.app is tried
- * before PATH" is the property that decides whether an attached Codex turn
- * launches the real binary or a dangling one.
- */
-export function providerBinarySpec(provider: AttachedProvider): BinarySpec {
-  const home = (() => {
-    try {
-      return homedir()
-    } catch {
-      return ''
-    }
-  })()
-  if (provider === 'claude') {
-    return {
-      name: 'claude',
-      envKeys: ['COS_ATTACHED_CLAUDE_BIN', 'COS_CLAUDE_BIN'],
-      absolutes: [
-        '/opt/homebrew/bin/claude',
-        '/usr/local/bin/claude',
-        home ? join(home, '.local', 'bin', 'claude') : '',
-      ].filter(Boolean),
-    }
-  }
-  return {
-    name: 'codex',
-    envKeys: ['COS_ATTACHED_CODEX_BIN', 'COS_CODEX_BIN'],
-    absolutes: [
-      // Verified 2026-08-15: codex-cli 0.148.0-alpha.9 lives here, and there is
-      // no `codex` on PATH at all on this machine.
-      '/Applications/ChatGPT.app/Contents/Resources/codex',
-      home ? join(home, '.codex', 'bin', 'codex') : '',
-      '/opt/homebrew/bin/codex',
-      '/usr/local/bin/codex',
-    ].filter(Boolean),
-  }
-}
-
-/**
- * Resolve a provider binary to a verified absolute path, or refuse.
- *
- * Never returns a bare name. A bare name is a silent PATH lookup, and the two
- * environments this server runs in disagree about PATH: a login shell finds the
- * CLI, a Finder- or launchd-spawned process gets a minimal PATH and does not
- * (hit twice in COS Control). The PATH scan below is done by us, entry by
- * entry, and still yields an absolute path we have stat'ed — so a failure names
- * the missing binary instead of surfacing as ENOENT from inside a spawn.
- *
- * An unusable env override REFUSES rather than falling through to the
- * candidates: an operator who set it wrongly needs to be told, not overridden.
- */
-export function resolveProviderBinary(
-  provider: AttachedProvider,
-  env: NodeJS.ProcessEnv = process.env,
-): BinaryResolution {
-  return resolveBinaryFromSpec(providerBinarySpec(provider), env)
-}
-
-/**
- * The resolution algorithm itself, separated from the provider tables.
- *
- * Not a testing seam bolted on: on any developer machine at least one real
- * absolute candidate exists, so the PATH-scan and not-found branches of
- * `resolveProviderBinary` are unreachable from a test and would ship
- * unexercised — which is exactly how a launchd-only failure hides. Driving the
- * REAL algorithm with a fixture spec exercises them for real.
- */
-export function resolveBinaryFromSpec(spec: BinarySpec, env: NodeJS.ProcessEnv): BinaryResolution {
-  const excluded = spec.excludePrefixes ?? STALE_SHIM_PREFIXES
-
-  for (const key of spec.envKeys) {
-    const raw = env[key]
-    if (typeof raw !== 'string' || raw.trim().length === 0) continue
-    const candidate = raw.trim()
-    if (!isUsableExecutable(candidate, excluded)) {
-      return { ok: false, binary: spec.name, detail: 'env_override_unusable' }
-    }
-    return { ok: true, path: candidate, source: 'env' }
-  }
-
-  for (const candidate of spec.absolutes) {
-    if (isUsableExecutable(candidate, excluded)) return { ok: true, path: candidate, source: 'absolute' }
-  }
-
-  const pathValue = typeof env.PATH === 'string' ? env.PATH : ''
-  for (const dir of pathValue.split(delimiter)) {
-    // A relative PATH entry resolves against the server's cwd, which is not a
-    // location we control. Skipped rather than resolved.
-    //
-    // Redundant with the `isAbsolute` inside `isUsableExecutable` — verified by
-    // mutation: removing EITHER one alone changes no outcome, and only removing
-    // BOTH lets a relative entry through. Kept because two independent guards
-    // on "never resolve against the server cwd" is the correct amount for a
-    // path that ends up as a spawned executable.
-    if (!dir || !isAbsolute(dir)) continue
-    const candidate = join(dir, spec.name)
-    if (isUsableExecutable(candidate, excluded)) return { ok: true, path: candidate, source: 'path' }
-  }
-
-  return { ok: false, binary: spec.name, detail: 'not_found' }
-}
 
 // ---------------------------------------------------------------------------
 // Injected surface

package/server/lib/codex-bridge.ts

@@ -2,6 +2,11 @@
 // Concrete GPT ids resolve from Codex's live model catalog at run time.
 
 import { spawn, spawnSync } from 'node:child_process'
+// Resolved, never bare. `codex` on PATH is a shell alias to /Applications/Codex.app,
+// which does not exist; the real binary is in ChatGPT.app. A bare argv works here only
+// because COS Control injects that directory into the managed plist PATH -- it is ENOENT
+// for every public npx user, and for anything launchd- or Finder-spawned.
+import { resolveProviderBinary } from './provider-binary.js'
 import { logTokenAudit } from './token-audit.js'
 import { cleanupModelImageInputs, type ModelImageInput } from './model-image-input.js'
 import { buildSystemPrompt, buildLightweightSystemPrompt } from './context-builder.js'
@@ -137,7 +142,14 @@ let addDirSupported: boolean | undefined
 export function codexSupportsAdditionalDir(): boolean {
   if (addDirSupported !== undefined) return addDirSupported
   try {
-    const result = spawnSync('codex', ['exec', '--help'], {
+    const resolved = resolveProviderBinary('codex')
+    if (!resolved.ok) {
+      // Cannot probe what cannot be found. Report unsupported rather than throwing:
+      // this gate only disables output publishing, and chat stays functional.
+      addDirSupported = false
+      return addDirSupported
+    }
+    const result = spawnSync(resolved.path, ['exec', '--help'], {
       encoding: 'utf8',
       timeout: 5_000,
       stdio: ['ignore', 'pipe', 'pipe'],
@@ -413,7 +425,18 @@ export async function callCodexStreaming(
   delete env.CLAUDECODE
   if (outputImagePublisher) Object.assign(env, outputImagePublisher.env)
 
-  const proc = spawn('codex', args, {
+  // The live turn path. This one REFUSES loudly rather than degrading -- a turn that
+  // cannot reach the binary must say so, not fail later as an opaque ENOENT from inside
+  // a spawn whose argv the caller never sees.
+  const resolvedCodex = resolveProviderBinary('codex')
+  if (!resolvedCodex.ok) {
+    throw new Error(
+      `codex binary unresolved (${resolvedCodex.detail}). Checked the env override, `
+      + 'then ChatGPT.app, then PATH; /Applications/Codex.app is excluded as a stale shim.',
+    )
+  }
+
+  const proc = spawn(resolvedCodex.path, args, {
     stdio: ['pipe', 'pipe', 'pipe'],
     env,
     cwd: codexCwd,

package/server/lib/codex-model-catalog.ts

@@ -6,6 +6,10 @@
 // the CLI default is used only when no discovered catalog exists yet.
 
 import { spawn } from 'node:child_process'
+// Resolved, never bare -- see provider-binary.ts. This module is a leaf, and the resolver
+// was extracted precisely so importing it here cannot close the cycle
+// catalog -> adapter -> codex-run-ledger -> catalog.
+import { resolveProviderBinary } from './provider-binary.js'
 import { existsSync, readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { resolve } from 'node:path'
@@ -248,7 +252,15 @@ async function fetchAppServerModels(): Promise<CodexCatalogModel[]> {
   return new Promise((resolveModels, reject) => {
     const env = { ...process.env }
     delete env.CLAUDECODE
-    const child = spawn('codex', ['app-server', '--stdio'], {
+    const resolved = resolveProviderBinary('codex')
+    if (!resolved.ok) {
+      // Degrade, do not throw: this module already models exactly this outcome as
+      // `CodexCatalogSource = 'cli-default'`. A catalog refresh that cannot find the
+      // binary is a stale catalog, not a broken server.
+      reject(new Error(`codex binary unresolved (${resolved.detail})`))
+      return
+    }
+    const child = spawn(resolved.path, ['app-server', '--stdio'], {
       stdio: ['pipe', 'pipe', 'pipe'],
       env,
     })

package/server/lib/health-static-probes.ts

@@ -1,4 +1,5 @@
 import { execFile } from 'node:child_process'
+import { resolveProviderBinary } from './provider-binary.js'
 import { PYTHON_BIN } from './python-bridge.js'
 import {
   getCursorModelCatalog,
@@ -116,7 +117,12 @@ async function probeClaude(): Promise<{ value: string; available: boolean }> {
 
 async function probeCodex(): Promise<{ value: string; available: boolean }> {
   try {
-    const result = await execute('codex', ['--version'])
+    // Distinguish "cannot find the binary" from "found it and it errored" -- collapsing
+    // both to 'error' told every public npx user their Codex was broken when the real
+    // problem was a bare argv resolving through a PATH they do not have.
+    const resolved = resolveProviderBinary('codex')
+    if (!resolved.ok) return { value: `unresolved (${resolved.detail})`, available: false }
+    const result = await execute(resolved.path, ['--version'])
     const combined = `${result.stdout}\n${result.stderr}`.trim()
     const versionLine = combined.split(/\r?\n/).map(line => line.trim())
       .find(line => /^codex(?:-cli)?\s+/i.test(line))

package/server/lib/provider-binary.ts

@@ -0,0 +1,192 @@
+/**
+ * Where a provider's executable actually is.
+ *
+ * Extracted from `attached-provider-adapter.ts` 2026-08-19, unchanged. It moved because
+ * three other modules spawn providers by BARE NAME and need this resolution, and importing
+ * the adapter to get it closes a cycle: adapter -> codex-run-ledger -> codex-model-catalog
+ * -> adapter. This module imports nothing from the repo, so it can never be in one.
+ *
+ * Bare `'codex'` in argv resolves through PATH, and a Finder- or launchd-spawned process
+ * gets a minimal one. On this machine the bare sites work ONLY because COS Control injects
+ * ChatGPT.app onto the managed plist PATH -- they are broken for every public npx user.
+ */
+
+import { accessSync, constants as fsConstants, statSync } from 'node:fs'
+import { delimiter, isAbsolute, join } from 'node:path'
+import { homedir } from 'node:os'
+
+// ---------------------------------------------------------------------------
+// Binary resolution
+// ---------------------------------------------------------------------------
+
+export type BinaryResolutionFailure = 'env_override_unusable' | 'not_found'
+
+export type BinaryResolution =
+  | { ok: true; path: string; source: 'env' | 'absolute' | 'path' }
+  | { ok: false; binary: string; detail: BinaryResolutionFailure }
+
+/**
+ * Path prefixes that can never be a usable provider binary.
+ *
+ * `codex` resolved through PATH (or a shell alias) points at
+ * `/Applications/Codex.app/Contents/Resources/codex` on this machine, and that
+ * app no longer exists. Today the shim is dangling, so an existence check
+ * already rejects it — but a reinstalled or partially-removed Codex.app puts a
+ * real, executable file back on that path, and then only this list stands
+ * between an attached turn and a binary that cannot serve it.
+ */
+export const STALE_SHIM_PREFIXES: readonly string[] = ['/Applications/Codex.app/']
+
+export function isKnownStaleShimPath(
+  candidate: string,
+  prefixes: readonly string[] = STALE_SHIM_PREFIXES,
+): boolean {
+  // A non-array argument falls back to the known list rather than to "exclude
+  // nothing" — the classic version of this bug is `list.some(isKnownStaleShimPath)`,
+  // where `.some` passes the INDEX as the second argument and every exclusion
+  // silently disappears.
+  const list = Array.isArray(prefixes) ? prefixes : STALE_SHIM_PREFIXES
+  return list.some(prefix => typeof prefix === 'string' && prefix.length > 0 && candidate.startsWith(prefix))
+}
+
+function isUsableExecutable(
+  candidate: string,
+  excludePrefixes: readonly string[] = STALE_SHIM_PREFIXES,
+): boolean {
+  try {
+    if (!isAbsolute(candidate) || candidate.includes('\0')) return false
+    if (isKnownStaleShimPath(candidate, excludePrefixes)) return false
+    if (!statSync(candidate).isFile()) return false
+    accessSync(candidate, fsConstants.X_OK)
+    return true
+  } catch {
+    return false
+  }
+}
+
+export interface BinarySpec {
+  name: string
+  envKeys: readonly string[]
+  /** Tried in order, BEFORE any PATH scan. */
+  absolutes: readonly string[]
+  /**
+   * Paths that must never be selected, from any source. Defaults to
+   * `STALE_SHIM_PREFIXES`.
+   *
+   * On the spec rather than hardcoded because the exclusion is the only guard
+   * standing between resolution and a known-bad binary, and a guard whose input
+   * cannot be constructed is a guard nobody can prove works: the real prefix
+   * lives under `/Applications`, which no fixture can write to.
+   */
+  excludePrefixes?: readonly string[]
+}
+
+/**
+ * Where each provider's binary is looked for, in precedence order.
+ *
+ * Exported as data rather than kept private so the precedence itself is
+ * testable: on a machine where a stale shim sits on PATH, "ChatGPT.app is tried
+ * before PATH" is the property that decides whether an attached Codex turn
+ * launches the real binary or a dangling one.
+ */
+/**
+ * Takes a plain string, not `AttachedProvider`, deliberately. That type is declared in
+ * `attached-provider-adapter.ts`, and importing it back would recreate exactly the cycle
+ * this extraction exists to break. Callers pass a string-union value, which is assignable.
+ */
+export function providerBinarySpec(provider: string): BinarySpec {
+  const home = (() => {
+    try {
+      return homedir()
+    } catch {
+      return ''
+    }
+  })()
+  if (provider === 'claude') {
+    return {
+      name: 'claude',
+      envKeys: ['COS_ATTACHED_CLAUDE_BIN', 'COS_CLAUDE_BIN'],
+      absolutes: [
+        '/opt/homebrew/bin/claude',
+        '/usr/local/bin/claude',
+        home ? join(home, '.local', 'bin', 'claude') : '',
+      ].filter(Boolean),
+    }
+  }
+  return {
+    name: 'codex',
+    envKeys: ['COS_ATTACHED_CODEX_BIN', 'COS_CODEX_BIN'],
+    absolutes: [
+      // Verified 2026-08-15: codex-cli 0.148.0-alpha.9 lives here, and there is
+      // no `codex` on PATH at all on this machine.
+      '/Applications/ChatGPT.app/Contents/Resources/codex',
+      home ? join(home, '.codex', 'bin', 'codex') : '',
+      '/opt/homebrew/bin/codex',
+      '/usr/local/bin/codex',
+    ].filter(Boolean),
+  }
+}
+
+/**
+ * Resolve a provider binary to a verified absolute path, or refuse.
+ *
+ * Never returns a bare name. A bare name is a silent PATH lookup, and the two
+ * environments this server runs in disagree about PATH: a login shell finds the
+ * CLI, a Finder- or launchd-spawned process gets a minimal PATH and does not
+ * (hit twice in COS Control). The PATH scan below is done by us, entry by
+ * entry, and still yields an absolute path we have stat'ed — so a failure names
+ * the missing binary instead of surfacing as ENOENT from inside a spawn.
+ *
+ * An unusable env override REFUSES rather than falling through to the
+ * candidates: an operator who set it wrongly needs to be told, not overridden.
+ */
+export function resolveProviderBinary(
+  provider: string,
+  env: NodeJS.ProcessEnv = process.env,
+): BinaryResolution {
+  return resolveBinaryFromSpec(providerBinarySpec(provider), env)
+}
+
+/**
+ * The resolution algorithm itself, separated from the provider tables.
+ *
+ * Not a testing seam bolted on: on any developer machine at least one real
+ * absolute candidate exists, so the PATH-scan and not-found branches of
+ * `resolveProviderBinary` are unreachable from a test and would ship
+ * unexercised — which is exactly how a launchd-only failure hides. Driving the
+ * REAL algorithm with a fixture spec exercises them for real.
+ */
+export function resolveBinaryFromSpec(spec: BinarySpec, env: NodeJS.ProcessEnv): BinaryResolution {
+  const excluded = spec.excludePrefixes ?? STALE_SHIM_PREFIXES
+
+  for (const key of spec.envKeys) {
+    const raw = env[key]
+    if (typeof raw !== 'string' || raw.trim().length === 0) continue
+    const candidate = raw.trim()
+    if (!isUsableExecutable(candidate, excluded)) {
+      return { ok: false, binary: spec.name, detail: 'env_override_unusable' }
+    }
+    return { ok: true, path: candidate, source: 'env' }
+  }
+
+  for (const candidate of spec.absolutes) {
+    if (isUsableExecutable(candidate, excluded)) return { ok: true, path: candidate, source: 'absolute' }
+  }
+
+  const pathValue = typeof env.PATH === 'string' ? env.PATH : ''
+  for (const dir of pathValue.split(delimiter)) {
+    // A relative PATH entry resolves against the server's cwd, which is not a
+    // location we control. Skipped rather than resolved.
+    //
+    // Redundant with the `isAbsolute` inside `isUsableExecutable` — verified by
+    // mutation: removing EITHER one alone changes no outcome, and only removing
+    // BOTH lets a relative entry through. Kept because two independent guards
+    // on "never resolve against the server cwd" is the correct amount for a
+    // path that ends up as a spawned executable.
+    if (!dir || !isAbsolute(dir)) continue
+    const candidate = join(dir, spec.name)
+    if (isUsableExecutable(candidate, excluded)) return { ok: true, path: candidate, source: 'path' }
+  }
+
+  return { ok: false, binary: spec.name, detail: 'not_found' }
+}