@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- 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/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- 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 +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +178 -0
- package/src/cli/dispatch.ts +61 -13
- 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 +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- 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/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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 +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- 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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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/budget.ts +23 -5
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- 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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- 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-billing-refusal.ts +27 -3
- 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 +515 -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 +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/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/workbuddy.ts +6 -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/workbuddy-credit-balance.ts +125 -16
- 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/effort-history.ts +732 -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/history/integrity.ts +41 -4
- 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 +111 -3
- 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 +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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 +196 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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 +39 -3
- 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 +192 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- 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/static-catalog-probe.ts +33 -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 +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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 +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- 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 +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- 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 +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- 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 +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -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,18 @@ 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 { writeNativeMainAuthFile } from "./native-main-auth-file";
|
|
27
|
+
import {
|
|
28
|
+
beginNativeMainObservation,
|
|
29
|
+
invalidateRetainedNativeMainLogin,
|
|
30
|
+
invalidationForObservation,
|
|
31
|
+
observeNativeMainAuthFile,
|
|
32
|
+
retainedNativeMainLogin,
|
|
33
|
+
retainNativeMainLogin,
|
|
34
|
+
type NativeMainObservationTicket,
|
|
35
|
+
} from "./native-main-credentials";
|
|
26
36
|
import { assertNotRealCodexHomeUnderTest } from "../lib/test-home-guard";
|
|
27
37
|
import {
|
|
28
38
|
clearAccountNeedsReauth,
|
|
@@ -38,6 +48,7 @@ import { isNativeMainTrafficBlocked } from "./native-profile-startup";
|
|
|
38
48
|
import { loadConfig } from "../config";
|
|
39
49
|
import {
|
|
40
50
|
requestCodexAuthStatus,
|
|
51
|
+
configuredNativeMainRefreshMode,
|
|
41
52
|
resolveNativeMainRefreshMode,
|
|
42
53
|
type CodexAuthStatus,
|
|
43
54
|
} from "./native-main-refresh-mode";
|
|
@@ -93,6 +104,8 @@ type MainAuthJsonCredential = {
|
|
|
93
104
|
accessToken?: string;
|
|
94
105
|
refreshToken?: string;
|
|
95
106
|
chatgptAccountId: string;
|
|
107
|
+
/** Served from retention while the file is mid-rewrite (#7345); never a write-guard snapshot. */
|
|
108
|
+
retained?: true;
|
|
96
109
|
};
|
|
97
110
|
|
|
98
111
|
export interface NativeMainRefreshDependencies {
|
|
@@ -211,41 +224,73 @@ function statIdentity(path: string): FileIdentity | null {
|
|
|
211
224
|
}
|
|
212
225
|
}
|
|
213
226
|
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
227
|
+
interface MainAuthJsonReadOptions {
|
|
228
|
+
/** Answer an empty or partially written file from the last complete same-owner login. */
|
|
229
|
+
serveRetained?: boolean;
|
|
230
|
+
/**
|
|
231
|
+
* Ticket a complete observation retains under; `false` for write guards, which observe
|
|
232
|
+
* without retaining. A ticket captured before an async exchange refuses a stale completion.
|
|
233
|
+
*/
|
|
234
|
+
retainWith?: NativeMainObservationTicket | false;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* The native-main login, through {@link observeNativeMainAuthFile} (#7345). Missing, no-login and
|
|
239
|
+
* unreadable observations end retention; only an incomplete one may be answered from it, and only
|
|
240
|
+
* when the caller asks and the owner, file identity and credential epoch are unchanged.
|
|
241
|
+
*/
|
|
242
|
+
function readMainAuthJsonCredential(options: MainAuthJsonReadOptions = {}): MainAuthJsonCredential | null {
|
|
243
|
+
const codexHome = resolveCodexHomeDir();
|
|
244
|
+
const path = resolveWriteTarget(join(codexHome, "auth.json"));
|
|
245
|
+
const owner = { codexHome, path };
|
|
246
|
+
const ticket = options.retainWith === undefined ? beginNativeMainObservation() : options.retainWith;
|
|
247
|
+
const observation = observeNativeMainAuthFile(path);
|
|
248
|
+
if (observation.kind === "complete") {
|
|
249
|
+
const { raw, root, tokens } = observation;
|
|
229
250
|
const accessToken = nonEmptyString(tokens.access_token);
|
|
230
251
|
const refreshToken = nonEmptyString(tokens.refresh_token);
|
|
231
|
-
if (!accessToken && !refreshToken) return null;
|
|
232
252
|
const idToken = nonEmptyString(tokens.id_token);
|
|
233
|
-
const
|
|
234
|
-
?? nonEmptyString(tokens.account_id)
|
|
235
|
-
?? "";
|
|
236
|
-
return {
|
|
253
|
+
const credential: MainAuthJsonCredential = {
|
|
237
254
|
path,
|
|
238
255
|
rawSha256: sha256(raw),
|
|
239
|
-
identity
|
|
256
|
+
// The identity the bytes were read from; null (fail closed) when it changed mid-read.
|
|
257
|
+
identity: observation.identity,
|
|
240
258
|
root,
|
|
241
259
|
tokens,
|
|
242
260
|
...(accessToken ? { accessToken } : {}),
|
|
243
261
|
...(refreshToken ? { refreshToken } : {}),
|
|
244
|
-
chatgptAccountId,
|
|
262
|
+
chatgptAccountId: extractAccountId(idToken, accessToken) ?? nonEmptyString(tokens.account_id) ?? "",
|
|
245
263
|
};
|
|
246
|
-
|
|
264
|
+
if (ticket) {
|
|
265
|
+
retainNativeMainLogin(ticket, owner, credential.identity, credential, {
|
|
266
|
+
fingerprint: credential.rawSha256,
|
|
267
|
+
configuredRefreshMode: configuredRefreshOwner,
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
return credential;
|
|
271
|
+
}
|
|
272
|
+
const invalidation = invalidationForObservation(observation);
|
|
273
|
+
if (invalidation) {
|
|
274
|
+
invalidateRetainedNativeMainLogin(invalidation);
|
|
247
275
|
return null;
|
|
248
276
|
}
|
|
277
|
+
if (observation.kind !== "incomplete" || !options.serveRetained) return null;
|
|
278
|
+
if (isNativeMainTrafficBlocked()) {
|
|
279
|
+
invalidateRetainedNativeMainLogin("ownership-loss");
|
|
280
|
+
return null;
|
|
281
|
+
}
|
|
282
|
+
const retained = retainedNativeMainLogin<MainAuthJsonCredential>(owner, observation.identity, configuredRefreshOwner);
|
|
283
|
+
if (!retained) return null;
|
|
284
|
+
if (credentialRefreshGrantRejected(retained)) {
|
|
285
|
+
invalidateRetainedNativeMainLogin("revocation");
|
|
286
|
+
return null;
|
|
287
|
+
}
|
|
288
|
+
return { ...retained, retained: true };
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
/** Read only when a new login is retained or a retained one is about to be served. */
|
|
292
|
+
function configuredRefreshOwner(): string {
|
|
293
|
+
return configuredNativeMainRefreshMode(loadConfig());
|
|
249
294
|
}
|
|
250
295
|
|
|
251
296
|
function mainAccessTokenFresh(accessToken: string | undefined, now: number, skewMs: number): boolean {
|
|
@@ -274,7 +319,10 @@ export interface MainAccountCredentialStatus {
|
|
|
274
319
|
|
|
275
320
|
/** One owned physical observation; no credential material escapes this view. */
|
|
276
321
|
export function getMainAccountCredentialStatus(now = Date.now()): MainAccountCredentialStatus {
|
|
277
|
-
|
|
322
|
+
let current = readMainAuthJsonCredential({ serveRetained: true });
|
|
323
|
+
// A retained login is usable only while its bearer is fresh: an expired one goes to the refresh
|
|
324
|
+
// owner, which cannot refresh a file mid-rewrite, so it must not be selected (#7345).
|
|
325
|
+
if (current?.retained && !mainAccessTokenFresh(current.accessToken, now, MAIN_TOKEN_REFRESH_SKEW_MS)) current = null;
|
|
278
326
|
const owned = !current && codexOwnedMainCredential?.home === resolveCodexHomeDir() ? codexOwnedMainCredential : null;
|
|
279
327
|
const refreshGrantRejected = credentialRefreshGrantRejected(current);
|
|
280
328
|
const hasRefreshGrant = !!current?.refreshToken && !refreshGrantRejected;
|
|
@@ -303,7 +351,7 @@ export function hasMainAccountRefreshGrant(): boolean {
|
|
|
303
351
|
}
|
|
304
352
|
|
|
305
353
|
function assertMainAuthJsonSnapshotUnchanged(expected: MainAuthJsonCredential): void {
|
|
306
|
-
const current = readMainAuthJsonCredential();
|
|
354
|
+
const current = readMainAuthJsonCredential({ retainWith: false });
|
|
307
355
|
if (!current || current.path !== expected.path || current.rawSha256 !== expected.rawSha256) {
|
|
308
356
|
throw new MainAuthJsonChangedDuringRefreshError();
|
|
309
357
|
}
|
|
@@ -322,6 +370,21 @@ function assertMainAuthJsonIdentityUnchanged(expected: MainAuthJsonCredential):
|
|
|
322
370
|
}
|
|
323
371
|
}
|
|
324
372
|
|
|
373
|
+
function publishMainAuthJson(expected: MainAuthJsonCredential, content: string): void {
|
|
374
|
+
writeNativeMainAuthFile(expected.path, content, {
|
|
375
|
+
beforeRename: () => {
|
|
376
|
+
assertMainAuthJsonSnapshotUnchanged(expected);
|
|
377
|
+
const hook = beforeMainAuthJsonRenameForTests;
|
|
378
|
+
beforeMainAuthJsonRenameForTests = null;
|
|
379
|
+
hook?.();
|
|
380
|
+
},
|
|
381
|
+
// Runs immediately before rename(2), after the test hook has had its chance to
|
|
382
|
+
// simulate an external writer. Full snapshot check (content AND identity): this is
|
|
383
|
+
// the last look we get, so it asks everything it can rather than the cheap question.
|
|
384
|
+
validateBeforeRename: () => assertMainAuthJsonSnapshotUnchanged(expected),
|
|
385
|
+
});
|
|
386
|
+
}
|
|
387
|
+
|
|
325
388
|
function persistRefreshedMainAuthJson(
|
|
326
389
|
expected: MainAuthJsonCredential,
|
|
327
390
|
refreshed: OAuthCredentials,
|
|
@@ -336,22 +399,9 @@ function persistRefreshedMainAuthJson(
|
|
|
336
399
|
refresh_token: refreshToken,
|
|
337
400
|
account_id: chatgptAccountId,
|
|
338
401
|
};
|
|
339
|
-
publishCredentialSync(() =>
|
|
340
|
-
expected
|
|
402
|
+
publishCredentialSync(() => publishMainAuthJson(
|
|
403
|
+
expected,
|
|
341
404
|
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
405
|
));
|
|
356
406
|
advanceCodexCredentialMutationEpoch();
|
|
357
407
|
return { accessToken, chatgptAccountId };
|
|
@@ -403,19 +453,9 @@ function persistNativeMainReauthTokens(
|
|
|
403
453
|
id_token: tokens.idToken,
|
|
404
454
|
account_id: tokens.chatgptAccountId,
|
|
405
455
|
};
|
|
406
|
-
|
|
407
|
-
expected
|
|
456
|
+
publishMainAuthJson(
|
|
457
|
+
expected,
|
|
408
458
|
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
459
|
);
|
|
420
460
|
advanceCodexCredentialMutationEpoch();
|
|
421
461
|
}
|
|
@@ -443,7 +483,7 @@ export function beginNativeMainReauth(): {
|
|
|
443
483
|
options?: { signal?: AbortSignal },
|
|
444
484
|
) => Promise<{ chatgptAccountId: string }>;
|
|
445
485
|
} {
|
|
446
|
-
const expected = readMainAuthJsonCredential();
|
|
486
|
+
const expected = readMainAuthJsonCredential({ retainWith: false });
|
|
447
487
|
if (!expected || !expected.chatgptAccountId) {
|
|
448
488
|
throw new NativeMainReauthUnavailableError(
|
|
449
489
|
"No native main credential exists to reauthenticate; enrollment is the native profile workflow",
|
|
@@ -518,7 +558,16 @@ async function resolveMainAccountToken(
|
|
|
518
558
|
): Promise<{ accessToken: string; chatgptAccountId: string } | null> {
|
|
519
559
|
if (dependencies.signal?.aborted) throw dependencies.signal.reason;
|
|
520
560
|
const codexHome = resolveCodexHomeDir();
|
|
521
|
-
|
|
561
|
+
let initial = readMainAuthJsonCredential({ serveRetained: true });
|
|
562
|
+
// Retention covers a rewrite, not a refresh: an expired or rejected retained bearer goes to the
|
|
563
|
+
// selected refresh owner exactly as an unavailable file would (#7345). Upstream rejecting the
|
|
564
|
+
// retained bearer is revocation evidence, so that copy is dropped for good.
|
|
565
|
+
if (initial?.retained && initial.accessToken === rejectedAccessToken) {
|
|
566
|
+
invalidateRetainedNativeMainLogin("revocation");
|
|
567
|
+
initial = null;
|
|
568
|
+
} else if (initial?.retained && !mainAccessTokenFresh(initial.accessToken, Date.now(), MAIN_TOKEN_REFRESH_SKEW_MS)) {
|
|
569
|
+
initial = null;
|
|
570
|
+
}
|
|
522
571
|
// Every skip below ends a forced refresh WITHOUT asking the token endpoint anything, which from
|
|
523
572
|
// the outside is indistinguishable from a refusal: same failed request, no write, no verdict.
|
|
524
573
|
// A forced refresh is the only caller that passes `rejectedAccessToken`, so only it reports.
|
|
@@ -606,7 +655,9 @@ async function resolveMainAccountToken(
|
|
|
606
655
|
resolveNativeProfileContext({ codexHome }),
|
|
607
656
|
() => withCodexRefreshFileLock(lockKey, signal, async () => {
|
|
608
657
|
if (resolveCodexHomeDir() !== codexHome) throw new MainAuthJsonChangedDuringRefreshError();
|
|
609
|
-
|
|
658
|
+
// Captured before the exchange: an invalidation while it runs makes its completion stale.
|
|
659
|
+
const ticket = beginNativeMainObservation();
|
|
660
|
+
const locked = readMainAuthJsonCredential({ retainWith: ticket });
|
|
610
661
|
if (!locked) throw new MainAuthJsonChangedDuringRefreshError();
|
|
611
662
|
if (credentialRefreshGrantRejected(locked)) throw new MainAccountTokenRefreshError("reauth");
|
|
612
663
|
if (!locked.refreshToken
|
|
@@ -673,6 +724,7 @@ async function resolveMainAccountToken(
|
|
|
673
724
|
// A permitted in-flight success speaks only for its own profile and grant.
|
|
674
725
|
clearMainRefreshGrantRejection(mainRefreshGrantKey(locked)!);
|
|
675
726
|
if (dependencies.preserveReauth !== true) clearAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID);
|
|
727
|
+
readMainAuthJsonCredential({ retainWith: ticket });
|
|
676
728
|
if (dependencies.signal?.aborted) throw dependencies.signal.reason;
|
|
677
729
|
return result;
|
|
678
730
|
}),
|
|
@@ -0,0 +1,118 @@
|
|
|
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
|
+
/**
|
|
38
|
+
* Plain read bracketed by a stat before and after (#7345 retention). The identity is the file's
|
|
39
|
+
* dev/ino when both stats name the same file, and null when it was replaced during the read. The
|
|
40
|
+
* bytes still come from the plain path read, so read-count oracles observe it. Throws the error of
|
|
41
|
+
* either stat or the read unchanged: a file removed right after the read is missing, not a login.
|
|
42
|
+
*/
|
|
43
|
+
export function readNativeMainAuthBytesWithIdentity(path: string): { bytes: Buffer; identity: { dev: bigint; ino: bigint } | null } {
|
|
44
|
+
const before = statSync(path, { bigint: true });
|
|
45
|
+
const bytes = readNativeMainAuthBytes(path, "plain");
|
|
46
|
+
const after = statSync(path, { bigint: true });
|
|
47
|
+
const same = after.dev === before.dev && after.ino === before.ino;
|
|
48
|
+
return { bytes, identity: same ? { dev: after.dev, ino: after.ino } : null };
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** Reads with a stat before and after, as the desktop identity reader did. */
|
|
52
|
+
export function readNativeMainAuthBytesStable(path: string, maxBytes: bigint): { bytes: Buffer; stat: BigIntStats } {
|
|
53
|
+
const before = statSync(path, { bigint: true });
|
|
54
|
+
if (before.size > maxBytes) throw new Error('Unexpected native auth size');
|
|
55
|
+
const bytes = readFileSync(path);
|
|
56
|
+
const after = statSync(path, { bigint: true });
|
|
57
|
+
if (nativeAuthStatStamp(before) !== nativeAuthStatStamp(after)) throw new Error('Native credentials changed during read');
|
|
58
|
+
return { bytes, stat: after };
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** The only sync writer of a native-main login file. */
|
|
62
|
+
export function writeNativeMainAuthFile(path: string, content: string, hooks: AtomicWriteHooks): void {
|
|
63
|
+
atomicWriteFile(path, content, undefined, hooks);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** The only async writer of a native-main login file. `write` keeps the caller's injected writer (a test seam of NativeProfileManager). */
|
|
67
|
+
export async function writeNativeMainAuthFileAsync(path: string, content: string, write: (path: string, content: string) => Promise<void>): Promise<void> {
|
|
68
|
+
await write(path, content);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export function readBounded(path: string, limit: number, testSeam?: BoundedReadTestSeam): Buffer {
|
|
72
|
+
let fd: number | undefined;
|
|
73
|
+
let failed = false;
|
|
74
|
+
try {
|
|
75
|
+
testSeam?.beforeOpen?.(path);
|
|
76
|
+
const flags = process.platform === "win32"
|
|
77
|
+
? fsConstants.O_RDONLY
|
|
78
|
+
: fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW | fsConstants.O_NONBLOCK;
|
|
79
|
+
fd = openSync(path, flags);
|
|
80
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
81
|
+
if (!opened.isFile() || opened.size > BigInt(limit)) throw new Error("invalid bounded file");
|
|
82
|
+
|
|
83
|
+
if (process.platform === "win32") {
|
|
84
|
+
const pathEntry = lstatSync(path, { bigint: true });
|
|
85
|
+
if (
|
|
86
|
+
!pathEntry.isFile()
|
|
87
|
+
|| pathEntry.isSymbolicLink()
|
|
88
|
+
|| pathEntry.dev !== opened.dev
|
|
89
|
+
|| pathEntry.ino !== opened.ino
|
|
90
|
+
) throw new Error("invalid bounded file");
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
testSeam?.afterValidatedOpen?.(path, fd);
|
|
94
|
+
const buffer = Buffer.allocUnsafe(limit + 1);
|
|
95
|
+
testSeam?.onBufferAllocated?.(buffer.byteLength);
|
|
96
|
+
let totalBytesRead = 0;
|
|
97
|
+
while (totalBytesRead < buffer.byteLength) {
|
|
98
|
+
const requestedBytes = buffer.byteLength - totalBytesRead;
|
|
99
|
+
const bytesRead = readSync(fd, buffer, totalBytesRead, requestedBytes, totalBytesRead);
|
|
100
|
+
totalBytesRead += bytesRead;
|
|
101
|
+
testSeam?.onRead?.(requestedBytes, bytesRead, totalBytesRead);
|
|
102
|
+
if (bytesRead === 0) break;
|
|
103
|
+
}
|
|
104
|
+
if (totalBytesRead > limit) throw new Error("invalid bounded file");
|
|
105
|
+
return buffer.subarray(0, totalBytesRead);
|
|
106
|
+
} catch (error) {
|
|
107
|
+
failed = true;
|
|
108
|
+
throw error;
|
|
109
|
+
} finally {
|
|
110
|
+
if (fd !== undefined) {
|
|
111
|
+
try {
|
|
112
|
+
closeSync(fd);
|
|
113
|
+
} catch (error) {
|
|
114
|
+
if (!failed) throw error;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
@@ -0,0 +1,270 @@
|
|
|
1
|
+
import { closeSync, constants as fsConstants, fstatSync, openSync } from "node:fs";
|
|
2
|
+
import { readNativeMainAuthBytesWithIdentity } from "./native-main-auth-file";
|
|
3
|
+
import { codexCredentialMutationEpoch } from "./credential-mutation-epoch";
|
|
4
|
+
import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Retention of the last complete native-main login while Codex rewrites its login file (#7345).
|
|
8
|
+
*
|
|
9
|
+
* Codex rewrites the file in place (truncate, then write), so a reader can briefly see it empty
|
|
10
|
+
* or half written. The owner's contract: only those two states may be answered from the last
|
|
11
|
+
* complete login, and only while it is still provably the same owner's same file. Everything
|
|
12
|
+
* else is authoritative and ends retention at once, with no time window to wait out:
|
|
13
|
+
*
|
|
14
|
+
* - a missing file (logout or deletion; Codex may still confirm a login through its own RPC,
|
|
15
|
+
* which the caller asks separately),
|
|
16
|
+
* - a well-formed file without a ChatGPT token pair (explicit no-login or an API-key login),
|
|
17
|
+
* - an unreadable file,
|
|
18
|
+
* - account replacement (another OpenCodex credential publication, a different file identity,
|
|
19
|
+
* or a complete file naming a different login),
|
|
20
|
+
* - pause or revocation of the main account,
|
|
21
|
+
* - a change of the selected or configured refresh owner,
|
|
22
|
+
* - ownership loss (another home or path, the cross-process owner lock released, or native-main
|
|
23
|
+
* traffic blocked by recovery).
|
|
24
|
+
*
|
|
25
|
+
* File identity is only meaningful while its inode number cannot be reused: on POSIX the retained
|
|
26
|
+
* entry keeps a descriptor open on the file it was read from, so a deleted and recreated file
|
|
27
|
+
* always gets a new number, and a retained file that is no longer linked is never served.
|
|
28
|
+
*
|
|
29
|
+
* Retention never serves a write guard: callers that compare the file before publishing read the
|
|
30
|
+
* physical observation. It also never vouches for an expired access token; that goes to the
|
|
31
|
+
* selected refresh owner exactly as an unavailable file would.
|
|
32
|
+
*/
|
|
33
|
+
|
|
34
|
+
export type NativeMainAuthObservation =
|
|
35
|
+
| {
|
|
36
|
+
kind: "complete";
|
|
37
|
+
raw: string;
|
|
38
|
+
root: Record<string, unknown>;
|
|
39
|
+
tokens: Record<string, unknown>;
|
|
40
|
+
/** dev/ino of the file the bytes came from, or null when it changed during the read. */
|
|
41
|
+
identity: FileIdentity | null;
|
|
42
|
+
}
|
|
43
|
+
/** Empty or not yet parseable: the in-place rewrite window. */
|
|
44
|
+
| { kind: "incomplete"; identity: FileIdentity | null }
|
|
45
|
+
/** Well-formed but carries no ChatGPT access or refresh token. */
|
|
46
|
+
| { kind: "no-login" }
|
|
47
|
+
| { kind: "missing" }
|
|
48
|
+
| { kind: "unreadable" };
|
|
49
|
+
|
|
50
|
+
export type NativeMainRetentionInvalidation =
|
|
51
|
+
| "logout"
|
|
52
|
+
| "missing"
|
|
53
|
+
| "unreadable"
|
|
54
|
+
| "account-replacement"
|
|
55
|
+
| "pause"
|
|
56
|
+
| "revocation"
|
|
57
|
+
| "refresh-mode-change"
|
|
58
|
+
| "ownership-loss";
|
|
59
|
+
|
|
60
|
+
export interface NativeMainLoginOwner {
|
|
61
|
+
readonly codexHome: string;
|
|
62
|
+
readonly path: string;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/** Captured before an observation starts; a completion under an older generation is stale. */
|
|
66
|
+
export interface NativeMainObservationTicket {
|
|
67
|
+
readonly generation: number;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export interface RetainNativeMainLoginOptions {
|
|
71
|
+
/** Content fingerprint; an unchanged login keeps its entry, descriptor and configured mode. */
|
|
72
|
+
fingerprint: string;
|
|
73
|
+
/** The configured refresh owner, read only when a new login is retained. */
|
|
74
|
+
configuredRefreshMode: () => string;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
interface RetainedLogin {
|
|
78
|
+
readonly owner: NativeMainLoginOwner;
|
|
79
|
+
readonly identity: FileIdentity;
|
|
80
|
+
readonly fingerprint: string;
|
|
81
|
+
readonly configuredRefreshMode: string;
|
|
82
|
+
readonly fd: number | undefined;
|
|
83
|
+
mutationEpoch: number;
|
|
84
|
+
credential: unknown;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
let retained: RetainedLogin | undefined;
|
|
88
|
+
let generation = 0;
|
|
89
|
+
let lastRefreshMode: string | undefined;
|
|
90
|
+
let lastInvalidation: NativeMainRetentionInvalidation | undefined;
|
|
91
|
+
|
|
92
|
+
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
93
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
function nonEmptyString(value: unknown): boolean {
|
|
97
|
+
return typeof value === "string" && value.trim().length > 0;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function closeQuietly(fd: number | undefined): void {
|
|
101
|
+
if (fd === undefined) return;
|
|
102
|
+
try { closeSync(fd); } catch { /* already closed */ }
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
function drop(): void {
|
|
106
|
+
const entry = retained;
|
|
107
|
+
retained = undefined;
|
|
108
|
+
closeQuietly(entry?.fd);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** Classify login file text. A truncated JSON object never parses, so a partial write is "incomplete". */
|
|
112
|
+
export function classifyNativeMainAuthText(raw: string, identity: FileIdentity | null = null): NativeMainAuthObservation {
|
|
113
|
+
if (!raw.trim()) return { kind: "incomplete", identity };
|
|
114
|
+
let parsed: unknown;
|
|
115
|
+
try {
|
|
116
|
+
parsed = JSON.parse(raw);
|
|
117
|
+
} catch {
|
|
118
|
+
return { kind: "incomplete", identity };
|
|
119
|
+
}
|
|
120
|
+
if (!isRecord(parsed) || !isRecord(parsed.tokens)) return { kind: "no-login" };
|
|
121
|
+
if (!nonEmptyString(parsed.tokens.access_token) && !nonEmptyString(parsed.tokens.refresh_token)) {
|
|
122
|
+
return { kind: "no-login" };
|
|
123
|
+
}
|
|
124
|
+
return { kind: "complete", raw, root: parsed, tokens: parsed.tokens, identity };
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
function missingOrUnreadable(error: unknown): NativeMainAuthObservation {
|
|
128
|
+
const code = (error as NodeJS.ErrnoException | null)?.code;
|
|
129
|
+
return { kind: code === "ENOENT" || code === "ENOTDIR" ? "missing" : "unreadable" };
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/**
|
|
133
|
+
* One physical observation through the #7918 reader. The bytes come from its plain read and the
|
|
134
|
+
* identity from a stat before and after it; a replacement during the read leaves the identity null,
|
|
135
|
+
* so nothing is retained or served for those bytes.
|
|
136
|
+
*/
|
|
137
|
+
export function observeNativeMainAuthFile(path: string): NativeMainAuthObservation {
|
|
138
|
+
let read: ReturnType<typeof readNativeMainAuthBytesWithIdentity>;
|
|
139
|
+
try {
|
|
140
|
+
read = readNativeMainAuthBytesWithIdentity(path);
|
|
141
|
+
} catch (error) {
|
|
142
|
+
return missingOrUnreadable(error);
|
|
143
|
+
}
|
|
144
|
+
return classifyNativeMainAuthText(read.bytes.toString("utf8"), read.identity);
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
export function beginNativeMainObservation(): NativeMainObservationTicket {
|
|
148
|
+
return { generation };
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/** End retention now. Pending observations captured before this call can no longer retain. */
|
|
152
|
+
export function invalidateRetainedNativeMainLogin(reason: NativeMainRetentionInvalidation): void {
|
|
153
|
+
generation += 1;
|
|
154
|
+
drop();
|
|
155
|
+
lastInvalidation = reason;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/** Hold the file's inode on POSIX so its number cannot be reused while retained. */
|
|
159
|
+
function holdFile(path: string, identity: FileIdentity): number | undefined | null {
|
|
160
|
+
if (process.platform === "win32") return undefined;
|
|
161
|
+
let fd: number | undefined;
|
|
162
|
+
try {
|
|
163
|
+
fd = openSync(path, fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW | fsConstants.O_NONBLOCK);
|
|
164
|
+
const held = fstatSync(fd, { bigint: true });
|
|
165
|
+
if (held.isFile() && sameFileIdentity({ dev: held.dev, ino: held.ino }, identity)) return fd;
|
|
166
|
+
} catch { /* the file moved; nothing to hold */ }
|
|
167
|
+
closeQuietly(fd);
|
|
168
|
+
return null;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/**
|
|
172
|
+
* Record a complete login. Refused for a stale ticket (an invalidation happened while the
|
|
173
|
+
* observation or refresh was in flight) or an unknown or moved file identity.
|
|
174
|
+
*/
|
|
175
|
+
export function retainNativeMainLogin(
|
|
176
|
+
ticket: NativeMainObservationTicket,
|
|
177
|
+
owner: NativeMainLoginOwner,
|
|
178
|
+
identity: FileIdentity | null,
|
|
179
|
+
credential: unknown,
|
|
180
|
+
options: RetainNativeMainLoginOptions,
|
|
181
|
+
): boolean {
|
|
182
|
+
if (ticket.generation !== generation) return false;
|
|
183
|
+
if (!identity) {
|
|
184
|
+
drop();
|
|
185
|
+
return false;
|
|
186
|
+
}
|
|
187
|
+
const current = retained;
|
|
188
|
+
if (current && current.owner.codexHome === owner.codexHome && current.owner.path === owner.path
|
|
189
|
+
&& sameFileIdentity(current.identity, identity) && current.fingerprint === options.fingerprint) {
|
|
190
|
+
current.mutationEpoch = codexCredentialMutationEpoch();
|
|
191
|
+
current.credential = credential;
|
|
192
|
+
return true;
|
|
193
|
+
}
|
|
194
|
+
drop();
|
|
195
|
+
const fd = holdFile(owner.path, identity);
|
|
196
|
+
if (fd === null) return false;
|
|
197
|
+
retained = {
|
|
198
|
+
owner: { codexHome: owner.codexHome, path: owner.path },
|
|
199
|
+
identity,
|
|
200
|
+
fingerprint: options.fingerprint,
|
|
201
|
+
configuredRefreshMode: options.configuredRefreshMode(),
|
|
202
|
+
fd,
|
|
203
|
+
mutationEpoch: codexCredentialMutationEpoch(),
|
|
204
|
+
credential,
|
|
205
|
+
};
|
|
206
|
+
return true;
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
function heldFileStillLinked(fd: number | undefined): boolean {
|
|
210
|
+
if (fd === undefined) return true;
|
|
211
|
+
try {
|
|
212
|
+
return fstatSync(fd, { bigint: true }).nlink > 0n;
|
|
213
|
+
} catch {
|
|
214
|
+
return false;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
/**
|
|
219
|
+
* The retained login for an incomplete observation of the same owner's same file, or undefined.
|
|
220
|
+
* Any mismatch is itself authoritative and ends retention. `configuredRefreshMode` is read only
|
|
221
|
+
* when a retained login exists.
|
|
222
|
+
*/
|
|
223
|
+
export function retainedNativeMainLogin<T>(
|
|
224
|
+
owner: NativeMainLoginOwner,
|
|
225
|
+
identity: FileIdentity | null,
|
|
226
|
+
configuredRefreshMode: () => string,
|
|
227
|
+
): T | undefined {
|
|
228
|
+
const entry = retained;
|
|
229
|
+
if (!entry) return undefined;
|
|
230
|
+
if (entry.owner.codexHome !== owner.codexHome || entry.owner.path !== owner.path) {
|
|
231
|
+
invalidateRetainedNativeMainLogin("ownership-loss");
|
|
232
|
+
return undefined;
|
|
233
|
+
}
|
|
234
|
+
if (entry.mutationEpoch !== codexCredentialMutationEpoch() || !identity
|
|
235
|
+
|| !sameFileIdentity(identity, entry.identity) || !heldFileStillLinked(entry.fd)) {
|
|
236
|
+
invalidateRetainedNativeMainLogin("account-replacement");
|
|
237
|
+
return undefined;
|
|
238
|
+
}
|
|
239
|
+
if (configuredRefreshMode() !== entry.configuredRefreshMode) {
|
|
240
|
+
invalidateRetainedNativeMainLogin("refresh-mode-change");
|
|
241
|
+
return undefined;
|
|
242
|
+
}
|
|
243
|
+
return entry.credential as T;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
/** The authoritative invalidation an observation implies, if any. */
|
|
247
|
+
export function invalidationForObservation(observation: NativeMainAuthObservation): NativeMainRetentionInvalidation | undefined {
|
|
248
|
+
if (observation.kind === "missing") return "missing";
|
|
249
|
+
if (observation.kind === "no-login") return "logout";
|
|
250
|
+
if (observation.kind === "unreadable") return "unreadable";
|
|
251
|
+
return undefined;
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
/** Every resolution of the refresh owner reports here; a different owner ends retention. */
|
|
255
|
+
export function observeNativeMainRefreshMode(mode: string): void {
|
|
256
|
+
if (lastRefreshMode !== undefined && lastRefreshMode !== mode) invalidateRetainedNativeMainLogin("refresh-mode-change");
|
|
257
|
+
lastRefreshMode = mode;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
/** Diagnostic for tests: why retention last ended. */
|
|
261
|
+
export function lastNativeMainRetentionInvalidationForTests(): NativeMainRetentionInvalidation | undefined {
|
|
262
|
+
return lastInvalidation;
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
export function resetNativeMainRetentionForTests(): void {
|
|
266
|
+
drop();
|
|
267
|
+
generation += 1;
|
|
268
|
+
lastRefreshMode = undefined;
|
|
269
|
+
lastInvalidation = undefined;
|
|
270
|
+
}
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
} from "./native-main-lock-file";
|
|
11
11
|
import type { NativeProfileContext } from "./native-profile-store";
|
|
12
12
|
import { NativeProfileError } from "./native-profile-types";
|
|
13
|
+
import { invalidateRetainedNativeMainLogin } from "./native-main-credentials";
|
|
13
14
|
|
|
14
15
|
export const NATIVE_MAIN_OWNER_RETRY_MS = 250;
|
|
15
16
|
export const NATIVE_MAIN_OWNER_DB = ".opencodex-native-main.owner.sqlite";
|
|
@@ -92,6 +93,8 @@ export function nativeMainOwnerFilesystemSupported(
|
|
|
92
93
|
}
|
|
93
94
|
|
|
94
95
|
function publish(entry: OwnerEntry, snapshot: NativeMainOwnerSnapshot): void {
|
|
96
|
+
// Losing the cross-process owner lock ends a retained native-main login (#7345).
|
|
97
|
+
if (entry.snapshot.status === "held" && snapshot.status !== "held") invalidateRetainedNativeMainLogin("ownership-loss");
|
|
95
98
|
entry.snapshot = snapshot;
|
|
96
99
|
for (const listener of entry.listeners) {
|
|
97
100
|
try { listener({ ...snapshot }); } catch { /* an observer cannot forfeit process ownership */ }
|