@bitkyc08/opencodex 2.88.0 → 2.90.0

package/src/cli/combo.ts

@@ -1,3 +1,4 @@
+import { normalizeJevQuotaTiers } from "../combos/jev-quota-config";
 import { JEV_DECISION_TIMEOUT_MAX_MS, JEV_DECISION_TIMEOUT_MIN_MS } from "../combos/types";
 import {
   CliUsageError,
@@ -24,8 +25,10 @@ const USAGE = `Usage:
       [--effort <low|medium|high|xhigh|max|ultra|->] [--effort-mode <fallback|force|->]
       (force overrides valid client effort and can increase cost/latency) [--alias <name|->]
       [--native-alias [on|off]] [--allow-metered-targets <on|off>] [--display-name <label|->]
+      [--description <text|->]
       [--image-input <auto|disabled>] [--reasoning-effort-mode <strict|adaptive>]
       [--decision-provider <provider|-> | --decision-model <route|->] [--decision-timeout <ms|->]
+      [--decision-quota-signals <on|off|->] [--decision-quota-tiers <JSON|->]
       (jev only; the provider must be a configured jev-decision row)
       [--rename-from <id>] [--json]
   ocx combo stats <id> [--range <7d|30d|all>] [--json]
@@ -80,6 +83,7 @@ async function show(argv: string[], deps: RuntimeApiDeps): Promise<void> {
   printData(combo, wantsJson);
 }
 
+/** Handle `ocx combo set`: parse the combo id and flags (including `--decision-quota-signals` and `--decision-quota-tiers`), then create or update the combo through the management API. */
 async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
   const args = [...argv];
   const id = args.shift()?.trim();
@@ -118,6 +122,7 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
   const alias = takeOption(args, "--alias");
 
   const displayName = takeOption(args, "--display-name");
+  const description = takeOption(args, "--description");
   const decisionProvider = takeOption(args, "--decision-provider");
   const decisionModel = takeOption(args, "--decision-model");
   if (decisionModel !== undefined && decisionModel !== "-" && decisionProvider !== undefined && decisionProvider !== "-") {
@@ -129,6 +134,13 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
   if (decisionProvider !== undefined && decisionProvider !== "-" && strategy !== "jev") {
     throw new CliUsageError("--decision-provider applies only to the jev strategy", USAGE);
   }
+  const quotaSignals = takeOption(args, "--decision-quota-signals");
+  const quotaTiers = takeOption(args, "--decision-quota-tiers");
+  if (quotaSignals !== undefined && !["on", "off", "-"].includes(quotaSignals)) throw new CliUsageError("--decision-quota-signals must be on, off or -", USAGE);
+  let parsedQuotaTiers: ReturnType<typeof normalizeJevQuotaTiers> | null;
+  try { parsedQuotaTiers = quotaTiers === undefined || quotaTiers === "-" ? null : normalizeJevQuotaTiers(JSON.parse(quotaTiers)); } catch { throw new CliUsageError("invalid --decision-quota-tiers JSON", USAGE); }
+  if (quotaTiers !== undefined && quotaTiers !== "-" && !parsedQuotaTiers) throw new CliUsageError("quota tiers must be finite 0..100 and strictly ascending", USAGE);
+  if (strategy !== "jev" && (quotaSignals !== undefined && quotaSignals !== "-" || quotaTiers !== undefined && quotaTiers !== "-")) throw new CliUsageError("quota settings apply only to jev", USAGE);
   const decisionTimeout = takeOption(args, "--decision-timeout");
   let decisionTimeoutMs: number | null | undefined;
   if (decisionTimeout !== undefined) {
@@ -164,15 +176,20 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
   if (additional.imageInput !== undefined) combo.imageInput = additional.imageInput;
   if (additional.reasoningEffortMode !== undefined) combo.reasoningEffortMode = additional.reasoningEffortMode;
   if (displayName !== undefined) combo.displayName = displayName === "-" ? "" : displayName;
+  if (description !== undefined) combo.description = description === "-" ? "" : description;
   if (decisionProvider !== undefined) combo.decisionProvider = decisionProvider === "-" ? null : decisionProvider;
   if (decisionModel !== undefined) combo.decisionModel = decisionModel === "-" ? null : decisionModel;
   if (decisionProvider !== undefined && decisionProvider !== "-") combo.decisionModel = null;
   if (decisionModel !== undefined && decisionModel !== "-") combo.decisionProvider = null;
   if (decisionTimeoutMs !== undefined) combo.decisionTimeoutMs = decisionTimeoutMs;
+  if (quotaSignals !== undefined) combo.decisionQuotaSignals = quotaSignals === "-" ? null : quotaSignals === "on";
+  if (quotaTiers !== undefined) combo.decisionQuotaTiers = parsedQuotaTiers;
   if (strategy !== "jev") {
     delete combo.decisionProvider;
     delete combo.decisionModel;
     delete combo.decisionTimeoutMs;
+    delete combo.decisionQuotaSignals;
+    delete combo.decisionQuotaTiers;
   }
   const current = partialCurrent ?? await runtimeRequest<{ combos?: ComboRow[] }>("/api/combos", { redirect: "error" }, deps);
   const existing = (current.combos ?? []).find(row => row.id === (renameFrom ?? id));

package/src/cli/ensure-desktop-cold-start.ts

@@ -241,12 +241,12 @@ function consentedDesktopBundle(home: string, installId: string, run: Execute):
   const plistPath = realpathSync(join(home, "Library", "LaunchAgents", `${DESKTOP_PLIST_LABEL}.plist`));
   const registration = JSON.parse(
     run("/usr/bin/plutil", ["-convert", "json", "-o", "-", plistPath], 3_000),
-  ) as { Label?: unknown; ProgramArguments?: unknown; Program?: unknown };
+  ) as { Label?: unknown; RunAtLoad?: unknown; ProgramArguments?: unknown; Program?: unknown };
   const args = registration.ProgramArguments;
   // The shapes auto-launch writes: [program] or [program, "--autostart"]; see the migration
   // rules in desktop/src-tauri/src/login_registration.rs, which classify anything else Leave.
   // This is a macOS plist path, regardless of the host running an injected launch probe.
-  if (registration.Label !== DESKTOP_PLIST_LABEL || !Array.isArray(args)
+  if (registration.Label !== DESKTOP_PLIST_LABEL || registration.RunAtLoad !== true || !Array.isArray(args)
     || (args.length !== 1 && args.length !== 2) || typeof args[0] !== "string" || !posix.isAbsolute(args[0])
     || (args.length === 2 && args[1] !== "--autostart")
     || (registration.Program !== undefined && registration.Program !== args[0])) return null;

package/src/cli/help.ts

@@ -79,7 +79,7 @@ Usage:
   ocx alias <sub>             Short names for providers and models (list, set, rm, defaults)
   ocx combo <sub>             Combo routing strategies and failover
   ocx agent <sub>             Subagents, injection, effort caps, and sidecars
-  ocx message <sub>           Loaded local Codex sessions and queued peer messages (sessions|send)
+  ocx message <sub>           Codex queued messages, explicit SSH peers and foreground ownership
   ocx effort [sub]            Inspect and configure reasoning effort caps and defaults
   ocx observe <sub>           Logs, usage, storage, memory, and debug data
   ocx inspect <sub>           Effective config, catalog, analytics, pacing, client-config

package/src/cli/message-command.ts

@@ -2,13 +2,16 @@ import { MessageBudget } from "../messaging/budget";
 import { readMessageInput } from "../messaging/input";
 import { localSessions, messageFailure, sendLocalMessage } from "../messaging/send";
 import { parseMessageArgs } from "./message-args";
+import { parseRemoteMessageArgs } from "./message-remote-args";
 import { terminalSafeText } from "./runtime-api";
 
 /** Run one local messaging operation after pure syntax validation, then release owned resources. */
 export async function runMessageCommand(argv: readonly string[], env: NodeJS.ProcessEnv = process.env): Promise<number> {
+  const remote = parseRemoteMessageArgs(argv);
+  if (remote) return (await import("./message-remote-command")).runRemoteMessageCommand(remote, env);
   const args = parseMessageArgs(argv);
   if (!args) {
-    console.error("Usage: ocx message sessions [--json] | send (--thread <uuid> | --name <exact-name>) --stdin [--kind request|response|notification] [--in-reply-to <uuid>] [--json]");
+    console.error("Usage: ocx message sessions [--host <peer>] [--json] | send (--thread <uuid> | --name <exact-name>) --stdin [--host <peer>] [--kind request|response|notification] [--in-reply-to <uuid>] [--json] | enable [--port <port>] | disable | status | hosts <probe|add|list|remove|abandon|allow-inbound|deny-inbound> | serve [--host <peer>]...");
     return 64;
   }
   const controller = new AbortController();

package/src/cli/message-remote-args.ts

@@ -0,0 +1,69 @@
+import { validAlias, validPort, REMOTE_LIMITS } from "../messaging/remote-contract";
+import { isSshAlias } from "../link/ssh-argv";
+import { parseMessageArgs, type MessageArgs } from "./message-args";
+import { isThreadId } from "../messaging/types";
+
+export type RemoteMessageArgs = { action: "enable"; port?: number; json: boolean }
+  | { action: "disable" | "status" | "hosts-list" | "_control" | "_port"; json: boolean }
+  | { action: "serve"; hosts: string[]; json: boolean }
+  | { action: "hosts-probe"; ssh: string; json: boolean }
+  | { action: "hosts-add"; alias: string; ssh: string; fingerprint: string; json: boolean }
+  | { action: "hosts-remove"; host: string; transaction?: string; json: boolean }
+  | { action: "hosts-allow-inbound" | "hosts-deny-inbound"; host: string; json: boolean }
+  | { action: "hosts-abandon"; transaction: string; json: boolean }
+  | { action: "remote-operation"; host: string; local: MessageArgs; json: boolean };
+
+/** Pure remote syntax validation precedes state, home selection, listeners or SSH allocation. */
+export function parseRemoteMessageArgs(argv: readonly string[]): RemoteMessageArgs | null {
+  let action = argv[0], start = 1, positional: string | undefined;
+  if (action === "sessions" || action === "send") {
+    const hostIndex = argv.indexOf("--host");
+    if (hostIndex < 0 || argv.lastIndexOf("--host") !== hostIndex || !validAlias(argv[hostIndex + 1])) return null;
+    const local = parseMessageArgs([...argv.slice(0, hostIndex), ...argv.slice(hostIndex + 2)]);
+    return local ? { action: "remote-operation", host: argv[hostIndex + 1]!, local, json: local.json } : null;
+  }
+  if (action === "hosts") {
+    if (!["list", "probe", "add", "remove", "abandon", "allow-inbound", "deny-inbound"].includes(argv[1] ?? "")) return null;
+    action = `hosts-${argv[1]}`; start = 2;
+    if (["hosts-add", "hosts-remove", "hosts-allow-inbound", "hosts-deny-inbound"].includes(action)) {
+      positional = argv[start++]; if (!validAlias(positional)) return null;
+    }
+  }
+  const seen = new Set<string>(), flags: Record<string, string> = {}, hosts: string[] = [];
+  for (let index = start; index < argv.length; index++) {
+    const flag = argv[index]!;
+    if (seen.has(flag) && !(action === "serve" && flag === "--host")) return null;
+    seen.add(flag);
+    if (flag === "--json") continue;
+    const allowed = action === "enable" ? ["--port"] : action === "serve" ? ["--host"]
+      : action === "hosts-probe" ? ["--ssh"] : action === "hosts-add" ? ["--ssh", "--fingerprint"]
+        : action === "hosts-abandon" || action === "hosts-remove" ? ["--transaction"] : [];
+    if (!allowed.includes(flag)) return null;
+    const value = argv[++index]; if (!value || value.startsWith("--")) return null;
+    flags[flag] = value; if (flag === "--host") hosts.push(value);
+  }
+  const json = seen.has("--json");
+  if (action === "enable") {
+    if (flags["--port"] !== undefined && (!/^\d{4,5}$/.test(flags["--port"]) || !validPort(Number(flags["--port"])))) return null;
+    return { action, json, ...(flags["--port"] ? { port: Number(flags["--port"]) } : {}) };
+  }
+  if (action === "serve") return hosts.length <= REMOTE_LIMITS.peers && hosts.every(validAlias)
+    && new Set(hosts).size === hosts.length ? { action, hosts, json } : null;
+  if (["disable", "status", "hosts-list", "_control", "_port"].includes(action ?? "")) {
+    return { action: action as "disable", json };
+  }
+  if (action === "hosts-remove") {
+    const transaction = flags["--transaction"];
+    if (transaction !== undefined && !isThreadId(transaction)) return null;
+    return { action, host: positional!, json, ...(transaction !== undefined ? { transaction } : {}) };
+  }
+  if (action === "hosts-allow-inbound" || action === "hosts-deny-inbound") return { action, host: positional!, json };
+  if (action === "hosts-abandon" && isThreadId(flags["--transaction"])) return { action, transaction: flags["--transaction"]!, json };
+  if ((action === "hosts-probe" || action === "hosts-add") && flags["--ssh"] && isSshAlias(flags["--ssh"])) {
+    if (action === "hosts-probe") return { action, ssh: flags["--ssh"], json };
+    if (/^SHA256:[A-Za-z0-9+/=]{1,64}$/.test(flags["--fingerprint"] ?? "")) return {
+      action, alias: positional!, ssh: flags["--ssh"], fingerprint: flags["--fingerprint"], json,
+    };
+  }
+  return null;
+}

package/src/cli/message-remote-command.ts

@@ -0,0 +1,77 @@
+import { getConfigDir } from "../config/paths";
+import { MessageBudget } from "../messaging/budget";
+import { readMessageInput } from "../messaging/input";
+import { RemoteCapacity } from "../messaging/remote-contract";
+import { enrollRemoteHost, handleEnrollmentControl, probeRemoteHost, removeRemoteHost } from "../messaging/remote-enrollment";
+import { abandonRemoteEnrollment, pendingRemoteEnrollment } from "../messaging/remote-enrollment-recovery";
+import { remoteControl } from "../messaging/remote-auth";
+import { ownerEndpoint, startRemoteOwner } from "../messaging/remote-owner";
+import { remotePortCandidate } from "../messaging/remote-ports";
+import { remoteSessions, sendRemoteMessage } from "../messaging/remote-send";
+import { RemoteMessageStore } from "../messaging/remote-store";
+import { messageFailure } from "../messaging/send";
+import { messageCodexHome } from "./message-runtime";
+import { terminalSafeText } from "./runtime-api";
+import type { RemoteMessageArgs } from "./message-remote-args";
+
+/** Activate remote resources only after an explicit remote command's pure parser succeeds. */
+export async function runRemoteMessageCommand(args: RemoteMessageArgs, env: NodeJS.ProcessEnv): Promise<number> {
+  const store = new RemoteMessageStore(getConfigDir()), controller = new AbortController(), capacity = new RemoteCapacity();
+  const cancel = () => controller.abort();
+  process.once("SIGINT", cancel); process.once("SIGTERM", cancel);
+  const emit = (value: unknown) => console.log(args.json || args.action.startsWith("_")
+    ? JSON.stringify(value) : terminalSafeText(JSON.stringify(value)));
+  try {
+    if (args.action === "serve") {
+      const owner = await startRemoteOwner(store, messageCodexHome(env), args.hosts, controller.signal);
+      try {
+        emit({ protocol: "ocx-message-remote/1", running: true, port: owner.port });
+        await Promise.race([owner.finished, new Promise<void>(resolve => {
+          controller.signal.addEventListener("abort", () => resolve(), { once: true });
+          if (controller.signal.aborted) resolve();
+        })]);
+        if (!controller.signal.aborted) { emit({ running: false, error: { code: "owner_retired", message: "Foreground messaging owner retired; restart explicitly after resolving its route/configuration failure." } }); return 1; }
+      } finally { await owner.close(); }
+      return 0;
+    }
+    const budget = new MessageBudget(30000, controller.signal);
+    try {
+      if (args.action === "enable") { store.enable(args.port ?? store.read()?.port ?? 39176); emit(store.publicState()); }
+      else if (args.action === "disable") { store.disable(); emit(store.publicState()); }
+      else if (args.action === "hosts-list") emit({ ...store.publicState(), pendingEnrollment: pendingRemoteEnrollment(store) });
+      else if (args.action === "hosts-abandon") { emit(abandonRemoteEnrollment(store, args.transaction)); return 3; }
+      else if (args.action === "status") {
+        const state = store.read(); let running = false, routes: unknown = [];
+        if (state?.enabled) {
+          try { const result = await remoteControl(state, ownerEndpoint(state), "message/routes", {}, budget);
+            running = true; routes = result; } catch { /* Disabled/offline is not activation or repair. */ }
+        }
+        emit({ ...store.publicState(), running, routes, pendingEnrollment: pendingRemoteEnrollment(store) });
+      } else if (args.action === "hosts-probe") emit({ ssh: args.ssh, fingerprint: (await probeRemoteHost(args.ssh, budget, capacity)).fingerprint });
+      else if (args.action === "hosts-add") emit(await enrollRemoteHost(store, args.alias, args.ssh, args.fingerprint, budget, capacity));
+      else if (args.action === "hosts-allow-inbound" || args.action === "hosts-deny-inbound") {
+        emit(store.setInbound(args.host, args.action === "hosts-allow-inbound"));
+      }
+      else if (args.action === "hosts-remove") {
+        const receipt = await removeRemoteHost(store, args.host, budget, capacity, undefined, undefined, args.transaction); emit(receipt);
+        return receipt.remote === "removed" ? 0 : 3;
+      } else if (args.action === "_control") {
+        emit(handleEnrollmentControl(store, JSON.parse(await readMessageInput(Bun.stdin.stream(), budget))));
+      } else if (args.action === "_port") { store.requireEnabled(); emit({ port: remotePortCandidate() }); }
+      else if (args.action === "remote-operation") {
+        if (args.local.action === "sessions") emit(await remoteSessions(store, args.host, budget));
+        else {
+          const body = await readMessageInput(Bun.stdin.stream(), budget);
+          const receipt = await sendRemoteMessage(store, { ...args.local, host: args.host, body },
+            { home: messageCodexHome(env), senderId: env.CODEX_THREAD_ID }, budget);
+          emit(receipt); return receipt.status === "queued" ? 0 : receipt.status === "unknown" ? 3 : 1;
+        }
+      }
+      return 0;
+    } finally { budget.dispose(); }
+  } catch (error) {
+    // Control errors never echo stdin, SSH output, keys or paths; a failed enrollment keeps its transaction.
+    const failure = messageFailure(error), unknown = ["enrollment_unknown", "remote_control_unknown", "remote_storage_unknown", "cleanup_incomplete"].includes(failure.code);
+    emit({ schema: "ocx-message-error/1", ...(unknown ? { status: "unknown" } : args.action === "remote-operation" && args.local.action === "send" ? { status: "not_sent" } : {}), error: failure }); return unknown ? 3 : 1;
+  } finally { process.removeListener("SIGINT", cancel); process.removeListener("SIGTERM", cancel); }
+}

package/src/cli/provider-runtime.ts

@@ -10,8 +10,10 @@ import {
   takeBooleanOption,
   takeFlag,
   takeOption,
+  terminalSafeText,
   type RuntimeApiDeps,
 } from "./runtime-api";
+import { interactiveConfirm } from "./interactive-confirm";
 import { takeProviderEditSettings } from "./provider-settings";
 import { printProviderReceipt, runProviderAction } from "./provider-result";
 import { providerQuotaLine } from "./account-extended";
@@ -46,7 +48,7 @@ const USAGE = `Usage:
       [--retain-models <id,id|->] [--model <id> --text-only]
       [--xai-chat <on|off>] [--upstream-http-version <http1.1|->] [--fast <on|off>] [--context-window <tokens|->]
       [--allow-private-network <on|off>] [--model-context-tier <model=default|long_context>] [--json]
-  ocx provider test <name> [--json]
+  ocx provider test <name> [--model <id> [--yes]] [--json]
   ocx provider quota [--refresh] [--json]
   ocx provider resets [--limit <n>] [--json]
   ocx provider presets [--json]
@@ -147,12 +149,78 @@ async function edit(argv: string[], deps: RuntimeApiDeps): Promise<number> {
   return printProviderReceipt(result, wantsJson, "Provider edit");
 }
 
+interface CompletionTestDto {
+  applicable: boolean;
+  reason?: string;
+  detail?: string;
+  adapter?: string;
+  ok?: boolean;
+  wireModel?: string;
+  upstreamModel?: string | null;
+  modelComparison?: "match" | "mismatch" | "unknown";
+  comparisonNote?: "missing_metadata" | "conflicting_metadata";
+  ttftMs?: number | null;
+  totalLatencyMs?: number;
+  error?: { code: string; message: string; status?: number } | null;
+}
+
+async function testCompletion(name: string, model: string, yes: boolean, wantsJson: boolean, deps: RuntimeApiDeps): Promise<number> {
+  const input = deps.stdinImpl ?? process.stdin;
+  if (!yes && (wantsJson || !input.isTTY)) {
+    throw new CliUsageError("completion tests consume quota and may incur cost; --yes is required with --json or non-interactive input", USAGE);
+  }
+  const warning = terminalSafeText(`${name}: completion test for model ${model}. Warning: this sends an upstream request, consumes quota and may incur cost.`);
+  if (wantsJson) console.error(warning);
+  else console.log(warning);
+  if (!yes && !await interactiveConfirm({
+    question: "Run this completion test?", defaultYes: false, input: input as NodeJS.ReadStream,
+  })) {
+    console.log("cancelled");
+    return 1;
+  }
+  const result = await runtimeRequest<CompletionTestDto>(`/api/providers/test-completion?name=${encodeURIComponent(name)}`, {
+    method: "POST", redirect: "error", body: JSON.stringify({ model, confirm: true }),
+  }, deps);
+  if (result.applicable === false) {
+    printData(result, wantsJson, [
+      `${name}: not applicable — ${result.reason}`,
+      ...(result.detail ? [`Detail: ${result.detail}`] : []),
+      ...(result.adapter ? [`Adapter: ${result.adapter}`] : []),
+    ]);
+    return 0;
+  }
+  if (result.ok === true) {
+    printData(result, wantsJson, [
+      `${name}: connected`,
+      `TTFT: ${result.ttftMs ?? "unknown"} ms`,
+      `Total latency: ${result.totalLatencyMs ?? "unknown"} ms`,
+      `Upstream reported ${result.upstreamModel ?? "unknown"} for ${result.wireModel} — ${result.modelComparison}${result.comparisonNote ? ` (${result.comparisonNote})` : ""}`,
+      "metadata only — not proof of model identity",
+    ]);
+    return 0;
+  }
+  printData(result, wantsJson, [
+    `${name}: failed`,
+    `${result.error?.code ?? "unknown"}: ${result.error?.message ?? "Completion test failed"}${result.error?.status === undefined ? "" : ` (HTTP ${result.error.status})`}`,
+  ]);
+  return 1;
+}
+
 async function testProvider(argv: string[], deps: RuntimeApiDeps): Promise<number> {
   const args = [...argv];
   const name = args.shift()?.trim();
   const wantsJson = takeFlag(args, "--json");
   if (!name) throw new CliUsageError("provider name is required", USAGE);
+  const model = takeOption(args, "--model")?.trim();
+  const yes = takeFlag(args, "--yes");
   rejectArgs(args, USAGE);
+  if (yes && model === undefined) throw new CliUsageError("--yes requires --model", USAGE);
+  if (model !== undefined) {
+    if (!model || model.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(model)) {
+      throw new CliUsageError("--model must contain 1..256 characters without control characters", USAGE);
+    }
+    return testCompletion(name, model, yes, wantsJson, deps);
+  }
   const result = await runtimeRequest<Record<string, unknown>>(`/api/providers/test?name=${encodeURIComponent(name)}`, {
     method: "POST",
   }, deps);

package/src/cli/registry.ts

@@ -16,9 +16,9 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
   },
   {
     name: "message",
-    usage: "ocx message <sessions|send> [options]",
-    summary: "Discover loaded local Codex sessions and submit one queued peer message.",
-    details: ["Local Unix transport only; starts no daemon. queued is submission, not processing; never replay an unknown send."],
+    usage: "ocx message <sessions|send|enable|disable|status|hosts|serve> [options]",
+    summary: "Discover loaded Codex sessions and queue messages locally or through explicit SSH peers.",
+    details: ["Remote listeners/tunnels require explicit foreground serve; no daemon start. queued is submission, not processing; never replay an unknown send."],
   },
   {
     name: "chatgpt",

package/src/codex/account-lifecycle.ts

@@ -1,4 +1,5 @@
 import { observeSignedInCodexIdentity } from "./signed-in-identity";
+import { observeMainCodexCollisionIdentity } from "./collision-identity";
 import { existsSync, readFileSync } from "node:fs";
 import {
   deleteConfigTopLevelKey,
@@ -9,11 +10,12 @@ import {
 import { captureConfigTopLevelRollback } from "../config/rebase-provenance";
 import { removeCodexAccountCredential } from "./account-store";
 import { clearAccountNeedsReauth } from "./account-runtime-state";
-import { readCodexTokensResult } from "./auth-collision";
+import { readMainAuth } from "./auth-collision";
 import { MAIN_CODEX_ACCOUNT_ID, setMainAccountPlan } from "./main-account";
 import { clearAccountQuota } from "./quota";
 import { forgetManualPreference } from "./routing/active-account";
 import { deleteAllHealthForAccount } from "./routing/health-store";
+import { forgetCodexFailureWindow } from "./routing/failure-window";
 import { clearThreadAccountMapForAccount } from "./routing/thread-affinity";
 
 import { clearCodexPoolRefreshFailure } from "./pool-refresh-backoff";
@@ -49,11 +51,15 @@ export function purgeCodexAccountRuntimeState(accountId: string): void {
   clearAccountNeedsReauth(accountId);
   clearAccountQuota(accountId);
   clearThreadAccountMapForAccount(accountId);
-  // Deliberately not via `./routing`: the account-delete path only needs the health rows and
-  // the manual preference gone, and importing the router here closed a cycle through
-  // routing/health-store and routing/active-account.
+  // Deliberately not via `./routing`: the account-delete path only needs the health rows
+  // and their sibling routing state gone, and importing the router barrel here closed a
+  // cycle through routing/health-store and routing/active-account. The leaf imports below
+  // carry every per-account forget that barrel helper used to perform — including the
+  // failure window, whose degrade and pin-warning state must not leak into a replacement
+  // account or a new physical login behind __main__.
   deleteAllHealthForAccount(accountId);
   forgetManualPreference(accountId);
+  forgetCodexFailureWindow(accountId);
   clearCodexPoolRefreshFailure(accountId);
   if (accountId === MAIN_CODEX_ACCOUNT_ID) {
     clearMainAccountInfoCache();
@@ -74,7 +80,8 @@ function purgeMainCodexAccountRuntimeState(): void {
  * cooldown, quota, reauth, and thread affinity do not leak across accounts.
  */
 export function reconcileMainCodexAccountRuntimeState(): boolean {
-  const read = readCodexTokensResult();
+  const read = readMainAuth();
+  if (read.status === "missing" || read.status === "api-key-only") observeMainCodexCollisionIdentity();
   const currentAccountId = read.status === "ok"
     ? extractAccountId(read.tokens.id_token, read.tokens.access_token) ?? (read.tokens.account_id || null)
     : null;
@@ -86,11 +93,13 @@ export function reconcileMainCodexAccountRuntimeState(): boolean {
   observedMainChatgptAccountId = currentAccountId;
   if (previousAccountId === undefined || previousAccountId === currentAccountId) {
     observeMainQuotaIdentity(currentAccountId);
+    if (read.status === "ok") observeMainCodexCollisionIdentity(read.tokens);
     return false;
   }
 
   purgeMainCodexAccountRuntimeState();
   observeMainQuotaIdentity(currentAccountId);
+  if (read.status === "ok") observeMainCodexCollisionIdentity(read.tokens);
   return true;
 }
 
@@ -103,7 +112,8 @@ export function reconcileMainCodexAccountRuntimeState(): boolean {
 export function initializeMainAccountPolicyBinding(authPath: string): boolean {
   // Startup observes the pinned owned path inside the exclusive claim: bound the read so a
   // replaced non-regular or oversized file cannot stall startup inside that claim.
-  const result = readCodexTokensResult(authPath, { bounded: true });
+  const result = readMainAuth(authPath);
+  if (result.status === "missing" || result.status === "api-key-only") observeMainCodexCollisionIdentity();
   if (result.status !== "ok") return false;
   const { tokens } = result;
   if (typeof tokens.access_token !== "string" || !tokens.access_token
@@ -124,6 +134,7 @@ export function initializeMainAccountPolicyBinding(authPath: string): boolean {
   if (previousAccountId !== undefined && previousAccountId !== accountId) purgeMainCodexAccountRuntimeState();
   observeSignedInCodexIdentity(tokens);
   observeMainQuotaIdentity(accountId);
+  observeMainCodexCollisionIdentity(tokens);
   return observeMainQuotaCredential(tokens.access_token, accountId) !== undefined;
 }
 
@@ -136,6 +147,7 @@ export function applyConfirmedMainCodexAccountTransition(
   toAccountId: string,
 ): boolean {
   observeSignedInCodexIdentity();
+  observeMainCodexCollisionIdentity();
   if (!fromAccountId || !toAccountId || fromAccountId === toAccountId) {
     if (toAccountId) {
       observedMainChatgptAccountId = toAccountId;
@@ -150,6 +162,7 @@ export function applyConfirmedMainCodexAccountTransition(
 }
 
 export function resetMainCodexAccountIdentityTrackingForTests(): void {
+  observeMainCodexCollisionIdentity();
   observedMainChatgptAccountId = undefined;
   observeSignedInCodexIdentity();
   clearMainAccountCredentialPresence();

package/src/codex/account-pause.ts

@@ -1,3 +1,5 @@
+import { randomUUID } from "node:crypto";
+import type { AccountPauseDetails } from "../types/account-auto-pause";
 import type { OcxConfig } from "../types";
 import { deleteConfigTopLevelKey } from "../config/rebase-provenance";
 
@@ -7,7 +9,9 @@ export function isCodexAccountPaused(config: OcxConfig, accountId: string): bool
 }
 
 /** Persist the account's pool eligibility without changing credentials or runtime health. */
-export function setCodexAccountPaused(config: OcxConfig, accountId: string, paused: boolean): void {
+export function setCodexAccountPaused(config: OcxConfig, accountId: string, paused: boolean, details?: AccountPauseDetails): void {
+  config.codexAccountPauseState = { ...config.codexAccountPauseState,
+    [accountId]: { revision: randomUUID(), ...(paused && details ? { details } : {}) } };
   const pausedIds = new Set(config.pausedCodexAccountIds ?? []);
   if (paused) pausedIds.add(accountId);
   else pausedIds.delete(accountId);
@@ -18,4 +22,5 @@ export function setCodexAccountPaused(config: OcxConfig, accountId: string, paus
 
 export function forgetCodexAccountPause(config: OcxConfig, accountId: string): void {
   setCodexAccountPaused(config, accountId, false);
+  if (config.codexAccountPauseState) delete config.codexAccountPauseState[accountId];
 }

package/src/codex/account-runtime-state.ts

@@ -1,3 +1,4 @@
+import { setDecisionAccountUsable } from "../lib/decision-quota-sink";
 import { captureConfigGeneration, type GenerationContext } from "../lib/state-store-sweeper";
 import { isCodexAccountGenerationLive } from "./account-store";
 
@@ -39,12 +40,14 @@ export function clearMainRefreshGrantRejection(key: string): void {
 }
 
 
+/** Quarantine a Codex account (or one credential generation) after an auth failure, and mark its advisory decision-quota row unusable so routing evidence cannot treat it as healthy. */
 export function markAccountNeedsReauth(
   id: string,
   writerGeneration = captureConfigGeneration(),
   credentialGeneration?: number,
 ): void {
   if (writerGeneration < lastReconciledGeneration && !liveAccountIds.has(id)) return;
+  setDecisionAccountUsable(id === "__main__" ? "codex-main" : "codex", id, false, credentialGeneration);
   // An account-wide mark supersedes a generation-scoped one: it is the stronger claim.
   if (credentialGeneration === undefined || !reauthAccounts.has(id)) {
     reauthAccounts.set(id, credentialGeneration);
@@ -81,6 +84,7 @@ export function isAccountNeedsReauth(id: string): boolean {
   return true;
 }
 
+/** Lift a reauth quarantine only when the proof matches the quarantined credential generation, and restore the advisory decision-quota row's usability. */
 export function clearAccountNeedsReauth(id: string, credentialGeneration?: number): void {
   // A model response proves only the credential it used. Keep account-wide
   // quarantine and evidence from another generation intact.
@@ -88,4 +92,5 @@ export function clearAccountNeedsReauth(id: string, credentialGeneration?: numbe
     && (reauthAccounts.get(id) !== credentialGeneration
       || !isCodexAccountGenerationLive(id, credentialGeneration))) return;
   reauthAccounts.delete(id);
+  setDecisionAccountUsable(id === "__main__" ? "codex-main" : "codex", id, true, credentialGeneration);
 }

package/src/codex/account-store.ts

@@ -14,6 +14,7 @@ import {
   hardenExistingSecret,
   withConfigMutationLockSync,
 } from "../config";
+import { notifyCodexStoreLoaded } from "../lib/decision-quota-sink";
 import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
 import type { CodexAccountCredentialRecord, CodexAccountCredentials } from "../types";
 import { advanceCodexCredentialMutationEpoch } from "./credential-mutation-epoch";
@@ -113,30 +114,68 @@ function normalizeRecord(value: CodexAccountCredentials | CodexAccountCredential
   return undefined;
 }
 
+/**
+ * Observe-only read for the JEV quota activation owner: the same normalization as the loader,
+ * without hardening, invalid-file backup or slot notification. Absent or invalid stores read as empty.
+ */
+export function peekCodexAccountRecordStore(): Record<string, CodexAccountCredentialRecord> {
+  const path = codexAccountsPath();
+  if (!existsSync(path)) return {};
+  const normalized: Record<string, CodexAccountCredentialRecord> = {};
+  try {
+    const raw = JSON.parse(readFileSync(path, "utf-8")) as RawCodexAccountStore;
+    for (const [id, value] of Object.entries(raw)) {
+      const record = normalizeRecord(value);
+      if (record) normalized[id] = record;
+    }
+  } catch {
+    return {};
+  }
+  return normalized;
+}
+
+/** Read the Codex account record store from disk with hardened permissions, and hand it to the opt-in decision-quota slot (a no-op unless JEV quota signals are active). */
 function loadCodexAccountRecordStore(): CodexAccountStore {
+  const result = loadCodexAccountRecordStoreResult();
+  return result.status === "ok" ? result.records : {};
+}
+
+type CodexAccountRecordStoreResult = { status: "ok"; records: CodexAccountStore } | { status: "failed" };
+
+/** Retain read/parse failure separately for consumers that must preserve existing evidence. */
+function loadCodexAccountRecordStoreResult(): CodexAccountRecordStoreResult {
   const path = codexAccountsPath();
   hardenConfigDir();
   hardenExistingSecret(path);
-  if (!existsSync(path)) return {};
+  const normalized: CodexAccountStore = {};
   try {
     const raw = JSON.parse(readFileSync(path, "utf-8")) as RawCodexAccountStore;
-    const normalized: CodexAccountStore = {};
+    if (!isObject(raw)) throw new Error("invalid Codex account store shape");
     for (const [id, value] of Object.entries(raw)) {
       const record = normalizeRecord(value);
       if (record) normalized[id] = record;
     }
-    return normalized;
-  } catch {
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+      notifyCodexStoreLoaded({});
+      return { status: "ok", records: {} };
+    }
     backupInvalidConfig(path);
-    return {};
+    notifyCodexStoreLoaded({});
+    return { status: "failed" };
   }
+  // Outside the parse try: roster publication is advisory and must never route a loaded store into the invalid-config backup path.
+  notifyCodexStoreLoaded(normalized);
+  return { status: "ok", records: normalized };
 }
 
+/** Atomically write the Codex account store, then hand it to the opt-in decision-quota slot so active advisory evidence tracks the persisted credentials. */
 function persist(store: CodexAccountStore): void {
   const dir = getConfigDir();
   assertNotRealHomeUnderTest(dir);
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true, mode: 0o700 });
   atomicWriteFile(codexAccountsPath(), JSON.stringify(store, null, 2) + "\n");
+  notifyCodexStoreLoaded(store);
 }
 
 function persistCredentialMutation(store: CodexAccountStore): void {
@@ -373,6 +412,10 @@ export function isCodexAccountGenerationLive(id: string, generation: number): bo
   return !!record?.credential && record.deletedAt == null && record.generation === generation;
 }
 
+/** Callable for existing liveness consumers; stateful consumers can distinguish unknown snapshots. */
+export type CodexAccountGenerationLiveCheck = ((id: string, generation: number) => boolean)
+  & { readonly snapshotStatus: "ok" | "failed" };
+
 /**
  * The same verdict as {@link isCodexAccountGenerationLive}, over ONE store load.
  *
@@ -382,12 +425,15 @@ export function isCodexAccountGenerationLive(id: string, generation: number): bo
  * several accounts in one synchronous pass on the request path, so it opens one checker and
  * closes over the snapshot instead.
  */
-export function beginCodexAccountGenerationLiveCheck(): (id: string, generation: number) => boolean {
-  const snapshot = loadCodexAccountRecordSnapshot();
-  return (id, generation) => {
+export function beginCodexAccountGenerationLiveCheck(): CodexAccountGenerationLiveCheck {
+  let result: CodexAccountRecordStoreResult;
+  try { result = loadCodexAccountRecordStoreResult(); }
+  catch { result = { status: "failed" }; }
+  const snapshot = result.status === "ok" ? result.records : {};
+  return Object.assign((id: string, generation: number) => {
     const record = snapshot[id];
     return !!record?.credential && record.deletedAt == null && record.generation === generation;
-  };
+  }, { snapshotStatus: result.status });
 }
 
 export function saveCodexAccountCredentialIfGeneration(