@bitkyc08/opencodex 2.100.2 → 2.100.3
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 +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readFileSync, statSync, type BigIntStats } from 'node:fs';
|
|
2
1
|
import { createHash, randomUUID } from 'node:crypto';
|
|
2
|
+
import { nativeAuthStatStamp, readNativeMainAuthBytesStable } from '../native-main-auth-file';
|
|
3
3
|
import type { UsageIdentity } from './usage-controller';
|
|
4
4
|
|
|
5
5
|
type Credential = { identity: UsageIdentity; accessToken: string };
|
|
@@ -9,14 +9,10 @@ const equal = (a: UsageIdentity, b: UsageIdentity) => a.id === b.id && a.userId
|
|
|
9
9
|
/** Local native credentials remain in memory and are never returned by the public reader. */
|
|
10
10
|
export function createNativeIdentityReader(authPath: string, upstreamFetch: typeof fetch = fetch) {
|
|
11
11
|
const readerId = randomUUID(); let generation = 0, previousSnapshot: string | undefined;
|
|
12
|
-
const stamp = (value: BigIntStats) =>
|
|
13
|
-
`${value.dev}:${value.ino}:${value.size}:${value.mtimeNs}:${value.ctimeNs}`;
|
|
14
12
|
const readCredential = (): Credential => {
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
if (stamp(before) !== stamp(after)) throw new Error('Native credentials changed during read');
|
|
19
|
-
const snapshot = `${stamp(after)}:${createHash('sha256').update(text).digest('hex')}`;
|
|
13
|
+
const { bytes, stat: after } = readNativeMainAuthBytesStable(authPath, 1048576n);
|
|
14
|
+
const text = bytes.toString('utf8');
|
|
15
|
+
const snapshot = `${nativeAuthStatStamp(after)}:${createHash('sha256').update(text).digest('hex')}`;
|
|
20
16
|
if (snapshot !== previousSnapshot) { previousSnapshot = snapshot; generation++; }
|
|
21
17
|
const auth = JSON.parse(text);
|
|
22
18
|
if (auth.auth_mode !== 'chatgpt' || typeof auth.tokens?.id_token !== 'string'
|
package/src/codex/features.ts
CHANGED
|
@@ -1468,9 +1468,9 @@ function activeThreadComment(content: string, v2Enabled: boolean): string | unde
|
|
|
1468
1468
|
let legacy = (entries.find(entry => entry.key === AGENTS_THREAD_LIMIT_KEY) ?? entries[0])?.comment;
|
|
1469
1469
|
for (const entry of entries) legacy = mergeTrailingComments(legacy, entry.comment) || undefined;
|
|
1470
1470
|
const dedicated = tomlTableBody(content, "features.multi_agent_v2")
|
|
1471
|
-
?.match(/^\s*max_concurrent_threads_per_session\s*=\s*\d+(\
|
|
1471
|
+
?.match(/^\s*max_concurrent_threads_per_session\s*=\s*\d+([ \t]*#.*)$/m)?.[1];
|
|
1472
1472
|
const features = tomlTableBody(content, "features");
|
|
1473
|
-
const inlineLine = features?.match(/^\s*multi_agent_v2\s*=\s*\{([^}]*)\}(\
|
|
1473
|
+
const inlineLine = features?.match(/^\s*multi_agent_v2\s*=\s*\{([^}]*)\}([ \t]*#.*)$/m);
|
|
1474
1474
|
const inline = inlineLine && /(?:^|,)\s*max_concurrent_threads_per_session\s*=\s*\d+\s*(?:,|$)/.test(inlineLine[1])
|
|
1475
1475
|
? inlineLine[2]
|
|
1476
1476
|
: undefined;
|
|
@@ -347,6 +347,14 @@ export const HISTORY_RELABEL_STANDS_DOWN = "history_paginated_requires_native_wr
|
|
|
347
347
|
*/
|
|
348
348
|
export const HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE = "history_paginated_openai_requires_native_writer";
|
|
349
349
|
|
|
350
|
+
/**
|
|
351
|
+
* The same paginated `openai` rows, found while the resolved Codex is 0.166 or later (#8191).
|
|
352
|
+
* Those builds resume or list a thread only under the provider it was created with, so the retained
|
|
353
|
+
* root override no longer keeps these rows reachable once the default provider changes. A hard
|
|
354
|
+
* refusal: nothing is relabeled or rewritten, and the transition does not happen.
|
|
355
|
+
*/
|
|
356
|
+
export const HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED = "history_paginated_openai_provider_locked";
|
|
357
|
+
|
|
350
358
|
function assertLegacyHistoryRecord(line: string): void {
|
|
351
359
|
let value: unknown;
|
|
352
360
|
try { value = JSON.parse(line); } catch { throw new CodexHistoryIntegrityError("history_rollout_record_invalid"); }
|
|
@@ -482,6 +490,29 @@ export function preflightCodexHistoryInjection(
|
|
|
482
490
|
}
|
|
483
491
|
}
|
|
484
492
|
|
|
493
|
+
/**
|
|
494
|
+
* Read-only: does this store hold an `openai`-tagged thread Codex has already paginated (#8191)?
|
|
495
|
+
* For a transition whose preflight scans no rows (client compaction relabels nothing) but which
|
|
496
|
+
* still makes `opencodex` the default provider. Null when the store cannot be read.
|
|
497
|
+
*/
|
|
498
|
+
export function hasPaginatedOpenaiThreads(stateDbPath?: string): boolean | null {
|
|
499
|
+
let db: Database | undefined;
|
|
500
|
+
try {
|
|
501
|
+
const resolvedPath = stateDbPath ?? resolveCodexStateDbPath();
|
|
502
|
+
if (!existsSync(resolvedPath)) return false;
|
|
503
|
+
db = openCodexStateForPreflight(resolvedPath);
|
|
504
|
+
const columns = db.query<{ name: string }, []>("PRAGMA table_info(threads)").all();
|
|
505
|
+
if (!columns.some(column => column.name === "history_mode")) return false;
|
|
506
|
+
return db.query<{ hit: number }, []>(
|
|
507
|
+
"SELECT 1 AS hit FROM threads WHERE model_provider = 'openai' AND history_mode = 'paginated' LIMIT 1",
|
|
508
|
+
).get() !== null;
|
|
509
|
+
} catch {
|
|
510
|
+
return null;
|
|
511
|
+
} finally {
|
|
512
|
+
db?.close();
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
|
|
485
516
|
function integrityFailureResult(error: CodexHistoryIntegrityError): CodexHistorySyncResult {
|
|
486
517
|
return {
|
|
487
518
|
rows: error.progress.rows,
|
|
@@ -6,7 +6,7 @@ import type { CodexCliSelectionAsyncParentWrite } from "../cli-update-selection-
|
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Reconcile the native `features.multi_agent_v2` override when an injection carries an
|
|
9
|
-
* explicit
|
|
9
|
+
* explicit pin-driven surface ("v1" or "v2-plaintext").
|
|
10
10
|
*
|
|
11
11
|
* Codex resolves the global v2 feature before catalog-level `multi_agent_version` pins, so a
|
|
12
12
|
* config.toml that still enables `multi_agent_v2` would run v2 sessions under a catalog the
|
|
@@ -15,6 +15,11 @@ import type { CodexCliSelectionAsyncParentWrite } from "../cli-update-selection-
|
|
|
15
15
|
* injection on a previously-v2 Codex home the common trigger. The explicit mode selectors
|
|
16
16
|
* (`ocx v2 mode`, `PUT /api/v2`) already run the same format-preserving transition; this is
|
|
17
17
|
* the injection-side half of that contract.
|
|
18
|
+
*
|
|
19
|
+
* "v2-plaintext" joins the reconcile for a different reason: its whole surface already
|
|
20
|
+
* runs v2, but through catalog pins rather than the global feature. Leaving the flag on
|
|
21
|
+
* would outrank those pins and change the native agent-enable and thread-limit semantics,
|
|
22
|
+
* so the flag is disabled the same way.
|
|
18
23
|
*/
|
|
19
24
|
export type InjectedV1SurfaceReconcile =
|
|
20
25
|
| { ok: true; content: string; changed: boolean }
|
|
@@ -67,7 +72,8 @@ export async function prepareInjectedV1SurfaceReconcile(
|
|
|
67
72
|
config: Pick<OcxConfig, "multiAgentMode"> | undefined,
|
|
68
73
|
options: { validateOnly?: boolean },
|
|
69
74
|
): Promise<PreparedV1SurfaceReconcile | null> {
|
|
70
|
-
|
|
75
|
+
const mode = config?.multiAgentMode;
|
|
76
|
+
if (options.validateOnly || (mode !== "v1" && mode !== "v2-plaintext")) {
|
|
71
77
|
return null;
|
|
72
78
|
}
|
|
73
79
|
const { isMultiAgentV2Enabled, transitionMultiAgentV2 } = await import("../features");
|
|
@@ -115,7 +121,7 @@ export async function prepareInjectedV1SurfaceReconcile(
|
|
|
115
121
|
if (transition.retryable === false) throw new ConfigWriteDestinationChanged(transition.error);
|
|
116
122
|
return {
|
|
117
123
|
ok: false,
|
|
118
|
-
message: `Codex config injection refused: could not reconcile the
|
|
124
|
+
message: `Codex config injection refused: could not reconcile the ${mode} surface with the global multi_agent_v2 feature: ${transition.error}.`,
|
|
119
125
|
};
|
|
120
126
|
}
|
|
121
127
|
return { ok: true, content: readFileSync(CODEX_CONFIG_PATH, "utf-8"), changed: transition.changed };
|
|
@@ -22,7 +22,12 @@
|
|
|
22
22
|
* this proxy — the same guarantee the injector already makes everywhere else about a line
|
|
23
23
|
* it does not own.
|
|
24
24
|
*/
|
|
25
|
-
import {
|
|
25
|
+
import {
|
|
26
|
+
HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE,
|
|
27
|
+
HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED,
|
|
28
|
+
HISTORY_RELABEL_STANDS_DOWN,
|
|
29
|
+
} from "../history-provider";
|
|
30
|
+
import { compareCodexVersions, loadPersistedCodexRuntime, peekCodexRuntimeProcessCache } from "../runtime";
|
|
26
31
|
import { applyEol, setRootOpenaiBaseUrlForTarget, stripInjectedOpenaiBaseUrl } from "./config-toml";
|
|
27
32
|
import type { CodexRoutingTarget } from "./routing-target";
|
|
28
33
|
|
|
@@ -59,6 +64,42 @@ function admissionTokenRefusal(): string {
|
|
|
59
64
|
+ "or set syncResumeHistory to false to accept that those conversations resume against Codex's own OpenAI endpoint.";
|
|
60
65
|
}
|
|
61
66
|
|
|
67
|
+
/**
|
|
68
|
+
* The resolved Codex version without running anything: the process memo when it is fresh, else
|
|
69
|
+
* the persisted selection (`selectedVersion`; the record's `version` field is its schema number).
|
|
70
|
+
* Null when neither knows, which keeps the pre-0.166 behavior.
|
|
71
|
+
*/
|
|
72
|
+
export function passiveCodexVersion(): string | null {
|
|
73
|
+
try {
|
|
74
|
+
const peek = peekCodexRuntimeProcessCache();
|
|
75
|
+
if (peek.kind === "available" && peek.value.runtime.version) return peek.value.runtime.version;
|
|
76
|
+
return loadPersistedCodexRuntime()?.selectedVersion ?? null;
|
|
77
|
+
} catch {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** The first Codex that refuses to resume a thread under another provider (codex-cli 0.166.0-alpha). */
|
|
83
|
+
export const CODEX_PROVIDER_LOCKED_SINCE = "0.166.0-alpha.0";
|
|
84
|
+
|
|
85
|
+
/** True when the known Codex refuses to resume a thread under another provider. */
|
|
86
|
+
export function codexLocksResumeProvider(codexVersion?: string | null): boolean {
|
|
87
|
+
return Boolean(codexVersion) && compareCodexVersions(codexVersion!, CODEX_PROVIDER_LOCKED_SINCE) >= 0;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Named next actions for a home where the retained override cannot work any more. Each is a
|
|
92
|
+
* configuration key the operator already owns; none touches the threads.
|
|
93
|
+
*/
|
|
94
|
+
function providerLockedRefusal(codexVersion: string): string {
|
|
95
|
+
return `Codex config injection refused: ${HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED}. `
|
|
96
|
+
+ "Existing provider definitions and conversation files were preserved. "
|
|
97
|
+
+ `This home has conversations tagged openai whose history Codex has already migrated to its paginated format, and Codex ${codexVersion} (0.166 or later) resumes a conversation only under the provider it was created with. `
|
|
98
|
+
+ "Switching the default provider to opencodex would leave those conversations unable to resume, so nothing was changed. "
|
|
99
|
+
+ "To keep them resumable, leave codexDesktopAuthless and codexClientCompaction off. "
|
|
100
|
+
+ "To switch anyway and accept that those conversations stay with the openai provider, set syncResumeHistory to false.";
|
|
101
|
+
}
|
|
102
|
+
|
|
62
103
|
/**
|
|
63
104
|
* Resolve the transition, retaining the root override when this routing form can own one.
|
|
64
105
|
*
|
|
@@ -71,10 +112,22 @@ export function applyPaginatedOpenaiCompat(
|
|
|
71
112
|
target: CodexRoutingTarget,
|
|
72
113
|
content: string,
|
|
73
114
|
eol: "\r\n" | "\n",
|
|
115
|
+
/** The resolved Codex version when known; null or absent keeps the pre-0.166 retention. */
|
|
116
|
+
codexVersion?: string | null,
|
|
74
117
|
): PaginatedOpenaiCompatDecision {
|
|
75
118
|
if (refusal !== HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE) {
|
|
76
119
|
return { refusal, content, retainedRootOverride: false, message: refusal ? genericRefusal(refusal) : "" };
|
|
77
120
|
}
|
|
121
|
+
// Checked before every other branch: on 0.166+ neither the retained override, an admission
|
|
122
|
+
// token nor a user-owned root line keeps an openai-tagged thread resumable under opencodex.
|
|
123
|
+
if (codexVersion && codexLocksResumeProvider(codexVersion)) {
|
|
124
|
+
return {
|
|
125
|
+
refusal: HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED,
|
|
126
|
+
content,
|
|
127
|
+
retainedRootOverride: false,
|
|
128
|
+
message: providerLockedRefusal(codexVersion),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
78
131
|
if (target.requiresAdmissionToken === true) {
|
|
79
132
|
return { refusal, content, retainedRootOverride: false, message: admissionTokenRefusal() };
|
|
80
133
|
}
|
package/src/codex/inject/plan.ts
CHANGED
|
@@ -12,6 +12,8 @@
|
|
|
12
12
|
import { existsSync, readFileSync } from "node:fs";
|
|
13
13
|
import { websocketsEnabled } from "../../config";
|
|
14
14
|
import {
|
|
15
|
+
hasPaginatedOpenaiThreads,
|
|
16
|
+
HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE,
|
|
15
17
|
HISTORY_RELABEL_STANDS_DOWN,
|
|
16
18
|
preflightCodexHistoryInjection,
|
|
17
19
|
} from "../history-provider";
|
|
@@ -52,7 +54,7 @@ import {
|
|
|
52
54
|
usesProviderTable,
|
|
53
55
|
type CodexRoutingTarget,
|
|
54
56
|
} from "./routing-target";
|
|
55
|
-
import { applyPaginatedOpenaiCompat } from "./paginated-openai-compat";
|
|
57
|
+
import { applyPaginatedOpenaiCompat, codexLocksResumeProvider } from "./paginated-openai-compat";
|
|
56
58
|
|
|
57
59
|
/** Everything the plan needs that is not the config.toml input text. */
|
|
58
60
|
export interface CodexInjectionPlanContext {
|
|
@@ -62,6 +64,12 @@ export interface CodexInjectionPlanContext {
|
|
|
62
64
|
readonly catalogPathOption: string | null | undefined;
|
|
63
65
|
/** Journal reads stay read-only while a client guard owns the write channel. */
|
|
64
66
|
readonly journalReadOnly: boolean;
|
|
67
|
+
/**
|
|
68
|
+
* The resolved Codex version from a passive read, or null when unknown. From 0.166 a paginated
|
|
69
|
+
* openai-tagged row can no longer resume under opencodex, so the table transition is refused
|
|
70
|
+
* instead of retaining the root override (#8191).
|
|
71
|
+
*/
|
|
72
|
+
readonly codexVersion?: string | null;
|
|
65
73
|
}
|
|
66
74
|
|
|
67
75
|
/** The ok-variant of the plan: every derived artifact and reportable warning. */
|
|
@@ -375,7 +383,17 @@ export function deriveCodexInjectionPlan(
|
|
|
375
383
|
* existing provider references resolvable. Existing provider definitions are retained
|
|
376
384
|
* before the witness; no post-commit compensation may overwrite a newer native write.
|
|
377
385
|
*/
|
|
378
|
-
|
|
386
|
+
// Client compaction relabels nothing, so its preflight scans no rows, yet it still makes
|
|
387
|
+
// `opencodex` the default provider. On a Codex that locks resume to the creating provider
|
|
388
|
+
// (#8191), probe the store read-only so the same refusal applies; older or unknown versions
|
|
389
|
+
// keep the retained override and add no read.
|
|
390
|
+
let preflight = historyPreflight();
|
|
391
|
+
if (preflight === null && compactionOnly && preflightTableMode && config?.syncResumeHistory !== false
|
|
392
|
+
&& codexLocksResumeProvider(ctx.codexVersion)
|
|
393
|
+
&& hasPaginatedOpenaiThreads(resolveCodexStateDbPath({ readConfig: () => content })) === true) {
|
|
394
|
+
preflight = HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE;
|
|
395
|
+
}
|
|
396
|
+
const compat = applyPaginatedOpenaiCompat(preflight, routingTarget, content, eol, ctx.codexVersion);
|
|
379
397
|
content = compat.content;
|
|
380
398
|
keepRootOverrideAlongsideTable ||= compat.retainedRootOverride;
|
|
381
399
|
const observedHistoryRefusal = compat.refusal;
|
package/src/codex/inject.ts
CHANGED
|
@@ -49,6 +49,7 @@ import {
|
|
|
49
49
|
} from "./journal";
|
|
50
50
|
import { HISTORY_RELABEL_STANDS_DOWN } from "./history-provider";
|
|
51
51
|
import { formatApplyHistoryFailure } from "./inject/history-failure";
|
|
52
|
+
import { passiveCodexVersion } from "./inject/paginated-openai-compat";
|
|
52
53
|
import {
|
|
53
54
|
deriveCodexHistoryOperation,
|
|
54
55
|
resolveCodexHistoryJobTarget,
|
|
@@ -298,6 +299,7 @@ async function injectCodexConfigImpl(
|
|
|
298
299
|
routingTarget,
|
|
299
300
|
catalogPathOption: options.catalogPath,
|
|
300
301
|
journalReadOnly: !!options.beforeClientWrite,
|
|
302
|
+
codexVersion: passiveCodexVersion(),
|
|
301
303
|
};
|
|
302
304
|
const admittedPlan = deriveCodexInjectionPlan(rawContent, planContext);
|
|
303
305
|
if (admittedPlan.kind === "refused") {
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
import { isDeepStrictEqual } from "node:util";
|
|
2
|
+
import { chmodSync, closeSync, fsyncSync, mkdtempSync, openSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { hardenSecretDir, hardenSecretPath } from "../lib/windows-secret-acl";
|
|
5
|
+
import { isOcxRoutingMarkerLine } from "./injected-marker";
|
|
6
|
+
import { transformManagedSubagentDefaults, type WrittenSubagentDefaults } from "./subagent-defaults";
|
|
7
|
+
import { rootAssignmentKey, rootSourceLines, sourceAssignment, sourceText } from "./toml-source-lines";
|
|
8
|
+
|
|
9
|
+
const ROOT_KEYS = new Set(["openai_base_url", "experimental_realtime_ws_base_url", "model_catalog_json", "model_provider", "web_search"]);
|
|
10
|
+
type Field = { start: number; end: number; text: string; value: unknown };
|
|
11
|
+
export type JournalConfigFields = Record<string, string | null>;
|
|
12
|
+
|
|
13
|
+
/** Only injection-owned fields are captured; hooks, projects and paths never enter this map. */
|
|
14
|
+
function fields(content: string): Map<string, Field> {
|
|
15
|
+
const { lines, rootEnd } = rootSourceLines(content);
|
|
16
|
+
// Inline/dotted tables have no independently replaceable owned block. Detect
|
|
17
|
+
// them before restoring any root key; leaving them behind would lose recovery
|
|
18
|
+
// evidence while the injected provider still exists. Decode key paths as TOML,
|
|
19
|
+
// including quoted keys, without parsing unrelated (possibly wide) integers.
|
|
20
|
+
let header = "";
|
|
21
|
+
const keyToken = String.raw`(?:[A-Za-z0-9_-]+|"(?:[^"\\]|\\.)*"|'[^']*')`;
|
|
22
|
+
const assignment = new RegExp(`^\\s*(${keyToken}(?:\\s*\\.\\s*${keyToken})*)\\s*=`);
|
|
23
|
+
for (let at = 0; at < lines.length; at++) {
|
|
24
|
+
const line = lines[at]!;
|
|
25
|
+
if (!line.structural) continue;
|
|
26
|
+
if (/^\s*\[/.test(line.text)) { header = line.text; continue; }
|
|
27
|
+
const prefix = assignment.exec(line.text)?.[1];
|
|
28
|
+
if (!prefix) continue;
|
|
29
|
+
const context = Bun.TOML.parse(header) as Record<string, unknown>;
|
|
30
|
+
// Explicit owned blocks are handled losslessly by the block scan below.
|
|
31
|
+
if (["model_providers", "profiles"].some(key => {
|
|
32
|
+
const table = context[key];
|
|
33
|
+
return table && typeof table === "object" && Object.hasOwn(table, "opencodex");
|
|
34
|
+
})) continue;
|
|
35
|
+
const shape = Bun.TOML.parse(`${header}\n${prefix} = {}`) as Record<string, unknown>;
|
|
36
|
+
for (const key of ["model_providers", "profiles"]) {
|
|
37
|
+
const table = shape[key];
|
|
38
|
+
if (!table || typeof table !== "object") continue;
|
|
39
|
+
if (Object.hasOwn(table, "opencodex")) throw new Error("unsupported dotted owned Codex table");
|
|
40
|
+
if (Object.keys(table).length) continue; // an unrelated provider/profile path
|
|
41
|
+
let end = at + 1;
|
|
42
|
+
while (end < lines.length && !lines[end]!.structural) end++;
|
|
43
|
+
const value = Bun.TOML.parse(`${header}\n${sourceText(lines.slice(at, end))}`) as Record<string, unknown>;
|
|
44
|
+
const actual = value[key];
|
|
45
|
+
if (actual && typeof actual === "object" && Object.hasOwn(actual, "opencodex")) {
|
|
46
|
+
throw new Error("unsupported inline or dotted owned Codex table");
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const found = new Map<string, Field>();
|
|
51
|
+
const put = (key: string, value: Field) => {
|
|
52
|
+
if (found.has(key)) throw new Error("duplicate owned Codex field");
|
|
53
|
+
found.set(key, value);
|
|
54
|
+
};
|
|
55
|
+
for (let at = 0; at < rootEnd; at++) {
|
|
56
|
+
if (!lines[at]!.structural) continue;
|
|
57
|
+
const key = rootAssignmentKey(lines[at]!.text);
|
|
58
|
+
if (!key || !ROOT_KEYS.has(key)) continue;
|
|
59
|
+
const span = sourceAssignment(lines, at, rootEnd);
|
|
60
|
+
if (!span) throw new Error("invalid owned Codex field");
|
|
61
|
+
put(key, span);
|
|
62
|
+
}
|
|
63
|
+
for (let at = rootEnd; at < lines.length; at++) {
|
|
64
|
+
const line = lines[at]!;
|
|
65
|
+
if (!line.structural || !/^\s*\[/.test(line.text)) continue;
|
|
66
|
+
const header = Bun.TOML.parse(line.text) as Record<string, unknown>;
|
|
67
|
+
const target = ["model_providers", "profiles"].find(key => {
|
|
68
|
+
const table = header[key];
|
|
69
|
+
return table && typeof table === "object" && Object.hasOwn(table, "opencodex");
|
|
70
|
+
});
|
|
71
|
+
let end = at + 1;
|
|
72
|
+
while (end < lines.length && !(lines[end]!.structural && /^\s*\[/.test(lines[end]!.text))) end++;
|
|
73
|
+
// A marker adjacent to the next header belongs to that next block, never this one.
|
|
74
|
+
if (end < lines.length && lines[end - 1]?.structural && isOcxRoutingMarkerLine(lines[end - 1]!.text)) end--;
|
|
75
|
+
if (target) {
|
|
76
|
+
const table = (header[target] as Record<string, unknown>).opencodex;
|
|
77
|
+
if (!table || typeof table !== "object" || Object.keys(table).length) throw new Error("unsupported owned child table");
|
|
78
|
+
const text = sourceText(lines.slice(at, end));
|
|
79
|
+
// Child tables are refused rather than accidentally treating them as the parent block.
|
|
80
|
+
const value = Bun.TOML.parse(text);
|
|
81
|
+
put(`${target}.opencodex`, { start: at, end, text, value });
|
|
82
|
+
}
|
|
83
|
+
at = end - 1;
|
|
84
|
+
}
|
|
85
|
+
return found;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export function captureJournalConfigFields(content: string, ownership: Ownership): JournalConfigFields {
|
|
89
|
+
const captured: JournalConfigFields = {};
|
|
90
|
+
for (const [key, span] of fields(content)) {
|
|
91
|
+
const recorded = recordedValues(ownership).get(key);
|
|
92
|
+
if (isDeepStrictEqual(span.value, recorded) || key === "model_provider" && span.value === "opencodex"
|
|
93
|
+
|| key === "model_providers.opencodex" || key === "profiles.opencodex") captured[key] = span.text;
|
|
94
|
+
}
|
|
95
|
+
// Injection removes the root selection and old inline OCX profiles in URL-only mode.
|
|
96
|
+
for (const key of ["model_provider", "model_providers.opencodex", "profiles.opencodex"]) captured[key] ??= null;
|
|
97
|
+
return captured;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
interface Ownership {
|
|
101
|
+
injectedConfigFields?: JournalConfigFields;
|
|
102
|
+
injectedOpenaiBaseUrl?: string | null;
|
|
103
|
+
injectedRealtimeWsBaseUrl?: string | null;
|
|
104
|
+
injectedCatalogPath?: string | null;
|
|
105
|
+
injectedRootWebSearch?: string | null;
|
|
106
|
+
replacedRootWebSearch?: string | null;
|
|
107
|
+
injectedSubagentDefaults?: WrittenSubagentDefaults | null;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
function recordedValues(journal: Ownership): Map<string, unknown> {
|
|
111
|
+
const values = new Map<string, unknown>();
|
|
112
|
+
for (const [key, value] of [
|
|
113
|
+
["openai_base_url", journal.injectedOpenaiBaseUrl],
|
|
114
|
+
["experimental_realtime_ws_base_url", journal.injectedRealtimeWsBaseUrl],
|
|
115
|
+
["model_catalog_json", journal.injectedCatalogPath],
|
|
116
|
+
["web_search", journal.injectedRootWebSearch],
|
|
117
|
+
] as const) if (typeof value === "string") values.set(key, value);
|
|
118
|
+
return values;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/** Three-way restore: an edited preference stays; an edited routing field blocks hand-back. */
|
|
122
|
+
export function restoreJournalConfigFields(current: string, original: string, journal: Ownership, recoverOwnedEdits = false): string | null {
|
|
123
|
+
try {
|
|
124
|
+
const defaults = transformManagedSubagentDefaults(current, null, journal.injectedSubagentDefaults);
|
|
125
|
+
if (!defaults.ok) return null;
|
|
126
|
+
current = defaults.content;
|
|
127
|
+
const now = fields(current), before = fields(original);
|
|
128
|
+
if (journal.replacedRootWebSearch) {
|
|
129
|
+
const replaced = fields(journal.replacedRootWebSearch).get("web_search");
|
|
130
|
+
if (!replaced) return null;
|
|
131
|
+
before.set("web_search", replaced);
|
|
132
|
+
}
|
|
133
|
+
const expected = new Map<string, unknown>();
|
|
134
|
+
if (journal.injectedConfigFields) {
|
|
135
|
+
for (const [key, text] of Object.entries(journal.injectedConfigFields)) {
|
|
136
|
+
if (text === null) { expected.set(key, undefined); continue; }
|
|
137
|
+
const parsed = fields(text);
|
|
138
|
+
const field = parsed.get(key);
|
|
139
|
+
if (!field) return null;
|
|
140
|
+
expected.set(key, field.value);
|
|
141
|
+
}
|
|
142
|
+
} else {
|
|
143
|
+
// Version-1 journals predate field snapshots. Only their explicit value evidence
|
|
144
|
+
// authorizes removal; a whole-file hash alone never authorizes a guessed URL.
|
|
145
|
+
for (const [key, value] of recordedValues(journal)) expected.set(key, value);
|
|
146
|
+
if (now.get("model_provider")?.value === "opencodex") expected.set("model_provider", "opencodex");
|
|
147
|
+
}
|
|
148
|
+
const { bom, lines } = rootSourceLines(current);
|
|
149
|
+
if (recoverOwnedEdits) {
|
|
150
|
+
// Legacy journals lack field snapshots. An exact structural marker is evidence
|
|
151
|
+
// only for its adjacent owned span; loopback-looking values alone prove nothing.
|
|
152
|
+
for (const [key, span] of now) {
|
|
153
|
+
const marker = lines[span.start - 1];
|
|
154
|
+
if (key !== "web_search" && !expected.has(key) && marker?.structural && isOcxRoutingMarkerLine(marker.text)) expected.set(key, span.value);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
const replacements = new Map<number, { end: number; text: string }>();
|
|
158
|
+
const prepend: string[] = [];
|
|
159
|
+
const append: string[] = [];
|
|
160
|
+
const eol = lines.find(line => line.eol)?.eol || "\n";
|
|
161
|
+
for (const key of new Set([...now.keys(), ...expected.keys()])) {
|
|
162
|
+
const present = now.get(key), prior = before.get(key);
|
|
163
|
+
if (isDeepStrictEqual(present?.value, prior?.value)) continue;
|
|
164
|
+
if (!expected.has(key)) {
|
|
165
|
+
if (key === "model" || key.startsWith("agents.") || key === "web_search") continue;
|
|
166
|
+
return null;
|
|
167
|
+
}
|
|
168
|
+
const injected = expected.get(key);
|
|
169
|
+
if (isDeepStrictEqual(injected, prior?.value)) continue; // never owned
|
|
170
|
+
if (!isDeepStrictEqual(present?.value, injected)) {
|
|
171
|
+
if (key === "model" || key.startsWith("agents.") || key === "web_search") continue;
|
|
172
|
+
if (!recoverOwnedEdits) return null;
|
|
173
|
+
}
|
|
174
|
+
const replacement = prior ? prior.text.replace(/\r?\n/g, eol).replace(/(?:\r?\n)?$/, eol) : "";
|
|
175
|
+
if (present) {
|
|
176
|
+
let start = present.start;
|
|
177
|
+
if (start > 0 && lines[start - 1]!.structural && isOcxRoutingMarkerLine(lines[start - 1]!.text)) start--;
|
|
178
|
+
replacements.set(start, { end: present.end, text: replacement });
|
|
179
|
+
} else if (replacement) {
|
|
180
|
+
// A removed root value can safely return before the first table. Missing
|
|
181
|
+
// non-root spans require a containing table, so refuse ambiguous placement.
|
|
182
|
+
if (key.startsWith("agents.")) return null;
|
|
183
|
+
if (key.includes(".")) append.push(replacement);
|
|
184
|
+
else prepend.push(replacement);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
let out = bom + prepend.join("");
|
|
188
|
+
for (let at = 0; at < lines.length;) {
|
|
189
|
+
const replace = replacements.get(at);
|
|
190
|
+
if (replace) { out += replace.text; at = replace.end; }
|
|
191
|
+
else { out += sourceText([lines[at]!]); at++; }
|
|
192
|
+
}
|
|
193
|
+
return append.length ? `${out}${out.endsWith("\n") ? "" : eol}${append.join("")}` : out;
|
|
194
|
+
} catch { return null; }
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
/** Private, exclusive, durable preimage. Never registered as an uninstall-owned artifact. */
|
|
198
|
+
export function snapshotDisconnectRecovery(home: string, config: string | null, profile: string | null, journal: unknown): string {
|
|
199
|
+
const dir = mkdtempSync(join(home, ".ocx-disconnect-recovery-"));
|
|
200
|
+
chmodSync(dir, 0o700);
|
|
201
|
+
hardenSecretDir(dir, { required: true });
|
|
202
|
+
const path = join(dir, "snapshot.json");
|
|
203
|
+
const fd = openSync(path, "wx", 0o600);
|
|
204
|
+
try {
|
|
205
|
+
// Harden the empty file before placing possibly sensitive profile/config bytes in it.
|
|
206
|
+
hardenSecretPath(path, { required: true });
|
|
207
|
+
writeFileSync(fd, JSON.stringify({ version: 1, config, profile, journal }));
|
|
208
|
+
fsyncSync(fd);
|
|
209
|
+
} finally { closeSync(fd); }
|
|
210
|
+
if (process.platform !== "win32") {
|
|
211
|
+
for (const entry of [dir, home]) {
|
|
212
|
+
const directory = openSync(entry, "r");
|
|
213
|
+
try { fsyncSync(directory); } finally { closeSync(directory); }
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
return dir;
|
|
217
|
+
}
|
package/src/codex/journal.ts
CHANGED
|
@@ -3,13 +3,14 @@ import { createHash } from "node:crypto";
|
|
|
3
3
|
import type { AtomicWriteHooks } from "../config/atomic-write";
|
|
4
4
|
import { existsSync, lstatSync, readFileSync, unlinkSync } from "node:fs";
|
|
5
5
|
import { join } from "node:path";
|
|
6
|
-
import { atomicWriteFile } from "../config";
|
|
6
|
+
import { atomicWriteFile, withConfigMutationLockSync } from "../config";
|
|
7
7
|
import { assertCodexHomeOwner, codexHomeIsAbsent, CODEX_HOME_JOURNAL_FILE, CodexHomeOwnerRefusal, opencodexHomeForInjection, readCodexHomeJournal, type CodexHomeOwnerRefusalReason } from "./codex-home-owner";
|
|
8
8
|
import { hasInjectedCodexRouting } from "./injected-marker";
|
|
9
9
|
import { configWriteLockFailureMessage, withConfigWriteLockHeld } from "./config-write-lock";
|
|
10
10
|
import type { LockHandle } from "./config-write-lock";
|
|
11
11
|
import { CODEX_HOME, CODEX_CONFIG_PATH, CODEX_PROFILE_PATH } from "./paths";
|
|
12
12
|
import { transformManagedSubagentDefaults, type WrittenSubagentDefaults } from "./subagent-defaults";
|
|
13
|
+
import { captureJournalConfigFields, restoreJournalConfigFields, snapshotDisconnectRecovery, type JournalConfigFields } from "./journal-config-restore";
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* Exported so that anything reasoning ABOUT the journal points at the journal.
|
|
@@ -31,6 +32,7 @@ interface Journal {
|
|
|
31
32
|
originalConfig: string;
|
|
32
33
|
originalProfile: string | null;
|
|
33
34
|
injectedConfigHash?: string;
|
|
35
|
+
injectedConfigFields?: JournalConfigFields;
|
|
34
36
|
injectedProfileHash?: string | null;
|
|
35
37
|
/**
|
|
36
38
|
* The exact root `openai_base_url` this injection wrote, when it wrote one.
|
|
@@ -94,6 +96,7 @@ interface Journal {
|
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
export interface RestoreJournalResult {
|
|
99
|
+
recoveryBackupDir?: string;
|
|
97
100
|
/** The shared config write lock was held by another opencodex writer; restore did not run. */
|
|
98
101
|
lockBusy?: true;
|
|
99
102
|
lockUnsafe?: string;
|
|
@@ -247,6 +250,7 @@ export function markJournalInjectedState(
|
|
|
247
250
|
// hashing those newer bytes and restoring the first snapshot would delete those edits.
|
|
248
251
|
// Keep the first hash so changed/reinjected configs take the owned-field fallback path.
|
|
249
252
|
journal.injectedConfigHash ??= sha256(config) ?? undefined;
|
|
253
|
+
journal.injectedConfigFields = captureJournalConfigFields(config, ownership);
|
|
250
254
|
// The profile file is wholly generated by OpenCodex, so its latest exact hash remains safe
|
|
251
255
|
// to refresh and lets restore remove the latest generated profile after a port change.
|
|
252
256
|
journal.injectedProfileHash = sha256(profile);
|
|
@@ -354,7 +358,7 @@ export function journalOwner(options: { readOnly?: boolean } = {}): JournalOwner
|
|
|
354
358
|
}
|
|
355
359
|
|
|
356
360
|
export function restoreJournalState(
|
|
357
|
-
options: { heldConfigWriteLock?: LockHandle } = {},
|
|
361
|
+
options: { heldConfigWriteLock?: LockHandle; preserveConfigEdits?: boolean; recoverConfigForClient?: string; beforeWrite?: () => void } = {},
|
|
358
362
|
): RestoreJournalResult {
|
|
359
363
|
if (codexHomeIsAbsent(CODEX_HOME)) return {
|
|
360
364
|
configRestored: false, profileRestored: false, configRewritten: false, profileRewritten: false,
|
|
@@ -368,6 +372,7 @@ export function restoreJournalState(
|
|
|
368
372
|
configChanged: false, profileChanged: false, complete: false, unverified: true, ownershipRefusal: error.reason };
|
|
369
373
|
}
|
|
370
374
|
beginCodexWriteSection(held);
|
|
375
|
+
options.beforeWrite?.();
|
|
371
376
|
const journal = readJournal();
|
|
372
377
|
if (!journal) {
|
|
373
378
|
return { configRestored: false, profileRestored: false, configRewritten: false, profileRewritten: false,
|
|
@@ -377,9 +382,12 @@ export function restoreJournalState(
|
|
|
377
382
|
const currentProfile = existsSync(CODEX_PROFILE_PATH) ? readFileSync(CODEX_PROFILE_PATH, "utf-8") : null;
|
|
378
383
|
const comparison = compareJournalState(journal, currentConfig, currentProfile);
|
|
379
384
|
const { configUnchanged, profileUnchanged } = comparison;
|
|
385
|
+
const recovery = options.recoverConfigForClient !== undefined;
|
|
386
|
+
if (recovery && (!options.recoverConfigForClient || journal.owner?.kind !== "client"
|
|
387
|
+
|| journal.owner.apiKeyId !== options.recoverConfigForClient)) throw new Error("disconnect recovery refused: Codex journal must belong to the connected client key");
|
|
380
388
|
// A legacy record or interruption before markJournalInjectedState is not proof that
|
|
381
389
|
// later bytes belong to OpenCodex. Keep the whole pair and its recovery evidence intact.
|
|
382
|
-
if (comparison.unverified) {
|
|
390
|
+
if ((!recovery && comparison.unverified) || (recovery && !profileUnchanged)) {
|
|
383
391
|
return {
|
|
384
392
|
configRestored: comparison.configAlreadyOriginal,
|
|
385
393
|
profileRestored: comparison.profileAlreadyOriginal,
|
|
@@ -388,10 +396,18 @@ export function restoreJournalState(
|
|
|
388
396
|
configChanged: !configUnchanged,
|
|
389
397
|
profileChanged: !profileUnchanged,
|
|
390
398
|
complete: false,
|
|
391
|
-
unverified:
|
|
399
|
+
unverified: comparison.unverified,
|
|
392
400
|
};
|
|
393
401
|
}
|
|
394
402
|
|
|
403
|
+
const fieldRestore = (recovery || options.preserveConfigEdits && !configUnchanged) && currentConfig !== null
|
|
404
|
+
? restoreJournalConfigFields(currentConfig, comparison.originalConfig, journal, recovery) : null;
|
|
405
|
+
if ((recovery || options.preserveConfigEdits && !configUnchanged) && fieldRestore === null) {
|
|
406
|
+
return { configRestored: false, profileRestored: comparison.profileAlreadyOriginal,
|
|
407
|
+
configRewritten: false, profileRewritten: false, configChanged: true,
|
|
408
|
+
profileChanged: !profileUnchanged, complete: false, unverified: false };
|
|
409
|
+
}
|
|
410
|
+
|
|
395
411
|
// A matching byte hash does not authorize following a newly substituted profile link.
|
|
396
412
|
// Refuse the complete pair before restoring config or deleting its recovery journal.
|
|
397
413
|
let profileIsSymlink = false;
|
|
@@ -408,12 +424,16 @@ export function restoreJournalState(
|
|
|
408
424
|
};
|
|
409
425
|
}
|
|
410
426
|
assertCodexHomeOwner(CODEX_HOME);
|
|
427
|
+
options.beforeWrite?.();
|
|
428
|
+
const recoveryBackupDir = recovery
|
|
429
|
+
? snapshotDisconnectRecovery(CODEX_HOME, currentConfig, currentProfile, journal) : undefined;
|
|
411
430
|
let configRestored = comparison.configAlreadyOriginal;
|
|
412
431
|
let profileRestored = comparison.profileAlreadyOriginal;
|
|
413
432
|
let configRewritten = false;
|
|
414
433
|
let profileRewritten = false;
|
|
415
|
-
if (configUnchanged && !configRestored) {
|
|
416
|
-
|
|
434
|
+
if ((configUnchanged || fieldRestore !== null) && !configRestored) {
|
|
435
|
+
options.beforeWrite?.();
|
|
436
|
+
publishCodexArtifact(CODEX_CONFIG_PATH, held, (path, hooks) => atomicWriteFile(path, fieldRestore ?? comparison.originalConfig, undefined, hooks));
|
|
417
437
|
configRestored = true;
|
|
418
438
|
configRewritten = true;
|
|
419
439
|
}
|
|
@@ -445,6 +465,7 @@ export function restoreJournalState(
|
|
|
445
465
|
catch { complete = false; }
|
|
446
466
|
}
|
|
447
467
|
return {
|
|
468
|
+
...(recoveryBackupDir ? { recoveryBackupDir } : {}),
|
|
448
469
|
configRestored,
|
|
449
470
|
profileRestored,
|
|
450
471
|
configRewritten,
|
|
@@ -494,6 +515,54 @@ export interface ReconcileJournalOptions {
|
|
|
494
515
|
adoptUpdateHandover?: boolean;
|
|
495
516
|
}
|
|
496
517
|
|
|
518
|
+
/**
|
|
519
|
+
* Called by `connectClient` right after its connection commits, when its injection ran: the
|
|
520
|
+
* client takes over a journal another owner wrote (a standalone proxy's injection it re-injected
|
|
521
|
+
* over), keeping the original snapshot. Before the commit the journal stays its writer's, so a
|
|
522
|
+
* runtime starting mid-connect sees a live process owner and leaves it alone. Without the takeover
|
|
523
|
+
* the first start after that process exited (a supervisor relaunch after `ocx connect --link` and
|
|
524
|
+
* `ocx restart`) read it as a crashed session and restored native Codex under the new link.
|
|
525
|
+
* Only a process-written journal is taken: another client's journal belongs to a later connection
|
|
526
|
+
* (a stale sync must never claim it), and `beforeWrite` re-runs the caller's connection guard under
|
|
527
|
+
* the Codex config lock and the config mutation lock together with the write, so a connection that
|
|
528
|
+
* changed since its injection writes nothing and none can change before the write lands.
|
|
529
|
+
* Outcomes: `adopted`, `owned` (already this client's), `missing` (no journal), `foreign` (another
|
|
530
|
+
* client's journal, left alone; see {@link journalHandoverIncomplete}).
|
|
531
|
+
*/
|
|
532
|
+
export type JournalAdoption = "adopted" | "owned" | "missing" | "foreign";
|
|
533
|
+
|
|
534
|
+
/**
|
|
535
|
+
* Whether routing is still at risk after a handover. No journal (external providers leave none)
|
|
536
|
+
* gives startup recovery nothing to restore; only another client's journal is restored over this
|
|
537
|
+
* connection on the next start.
|
|
538
|
+
*/
|
|
539
|
+
export function journalHandoverIncomplete(adoption: JournalAdoption): boolean {
|
|
540
|
+
return adoption === "foreign";
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
export function adoptJournalForClient(apiKeyId: string, beforeWrite: () => void = () => {}): JournalAdoption {
|
|
544
|
+
if (codexHomeIsAbsent(CODEX_HOME)) return "missing";
|
|
545
|
+
const locked = withConfigWriteLockHeld(CODEX_CONFIG_PATH, undefined, (handle): JournalAdoption => {
|
|
546
|
+
assertCodexHomeOwner(CODEX_HOME);
|
|
547
|
+
beginCodexWriteSection(handle);
|
|
548
|
+
// Only a confirmed absence is safe; an unreadable journal may still hold a restorable owner.
|
|
549
|
+
const inspection = readCodexHomeJournal(JOURNAL_PATH);
|
|
550
|
+
if (inspection.kind === "unknown") throw new CodexHomeOwnerRefusal("owner-unknown");
|
|
551
|
+
if (inspection.kind === "missing") return "missing";
|
|
552
|
+
const journal = inspection.journal as unknown as Journal;
|
|
553
|
+
if (journal.owner?.kind === "client") return journal.owner.apiKeyId === apiKeyId ? "owned" : "foreign";
|
|
554
|
+
// Codex lock, then the mutation lock (the injection's order): guard and write as one step.
|
|
555
|
+
return withConfigMutationLockSync(() => {
|
|
556
|
+
beforeWrite();
|
|
557
|
+
const adopted = JSON.stringify({ ...journal, owner: { kind: "client", apiKeyId } });
|
|
558
|
+
publishCodexArtifact(JOURNAL_PATH, handle, (path, hooks) => atomicWriteFile(path, adopted, undefined, hooks));
|
|
559
|
+
return "adopted" as const;
|
|
560
|
+
});
|
|
561
|
+
});
|
|
562
|
+
if (!locked.ok) throw new Error(locked.error === "unsafe" ? configWriteLockFailureMessage(locked) : "the Codex config lock is busy");
|
|
563
|
+
return locked.value;
|
|
564
|
+
}
|
|
565
|
+
|
|
497
566
|
export function reconcileJournal(options: ReconcileJournalOptions = {}): boolean {
|
|
498
567
|
if (codexHomeIsAbsent(CODEX_HOME)) return false;
|
|
499
568
|
const locked = withConfigWriteLockHeld(CODEX_CONFIG_PATH, undefined, handle => {
|