@bitkyc08/opencodex 2.15.1 → 2.16.0

package/src/adapters/kiro.ts

@@ -19,6 +19,8 @@ import { createKiroToolNameRegistry, fallbackToolUseId, fingerprint, invocationI
 import { namespacedToolName } from "../types";
 import {
   isTranslatorBudgetExceededError,
+  releaseTranslatedEvent,
+  retainTranslatedEvent,
   type TranslatorBudget,
 } from "../lib/translator-budget";
 import type {
@@ -636,8 +638,8 @@ export function buildKiroPayload(
 
 // Stream parsing (shared by parseStream + parseResponse)
 // CodeWhisperer GenerateAssistantResponse ALWAYS returns an AWS eventstream body (there is no
-// non-streaming mode), so both the streaming bridge and the non-streaming web-search sidecar loop
-// decode the same way — parseResponse just collects what parseStream yields.
+// non-streaming wire mode), so the streaming bridge and non-streaming Responses path decode the
+// same way — parseResponse just collects what parseStream yields.
 interface KiroAttemptParseResult {
   terminal?: AdapterEvent;
   needsFallback?: boolean;
@@ -859,16 +861,12 @@ async function* parseKiroAttempt(
   );
   let handedOff = false;
   try {
-    let next = await attempt.next();
-    while (!next.done) {
-      yield next.value;
-      next = await attempt.next();
-    }
+    const result = yield* attempt;
     for (const event of deferred.splice(0)) {
       try { yield event; } finally { retention.releaseEvent(event); }
     }
     handedOff = true;
-    return { ...next.value, releaseRetained: () => retention.releaseAll() };
+    return { ...result, releaseRetained: () => retention.releaseAll() };
   } finally {
     if (!handedOff) retention.releaseAll();
   }
@@ -897,6 +895,12 @@ async function* parseKiroAttemptEvents(
   }
 
   let open: { id: string; name: string; chunks: string[]; completion: boolean } | null = null;
+  let openCallId: string | undefined;
+  const closeOpenCall = () => {
+    if (!openCallId) return;
+    budget.closeCall(openCallId);
+    openCallId = undefined;
+  };
   let outputChars = "";
   let outputCharsBytes = 0;
   let contextUsagePercentage: number | undefined;
@@ -1109,7 +1113,7 @@ async function* parseKiroAttemptEvents(
     if (!open) return { events: [] };
     const tool = open;
     open = null;
-    budget.closeCall(tool.id);
+    closeOpenCall();
     const input = tool.chunks.join("");
     if (!isCompleteKiroToolInput(input)) {
       return { events: [], terminal: protocolTerminal(kiroTruncationErrorMessage("incomplete tool input JSON"), tool.completion) };
@@ -1221,11 +1225,12 @@ async function* parseKiroAttemptEvents(
             if (started.terminal) return { assistantText, sawReasoning, terminal: started.terminal };
             open = started.tool!;
             budget.openCall(open.id);
+            openCallId = open.id;
           } else if (
             (ev.toolUseId && ev.toolUseId !== open.id)
             || (ev.name && open.name !== "unknown" && ev.name !== open.name)
           ) {
-            budget.closeCall(open.id);
+            closeOpenCall();
             open = null;
             return { assistantText, sawReasoning, terminal: protocolTerminal(kiroTruncationErrorMessage("tool input changed identity before stop")) };
           }
@@ -1489,7 +1494,7 @@ async function* parseKiroAttemptEvents(
     };
   } catch (err) {
     if (isTranslatorBudgetExceededError(err)) {
-      if (open) budget.closeCall(open.id);
+      closeOpenCall();
       return {
         assistantText,
         sawReasoning,
@@ -1531,6 +1536,9 @@ async function* parseKiroAttemptEvents(
         usage: usage(),
       },
     };
+  } finally {
+    thinking.dispose();
+    closeOpenCall();
   }
 }
 
@@ -1547,7 +1555,7 @@ export async function* parseKiroStream(
   contextInputEstimate?: number,
 ): AsyncGenerator<AdapterEvent> {
   const contextWindowState: KiroContextWindowState = { value: contextWindow };
-  const first = parseKiroAttempt(
+  const firstResult = yield* parseKiroAttempt(
     response,
     budget,
     completionMode,
@@ -1559,12 +1567,6 @@ export async function* parseKiroStream(
     contextInputEstimate,
     false,
   );
-  let firstNext = await first.next();
-  while (!firstNext.done) {
-    yield firstNext.value;
-    firstNext = await first.next();
-  }
-  const firstResult = firstNext.value;
   try {
     if (!firstResult.needsFallback) {
       if (firstResult.terminal) yield firstResult.terminal;
@@ -1642,7 +1644,7 @@ export async function* parseKiroStream(
       return;
     }
 
-    const second = parseKiroAttempt(
+    const secondResult = yield* parseKiroAttempt(
       fallback.response,
       budget,
       "text_fallback",
@@ -1656,12 +1658,6 @@ export async function* parseKiroStream(
       // A zero-output transport failure here must stay non-retryable to avoid duplicating that text.
       priorEmittedOutput,
     );
-    let secondNext = await second.next();
-    while (!secondNext.done) {
-      yield secondNext.value;
-      secondNext = await second.next();
-    }
-    const secondResult = secondNext.value;
     try {
       if (!secondResult.terminal) {
         yield retryableKiroIncomplete(
@@ -1909,25 +1905,32 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
       return safeKiroHttpErrorMessage(status, headers, payloadText);
     },
 
-    // Non-streaming path used by the web-search sidecar loop (loop.ts runs each iteration
-    // non-streamed so it can inspect tool calls). CW only ever event-streams, so we drain the
-    // same decoder into an array. Without this, any Codex request that includes the web_search
-    // tool failed with "web-search sidecar requires a non-streaming adapter" (kiro-only).
+    // Kiro always returns an event stream, including for non-streaming Responses requests. Drain
+    // the decoder into a budget-owned batch so an upstream stream cannot grow this array without
+    // bound while the caller waits for the complete JSON response.
     async parseResponse(response: Response, budget: TranslatorBudget): Promise<AdapterEvent[]> {
       const events: AdapterEvent[] = [];
-      for await (const e of parseKiroStream(
-        response,
-        budget,
-        modelId,
-        inputTokens,
-        contextWindow,
-        toolNameMap,
-        conversationId,
-        completionMode,
-        completionMode === "required" ? fallbackFactory : undefined,
-        contextInputEstimate,
-      )) events.push(e);
-      return events;
+      try {
+        for await (const e of parseKiroStream(
+          response,
+          budget,
+          modelId,
+          inputTokens,
+          contextWindow,
+          toolNameMap,
+          conversationId,
+          completionMode,
+          completionMode === "required" ? fallbackFactory : undefined,
+          contextInputEstimate,
+        )) {
+          retainTranslatedEvent(e, budget, events.at(-1));
+          events.push(e);
+        }
+        return events;
+      } catch (error) {
+        for (const event of events) releaseTranslatedEvent(event, budget);
+        throw error;
+      }
     },
   };
 }

package/src/adapters/openai-chat.ts

@@ -968,8 +968,11 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
         if (provider.parallelToolCalls === false) {
           // NIM documents the Boolean defaulting to false and kimi rejects true; pin the
           // wire bit so Codex cannot opt in via request.options. Other opted-out providers
-          // omit the field so strict OpenAI-compatible hosts never see an unsupported knob.
-          if (provider.baseUrl === "https://integrate.api.nvidia.com/v1") {
+          // omit the field by default so strict OpenAI-compatible hosts never see an
+          // unsupported knob, but a self-hosted gateway that DOES honor the field and keeps
+          // emitting parallel calls without it can opt in via pinParallelToolCallsFalse.
+          if (provider.baseUrl === "https://integrate.api.nvidia.com/v1"
+              || provider.pinParallelToolCallsFalse === true) {
             body.parallel_tool_calls = false;
           }
         } else if (provider.parallelToolCalls === true) {

package/src/adapters/openai-responses.ts

@@ -1361,6 +1361,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
       }
 
       const forward = provider.authMode === "forward";
+      let convertedRoutedCustomToolNames: Set<string> | undefined;
       const unexpandedMiss = !!parsed.previousResponseId && parsed._previousResponseInputExpanded !== true;
       let outBody = stripPreviousResponseId(
         parsed._rawBody,
@@ -1408,7 +1409,9 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
         outBody = promoteClientLoadedTools(outBody);
       }
       if (provider.authMode !== "forward") {
-        outBody = rewriteRoutedCustomToolsForUpstream(outBody).body;
+        const rewritten = rewriteRoutedCustomToolsForUpstream(outBody);
+        outBody = rewritten.body;
+        convertedRoutedCustomToolNames = rewritten.names;
       }
       const sanitizedBody = normalizeToolSchemas(stripSparkCompatibility(stripUnsupportedReasoningParams(stripItemIdsWhenUnstored(stripInvalidItemIds(stripUnsupportedHostedTools(sanitizeReasoningInputContent(scrubOcxCompactionItems(outBody), { preserveRawReasoningContent: provider.preserveResponsesReasoningContent === true })))))));
       const body = JSON.stringify(stripDisabledReasoningSummaries(
@@ -1426,6 +1429,7 @@ export function createResponsesPassthroughAdapter(provider: OcxProviderConfig):
         headers,
         body,
         releaseBodyObservation,
+        ...(convertedRoutedCustomToolNames ? { convertedRoutedCustomToolNames } : {}),
       };
     },
 

package/src/cli/dispatch.ts

@@ -21,7 +21,6 @@ import { restoreNativeCodexAsync } from "../codex/inject";
 import { stripGrokConfig } from "../grok/inject";
 import { afterCatalogWriteHandleAppServers } from "../codex/app-server-processes";
 import { normalizeUpdateChannel, runGuiUpdateWorker } from "../update/job";
-import { serviceCommand } from "../service";
 
 export interface CliDispatchDeps {
   args: string[];
@@ -45,6 +44,7 @@ export interface CliDispatchDeps {
   handleStatus: () => Promise<void>;
   handleRecoverHistory: () => Promise<void>;
   handleReady: (args: ReadyArgs) => Promise<number>;
+  serviceCommand: (...args: string[]) => Promise<void>;
 }
 
 type CommandRunner = (deps: CliDispatchDeps) => Promise<number>;
@@ -261,8 +261,11 @@ const commandRunners: Record<string, CommandRunner> = {
     return 0;
   },
   service: async deps => {
-    await serviceCommand(...deps.args.slice(1));
-    return 0;
+    process.exitCode = 0;
+    await deps.serviceCommand(...deps.args.slice(1));
+    // serviceCommand uses process.exitCode for recoverable install/stop failures
+    // that must finish cleanup before the single top-level process.exit runs.
+    return Number(process.exitCode ?? 0);
   },
   tray: async deps => {
     const { windowsTrayCommand } = await import("../tray/windows");

package/src/cli/index.ts

@@ -941,4 +941,5 @@ process.exit(await dispatchCommand(head, {
   handleStatus,
   handleRecoverHistory,
   handleReady,
+  serviceCommand,
 }));

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "9db72337e10283bebce7752061492ab1be0a14fe85b2c9dbd32bcf1395cf5f2f"
+      "sha256": "5c2d417ce3cb466651385bca4d8fee522e0bdf1c6d8c2fc1f84b4cf54574aee1"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -42,7 +42,7 @@
     },
     {
       "path": "src/adapters/base.ts",
-      "sha256": "67f50a3e0e45514f55f08d19726acfcab6fe4a9bd5e88bb7455b5af236a10663"
+      "sha256": "f20fdca89cd4bac4ec049ab46e200f2aa6435dae548c5994b7edf5b6d73f1bd5"
     },
     {
       "path": "src/adapters/client-fingerprint.ts",
@@ -182,7 +182,7 @@
     },
     {
       "path": "src/adapters/google-antigravity-replay.ts",
-      "sha256": "230da5cd5c6a94c2f520eeea2905294df6320e95e6f6e42569a4bfe04724193d"
+      "sha256": "52704bcd65eab346025e6faffe70d0c1d07e39651e4139f34bc67759fbaa4f08"
     },
     {
       "path": "src/adapters/google-antigravity-wire.ts",
@@ -242,7 +242,7 @@
     },
     {
       "path": "src/adapters/kiro-thinking.ts",
-      "sha256": "d4016e1314c8b91bada92fff3ec4b94d0e1d88c4e51db49c29a482584844dfe0"
+      "sha256": "c7093dd20dc16156aee4d6a37de0b71f6e646c09f2ba99be8f3c6a388703a981"
     },
     {
       "path": "src/adapters/kiro-tool-fallback.ts",
@@ -262,7 +262,7 @@
     },
     {
       "path": "src/adapters/kiro.ts",
-      "sha256": "c396bcf9810a1381f71957f95ed8399a13e240f5dc6be878c8836dfa7ca66f52"
+      "sha256": "fe61e9e4f8d7eada8baab90e09e9b2b03641c114eabe7846f2947cb0667996f1"
     },
     {
       "path": "src/adapters/mimo-free.ts",
@@ -274,7 +274,7 @@
     },
     {
       "path": "src/adapters/openai-chat.ts",
-      "sha256": "1fcd9a2da1e675026fa2ac03b396cefa7cd62e3c1baf27844bbe7fd589c70275"
+      "sha256": "c87e922e32ccf8c224891e9a3a42e86139eb7db8d97b9c46613f01a132afc6fa"
     },
     {
       "path": "src/adapters/openai-responses-url.ts",
@@ -282,7 +282,7 @@
     },
     {
       "path": "src/adapters/openai-responses.ts",
-      "sha256": "9c8d4483c0dacf3bf0562f08fe61b43d3c3107f1a978d66fc916c3da5dfe1d17"
+      "sha256": "8d4809ac4228beea1fa08716cd43c9ab7a87fdeaed5f30f39336ee808375b98d"
     },
     {
       "path": "src/adapters/run-turn-queue.ts",
@@ -446,7 +446,7 @@
     },
     {
       "path": "src/cli/dispatch.ts",
-      "sha256": "2cba2f25e64bef2b08f1299a8b94757517bdf8bcd56e9ce2c7d46e50be3cce47"
+      "sha256": "478bd9539c26322ec5365e80f44674d507c708ccff6d09605a6e7804abedee79"
     },
     {
       "path": "src/cli/doctor.ts",
@@ -462,7 +462,7 @@
     },
     {
       "path": "src/cli/index.ts",
-      "sha256": "8e3e096dac1115ae5a1a8c12d740b72766f4a1a1ece1e96c7e05d11b83080adb"
+      "sha256": "63e8747afb606295340bd30598d7112b75efb2a89353234a874df42c5fc7e1a7"
     },
     {
       "path": "src/cli/init.ts",
@@ -1038,7 +1038,7 @@
     },
     {
       "path": "src/integrations/config-io.ts",
-      "sha256": "5193f6718cab71d9b7117faec5feb3a413bc1ccfc1b1f5649451cba909b5bf15"
+      "sha256": "5271736a6499bc4bcb68bde2ccefd8ef8ce7953bddf13e764fb1b9ee66433fe3"
     },
     {
       "path": "src/integrations/journal.ts",
@@ -1054,7 +1054,7 @@
     },
     {
       "path": "src/integrations/omp-yaml-source.ts",
-      "sha256": "b9e4355893d74cfff01892c2b2a0e164420d07beb5222818e14cddaff0c3d718"
+      "sha256": "58a8769edc6c1f409f2851955e52dba3cdb5e30938d6b7dc19e59b900731d219"
     },
     {
       "path": "src/integrations/ownership.ts",
@@ -1066,11 +1066,11 @@
     },
     {
       "path": "src/integrations/serialize.ts",
-      "sha256": "e7a23ead6a5a6445ddc7803af9aa8cfebc745e2d6ab325828b95689a50c9b29d"
+      "sha256": "0560601276b25d82eaf6e5460c815e0a67ecb4cf1cf6e378952c60dedfb333e6"
     },
     {
       "path": "src/integrations/state.ts",
-      "sha256": "65dd695356bce8ac9593e4cbec64ab85ca9d54784a0e7c8ae7294b9e9a81fba0"
+      "sha256": "e2446f333ab3b57eebc120bf674f37aff6210cde7cf45628e7ff0ca77ca4d4f0"
     },
     {
       "path": "src/integrations/store.ts",
@@ -1078,7 +1078,7 @@
     },
     {
       "path": "src/integrations/writer.ts",
-      "sha256": "e2857bcc0351f1b6de8ba7d2fb6da27eff621e35ff69d40138e789ac24b116d6"
+      "sha256": "92cc7c85a6bffa520f0fce57890f45758c712f69a128451be60368444d5ff725"
     },
     {
       "path": "src/lab/artifacts/sanitize.ts",
@@ -1118,7 +1118,7 @@
     },
     {
       "path": "src/lab/automation/orchestrator.ts",
-      "sha256": "ea12b23eceb13af13e6139a90ecd6b62ddd9485be118ef15027aff8c75621b6b"
+      "sha256": "5f10d45593ea6464f6ecd1db6ee922bc7627fc6578fe6f3f93b7a35c1b479df8"
     },
     {
       "path": "src/lab/automation/persistence.ts",
@@ -1548,6 +1548,10 @@
       "path": "src/lib/injection-debug-log.ts",
       "sha256": "ab3b8e53c546c0ff43dc129d29c0b11c2d258f86e9d12475d87bf55510eb02c9"
     },
+    {
+      "path": "src/lib/lab-activation.ts",
+      "sha256": "7cdfb758543a789a75354ebfba730c516d264a4d6a10648456f57e2654034dec"
+    },
     {
       "path": "src/lib/lab-live-execution-authority.ts",
       "sha256": "7a4c488521b861ad70a87f560d85cb5c9f552e16493c5d44e19734947b4ac714"
@@ -1564,6 +1568,10 @@
       "path": "src/lib/lab-live-route-production.ts",
       "sha256": "fb890cceb6390cd2d846c86c97e0d490ea8b58783cd7410d032b6d8573a07f49"
     },
+    {
+      "path": "src/lib/lab-passive-linker-registration.ts",
+      "sha256": "5f88d3428f87f1773f944e43d812356b96e881dcb8bd13d34baf504ce509e54c"
+    },
     {
       "path": "src/lib/local-management-attestation.ts",
       "sha256": "1bccf8f85ecd89cb017224024ca3d199d97c8ce88f5ac936dbc1419845a77f6e"
@@ -1580,6 +1588,10 @@
       "path": "src/lib/open-url.ts",
       "sha256": "a6db7ec7181ccb4e95411b2c7499fdd00f3dd48bebcdaca099da086c0dae2e59"
     },
+    {
+      "path": "src/lib/optional-shutdown-hooks.ts",
+      "sha256": "ba1fb3f46ddd1ad7d1cf90e22ae8df5dd2969dbb99449beaf8fac3100425a908"
+    },
     {
       "path": "src/lib/pinned-http.ts",
       "sha256": "27a69c4eac63db31ef754c84d7f5f2e2949221b5fe27e066420f91b40fcc51d7"
@@ -1658,7 +1670,7 @@
     },
     {
       "path": "src/lib/translator-budget.ts",
-      "sha256": "872d5d35eb0d2ee099fc4ab4bf3b9331c6207d4282f61f2c1b11a5a36c00d981"
+      "sha256": "4d79fed2d10e23b87af2c67ea0a979ce580eb232ac35e1f6851b5f02ef5a07d7"
     },
     {
       "path": "src/lib/upstream-reachability.ts",
@@ -1822,7 +1834,7 @@
     },
     {
       "path": "src/providers/antigravity-models.ts",
-      "sha256": "e7a2b7352997cfdc4268c733def555dae8632ba58a3f889dfc78d812b885d072"
+      "sha256": "cbe65f34a127ad44fd8f6bd2214553b238449b4f10d948d5ed67f4b163964874"
     },
     {
       "path": "src/providers/api-keys.ts",
@@ -1990,7 +2002,7 @@
     },
     {
       "path": "src/routing/compatibility/assemble.ts",
-      "sha256": "00f0802e3ef8a2bf79779fbe27b62a73e92a94cff11bf5594784fef35dbda495"
+      "sha256": "186010fe58a02823530819cf7bbf06cefdbb3224850ea8321736d1017f32783f"
     },
     {
       "path": "src/routing/compatibility/behavior.ts",
@@ -2004,10 +2016,18 @@
       "path": "src/routing/compatibility/endpoint.ts",
       "sha256": "38578440e02ce712f8d84fa97ec2d1bc3396f31983be9b6e5b0010ef6edd146b"
     },
+    {
+      "path": "src/routing/compatibility/lab-evidence-provider.ts",
+      "sha256": "352a65b6d95c8e6eaa7e6f81fca49284b49a9ddf7bd1895be192b858784fd861"
+    },
     {
       "path": "src/routing/compatibility/policy.ts",
       "sha256": "d903d561ef2ae16c86d16c7ec157556ee0c78557aaa7e83dad46c1abc0e6530c"
     },
+    {
+      "path": "src/routing/compatibility/provider-slot.ts",
+      "sha256": "809c7b5dbe13b6e90d5abf51cadf33825f8d82b5fd1c7355d9ef25b736371bdc"
+    },
     {
       "path": "src/routing/compatibility/reader.ts",
       "sha256": "c48943c0b660609bbdf4d47896de6338cd46b2c9144f1c916646221fe437a678"
@@ -2114,11 +2134,11 @@
     },
     {
       "path": "src/server/index.ts",
-      "sha256": "cff5571eb50f6ec315fa2f3ddd835d3bdd25b59c94a5b991771f066ad3e3ffc2"
+      "sha256": "cc6461e629f1f5e373d81ebee0720a9ba85c7deedded457bbd398ac962e0e404"
     },
     {
       "path": "src/server/lifecycle.ts",
-      "sha256": "ee926ab2c5bb9925f91ce908ba8ce707859690bae1d07227afc38b259f40ea73"
+      "sha256": "02d0691de03c510419c971341a7015507491599b9a91bec369fd7144f85b05a3"
     },
     {
       "path": "src/server/live.ts",
@@ -2134,7 +2154,7 @@
     },
     {
       "path": "src/server/management-api.ts",
-      "sha256": "ccd670a1618afc1ec6611771ec2519ea6c216d0ef43aa9e1114a3a98a9f0e030"
+      "sha256": "0a513030e2b730393d86c87ad237f1e9f35e64586d8736c91c69fed6aaabb60d"
     },
     {
       "path": "src/server/management-auth.ts",
@@ -2214,7 +2234,7 @@
     },
     {
       "path": "src/server/management/routing-profile-routes.ts",
-      "sha256": "1185f47d963c31efa7da224baf9f2a447a15a7afee0705c05e6c110e75b465ff"
+      "sha256": "08484dcc92a3672450122316dad9939707a2669eabf396084bfb93fa9dde35f9"
     },
     {
       "path": "src/server/management/shared.ts",
@@ -2248,6 +2268,10 @@
       "path": "src/server/memory-watchdog.ts",
       "sha256": "d2f7f5cd03316cdfb0bd23abd77b4c28d87986a9a1cb9e0f53e3890695f07f4c"
     },
+    {
+      "path": "src/server/passive-route-linker.ts",
+      "sha256": "6a20d1e864efe80cd9d6c69df9616bc6092a6102cd8d339f0cb376f8821bed0b"
+    },
     {
       "path": "src/server/port-reclaim.ts",
       "sha256": "5b1a9e7e5e3d752ee7dd0dca1ea8737eeaf7945e2c9a4e3a0aed9805cc72d253"
@@ -2334,7 +2358,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "c67fdae5470a8d0c234e24d7d062bf351ec35c911550363c8d73199f4059fc95"
+      "sha256": "0817eb37ba0ce9425afd9b9794eccab1095b7563d217652562cb281479f1df48"
     },
     {
       "path": "src/server/responses/encrypted-payload.ts",
@@ -2482,7 +2506,7 @@
     },
     {
       "path": "src/types.ts",
-      "sha256": "d911cdcf36b5694e58918b7e76b94b42c3bf94962ef4a41b93ae01629be36016"
+      "sha256": "33f4ee11228bb8faca03c57fdd5000512f70153c2fd446f88d78b0a43056d330"
     },
     {
       "path": "src/update/badge.ts",

package/src/integrations/config-io.ts

@@ -9,6 +9,7 @@
  */
 import { mkdirSync, readFileSync, rmSync, statSync } from "node:fs";
 import type { ConfigFormat } from "../clients/config-export";
+import { MAX_JSON_NESTING } from "./serialize";
 import { atomicWriteFile } from "../config";
 import type { JournalEntry } from "./journal";
 import type { OwnershipRecord } from "./ownership";
@@ -23,12 +24,129 @@ import type { IntegrationClientId } from "./registry";
  */
 export const PARSE_FAILED = Symbol("parse-failed");
 
+/**
+ * What `JSON.parse` has already discarded by the time we hold the parsed value,
+ * and a rewrite would therefore silently change. Both classes are invisible in
+ * the parsed object, which is why this scans the RAW text — same reasoning as
+ * the TOML inf/nan guard below.
+ *
+ * Numbers: `1e999` overflows to Infinity (a rewrite bakes in `null` — the merge
+ * layer's JSON clone does it even before the serializer could refuse), `1e-9999`
+ * underflows to `+0`, an integer literal may have been rounded (a rewrite then
+ * hands consumers that read JSON integers exactly — python, jq, BigInt revivers
+ * — a different value), and `-0` re-serializes as `0`. Only literals whose value
+ * actually changed are refused: `1e21`, `1e-320` or 2^54 round-trip exactly and
+ * stay usable.
+ *
+ * Duplicate members: `{"a":1,"a":2}` parses to a single `a`, so rewriting the
+ * document DELETES the earlier member. That is content loss, not the formatting
+ * normalization we promise, and this classifier is what makes the rewrite of a
+ * user-edited file reachable at all — so it fails closed here.
+ *
+ * Depth: the same pass counts container nesting against MAX_JSON_NESTING
+ * (shared with the serializer, see serialize.ts). JSON.parse handles hundreds
+ * of thousands of levels iteratively, but the downstream merge and
+ * JSON.stringify recurse — a 100KB file nested 50k deep sailed through parse
+ * and guard, then blew up serialization with a raw RangeError after a
+ * multi-GB allocation spike. A hand-written scan rather than a JSON.parse
+ * source-access reviver on purpose: the reviver walk recurses internally, so
+ * its depth limit would be an unpredictable stack size instead of this
+ * deterministic ceiling.
+ */
+function jsonTextSafeToRewrite(text: string): boolean {
+  /**
+   * One frame per open container; a Set of member names for objects, null for
+   * arrays. Its length is the current nesting depth.
+   */
+  const containers: Array<Set<string> | null> = [];
+  /** The most recent string literal — the member name if a `:` follows. */
+  let lastString: string | null = null;
+  let inString = false;
+  let escaped = false;
+  let stringStart = 0;
+  for (let i = 0; i < text.length; i += 1) {
+    const ch = text[i]!;
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === "\"") {
+        inString = false;
+        lastString = text.slice(stringStart, i + 1);
+      }
+      continue;
+    }
+    if (ch === "\"") { inString = true; stringStart = i; continue; }
+    if (ch === "{" || ch === "[") {
+      containers.push(ch === "{" ? new Set<string>() : null);
+      if (containers.length > MAX_JSON_NESTING) return false;
+      lastString = null;
+      continue;
+    }
+    if (ch === "}" || ch === "]") { containers.pop(); lastString = null; continue; }
+    if (ch === ":") {
+      const members = containers[containers.length - 1];
+      if (members && lastString !== null) {
+        /*
+         * Decoded, not raw: `"a"` and `"a"` are spellings of ONE member,
+         * and JSON.parse keeps only the last of them.
+         */
+        let name: string;
+        try { name = JSON.parse(lastString) as string; } catch { return false; }
+        if (members.has(name)) return false;
+        members.add(name);
+      }
+      lastString = null;
+      continue;
+    }
+    if (ch !== "-" && (ch < "0" || ch > "9")) continue;
+    let end = i + 1;
+    while (end < text.length && /[0-9+\-.eE]/.test(text[end]!)) end += 1;
+    const literal = text.slice(i, end);
+    i = end - 1;
+    const value = Number(literal);
+    if (!Number.isFinite(value)) return false;
+    if (value === 0) {
+      /*
+       * `-0` (re-serializes as `0`) and underflow: `1e-9999` is a nonzero
+       * value the parse already flattened to `+0`. The significand alone
+       * decides, so genuine zero spellings (`0`, `0.0`, `0e10`) stay usable.
+       */
+      if (literal.startsWith("-") || /[1-9]/.test(literal.split(/[eE]/)[0]!)) return false;
+    }
+    /*
+     * Deliberately plain digit runs only. They are the one spelling real
+     * consumers read with exact integer semantics (python's json yields an
+     * arbitrary-precision int, jq preserves big integer literals), so baking
+     * in the rounded double changes what those consumers extract. Decimal or
+     * exponent spellings of the same value (`9007199254740993e0`, `…3.0`) are
+     * float semantics for every consumer — they round identically before and
+     * after a rewrite, and shortest-round-trip stringify preserves what any
+     * reader can observe, so refusing them would only manufacture dead ends
+     * (`1e308` is not exactly representable either, yet rewrites losslessly
+     * for every possible reader).
+     */
+    const digits = literal[0] === "-" ? literal.slice(1) : literal;
+    if (/^[0-9]{16,}$/.test(digits) && BigInt(literal) !== BigInt(value)) return false;
+  }
+  return true;
+}
+
 /** Parse a client config, tolerating absence. PARSE_FAILED on garbage. */
 export function parseConfig(text: string | null, format: ConfigFormat): unknown | typeof PARSE_FAILED {
   if (text === null || text.trim().length === 0) return {};
   try {
     switch (format) {
-      case "json": return JSON.parse(text);
+      case "json": {
+        /*
+         * Scanned BEFORE parsing: the guard is text-only, and refusing first
+         * means a hostile document is never materialized — the depth ceiling
+         * would otherwise cap the rewrite only after JSON.parse had already
+         * built the 50k-deep object graph. The outcome is unchanged: invalid
+         * JSON still returns PARSE_FAILED, from the catch below.
+         */
+        if (!jsonTextSafeToRewrite(text)) return PARSE_FAILED;
+        return JSON.parse(text);
+      }
       case "json5": return Bun.JSON5.parse(text);
       case "yaml": return Bun.YAML.parse(text);
       case "toml": {