@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
@@ -13,6 +13,7 @@ import {
13
13
  unlinkSync,
14
14
  } from "node:fs";
15
15
  import { posix, win32 } from "node:path";
16
+ import { sameFileIdentity, statTimeMs, type FileIdentity } from "../lib/file-identity";
16
17
  import { SHIM_MARKER, UNIX_SHIM_REVISION_MARKER, WINDOWS_SHIM_REVISION_MARKER } from "./shim-templates";
17
18
  import type { ShimFileState } from "./shim-state-file";
18
19
 
@@ -21,6 +22,7 @@ const CODEX_SHIM_PROBE_BYTES = 16 * 1024;
21
22
  interface ShimPathFingerprint {
22
23
  dev: number;
23
24
  ino: number;
25
+ identity: FileIdentity;
24
26
  kind: "file" | "symlink";
25
27
  mode: number;
26
28
  size: number;
@@ -48,16 +50,17 @@ function readShimProbePrefix(path: string): string {
48
50
 
49
51
  function statFingerprint(path: string, follow: boolean): Omit<ShimPathFingerprint, "target"> | null {
50
52
  try {
51
- const stat = follow ? statSync(path) : lstatSync(path);
53
+ const stat = follow ? statSync(path, { bigint: true }) : lstatSync(path, { bigint: true });
52
54
  if (follow ? !stat.isFile() : (!stat.isFile() && !stat.isSymbolicLink())) return null;
53
55
  return {
54
- dev: stat.dev,
55
- ino: stat.ino,
56
+ dev: Number(stat.dev),
57
+ ino: Number(stat.ino),
58
+ identity: { dev: stat.dev, ino: stat.ino },
56
59
  kind: stat.isSymbolicLink() ? "symlink" : "file",
57
- mode: stat.mode,
58
- size: stat.size,
59
- mtimeMs: stat.mtimeMs,
60
- ctimeMs: stat.ctimeMs,
60
+ mode: Number(stat.mode),
61
+ size: Number(stat.size),
62
+ mtimeMs: statTimeMs(stat.mtimeNs),
63
+ ctimeMs: statTimeMs(stat.ctimeNs),
61
64
  };
62
65
  } catch {
63
66
  return null;
@@ -68,8 +71,7 @@ function sameFingerprint(
68
71
  left: ShimPathFingerprint | Omit<ShimPathFingerprint, "target">,
69
72
  right: ShimPathFingerprint | Omit<ShimPathFingerprint, "target">,
70
73
  ): boolean {
71
- return left.dev === right.dev
72
- && left.ino === right.ino
74
+ return !!left.identity && !!right.identity && sameFileIdentity(left.identity, right.identity)
73
75
  && left.kind === right.kind
74
76
  && left.mode === right.mode
75
77
  && left.size === right.size
@@ -1,6 +1,7 @@
1
1
  import { lstatSync } from "node:fs";
2
2
  import { extname, join, posix, win32 } from "node:path";
3
3
  import { getConfigDir } from "../config";
4
+ import { sameFileIdentity } from "../lib/file-identity";
4
5
  import { fileErrorCode, readStateResult, stateFiles } from "./shim-state-file";
5
6
  import {
6
7
  isHealthyShimProbe,
@@ -111,7 +112,7 @@ export function inspectCodexShimBackingForCommand(
111
112
  const sameEffectiveIdentity = (fingerprint: ShimPathFingerprint | null): boolean => {
112
113
  if (!fingerprint) return false;
113
114
  const identity = fingerprint.target ?? fingerprint;
114
- return identity.dev === selectedIdentity.dev && identity.ino === selectedIdentity.ino;
115
+ return sameFileIdentity(identity.identity, selectedIdentity.identity);
115
116
  };
116
117
  const matches = files.flatMap(file => {
117
118
  const backingPath = file.realPath ?? file.backupPath;
@@ -151,7 +152,7 @@ export function inspectCodexShimBackingForCommand(
151
152
  });
152
153
  }
153
154
  const wrapperIdentity = wrapperProbe.fingerprint.target ?? wrapperProbe.fingerprint;
154
- if (backing.dev === wrapperIdentity.dev && backing.ino === wrapperIdentity.ino) {
155
+ if (sameFileIdentity(backing.identity, wrapperIdentity.identity)) {
155
156
  return Object.freeze({ status: "unknown" as const, reason: "backing_mismatch" as const });
156
157
  }
157
158
  const wrapperExt = extname(file.wrapperPath).toLowerCase();
@@ -10,11 +10,12 @@ import {
10
10
  rmdirSync,
11
11
  unlinkSync,
12
12
  writeFileSync,
13
- type Stats,
13
+ type BigIntStats,
14
14
  } from "node:fs";
15
15
  import { join } from "node:path";
16
16
  import { getConfigDir } from "../config";
17
17
  import { isProcessAlive } from "../lib/process-control";
18
+ import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
18
19
  import { sameFingerprint, stableShimPathProbe, type ShimPathFingerprint } from "./shim-fingerprint";
19
20
  import { fileErrorCode } from "./shim-state-file";
20
21
 
@@ -34,7 +35,7 @@ interface ShimRestoreLockRecord {
34
35
  interface ShimRestoreLockSnapshot {
35
36
  record: ShimRestoreLockRecord;
36
37
  ownerPath: string;
37
- lockIdentity: Pick<Stats, "dev" | "ino">;
38
+ lockIdentity: FileIdentity;
38
39
  fingerprint: ShimPathFingerprint;
39
40
  }
40
41
 
@@ -42,15 +43,11 @@ function restoreLockPath(): string {
42
43
  return join(getConfigDir(), "codex-shim.autorestore.lock");
43
44
  }
44
45
 
45
- function sameFileIdentity(left: Pick<Stats, "dev" | "ino">, right: Pick<Stats, "dev" | "ino">): boolean {
46
- return left.dev === right.dev && left.ino === right.ino;
47
- }
48
-
49
46
  function readShimRestoreLockSnapshot(path: string): ShimRestoreLockSnapshot | null {
50
- let lockIdentity: Stats;
47
+ let lockIdentity: BigIntStats;
51
48
  let entries: string[];
52
49
  try {
53
- lockIdentity = lstatSync(path);
50
+ lockIdentity = lstatSync(path, { bigint: true });
54
51
  if (!lockIdentity.isDirectory()) return null;
55
52
  entries = readdirSync(path);
56
53
  } catch {
@@ -66,7 +63,7 @@ function readShimRestoreLockSnapshot(path: string): ShimRestoreLockSnapshot | nu
66
63
  || typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 0
67
64
  || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt)) return null;
68
65
  if (entries[0] !== `${value.token}.json`) return null;
69
- const currentLockIdentity = lstatSync(path);
66
+ const currentLockIdentity = lstatSync(path, { bigint: true });
70
67
  if (!currentLockIdentity.isDirectory() || !sameFileIdentity(lockIdentity, currentLockIdentity)) return null;
71
68
  return {
72
69
  record: value as ShimRestoreLockRecord,
@@ -112,7 +109,7 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
112
109
  const path = restoreLockPath();
113
110
  for (let attempt = 0; attempt < 2; attempt += 1) {
114
111
  let fd: number | null = null;
115
- let identity: Stats | null = null;
112
+ let identity: BigIntStats | null = null;
116
113
  let createdDirectory = false;
117
114
  const record: ShimRestoreLockRecord = {
118
115
  version: 1,
@@ -125,9 +122,9 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
125
122
  mkdirSync(path, { mode: 0o700 });
126
123
  createdDirectory = true;
127
124
  fd = openSync(ownerPath, "wx", 0o600);
128
- identity = fstatSync(fd);
125
+ identity = fstatSync(fd, { bigint: true });
129
126
  writeFileSync(fd, `${JSON.stringify(record)}\n`, "utf8");
130
- identity = fstatSync(fd);
127
+ identity = fstatSync(fd, { bigint: true });
131
128
  let released = false;
132
129
  return {
133
130
  release(): void {
@@ -137,7 +134,7 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
137
134
  try {
138
135
  const current = readShimRestoreLockSnapshot(path);
139
136
  if (identity && current && current.record.token === record.token
140
- && sameFileIdentity(identity, current.fingerprint)) {
137
+ && sameFileIdentity(identity, current.fingerprint.identity)) {
141
138
  unlinkSync(ownerPath);
142
139
  rmdirSync(path);
143
140
  }
@@ -150,7 +147,7 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
150
147
  try {
151
148
  const current = readShimRestoreLockSnapshot(path);
152
149
  if (identity && current && current.record.token === record.token
153
- && sameFileIdentity(identity, current.fingerprint)) {
150
+ && sameFileIdentity(identity, current.fingerprint.identity)) {
154
151
  unlinkSync(ownerPath);
155
152
  rmdirSync(path);
156
153
  }
@@ -10,12 +10,14 @@ import {
10
10
  renameSync,
11
11
  unlinkSync,
12
12
  writeFileSync,
13
+ type BigIntStats,
13
14
  type Stats,
14
15
  } from "node:fs";
15
16
  import { randomUUID } from "node:crypto";
16
17
  import { dirname, isAbsolute, join, resolve } from "node:path";
17
18
  import { getConfigDir } from "../config";
18
19
  import { recordOwnedConfigPath } from "../lib/config-ownership";
20
+ import { sameFileIdentity, statTimeMs } from "../lib/file-identity";
19
21
 
20
22
  export const CODEX_SHIM_STATE_MAX_BYTES = 1024 * 1024;
21
23
 
@@ -99,9 +101,9 @@ function fileErrorCode(error: unknown): string | undefined {
99
101
  }
100
102
 
101
103
  function readBoundedRegularFile(path: string, maxBytes: number): { bytes: Buffer; content: string; stat: Stats } | { warning: string } | null {
102
- let lexicalBefore: Stats;
104
+ let lexicalBefore: BigIntStats;
103
105
  try {
104
- lexicalBefore = lstatSync(path);
106
+ lexicalBefore = lstatSync(path, { bigint: true });
105
107
  if (lexicalBefore.isSymbolicLink() || !lexicalBefore.isFile()) {
106
108
  return { warning: `Codex shim state is not a direct regular file at ${path}; auto-restore skipped.` };
107
109
  }
@@ -117,12 +119,12 @@ function readBoundedRegularFile(path: string, maxBytes: number): { bytes: Buffer
117
119
  return { warning: `Codex shim state could not be opened as a regular file at ${path}.` };
118
120
  }
119
121
  try {
120
- const before = fstatSync(fd);
122
+ const before = fstatSync(fd, { bigint: true });
121
123
  if (!before.isFile()) return { warning: `Codex shim state is not a regular file at ${path}; auto-restore skipped.` };
122
124
  if (before.size > maxBytes) {
123
125
  return { warning: `Codex shim state exceeds the 1 MiB startup limit at ${path}; auto-restore skipped.` };
124
126
  }
125
- const buffer = Buffer.allocUnsafe(before.size);
127
+ const buffer = Buffer.allocUnsafe(Number(before.size));
126
128
  let offset = 0;
127
129
  while (offset < buffer.length) {
128
130
  const bytesRead = readSync(fd, buffer, offset, buffer.length - offset, offset);
@@ -133,25 +135,31 @@ function readBoundedRegularFile(path: string, maxBytes: number): { bytes: Buffer
133
135
  if (readSync(fd, extra, 0, 1, offset) !== 0) {
134
136
  return { warning: `Codex shim state exceeds the 1 MiB startup limit at ${path}; auto-restore skipped.` };
135
137
  }
136
- const after = fstatSync(fd);
137
- let lexicalAfter: Stats;
138
+ const after = fstatSync(fd, { bigint: true });
139
+ let lexicalAfter: BigIntStats;
138
140
  try {
139
- lexicalAfter = lstatSync(path);
141
+ lexicalAfter = lstatSync(path, { bigint: true });
140
142
  } catch {
141
143
  return { warning: `Codex shim state changed while being read at ${path}; auto-restore skipped.` };
142
144
  }
143
- if (before.dev !== after.dev || before.ino !== after.ino || before.size !== after.size
144
- || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs
145
+ if (!sameFileIdentity(before, after) || before.size !== after.size
146
+ || statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs) || statTimeMs(before.ctimeNs) !== statTimeMs(after.ctimeNs)
145
147
  || before.mode !== after.mode || before.uid !== after.uid
146
- || lexicalBefore.dev !== before.dev || lexicalBefore.ino !== before.ino
148
+ || !sameFileIdentity(lexicalBefore, before)
147
149
  || lexicalBefore.mode !== before.mode || lexicalBefore.uid !== before.uid
148
- || lexicalBefore.size !== before.size || lexicalBefore.mtimeMs !== before.mtimeMs || lexicalBefore.ctimeMs !== before.ctimeMs
149
- || !lexicalAfter.isFile() || lexicalAfter.isSymbolicLink() || lexicalAfter.dev !== after.dev || lexicalAfter.ino !== after.ino
150
+ || lexicalBefore.size !== before.size || statTimeMs(lexicalBefore.mtimeNs) !== statTimeMs(before.mtimeNs) || statTimeMs(lexicalBefore.ctimeNs) !== statTimeMs(before.ctimeNs)
151
+ || !lexicalAfter.isFile() || lexicalAfter.isSymbolicLink() || !sameFileIdentity(lexicalAfter, after)
150
152
  || lexicalAfter.mode !== after.mode || lexicalAfter.uid !== after.uid
151
- || lexicalAfter.size !== after.size || lexicalAfter.mtimeMs !== after.mtimeMs || lexicalAfter.ctimeMs !== after.ctimeMs) {
153
+ || lexicalAfter.size !== after.size || statTimeMs(lexicalAfter.mtimeNs) !== statTimeMs(after.mtimeNs) || statTimeMs(lexicalAfter.ctimeNs) !== statTimeMs(after.ctimeNs)) {
152
154
  return { warning: `Codex shim state changed while being read at ${path}; auto-restore skipped.` };
153
155
  }
154
- return { bytes: buffer, content: buffer.toString("utf8"), stat: after };
156
+ const stat = Object.assign(Object.create(Object.getPrototypeOf(after)), after, {
157
+ dev: Number(after.dev), ino: Number(after.ino), mode: Number(after.mode), nlink: Number(after.nlink),
158
+ uid: Number(after.uid), gid: Number(after.gid), rdev: Number(after.rdev), size: Number(after.size),
159
+ blksize: Number(after.blksize), blocks: Number(after.blocks), atimeMs: statTimeMs(after.atimeNs),
160
+ mtimeMs: statTimeMs(after.mtimeNs), ctimeMs: statTimeMs(after.ctimeNs), birthtimeMs: statTimeMs(after.birthtimeNs),
161
+ }) as Stats;
162
+ return { bytes: buffer, content: buffer.toString("utf8"), stat };
155
163
  } finally {
156
164
  closeSync(fd);
157
165
  }
@@ -10,6 +10,7 @@ import { randomUUID } from "node:crypto";
10
10
  import { chmodSync, lstatSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
11
11
  import { basename, dirname, join } from "node:path";
12
12
  import { durableBunRuntime, type BunRuntimeSource, type DurableBunRuntime } from "../lib/bun-runtime";
13
+ import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
13
14
  import { serviceApiTokenFilePath } from "../lib/service-secrets";
14
15
  import {
15
16
  buildUnixCodexShim,
@@ -54,7 +55,7 @@ export function windowsShimContent(wrapperPath: string, realCodexPath: string, r
54
55
  return buildUnixCodexShim(gitBashPath(realCodexPath), gitBashPath(bun), gitBashPath(cli), bunRuntimeSource, gitBashPath(serviceApiTokenFilePath()));
55
56
  }
56
57
 
57
- export function writeShim(wrapperPath: string, realCodexPath: string, runtime?: DurableBunRuntime): { dev: number; ino: number } | undefined {
58
+ export function writeShim(wrapperPath: string, realCodexPath: string, runtime?: DurableBunRuntime): FileIdentity | undefined {
58
59
  const { bun, bunRuntimeSource, cli } = cliEntry(runtime);
59
60
  if (process.platform === "win32") {
60
61
  writeFileSync(wrapperPath, windowsShimContent(wrapperPath, realCodexPath, runtime), "utf8");
@@ -74,7 +75,7 @@ export function writeShim(wrapperPath: string, realCodexPath: string, runtime?:
74
75
  try {
75
76
  // "wx" fails if the staging path somehow exists, so we never inherit a file.
76
77
  writeFileSync(staged, buildUnixCodexShim(realCodexPath, bun, cli, bunRuntimeSource), { encoding: "utf8", flag: "wx", mode: 0o600 });
77
- const stagedStat = lstatSync(staged);
78
+ const stagedStat = lstatSync(staged, { bigint: true });
78
79
  chmodSync(staged, 0o755);
79
80
  renameSync(staged, wrapperPath);
80
81
  renamed = true;
@@ -96,14 +97,14 @@ export function writeShim(wrapperPath: string, realCodexPath: string, runtime?:
96
97
  */
97
98
  export function ownedWrapperFingerprint(
98
99
  wrapperPath: string,
99
- written: { dev: number; ino: number } | undefined,
100
+ written: FileIdentity | undefined,
100
101
  ): ShimPathFingerprint | undefined {
101
102
  const probe = stableShimPathProbe(wrapperPath);
102
103
  if (!probe) return undefined;
103
104
  // Platforms that still write in place (Windows) have no staged identity; fall
104
105
  // back to the marker check they have always used.
105
106
  if (!written) return probe.prefix.includes(SHIM_MARKER) ? probe.fingerprint : undefined;
106
- if (probe.fingerprint.dev !== written.dev || probe.fingerprint.ino !== written.ino) return undefined;
107
+ if (!sameFileIdentity(probe.fingerprint.identity, written)) return undefined;
107
108
  return probe.fingerprint;
108
109
  }
109
110
 
@@ -118,11 +119,11 @@ export function ownedWrapperFingerprint(
118
119
  */
119
120
  export function wrapperInodeIsOurs(
120
121
  wrapper: StableShimPathProbe,
121
- written: { dev: number; ino: number } | undefined,
122
+ written: FileIdentity | undefined,
122
123
  recorded: ShimPathFingerprint | undefined,
123
124
  ): boolean {
124
125
  // A different inode is conclusive: someone renamed their own file over ours.
125
- if (written && (wrapper.fingerprint.dev !== written.dev || wrapper.fingerprint.ino !== written.ino)) {
126
+ if (written && !sameFileIdentity(wrapper.fingerprint.identity, written)) {
126
127
  return false;
127
128
  }
128
129
  // Same inode is not sufficient on its own — an in-place truncation (shell `>`,
package/src/codex/shim.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { randomUUID } from "node:crypto";
2
- import { beginCodexCliSelectionParentWrite } from "./cli-update-selection-gate";
2
+ import { beginCodexCliSelectionParentWrite, withCodexCliSelectionParentWriteAsync, CodexCliSelectionMutationBusyError } from "./cli-update-selection-gate";
3
3
  import {
4
4
  existsSync,
5
5
  lstatSync,
@@ -10,6 +10,7 @@ import {
10
10
  } from "node:fs";
11
11
  import { delimiter, extname, join, posix, win32 } from "node:path";
12
12
  import { durableBunRuntime, type DurableBunRuntime } from "../lib/bun-runtime";
13
+ import type { FileIdentity } from "../lib/file-identity";
13
14
  import { assertSelectedRuntimeWritable, RuntimePreflightError, type RuntimePreflightDeps } from "../lib/bun-runtime-preflight";
14
15
  import { getConfigDir } from "../config";
15
16
  import { isWslRuntime, wslAutomountRoot } from "./home";
@@ -264,7 +265,7 @@ interface FreshShimInstallJournalEntry {
264
265
  writtenWrapperFingerprint?: ShimPathFingerprint;
265
266
  wrapperWriteStarted: boolean;
266
267
  /** dev/ino of the file our `writeShim()` created, recorded before anything can fail. */
267
- writtenWrapperInode?: { dev: number; ino: number };
268
+ writtenWrapperInode?: FileIdentity;
268
269
  }
269
270
 
270
271
  function rollbackFreshShimInstall(journal: readonly FreshShimInstallJournalEntry[]): void {
@@ -984,6 +985,28 @@ export function installCodexShim(deps: RuntimePreflightDeps = {}): { installed:
984
985
  finally { gate.exit(); }
985
986
  }
986
987
 
988
+ export async function installCodexShimAsync(deps: RuntimePreflightDeps = {}): Promise<ReturnType<typeof installCodexShim>> {
989
+ try { return await withCodexCliSelectionParentWriteAsync(() => installCodexShim(deps)); }
990
+ catch (error) {
991
+ if (error instanceof CodexCliSelectionMutationBusyError) return { installed: false, refused: true, message: error.message };
992
+ throw error;
993
+ }
994
+ }
995
+ export async function autoRestoreCodexShimAsync(options: Parameters<typeof autoRestoreCodexShim>[0]): Promise<CodexShimAutoRestoreResult> {
996
+ try { return await withCodexCliSelectionParentWriteAsync(() => autoRestoreCodexShim(options)); }
997
+ catch (error) {
998
+ if (error instanceof CodexCliSelectionMutationBusyError) return { status: "deferred", message: error.message };
999
+ throw error;
1000
+ }
1001
+ }
1002
+ export async function uninstallCodexShimAsync(): Promise<ReturnType<typeof uninstallCodexShim>> {
1003
+ try { return await withCodexCliSelectionParentWriteAsync(uninstallCodexShim); }
1004
+ catch (error) {
1005
+ if (error instanceof CodexCliSelectionMutationBusyError) return { removed: false, message: error.message };
1006
+ throw error;
1007
+ }
1008
+ }
1009
+
987
1010
  export function autoRestoreCodexShim(options: Parameters<typeof autoRestoreWindowsCodexShim>[0]): CodexShimAutoRestoreResult {
988
1011
  if (process.platform !== "win32") return autoRestoreUnixOverlay(options);
989
1012
  const gate = beginCodexCliSelectionParentWrite();
@@ -21,6 +21,7 @@ import {
21
21
  unlinkSync,
22
22
  } from "node:fs";
23
23
  import { basename, dirname, join } from "node:path";
24
+ import { fileIdentityKey } from "../lib/file-identity";
24
25
 
25
26
  import { Database } from "bun:sqlite";
26
27
 
@@ -524,11 +525,11 @@ export function openCodexCoordinatorTransaction(
524
525
  );
525
526
  }
526
527
  }
527
- const opened = lstatSync(finalDatabasePath);
528
+ const opened = lstatSync(finalDatabasePath, { bigint: true });
528
529
  if (opened.isSymbolicLink() || !opened.isFile()) {
529
530
  throw new CodexUserIdentityRefusal("The coordinator database path changed during open.");
530
531
  }
531
- initialIdentity = `${opened.dev}:${opened.ino}`;
532
+ initialIdentity = fileIdentityKey(opened);
532
533
  database.exec("PRAGMA busy_timeout = 0; PRAGMA locking_mode = NORMAL; BEGIN IMMEDIATE");
533
534
  transactionOpen = true;
534
535
  initialize(database, databaseWasAbsent || databaseWasEmpty);
@@ -546,9 +547,9 @@ export function openCodexCoordinatorTransaction(
546
547
  };
547
548
  const assertStablePath = (): void => {
548
549
  requireOpen();
549
- const entry = lstatSync(finalDatabasePath);
550
+ const entry = lstatSync(finalDatabasePath, { bigint: true });
550
551
  if (entry.isSymbolicLink() || !entry.isFile()
551
- || `${entry.dev}:${entry.ino}` !== initialIdentity
552
+ || fileIdentityKey(entry) !== initialIdentity
552
553
  || !samePathIdentity(realpathSync.native(finalDatabasePath), finalDatabasePath)) {
553
554
  throw new CodexUserIdentityRefusal("The coordinator database path was substituted.");
554
555
  }
@@ -722,13 +722,52 @@ const DEFINITE_CONTEXT_OVERFLOW_PHRASES = [
722
722
  "too many tokens",
723
723
  ];
724
724
 
725
+ /**
726
+ * Short provider verdicts that a validation error could otherwise echo as the caller's own value
727
+ * (#7443). Each counts only at the very start of the provider's leaf message, after JSON envelopes
728
+ * are unwrapped, and Anthropic's only with its token counts. Text that merely contains one, including
729
+ * a serialized SDK exception or a quoted caller object, is not evidence: only the phrases dev already
730
+ * matched as substrings keep that wider reach.
731
+ */
732
+ const ANCHORED_CONTEXT_OVERFLOW_VERDICTS: readonly RegExp[] = [
733
+ /^prompt is too long: \d+ tokens > \d+ maximum/i,
734
+ /^input is too long for requested model\b/i,
735
+ /^please reduce the length of the messages or completion\b/i,
736
+ ];
737
+
725
738
  /** Wrapper envelopes unwrapped before the leaf message is read. */
726
739
  const MAX_CONTEXT_OVERFLOW_ENVELOPES = 4;
727
740
 
741
+ /**
742
+ * Parameter validation echoes the caller's own value, so its prose is not a context verdict even
743
+ * when the value reads like one: "Invalid 'tools[0].function.name': 'prompt is too long'". These
744
+ * markers are read anywhere in the text, so an SDK error wrapper that serializes such a record as a
745
+ * Python dict is refused too, while a quoted genuine verdict in the same wrapper stays evidence.
746
+ */
747
+ const CONTEXT_PARAM_NAMES = "messages|input|input_text|input_tokens|prompt|contents?|max_tokens|max_completion_tokens|max_output_tokens";
748
+ /** A `param` naming the conversation or a token budget is consistent with an overflow. */
749
+ const CONTEXT_PARAM = new RegExp(`^(?:${CONTEXT_PARAM_NAMES})(?:$|[.[])`, "i");
750
+ const PARAMETER_VALIDATION_CODES: ReadonlySet<string> = new Set(["invalid_value", "invalid_type"]);
751
+ const PARAMETER_VALIDATION_MARKERS: readonly RegExp[] = [
752
+ /\binvalid_(?:value|type)\b/i,
753
+ new RegExp(`['"]param['"]\\s*:\\s*['"](?!(?:${CONTEXT_PARAM_NAMES})(?:['".[]))`, "i"),
754
+ /\binvalid\s+(?:value\s+for\s+)?['"`\u2018\u201c]/i,
755
+ /\binvalid\s+(?:tool|function|parameter|argument|field|value)\b/i,
756
+ /\binput_value\s*=/i,
757
+ /\bvalidation errors? for\b/i,
758
+ ];
759
+
760
+ function isParameterValidationRecord(record: Record<string, unknown>): boolean {
761
+ if (typeof record.code === "string" && PARAMETER_VALIDATION_CODES.has(record.code.toLowerCase())) return true;
762
+ return typeof record.param === "string" && record.param.length > 0 && !CONTEXT_PARAM.test(record.param);
763
+ }
764
+
728
765
  function isDefiniteContextOverflowMessage(text: string): boolean {
766
+ if (PARAMETER_VALIDATION_MARKERS.some(marker => marker.test(text))) return false;
729
767
  const normalized = text.toLowerCase();
730
768
  return normalized === "context_length_exceeded"
731
- || DEFINITE_CONTEXT_OVERFLOW_PHRASES.some(phrase => normalized.includes(phrase));
769
+ || DEFINITE_CONTEXT_OVERFLOW_PHRASES.some(phrase => normalized.includes(phrase))
770
+ || ANCHORED_CONTEXT_OVERFLOW_VERDICTS.some(verdict => verdict.test(text.trim()));
732
771
  }
733
772
 
734
773
  /**
@@ -767,7 +806,7 @@ export function isDefiniteContextOverflow(status: number, message: string): bool
767
806
  .find((candidate): candidate is Record<string, unknown> =>
768
807
  !!candidate && typeof candidate === "object" && !Array.isArray(candidate)
769
808
  && typeof (candidate as Record<string, unknown>).message === "string");
770
- if (!source) return false;
809
+ if (!source || isParameterValidationRecord(source)) return false;
771
810
  text = (source.message as string).trim();
772
811
  }
773
812
  return false;
@@ -902,8 +941,8 @@ export function comboFailureDecision(
902
941
  //
903
942
  // This MUST be tested before the generic stop list below. Our own refusal message says
904
943
  // "context window" -- that is what it refuses on -- and the classifier remaps that phrase,
905
- // so checking the stop list first swallowed the signal and ended the chain. An UPSTREAM
906
- // `context_length_exceeded` carries no admission code and still falls through to stop.
944
+ // so checking the stop list first swallowed the signal and ended the chain. Confirmed
945
+ // upstream context refusals already took the bounded message-classification hop above.
907
946
  //
908
947
  // Matched on the STRUCTURED code only, which classifyError now preserves for our own
909
948
  // refusal. A raw substring test would additionally let any upstream override a terminal
@@ -18,10 +18,12 @@ import { recordOwnedConfigPath } from "../lib/config-ownership";
18
18
  import { assertNotRealCodexHomeUnderTest, assertNotRealHomeUnderTest } from "../lib/test-home-guard";
19
19
  import {
20
20
  forgetEphemeralSecretPath,
21
+ flushWindowsSecretAclReapsBeforeRemoval,
21
22
  hardenSecretPath,
22
23
  hardenSecretPathAsync,
23
24
  reattributeHardenedSecretPath,
24
25
  windowsSecretAclReapPendingForPath,
26
+ WindowsSecretAclSettleTimeoutError,
25
27
  } from "../lib/windows-secret-acl";
26
28
  import {
27
29
  renameAtomicFile,
@@ -30,6 +32,28 @@ import {
30
32
  import { getConfigDir } from "./paths";
31
33
 
32
34
  let atomicSequence = 0;
35
+ const aclDestinations = new Map<string, Set<string>>();
36
+
37
+ /** Track overlapping writes, refusing only children retained past their timeout belt. */
38
+ function admitAtomicAclWork(target: string, temp: string, enabled: boolean): (() => void) | undefined {
39
+ if (!enabled || !windowsHardeningApplies()) return undefined;
40
+ const destination = join(realpathSync(dirname(target)), basename(target));
41
+ const key = process.platform === "win32" ? destination.toLowerCase() : destination;
42
+ const temps = aclDestinations.get(key) ?? new Set<string>();
43
+ if ([...temps].some(windowsSecretAclReapPendingForPath)) throw new WindowsSecretAclSettleTimeoutError();
44
+ temps.add(temp);
45
+ aclDestinations.set(key, temps);
46
+ const release = (): void => {
47
+ temps.delete(temp);
48
+ if (temps.size === 0) aclDestinations.delete(key);
49
+ };
50
+ return () => {
51
+ if (windowsSecretAclReapPendingForPath(temp)) {
52
+ // Caller settlement is bounded; admission resumes only after actual handle release.
53
+ void flushWindowsSecretAclReapsBeforeRemoval(temp).then(release);
54
+ } else release();
55
+ };
56
+ }
33
57
 
34
58
  /**
35
59
  * Whether this writer's Windows ACL branch applies.
@@ -207,7 +231,7 @@ function writePrivateTempFile(
207
231
  try {
208
232
  onCreated(descriptor);
209
233
  if (windowsHardeningApplies()) {
210
- hardenSecretPath(path, { required: true, timeoutMemoKey });
234
+ hardenSecretPath(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
211
235
  }
212
236
  // Keyed on the REAL platform, not the override: on a POSIX host the mode is
213
237
  // the boundary and `assertPrivateTempDescriptor` demands 0o600, which an
@@ -248,7 +272,7 @@ function writePrivateTempFileWith(
248
272
  try {
249
273
  onCreated(descriptor);
250
274
  if (windowsHardeningApplies()) {
251
- hardenSecretPath(path, { required: true, timeoutMemoKey });
275
+ hardenSecretPath(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
252
276
  }
253
277
  if (process.platform !== "win32") fchmodSync(descriptor, 0o600);
254
278
  assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
@@ -271,7 +295,7 @@ async function writePrivateTempFileAsync(
271
295
  try {
272
296
  onCreated(descriptor);
273
297
  if (windowsHardeningApplies()) {
274
- await hardenSecretPathAsync(path, { required: true, timeoutMemoKey });
298
+ await hardenSecretPathAsync(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
275
299
  }
276
300
  if (process.platform !== "win32") {
277
301
  fchmodSync(descriptor, 0o600);
@@ -297,8 +321,11 @@ function atomicWriteFileToTarget(
297
321
  if (recordOwnership) recordOwnedConfigPath(getConfigDir(), path);
298
322
  assertResolvedTargetAllowed(path, target);
299
323
  const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
324
+ const releaseAcl = admitAtomicAclWork(target, tmp, io === undefined);
300
325
  let hardened = false;
301
326
  let ownsTemp = false;
327
+ // Cleanup must not consume the destination's recovery attempt for a later write.
328
+ let cleanupHarden = false;
302
329
  let publicationAttempted = false;
303
330
  let identity: BigIntStats | undefined;
304
331
  const created = (descriptor: number): void => {
@@ -321,7 +348,7 @@ function atomicWriteFileToTarget(
321
348
  // its ChangeTime bump is what used to invalidate the harden memo one line
322
349
  // later. On POSIX the mode IS the boundary, so it stays.
323
350
  if (windowsHardeningApplies()) {
324
- hardenSecretPath(tempPath, { required: true, timeoutMemoKey: path });
351
+ hardenSecretPath(tempPath, { required: true, timeoutMemoKey: path, retryTimedOutOnce: !cleanupHarden });
325
352
  return;
326
353
  }
327
354
  try { chmodSync(tempPath, 0o600); } catch { /* platform may ignore chmod */ }
@@ -365,6 +392,7 @@ function atomicWriteFileToTarget(
365
392
  forgetEphemeralSecretPath(tmp);
366
393
  } catch (cause) {
367
394
  if (!ownsTemp) throw cause;
395
+ cleanupHarden = true;
368
396
  let sharedTemp = false;
369
397
  if (exclusive) {
370
398
  try { sharedTemp = assertIdentity(tmp).nlink > 1n; } catch (error) {
@@ -403,7 +431,7 @@ function atomicWriteFileToTarget(
403
431
  if (removed) forgetEphemeralSecretPath(tmp);
404
432
  if (!removed) throw new AtomicWriteResidualTempError(tmp, hardened, { cause });
405
433
  throw cause;
406
- }
434
+ } finally { releaseAcl?.(); }
407
435
  }
408
436
 
409
437
  export function atomicWriteFile(
@@ -490,12 +518,13 @@ export async function atomicWriteFileAsync(
490
518
  testSeam?: AtomicWriteAsyncTestSeam,
491
519
  ): Promise<void> {
492
520
  let ownsTemp = false;
521
+ let cleanupHarden = false;
493
522
  const effective: AtomicWriteAsyncIO = io ?? {
494
523
  write: (tempPath, value) => writePrivateTempFileAsync(tempPath, value, path, () => { ownsTemp = true; }),
495
524
  harden: async tempPath => {
496
525
  // Same reasoning as the synchronous writer above.
497
526
  if (windowsHardeningApplies()) {
498
- await hardenSecretPathAsync(tempPath, { required: true, timeoutMemoKey: path });
527
+ await hardenSecretPathAsync(tempPath, { required: true, timeoutMemoKey: path, retryTimedOutOnce: !cleanupHarden });
499
528
  return;
500
529
  }
501
530
  try { chmodSync(tempPath, 0o600); } catch { /* platform may ignore chmod */ }
@@ -507,6 +536,7 @@ export async function atomicWriteFileAsync(
507
536
  const target = resolveWriteTarget(path);
508
537
  assertResolvedTargetAllowed(path, target);
509
538
  const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
539
+ const releaseAcl = admitAtomicAclWork(target, tmp, io === undefined);
510
540
  let hardened = false;
511
541
  let tempWasHardenedBeforeContent = false;
512
542
  try {
@@ -520,6 +550,7 @@ export async function atomicWriteFileAsync(
520
550
  forgetEphemeralSecretPath(tmp);
521
551
  } catch (cause) {
522
552
  if (!ownsTemp) throw cause;
553
+ cleanupHarden = true;
523
554
  // The async ACL belt bounds the writer, but it is not evidence that icacls released this
524
555
  // path. Leave the temp in the existing residual state instead of racing an unlink against a
525
556
  // live Windows handle. The default Windows writer hardens before writing secret bytes; a
@@ -555,5 +586,5 @@ export async function atomicWriteFileAsync(
555
586
  if (removed) forgetEphemeralSecretPath(tmp);
556
587
  if (!removed) throw new AtomicWriteResidualTempError(tmp, hardened, { cause });
557
588
  throw cause;
558
- }
589
+ } finally { releaseAcl?.(); }
559
590
  }
@@ -8,6 +8,7 @@ import { join } from "node:path";
8
8
  import * as z from "zod/v4";
9
9
  import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
10
10
  import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
11
+ import { WORKFLOW_BUDGET_SHAPE_HINT, workflowBudgetConfigError } from "./schema/workflow-budget";
11
12
  import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
12
13
  import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
13
14
  import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
@@ -145,6 +146,7 @@ function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): Conf
145
146
  warnings.push(...degradedListenerWarnings(rawParsed, normalized));
146
147
  if (blockedModelRedirectsError(rawParsed)) warnings.push("blockedModelRedirects ignored: expected a map of nonempty model keys to nonempty string targets");
147
148
  if (nativeReasoningRetentionConfigError(rawParsed)) warnings.push("nativeReasoningRetention ignored: expected only optional boolean modelSwitch and accountSwitch fields; both remain off");
149
+ if (workflowBudgetConfigError(rawParsed)) warnings.push("workflowBudget ignored: " + WORKFLOW_BUDGET_SHAPE_HINT + "; the built-in ceilings remain");
148
150
  if (mainAccountHardLockFallbackError(rawParsed)) warnings.push("codexMainAccountHardLockFallback ignored: expected a nonblank model selector and an optional declared reasoningEffort");
149
151
  if (fallbackPolicyError(rawParsed)) warnings.push("fallback partly ignored: expected boolean model/provider switches, providers/routes/devices maps of them, and devices.<id>.localFallback; ignored leaves keep today's fallback behavior");
150
152
  const quotaAutoRefreshWarning = degradedCodexQuotaAutoRefreshWarning(rawParsed, normalized);
@@ -735,6 +737,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
735
737
  // drop a refusal on the next whole-config save; the write boundary rejects it instead.
736
738
  ?? fallbackPolicyError(value)
737
739
  ?? nativeReasoningRetentionConfigError(value)
740
+ ?? workflowBudgetConfigError(value)
738
741
  ?? mainAccountHardLockFallbackError(value)
739
742
  ?? compactionRecoveryConfigError(value) ?? desktopCompatibilityConfigError(value) ?? configReasoningPinsConfigError(value)
740
743
  ?? blankHostnameError(value)
@@ -43,16 +43,16 @@ function hardenInitialConfig(fd: number, temp: string, target: string): void {
43
43
  }
44
44
  }
45
45
 
46
- function identifiesDescriptor(fd: number, path: string): boolean {
47
- const opened = fstatSync(fd);
48
- const entry = lstatSync(path);
46
+ function identifiesDescriptor(fd: number, path: string, privateMode = false): boolean {
47
+ const opened = fstatSync(fd, { bigint: true });
48
+ const entry = lstatSync(path, { bigint: true });
49
49
  return opened.isFile() && entry.isFile()
50
- && opened.dev === entry.dev && opened.ino === entry.ino;
50
+ && opened.dev === entry.dev && opened.ino === entry.ino
51
+ && (!privateMode || process.platform === "win32" || (opened.mode & 0o777n) === 0o600n);
51
52
  }
52
53
 
53
54
  function verifyPrivateTemp(fd: number, temp: string): void {
54
- if (!identifiesDescriptor(fd, temp)
55
- || (process.platform !== "win32" && (fstatSync(fd).mode & 0o777) !== 0o600)) {
55
+ if (!identifiesDescriptor(fd, temp, true)) {
56
56
  throw new Error("Initial config temporary file identity or permissions changed.");
57
57
  }
58
58
  }