@bitkyc08/opencodex 2.45.0 → 2.46.0-preview.20260907

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "3bf62e3b02229bf4f2c8652b3d780693c0c9c8498d7ff72180cce2cf795b186e"
+      "sha256": "9912d795da9a0f1f0f1374d817e51d5c2e8c7023abc87052e150e9d3ef463d91"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -42,7 +42,7 @@
     },
     {
       "path": "src/adapters/anthropic.ts",
-      "sha256": "dfeaa31b5cdcbffeeff6b68ef0ebee8048606aa3cbf33870117a5052eff6c038"
+      "sha256": "bc0da6835048a5946eae21e87d2afe62edec9b6a78e697e0aace10c1b826c43d"
     },
     {
       "path": "src/adapters/azure.ts",
@@ -366,7 +366,7 @@
     },
     {
       "path": "src/adapters/openai-responses.ts",
-      "sha256": "1324c424d410df423092f5c5dfebced671ca7a3d65d85ad35d08bcb8b2e2cd24"
+      "sha256": "db01d0ade13c4e241e4818091884f689d6dd85ab5d7656832265d6f04097ab55"
     },
     {
       "path": "src/adapters/opencode-go.ts",
@@ -414,7 +414,7 @@
     },
     {
       "path": "src/bridge.ts",
-      "sha256": "393602b2369ad8ba366a05b5900885e049d4162e38960bc7291db03ee643f3ab"
+      "sha256": "c583fe5a240bb4d1f732ae00752e2b14773a306487000f909caabeec09a9d889"
     },
     {
       "path": "src/chat/inbound.ts",
@@ -522,7 +522,7 @@
     },
     {
       "path": "src/claude/inbound.ts",
-      "sha256": "122d14724bb106fe57ceea2fe29e47455b00628812b2c880bf79a538bbd4690c"
+      "sha256": "e0643ae16f2d7832fe72206e93da4435f3d81fa2dfad96284a45c99b7ecc7017"
     },
     {
       "path": "src/claude/model-info.ts",
@@ -530,7 +530,7 @@
     },
     {
       "path": "src/claude/outbound.ts",
-      "sha256": "81e95583b79412ef5111d4f1eb1bef1e64c24a5b69e04011472c0552ee39b677"
+      "sha256": "964627d141b365cb0bba42a991cfd2c423420ec6df96ea2f3f8a99834ef4dbaf"
     },
     {
       "path": "src/cli.ts",
@@ -586,7 +586,7 @@
     },
     {
       "path": "src/cli/capabilities.ts",
-      "sha256": "81726a7432f53219eb9789747966b2f6137592409a2d6dacf1ccb4bdfa49ca75"
+      "sha256": "96083709dc6a6af2db3245f798803ce8ded61db5a68c176294429d217b997921"
     },
     {
       "path": "src/cli/catalog-prewarm.ts",
@@ -638,11 +638,11 @@
     },
     {
       "path": "src/cli/dispatch.ts",
-      "sha256": "3c001efbaeeb680ff4de97365bb7bb12a34adb1118dd7059f3147051b2b1ad1f"
+      "sha256": "29620e258d088486d5c1404b30cf7b6c46e9daa7a792a8896d18a2758e52cd44"
     },
     {
       "path": "src/cli/doctor.ts",
-      "sha256": "0bee9780b50e737434dbb25028cab8c04f5b767c45915fe4b01a5aa0f5789a86"
+      "sha256": "172cd9206c049204f228daa10adea6d4e66001a363f6920b6c40a365767637cd"
     },
     {
       "path": "src/cli/effort.ts",
@@ -654,7 +654,7 @@
     },
     {
       "path": "src/cli/export-command.ts",
-      "sha256": "083220ecfa3357e690abf6ad3024b621c40545ae2a642364e7b92b04763300ed"
+      "sha256": "0022d2900c3e6120070873a94d4ea794880b0a00d94e9072529e226936e59823"
     },
     {
       "path": "src/cli/gui-pair-client.ts",
@@ -666,11 +666,11 @@
     },
     {
       "path": "src/cli/help.ts",
-      "sha256": "44f0999c368543270b6e01779912c5d8b8adda1f9bf52a0b4853d30951d83750"
+      "sha256": "fb600931833db20d6357e513e8ab4e52294e3c1d45b6ec5d39a48446acbcfc17"
     },
     {
       "path": "src/cli/index.ts",
-      "sha256": "28f75e7e1b87e85cea387aad75c6f4cb39ff14547304cceedf2c6b13fa72a6e7"
+      "sha256": "5daf375e66c9911f9efda2e2799f5d1ec9a9d88af33290d434f3c0aa3c9901b4"
     },
     {
       "path": "src/cli/init.ts",
@@ -682,7 +682,7 @@
     },
     {
       "path": "src/cli/integrations.ts",
-      "sha256": "b9c85b2e6c5431b0598780920ea048ddb4d3d80ba003bcd2244cb5268b61656a"
+      "sha256": "7350ab5254374b03168c9fdfc474b602a4ef8da5971ebd85ba1f2a381a620dfe"
     },
     {
       "path": "src/cli/interactive-confirm.ts",
@@ -730,7 +730,7 @@
     },
     {
       "path": "src/cli/provider.ts",
-      "sha256": "64db1a7f36f0d977991a8abbbdcd27c07356b8a304fc4958029187f45245d5fe"
+      "sha256": "fd8e3e0d4cb1314df08a1011bc34535b477006a993937b6b72f4fbf4156cea8a"
     },
     {
       "path": "src/cli/ready.ts",
@@ -738,7 +738,7 @@
     },
     {
       "path": "src/cli/registry.ts",
-      "sha256": "26ec4ad29287e14508c36756122241429eee7d77f9df64acb0129549e89489e7"
+      "sha256": "a415ed583ceab021ccfa6eeee1cf254533431559aa0c718dc2f0d24e9dd07589"
     },
     {
       "path": "src/cli/root.ts",
@@ -802,7 +802,7 @@
     },
     {
       "path": "src/cli/version-skew.ts",
-      "sha256": "5c9cde92783d944bf918600dbb1892bf9ef1102c535a3cbcf25cfde1e5420db8"
+      "sha256": "eecb3bf064360b06810b6281e6c514a8e95d971a31d9022c66ef4b9720457c05"
     },
     {
       "path": "src/client/connect.ts",
@@ -842,11 +842,11 @@
     },
     {
       "path": "src/clients/aside-profiles.ts",
-      "sha256": "210335d697e3c9b8f61e653fda0b3a188233a60b36c19be681ada6d3bc31db79"
+      "sha256": "a02f8f25268d3a2eddebd9cc70a9a021b225e0369b00efa073adb08b8090276b"
     },
     {
       "path": "src/clients/config-export.ts",
-      "sha256": "7c86c748532abde556055ba6b6ae4e689eaa0fff4cf62bc30ed399a8eb5fb2c8"
+      "sha256": "674ecdb74d92da0ebf5f48f9106020e06f2e3f63eec14af783c9135dfb37e732"
     },
     {
       "path": "src/clients/config-export/constants.ts",
@@ -854,7 +854,7 @@
     },
     {
       "path": "src/clients/config-export/contracts.ts",
-      "sha256": "2aebfb368220ca9ff1c7b6c24baedaa11db1ac562d565125f677a89a10c9e3ea"
+      "sha256": "0e4e71d6b4d38e3a16a81b77935403cff7dcb26027aee746bc3c138a1e6395eb"
     },
     {
       "path": "src/clients/config-export/dsh.ts",
@@ -876,10 +876,18 @@
       "path": "src/clients/config-export/omp.ts",
       "sha256": "a770072e1818ea4b6fe2358f65c83700a6a17506c14994242427d41046515bbb"
     },
