@bitkyc08/opencodex 2.47.0 → 2.48.0

package/src/codex/reset-credit-auto-redeem.ts

@@ -1,6 +1,7 @@
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { ConfigMutationLockError, withConfigMutationLockSync } from "../config";
 import { atomicWriteFile } from "../config/atomic-write";
 import { getConfigDir } from "../config/paths";
 import { registerOptionalShutdownHook } from "../lib/optional-shutdown-hooks";
@@ -91,9 +92,9 @@ function readJournal(path: string): Journal {
   }
 }
 
-function writeJournal(path: string, journal: Journal): void {
+function writeJournal(path: string, journal: Journal, now: number): void {
   // Keep only entries whose credit could still matter: settled ones older than a week are noise.
-  const cutoff = Date.now() - 7 * 24 * 60 * 60_000;
+  const cutoff = now - 7 * 24 * 60 * 60_000;
   journal.entries = journal.entries.filter(e => e.state !== "settled" || e.updatedAt > cutoff);
   atomicWriteFile(path, JSON.stringify(journal, null, 2));
 }
@@ -112,6 +113,7 @@ export interface AutoRedeemDeps {
   now?: () => number;
   setTimer?: (fn: () => void, ms: number) => unknown;
   clearTimer?: (handle: unknown) => void;
+  /** Callers sharing an overridden journal must also share the OPENCODEX_HOME mutation coordinator. */
   journalFile?: string;
   log?: (line: string) => void;
   /** Upper bound on one sleep so a laptop sleep or clock jump re-checks rather than trusting a stale plan. */
@@ -155,15 +157,38 @@ export function createResetCreditAutoRedeemer(deps: AutoRedeemDeps): ResetCredit
     handle = setTimer(() => { handle = null; void tick(); }, Math.max(0, Math.min(ms, maxSleepMs)));
   };
 
+  const retryJournal = (error: unknown): void => {
+    const cause = error instanceof ConfigMutationLockError ? error.cause : error;
+    const code = cause && typeof cause === "object" && "code" in cause ? String(cause.code) : "";
+    const busy = code === "SQLITE_BUSY" || code === "SQLITE_LOCKED"
+      || (cause instanceof Error && /database (?:is|table is) locked/i.test(cause.message));
+    schedule(busy ? 1_000 : idleRecheckMs);
+  };
+
   const dispatch = async (plan: AutoRedeemPlan): Promise<AutoRedeemOutcome> => {
-    const journal = readJournal(path);
-    let entry = journal.entries.find(e => e.accountKey === accountKey && e.grantedAt === plan.grantedAt && e.expiresAt === plan.expiresAt);
-    if (entry?.state === "settled") return { kind: "skipped", reason: "credit-gone" };
-    if (!entry) {
-      entry = { accountKey, grantedAt: plan.grantedAt, expiresAt: plan.expiresAt, redeemRequestId: randomUUID(), state: "dispatched", updatedAt: now() };
-      journal.entries.push(entry);
-      // Journal BEFORE the network call: a crash after this line replays the same request id.
-      writeJournal(path, journal);
+    // Reserve under the shared config-mutation lock. `inFlight` only serializes ticks inside
+    // ONE process; two servers on the same config dir would otherwise both read a journal with
+    // no entry, each mint a different `redeem_request_id`, and spend two credits for one plan.
+    let entry: JournalEntry;
+    try {
+      entry = withConfigMutationLockSync(() => {
+        const journal = readJournal(path);
+        const existing = journal.entries.find(e => e.accountKey === accountKey && e.grantedAt === plan.grantedAt && e.expiresAt === plan.expiresAt);
+        if (existing) return existing;
+        const created: JournalEntry = { accountKey, grantedAt: plan.grantedAt, expiresAt: plan.expiresAt, redeemRequestId: randomUUID(), state: "dispatched", updatedAt: now() };
+        journal.entries.push(created);
+        // Journal BEFORE the network call: a crash after this line replays the same request id.
+        writeJournal(path, journal, created.updatedAt);
+        return created;
+      });
+    } catch (error) {
+      // Only contention gets a short retry; persistent storage failures must not spin.
+      retryJournal(error);
+      return { kind: "error", message: error instanceof Error ? error.message : "journal reservation failed" };
+    }
+    if (entry.state === "settled") {
+      schedule(idleRecheckMs);
+      return { kind: "skipped", reason: "credit-gone" };
     }
     log(`[opencodex] reset-credit auto-redeem: dispatching for account ${accountKey} (credit expires ${plan.expiresAt})`);
     let result: { code: string };
@@ -174,9 +199,25 @@ export function createResetCreditAutoRedeemer(deps: AutoRedeemDeps): ResetCredit
       schedule(60_000);
       return { kind: "ambiguous", redeemRequestId: entry.redeemRequestId };
     }
-    entry.state = "settled";
-    entry.updatedAt = now();
-    writeJournal(path, journal);
+    // Re-read under the lock: a peer may have appended its own entries since the reservation,
+    // and writing a stale in-memory journal would drop them.
+    try {
+      withConfigMutationLockSync(() => {
+        const journal = readJournal(path);
+        const current = journal.entries.find(e => e.accountKey === accountKey && e.grantedAt === plan.grantedAt && e.expiresAt === plan.expiresAt);
+        if (!current || current.redeemRequestId !== entry.redeemRequestId) {
+          throw new Error("auto-redeem journal reservation changed before settlement");
+        }
+        current.state = "settled";
+        current.updatedAt = now();
+        writeJournal(path, journal, current.updatedAt);
+      });
+    } catch (error) {
+      // Upstream answered, but settlement could not be committed. Preserve any reservation;
+      // a later dispatch must reuse its request id. A vanished credit may never dispatch again.
+      retryJournal(error);
+      return { kind: "error", message: error instanceof Error ? error.message : "journal settlement failed" };
+    }
     log(`[opencodex] reset-credit auto-redeem: upstream answered ${result.code} for account ${accountKey}`);
     schedule(idleRecheckMs);
     return { kind: "dispatched", code: result.code, redeemRequestId: entry.redeemRequestId };

package/src/codex/routing.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { saveConfigPreservingClaudeCode } from "../config";
-import { isCodexAccountGenerationLive, readCodexAccountRecord } from "./account-store";
+import { isCodexAccountGenerationLive, readCodexAccountRecord, type CodexRefreshProvenance } from "./account-store";
 import { codexAccountLogLabel } from "./account-label";
 import { NATIVE_RESERVE_MODEL } from "./catalog/native-models";
 import { isCodexAccountPaused } from "./account-pause";
@@ -642,6 +642,80 @@ export function claimDueCodexQuotaRecoveryProbes(
   });
 }
 
