@bitkyc08/opencodex 2.44.0 → 2.45.0

package/src/config/initialize.ts

@@ -0,0 +1,132 @@
+import {
+  closeSync, constants, fchmodSync, fstatSync, linkSync, lstatSync,
+  openSync, unlinkSync, writeFileSync,
+} from "node:fs";
+import { dirname } from "node:path";
+import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
+import { forgetEphemeralSecretPath, hardenSecretPath } from "../lib/windows-secret-acl";
+import { isMissingPathError, nextAtomicTempSequence } from "./atomic-write";
+
+type PublicationState = "not-published" | "published" | "uncertain";
+
+/** Messages contain no candidate bytes or raw filesystem error text. */
+export class InitialConfigPublicationError extends Error {
+  constructor(
+    readonly publication: PublicationState,
+    readonly residualTemp: boolean,
+    readonly hardLinkUnavailable: boolean,
+    options?: ErrorOptions,
+  ) {
+    super(hardLinkUnavailable
+      ? "Initial config requires hard-link publication; the filesystem or its permissions denied it."
+      : "Initial config publication did not finish.", options);
+    this.name = "InitialConfigPublicationError";
+  }
+}
+
+/** Narrow fault boundary; publication must be a single link operation. */
+export interface InitialConfigPublicationIO {
+  harden(fd: number, temp: string, target: string): void;
+  write(fd: number, bytes: string): void;
+  link(temp: string, target: string): void;
+  unlink(temp: string): void;
+  close(fd: number): void;
+}
+
+function hardenInitialConfig(fd: number, temp: string, target: string): void {
+  if (process.platform === "win32") {
+    hardenSecretPath(temp, { required: true, timeoutMemoKey: target });
+  } else {
+    fchmodSync(fd, 0o600);
+  }
+}
+
+function identifiesDescriptor(fd: number, path: string): boolean {
+  const opened = fstatSync(fd);
+  const entry = lstatSync(path);
+  return opened.isFile() && entry.isFile()
+    && opened.dev === entry.dev && opened.ino === entry.ino;
+}
+
+function verifyPrivateTemp(fd: number, temp: string): void {
+  if (!identifiesDescriptor(fd, temp)
+    || (process.platform !== "win32" && (fstatSync(fd).mode & 0o777) !== 0o600)) {
+    throw new Error("Initial config temporary file identity or permissions changed.");
+  }
+}
+
+function removeOwnedTemp(fd: number, temp: string, unlink: (path: string) => void): boolean {
+  for (let attempt = 0; attempt < 2; attempt++) {
+    try {
+      if (!identifiesDescriptor(fd, temp)) return false;
+      unlink(temp);
+      forgetEphemeralSecretPath(temp);
+      return true;
+    } catch (error) {
+      if (isMissingPathError(error)) {
+        forgetEphemeralSecretPath(temp);
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+/**
+ * Publish complete bytes without replacing any entry at target. Never truncate:
+ * even an error from link can mean a remote filesystem already published the inode.
+ * Cleanup removes only our temporary name, never the target or another inode.
+ */
+export function publishInitialConfigNoReplace(
+  target: string,
+  bytes: string,
+  io: Partial<InitialConfigPublicationIO> = {},
+): boolean {
+  assertNotRealHomeUnderTest(dirname(target));
+  const temp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
+  let fd: number | undefined;
+  let publication: PublicationState = "not-published";
+  let collided = false;
+  let failure: unknown;
+  let failed = false;
+  let hardLinkUnavailable = false;
+  let residualTemp = false;
+  try {
+    fd = openSync(temp, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL, 0o600);
+    (io.harden ?? hardenInitialConfig)(fd, temp, target);
+    verifyPrivateTemp(fd, temp);
+    (io.write ?? ((descriptor: number, value: string) => writeFileSync(descriptor, value, { encoding: "utf8" })))(fd, bytes);
+    verifyPrivateTemp(fd, temp);
+    try {
+      publication = "uncertain";
+      (io.link ?? linkSync)(temp, target);
+      publication = "published";
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException | undefined)?.code;
+      // EEXIST normally means a competitor won. A shared target means our
+      // publication may nevertheless have happened (e.g. a remote FS retry).
+      if (code === "EEXIST" && !identifiesDescriptor(fd, target)) collided = true;
+      else {
+        hardLinkUnavailable = ["EOPNOTSUPP", "ENOTSUP", "ENOSYS", "EXDEV", "EPERM"].includes(code ?? "");
+        throw error;
+      }
+    }
+    if (!collided && !identifiesDescriptor(fd, target)) {
+      throw new Error("Initial config published target identity changed.");
+    }
+  } catch (error) {
+    failed = true;
+    failure = error;
+  } finally {
+    if (fd !== undefined) {
+      // Unlink-only cleanup preserves all bytes if another name shares this inode.
+      residualTemp = !removeOwnedTemp(fd, temp, io.unlink ?? unlinkSync);
+      try { (io.close ?? closeSync)(fd); }
+      catch (error) { if (!failed) failure = error; failed = true; }
+    }
+  }
+  if (failed || residualTemp) {
+    throw new InitialConfigPublicationError(publication, residualTemp, hardLinkUnavailable, { cause: failure });
+  }
+  return !collided;
+}

package/src/config/rebase-provenance.ts

@@ -66,3 +66,29 @@ export function deleteConfigTopLevelKey<K extends keyof OcxConfig>(config: OcxCo
 export function clearPendingConfigTopLevelDeletions(config: OcxConfig): void {
   pendingTopLevelDeletions.delete(config);
 }
+
+/**
+ * Capture field replacements and deletion intent for a synchronous live-config save.
+ * Restore before yielding on failure: an asynchronous rollback could overwrite a newer
+ * mutation. Descriptors preserve absent versus explicitly undefined properties; the
+ * private pending set must also retain its original presence, even when it was empty.
+ * Unrelated fields and the live object's identity/baselines are left in place.
+ */
+export function captureConfigTopLevelRollback(
+  config: OcxConfig,
+  keys: readonly (keyof OcxConfig)[],
+): () => void {
+  const descriptors = new Map([...new Set<keyof OcxConfig>([...keys, CONFIG_REBASE_PROVENANCE_KEY])]
+    .map(key => [key, Object.getOwnPropertyDescriptor(config, key)] as const));
+  const pending = pendingTopLevelDeletions.get(config);
+  const pendingBefore = pending === undefined ? undefined : new Set(pending);
+  return () => {
+    for (const [key, descriptor] of descriptors) {
+      if (descriptor) Object.defineProperty(config, key, descriptor);
+      else deleteConfigTopLevelKey(config, key);
+    }
+    // The absent fields above are restoration, not new user deletion commands.
+    if (pendingBefore === undefined) pendingTopLevelDeletions.delete(config);
+    else pendingTopLevelDeletions.set(config, new Set(pendingBefore));
+  };
+}

package/src/config.ts

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { chmodSync, constants as fsConstants, copyFileSync, existsSync, linkSync, mkdirSync, readFileSync, truncateSync, unlinkSync, writeFileSync } from "node:fs";
+import { chmodSync, constants as fsConstants, copyFileSync, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, truncateSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { Database } from "bun:sqlite";
 import * as z from "zod/v4";
@@ -123,6 +123,7 @@ export {
   type AtomicWriteIO,
 } from "./config/atomic-write";
 import { getConfigDir, getConfigPath, hardenConfigDir } from "./config/paths";
+import { InitialConfigPublicationError, publishInitialConfigNoReplace, type InitialConfigPublicationIO } from "./config/initialize";
 import {
   describeProxyForLog,
   readWindowsSystemProxy,
@@ -2811,6 +2812,16 @@ export function readConfigDiagnostics(): ConfigDiagnostics {
   return readConfigFileSnapshot().diagnostics;
 }
 
+/** Read-only init preflight. Occupied unsafe entries are never treated as absence. */
+export function observeInitialConfigState(): "missing" | "exists" | "invalid" {
+  try {
+    if (!lstatSync(getConfigPath()).isFile()) return "invalid";
+  } catch (error) {
+    return isMissingPathError(error) ? "missing" : "invalid";
+  }
+  return readConfigFileSnapshot().diagnostics.source === "file" ? "exists" : "invalid";
+}
+
 /**
  * The persisted config, plus a digest of the EXACT bytes it was parsed from.
  *
@@ -3123,6 +3134,44 @@ function persistConfigUnlocked(config: OcxConfig): boolean {
   return true;
 }
 
+export type PersistedConfigInitializationOutcome = "created" | "exists" | "invalid";
+
+/** Initialize only a missing config; ordinary explicit updates still use saveConfig. */
+export function initializePersistedConfigIfMissing(
+  config: OcxConfig,
+  io?: Partial<InitialConfigPublicationIO>,
+): PersistedConfigInitializationOutcome {
+  assertNotRealHomeUnderTest(getConfigDir());
+  const before = observeInitialConfigState();
+  if (before !== "missing") return before;
+  let published = false;
+  try {
+    const persisted = withConfigMutationLockSync((): OcxConfig | "exists" | "invalid" => {
+      const current = observeInitialConfigState();
+      if (current !== "missing") return current;
+      const projected = projectCustomModelCatalogMigration(undefined, projectConfigRebaseProvenance(config));
+      if (!validateConfigCandidate(projected).ok) throw new Error("Initial configuration is invalid.");
+      if (!publishInitialConfigNoReplace(getConfigPath(), JSON.stringify(projected, null, 2) + "\n", io)) {
+        return observeInitialConfigState() === "exists" ? "exists" : "invalid";
+      }
+      published = true;
+      recordOwnedConfigPath(getConfigDir(), getConfigPath());
+      bumpGenerationForCooperatingConfigWrite();
+      return projected;
+    });
+    if (typeof persisted === "string") return persisted;
+    adoptCustomModelCatalogMigration(config, persisted);
+    if (persisted.configRebaseProvenance === undefined) delete config.configRebaseProvenance;
+    else config.configRebaseProvenance = structuredClone(persisted.configRebaseProvenance);
+    clearPendingConfigTopLevelDeletions(config);
+    refreshUserCostOverlays(persisted);
+    return "created";
+  } catch (cause) {
+    if (published) throw new InitialConfigPublicationError("published", false, false, { cause });
+    throw cause;
+  }
+}
+
 /** Persist `config` to config.json under the config-mutation lock. */
 export function saveConfig(config: OcxConfig): void {
   // Keep the real-home assertion ahead of even lock-directory preparation.

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "fdd2966ed9753b148b517949cf28dda1833e4fd1de39910b9454e488d3fac898"
+      "sha256": "3bf62e3b02229bf4f2c8652b3d780693c0c9c8498d7ff72180cce2cf795b186e"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -366,7 +366,7 @@
     },
     {
       "path": "src/adapters/openai-responses.ts",
-      "sha256": "4dba6844ff372f20c377bf55745d15d2e536228a150d2736341ae9a60b80d3b5"
+      "sha256": "1324c424d410df423092f5c5dfebced671ca7a3d65d85ad35d08bcb8b2e2cd24"
     },
     {
       "path": "src/adapters/opencode-go.ts",
@@ -422,7 +422,7 @@
     },
     {
       "path": "src/chat/outbound.ts",
-      "sha256": "59ba1a09aca598b43812abbe740ebd3cdac95f8055e44c0eb6301c241767913a"
+      "sha256": "a7912ce4fde3601115b1bb3b92470a365136ffb5b8f346cc871cef72bcdcfe97"
     },
     {
       "path": "src/claude/agents-inject.ts",
@@ -444,6 +444,10 @@
       "path": "src/claude/auth-mode.ts",
       "sha256": "c2850d987754a58d258c9199901ec71634e3388498b229c09fa622cee65f81ac"
     },
+    {
+      "path": "src/claude/compatibility.ts",
+      "sha256": "cc28522a80a180a922dc63ada519847687d69578af28f0d4431ceb0983b937e3"
+    },
     {
       "path": "src/claude/context-windows.ts",
       "sha256": "c400f4b76319ec14855128af40fe52b60d31d217b89e291641522a51d2583d97"
@@ -522,7 +526,7 @@
     },
     {
       "path": "src/claude/model-info.ts",
-      "sha256": "0e1d4698e300e25bdedffa31fb413f4a6151e59bdd29179981543864ba74f33b"
+      "sha256": "ac4dd859de82c6f6033c2754faea80a15bf538f284e19be673098f388a90aec7"
     },
     {
       "path": "src/claude/outbound.ts",
@@ -550,7 +554,7 @@
     },
     {
       "path": "src/cli/account-extended.ts",
-      "sha256": "9308c5fc1ee6ea481749cc353288be347d78d2cf35b85839749b94813115020d"
+      "sha256": "238f1047c46cbce11c5dfe96440a4b4dba30e6b9936e59c6bebb5aef5dc95a4f"
     },
     {
       "path": "src/cli/account-main.ts",
@@ -670,7 +674,7 @@
     },
     {
       "path": "src/cli/init.ts",
-      "sha256": "51b1e38e25b642665567eff5a61987f86218cf3e0beb49cbb85238db033166b4"
+      "sha256": "0283ef8c97b467219a8e9f77015c18c83023c7068b445b3e29df7111ac18fdcb"
     },
     {
       "path": "src/cli/inspect.ts",
@@ -962,7 +966,7 @@
     },
     {
       "path": "src/codex/catalog.ts",
-      "sha256": "29907ddc709e5a287a732bcb3716211faa07eb4faf5873fe2bbc73b9d6c12142"
+      "sha256": "e15f0b3c3827591cef846b255630586867703f0a1f37f846f0815f45ec2fd655"
     },
     {
       "path": "src/codex/catalog/account-models.ts",
@@ -1002,7 +1006,7 @@
     },
     {
       "path": "src/codex/catalog/provider-fetch.ts",
-      "sha256": "67c7916948b10ed77053217eb55eed71e4dd738370c5c7dd9f0fbaa4a0113737"
+      "sha256": "533f6a92a1d9372119384d7211dd0e621e612d073ff8b2b395657f09bd3a98a9"
     },
     {
       "path": "src/codex/catalog/reserve.ts",
@@ -1010,7 +1014,7 @@
     },
     {
       "path": "src/codex/catalog/sync.ts",
-      "sha256": "7edb13998aa9eac65bb9deea7ee1dc387909eefc6997759865fb7639936abc9f"
+      "sha256": "e775d8715527a47175f45006f21cec4c03e71ab6224acc7841f62a236f7cdf4a"
     },
     {
       "path": "src/codex/cli-install-provenance.ts",
@@ -1454,12 +1458,16 @@
     },
     {
       "path": "src/config.ts",
-      "sha256": "5fa1f245d0342663a5c0844c69252475a4130d73f01c5ac6592e9e9e772a3233"
+      "sha256": "07e17c807d8e8546fbbffc746279bfab8caf76667c80c51968f4b9add14b03d5"
     },
     {
       "path": "src/config/atomic-write.ts",
       "sha256": "96e61002678c6f425518aece2e3fb4fd3ae49e25c375d337eecd676ae5d859c6"
     },
+    {
+      "path": "src/config/initialize.ts",
+      "sha256": "12e07b539b32fbd7b4d96f0a92c3ba8c520c46aaea41a15f604d2f965daddde4"
+    },
     {
       "path": "src/config/paths.ts",
       "sha256": "c95e06d52ea41a77d5edcab36d259d167e688a294362121949ad712b9a8a39b1"
@@ -1490,7 +1498,7 @@
     },
     {
       "path": "src/config/rebase-provenance.ts",
-      "sha256": "8ee5ee9c8110c71b09fdaeb806bdd4a8b8ce6e4a8ad447fbf06fc484c26f8fda"
+      "sha256": "97dc1c17ccb9298ac963b67c1cd2f15d5ec853648c03b0505492941986e72e0f"
     },
     {
       "path": "src/config/subagent-models.ts",
@@ -2414,7 +2422,7 @@
     },
     {
       "path": "src/lib/windows-secret-acl.ts",
-      "sha256": "1ebb5a92b28a0ea6b4d019f823a4646393d5da05fe6331bc1ad5b95a7c1c147c"
+      "sha256": "361952975f0379faaf3fae33088bac8386bb55e90be95bf2d051a4d2abbfcb27"
     },
     {
       "path": "src/lib/windows-service-mutation-lock.ts",
@@ -2770,7 +2778,7 @@
     },
     {
       "path": "src/providers/quota.ts",
-      "sha256": "53f8f308cc1ad1ae30ade207cdfab1600a08af6b5744ba89a68cff6be6389432"
+      "sha256": "d7e0f344e54af750358f2a92b3af9f278e8d88e11c5d695311e7527c55c239af"
     },
     {
       "path": "src/providers/registry.ts",
@@ -2918,7 +2926,7 @@
     },
     {
       "path": "src/responses/state.ts",
-      "sha256": "32178760039b27dcaef8d7288fc066bc81a1ee173b756cd3c4b3c9e97864a7cd"
+      "sha256": "f90df1f12e7606ce18c078277ddc43697851d23eac799fd81ca2fc4471e96e5f"
     },
     {
       "path": "src/responses/task-input.ts",
@@ -3066,19 +3074,19 @@
     },
     {
       "path": "src/server/chat-completions.ts",
-      "sha256": "d82c27416999a4b57723f7a5aafaa36cfc261c083b10a0482cae9ca5ea7c129a"
+      "sha256": "afeb50f4a401eb7b444274fb2dd23ea578f08546eedb028ac94b5791cc054fef"
     },
     {
       "path": "src/server/chat-native-sse.ts",
-      "sha256": "2a183d786d0e5430a80192ed878aa32bed99d7ac53a92c6fe8ee9eccd0a56f65"
+      "sha256": "ddf56df7b59df2d5d818c7b394f11dc3d0948adf00e14fbf4350c652dc9829bb"
     },
     {
       "path": "src/server/chat-native.ts",
-      "sha256": "f48d57bb19656e5a6fb8075a67485f5acaec68d76817cd1b29752ed6cb01d734"
+      "sha256": "11bbb0a33b2b21a0fe7022e103ba5f1bf4adc7fe5d77c3d1159243eb94695d70"
     },
     {
       "path": "src/server/claude-messages.ts",
-      "sha256": "056a68fdb75af41a62b2d737df63d17b9e6375f22b6f8c1769f955cb68869fdb"
+      "sha256": "5b674921b624b0195565f3abcb1279ec8db4e2fbb905a24b98d956adb4836ba3"
     },
     {
       "path": "src/server/direct-local-http.ts",
@@ -3122,7 +3130,7 @@
     },
     {
       "path": "src/server/index.ts",
-      "sha256": "310eea35bb2b472b162cbff9d74440fa7fdae194f033d0e6512dbf8ad2ff0ae2"
+      "sha256": "451299336416e2ff2f3910cb50802fa0ecee2773f0d389b2110cf6b2f97137e0"
     },
     {
       "path": "src/server/lifecycle.ts",
@@ -3154,7 +3162,7 @@
     },
     {
       "path": "src/server/management/agent-settings-routes.ts",
-      "sha256": "da47ec85abb598ea480191e8f46ef23832e48f035579aebbbaff6f721be7ba68"
+      "sha256": "6994b27581e2b82c7741b66e77ca038072c4475093c9db73aede22401692d52b"
     },
     {
       "path": "src/server/management/api-access.ts",
@@ -3210,7 +3218,7 @@
     },
     {
       "path": "src/server/management/logs-usage-routes.ts",
-      "sha256": "bc8b1a0c0a491443fc40ca0cc4176442bce9c1b0ee95e7798c3a9a83878ec911"
+      "sha256": "e62eb449357833d13ef32575e02416f95ff9c76764c69ce2a0d4edb9c07bc2fe"
     },
     {
       "path": "src/server/management/model-routes.ts",
@@ -3348,9 +3356,13 @@
       "path": "src/server/request-log-conversation.ts",
       "sha256": "97666ff58b3483f29d387bbdf130d0eea8cd357ad0f1c9e40807b8fd1a4b0db1"
     },
+    {
+      "path": "src/server/request-log-cursor.ts",
+      "sha256": "4ccac2e6a8741d3a745fcd6fddcab182bd6f7193887ef1473c8d2f27db05baf5"
+    },
     {
       "path": "src/server/request-log.ts",
-      "sha256": "9918e39e25c4f0004ce560e0fd758c21b5e44525260c6fec0f1a2e72c88c87bd"
+      "sha256": "18164c5562e3b06036c023d76b2320fc8c47fef0d6ba534db6038ab34b19b5a3"
     },
     {
       "path": "src/server/responses-custom-tool-repair.ts",
@@ -3414,7 +3426,7 @@
     },
     {
       "path": "src/server/responses/agent-task-recovery.ts",
-      "sha256": "c4f6d898fb097ad83b0a69de8b95a01f4a4873c416f6cd6b443b2b20e77d7b69"
+      "sha256": "6041f65c4af7b9e42d041153da1a55a90cd4c7f62a6a48de1c5856761525b2e9"
     },
     {
       "path": "src/server/responses/codex-auth-error.ts",
@@ -3426,7 +3438,7 @@
     },
     {
       "path": "src/server/responses/codex-ws-exchange.ts",
-      "sha256": "a0fed1edf95466fb433fbaf7f8250b384bf90bb133c7425539cc1781168af2e5"
+      "sha256": "fcabbf25487ea9f2ab9a4afc1af304964a359bff2948496633041e6403316ac5"
     },
     {
       "path": "src/server/responses/codex-ws-metadata.ts",
@@ -3458,7 +3470,7 @@
     },
     {
       "path": "src/server/responses/compact.ts",
-      "sha256": "687b041f879eaf6a676270508cd8b52ca8e744b984e9ed192abdb0b95645d3b6"
+      "sha256": "953c907e6dbad4a7389380400f1302fa013564612dc8e2c426a8bcc7aac5e37c"
     },
     {
       "path": "src/server/responses/context-overflow.ts",
@@ -3466,7 +3478,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "31cb091db2d14317e12ae16342fa7e264d4243d65d1a78a65787e56cc017eaf5"
+      "sha256": "820be393b77d862ce99ae06ccb2b4f6ae5afb086f617e06f0453fed04941ceae"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -3598,7 +3610,7 @@
     },
     {
       "path": "src/storage/cleanup.ts",
-      "sha256": "93ce034c31eb85f1f179fc55cad30ccec9408f0eb47fb1b051fe8989f668ff42"
+      "sha256": "9af868bf0e722b5b5a60ce6766a486ca03c705c8b07491cdee9cbddbbacf5af7"
     },
     {
       "path": "src/storage/policy-job.ts",
@@ -3670,7 +3682,7 @@
     },
     {
       "path": "src/types/config.ts",
-      "sha256": "ea6d2d64f91a5e1be026f8f7182bd28a5823db9005f0bbe803ed05cbed0358de"
+      "sha256": "760afeb7a5c0553f1941dc28350db566b0fdd6c36aadec55e9bd6d2cb3e5b348"
     },
     {
       "path": "src/types/provider.ts",
@@ -3786,7 +3798,7 @@
     },
     {
       "path": "src/usage/log.ts",
-      "sha256": "891e5f077334e6703aefc6ef600fa0b45c5e91a1e0416416e550e1775a6c3a60"
+      "sha256": "07f4e9c90a5be6fda0576b2c9de5c8575df87a93c011cfc065303056b4afd763"
     },
     {
       "path": "src/usage/model-identity.ts",

package/src/lib/windows-secret-acl.ts

@@ -715,18 +715,22 @@ function sanitizedAclError(diagnostics: string, cause: unknown): NodeJS.ErrnoExc
   return error;
 }
 
-function previousTimeoutError(retryConsumed: boolean): NodeJS.ErrnoException {
+type TimeoutMemoRefusalError = NodeJS.ErrnoException & {
+  aclFailureOrigin: "timeout_memo_refusal";
+};
+
+function previousTimeoutError(retryConsumed: boolean): TimeoutMemoRefusalError {
   if (retryConsumed) {
     const error = new Error(
       "ACL hardening skipped — the previous timeout recovery was already consumed",
     ) as NodeJS.ErrnoException;
     error.code = "EACLRETRYEXHAUSTED";
-    return error;
+    return Object.assign(error, { aclFailureOrigin: "timeout_memo_refusal" as const });
   }
-  return sanitizedAclError(
+  return Object.assign(sanitizedAclError(
     "ACL hardening skipped — previous attempt timed out",
     Object.assign(new Error("timeout"), { code: "ETIMEDOUT" }),
-  );
+  ), { aclFailureOrigin: "timeout_memo_refusal" as const });
 }
 
 /** Consume, but never reset, the single explicit recovery attempt for this key. */

package/src/providers/quota.ts

@@ -2607,11 +2607,22 @@ function parseAntigravityQuotaSummary(body: Record<string, unknown> | null): Pro
 }
 
 const ANTIGRAVITY_ACCOUNT_QUOTA_BASE = "https://daily-cloudcode-pa.googleapis.com";
-let antigravityOutboundDependencies: ProviderOutboundDependencies = {};
+const ANTIGRAVITY_QUOTA_SUMMARY_URL = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:retrieveUserQuotaSummary`;
+const ANTIGRAVITY_QUOTA_MODELS_URL = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:fetchAvailableModels`;
 
-/** Test seam: inject resolver/pinned transport for the per-account Antigravity probe. */
+/** Only these fixed accounting destinations may use transparent Fake-IP DNS. */
+export function isCanonicalAntigravityQuotaUrl(name: string, url: string): boolean {
+  return name === "google-antigravity"
+    && (url === ANTIGRAVITY_QUOTA_SUMMARY_URL || url === ANTIGRAVITY_QUOTA_MODELS_URL);
+}
+
+let antigravityOutboundDependencies: ProviderOutboundDependencies = {
+  isCanonicalUrl: isCanonicalAntigravityQuotaUrl,
+};
+
+/** Test seam: inject resolver/pinned transport for provider and per-account probes. */
 export function setAntigravityAccountQuotaTransportForTests(dependencies: ProviderOutboundDependencies | null): void {
-  antigravityOutboundDependencies = dependencies ?? {};
+  antigravityOutboundDependencies = { ...dependencies, isCanonicalUrl: isCanonicalAntigravityQuotaUrl };
 }
 
 /**
@@ -2622,7 +2633,7 @@ export function setAntigravityAccountQuotaTransportForTests(dependencies: Provid
  * A redirect or non-2xx yields null (unavailable), never a partial row.
  */
 export async function fetchAntigravityUsageQuota(accessToken: string, projectId: string): Promise<ProviderQuota | null> {
-  const summaryUrl = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:retrieveUserQuotaSummary`;
+  const summaryUrl = ANTIGRAVITY_QUOTA_SUMMARY_URL;
   try {
     const summaryResponse = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, summaryUrl, {
       headers: {
@@ -2644,7 +2655,7 @@ export async function fetchAntigravityUsageQuota(accessToken: string, projectId:
     // Fallback to fetchAvailableModels on error
   }
 
-  const url = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:fetchAvailableModels`;
+  const url = ANTIGRAVITY_QUOTA_MODELS_URL;
   const response = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, url, {
     headers: {
       Accept: "application/json",
@@ -2662,7 +2673,7 @@ export async function fetchAntigravityUsageQuota(accessToken: string, projectId:
   return { customWindows, updatedAt: Date.now() };
 }
 
-async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig): Promise<ProviderQuotaReport | null> {
+async function fetchAntigravityQuota(provider: string): Promise<ProviderQuotaReport | null> {
   const credential = getCredential("google-antigravity");
   if (!credential?.projectId) return null;
   let accessToken: string;
@@ -2671,13 +2682,12 @@ async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig
   } catch {
     return null;
   }
-  const baseUrl = (config.baseUrl || ANTIGRAVITY_ACCOUNT_QUOTA_BASE).replace(/\/+$/, "");
 
-  // The summary probe is pinned to Google's own host through the provider-outbound
+  // Both probes are pinned to Google's own host through the provider-outbound
   // transport, mirroring `fetchAntigravityUsageQuota` above: a configured `baseUrl` is a
-  // routing choice for requests, not a second source of Google's accounting, and this
-  // request carries the account bearer.
-  const summaryUrl = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:retrieveUserQuotaSummary`;
+  // routing choice for requests, not a second source of Google's accounting, and these
+  // requests carry the account bearer.
+  const summaryUrl = ANTIGRAVITY_QUOTA_SUMMARY_URL;
   try {
     const summaryResponse = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, summaryUrl, {
       headers: {
@@ -2701,8 +2711,8 @@ async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig
     // Fallback on network/fetch error
   }
 
-  const response = await fetch(`${baseUrl}/v1internal:fetchAvailableModels`, {
-    method: "POST",
+  const url = ANTIGRAVITY_QUOTA_MODELS_URL;
+  const response = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, url, {
     headers: {
       Accept: "application/json",
       "Content-Type": "application/json",
@@ -2711,7 +2721,8 @@ async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig
     },
     body: JSON.stringify({ project: credential.projectId }),
     signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-  });
+  }, antigravityOutboundDependencies);
+  if (await providerRedirectError(response, url)) return null;
   if (!response.ok) return null;
   const customWindows = antigravityWindowsFromModels(asRecord(await readQuotaJson(response)));
   if (customWindows.length === 0) return null;
@@ -2783,7 +2794,7 @@ async function maybeFetchProviderQuota(
     }
     if (provider.authMode === "oauth" && explicitAccountReader(name)) return await fetchExplicitCurrentQuota(name, provider, config);
     if (provider.authMode === "oauth" && name === "anthropic") return fetchAnthropicQuota(name);
-    if (provider.authMode === "oauth" && name === "google-antigravity") return fetchAntigravityQuota(name, provider);
+    if (provider.authMode === "oauth" && name === "google-antigravity") return await fetchAntigravityQuota(name);
     if (provider.authMode === "oauth" && name === "kiro") return fetchKiroQuota(name);
     // Passive providers (meta-muse): Meta publishes no quota endpoint, so there is no
     // probe to run — the row is the active account's last in-band observation.