+    {
+      "path": "src/clients/config-export/raycast.ts",
+      "sha256": "624cf5c2acf9e5ad9fb2da54e8a3b80a6ec3c2dfc0303c1724497788d51d222c"
+    },
     {
       "path": "src/clients/config-export/zcode.ts",
       "sha256": "c3547c36a1e04b66d88add299d5c8465599ea3b6fd6266b25cd3c00afb52d757"
     },
+    {
+      "path": "src/clients/model-presentation.ts",
+      "sha256": "ff7f94612422eb62be505324c4f3c40174e3de28c8644202094972addb5628cb"
+    },
     {
       "path": "src/codex/account-id.ts",
       "sha256": "beaa9a9fe8a2588cd1f98fc4c4d16b39b3f224dcced1b5e1c3dd10eb8fe5c8a3"
@@ -1014,7 +1022,7 @@
     },
     {
       "path": "src/codex/catalog/sync.ts",
-      "sha256": "e775d8715527a47175f45006f21cec4c03e71ab6224acc7841f62a236f7cdf4a"
+      "sha256": "f436b8cd48e820a45bca2cbf550e0fab33aa22daeac6db318d88ebe3aacace3b"
     },
     {
       "path": "src/codex/cli-install-provenance.ts",
@@ -1030,7 +1038,7 @@
     },
     {
       "path": "src/codex/convergence.ts",
-      "sha256": "3f882ddb48a4d5a57e2697c0c116ebafc4b2ed309a899497471301a2fd378c0a"
+      "sha256": "64323a64fc2ee76e6daf424f6b8632eadcf0097a4ebea9b3e3e206e9511901dc"
     },
     {
       "path": "src/codex/coordinator-doctor.ts",
@@ -1506,7 +1514,7 @@
     },
     {
       "path": "src/generated/model-metadata.ts",
-      "sha256": "95341e411a2f27613a48f9f8e6302b6f2aec4eb6a72f965b7332d6f4396b0d83"
+      "sha256": "1d0baea1ede9e15a7d859109233ea2020eff5ac9770e97958d252e4a2d003e9e"
     },
     {
       "path": "src/github/star-state.ts",
@@ -1558,7 +1566,7 @@
     },
     {
       "path": "src/images/loop.ts",
-      "sha256": "3c66e28fdb84237da3fc365c6ae341a73e573d8e9d952ac12cb28bad7c13327d"
+      "sha256": "0d87006d01ca9ea7b606051a1d5c878c936a38acd1b078bb6c011c9aa93b7b83"
     },
     {
       "path": "src/images/plan.ts",
@@ -1598,7 +1606,7 @@
     },
     {
       "path": "src/integrations/catalog-refresh.ts",
-      "sha256": "b18d9b2f907d4d9d4f5e01a5d375a03147a56ca193fbf5eea639b3ef1b5f3468"
+      "sha256": "bca9d33e50690ebb9f26e17857856fe40acf5b27fd2909b64d864f190bb472ed"
     },
     {
       "path": "src/integrations/config-io.ts",
@@ -1622,7 +1630,7 @@
     },
     {
       "path": "src/integrations/merge.ts",
-      "sha256": "517941efb221549a2b61f4ff3621d24de6eda8769a994049a7d9d83a77943944"
+      "sha256": "3509078efcd76dbaae5bd74ed73317f69ada32a8cfd23633898946802a039564"
     },
     {
       "path": "src/integrations/mutation-flight.ts",
@@ -1648,9 +1656,13 @@
       "path": "src/integrations/ownership.ts",
       "sha256": "974d740dc6deab816726879b1d814a660769dce39b2d4856e41c4d0de05ca150"
     },
