@bitkyc08/opencodex 2.93.0 → 2.95.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.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -41,6 +41,7 @@ import { darwinDesktopAppAdapter, darwinDefaultExec } from "./desktop-app/darwin
|
|
|
41
41
|
import { linuxDesktopAppAdapter, linuxDefaultExec } from "./desktop-app/linux";
|
|
42
42
|
import { windowsDesktopAppAdapter, windowsDefaultExec } from "./desktop-app/windows";
|
|
43
43
|
import { isTestHomeGuardArmed } from "../lib/test-home-guard";
|
|
44
|
+
import { beginCodexCliSelectionParentWrite, withCodexCliSelectionParentWriteAsync, CodexCliSelectionMutationBusyError } from "./cli-update-selection-gate";
|
|
44
45
|
|
|
45
46
|
export type { DesktopAppExecOptions } from "./desktop-app/types";
|
|
46
47
|
|
|
@@ -90,6 +91,7 @@ export type DesktopAppRestartReason =
|
|
|
90
91
|
| "restart_in_flight"
|
|
91
92
|
| "handoff_started"
|
|
92
93
|
| "relaunch_context_failed"
|
|
94
|
+
| "selection_mutation_busy"
|
|
93
95
|
| "targets_survived"
|
|
94
96
|
| "relaunch_failed";
|
|
95
97
|
|
|
@@ -248,11 +250,27 @@ export function restartCodexDesktopApp(io: DesktopAppRestartIo = {}): DesktopApp
|
|
|
248
250
|
// first quits and relaunches, the second sees the freshly started shell as a target
|
|
249
251
|
// and kills it. Own-pid reentrancy means the wp5 helper runs this same step and
|
|
250
252
|
// finds the lock its caller made out to it.
|
|
251
|
-
|
|
252
|
-
|
|
253
|
+
// A cli-update worker holds this gate from its final process scan through
|
|
254
|
+
// installer termination and readback, so no new shell may appear inside. The
|
|
255
|
+
// admission check runs BEFORE the restart lock and every mutation this
|
|
256
|
+
// function performs: a busy refusal must leave the app, the lock and any
|
|
257
|
+
// handoff all untouched. Held through relaunch or a failed attempt's
|
|
258
|
+
// cleanup; a handoff helper's own delayed descendants stay the documented
|
|
259
|
+
// pre-existing residual.
|
|
260
|
+
const selectionWrite = beginCodexCliSelectionParentWrite();
|
|
261
|
+
if (!selectionWrite.entered) return skipped("selection_mutation_busy");
|
|
253
262
|
|
|
254
263
|
let handedOff = false;
|
|
264
|
+
// The lock attempt sits inside the protected scope too: a throw from the
|
|
265
|
+
// lock's own mkdir/write before the try would otherwise leak this
|
|
266
|
+
// process-wide gate for the rest of the process. lockHeld distinguishes
|
|
267
|
+
// "acquisition threw/refused" from "lock taken" so a failed attempt never
|
|
268
|
+
// releases a lock this call does not hold.
|
|
269
|
+
let lockHeld = false;
|
|
255
270
|
try {
|
|
271
|
+
const acquisition = acquireDesktopRestartLock(io.lock);
|
|
272
|
+
if (!acquisition.acquired) return skipped("restart_in_flight");
|
|
273
|
+
lockHeld = true;
|
|
256
274
|
const install = adapter.discover(exec);
|
|
257
275
|
if (!install) return skipped("package_discovery_failed");
|
|
258
276
|
|
|
@@ -366,6 +384,17 @@ export function restartCodexDesktopApp(io: DesktopAppRestartIo = {}): DesktopApp
|
|
|
366
384
|
} finally {
|
|
367
385
|
// On the handoff path ownership was transferred to the helper, so releasing here
|
|
368
386
|
// would drop a lock that is still protecting a restart about to happen.
|
|
369
|
-
|
|
387
|
+
selectionWrite.exit();
|
|
388
|
+
if (lockHeld && !handedOff) releaseDesktopRestartLock(io.lock);
|
|
389
|
+
}
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
export async function restartCodexDesktopAppAsync(io: DesktopAppRestartIo = {}): Promise<DesktopAppRestartResult> {
|
|
393
|
+
try { return await withCodexCliSelectionParentWriteAsync(() => restartCodexDesktopApp(io)); }
|
|
394
|
+
catch (error) {
|
|
395
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return {
|
|
396
|
+
attempted: false, stopped: [], surviving: [], relaunch: "skipped", reason: "selection_mutation_busy",
|
|
397
|
+
};
|
|
398
|
+
throw error;
|
|
370
399
|
}
|
|
371
400
|
}
|
|
@@ -0,0 +1,229 @@
|
|
|
1
|
+
import { accessSync, constants, statSync } from "node:fs";
|
|
2
|
+
import { posix } from "node:path";
|
|
3
|
+
import { codexExecInvocation } from "./exec-invocation";
|
|
4
|
+
import type { SpawnInvocation } from "../lib/win-exec";
|
|
5
|
+
import { macCodexAppBundleFor, realpathOrNull } from "./mac-app-bundle";
|
|
6
|
+
import {
|
|
7
|
+
untrustedChatgptBundleReason,
|
|
8
|
+
untrustedChatgptBundleReasonAsync,
|
|
9
|
+
} from "../chatgpt/app-server-shim/bundle-trust";
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* macOS execution-boundary trust for a resolved Codex target.
|
|
13
|
+
*
|
|
14
|
+
* Discovery and the resolver memo answer "which command would we run"; they are
|
|
15
|
+
* deliberately exec-free and never prove trust. Every actual spawn/exec of a
|
|
16
|
+
* Codex binary goes through this module instead: on darwin the command is
|
|
17
|
+
* resolved with real execvp semantics (empty PATH segment = spawn cwd,
|
|
18
|
+
* relative PATH entries resolve against that cwd, a slash in the command makes
|
|
19
|
+
* it cwd/absolute-relative and PATH is skipped), classified by the shared
|
|
20
|
+
* known-Codex-bundle classifier, and — when the lexical or canonical path sits
|
|
21
|
+
* inside a ChatGPT.app or Codex.app bundle at any location — checked by the shared
|
|
22
|
+
* signature/ownership policy before the same canonical target is returned for
|
|
23
|
+
* execution. CLI handoffs additionally classify any enclosing lexical or canonical .app,
|
|
24
|
+
* independent of bundle name or identifier. Other callers retain the known-app
|
|
25
|
+
* policy; non-bundle executables pass through to the shared launcher unchanged.
|
|
26
|
+
*
|
|
27
|
+
* The check is one-shot per invocation and deliberately not memoized:
|
|
28
|
+
* directory-service group membership, signature state, and directory-entry
|
|
29
|
+
* ownership can change between resolve and exec, so a cached "trusted" answer
|
|
30
|
+
* would invent a trust lifetime the platform does not provide.
|
|
31
|
+
*/
|
|
32
|
+
export class CodexExecTrustError extends Error {
|
|
33
|
+
readonly reason: string;
|
|
34
|
+
readonly code = "CODEX_EXEC_UNTRUSTED";
|
|
35
|
+
constructor(reason: string) {
|
|
36
|
+
super("untrusted Codex exec target: " + reason);
|
|
37
|
+
this.name = "CodexExecTrustError";
|
|
38
|
+
this.reason = reason;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** Default execvp search path on darwin when the spawn env carries no PATH (_CS_PATH). */
|
|
43
|
+
const DARWIN_DEFAULT_PATH = "/usr/bin:/bin:/usr/sbin:/sbin";
|
|
44
|
+
|
|
45
|
+
export interface CodexExecBoundaryDeps {
|
|
46
|
+
/** Spawn environment; PATH resolution uses exactly this list. */
|
|
47
|
+
env?: NodeJS.ProcessEnv;
|
|
48
|
+
platform?: NodeJS.Platform;
|
|
49
|
+
/** Working directory the spawn will use; empty/relative PATH segments resolve against it. */
|
|
50
|
+
cwd?: string;
|
|
51
|
+
/** Existence probe: win32 passthrough PATH resolution and POSIX EACCES classification. */
|
|
52
|
+
exists?: (path: string) => boolean;
|
|
53
|
+
/** POSIX spawnability predicate: regular file + X_OK. */
|
|
54
|
+
executable?: (path: string) => boolean;
|
|
55
|
+
/** Canonicalizer; returns null when the path cannot be resolved. */
|
|
56
|
+
realpath?: (path: string) => string | null;
|
|
57
|
+
/** CLI handoffs verify any enclosing app, without trusting mutable bundle identity metadata. */
|
|
58
|
+
verifyAnyAppBundle?: boolean;
|
|
59
|
+
/** Discovered Desktop bundle identity, retained by its generated launcher across respawns. */
|
|
60
|
+
expectedBundleRoot?: string;
|
|
61
|
+
macBundleTrustReason?: (bundleRoot: string, binary: string) => string | null;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export interface CodexExecBoundaryAsyncDeps extends Omit<CodexExecBoundaryDeps, "macBundleTrustReason"> {
|
|
65
|
+
signal?: AbortSignal;
|
|
66
|
+
/**
|
|
67
|
+
* Async twin of the sync trust check. It MUST honor the forwarded signal:
|
|
68
|
+
* once aborted it settles promptly, and any children it owns (dscl/codesign)
|
|
69
|
+
* are killed and reaped before it settles - the boundary awaits it, so a
|
|
70
|
+
* check that ignores the signal stalls the caller; one that abandons its
|
|
71
|
+
* children leaks processes.
|
|
72
|
+
*/
|
|
73
|
+
macBundleTrustReasonAsync?: (bundleRoot: string, binary: string, signal?: AbortSignal) => Promise<string | null>;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/** Same contract as workspace-executable's candidate check: regular file and executable bit. */
|
|
77
|
+
function executableTarget(path: string): boolean {
|
|
78
|
+
try {
|
|
79
|
+
if (!statSync(path).isFile()) return false;
|
|
80
|
+
accessSync(path, constants.X_OK);
|
|
81
|
+
return true;
|
|
82
|
+
} catch {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function spawnError(command: string, code: "ENOENT" | "EACCES"): Error {
|
|
88
|
+
return Object.assign(new Error("spawn " + command + " " + code), { code });
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** Non-executability alone must not masquerade as "not found"; existence is probed separately. */
|
|
92
|
+
function existsTarget(path: string, deps: CodexExecBoundaryDeps): boolean {
|
|
93
|
+
if (deps.exists) { try { return deps.exists(path); } catch { return false; } }
|
|
94
|
+
try { statSync(path); return true; } catch { return false; }
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/** execvp-style PATH resolution: first executable regular file wins; empty segment means cwd. */
|
|
98
|
+
function resolveDarwinExecPath(command: string, deps: CodexExecBoundaryDeps): { path: string } | { error: Error } {
|
|
99
|
+
const env = deps.env ?? process.env;
|
|
100
|
+
const cwd = deps.cwd ?? process.cwd();
|
|
101
|
+
const executable = deps.executable ?? executableTarget;
|
|
102
|
+
const dirOf = (segment: string): string =>
|
|
103
|
+
segment === "" ? cwd : segment.startsWith("/") ? segment : posix.resolve(cwd, segment);
|
|
104
|
+
if (command.includes("/")) {
|
|
105
|
+
const candidate = dirOf(command);
|
|
106
|
+
if (executable(candidate)) return { path: candidate };
|
|
107
|
+
return { error: spawnError(command, existsTarget(candidate, deps) ? "EACCES" : "ENOENT") };
|
|
108
|
+
}
|
|
109
|
+
const pathValue = env.PATH === undefined ? DARWIN_DEFAULT_PATH : env.PATH;
|
|
110
|
+
let denied = false;
|
|
111
|
+
for (const segment of pathValue.split(":")) {
|
|
112
|
+
const candidate = dirOf(segment) + "/" + command;
|
|
113
|
+
if (executable(candidate)) return { path: candidate };
|
|
114
|
+
if (existsTarget(candidate, deps)) denied = true;
|
|
115
|
+
}
|
|
116
|
+
return { error: spawnError(command, denied ? "EACCES" : "ENOENT") };
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* Canonical (bundleRoot, binary) pair when the resolved path classifies into a
|
|
121
|
+
* known Codex desktop bundle (or any enclosing app for CLI handoffs), else null. The pair is always consistent:
|
|
122
|
+
* both halves are canonicalized together so a symlinked HOME or a PATH alias
|
|
123
|
+
* cannot split the containment check, and a bundle member that cannot be
|
|
124
|
+
* canonicalized refuses rather than escaping the known-bundle classification.
|
|
125
|
+
*/
|
|
126
|
+
function darwinBundleTarget(resolved: string, deps: CodexExecBoundaryDeps): { bundle: string; binary: string } | null {
|
|
127
|
+
const realpath = deps.realpath ?? realpathOrNull;
|
|
128
|
+
if (deps.expectedBundleRoot !== undefined && !posix.isAbsolute(deps.expectedBundleRoot)) {
|
|
129
|
+
throw new CodexExecTrustError("the recorded app bundle must be an absolute path");
|
|
130
|
+
}
|
|
131
|
+
const binary = realpath(resolved);
|
|
132
|
+
const enclosingApp = (path: string) => /^(.*?\/[^/]*\.app)(?:\/|$)/i.exec(path)?.[1];
|
|
133
|
+
const lexicalBundle = deps.verifyAnyAppBundle && deps.expectedBundleRoot === undefined ? enclosingApp(resolved) : undefined;
|
|
134
|
+
// Verify the outer canonical app for nested layouts, but retain lexical containment.
|
|
135
|
+
const enclosing = deps.verifyAnyAppBundle && binary !== null ? enclosingApp(binary) : undefined;
|
|
136
|
+
const bundle = deps.expectedBundleRoot ?? enclosing ?? lexicalBundle ?? macCodexAppBundleFor(resolved, { env: deps.env, platform: deps.platform, realpath });
|
|
137
|
+
if (!bundle) return null;
|
|
138
|
+
if (binary === null) throw new CodexExecTrustError("cannot canonicalize the app-bundle exec target");
|
|
139
|
+
const canonicalBundle = realpath(bundle);
|
|
140
|
+
if (canonicalBundle === null) throw new CodexExecTrustError("cannot canonicalize the app bundle");
|
|
141
|
+
if (!binary.startsWith(canonicalBundle + "/Contents/")) {
|
|
142
|
+
throw new CodexExecTrustError("the app-bundle exec target is outside bundle Contents");
|
|
143
|
+
}
|
|
144
|
+
if (lexicalBundle && lexicalBundle !== bundle) {
|
|
145
|
+
const canonicalLexicalBundle = realpath(lexicalBundle);
|
|
146
|
+
if (canonicalLexicalBundle === null) throw new CodexExecTrustError("cannot canonicalize the app bundle");
|
|
147
|
+
if (!binary.startsWith(canonicalLexicalBundle + "/Contents/")) {
|
|
148
|
+
throw new CodexExecTrustError("the app-bundle exec target is outside bundle Contents");
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return { bundle: canonicalBundle, binary };
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/** Classification of this exact validated invocation, not a reusable trust grant. */
|
|
155
|
+
interface ValidatedCodexExecTarget {
|
|
156
|
+
readonly invocation: SpawnInvocation;
|
|
157
|
+
readonly macAppBundle: boolean;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export function validatedCodexExecTarget(
|
|
161
|
+
command: string,
|
|
162
|
+
args: readonly string[],
|
|
163
|
+
deps: CodexExecBoundaryDeps = {},
|
|
164
|
+
): ValidatedCodexExecTarget {
|
|
165
|
+
if ((deps.platform ?? process.platform) !== "darwin") {
|
|
166
|
+
if (deps.expectedBundleRoot !== undefined) throw new CodexExecTrustError("recorded app bundles require macOS verification");
|
|
167
|
+
return { invocation: codexExecInvocation(command, args, deps.platform ?? process.platform, { env: deps.env, exists: deps.exists }), macAppBundle: false };
|
|
168
|
+
}
|
|
169
|
+
const resolved = resolveDarwinExecPath(command, deps);
|
|
170
|
+
if ("error" in resolved) throw resolved.error;
|
|
171
|
+
const target = darwinBundleTarget(resolved.path, deps);
|
|
172
|
+
if (target) {
|
|
173
|
+
const reason = (deps.macBundleTrustReason ?? untrustedChatgptBundleReason)(target.bundle, target.binary);
|
|
174
|
+
if (reason) throw new CodexExecTrustError(reason);
|
|
175
|
+
return { invocation: { file: target.binary, args: [...args], options: {} }, macAppBundle: true };
|
|
176
|
+
}
|
|
177
|
+
return { invocation: { file: resolved.path, args: [...args], options: {} }, macAppBundle: false };
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
export async function validatedCodexExecTargetAsync(
|
|
181
|
+
command: string,
|
|
182
|
+
args: readonly string[],
|
|
183
|
+
deps: CodexExecBoundaryAsyncDeps = {},
|
|
184
|
+
): Promise<ValidatedCodexExecTarget> {
|
|
185
|
+
deps.signal?.throwIfAborted();
|
|
186
|
+
if ((deps.platform ?? process.platform) !== "darwin") {
|
|
187
|
+
if (deps.expectedBundleRoot !== undefined) throw new CodexExecTrustError("recorded app bundles require macOS verification");
|
|
188
|
+
return { invocation: codexExecInvocation(command, args, deps.platform ?? process.platform, { env: deps.env, exists: deps.exists }), macAppBundle: false };
|
|
189
|
+
}
|
|
190
|
+
const resolved = resolveDarwinExecPath(command, deps);
|
|
191
|
+
if ("error" in resolved) throw resolved.error;
|
|
192
|
+
const target = darwinBundleTarget(resolved.path, deps);
|
|
193
|
+
if (target) {
|
|
194
|
+
const reason = await (deps.macBundleTrustReasonAsync
|
|
195
|
+
? deps.macBundleTrustReasonAsync(target.bundle, target.binary, deps.signal)
|
|
196
|
+
: untrustedChatgptBundleReasonAsync(target.bundle, target.binary, undefined, deps.signal));
|
|
197
|
+
if (reason) throw new CodexExecTrustError(reason);
|
|
198
|
+
deps.signal?.throwIfAborted();
|
|
199
|
+
return { invocation: { file: target.binary, args: [...args], options: {} }, macAppBundle: true };
|
|
200
|
+
}
|
|
201
|
+
deps.signal?.throwIfAborted();
|
|
202
|
+
return { invocation: { file: resolved.path, args: [...args], options: {} }, macAppBundle: false };
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
export function validatedCodexExecInvocation(
|
|
206
|
+
command: string, args: readonly string[], deps: CodexExecBoundaryDeps = {},
|
|
207
|
+
): SpawnInvocation {
|
|
208
|
+
return validatedCodexExecTarget(command, args, deps).invocation;
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
export async function validatedCodexExecInvocationAsync(
|
|
212
|
+
command: string, args: readonly string[], deps: CodexExecBoundaryAsyncDeps = {},
|
|
213
|
+
): Promise<SpawnInvocation> {
|
|
214
|
+
const target = await validatedCodexExecTargetAsync(command, args, deps);
|
|
215
|
+
deps.signal?.throwIfAborted();
|
|
216
|
+
return target.invocation;
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
/** Assert a single already-located executable; returns the canonical target to exec. */
|
|
220
|
+
export function assertCodexExecTargetTrusted(command: string, deps: CodexExecBoundaryDeps = {}): string {
|
|
221
|
+
return validatedCodexExecInvocation(command, [], deps).file;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
export async function assertCodexExecTargetTrustedAsync(
|
|
225
|
+
command: string,
|
|
226
|
+
deps: CodexExecBoundaryAsyncDeps = {},
|
|
227
|
+
): Promise<string> {
|
|
228
|
+
return (await validatedCodexExecInvocationAsync(command, [], deps)).file;
|
|
229
|
+
}
|
|
@@ -1,10 +1,90 @@
|
|
|
1
|
+
import { createHmac } from "node:crypto";
|
|
2
|
+
|
|
1
3
|
/** Native request metadata shared by the HTTP adapter and WS preparation. */
|
|
2
4
|
export const CODEX_RESPONSES_LITE_HEADER = "x-openai-internal-codex-responses-lite";
|
|
3
5
|
export const CODEX_RESPONSES_LITE_METADATA_KEY = "ws_request_header_x_openai_internal_codex_responses_lite";
|
|
4
6
|
export const CODEX_ROUTING_HINT_HEADER = "x-codex-routing-hint";
|
|
7
|
+
export const CODEX_INSTALLATION_ID_HEADER = "x-codex-installation-id";
|
|
8
|
+
export const CODEX_TURN_METADATA_HEADER = "x-codex-turn-metadata";
|
|
9
|
+
export const CODEX_TURN_STATE_HEADER = "x-codex-turn-state";
|
|
10
|
+
export const CODEX_ATTESTATION_HEADER = "x-oai-attestation";
|
|
5
11
|
|
|
6
12
|
const MAX_ROUTING_MODEL_BYTES = 256;
|
|
7
13
|
const MAX_ROUTING_TIER_BYTES = 64;
|
|
14
|
+
const INSTALL_BODY_KEY = "opencodex-codex-pool-install-body-v1";
|
|
15
|
+
const INSTALL_TAG_KEY = "opencodex-codex-pool-install-tag-v1";
|
|
16
|
+
const UUID_V4_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
|
17
|
+
const MAX_TURN_METADATA_BYTES = 32 * 1024;
|
|
18
|
+
|
|
19
|
+
function accountTagForUuidPrefix(account: string, prefix20Hex: string): string {
|
|
20
|
+
return createHmac("sha256", INSTALL_TAG_KEY).update(`${account}\0${prefix20Hex.toLowerCase()}`).digest("hex").slice(0, 12);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Deterministic, idempotent RFC 4122 v4 UUID isolated per (chatgptAccountId, callerInstallationId).
|
|
25
|
+
* Calling it twice with the same chatgptAccountId returns the identical UUID without double-hashing.
|
|
26
|
+
*/
|
|
27
|
+
export function deriveCodexAccountInstallationId(chatgptAccountId: string, callerInstallationId: string): string {
|
|
28
|
+
const account = chatgptAccountId.trim();
|
|
29
|
+
const raw = callerInstallationId.trim();
|
|
30
|
+
if (!account || !raw) return callerInstallationId;
|
|
31
|
+
if (UUID_V4_RE.test(raw)) {
|
|
32
|
+
const hex = raw.replace(/-/g, "").toLowerCase();
|
|
33
|
+
if (hex.slice(20, 32) === accountTagForUuidPrefix(account, hex.slice(0, 20))) {
|
|
34
|
+
return raw.toLowerCase();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
const h = createHmac("sha256", INSTALL_BODY_KEY).update(`${account}\0${raw}`).digest("hex");
|
|
38
|
+
const variant = ((Number.parseInt(h[16]!, 16) & 0x3) | 0x8).toString(16);
|
|
39
|
+
const prefix20 = `${h.slice(0, 8)}${h.slice(8, 12)}4${h.slice(13, 16)}${variant}${h.slice(17, 20)}`;
|
|
40
|
+
const node12 = accountTagForUuidPrefix(account, prefix20);
|
|
41
|
+
return `${prefix20.slice(0, 8)}-${prefix20.slice(8, 12)}-${prefix20.slice(12, 16)}-${prefix20.slice(16, 20)}-${node12}`;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export function rewriteTurnMetadataInstallationId(rawMetadata: string, chatgptAccountId: string): string {
|
|
45
|
+
if (!chatgptAccountId.trim() || Buffer.byteLength(rawMetadata, "utf8") > MAX_TURN_METADATA_BYTES) return rawMetadata;
|
|
46
|
+
let parsed: unknown;
|
|
47
|
+
try { parsed = JSON.parse(rawMetadata); } catch { return rawMetadata; }
|
|
48
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return rawMetadata;
|
|
49
|
+
const record = parsed as Record<string, unknown>;
|
|
50
|
+
if (typeof record.installation_id !== "string" || !record.installation_id.trim()) return rawMetadata;
|
|
51
|
+
const nextId = deriveCodexAccountInstallationId(chatgptAccountId, record.installation_id);
|
|
52
|
+
if (nextId === record.installation_id) return rawMetadata;
|
|
53
|
+
return JSON.stringify({ ...record, installation_id: nextId });
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export function isolateCodexPoolAccountHeaders(headers: Headers, chatgptAccountId: string): void {
|
|
57
|
+
headers.delete(CODEX_ATTESTATION_HEADER);
|
|
58
|
+
if (!chatgptAccountId.trim()) return;
|
|
59
|
+
const installId = headers.get(CODEX_INSTALLATION_ID_HEADER);
|
|
60
|
+
if (installId && installId.trim()) {
|
|
61
|
+
headers.set(CODEX_INSTALLATION_ID_HEADER, deriveCodexAccountInstallationId(chatgptAccountId, installId));
|
|
62
|
+
}
|
|
63
|
+
const turnMeta = headers.get(CODEX_TURN_METADATA_HEADER);
|
|
64
|
+
if (turnMeta) {
|
|
65
|
+
headers.set(CODEX_TURN_METADATA_HEADER, rewriteTurnMetadataInstallationId(turnMeta, chatgptAccountId));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
export function isolateCodexPoolClientMetadata(body: unknown, chatgptAccountId: string | undefined): unknown {
|
|
70
|
+
if (!chatgptAccountId?.trim() || !body || typeof body !== "object" || Array.isArray(body)) return body;
|
|
71
|
+
const record = body as Record<string, unknown>;
|
|
72
|
+
const cm = record.client_metadata;
|
|
73
|
+
if (!cm || typeof cm !== "object" || Array.isArray(cm)) return body;
|
|
74
|
+
const meta = cm as Record<string, unknown>;
|
|
75
|
+
let nextMeta: Record<string, unknown> | undefined;
|
|
76
|
+
const rawInstallId = meta[CODEX_INSTALLATION_ID_HEADER];
|
|
77
|
+
if (typeof rawInstallId === "string" && rawInstallId.trim()) {
|
|
78
|
+
const nextId = deriveCodexAccountInstallationId(chatgptAccountId, rawInstallId);
|
|
79
|
+
if (nextId !== rawInstallId) nextMeta = { ...meta, [CODEX_INSTALLATION_ID_HEADER]: nextId };
|
|
80
|
+
}
|
|
81
|
+
const rawTurnMeta = (nextMeta ?? meta)[CODEX_TURN_METADATA_HEADER];
|
|
82
|
+
if (typeof rawTurnMeta === "string" && rawTurnMeta.trim()) {
|
|
83
|
+
const rewritten = rewriteTurnMetadataInstallationId(rawTurnMeta, chatgptAccountId);
|
|
84
|
+
if (rewritten !== rawTurnMeta) nextMeta = { ...(nextMeta ?? meta), [CODEX_TURN_METADATA_HEADER]: rewritten };
|
|
85
|
+
}
|
|
86
|
+
return nextMeta ? { ...record, client_metadata: nextMeta } : body;
|
|
87
|
+
}
|
|
8
88
|
|
|
9
89
|
function isRoutingHintComponent(value: unknown, maxBytes: number): value is string {
|
|
10
90
|
// Printable non-whitespace ASCII makes code-unit length equal to byte length.
|
package/src/codex/history-job.ts
CHANGED
|
@@ -27,6 +27,7 @@ import { currentHistoryDbBusyTimeoutMs, resolveExistingHistoryBackupPath } from
|
|
|
27
27
|
import { spawnWorker } from "../lib/worker-embed";
|
|
28
28
|
import type { CodexHistoryFailureReason, CodexHistoryVerifiedNoopProof } from "./history-provider";
|
|
29
29
|
import { getCodexHome, resolveCodexStateDbPath } from "./paths";
|
|
30
|
+
import type { RestoreOwnershipRefusal } from "../client/restore-ownership";
|
|
30
31
|
|
|
31
32
|
/**
|
|
32
33
|
* Resolve the paths a history job needs, at CALL time.
|
|
@@ -103,6 +104,7 @@ export interface CodexHistoryJobRequest {
|
|
|
103
104
|
readonly canonicalBackupPath: string;
|
|
104
105
|
readonly operation: CodexHistoryWorkerOperation;
|
|
105
106
|
readonly expectedDesiredEnabled?: boolean;
|
|
107
|
+
readonly guardStopOwnership?: boolean;
|
|
106
108
|
}
|
|
107
109
|
|
|
108
110
|
export type CodexHistoryJobOutcome =
|
|
@@ -111,6 +113,7 @@ export type CodexHistoryJobOutcome =
|
|
|
111
113
|
| { readonly kind: "blocked"; readonly reason: "busy" | "database" | "unsafe-path" | "desired_disabled" | "desired_enabled" }
|
|
112
114
|
| { readonly kind: "failed"; readonly reason: "worker-error" | "worker-died" | "timeout";
|
|
113
115
|
readonly message: string; readonly historyFailureReason?: CodexHistoryFailureReason;
|
|
116
|
+
readonly restoreBoundary?: RestoreOwnershipRefusal;
|
|
114
117
|
/** Specific integrity condition when `historyFailureReason` is `"integrity"`. */
|
|
115
118
|
readonly historyIntegrityCode?: string;
|
|
116
119
|
readonly rows?: number; readonly files?: number };
|
|
@@ -178,6 +181,8 @@ function isPlausibleWorkerResult(
|
|
|
178
181
|
|| message.reason === "desired_disabled" || message.reason === "desired_enabled";
|
|
179
182
|
case "error":
|
|
180
183
|
return typeof message.message === "string"
|
|
184
|
+
&& (message.restoreBoundary === undefined || (target?.operation === "restore-openai"
|
|
185
|
+
&& (message.restoreBoundary === "hub-owned" || message.restoreBoundary === "unproven")))
|
|
181
186
|
&& (message.rows === undefined || (Number.isSafeInteger(message.rows) && Number(message.rows) >= 0))
|
|
182
187
|
&& (message.files === undefined || (Number.isSafeInteger(message.files) && Number(message.files) >= 0))
|
|
183
188
|
&& ((message.rows === undefined && message.files === undefined)
|
|
@@ -307,6 +312,7 @@ function classifyWorkerResult(result: HistoryWorkerResult): CodexHistoryJobOutco
|
|
|
307
312
|
kind: "failed",
|
|
308
313
|
reason: "worker-error",
|
|
309
314
|
message: redactWorkerMessage(result.message),
|
|
315
|
+
...(result.restoreBoundary ? { restoreBoundary: result.restoreBoundary } : {}),
|
|
310
316
|
...(result.reason ? { historyFailureReason: result.reason } : {}),
|
|
311
317
|
...(result.integrityCode ? { historyIntegrityCode: result.integrityCode } : {}),
|
|
312
318
|
...(result.rows !== undefined && result.files !== undefined
|
|
@@ -438,6 +444,7 @@ export async function runCodexHistoryJob(
|
|
|
438
444
|
canonicalStateDbPath: request.canonicalStateDbPath,
|
|
439
445
|
canonicalBackupPath: request.canonicalBackupPath,
|
|
440
446
|
...(request.expectedDesiredEnabled === undefined ? {} : { expectedDesiredEnabled: request.expectedDesiredEnabled }),
|
|
447
|
+
...(request.guardStopOwnership ? { guardStopOwnership: true } : {}),
|
|
441
448
|
// A Worker is a fresh module realm: it would otherwise open state_5.sqlite with this
|
|
442
449
|
// module's default rather than the timeout this process resolved. Production sends the
|
|
443
450
|
// same codex-rs-matching 5s the Worker would have used on its own.
|
|
@@ -7,6 +7,7 @@ import { Database } from "bun:sqlite";
|
|
|
7
7
|
import { resolveCodexStateDbPath } from "./paths";
|
|
8
8
|
import { openCodexStateForPreflight } from "./history-state-open";
|
|
9
9
|
import { atomicWriteFile, getConfigDir } from "../config";
|
|
10
|
+
import { sameFileIdentity, statTimeMs, type FileIdentity } from "../lib/file-identity";
|
|
10
11
|
import {
|
|
11
12
|
CODEX_HISTORY_RESUMABLE_SOURCES,
|
|
12
13
|
codexHistoryBackupId,
|
|
@@ -268,15 +269,15 @@ function readFirstLineProviderValue(path: string, expectedId: string): string |
|
|
|
268
269
|
|
|
269
270
|
function patchFirstLineProviderInPlace(
|
|
270
271
|
path: string, expectedId: string, provider: string,
|
|
271
|
-
expectedIdentity:
|
|
272
|
+
expectedIdentity: FileIdentity,
|
|
272
273
|
): FirstLineProviderResult {
|
|
273
274
|
historyAppendHooks?.beforeFirstLineOpen?.(path);
|
|
274
275
|
const fd = openSync(path, "r+");
|
|
275
276
|
try {
|
|
276
277
|
const assertIdentity = (): void => {
|
|
277
278
|
assertHistoryDescriptorIdentity(path, fd);
|
|
278
|
-
const held = fstatSync(fd);
|
|
279
|
-
if (held
|
|
279
|
+
const held = fstatSync(fd, { bigint: true });
|
|
280
|
+
if (!sameFileIdentity(held, expectedIdentity)) {
|
|
280
281
|
throw new CodexHistoryIntegrityError("history_rollout_identity_changed");
|
|
281
282
|
}
|
|
282
283
|
};
|
|
@@ -360,10 +361,10 @@ function assertLegacyHistoryRecord(line: string): void {
|
|
|
360
361
|
}
|
|
361
362
|
|
|
362
363
|
function assertHistoryDescriptorIdentity(path: string, fd: number): void {
|
|
363
|
-
const held = fstatSync(fd);
|
|
364
|
-
let current:
|
|
365
|
-
try { current = lstatSync(path); } catch { throw new CodexHistoryIntegrityError("history_rollout_identity_changed"); }
|
|
366
|
-
if (!current.isFile() || current.isSymbolicLink() || current
|
|
364
|
+
const held = fstatSync(fd, { bigint: true });
|
|
365
|
+
let current: import("node:fs").BigIntStats;
|
|
366
|
+
try { current = lstatSync(path, { bigint: true }); } catch { throw new CodexHistoryIntegrityError("history_rollout_identity_changed"); }
|
|
367
|
+
if (!current.isFile() || current.isSymbolicLink() || !sameFileIdentity(current, held)) {
|
|
367
368
|
throw new CodexHistoryIntegrityError("history_rollout_identity_changed");
|
|
368
369
|
}
|
|
369
370
|
}
|
|
@@ -693,8 +694,8 @@ function inspectBackupForNoop(path: string, stateDbPath: string): StrictBackupIn
|
|
|
693
694
|
|
|
694
695
|
function historyFileIdentity(path: string): string | null {
|
|
695
696
|
try {
|
|
696
|
-
const stat = statSync(path);
|
|
697
|
-
return [stat.dev, stat.ino, stat.size, stat.
|
|
697
|
+
const stat = statSync(path, { bigint: true });
|
|
698
|
+
return [stat.dev, stat.ino, Number(stat.size), statTimeMs(stat.mtimeNs), statTimeMs(stat.ctimeNs)].join(":");
|
|
698
699
|
} catch {
|
|
699
700
|
return null;
|
|
700
701
|
}
|
|
@@ -1132,7 +1133,7 @@ function updateSessionMeta(
|
|
|
1132
1133
|
} = {},
|
|
1133
1134
|
): SessionMetaUpdateResult {
|
|
1134
1135
|
if (!path || !existsSync(path)) return { changed: false, durableProvider: false };
|
|
1135
|
-
const validatedIdentity = lstatSync(path);
|
|
1136
|
+
const validatedIdentity = lstatSync(path, { bigint: true });
|
|
1136
1137
|
if (options.expectedFileIdentity !== undefined
|
|
1137
1138
|
&& historyFileIdentity(path) !== options.expectedFileIdentity) {
|
|
1138
1139
|
return { changed: false, durableProvider: false, conflict: true };
|
|
@@ -1368,7 +1369,7 @@ export function syncCodexHistoryProvider(
|
|
|
1368
1369
|
provider: CodexHistoryProvider,
|
|
1369
1370
|
stateDbPath = resolveCodexStateDbPath(),
|
|
1370
1371
|
backupPath = resolveExistingHistoryBackupPath(stateDbPath),
|
|
1371
|
-
opts: { skipWhenProvablyNoop?: boolean } = {},
|
|
1372
|
+
opts: { skipWhenProvablyNoop?: boolean; withWriteGuard?: <T>(write: () => T) => T } = {},
|
|
1372
1373
|
): CodexHistorySyncResult {
|
|
1373
1374
|
// Opt-in steady-state gate (Design B loopback callers only): default semantics of
|
|
1374
1375
|
// this exported API are unchanged — legacy stop/restore paths never pass the flag.
|
|
@@ -1377,7 +1378,10 @@ export function syncCodexHistoryProvider(
|
|
|
1377
1378
|
return { rows: 0, files: 0 };
|
|
1378
1379
|
}
|
|
1379
1380
|
try {
|
|
1380
|
-
|
|
1381
|
+
// The guard encloses the entire synchronous attempt: DB CAS/commit, every rollout
|
|
1382
|
+
// append and manifest consumption/finalization. No ownership publication can interleave.
|
|
1383
|
+
const write = () => syncCodexHistoryProviderUnsafe(provider, stateDbPath, backupPath);
|
|
1384
|
+
const retried = withHistoryRetryResult(() => opts.withWriteGuard ? opts.withWriteGuard(write) : write());
|
|
1381
1385
|
return retried.ok ? retried.value : { rows: 0, files: 0, failed: true, failureReason: retried.reason };
|
|
1382
1386
|
} catch (error) {
|
|
1383
1387
|
if (error instanceof CodexHistoryIntegrityError) {
|
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
import { withHistoryWriteSerialization } from "./history-lock";
|
|
27
27
|
import { loadConfig } from "../config";
|
|
28
28
|
import { shouldSyncCodexOnStart } from "./desired-state";
|
|
29
|
+
import { stopRestoreWriteGuard, type RestoreOwnershipRefusal } from "../client/restore-ownership";
|
|
29
30
|
import {
|
|
30
31
|
writeHistoryProviderTransition,
|
|
31
32
|
writeLegacyOpenaiHistoryRecovery,
|
|
@@ -63,6 +64,8 @@ export interface HistoryWorkerRunMessage {
|
|
|
63
64
|
readonly canonicalBackupPath: string;
|
|
64
65
|
/** When set, prove this transition's desired direction while H is held. */
|
|
65
66
|
readonly expectedDesiredEnabled?: boolean;
|
|
67
|
+
/** Stop restoration must revalidate connection ownership inside H, under C. */
|
|
68
|
+
readonly guardStopOwnership?: boolean;
|
|
66
69
|
/**
|
|
67
70
|
* The parent realm's `state_5.sqlite` busy timeout. A Worker cannot observe a parent that
|
|
68
71
|
* resolved a different window, for the same reason the homes below are explicit.
|
|
@@ -81,6 +84,7 @@ export type HistoryWorkerResult =
|
|
|
81
84
|
readonly reason: "busy" | "database" | "unsafe-path" | "desired_disabled" | "desired_enabled" }
|
|
82
85
|
| { readonly type: "error"; readonly requestId: string; readonly jobId: string;
|
|
83
86
|
readonly message: string; readonly reason?: CodexHistoryFailureReason;
|
|
87
|
+
readonly restoreBoundary?: RestoreOwnershipRefusal;
|
|
84
88
|
/** Specific integrity condition, so a non-retryable one can be named as such. */
|
|
85
89
|
readonly integrityCode?: string;
|
|
86
90
|
readonly rows?: number; readonly files?: number };
|
|
@@ -114,6 +118,8 @@ export function isHistoryWorkerRunMessage(data: unknown): data is HistoryWorkerR
|
|
|
114
118
|
&& nonEmpty(message.canonicalStateDbPath)
|
|
115
119
|
&& nonEmpty(message.canonicalBackupPath)
|
|
116
120
|
&& (message.expectedDesiredEnabled === undefined || typeof message.expectedDesiredEnabled === "boolean")
|
|
121
|
+
&& (message.guardStopOwnership === undefined
|
|
122
|
+
|| (message.guardStopOwnership === true && message.operation === "restore-openai"))
|
|
117
123
|
&& (message.busyTimeoutMs === undefined
|
|
118
124
|
|| (typeof message.busyTimeoutMs === "number"
|
|
119
125
|
&& Number.isFinite(message.busyTimeoutMs)
|
|
@@ -159,7 +165,16 @@ export function runHistoryUnitUnderLock(
|
|
|
159
165
|
// manifest-backed original metadata. The provider is derived from the operation,
|
|
160
166
|
// never from a caller; only recover-legacy-openai force-labels bare routed rows.
|
|
161
167
|
const provider = operation === "apply-opencodex" ? "opencodex" : "openai";
|
|
162
|
-
|
|
168
|
+
const guard = message.guardStopOwnership ? stopRestoreWriteGuard() : undefined;
|
|
169
|
+
try {
|
|
170
|
+
// H is already held. The provider takes C only for synchronous attempts, so
|
|
171
|
+
// there is no C -> H edge and no C lease spans the parent's Worker await.
|
|
172
|
+
return writeHistoryProviderTransition(permit, target, provider, guard?.run);
|
|
173
|
+
} catch (error) {
|
|
174
|
+
const boundary = guard?.boundary();
|
|
175
|
+
if (boundary && boundary !== "restore") return { restoreBoundary: boundary };
|
|
176
|
+
throw error;
|
|
177
|
+
}
|
|
163
178
|
},
|
|
164
179
|
);
|
|
165
180
|
|
|
@@ -167,6 +182,10 @@ export function runHistoryUnitUnderLock(
|
|
|
167
182
|
return { type: "blocked", requestId, jobId, reason: acquired.reason };
|
|
168
183
|
}
|
|
169
184
|
const result = acquired.value;
|
|
185
|
+
if ("restoreBoundary" in result) {
|
|
186
|
+
return { type: "error", requestId, jobId, message: `stop_restore_${result.restoreBoundary}`,
|
|
187
|
+
restoreBoundary: result.restoreBoundary };
|
|
188
|
+
}
|
|
170
189
|
if ("desiredStateChanged" in result) {
|
|
171
190
|
return {
|
|
172
191
|
type: "blocked",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { closeSync, constants, fstatSync, openSync, readSync, statSync, type
|
|
1
|
+
import { closeSync, constants, fstatSync, openSync, readSync, statSync, type BigIntStats } from "node:fs";
|
|
2
|
+
import { sameFileIdentity } from "../../lib/file-identity";
|
|
2
3
|
|
|
3
4
|
const MAX_CODEX_CONFIG_BYTES = 1024 * 1024;
|
|
4
5
|
|
|
@@ -14,15 +15,15 @@ const MAX_CODEX_CONFIG_BYTES = 1024 * 1024;
|
|
|
14
15
|
export function readBoundedCodexConfig(path: string): string | null {
|
|
15
16
|
let fd: number | undefined;
|
|
16
17
|
try {
|
|
17
|
-
let namedBefore:
|
|
18
|
+
let namedBefore: BigIntStats;
|
|
18
19
|
try {
|
|
19
|
-
namedBefore = statSync(path);
|
|
20
|
+
namedBefore = statSync(path, { bigint: true });
|
|
20
21
|
} catch (error) {
|
|
21
22
|
const code = (error as NodeJS.ErrnoException).code;
|
|
22
23
|
if (code === "ENOENT" || code === "ENOTDIR") return null;
|
|
23
24
|
throw error;
|
|
24
25
|
}
|
|
25
|
-
if (!namedBefore.isFile() || namedBefore.size > MAX_CODEX_CONFIG_BYTES) {
|
|
26
|
+
if (!namedBefore.isFile() || namedBefore.size > BigInt(MAX_CODEX_CONFIG_BYTES)) {
|
|
26
27
|
throw new Error("config.toml is not a bounded regular file");
|
|
27
28
|
}
|
|
28
29
|
// Deliberately no O_NOFOLLOW: Codex and the injector read through a symlinked
|
|
@@ -33,27 +34,27 @@ export function readBoundedCodexConfig(path: string): string | null {
|
|
|
33
34
|
? 0
|
|
34
35
|
: (constants.O_NONBLOCK ?? 0);
|
|
35
36
|
fd = openSync(path, constants.O_RDONLY | guardedFlags);
|
|
36
|
-
const before = fstatSync(fd);
|
|
37
|
-
if (before
|
|
37
|
+
const before = fstatSync(fd, { bigint: true });
|
|
38
|
+
if (!sameFileIdentity(before, namedBefore)) {
|
|
38
39
|
throw new Error("config.toml changed while it was read");
|
|
39
40
|
}
|
|
40
|
-
if (!before.isFile() || before.size > MAX_CODEX_CONFIG_BYTES) {
|
|
41
|
+
if (!before.isFile() || before.size > BigInt(MAX_CODEX_CONFIG_BYTES)) {
|
|
41
42
|
throw new Error("config.toml is not a bounded regular file");
|
|
42
43
|
}
|
|
43
44
|
|
|
44
|
-
const buffer = Buffer.allocUnsafe(before.size + 1);
|
|
45
|
+
const buffer = Buffer.allocUnsafe(Number(before.size) + 1);
|
|
45
46
|
let bytesRead = 0;
|
|
46
47
|
while (bytesRead < buffer.length) {
|
|
47
48
|
const count = readSync(fd, buffer, bytesRead, buffer.length - bytesRead, null);
|
|
48
49
|
if (count === 0) break;
|
|
49
50
|
bytesRead += count;
|
|
50
51
|
}
|
|
51
|
-
const after = fstatSync(fd);
|
|
52
|
-
const namedAfter = statSync(path);
|
|
53
|
-
if (bytesRead !== before.size || after.size !== before.size
|
|
54
|
-
|| after.
|
|
52
|
+
const after = fstatSync(fd, { bigint: true });
|
|
53
|
+
const namedAfter = statSync(path, { bigint: true });
|
|
54
|
+
if (BigInt(bytesRead) !== before.size || after.size !== before.size
|
|
55
|
+
|| after.mtimeNs !== before.mtimeNs || after.ctimeNs !== before.ctimeNs
|
|
55
56
|
|| !namedAfter.isFile()
|
|
56
|
-
|| namedAfter
|
|
57
|
+
|| !sameFileIdentity(namedAfter, before)) {
|
|
57
58
|
throw new Error("config.toml changed while it was read");
|
|
58
59
|
}
|
|
59
60
|
return buffer.toString("utf8", 0, bytesRead);
|