+type CooldownRecoveryLease = Pick<CodexQuotaRecoveryProbeClaim,
+  "accountId" | "scope" | "leaseId" | "cooldownGeneration">;
+
+export type ManualResetCooldownClaim =
+  | { kind: "pool"; probe: CodexQuotaRecoveryProbeClaim }
+  | { kind: "main"; probe: CooldownRecoveryLease };
+
+function manualResetAccountEligible(config: OcxConfig, accountId: string): boolean {
+  return !isCodexAccountPaused(config, accountId) && !isAccountNeedsReauth(accountId)
+    && (accountId === MAIN_CODEX_ACCOUNT_ID
+      || (config.codexAccounts ?? []).some(account => account.id === accountId && isSelectableCodexPoolAccount(account)));
+}
+
+/** Explicit reset bypasses probe pacing, never another owner's lease or quota scope. */
+export function claimManualResetCooldowns(
+  config: OcxConfig,
+  accountId: string,
+  now = Date.now(),
+  expectedPoolGeneration?: number,
+): ManualResetCooldownClaim[] {
+  if (!manualResetAccountEligible(config, accountId)) return [];
+  const record = accountId === MAIN_CODEX_ACCOUNT_ID ? undefined : readCodexAccountRecord(accountId);
+  if (accountId !== MAIN_CODEX_ACCOUNT_ID && (!record?.credential || record.deletedAt != null)) return [];
+  if (record && expectedPoolGeneration !== undefined && record.generation !== expectedPoolGeneration) return [];
+  const claims: ManualResetCooldownClaim[] = [];
+  for (const scope of [undefined, "shared"] as const) {
+    const health = scope ? scopedHealthFor(accountId, scope) : upstreamHealth.get(accountId);
+    if (!health || health.cooldownSource !== "reset-derived" || health.probeLeaseId !== undefined
+      || !Number.isFinite(health.cooldownUntil) || !(health.cooldownUntil! > now)) continue;
+    const leaseId = randomUUID();
+    const cooldownGeneration = health.cooldownGeneration ?? 0;
+    const next = { ...health, probeLeaseId: leaseId, probeLeaseGeneration: cooldownGeneration, lastProbeAt: now };
+    if (scope) setScopedHealth(accountId, scope, next);
+    else upstreamHealth.set(accountId, next);
+    const probe = { accountId, scope, leaseId, cooldownGeneration };
+    claims.push(record ? { kind: "pool", probe: {
+      ...probe, credentialGeneration: record.generation, credentialReplacedAt: record.replacedAt,
+    } } : { kind: "main", probe });
+  }
+  return claims;
+}
+
+export type ManualResetRefreshLineage = Readonly<{
+  fromGeneration: number;
+  toGeneration: number;
+  provenance: CodexRefreshProvenance;
+}>;
+
+type ManualResetQuotaProof = CodexQuotaRecoveryProbeProof & {
+  refreshLineage?: ManualResetRefreshLineage;
+};
+
+/** Main proof is checked by the already-owned auth operation, never by a Pool record. */
+export function settleManualResetCooldown(
+  config: OcxConfig,
+  claim: ManualResetCooldownClaim,
+  recovered: boolean,
+  proof: ManualResetQuotaProof = {},
+  now = Date.now(),
+): boolean {
+  if (!recovered) return settleCooldownRecoveryLease(claim.probe, false, now);
+  const eligible = manualResetAccountEligible(config, claim.probe.accountId);
+  if (claim.kind === "main") return settleCooldownRecoveryLease(claim.probe, eligible, now);
+  const lineage = proof.refreshLineage;
+  // Equal wall-clock replacement stamps do not establish ancestry. Manual +1
+  // recovery additionally needs the actual forced-refresh result for this edge.
+  const ownedGeneration = proof.credentialGeneration === claim.probe.credentialGeneration
+    || (proof.credentialGeneration === claim.probe.credentialGeneration + 1
+      && lineage?.fromGeneration === claim.probe.credentialGeneration
+      && lineage.toGeneration === proof.credentialGeneration
+      && (lineage.provenance === "self-refresh" || lineage.provenance === "joined-lineage"));
+  return settleCodexQuotaRecoveryProbe(claim.probe, eligible && ownedGeneration, proof, now);
+}
+
 /** Settle one background recovery claim without mutating account-wide outcome state. */
 export function settleCodexQuotaRecoveryProbe(
   claim: CodexQuotaRecoveryProbeClaim,
@@ -665,9 +739,16 @@ export function settleCodexQuotaRecoveryProbe(
       : proofGeneration === claim.credentialGeneration + 1
         && currentRecord?.replacedAt === claim.credentialReplacedAt
         && isCodexAccountGenerationLive(claim.accountId, proofGeneration));
-  const fenced = (health.cooldownGeneration ?? 0) === claim.cooldownGeneration
-    && (health.probeLeaseGeneration ?? 0) === claim.cooldownGeneration
-    && generationFenced;
+  return settleCooldownRecoveryLease(claim, recovered && generationFenced, now);
+}
+
+function settleCooldownRecoveryLease(claim: CooldownRecoveryLease, recovered: boolean, now: number): boolean {
+  const health = claim.scope ? scopedHealthFor(claim.accountId, claim.scope) : upstreamHealth.get(claim.accountId);
+  if (!health || health.probeLeaseId !== claim.leaseId) return false;
+  const fenced = (claim.scope === undefined || claim.scope === "shared")
+    && health.cooldownSource === "reset-derived"
+    && (health.cooldownGeneration ?? 0) === claim.cooldownGeneration
+    && (health.probeLeaseGeneration ?? 0) === claim.cooldownGeneration;
   if (!recovered || !fenced) {
     const released = withProbeLeaseReleased(health, now);
     if (claim.scope) setScopedHealth(claim.accountId, claim.scope, released);

package/src/codex/shim.ts

@@ -1069,6 +1069,7 @@ export function buildWindowsCodexShim(realCodexPath: string, bunPath: string, cl
   const valueOptionChecks = CODEX_GLOBAL_OPTIONS_WITH_VALUE.map(option => `if /I "%~1"=="${option}" goto skip_option_value`).join("\r\n");
   return `@echo off\r
 rem ${SHIM_MARKER}\r
+setlocal\r
 ${windowsBatchSet("OCX_REAL_CODEX", realCodexPath)}\r
 ${windowsBatchSet("OCX_BUN", bunPath)}\r
 ${windowsBatchSet("OCX_CLI", cliPath)}\r
@@ -1115,6 +1116,9 @@ export function buildWindowsPowerShellCodexShim(realCodexPath: string, bunPath:
   const tokenFile = serviceApiTokenFilePath();
   return `#!/usr/bin/env pwsh
 # ${SHIM_MARKER}
+$hadApiAuthToken = Test-Path Env:\\OPENCODEX_API_AUTH_TOKEN
+$priorApiAuthToken = $env:OPENCODEX_API_AUTH_TOKEN
+try {
 if (-not $env:OPENCODEX_API_AUTH_TOKEN -and (Test-Path -LiteralPath ${psString(tokenFile)})) {
   $env:OPENCODEX_API_AUTH_TOKEN = (Get-Content -Raw -LiteralPath ${psString(tokenFile)}).Trim()
 }
@@ -1147,7 +1151,12 @@ if (-not $skipEnsure) {
   }
 }
 & ${psString(realCodexPath)} @args
-exit $LASTEXITCODE
+$codexExitCode = $LASTEXITCODE
+} finally {
+  if ($hadApiAuthToken) { $env:OPENCODEX_API_AUTH_TOKEN = $priorApiAuthToken }
+  else { Remove-Item Env:\\OPENCODEX_API_AUTH_TOKEN -ErrorAction SilentlyContinue }
+}
+exit $codexExitCode
 `;
 }
 

package/src/config/atomic-write.ts

@@ -1,7 +1,6 @@
 import {
   chmodSync,
   closeSync,
-  constants,
   fchmodSync,
   fstatSync,
   lstatSync,
@@ -121,7 +120,7 @@ function writePrivateTempFile(
   timeoutMemoKey: string,
   onCreated: () => void,
 ): void {
-  const descriptor = openSync(path, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL, 0o600);
+  const descriptor = openSync(path, "wx", 0o600);
   onCreated();
   try {
     if (process.platform === "win32") {
@@ -142,7 +141,7 @@ async function writePrivateTempFileAsync(
   timeoutMemoKey: string,
   onCreated: () => void,
 ): Promise<void> {
-  const descriptor = openSync(path, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL, 0o600);
+  const descriptor = openSync(path, "wx", 0o600);
   onCreated();
   try {
     if (process.platform === "win32") {

package/src/config/initialize.ts

@@ -1,5 +1,5 @@
 import {
-  closeSync, constants, fchmodSync, fstatSync, linkSync, lstatSync,
+  closeSync, fchmodSync, fstatSync, linkSync, lstatSync,
   openSync, unlinkSync, writeFileSync,
 } from "node:fs";
 import { dirname } from "node:path";
@@ -15,10 +15,12 @@ export class InitialConfigPublicationError extends Error {
     readonly publication: PublicationState,
     readonly residualTemp: boolean,
     readonly hardLinkUnavailable: boolean,
-    options?: ErrorOptions,
+    options?: ErrorOptions & { hardeningFailed?: boolean },
   ) {
-    super(hardLinkUnavailable
-      ? "Initial config requires hard-link publication; the filesystem or its permissions denied it."
+    super(options?.hardeningFailed
+      ? "Initial config permissions could not be secured. Choose an OPENCODEX_HOME location that supports private file permissions (NTFS ACLs on Windows), then rerun `ocx init`."
+      : hardLinkUnavailable
+      ? "Initial config requires hard-link publication; the filesystem or its permissions denied it. Inspect the config directory before retrying. Choose an OPENCODEX_HOME location that supports hard links and private file permissions, then rerun `ocx init`."
       : "Initial config publication did not finish.", options);
     this.name = "InitialConfigPublicationError";
   }
@@ -90,10 +92,13 @@ export function publishInitialConfigNoReplace(
   let failure: unknown;
   let failed = false;
   let hardLinkUnavailable = false;
+  let hardeningFailed = false;
   let residualTemp = false;
   try {
-    fd = openSync(temp, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL, 0o600);
+    fd = openSync(temp, "wx", 0o600);
+    hardeningFailed = true;
     (io.harden ?? hardenInitialConfig)(fd, temp, target);
+    hardeningFailed = false;
     verifyPrivateTemp(fd, temp);
     (io.write ?? ((descriptor: number, value: string) => writeFileSync(descriptor, value, { encoding: "utf8" })))(fd, bytes);
     verifyPrivateTemp(fd, temp);
@@ -126,7 +131,7 @@ export function publishInitialConfigNoReplace(
     }
   }
   if (failed || residualTemp) {
-    throw new InitialConfigPublicationError(publication, residualTemp, hardLinkUnavailable, { cause: failure });
+    throw new InitialConfigPublicationError(publication, residualTemp, hardLinkUnavailable, { cause: failure, hardeningFailed });
   }
   return !collided;
 }

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "a2c26a283356c9af4cfa97cc0b716e338b17fde951d9c71fc9450944dde31a24"
+      "sha256": "8c97c97d74c4f42c86a4165fdcaeb5d3bce90b7d0bc2ed085593702f63cea20d"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -366,11 +366,11 @@
     },
     {
       "path": "src/adapters/openai-responses.ts",
-      "sha256": "db01d0ade13c4e241e4818091884f689d6dd85ab5d7656832265d6f04097ab55"
+      "sha256": "c1ede0d8538bbefdd60e85eac045992fc740971fa93b3529cc5417de2b091e40"
     },
     {
-      "path": "src/adapters/opencode-go.ts",
-      "sha256": "37b3aad6259736d1973eca1444f61184e0329404bbdbd1c4326953c76f401192"
+      "path": "src/adapters/opencode-go-additional-tools.ts",
+      "sha256": "42090cb27e20503d3d6ad0680b1a45b918b19d878c2e6db6ed031ca57f17c1ee"
     },
     {
       "path": "src/adapters/registry.ts",
@@ -384,6 +384,10 @@
       "path": "src/adapters/responses-tool-schema.ts",
       "sha256": "affeb179617d9abfb8cd18d47b132ff02d05c4438e5395b90103c7b03c184f55"
     },
+    {
+      "path": "src/adapters/routed-agent-messages.ts",
+      "sha256": "3617b10e10db2ebfd573a479f7c345c254c49f3b139cc2d0290011c007c05c8b"
+    },
     {
       "path": "src/adapters/run-turn-queue.ts",
       "sha256": "31b12f11c9c35f3e499c418bf943762f299755d8a68d7bba9fa9371fa5684a43"
@@ -506,7 +510,7 @@
     },
     {
       "path": "src/claude/inbound-content-options.ts",
-      "sha256": "0c402f2034bd6a01f0d7a338e011bdf4edd404c5acc9406985db6d6f6beeb3f0"
+      "sha256": "5bd23dd382a52ed889ad5b42535f86cd214bc35617fdbf80c8daa8f34a4a763d"
     },
     {
       "path": "src/claude/inbound-debug.ts",
@@ -946,7 +950,7 @@
     },
     {
       "path": "src/codex/auth-api.ts",
-      "sha256": "626192f1207e2721c78c181b2a436411577520126ae14ec324ec23e08cd5a0e7"
+      "sha256": "10ea42a877146d9d4adca8590c0207affa9a12c4dc429d14441cd256cd88e796"
     },
     {
       "path": "src/codex/auth-collision.ts",
@@ -1070,7 +1074,7 @@
     },
     {
       "path": "src/codex/features.ts",
-      "sha256": "a42c3891a7978d27b974d68a3b5abecc7c3650e7d4d6f17c9e96ff52536f0a1e"
+      "sha256": "2d2e3ff6e5c0cddd31188fbe76f38c5fc50bce83b0800ff3a44fa36a2362aa7e"
     },
     {
       "path": "src/codex/forward-transport-headers.ts",
@@ -1208,6 +1212,10 @@
       "path": "src/codex/model-entitlements.ts",
       "sha256": "a21db9fc98bfad86aaaf6aff404c2ee1e3990c1b1598c7d9ab7af91af1c2b601"
     },
+    {
+      "path": "src/codex/multi-agent-mode-policy.ts",
+      "sha256": "8559eddf8c697993997778665daf21060ae1971c289fbb70bc971e5bbef6084a"
+    },
     {
       "path": "src/codex/native-main-admission.ts",
       "sha256": "1f4956299bf243980bb06c7ddcfdadf71497cd874d3c1c49cb28465f27f6c85f"
@@ -1366,7 +1374,7 @@
     },
     {
       "path": "src/codex/reset-credit-auto-redeem.ts",
-      "sha256": "3dd462d5e8c5ddccea10c999f2228a4cadb00424f2dc65586578d144c4b0c843"
+      "sha256": "7d5a443e6fa6b4c36b8daa59d6d2ca8131ac7a086b3e85bc51d2b337ff43047d"
     },
     {
       "path": "src/codex/reset-credit-operation-ledger.ts",
@@ -1378,7 +1386,7 @@
     },
     {
       "path": "src/codex/routing.ts",
-      "sha256": "6ffbfef59a981164bda8fbc238f6155e89a06aaab13586d88d97c6c9f26ce1ec"
+      "sha256": "31009533a9eeb8aab35f77bd626de9c01b15a74d5e06ee98282c5b07572cf2b9"
     },
     {
       "path": "src/codex/runtime.ts",
@@ -1386,7 +1394,7 @@
     },
     {
       "path": "src/codex/shim.ts",
-      "sha256": "16cbf109b0c0057d058a8eccc1114201baa29d0444547a22b45c53bf6f15b3bc"
+      "sha256": "08c28d3daafaeee903ddab78ff396d6a6bf46118893640ae316ece111e8a3e38"
     },
     {
       "path": "src/codex/subagent-defaults.ts",
@@ -1470,11 +1478,11 @@
     },
     {
       "path": "src/config/atomic-write.ts",
-      "sha256": "96e61002678c6f425518aece2e3fb4fd3ae49e25c375d337eecd676ae5d859c6"
+      "sha256": "e4e0e2c3bb3adc7a2e02c7411718d4faad8417870c27143742ba72f9d6f6ab3a"
     },
     {
       "path": "src/config/initialize.ts",
-      "sha256": "12e07b539b32fbd7b4d96f0a92c3ba8c520c46aaea41a15f604d2f965daddde4"
+      "sha256": "eddee7d5cbef36444f4d73d193b5e16bbe623d5fbf408ef4a47b40bc9daefa3c"
     },
     {
       "path": "src/config/paths.ts",
@@ -2378,7 +2386,7 @@
     },
     {
       "path": "src/lib/state-store-registrations.ts",
-      "sha256": "f108d262fb54d753458631b9bb16c22474ea398181331b9a2cb87d9b487864c7"
+      "sha256": "7aa40b75b379f4b8f4c450bf3a0eeea2d0d7619c919be09df3aba73b58f9f57d"
     },
     {
       "path": "src/lib/state-store-sweeper.ts",
@@ -2662,7 +2670,7 @@
     },
     {
       "path": "src/providers/default-aliases.ts",
-      "sha256": "f6a830d5144af65167ecffadfcfafe4c69530f866f720ed4f1690c80203aff5c"
+      "sha256": "190c2b85e92ff3d686efefa4c7dac0db75a4897b670e5ee5ff3d3e8055d4eb35"
     },
     {
       "path": "src/providers/derive.ts",
@@ -2802,7 +2810,7 @@
     },
     {
       "path": "src/providers/registry.ts",
-      "sha256": "a77a52f5f62617b17a3a9dbbdbf06a8bfe4c8fc05bf1947e65d1b38ddb1607ea"
+      "sha256": "e636da79c8dbabe1702fd00e9b47199bc00dde5e871b931a6e12598e970f7c20"
     },
     {
       "path": "src/providers/request-pacing.ts",
@@ -2978,7 +2986,7 @@
     },
     {
       "path": "src/router.ts",
-      "sha256": "efa46cc81115575bc3c47ce4910adf75b4ffd34674f27661b5d2f3d1e3c08363"
+      "sha256": "9fca9c7d3736dcb4cd07b58af87ff3b19abe14280fff8e6ff9b053841c2e51b4"
     },
     {
       "path": "src/routing/analytics.ts",
@@ -3106,7 +3114,7 @@
     },
     {
       "path": "src/server/claude-messages.ts",
-      "sha256": "53dfb51007f96c1a3d037e7c6fe850fe726d5507d68d222b326427505111152c"
+      "sha256": "09c50f4454e990ccd5161ec5acdc49da2c75bf3bc04c7534209081756eed2b31"
     },
     {
       "path": "src/server/direct-local-http.ts",
@@ -3162,7 +3170,7 @@
     },
     {
       "path": "src/server/live.ts",
-      "sha256": "6347a6dd273bb6d5d2c1ba9826497087edb59f0c61d4c10196ddfbd01f3b6205"
+      "sha256": "5e68c7830a9a143f218bed2686dd794d0df7aa9a79cacc118c11b13690c630d4"
     },
     {
       "path": "src/server/local-management-read-client.ts",
@@ -3186,7 +3194,7 @@
     },
     {
       "path": "src/server/management/agent-settings-routes.ts",
-      "sha256": "1d91b0c0e58fde53bfe17b581d0fae125f86afbdad436b8a9c2ec9e4fff45a1c"
+      "sha256": "a771aa9da4a4b2b0efebd4367f10b792347881baec056bc375ee8821373f8df8"
     },
     {
       "path": "src/server/management/api-access.ts",
@@ -3486,7 +3494,11 @@
     },
     {
       "path": "src/server/responses/collaboration.ts",
-      "sha256": "031603ccc5195ea7d74df7349464ad949739c0020f9cf179a4da36f566b5d921"
+      "sha256": "5982f3f249f5e3e1da217029597c56e1d154a1226e816d884c29c31b28ae125e"
+    },
+    {
+      "path": "src/server/responses/combo-session-recall.ts",
+      "sha256": "4401cbfadaeaeff14dd14c8afb25f0b8e61cadc1009393b35fe9bd25c6796f20"
     },
     {
       "path": "src/server/responses/combo-stream-preflight.ts",
@@ -3494,7 +3506,7 @@
     },
     {
       "path": "src/server/responses/compact.ts",
-      "sha256": "7a154e9c46cb6ebe31ca2b5d9a649cc4b6b120925e6e8b4844d16635be276938"
+      "sha256": "205d9eaf2ce0f7c3d1af3bd58f7e3167479deec2c3a99e3743747f4fcb205e91"
     },
     {
       "path": "src/server/responses/context-overflow.ts",
@@ -3502,7 +3514,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "1e3f30886b003f96c3e1ca47de0a1196c55a46a9d1b2fc65f0090d2d0655af9c"
+      "sha256": "2d90436a0b09a6455c6bf666d49b5e4bbd1236fd38f4375a83b8af6e3dfe84d4"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -3706,7 +3718,7 @@
     },
     {
       "path": "src/types/config.ts",
-      "sha256": "aa4ac106c1be6312e328be2b61d77a0c5ba6de969814a189f5a994bda662c301"
+      "sha256": "ec0942e86fcbb8a7ac4e8fb2bd44e6b180b35782e3d0dc15c85c6061d4998bfa"
     },
     {
       "path": "src/types/provider.ts",

package/src/lib/state-store-registrations.ts

@@ -21,6 +21,7 @@ import {
 } from "../combos/failover";
 import { reconcileComboWarningMemos } from "../combos/request";
 import { reconcileComboRotationState } from "../combos/resolve";
+import { reconcileComboRecall } from "../server/responses/combo-session-recall";
 import { listLiveComboTargetKeys } from "../combos/types";
 import {
   listLiveConfigOwnershipRoots,
@@ -111,6 +112,7 @@ export const STATE_STORE_REGISTRATIONS = [
   { name: "model-cache-history", reconcileGeneration: reconcileModelCacheGeneration },
   { name: "pool-rotation", reconcileGeneration: reconcilePoolRotationState },
   { name: "combo-rotation", reconcileGeneration: reconcileComboRotationState },
+  { name: "combo-session-recall", reconcileGeneration: reconcileComboRecall },
   { name: "guardian-backoff", reconcileGeneration: reconcileGuardianBackoff },
   { name: "codex-reauth", reconcileGeneration: reconcileCodexReauthState },
   { name: "oauth-reauth", reconcileGeneration: reconcileOAuthReauthState },

package/src/providers/default-aliases.ts

@@ -15,7 +15,10 @@ export function effectiveProviderAlias(
   if (config?.providers) {
     const lower = regAlias.toLowerCase();
     const claimedByOther = Object.entries(config.providers).some(([name, p]) =>
-      name !== providerName && typeof p.alias === "string" && p.alias.trim().toLowerCase() === lower
+      name !== providerName && (
+        name.toLowerCase() === lower
+        || (typeof p.alias === "string" && p.alias.trim().toLowerCase() === lower)
+      )
     );
     if (claimedByOther) return undefined;
   }

package/src/providers/registry.ts

@@ -1539,8 +1539,10 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
     modelDiscovery: {
       // Resolves against effectiveBaseUrl (registry baseUrl .../v1) to the same
       // canonical endpoint https://inference-api.nousresearch.com/v1/models.
+      // Nous returns a mixed paid/free catalog whose JSON can exceed 256 KiB;
+      // keep the provider-specific limit below the process-wide 4 MiB ceiling.
       path: "models",
-      maxResponseBytes: 262_144,
+      maxResponseBytes: 1_048_576,
       maxModels: 512,
     },
     note: "Nous Research subscription gateway. OAuth device login with your own Portal account; mixed paid + :free models discovered live (fallback seed 2026-08-10: tencent/hy3:free, poolside/laguna-s-2.1:free, stepfun/step-3.7-flash:free, poolside/laguna-xs-2.1:free).",
@@ -1674,6 +1676,9 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
     // Zen Go can close a Chat stream after a fully assembled function call without sending
     // finish_reason or [DONE] (#2260). The adapter still rejects incomplete argument JSON.
     openaiChatEofTolerance: true,
+    // Go rejects reasoning.encrypted_content with previous_response_id (#3838).
+    // Use explicit replay history and the existing stateless Responses policy.
+    statelessResponses: true,
     /* [Decision Log]
     - 목적과 의도: Route the exact models OpenCode Go documents on the Responses endpoint — GPT 5.6 Luna, Grok 4.6, and Muse Spark Contributor (#2617).
     - 기존 구현 및 제약 조건: The provider is mixed-wire but its provider-wide `openai-chat` adapter sent Luna to `/chat/completions`; explicit user `modelAdapters` entries must remain authoritative.

package/src/router.ts

@@ -703,13 +703,16 @@ function routeModelInternal(
         throw new Error("provider alias '" + requestedProvider + "' is ambiguous: " + configuredMatches.map(([n]) => n).sort().join(", "));
       } else {
         // Pass 2: built-in registry aliases, only for providers that do NOT have an explicit alias override
-        // and whose registry alias has not been claimed by another configured provider (#3531 review)
+        // and whose registry alias has not been claimed by another configured provider name or alias
         const registryMatches = Object.entries(config.providers).filter(([name, provider]) => {
           if (provider.alias !== undefined) return false;
           const regAlias = PROVIDER_REGISTRY.find(e => e.id === name)?.alias;
           if (!regAlias || regAlias.toLowerCase() !== requestedLower) return false;
           const claimedByOther = Object.entries(config.providers).some(([otherName, p]) =>
-            otherName !== name && typeof p.alias === "string" && p.alias.trim().toLowerCase() === requestedLower
+            otherName !== name && (
+              otherName.toLowerCase() === requestedLower
+              || (typeof p.alias === "string" && p.alias.trim().toLowerCase() === requestedLower)
+            )
           );
           return !claimedByOther;
         });