+    {
+      "path": "src/integrations/raycast-detect.ts",
+      "sha256": "29f4702d711a7547c1d71eb60e8b80c9674ca023bf5a26513c4021cc0d626b2c"
+    },
     {
       "path": "src/integrations/registry.ts",
-      "sha256": "09446d4c94c342d66133a23da03f64fad5bc60c33b97c764ae8e29d81d307534"
+      "sha256": "b668ce30d0496bef3f4be15c35be830de3e3c21f7c440c0a6910bbefab0f06f5"
     },
     {
       "path": "src/integrations/serialize.ts",
@@ -1658,7 +1670,7 @@
     },
     {
       "path": "src/integrations/state.ts",
-      "sha256": "7068adf0930d95aa29f3e375e76b0b6c1cd1c5fc2296962b30557f5319e1f68d"
+      "sha256": "9e3de25e823089c1affe558f5be31d7b91e14fe02ea2675638c80b1ff9f2e920"
     },
     {
       "path": "src/integrations/store.ts",
@@ -1670,7 +1682,7 @@
     },
     {
       "path": "src/integrations/writer.ts",
-      "sha256": "521e04d5ecd8f519f1e3fda0114fdab1361fe2b738267f0c4b852632ddb597a9"
+      "sha256": "46c56802eee2da6cd55751cbfb358768871cdd3db697263dd3925434c44f90a7"
     },
     {
       "path": "src/lab/artifacts/sanitize.ts",
@@ -2174,7 +2186,7 @@
     },
     {
       "path": "src/lib/bounded-body.ts",
-      "sha256": "bc51e0746b3ae2b8c0f93c359d7d8bb3867a38fb09a95f8fd40a6f1d39bacbcb"
+      "sha256": "8a271580ec37de198755769bcbda25a9beecf7ece6ba36bb08266fc78b950a04"
     },
     {
       "path": "src/lib/bounded-subprocess.ts",
@@ -2478,7 +2490,7 @@
     },
     {
       "path": "src/oauth/anthropic-routing.ts",
-      "sha256": "fbf61f5b118f1d90a1a59dbe8970d4f635dde2960e386d2237666a1aa907fe87"
+      "sha256": "0cae1a382e319349d92d589be77528a123aca5d65274732eb3f4de2cd4b2c076"
     },
     {
       "path": "src/oauth/anthropic.ts",
@@ -2518,7 +2530,7 @@
     },
     {
       "path": "src/oauth/health.ts",
-      "sha256": "3d4b0bc190466042b70eb0021cdf2723ce604d96fbe57427b1add61b329b914f"
+      "sha256": "2af2cae20f57f47f44f8ba8c3b692ca384fb9776f2ea53d69b1929bcdc04db59"
     },
     {
       "path": "src/oauth/index.ts",
@@ -2778,11 +2790,11 @@
     },
     {
       "path": "src/providers/quota.ts",
-      "sha256": "d7e0f344e54af750358f2a92b3af9f278e8d88e11c5d695311e7527c55c239af"
+      "sha256": "0cc9b4797d1379a2f359f3798da1488fd9ef2f0100ce31cf51b421c20619d9d7"
     },
     {
       "path": "src/providers/registry.ts",
-      "sha256": "fdc9f2e605de777863f7372eedd8b401db80c4a6bb0032feddfa8a7f66c3cad7"
+      "sha256": "495de5c9ae08da4e3a545924b913ee3cfac71196b776aa45c795a5f743319a66"
     },
     {
       "path": "src/providers/request-pacing.ts",
@@ -2898,7 +2910,7 @@
     },
     {
       "path": "src/responses/parser.ts",
-      "sha256": "1c263b6b86a839bf8e75d00f6ab5210c96d47a8750e81e03a7fff4e7a346d66b"
+      "sha256": "f6d3f2447c94680c246ed7dcda910eb69e5cd5eb8ba27f90e3af723d6eebae4b"
     },
     {
       "path": "src/responses/provider-continuation.ts",
@@ -2910,7 +2922,7 @@
     },
     {
       "path": "src/responses/reasoning-envelope.ts",
-      "sha256": "1f06da19739c3fd946e54b81e7c5d87d1677d4335fec35b1e7264662a5725d10"
+      "sha256": "c8092798153ba1a5708c401c63116e58959502b6b7afc93cb8cf3027c4e971a3"
     },
     {
       "path": "src/responses/reasoning-replay-cache.ts",
@@ -3108,6 +3120,10 @@
       "path": "src/server/github-copilot-responses-repair.ts",
       "sha256": "7cff66ca0b8e1b4ff64e29c3b353d876d053a9612a0c357ea5af9603c8400629"
     },
