@bitkyc08/opencodex 2.100.1 → 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-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- 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 +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- 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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- 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 +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- 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 +314 -0
- 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 +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +29 -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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-readiness.ts +16 -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-status.ts +76 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- 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-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- 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-types.ts +2 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- 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/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- 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 +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- 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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- 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 +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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/account-resume-health.ts +60 -0
- 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 +25 -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 +51 -1
- 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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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/config-routes.ts +7 -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 +218 -0
- 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 +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -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 +22 -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-failure-detail.ts +59 -1
- 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 +40 -51
- 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 +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -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 +99 -106
- 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 +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- 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/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -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/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -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 => {
|
|
@@ -3,7 +3,7 @@ import { captureMainAccountIdentityGeneration, getMainQuotaCredentialGeneration,
|
|
|
3
3
|
import { classifyChatgptRefreshFailure, noteChatgptRefreshFailure } from "./chatgpt-refresh-failure";
|
|
4
4
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
5
5
|
import { createHash } from "node:crypto";
|
|
6
|
-
import { lstatSync,
|
|
6
|
+
import { lstatSync, statSync } from "node:fs";
|
|
7
7
|
import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
|
|
8
8
|
import { dirname, join, resolve } from "node:path";
|
|
9
9
|
import { readCodexTokens } from "./auth-collision";
|
|
@@ -21,8 +21,9 @@ import {
|
|
|
21
21
|
refreshGrantFingerprintForToken,
|
|
22
22
|
withCodexRefreshFileLock,
|
|
23
23
|
} from "./account-store";
|
|
24
|
-
import {
|
|
24
|
+
import { resolveWriteTarget } from "../config/atomic-write";
|
|
25
25
|
import { resolveCodexHomeDir } from "./home";
|
|
26
|
+
import { readNativeMainAuthBytes, writeNativeMainAuthFile } from "./native-main-auth-file";
|
|
26
27
|
import { assertNotRealCodexHomeUnderTest } from "../lib/test-home-guard";
|
|
27
28
|
import {
|
|
28
29
|
clearAccountNeedsReauth,
|
|
@@ -215,7 +216,7 @@ function readMainAuthJsonCredential(): MainAuthJsonCredential | null {
|
|
|
215
216
|
const path = resolveWriteTarget(join(resolveCodexHomeDir(), "auth.json"));
|
|
216
217
|
let raw: string;
|
|
217
218
|
try {
|
|
218
|
-
raw =
|
|
219
|
+
raw = readNativeMainAuthBytes(path, "plain").toString("utf8");
|
|
219
220
|
} catch {
|
|
220
221
|
return null;
|
|
221
222
|
}
|
|
@@ -322,6 +323,21 @@ function assertMainAuthJsonIdentityUnchanged(expected: MainAuthJsonCredential):
|
|
|
322
323
|
}
|
|
323
324
|
}
|
|
324
325
|
|
|
326
|
+
function publishMainAuthJson(expected: MainAuthJsonCredential, content: string): void {
|
|
327
|
+
writeNativeMainAuthFile(expected.path, content, {
|
|
328
|
+
beforeRename: () => {
|
|
329
|
+
assertMainAuthJsonSnapshotUnchanged(expected);
|
|
330
|
+
const hook = beforeMainAuthJsonRenameForTests;
|
|
331
|
+
beforeMainAuthJsonRenameForTests = null;
|
|
332
|
+
hook?.();
|
|
333
|
+
},
|
|
334
|
+
// Runs immediately before rename(2), after the test hook has had its chance to
|
|
335
|
+
// simulate an external writer. Full snapshot check (content AND identity): this is
|
|
336
|
+
// the last look we get, so it asks everything it can rather than the cheap question.
|
|
337
|
+
validateBeforeRename: () => assertMainAuthJsonSnapshotUnchanged(expected),
|
|
338
|
+
});
|
|
339
|
+
}
|
|
340
|
+
|
|
325
341
|
function persistRefreshedMainAuthJson(
|
|
326
342
|
expected: MainAuthJsonCredential,
|
|
327
343
|
refreshed: OAuthCredentials,
|
|
@@ -336,22 +352,9 @@ function persistRefreshedMainAuthJson(
|
|
|
336
352
|
refresh_token: refreshToken,
|
|
337
353
|
account_id: chatgptAccountId,
|
|
338
354
|
};
|
|
339
|
-
publishCredentialSync(() =>
|
|
340
|
-
expected
|
|
355
|
+
publishCredentialSync(() => publishMainAuthJson(
|
|
356
|
+
expected,
|
|
341
357
|
JSON.stringify({ ...expected.root, tokens }, null, 2) + "\n",
|
|
342
|
-
undefined,
|
|
343
|
-
{
|
|
344
|
-
beforeRename: () => {
|
|
345
|
-
assertMainAuthJsonSnapshotUnchanged(expected);
|
|
346
|
-
const hook = beforeMainAuthJsonRenameForTests;
|
|
347
|
-
beforeMainAuthJsonRenameForTests = null;
|
|
348
|
-
hook?.();
|
|
349
|
-
},
|
|
350
|
-
// Runs immediately before rename(2), after the test hook has had its chance to
|
|
351
|
-
// simulate an external writer. Full snapshot check (content AND identity): this is
|
|
352
|
-
// the last look we get, so it asks everything it can rather than the cheap question.
|
|
353
|
-
validateBeforeRename: () => assertMainAuthJsonSnapshotUnchanged(expected),
|
|
354
|
-
},
|
|
355
358
|
));
|
|
356
359
|
advanceCodexCredentialMutationEpoch();
|
|
357
360
|
return { accessToken, chatgptAccountId };
|
|
@@ -403,19 +406,9 @@ function persistNativeMainReauthTokens(
|
|
|
403
406
|
id_token: tokens.idToken,
|
|
404
407
|
account_id: tokens.chatgptAccountId,
|
|
405
408
|
};
|
|
406
|
-
|
|
407
|
-
expected
|
|
409
|
+
publishMainAuthJson(
|
|
410
|
+
expected,
|
|
408
411
|
JSON.stringify({ ...expected.root, tokens: nextTokens }, null, 2) + "\n",
|
|
409
|
-
undefined,
|
|
410
|
-
{
|
|
411
|
-
beforeRename: () => {
|
|
412
|
-
assertMainAuthJsonSnapshotUnchanged(expected);
|
|
413
|
-
const hook = beforeMainAuthJsonRenameForTests;
|
|
414
|
-
beforeMainAuthJsonRenameForTests = null;
|
|
415
|
-
hook?.();
|
|
416
|
-
},
|
|
417
|
-
validateBeforeRename: () => assertMainAuthJsonSnapshotUnchanged(expected),
|
|
418
|
-
},
|
|
419
412
|
);
|
|
420
413
|
advanceCodexCredentialMutationEpoch();
|
|
421
414
|
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import {
|
|
2
|
+
closeSync,
|
|
3
|
+
constants as fsConstants,
|
|
4
|
+
fstatSync,
|
|
5
|
+
lstatSync,
|
|
6
|
+
openSync,
|
|
7
|
+
readFileSync,
|
|
8
|
+
readSync,
|
|
9
|
+
statSync,
|
|
10
|
+
type BigIntStats,
|
|
11
|
+
} from "node:fs";
|
|
12
|
+
import { readBoundedLocalFile } from "./orca-auth-source";
|
|
13
|
+
import { atomicWriteFile, type AtomicWriteHooks } from "../config/atomic-write";
|
|
14
|
+
|
|
15
|
+
export const MAX_AUTH_BYTES = 4 * 1024 * 1024;
|
|
16
|
+
|
|
17
|
+
export interface BoundedReadTestSeam {
|
|
18
|
+
beforeOpen?: (path: string) => void;
|
|
19
|
+
afterValidatedOpen?: (path: string, fd: number) => void;
|
|
20
|
+
onBufferAllocated?: (byteLength: number) => void;
|
|
21
|
+
onRead?: (requestedBytes: number, bytesRead: number, totalBytesRead: number) => void;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export type NativeMainAuthReadMode = "plain" | "bounded" | "local-bounded";
|
|
25
|
+
|
|
26
|
+
/** Reads the raw bytes of a native-main login file. Throws the error of the underlying read unchanged. */
|
|
27
|
+
export function readNativeMainAuthBytes(path: string, mode: NativeMainAuthReadMode, limit?: number): Buffer {
|
|
28
|
+
if (mode === "plain") return readFileSync(path);
|
|
29
|
+
if (mode === "bounded") return readBounded(path, limit ?? MAX_AUTH_BYTES);
|
|
30
|
+
return Buffer.from(readBoundedLocalFile(path, limit ?? MAX_AUTH_BYTES), "utf8");
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export function nativeAuthStatStamp(value: BigIntStats): string {
|
|
34
|
+
return `${value.dev}:${value.ino}:${value.size}:${value.mtimeNs}:${value.ctimeNs}`;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/** Reads with a stat before and after, as the desktop identity reader did. */
|
|
38
|
+
export function readNativeMainAuthBytesStable(path: string, maxBytes: bigint): { bytes: Buffer; stat: BigIntStats } {
|
|
39
|
+
const before = statSync(path, { bigint: true });
|
|
40
|
+
if (before.size > maxBytes) throw new Error('Unexpected native auth size');
|
|
41
|
+
const bytes = readFileSync(path);
|
|
42
|
+
const after = statSync(path, { bigint: true });
|
|
43
|
+
if (nativeAuthStatStamp(before) !== nativeAuthStatStamp(after)) throw new Error('Native credentials changed during read');
|
|
44
|
+
return { bytes, stat: after };
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** The only sync writer of a native-main login file. */
|
|
48
|
+
export function writeNativeMainAuthFile(path: string, content: string, hooks: AtomicWriteHooks): void {
|
|
49
|
+
atomicWriteFile(path, content, undefined, hooks);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** The only async writer of a native-main login file. `write` keeps the caller's injected writer (a test seam of NativeProfileManager). */
|
|
53
|
+
export async function writeNativeMainAuthFileAsync(path: string, content: string, write: (path: string, content: string) => Promise<void>): Promise<void> {
|
|
54
|
+
await write(path, content);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export function readBounded(path: string, limit: number, testSeam?: BoundedReadTestSeam): Buffer {
|
|
58
|
+
let fd: number | undefined;
|
|
59
|
+
let failed = false;
|
|
60
|
+
try {
|
|
61
|
+
testSeam?.beforeOpen?.(path);
|
|
62
|
+
const flags = process.platform === "win32"
|
|
63
|
+
? fsConstants.O_RDONLY
|
|
64
|
+
: fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW | fsConstants.O_NONBLOCK;
|
|
65
|
+
fd = openSync(path, flags);
|
|
66
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
67
|
+
if (!opened.isFile() || opened.size > BigInt(limit)) throw new Error("invalid bounded file");
|
|
68
|
+
|
|
69
|
+
if (process.platform === "win32") {
|
|
70
|
+
const pathEntry = lstatSync(path, { bigint: true });
|
|
71
|
+
if (
|
|
72
|
+
!pathEntry.isFile()
|
|
73
|
+
|| pathEntry.isSymbolicLink()
|
|
74
|
+
|| pathEntry.dev !== opened.dev
|
|
75
|
+
|| pathEntry.ino !== opened.ino
|
|
76
|
+
) throw new Error("invalid bounded file");
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
testSeam?.afterValidatedOpen?.(path, fd);
|
|
80
|
+
const buffer = Buffer.allocUnsafe(limit + 1);
|
|
81
|
+
testSeam?.onBufferAllocated?.(buffer.byteLength);
|
|
82
|
+
let totalBytesRead = 0;
|
|
83
|
+
while (totalBytesRead < buffer.byteLength) {
|
|
84
|
+
const requestedBytes = buffer.byteLength - totalBytesRead;
|
|
85
|
+
const bytesRead = readSync(fd, buffer, totalBytesRead, requestedBytes, totalBytesRead);
|
|
86
|
+
totalBytesRead += bytesRead;
|
|
87
|
+
testSeam?.onRead?.(requestedBytes, bytesRead, totalBytesRead);
|
|
88
|
+
if (bytesRead === 0) break;
|
|
89
|
+
}
|
|
90
|
+
if (totalBytesRead > limit) throw new Error("invalid bounded file");
|
|
91
|
+
return buffer.subarray(0, totalBytesRead);
|
|
92
|
+
} catch (error) {
|
|
93
|
+
failed = true;
|
|
94
|
+
throw error;
|
|
95
|
+
} finally {
|
|
96
|
+
if (fd !== undefined) {
|
|
97
|
+
try {
|
|
98
|
+
closeSync(fd);
|
|
99
|
+
} catch (error) {
|
|
100
|
+
if (!failed) throw error;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
@@ -75,6 +75,7 @@ import {
|
|
|
75
75
|
type NativeStageProof,
|
|
76
76
|
type NativeStageTerminalOutcome,
|
|
77
77
|
} from "./native-profile-stage-store";
|
|
78
|
+
import { writeNativeMainAuthFileAsync } from "./native-main-auth-file";
|
|
78
79
|
|
|
79
80
|
const LOCK_WAIT_MS = 5_000;
|
|
80
81
|
const LEGACY_STAGE_MAX_AGE_MS = 30 * 60_000;
|
|
@@ -1307,7 +1308,7 @@ export class NativeProfileManager {
|
|
|
1307
1308
|
journalPrepared = true;
|
|
1308
1309
|
await this.onSwitchBoundary("journal-prepared");
|
|
1309
1310
|
this.assertOperationStorageStable();
|
|
1310
|
-
await
|
|
1311
|
+
await writeNativeMainAuthFileAsync(this.context.authPath, target.text, this.atomicWrite);
|
|
1311
1312
|
const observedTarget = this.verifyWrittenEnvelope(target.digest, targetProfile.identityHash, key);
|
|
1312
1313
|
observedTarget.raw.fill(0);
|
|
1313
1314
|
advanceCodexCredentialMutationEpoch();
|
|
@@ -1336,7 +1337,7 @@ export class NativeProfileManager {
|
|
|
1336
1337
|
}
|
|
1337
1338
|
try {
|
|
1338
1339
|
this.assertOperationStorageStable();
|
|
1339
|
-
await
|
|
1340
|
+
await writeNativeMainAuthFileAsync(this.context.authPath, source!.text, this.atomicWrite);
|
|
1340
1341
|
const restored = this.verifyWrittenEnvelope(source!.digest, nativeIdentityHash(key!.key, source!.accountId), key!);
|
|
1341
1342
|
restored.raw.fill(0);
|
|
1342
1343
|
advanceCodexCredentialMutationEpoch();
|
|
@@ -1451,7 +1452,7 @@ export class NativeProfileManager {
|
|
|
1451
1452
|
rollbackVaultPublished = true;
|
|
1452
1453
|
}
|
|
1453
1454
|
this.assertOperationStorageStable();
|
|
1454
|
-
await
|
|
1455
|
+
await writeNativeMainAuthFileAsync(this.context.authPath, sourceEnvelope.text, this.atomicWrite);
|
|
1455
1456
|
const restored = this.verifyWrittenEnvelope(sourceEnvelope.digest, journal.sourceIdentityHash, key);
|
|
1456
1457
|
restored.raw.fill(0);
|
|
1457
1458
|
advanceCodexCredentialMutationEpoch();
|