@bitkyc08/opencodex 2.94.0 → 2.96.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (289) hide show
  1. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  2. package/gui/dist/assets/App-bwugJRKn.js +58 -0
  3. package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-BOPQyDbH.js} +1 -1
  4. package/gui/dist/assets/index-ebuVUtB7.js +94 -0
  5. package/gui/dist/assets/quota-summary-6HsrHQAy.js +1 -0
  6. package/gui/dist/index.html +1 -1
  7. package/package.json +1 -1
  8. package/src/adapters/anthropic.ts +10 -3
  9. package/src/adapters/command-code-project-context.ts +3 -3
  10. package/src/adapters/kiro/adapter.ts +4 -1
  11. package/src/adapters/kiro/stream.ts +1 -0
  12. package/src/adapters/kiro-events.ts +1 -0
  13. package/src/adapters/ollama-native.ts +10 -6
  14. package/src/adapters/openai-chat/messages.ts +20 -7
  15. package/src/adapters/openai-chat/passthrough.ts +4 -2
  16. package/src/adapters/openai-chat/single-system.ts +24 -0
  17. package/src/adapters/openai-responses/canonical-forward.ts +50 -13
  18. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  19. package/src/adapters/openai-responses/passthrough.ts +45 -11
  20. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  21. package/src/adapters/openai-responses/request-strips.ts +23 -4
  22. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  23. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  24. package/src/adapters/openai-responses/transport.ts +17 -26
  25. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  26. package/src/adapters/qoder/adapter.ts +1 -1
  27. package/src/adapters/qoder/image-input.ts +5 -2
  28. package/src/adapters/routed-agent-messages.ts +3 -0
  29. package/src/adapters/xai-web-search.ts +6 -3
  30. package/src/adapters/zed-additional-tools.ts +7 -7
  31. package/src/adapters/zed.ts +1 -6
  32. package/src/advisor/consult.ts +22 -10
  33. package/src/advisor/runtime.ts +10 -4
  34. package/src/bridge/max-output-completion.ts +41 -0
  35. package/src/bridge/response-json.ts +9 -4
  36. package/src/bridge/sse.ts +13 -2
  37. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
  38. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  39. package/src/claude/compatibility.ts +5 -1
  40. package/src/claude/desktop-3p.ts +27 -6
  41. package/src/claude/desktop-model-visibility.ts +141 -0
  42. package/src/claude/desktop-remote-store-io.ts +8 -8
  43. package/src/claude/inbound-content-options.ts +11 -1
  44. package/src/claude/intercept/proxy-auth.ts +16 -16
  45. package/src/cli/account-main.ts +3 -2
  46. package/src/cli/agent.ts +44 -15
  47. package/src/cli/capabilities-agents-routing.ts +9 -0
  48. package/src/cli/capabilities-provider-models.ts +7 -0
  49. package/src/cli/chatgpt-command.ts +1 -1
  50. package/src/cli/codex-launcher.ts +20 -8
  51. package/src/cli/codex-shim-autorestore.ts +19 -1
  52. package/src/cli/dispatch.ts +6 -6
  53. package/src/cli/doctor.ts +5 -5
  54. package/src/cli/ensure-desired-integrations.ts +4 -3
  55. package/src/cli/index.ts +8 -10
  56. package/src/cli/init.ts +2 -2
  57. package/src/cli/internal-command.ts +29 -2
  58. package/src/cli/message-command.ts +2 -1
  59. package/src/cli/message-mcp-command.ts +29 -0
  60. package/src/cli/provider-cc-switch-import.ts +185 -0
  61. package/src/cli/provider.ts +5 -0
  62. package/src/cli/registry.ts +2 -1
  63. package/src/cli/restart-scope.ts +2 -2
  64. package/src/cli/root.ts +6 -6
  65. package/src/cli/stop-approval.ts +15 -1
  66. package/src/cli/v2.ts +69 -19
  67. package/src/client/machine-api.ts +2 -2
  68. package/src/clients/config-export.ts +14 -3
  69. package/src/codex/account-cooldown-response.ts +18 -0
  70. package/src/codex/account-store.ts +1 -0
  71. package/src/codex/app-server-restart-service.ts +2 -2
  72. package/src/codex/auth-api/login-flow.ts +2 -2
  73. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  74. package/src/codex/auth-context-provider.ts +15 -0
  75. package/src/codex/auth-context.ts +14 -23
  76. package/src/codex/catalog/bundled.ts +10 -3
  77. package/src/codex/catalog/metadata.ts +4 -5
  78. package/src/codex/catalog/native-omission.ts +28 -0
  79. package/src/codex/catalog/native-template.ts +58 -0
  80. package/src/codex/catalog/parsing.ts +3 -29
  81. package/src/codex/catalog/provider-models.ts +2 -1
  82. package/src/codex/catalog/retained-sync.ts +15 -5
  83. package/src/codex/catalog/write-audit.ts +18 -18
  84. package/src/codex/cli-install-provenance.ts +46 -45
  85. package/src/codex/cli-update-artifacts.ts +8 -6
  86. package/src/codex/cli-update-job-store-windows.ts +99 -27
  87. package/src/codex/cli-update-job-worker.ts +3 -11
  88. package/src/codex/cli-update-recovery.ts +54 -8
  89. package/src/codex/cli-update-selection-gate.ts +74 -4
  90. package/src/codex/cli-windows-plan-provenance.ts +37 -19
  91. package/src/codex/codex-home-owner.ts +9 -8
  92. package/src/codex/convergence.ts +13 -3
  93. package/src/codex/coordinator-doctor.ts +14 -8
  94. package/src/codex/desktop-app/handoff.ts +1 -1
  95. package/src/codex/desktop-app-restart.ts +11 -1
  96. package/src/codex/exec-boundary.ts +26 -5
  97. package/src/codex/forward-transport-headers.ts +33 -33
  98. package/src/codex/history-provider.ts +11 -10
  99. package/src/codex/inject/bounded-config-reader.ts +14 -13
  100. package/src/codex/installation-id.ts +72 -0
  101. package/src/codex/main-account.ts +6 -6
  102. package/src/codex/native-main-lock-file.ts +13 -12
  103. package/src/codex/native-residue.ts +18 -14
  104. package/src/codex/orca-auth-source.ts +8 -7
  105. package/src/codex/quota-types.ts +5 -0
  106. package/src/codex/quota.ts +49 -7
  107. package/src/codex/role-auto-assign.ts +50 -26
  108. package/src/codex/role-capability.ts +160 -0
  109. package/src/codex/role-sizing.ts +24 -6
  110. package/src/codex/routing/cooldown-math.ts +3 -2
  111. package/src/codex/runtime.ts +43 -3
  112. package/src/codex/shim-fingerprint.ts +11 -9
  113. package/src/codex/shim-inspect.ts +3 -2
  114. package/src/codex/shim-restore-lock.ts +11 -14
  115. package/src/codex/shim-state-file.ts +22 -14
  116. package/src/codex/shim-wrapper-write.ts +7 -6
  117. package/src/codex/shim.ts +25 -2
  118. package/src/codex/transition-state.ts +5 -4
  119. package/src/combos/failover.ts +43 -4
  120. package/src/config/atomic-write.ts +38 -7
  121. package/src/config/diagnostics.ts +3 -0
  122. package/src/config/initialize.ts +6 -6
  123. package/src/config/load-degrade.ts +2 -0
  124. package/src/config/process-state.ts +23 -5
  125. package/src/config/salvage.ts +1 -0
  126. package/src/config/schema/config-schema.ts +29 -1
  127. package/src/config/schema/leaf-validators.ts +7 -0
  128. package/src/config/schema/workflow-budget.ts +43 -0
  129. package/src/config/tracked-runtime-inspection.ts +188 -0
  130. package/src/generated/compatibility-version.json +380 -244
  131. package/src/grok/sync.ts +10 -1
  132. package/src/integrations/aside-profile-context.ts +1 -1
  133. package/src/integrations/droid-settings.ts +4 -4
  134. package/src/integrations/hermes-profiles.ts +3 -3
  135. package/src/lib/bounded-file-read.ts +3 -9
  136. package/src/lib/bun-runtime-preflight.ts +9 -8
  137. package/src/lib/file-identity.ts +15 -0
  138. package/src/lib/local-chat-completion.ts +8 -6
  139. package/src/lib/local-destinations.ts +32 -3
  140. package/src/lib/redact-folding.ts +9 -0
  141. package/src/lib/spend-pool-alias-validation.ts +6 -6
  142. package/src/lib/state-store-registrations.ts +2 -0
  143. package/src/lib/test-home-guard.ts +37 -9
  144. package/src/lib/windows-secret-acl.ts +49 -31
  145. package/src/lib/workflow-budget-config.ts +39 -0
  146. package/src/local-credentials/generation.ts +6 -2
  147. package/src/local-credentials/inventory.ts +132 -8
  148. package/src/messaging/mcp-queue-rpc.ts +102 -0
  149. package/src/messaging/mcp-queue-server.ts +42 -0
  150. package/src/messaging/mcp-queue-tools.ts +39 -0
  151. package/src/messaging/remote-forward-failure.ts +35 -0
  152. package/src/messaging/remote-ports.ts +27 -5
  153. package/src/messaging/remote-process.ts +30 -4
  154. package/src/messaging/remote-tunnels.ts +80 -15
  155. package/src/oauth/anthropic-identity.ts +2 -6
  156. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  157. package/src/oauth/google-antigravity.ts +23 -10
  158. package/src/oauth/index.ts +7 -0
  159. package/src/oauth/kiro-device-login.ts +87 -30
  160. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  161. package/src/oauth/store.ts +9 -7
  162. package/src/providers/account-quota-disk.ts +18 -4
  163. package/src/providers/anthropic-subscription.ts +25 -0
  164. package/src/providers/cc-switch-import-bytes.ts +991 -0
  165. package/src/providers/cc-switch-import-source.ts +1083 -0
  166. package/src/providers/cc-switch-import.ts +942 -0
  167. package/src/providers/claude-cli-usage.ts +15 -67
  168. package/src/providers/derive.ts +6 -0
  169. package/src/providers/model-discovery-diagnostic.ts +4 -0
  170. package/src/providers/model-discovery.ts +4 -4
  171. package/src/providers/model-rename-fields.ts +2 -0
  172. package/src/providers/model-rename-migration.ts +41 -6
  173. package/src/providers/quota/anthropic-decision-windows.ts +5 -19
  174. package/src/providers/quota/anthropic-usage-windows.ts +55 -0
  175. package/src/providers/quota/report-cache.ts +17 -4
  176. package/src/providers/quota.ts +2 -2
  177. package/src/providers/reasoning-metadata.ts +31 -15
  178. package/src/providers/registry/entries-core.ts +1 -1
  179. package/src/providers/registry/entries-extended.ts +1 -1
  180. package/src/providers/registry/model-ids.ts +1 -0
  181. package/src/providers/registry/model-seeds.ts +2 -1
  182. package/src/providers/registry/types.ts +3 -1
  183. package/src/providers/resolved-model-policy.ts +2 -2
  184. package/src/providers/routed-config.ts +2 -0
  185. package/src/providers/stale-model-roster-migration.ts +5 -1
  186. package/src/providers/xai-transport.ts +4 -4
  187. package/src/remote-control/workspace-codex-runtime.ts +2 -2
  188. package/src/remote-control/workspace-executor.ts +14 -13
  189. package/src/responses/custom-tool-compat.ts +2 -1
  190. package/src/responses/item-provenance.ts +79 -0
  191. package/src/responses/namespace-tool-compat.ts +21 -3
  192. package/src/responses/parser-tools.ts +1 -0
  193. package/src/responses/schema.ts +5 -2
  194. package/src/router.ts +21 -2
  195. package/src/routing/analytics.ts +3 -5
  196. package/src/routing/fallback-policy.ts +7 -3
  197. package/src/routing/health.ts +5 -3
  198. package/src/routing/history/build-file.ts +6 -0
  199. package/src/routing/history/indexer.ts +158 -31
  200. package/src/routing/history/ingest.ts +1 -1
  201. package/src/routing/history/integrity.ts +208 -0
  202. package/src/routing/history/rebuild-job.ts +20 -6
  203. package/src/routing/history/rebuild-protocol.ts +2 -1
  204. package/src/routing/history/rebuild-worker.ts +18 -0
  205. package/src/routing/history/sqlite-errors.ts +9 -0
  206. package/src/server/admission-model-scope.ts +21 -4
  207. package/src/server/advisor-admission-scope.ts +29 -0
  208. package/src/server/audio-dictation.ts +3 -0
  209. package/src/server/audio-live.ts +8 -2
  210. package/src/server/audio-upstream.ts +2 -0
  211. package/src/server/auth-cors.ts +5 -2
  212. package/src/server/capture-admission-policy.ts +91 -0
  213. package/src/server/chat-completions.ts +33 -7
  214. package/src/server/claude-messages.ts +93 -2
  215. package/src/server/codex-model-list.ts +2 -1
  216. package/src/server/configured-credentials.ts +5 -0
  217. package/src/server/context-history.ts +9 -6
  218. package/src/server/images.ts +14 -5
  219. package/src/server/index/live-sideband.ts +16 -2
  220. package/src/server/index/serve-options.ts +13 -2
  221. package/src/server/index/websocket-handler.ts +4 -1
  222. package/src/server/live.ts +30 -5
  223. package/src/server/management/agent-settings-routes.ts +34 -9
  224. package/src/server/management/codex-agent-role-routes.ts +1 -0
  225. package/src/server/management/codex-role-auto-assign.ts +50 -6
  226. package/src/server/management/config-routes.ts +15 -4
  227. package/src/server/management/context.ts +3 -0
  228. package/src/server/management/native-integration-routes.ts +22 -0
  229. package/src/server/management/oauth-account-routes.ts +20 -4
  230. package/src/server/management/provider-overwrite-carry.ts +21 -0
  231. package/src/server/management/provider-routes.ts +3 -1
  232. package/src/server/management/route-registry.ts +2 -0
  233. package/src/server/management/shared.ts +17 -1
  234. package/src/server/management/workflow-budget-routes.ts +70 -3
  235. package/src/server/messages-native-eligibility.ts +6 -5
  236. package/src/server/messages-native-scope.ts +6 -1
  237. package/src/server/messages-shared.ts +57 -17
  238. package/src/server/persistent-gui-session.ts +4 -4
  239. package/src/server/request-log.ts +30 -2
  240. package/src/server/responses/adapter-delivery.ts +4 -0
  241. package/src/server/responses/adapter-dispatch.ts +5 -0
  242. package/src/server/responses/advisor-plan-slot.ts +4 -0
  243. package/src/server/responses/advisor-slot.ts +73 -46
  244. package/src/server/responses/codex-auth-error.ts +9 -1
  245. package/src/server/responses/combo-required-tool-contract.ts +39 -0
  246. package/src/server/responses/compact.ts +41 -20
  247. package/src/server/responses/core-codex-account.ts +17 -6
  248. package/src/server/responses/core-combo-failure.ts +2 -0
  249. package/src/server/responses/core-combo.ts +70 -5
  250. package/src/server/responses/core-lifetime.ts +4 -0
  251. package/src/server/responses/core-normalize.ts +7 -1
  252. package/src/server/responses/core-options.ts +9 -0
  253. package/src/server/responses/core.ts +2 -0
  254. package/src/server/responses/jev-model-invoke.ts +4 -2
  255. package/src/server/responses/passthrough-build-error.ts +36 -0
  256. package/src/server/responses/passthrough-dispatch.ts +10 -24
  257. package/src/server/responses/policy-fallback.ts +2 -0
  258. package/src/server/responses/request-prepare.ts +4 -5
  259. package/src/server/responses/request-send-budget.ts +2 -1
  260. package/src/server/responses/request-sidecar-auth.ts +4 -1
  261. package/src/server/responses/request-transport.ts +2 -3
  262. package/src/server/responses/run-turn-execution.ts +4 -0
  263. package/src/server/responses/sidecar-execution.ts +21 -5
  264. package/src/server/responses-snapshot-repair.ts +18 -4
  265. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  266. package/src/server/search.ts +13 -4
  267. package/src/server/workflow-refusal.ts +2 -1
  268. package/src/server/ws-bridge.ts +5 -2
  269. package/src/service/state-lock.ts +12 -11
  270. package/src/service-manager-probe.ts +53 -8
  271. package/src/types/admission-policy.ts +13 -0
  272. package/src/types/config.ts +25 -0
  273. package/src/types/provider.ts +10 -0
  274. package/src/types/request.ts +7 -0
  275. package/src/types.ts +1 -0
  276. package/src/update/job.ts +20 -0
  277. package/src/update/worker-launch.ts +71 -1
  278. package/src/usage/log.ts +25 -4
  279. package/src/vision/describe.ts +4 -7
  280. package/src/vision/index.ts +2 -0
  281. package/src/vision/plan.ts +4 -0
  282. package/src/vision/routed-describe.ts +38 -23
  283. package/src/web-search/executor.ts +4 -7
  284. package/src/web-search/loop.ts +104 -9
  285. package/src/web-search/parse.ts +10 -2
  286. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  287. package/gui/dist/assets/App-DmvwlhQq.js +0 -58
  288. package/gui/dist/assets/index-3EPO_KbX.js +0 -94
  289. package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