+    {
+      "path": "src/server/grok-responses-control-frame.ts",
+      "sha256": "65c809ec37742b3a35d7d18a6f98cf802f414a8485755f1140673fc8a9e21f7a"
+    },
     {
       "path": "src/server/grok-responses-snapshot-repair.ts",
       "sha256": "d5a84a2fb2b8707a30fb5cde48342968af2a0898a5e92cd843faa53e0cb73ef6"
@@ -3194,7 +3210,7 @@
     },
     {
       "path": "src/server/management/config-routes.ts",
-      "sha256": "ea2861451b393aeb027c525585b46a0e2e0e071c09894106c4fc1e1560e88231"
+      "sha256": "de6d1222039b7689be80f120846f0da0c8de27a8f872f472fad59180f14408b6"
     },
     {
       "path": "src/server/management/context.ts",
@@ -3206,7 +3222,7 @@
     },
     {
       "path": "src/server/management/integration-routes.ts",
-      "sha256": "9455ba483dfc83bf3fc7b359a5543875f98c0440b433dfabd3539e2cbe77f433"
+      "sha256": "206da4ffcb06f4ad5b4fa47d767d03d148b513b3ec0c6ff4fe2fcbb3b6ea6971"
     },
     {
       "path": "src/server/management/lab-automation-routes.ts",
@@ -3222,7 +3238,7 @@
     },
     {
       "path": "src/server/management/model-routes.ts",
-      "sha256": "1a74253441dffbc9464c0b7aade7b81dadaba301ea9c7361c4d2b6cdf5907afd"
+      "sha256": "7f31dd0c54945e4f69dbae871d7feb9f0165846993421d7d071b5d4b78c29f9b"
     },
     {
       "path": "src/server/management/model-rows.ts",
@@ -3350,7 +3366,7 @@
     },
     {
       "path": "src/server/request-decompress.ts",
-      "sha256": "239636dd0e8bbac8b9351643bd6f6223509085f17c88d547c52e3d438de503bd"
+      "sha256": "6068cb4b96389407e2c2c8cc37e769d8164541e8455663b0d256b593736cb204"
     },
     {
       "path": "src/server/request-log-conversation.ts",
@@ -3422,11 +3438,11 @@
     },
     {
       "path": "src/server/responses/agent-task-recovery-cache.ts",
-      "sha256": "355cd82be77db1d588f433c7337d04961f58f45048b98832b0db0b1d917d48b3"
+      "sha256": "73944718c95c4f770c5dadfb7f99066ad5993c9bc9edd107c8e3e3d103dded1d"
     },
     {
       "path": "src/server/responses/agent-task-recovery.ts",
-      "sha256": "6041f65c4af7b9e42d041153da1a55a90cd4c7f62a6a48de1c5856761525b2e9"
+      "sha256": "281ea00aa47e4a980a5bdf80856b1a69788db4ade9ffbcd7485daf211759cc27"
     },
     {
       "path": "src/server/responses/codex-auth-error.ts",
@@ -3478,7 +3494,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "820be393b77d862ce99ae06ccb2b4f6ae5afb086f617e06f0453fed04941ceae"
+      "sha256": "65b01832c0164ea6cb4391f5015b977b985966718f0267cbb5c6bd90196c63e6"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -3890,7 +3906,7 @@
     },
     {
       "path": "src/web-search/loop.ts",
-      "sha256": "8de82a4764dee1208a9cb01bf3e1ee962f4f1d8b19ac6513d14a15b4faefb532"
+      "sha256": "74b3aaa6dacbf7a1e6f3c6bfa858c44bf98c2da84b9c36d60058777af2302bbb"
     },
     {
       "path": "src/web-search/parse.ts",

package/src/generated/model-metadata.ts

@@ -31,6 +31,7 @@ const PROVIDER_ALIASES: Record<string, string> = {
   "moonshot": "moonshot",
   "zhipu-bigmodel": "zai",
   "zhipu-bigmodel-coding": "zai",
+  "zhipu-bigmodel-responses": "zai",
   "minimax": "minimax",
   "minimax-cn": "minimax"
 } as const;

package/src/images/loop.ts

@@ -263,8 +263,16 @@ export interface ImageBridgeDeps {
    * Optional 429 failover for the routed (non-xAI) model. Return a rebuilt adapter for the
    * rotated credential, or null when the pool is exhausted. Async hooks support OAuth refresh;
    * existing synchronous key-pool hooks remain valid.
+   *
+   * `responseHeaders` carries the whole refusal, not just Retry-After, because an Anthropic
+   * 429 states the window's reset epoch even when it omits Retry-After -- and a rotation that
+   * cannot see it cools the drained account for the short default instead of until the window
+   * actually reopens. Optional so existing callers keep compiling.
    */
-  on429?: (retryAfterHeader: string | null) => ProviderAdapter | null | Promise<ProviderAdapter | null>;
+  on429?: (
+    retryAfterHeader: string | null,
+    responseHeaders?: Headers,
+  ) => ProviderAdapter | null | Promise<ProviderAdapter | null>;
   /** Opt-in same-target 429 policy (key-auth providers). When present, 429 replays on the SAME key before on429 rotation. */
   retryOn429Policy?: Required<RateLimitRetryPolicy> | null;
   /** Called when the bridged Responses stream completes (parity with runTurn / routed paths). */
@@ -579,7 +587,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
       }
       // 429 key-failover parity with web-search / normal routed path.
       while (prepared.response.status === 429 && deps.on429) {
-        const rotated = await deps.on429(prepared.response.headers.get("retry-after"));
+        const rotated = await deps.on429(prepared.response.headers.get("retry-after"), prepared.response.headers);
         if (!rotated) break;
         try { void prepared.response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
         adapter = rotated;

package/src/integrations/catalog-refresh.ts

@@ -10,7 +10,7 @@ import {
 /** Refresh only previously connected clients; a refused file never blocks its peers. */
 export async function refreshOwnedCatalogIntegrations(
   input: Omit<OwnedIntegrationRefreshInput, "clientId">,
-  clientIds: readonly IntegrationClientId[] = ["pi", "aside"],
+  clientIds: readonly IntegrationClientId[] = ["pi", "aside", "raycast"],
 ): Promise<OwnedIntegrationRefreshOutcome[]> {
   let models: Promise<readonly ExportModel[]> | undefined;
   const loadModels = () => models ??= Promise.resolve().then(() =>

package/src/integrations/merge.ts

@@ -20,18 +20,103 @@ function clone<T>(value: T): T {
   return value === undefined ? value : (JSON.parse(JSON.stringify(value)) as T);
 }
 
-/** Write `value` at `path`, creating intermediate objects. Returns a new document. */
+/**
+ * `[field=value]` addresses the ONE element of a sequence whose `field` equals
+ * `value`. Raycast keeps its providers as a YAML list, so the element is the
+ * smallest thing we can own there; an index would move under us the moment
+ * the user reordered their own entries. Any other segment is a plain key.
+ */
+const ARRAY_SELECTOR = /^\[([A-Za-z_][A-Za-z0-9_]*)=([^\]]+)\]$/u;
+
+export type PathSegment =
+  | { kind: "key"; key: string }
+  | { kind: "select"; field: string; value: string };
+
+export function parseSegment(raw: string): PathSegment {
+  const match = ARRAY_SELECTOR.exec(raw);
+  if (!match) return { kind: "key", key: raw };
+  return { kind: "select", field: match[1]!, value: match[2]! };
+}
+
+/**
+ * Thrown when a selector matches more than one element. Picking either one
+ * would silently rewrite an entry the user may have written; the writer maps
+ * this to an `unsafe` refusal instead.
+ */
+export class AmbiguousSelectorError extends Error {
+  constructor(field: string, value: string) {
+    super(`more than one entry has ${field}=${value}`);
+    this.name = "AmbiguousSelectorError";
+  }
+}
+
+/** The index of the element a selector names, -1 when none matches. */
+export function selectIndex(items: readonly unknown[], field: string, value: string): number {
+  const matches: number[] = [];
+  items.forEach((item, index) => {
+    if (isPlainRecord(item) && item[field] === value) matches.push(index);
+  });
+  if (matches.length > 1) throw new AmbiguousSelectorError(field, value);
+  return matches[0] ?? -1;
+}
+
+function assertNever(segment: never): never {
+  throw new Error(`unknown path segment ${JSON.stringify(segment)}`);
+}
+
+/**
+ * Write `value` at `path`, creating intermediate containers. Returns a new document.
+ *
+ * A `key` segment descends through a record, creating `{}` where the slot is
+ * absent or holds something else. A `select` segment descends through an
+ * array the same way, creating `[]`; a missing element is pushed, a matching
+ * one is replaced in place so the user's ordering survives.
+ */
 export function setPath(doc: unknown, path: readonly string[], value: unknown): unknown {
   if (path.length === 0) throw new Error("setPath needs a non-empty path");
-  const root: Record<string, unknown> = isPlainRecord(doc) ? clone(doc) : {};
-  let cursor = root;
-  for (const key of path.slice(0, -1)) {
-    const next = cursor[key];
-    if (!isPlainRecord(next)) cursor[key] = {};
-    cursor = cursor[key] as Record<string, unknown>;
+  /*
+   * `parent[slot]` is the position the segment just consumed addresses. The
+   * root sits in a one-key holder so the first segment needs no special case:
+   * a non-record document is replaced by `{}` exactly as before.
+   */
+  const holder: Record<string, unknown> = { root: isPlainRecord(doc) ? clone(doc) : {} };
+  let parent: Record<string, unknown> | unknown[] = holder;
+  let slot: string | number = "root";
+  const read = (): unknown => (Array.isArray(parent) ? parent[slot as number] : parent[slot as string]);
+  const write = (next: unknown): void => {
+    if (Array.isArray(parent)) parent[slot as number] = next;
+    else parent[slot as string] = next;
+  };
+  for (const raw of path) {
+    const segment = parseSegment(raw);
+    switch (segment.kind) {
+      case "key": {
+        if (!isPlainRecord(read())) write({});
+        parent = read() as Record<string, unknown>;
+        slot = segment.key;
+        break;
+      }
+      case "select": {
+        if (!Array.isArray(read())) write([]);
+        const items = read() as unknown[];
+        const found = selectIndex(items, segment.field, segment.value);
+        parent = items;
+        if (found >= 0) {
+          slot = found;
+        } else {
+          // Seed the element so the selector stays true for whatever a deeper
+          // segment writes into it; a last-position select replaces it whole.
+          slot = items.length;
+          items.push({ [segment.field]: segment.value });
+        }
+        break;
+      }
+      default:
+        return assertNever(segment);
+    }
   }
-  cursor[path[path.length - 1]!] = clone(value);
-  return root;
+  write(clone(value));
+  return holder.root;
 }
 
 /**
@@ -54,27 +139,53 @@ export function deletePath(
 ): { doc: unknown; removed: boolean } {
   if (!isPlainRecord(doc) || path.length === 0) return { doc, removed: false };
   const root = clone(doc) as Record<string, unknown>;
-  const chain: Record<string, unknown>[] = [root];
-  let cursor: Record<string, unknown> = root;
-  for (const key of path.slice(0, -1)) {
-    const next = cursor[key];
-    if (!isPlainRecord(next)) return { doc: root, removed: false };
-    cursor = next;
-    chain.push(cursor);
+  // `chain[i]` is the container segment `i` is resolved against; `slots[i]` is
+  // the key or index it resolved to, so the prune walk can delete by position.
+  const chain: (Record<string, unknown> | unknown[])[] = [root];
+  const slots: (string | number)[] = [];
+  for (let depth = 0; depth < path.length; depth += 1) {
+    const container = chain[depth]!;
+    const segment = parseSegment(path[depth]!);
+    switch (segment.kind) {
+      case "key": {
+        if (Array.isArray(container) || !(segment.key in container)) return { doc: root, removed: false };
+        slots.push(segment.key);
+        chain.push(container[segment.key] as Record<string, unknown> | unknown[]);
+        break;
+      }
+      case "select": {
+        if (!Array.isArray(container)) return { doc: root, removed: false };
+        const found = selectIndex(container, segment.field, segment.value);
+        if (found < 0) return { doc: root, removed: false };
+        slots.push(found);
+        chain.push(container[found] as Record<string, unknown> | unknown[]);
+        break;
+      }
+      default:
+        return assertNever(segment);
+    }
+    // Only the leaf may be a scalar; walking into one means the path is absent.
+    if (depth < path.length - 1) {
+      const next = chain[depth + 1];
+      if (!isPlainRecord(next) && !Array.isArray(next)) return { doc: root, removed: false };
+    }
   }
-  const leaf = path[path.length - 1]!;
-  if (!(leaf in cursor)) return { doc: root, removed: false };
-  delete cursor[leaf];
+  const remove = (container: Record<string, unknown> | unknown[], slot: string | number): void => {
+    if (Array.isArray(container)) container.splice(slot as number, 1);
+    else delete container[slot as string];
+  };
+  remove(chain[path.length - 1]!, slots[path.length - 1]!);
   /*
    * Walk back up, pruning only containers this deletion emptied AND that we
    * created. The root is never pruned.
    */
-  for (let index = chain.length - 1; index >= 1; index -= 1) {
+  for (let index = path.length - 1; index >= 1; index -= 1) {
     const container = chain[index]!;
-    if (Object.keys(container).length > 0) break;
+    const empty = Array.isArray(container) ? container.length === 0 : Object.keys(container).length === 0;
+    if (!empty) break;
     const containerPath = path.slice(0, index).join("\u0000");
     if (!createdContainers.has(containerPath)) break;
-    delete chain[index - 1]![path[index - 1]!];
+    remove(chain[index - 1]!, slots[index - 1]!);
   }
   return { doc: root, removed: true };
 }
@@ -121,9 +232,31 @@ export function createdContainerPaths(
   for (const fragment of contribution.fragments) {
     let cursor: unknown = doc;
     for (let depth = 0; depth < fragment.path.length - 1; depth += 1) {
-      const key = fragment.path[depth]!;
-      const next = isPlainRecord(cursor) ? cursor[key] : undefined;
-      if (!isPlainRecord(next)) {
+      const segment = parseSegment(fragment.path[depth]!);
+      let next: unknown;
+      switch (segment.kind) {
+        case "key": {
+          /*
+           * The container this key must hold is whatever the NEXT segment
+           * descends into: an array when that is a selector, a record
+           * otherwise. Either one is ours to create when absent.
+           */
+          const nextSegment = parseSegment(fragment.path[depth + 1]!);
+          next = isPlainRecord(cursor) ? cursor[segment.key] : undefined;
+          if (nextSegment.kind === "select" ? !Array.isArray(next) : !isPlainRecord(next)) next = undefined;
+          break;
+        }
+        case "select": {
+          // A selector that matches nothing means setPath will push the element.
+          next = Array.isArray(cursor)
+            ? cursor[selectIndex(cursor, segment.field, segment.value)]
+            : undefined;
+          break;
+        }
+        default:
+          return assertNever(segment);
+      }
+      if (next === undefined) {
         created.add(fragment.path.slice(0, depth + 1).join("\u0000"));
         cursor = undefined;
         continue;