@@ -9,8 +9,9 @@ import {
9
9
  readSync,
10
10
  realpathSync,
11
11
  statSync,
12
- type Stats,
12
+ type BigIntStats,
13
13
  } from "node:fs";
14
+ import { sameFileIdentity, statTimeMs } from "../lib/file-identity";
14
15
  import { posix, win32 } from "node:path";
15
16
  import { getConfigDir } from "../config";
16
17
  import { parseStrictSemver } from "../lib/strict-semver";
@@ -503,10 +504,10 @@ function readBoundedFile(
503
504
  // injected stat/read behavior.
504
505
  const inspectLexical = deps.lstat
505
506
  ?? (deps.stat === undefined && deps.readFile === undefined ? lstatSync : null);
506
- let lexicalBefore: ReturnType<typeof lstatSync> | null = null;
507
+ let lexicalBefore: BigIntStats | null = null;
507
508
  if (inspectLexical) {
508
509
  try {
509
- lexicalBefore = inspectLexical(path);
510
+ lexicalBefore = inspectLexical(path, { bigint: true });
510
511
  if (lexicalBefore.isSymbolicLink() || !lexicalBefore.isFile()) return null;
511
512
  } catch {
512
513
  return null;
@@ -520,9 +521,9 @@ function readBoundedFile(
520
521
  ? fsConstants.O_RDONLY
521
522
  : fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW | fsConstants.O_NONBLOCK;
522
523
  fd = openSync(path, flags);
523
- const before = fstatSync(fd);
524
+ const before = fstatSync(fd, { bigint: true });
524
525
  if (!before.isFile() || before.size > maxBytes) return null;
525
- const bytes = Buffer.allocUnsafe(before.size);
526
+ const bytes = Buffer.allocUnsafe(Number(before.size));
526
527
  let offset = 0;
527
528
  while (offset < bytes.length) {
528
529
  const count = readSync(fd, bytes, offset, bytes.length - offset, offset);
@@ -531,16 +532,16 @@ function readBoundedFile(
531
532
  }
532
533
  const extra = Buffer.allocUnsafe(1);
533
534
  if (readSync(fd, extra, 0, 1, offset) !== 0) return null;
534
- const after = fstatSync(fd);
535
- const lexicalAfter = inspectLexical ? inspectLexical(path) : null;
535
+ const after = fstatSync(fd, { bigint: true });
536
+ const lexicalAfter = inspectLexical ? inspectLexical(path, { bigint: true }) : null;
536
537
  if (lexicalAfter?.isSymbolicLink()) return null;
537
- if (before.dev !== after.dev || before.ino !== after.ino || before.size !== after.size
538
- || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs
538
+ if (!sameFileIdentity(before, after) || before.size !== after.size
539
+ || statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs) || statTimeMs(before.ctimeNs) !== statTimeMs(after.ctimeNs)
539
540
  || (lexicalBefore !== null && (lexicalAfter === null || lexicalAfter.isSymbolicLink()
540
- || lexicalBefore.dev !== before.dev || lexicalBefore.ino !== before.ino
541
- || lexicalAfter.dev !== after.dev || lexicalAfter.ino !== after.ino
542
- || lexicalAfter.size !== after.size || lexicalAfter.mtimeMs !== after.mtimeMs
543
- || lexicalAfter.ctimeMs !== after.ctimeMs))) return null;
541
+ || !sameFileIdentity(lexicalBefore, before)
542
+ || !sameFileIdentity(lexicalAfter, after)
543
+ || lexicalAfter.size !== after.size || statTimeMs(lexicalAfter.mtimeNs) !== statTimeMs(after.mtimeNs)
544
+ || statTimeMs(lexicalAfter.ctimeNs) !== statTimeMs(after.ctimeNs)))) return null;
544
545
  return bytes;
545
546
  } catch {
546
547
  return null;
@@ -552,20 +553,19 @@ function readBoundedFile(
552
553
  const stat = deps.stat;
553
554
  const read = deps.readFile;
554
555
  try {
555
- const before = stat(path);
556
+ const before = stat(path, { bigint: true });
556
557
  if (!before.isFile() || before.size > maxBytes) return null;
557
558
  const bytes = read(path);
558
- const after = stat(path);
559
- const lexicalAfter = inspectLexical ? inspectLexical(path) : null;
559
+ const after = stat(path, { bigint: true });
560
+ const lexicalAfter = inspectLexical ? inspectLexical(path, { bigint: true }) : null;
560
561
  if (
561
- bytes.byteLength !== before.size
562
- || before.dev !== after.dev
563
- || before.ino !== after.ino
562
+ BigInt(bytes.byteLength) !== before.size
563
+ || !sameFileIdentity(before, after)
564
564
  || before.size !== after.size
565
- || before.mtimeMs !== after.mtimeMs
565
+ || statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs)
566
566
  || (lexicalBefore !== null && (lexicalAfter === null || lexicalAfter.isSymbolicLink()
567
- || lexicalBefore.dev !== before.dev || lexicalBefore.ino !== before.ino
568
- || lexicalAfter.dev !== after.dev || lexicalAfter.ino !== after.ino))
567
+ || !sameFileIdentity(lexicalBefore, before)
568
+ || !sameFileIdentity(lexicalAfter, after)))
569
569
  ) return null;
570
570
  return bytes;
571
571
  } catch {
@@ -830,16 +830,16 @@ function observeHeldFileSet(
830
830
  const read = deps.readFile;
831
831
  if (!stat || !read) return null;
832
832
  const results = new Map<string, ObservedContentFile>();
833
- const identities: { before: Stats; req: InstallContentFile }[] = [];
833
+ const identities: { before: BigIntStats; req: InstallContentFile }[] = [];
834
834
  try {
835
835
  for (const req of requests) {
836
- const before = stat(req.path);
836
+ const before = stat(req.path, { bigint: true });
837
837
  if (!before.isFile() || before.size > req.maxBytes) return null;
838
838
  const bytes = read(req.path);
839
- const after = stat(req.path);
840
- if (bytes.byteLength !== before.size
841
- || before.dev !== after.dev || before.ino !== after.ino
842
- || before.size !== after.size || before.mtimeMs !== after.mtimeMs) return null;
839
+ const after = stat(req.path, { bigint: true });
840
+ if (BigInt(bytes.byteLength) !== before.size
841
+ || !sameFileIdentity(before, after)
842
+ || before.size !== after.size || statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs)) return null;
843
843
  identities.push({ before, req });
844
844
  results.set(req.role, {
845
845
  digest: sha256(fileContentDomain(req.role), bytes),
@@ -848,9 +848,9 @@ function observeHeldFileSet(
848
848
  }
849
849
  // A replacement that slipped in after a file's own read still failed.
850
850
  for (const { before, req } of identities) {
851
- const now = stat(req.path);
852
- if (before.dev !== now.dev || before.ino !== now.ino
853
- || before.size !== now.size || before.mtimeMs !== now.mtimeMs) return null;
851
+ const now = stat(req.path, { bigint: true });
852
+ if (!sameFileIdentity(before, now)
853
+ || before.size !== now.size || statTimeMs(before.mtimeNs) !== statTimeMs(now.mtimeNs)) return null;
854
854
  }
855
855
  if (finalize && !finalize()) return null;
856
856
  return results;
@@ -858,7 +858,7 @@ function observeHeldFileSet(
858
858
  return null;
859
859
  }
860
860
  }
861
- const held: { fd: number; req: InstallContentFile; before: Stats }[] = [];
861
+ const held: { fd: number; req: InstallContentFile; before: BigIntStats }[] = [];
862
862
  const openedFds: number[] = [];
863
863
  try {
864
864
  const flags = process.platform === "win32"
@@ -870,7 +870,7 @@ function observeHeldFileSet(
870
870
  // The descriptor joins the close set before any check that can bail, so
871
871
  // an fstat failure or a refused type/size cannot leak it.
872
872
  openedFds.push(fd);
873
- const before = fstatSync(fd);
873
+ const before = fstatSync(fd, { bigint: true });
874
874
  // O_NONBLOCK keeps a FIFO open nonblocking, so the type check must come
875
875
  // first: anything that is not a regular file is refused before a read.
876
876
  if (!before.isFile() || before.size > req.maxBytes) return null;
@@ -881,11 +881,12 @@ function observeHeldFileSet(
881
881
  const hasher = createHash("sha256")
882
882
  .update(fileContentDomain(req.role), "utf8")
883
883
  .update("\0", "utf8");
884
- const bytes = keepBytes(req.role) ? Buffer.allocUnsafe(before.size) : null;
885
- const chunk = Buffer.allocUnsafe(Math.max(1, Math.min(HELD_READ_CHUNK_BYTES, before.size)));
884
+ const size = Number(before.size);
885
+ const bytes = keepBytes(req.role) ? Buffer.allocUnsafe(size) : null;
886
+ const chunk = Buffer.allocUnsafe(Math.max(1, Math.min(HELD_READ_CHUNK_BYTES, size)));
886
887
  let offset = 0;
887
- while (offset < before.size) {
888
- const count = readSync(fd, chunk, 0, Math.min(chunk.length, before.size - offset), offset);
888
+ while (offset < size) {
889
+ const count = readSync(fd, chunk, 0, Math.min(chunk.length, size - offset), offset);
889
890
  if (count <= 0) return null;
890
891
  hasher.update(chunk.subarray(0, count));
891
892
  if (bytes) chunk.copy(bytes, offset, 0, count);
@@ -896,15 +897,15 @@ function observeHeldFileSet(
896
897
  results.set(req.role, { digest: hasher.digest("hex"), bytes });
897
898
  }
898
899
  for (const { fd, req, before } of held) {
899
- const after = fstatSync(fd);
900
- const lexical = lstatSync(req.path);
901
- const followed = statSync(req.path);
902
- if (before.dev !== after.dev || before.ino !== after.ino
903
- || before.size !== after.size || before.mtimeMs !== after.mtimeMs
904
- || before.ctimeMs !== after.ctimeMs
900
+ const after = fstatSync(fd, { bigint: true });
901
+ const lexical = lstatSync(req.path, { bigint: true });
902
+ const followed = statSync(req.path, { bigint: true });
903
+ if (!sameFileIdentity(before, after)
904
+ || before.size !== after.size || statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs)
905
+ || statTimeMs(before.ctimeNs) !== statTimeMs(after.ctimeNs)
905
906
  || lexical.isSymbolicLink() || !lexical.isFile()
906
- || lexical.dev !== before.dev || lexical.ino !== before.ino
907
- || followed.dev !== before.dev || followed.ino !== before.ino) return null;
907
+ || !sameFileIdentity(lexical, before)
908
+ || !sameFileIdentity(followed, before)) return null;
908
909
  }
909
910
  if (finalize && !finalize()) return null;
910
911
  return results;
@@ -4,6 +4,8 @@ import { closeSync, constants, createReadStream, fstatSync, lstatSync, openSync
4
4
  import { Readable, Transform } from "node:stream";
5
5
  import { pipeline } from "node:stream/promises";
6
6
  import { parseStrictSemver } from "../lib/strict-semver";
7
+ import { sameFileIdentity, statTimeMs } from "../lib/file-identity";
8
+ import type { BigIntStats } from "node:fs";
7
9
  import { codexCliContentFileDigest, codexCliContentSetDigest, codexCliPlatformBacking } from "./cli-install-provenance";
8
10
  import { windowsArchivePathValidator, WINDOWS_CODEX_HEADER_BYTES, WINDOWS_CODEX_NATIVE_MEMBER } from "./cli-update-windows-paths";
9
11
 
@@ -105,10 +107,10 @@ export async function verifyCodexCliArchive(source: Buffer | string, target: Cod
105
107
  options: { windowsX64?: boolean } = {}): Promise<CodexArchiveFiles> {
106
108
  if (!isSha512Integrity(target.integrity)) throw new Error("artifact_integrity_mismatch");
107
109
  let fd: number | undefined;
108
- let before: ReturnType<typeof fstatSync> | undefined;
110
+ let before: BigIntStats | undefined;
109
111
  if (typeof source === "string") {
110
112
  fd = openSync(source, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
111
- try { before = fstatSync(fd); } catch (error) { closeSync(fd); throw error; }
113
+ try { before = fstatSync(fd, { bigint: true }); } catch (error) { closeSync(fd); throw error; }
112
114
  if (!before.isFile() || before.size > MAX_CODEX_ARCHIVE_BYTES) { closeSync(fd); throw new Error("artifact_file_unverified"); }
113
115
  }
114
116
  let input: Readable;
@@ -208,10 +210,10 @@ export async function verifyCodexCliArchive(source: Buffer | string, target: Cod
208
210
  if (!ended || trailer < 512 || current || padding || headerSize) throw new Error("artifact_tar_truncated");
209
211
  if ("sha512-" + archiveHash.digest("base64") !== target.integrity) throw new Error("artifact_integrity_mismatch");
210
212
  if (fd !== undefined && before && typeof source === "string") {
211
- const after = fstatSync(fd), lexical = lstatSync(source);
212
- if (before.dev !== after.dev || before.ino !== after.ino || before.size !== after.size
213
- || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs || lexical.isSymbolicLink()
214
- || lexical.dev !== before.dev || lexical.ino !== before.ino) throw new Error("artifact_file_changed");
213
+ const after = fstatSync(fd, { bigint: true }), lexical = lstatSync(source, { bigint: true });
214
+ if (!sameFileIdentity(before, after) || before.size !== after.size
215
+ || statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs) || statTimeMs(before.ctimeNs) !== statTimeMs(after.ctimeNs) || lexical.isSymbolicLink()
216
+ || !sameFileIdentity(lexical, before)) throw new Error("artifact_file_changed");
215
217
  }
216
218
  verified = true;
217
219
  } finally {
@@ -686,83 +686,155 @@ export interface WindowsCliRecoveryIo {
686
686
  withProofHandle<T>(name: string, run: (handle: bigint) => T): T;
687
687
  write(name: string, pendingName: string, body: string, adoptPending?: boolean): void;
688
688
  }
689
+ export interface WindowsCliRecoveryAsyncIo {
690
+ readonly dir: string;
691
+ names(): string[];
692
+ read(name: string): Promise<string>;
693
+ write(name: string, pendingName: string, body: string, adoptPending?: boolean): Promise<void>;
694
+ }
695
+ type RecoveryStoreStep = { kind: "acl"; entries: readonly WindowsAclEntry[] }
696
+ | { kind: "harden"; path: string; directory: boolean };
697
+ type RecoveryStoreSteps<T> = Generator<RecoveryStoreStep, T, void>;
698
+ function runRecoveryStoreSteps<T>(steps: RecoveryStoreSteps<T>): T {
699
+ let step = steps.next();
700
+ while (!step.done) {
701
+ try {
702
+ const effect = step.value;
703
+ if (effect.kind === "acl") {
704
+ if (!verifyWindowsEntriesAcl(aclTargets(effect.entries), ACL_VERIFY_TIMEOUT_MS)) throw unsafe();
705
+ } else if (effect.directory) hardenSecretDir(toNamespacedPath(effect.path), { required: true });
706
+ else hardenSecretPath(toNamespacedPath(effect.path), { required: true });
707
+ } catch (error) { step = steps.throw(error); continue; }
708
+ step = steps.next();
709
+ }
710
+ return step.value;
711
+ }
712
+ async function runRecoveryStoreStepsAsync<T>(steps: RecoveryStoreSteps<T>): Promise<T> {
713
+ let step = steps.next();
714
+ while (!step.done) {
715
+ try {
716
+ const effect = step.value;
717
+ if (effect.kind === "acl") await verifyAcl(effect.entries);
718
+ else if (effect.directory) await hardenSecretDirAsync(toNamespacedPath(effect.path), { required: true });
719
+ else await hardenSecretPathAsync(toNamespacedPath(effect.path), { required: true });
720
+ } catch (error) { step = steps.throw(error); continue; }
721
+ step = steps.next();
722
+ }
723
+ return step.value;
724
+ }
725
+ function openRecoveryContext(config: string): Ctx {
726
+ if (process.platform !== "win32" || process.arch !== "x64") throw unsafe();
727
+ assertNotRealHomeUnderTest(config);
728
+ const kernel = recoveryFfi.dlopen("kernel32.dll", KERNEL_SYMBOLS);
729
+ try { return { ffi: recoveryFfi, kernel, nt: recoveryFfi.dlopen("ntdll.dll", NT_SYMBOLS), pins: new PinSet() }; }
730
+ catch (error) { kernel.close(); throw error; }
731
+ }
689
732
  /** The shared recovery protocol uses the ledger's native ancestry, no-reparse,
690
733
  * identity, private-DACL and rename primitives at synchronous gate boundaries.
691
734
  * Restart publication may write an existing pinned store without creating it.
692
735
  */
693
736
  export function withWindowsCliRecoveryStore<T>(config: string, create: boolean, run: (io: WindowsCliRecoveryIo) => T, publish = false): T {
694
- if (process.platform !== "win32" || process.arch !== "x64") throw unsafe();
695
- assertNotRealHomeUnderTest(config);
696
- const kernel = recoveryFfi.dlopen("kernel32.dll", KERNEL_SYMBOLS);
697
- const nt = recoveryFfi.dlopen("ntdll.dll", NT_SYMBOLS);
698
- const ctx: Ctx = { ffi: recoveryFfi, kernel, nt, pins: new PinSet() };
699
- const verify = (entries: readonly WindowsAclEntry[]) => {
700
- if (!verifyWindowsEntriesAcl(aclTargets(entries), ACL_VERIFY_TIMEOUT_MS)) throw unsafe();
701
- };
737
+ const ctx = openRecoveryContext(config);
702
738
  try {
739
+ const io = runRecoveryStoreSteps(recoveryStoreSteps(ctx, config, create, publish));
740
+ return run({ dir: io.dir, names: io.names,
741
+ read: name => runRecoveryStoreSteps(io.read(name)),
742
+ withProofHandle: (name, use) => runRecoveryStoreSteps(io.withProofHandle(name, use)),
743
+ write: (name, pending, body, adopt) => runRecoveryStoreSteps(io.write(name, pending, body, adopt)),
744
+ });
745
+ } finally { ctx.pins.closeAll(ctx.kernel); ctx.nt.close(); ctx.kernel.close(); }
746
+ }
747
+
748
+ /** Parent admission awaits the same native protocol; pins outlive every ACL read. */
749
+ export async function withWindowsCliRecoveryStoreAsync<T>(config: string, create: boolean,
750
+ run: (io: WindowsCliRecoveryAsyncIo) => Promise<T>, publish = false): Promise<T> {
751
+ const ctx = openRecoveryContext(config);
752
+ try {
753
+ const io = await runRecoveryStoreStepsAsync(recoveryStoreSteps(ctx, config, create, publish));
754
+ return await run({ dir: io.dir, names: io.names,
755
+ read: name => runRecoveryStoreStepsAsync(io.read(name)),
756
+ write: (name, pending, body, adopt) => runRecoveryStoreStepsAsync(io.write(name, pending, body, adopt)),
757
+ });
758
+ } finally { ctx.pins.closeAll(ctx.kernel); ctx.nt.close(); ctx.kernel.close(); }
759
+ }
760
+
761
+ function* recoveryStoreSteps(ctx: Ctx, config: string, create: boolean, publish: boolean) {
762
+ const kernel = ctx.kernel;
703
763
  const chain = pinChain(ctx, config, ACCESS_DIR_PIN);
704
- verify(chain.map((entry, i) => ({ path: entry.path, directory: true,
705
- policy: i >= chain.length - 2 ? "write-private" : "trusted-ancestry" })));
764
+ const checkChain = () => {
765
+ for (const entry of chain) if (!sameIdentity(entry.inspection, inspect(ctx, entry.handle, true))) throw unsafe();
766
+ };
767
+ yield { kind: "acl", entries: chain.map((entry, i) => ({ path: entry.path, directory: true,
768
+ policy: i >= chain.length - 2 ? "write-private" : "trusted-ancestry" })) } satisfies RecoveryStoreStep;
769
+ checkChain();
706
770
  const configPin = chain.at(-1);
707
771
  if (!configPin) throw unsafe();
708
772
  const dir = join(config, "codex-cli-update-recovery");
709
773
  try {
710
- if (create) { mkdirSync(dir); hardenSecretDir(toNamespacedPath(dir), { required: true }); }
774
+ if (create) { mkdirSync(dir); yield { kind: "harden", path: dir, directory: true } satisfies RecoveryStoreStep; }
711
775
  } catch (error) { if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error; }
712
776
  const directoryPin = relOpen(ctx, configPin.handle, "codex-cli-update-recovery", true,
713
777
  create || publish ? ACCESS_DIR_PIN : ACCESS_READ, SHARE_DIR);
714
- inspect(ctx, directoryPin, true); assertCanonicalPath(ctx, directoryPin, dir);
715
- verify([{ path: dir, directory: true, policy: "private" }]);
778
+ const directoryIdentity = inspect(ctx, directoryPin, true); assertCanonicalPath(ctx, directoryPin, dir);
779
+ const checkDirectory = () => {
780
+ checkChain();
781
+ if (!sameIdentity(directoryIdentity, inspect(ctx, directoryPin, true))) throw unsafe();
782
+ };
783
+ yield { kind: "acl", entries: [{ path: dir, directory: true, policy: "private" }] } satisfies RecoveryStoreStep;
784
+ checkDirectory();
716
785
  if (create) flushDir(ctx, configPin.handle);
717
- const leaf = (name: string, access = ACCESS_READ, sharing = SHARE_LEAF_VERIFY) => {
786
+ const leaf = function* (name: string, access = ACCESS_READ, sharing = SHARE_LEAF_VERIFY): RecoveryStoreSteps<{ handle: bigint; stat: StoreInspection }> {
718
787
  if (!/^[0-9a-f-]{36}(?:\.(?:terminal|proof))?(?:\.pending|\.json|\.terminal|\.proof)$/.test(name)) throw unsafe();
719
788
  const handle = relOpen(ctx, directoryPin, name, false, access, sharing);
720
789
  const stat = inspect(ctx, handle, false);
721
790
  if (stat.links !== 1 || stat.size > 1024) throw unsafe();
722
- verify([{ path: join(dir, name), directory: false, policy: "private" }]);
791
+ yield { kind: "acl", entries: [{ path: join(dir, name), directory: false, policy: "private" }] };
792
+ checkDirectory();
793
+ const current = inspect(ctx, handle, false);
794
+ if (!sameIdentity(stat, current) || current.links !== 1 || current.size !== stat.size) throw unsafe();
723
795
  return { handle, stat };
724
796
  };
725
- return run({ dir,
797
+ return { dir,
726
798
  names: () => readdirSync(dir),
727
- read(name) {
728
- const file = leaf(name);
799
+ *read(name: string): RecoveryStoreSteps<string> {
800
+ const file = yield* leaf(name);
729
801
  try { return readAll(ctx, file.handle, file.stat.size).toString("utf8"); }
730
802
  finally { ctx.pins.release(file.handle, kernel); }
731
803
  },
732
- withProofHandle(name, use) {
804
+ *withProofHandle<T>(name: string, use: (handle: bigint) => T): RecoveryStoreSteps<T> {
733
805
  if (!/^[0-9a-f-]{36}\.proof$/.test(name)) throw unsafe();
734
- const file = leaf(name, 0x40100080, 7);
806
+ const file = yield* leaf(name, 0x40100080, 7);
735
807
  try { return use(file.handle); } finally { ctx.pins.release(file.handle, kernel); }
736
808
  },
737
- write(name, pendingName, body, adoptPending = false) {
809
+ *write(name: string, pendingName: string, body: string, adoptPending = false): RecoveryStoreSteps<void> {
738
810
  if (!(create || publish) || Buffer.byteLength(body) > 1024 || !/^[0-9a-f-]{36}(?:\.terminal|\.proof)?$/.test(name.replace(/\.json$/, ""))
739
811
  || pendingName !== name.replace(/\.json$/, "") + ".pending") throw unsafe();
740
812
  // Recovery preserves the only durable child identity until atomic rename.
741
813
  const temp = join(dir, pendingName), destination = join(dir, name);
742
814
  if (!adoptPending) {
743
815
  try {
744
- const old = leaf(pendingName, ACCESS_LEAF, SHARE_LEAF);
816
+ const old = yield* leaf(pendingName, ACCESS_LEAF, SHARE_LEAF);
745
817
  markDelete(ctx, old.handle); ctx.pins.release(old.handle, kernel);
746
818
  } catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; }
747
819
  const fd = openSync(temp, "wx", 0o600);
748
820
  try { writeFileSync(fd, body); fsyncSync(fd); } finally { closeSync(fd); }
749
821
  }
750
- hardenSecretPath(toNamespacedPath(temp), { required: true });
751
- const file = leaf(pendingName, adoptPending ? ACCESS_LEAF | 0x40000000 : ACCESS_LEAF, SHARE_LEAF);
822
+ yield { kind: "harden", path: temp, directory: false };
823
+ checkDirectory();
824
+ const file = yield* leaf(pendingName, adoptPending ? ACCESS_LEAF | 0x40000000 : ACCESS_LEAF, SHARE_LEAF);
752
825
  try {
753
826
  if (!readAll(ctx, file.handle, file.stat.size).equals(Buffer.from(body))) throw unsafe();
754
827
  if (adoptPending) flushDir(ctx, file.handle);
755
828
  renamePinned(ctx, file.handle, destination);
756
829
  // The held adopted pin denies other writers; this reader must share
757
830
  // its write/flush access as well as DELETE through identity readback.
758
- const published = leaf(name, ACCESS_READ, adoptPending ? SHARE_LEAF_VERIFY | 0x2 : SHARE_LEAF_VERIFY);
831
+ const published = yield* leaf(name, ACCESS_READ, adoptPending ? SHARE_LEAF_VERIFY | 0x2 : SHARE_LEAF_VERIFY);
759
832
  try { if (!sameIdentity(file.stat, published.stat)) throw unsafe(); }
760
833
  finally { ctx.pins.release(published.handle, kernel); }
761
834
  flushDir(ctx, directoryPin);
762
835
  } finally { ctx.pins.release(file.handle, kernel); forgetEphemeralSecretPath(toNamespacedPath(temp)); }
763
836
  },
764
- });
765
- } finally { ctx.pins.closeAll(kernel); nt.close(); kernel.close(); }
837
+ };
766
838
  }
767
839
 
768
840
  export interface WindowsJobStoreIo {
@@ -34,9 +34,7 @@ import { trustedNodeLauncherContext } from "../cli/launcher-context";
34
34
  import { spawnWorker } from "../lib/worker-embed";
35
35
  import { recoverClosedCodexCliUpdateWorker } from "./cli-update-worker-recovery";
36
36
  import {
37
- CODEX_CLI_UPDATE_GATE_FREE,
38
- CODEX_CLI_UPDATE_GATE_PARENT_WRITE,
39
- CODEX_CLI_UPDATE_GATE_WORKER_COMMIT,
37
+ codexCliSelectionGateState,
40
38
  cancelCodexCliUpdateFence,
41
39
  codexCliUpdateSelectionGate,
42
40
  createCodexCliUpdateFence,
@@ -108,13 +106,8 @@ export interface CodexCliUpdateWorkerDiagnostics {
108
106
  }
109
107
 
110
108
  export function codexCliUpdateWorkerDiagnostics(): CodexCliUpdateWorkerDiagnostics {
111
- const raw = Atomics.load(new Int32Array(codexCliUpdateSelectionGate()), 0);
112
- const gate = raw === CODEX_CLI_UPDATE_GATE_FREE ? "free"
113
- : raw === CODEX_CLI_UPDATE_GATE_PARENT_WRITE ? "parent_write"
114
- : raw >= CODEX_CLI_UPDATE_GATE_WORKER_COMMIT ? "worker_commit"
115
- : "unrecognized";
116
109
  return {
117
- gate,
110
+ gate: codexCliSelectionGateState(),
118
111
  liveJobs: [...liveJobs.entries()].map(([jobId, record]) => ({
119
112
  jobId, settled: record.settled(), workerClosed: record.workerClosed(),
120
113
  })),
@@ -188,8 +181,7 @@ function trackUnjoined(worker: Worker, alreadyClosed: boolean): void {
188
181
  * recovery releases admission only after matching terminal proof.
189
182
  */
190
183
  function warnIfCommitGateHeld(): void {
191
- if (Atomics.load(new Int32Array(codexCliUpdateSelectionGate()), 0)
192
- < CODEX_CLI_UPDATE_GATE_WORKER_COMMIT) return;
184
+ if (codexCliSelectionGateState() !== "worker_commit") return;
193
185
  console.warn(
194
186
  "[opencodex] a Codex CLI update worker closed while the shared selection gate still reads"
195
187
  + " worker_commit; admission awaits owner-scoped terminal evidence — inspect"
@@ -3,7 +3,7 @@ import { closeSync, constants, fstatSync, fsyncSync, ftruncateSync, lstatSync, m
3
3
  import { dirname, join } from "node:path";
4
4
  import { getConfigDir } from "../config/paths";
5
5
  import { assertTrustedCodexCliAncestry } from "./cli-update-paths";
6
- import { withWindowsCliRecoveryStore } from "./cli-update-job-store-windows";
6
+ import { withWindowsCliRecoveryStore, withWindowsCliRecoveryStoreAsync } from "./cli-update-job-store-windows";
7
7
  import { windowsCodexCliChildGone } from "./windows-cli-recovery";
8
8
 
9
9
  export interface CodexCliUpdateNativeChildIdentity { jobName: string; creationTime: string }
@@ -169,19 +169,64 @@ export function codexCliUpdateRecoveryBlocksAdmission(configDir = getConfigDir()
169
169
  } catch { return true; } // Existing evidence that disappears/is unreadable stays fenced.
170
170
  }
171
171
 
172
+ /** Every attempt observes fresh records; this never caches an ACL/admission verdict. */
173
+ export async function codexCliUpdateRecoveryBlocksAdmissionAsync(configDir = getConfigDir()): Promise<boolean> {
174
+ if (process.platform !== "win32") return codexCliUpdateRecoveryBlocksAdmission(configDir);
175
+ try { lstatSync(join(configDir, "codex-cli-update-recovery")); }
176
+ catch (error) { return (error as NodeJS.ErrnoException).code !== "ENOENT"; }
177
+ try {
178
+ const canonical = realpathSync.native(configDir);
179
+ return await withWindowsCliRecoveryStoreAsync(canonical, false, async io => {
180
+ const steps = inspectRecoveryFilesSteps(io.names(), true);
181
+ let step = steps.next();
182
+ while (!step.done) {
183
+ const effect = step.value;
184
+ if (effect.kind === "publish") {
185
+ await io.write(effect.record.token + ".json", effect.record.token + ".pending", JSON.stringify(effect.record), true);
186
+ step = steps.next(undefined);
187
+ } else {
188
+ const record = JSON.parse(await io.read(effect.token + (effect.suffix ?? ".json"))) as RecoveryRecord;
189
+ if (!validRecord(record, effect.token)) throw new Error("invalid_recovery_owner");
190
+ step = steps.next(record);
191
+ }
192
+ }
193
+ return step.value;
194
+ }, true);
195
+ } catch { return true; }
196
+ }
197
+
198
+ type RecoveryInspectionStep = { kind: "read"; token: string; suffix?: string }
199
+ | { kind: "publish"; record: RecoveryRecord };
200
+ type RecoveryInspectionSteps = Generator<RecoveryInspectionStep, boolean, RecoveryRecord | undefined>;
201
+ function* childGoneSteps(record: RecoveryRecord): RecoveryInspectionSteps {
202
+ if (process.platform !== "win32") return childGone(record);
203
+ if (record.pgid === null || !record.windows?.jobName || !record.windows.creationTime) return false;
204
+ const proof = (yield { kind: "read", token: record.token, suffix: ".proof" })!;
205
+ return childGone(record, () => proof);
206
+ }
172
207
  function inspectRecoveryFiles(files: string[], readRecord: (token: string, suffix?: string) => RecoveryRecord,
173
208
  publishChild?: (record: RecoveryRecord) => void): boolean {
209
+ const steps = inspectRecoveryFilesSteps(files, !!publishChild);
210
+ let step = steps.next();
211
+ while (!step.done) {
212
+ const effect = step.value;
213
+ if (effect.kind === "publish") { publishChild!(effect.record); step = steps.next(undefined); }
214
+ else step = steps.next(readRecord(effect.token, effect.suffix));
215
+ }
216
+ return step.value;
217
+ }
218
+ function* inspectRecoveryFilesSteps(files: string[], publishChild: boolean): RecoveryInspectionSteps {
174
219
  if (new Set(files.map(file => file.slice(0, 36))).size > 256) return true;
175
220
  const terminal = new Set<string>();
176
221
  const active = new Map<string, RecoveryRecord>();
177
222
  for (const file of files.filter(file => file.endsWith(".terminal"))) {
178
- const record = readRecord(file.slice(0, -9), ".terminal");
223
+ const record = (yield { kind: "read", token: file.slice(0, -9), suffix: ".terminal" })!;
179
224
  if (record.phase !== "terminal") return true;
180
225
  terminal.add(record.token);
181
226
  }
182
227
  for (const file of files.filter(file => file.endsWith(".json"))) {
183
228
  if (terminal.has(file.slice(0, -5))) continue;
184
- const record = readRecord(file.slice(0, -5));
229
+ const record = (yield { kind: "read", token: file.slice(0, -5) })!;
185
230
  if (record.phase === "terminal") { terminal.add(record.token); continue; }
186
231
  active.set(record.token, record);
187
232
  }
@@ -202,7 +247,7 @@ function inspectRecoveryFiles(files: string[], readRecord: (token: string, suffi
202
247
  if (terminal.has(token)) continue; // Published terminal authority shadows late writes.
203
248
  const suffix = file.slice(token.length);
204
249
  if (suffix !== ".pending" && suffix !== ".terminal.pending") return true;
205
- const record = readRecord(token, suffix);
250
+ const record = (yield { kind: "read", token, suffix })!;
206
251
  const previous = active.get(token) ?? reconciled.get(token);
207
252
  if (process.platform === "win32" && suffix === ".pending" && record.phase === "child") {
208
253
  const armed = active.get(token);
@@ -211,8 +256,8 @@ function inspectRecoveryFiles(files: string[], readRecord: (token: string, suffi
211
256
  || armed.windows.creationTime !== null || armed.windows.jobName !== record.windows?.jobName
212
257
  || record.pgid === null || record.pgid > 0xffffffff || !record.windows?.creationTime
213
258
  || BigInt(record.windows.creationTime) > 0xffffffffffffffffn
214
- || !processGone(record.parentPid) || !childGone(record, token => readRecord(token, ".proof"))) return true;
215
- publishChild(record); // Existing protected flush/ACL/rename path; any failure fences.
259
+ || !processGone(record.parentPid) || !(yield* childGoneSteps(record)) || !processGone(record.parentPid)) return true;
260
+ yield { kind: "publish", record }; // Existing protected flush/ACL/rename path; any failure fences.
216
261
  reconciled.set(token, record); continue;
217
262
  }
218
263
  // A complete cleanup write can survive a crash before rename. Recognize
@@ -221,7 +266,8 @@ function inspectRecoveryFiles(files: string[], readRecord: (token: string, suffi
221
266
  if (record.phase !== "terminal" || record.pgid !== null || !processGone(record.parentPid)
222
267
  || (previous && previous.parentPid !== record.parentPid)) return true;
223
268
  if (previous?.phase === "child"
224
- && !childGone(previous, token => readRecord(token, ".proof"))) return true;
269
+ && !(yield* childGoneSteps(previous))) return true;
270
+ if (!processGone(record.parentPid)) return true;
225
271
  reconciled.set(token, record);
226
272
  }
227
273
  for (const record of active.values()) {
@@ -229,7 +275,7 @@ function inspectRecoveryFiles(files: string[], readRecord: (token: string, suffi
229
275
  // Re-probe on every admission attempt, including after a restart. A live
230
276
  // or inaccessible group stays fenced until the whole group proves absent.
231
277
  if (record.phase === "child" && record.pgid !== null
232
- && processGone(record.parentPid) && childGone(record, token => readRecord(token, ".proof"))) continue;
278
+ && processGone(record.parentPid) && (yield* childGoneSteps(record)) && processGone(record.parentPid)) continue;
233
279
  return true;
234
280
  }
235
281
  return false;