@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
package/src/client/runtime.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
1
2
|
import { flushLinkDiagnostics, recordLinkDiagnostic } from "../link/diagnostics";
|
|
2
3
|
import { existsSync } from "node:fs";
|
|
3
4
|
import type { Server } from "bun";
|
|
@@ -28,17 +29,25 @@ import { clientInitiatedLinkReadiness, createHomeInitiatedLinkReadiness } from "
|
|
|
28
29
|
import { createClientLinkSupervisor, type ClientLinkSupervisor } from "./link-tunnel";
|
|
29
30
|
import { clientLinkStatePath, isChildInitiatedLink, recordChildInitiatedLink } from "./link-state";
|
|
30
31
|
import { startMachineListener, type MachineListenerDeps } from "./machine-listener";
|
|
31
|
-
import { isLinkConnection, readClientConnectionState } from "./state";
|
|
32
|
+
import { isLinkConnection, readClientConnectionState, readClientConnectionStateWithEvidence } from "./state";
|
|
32
33
|
import { withClientLifecycleSync } from "./lifecycle-lock";
|
|
33
|
-
import { clientRestartRollbackAction, clientRestartSupervisor, createClientRestartController, type ClientRestartController } from "./runtime-restart";
|
|
34
|
+
import { clientConnectionEnded, clientRestartRollbackAction, clientRestartSupervisor, createClientRestartController, LEGACY_FLAG_RESTART_OWNER, restartOwnerEvidence, type ClientRestartController, type RecordedRestartOwner, type RestartOwner } from "./runtime-restart";
|
|
34
35
|
import { createLinkParityReporter, type LinkParityReporter } from "./link-parity-reporter";
|
|
35
36
|
import { restoreLinkClientRouting } from "./stop-routing";
|
|
37
|
+
import { SUPERVISOR_MARKER_ENVS } from "../lib/supervisor-markers";
|
|
36
38
|
import { markClientRuntimeStopping, markClientRuntimeStoppingWithRetry } from "./sync-runtime";
|
|
39
|
+
import { startRouteIntentTick, type RouteIntentTick } from "../integrations/route-intent-tick";
|
|
40
|
+
import { startRouteIntentWatch, type RouteIntentRuntimeWatch } from "./route-intent-watch";
|
|
37
41
|
|
|
38
42
|
let activeServer: Server<unknown> | null = null;
|
|
39
43
|
let activePort: number | null = null;
|
|
40
44
|
let activeSupervisor: ClientLinkSupervisor | null = null;
|
|
41
45
|
let activeReporter: LinkParityReporter | null = null;
|
|
46
|
+
let activeRouteWatch: RouteIntentRuntimeWatch | null = null;
|
|
47
|
+
let activeRouteSync: RouteIntentTick | null = null;
|
|
48
|
+
// The local-credential observer lives exactly while this process serves (status attestation).
|
|
49
|
+
// Every path that stops serving stops it, including a recycle back to standalone.
|
|
50
|
+
let activeCredentialObservation: { stop(): void } | null = null;
|
|
42
51
|
let recycleScheduled = false;
|
|
43
52
|
let recycleTimer: ReturnType<typeof setTimeout> | undefined;
|
|
44
53
|
let recycleFlight: Promise<void> | null = null;
|
|
@@ -83,6 +92,8 @@ export interface StandaloneRecycleIo {
|
|
|
83
92
|
exitProcess?: (code: number) => void;
|
|
84
93
|
configuredPort?: () => number | undefined;
|
|
85
94
|
isDesktopSupervised?: () => boolean;
|
|
95
|
+
/** A service that will really relaunch this process; defaults to the OCX_SERVICE marker. */
|
|
96
|
+
serviceSupervised?: () => boolean;
|
|
86
97
|
}
|
|
87
98
|
|
|
88
99
|
function cleanup(): void {
|
|
@@ -99,19 +110,32 @@ export function clientRuntimeRecord(
|
|
|
99
110
|
pid: number,
|
|
100
111
|
port: number,
|
|
101
112
|
attestationSecret: string = createLocalAttestationSecret(),
|
|
113
|
+
owner: RecordedRestartOwner | null = recordedOwner(),
|
|
102
114
|
): RuntimePortState {
|
|
103
115
|
let command: string[] | undefined;
|
|
104
116
|
try { command = currentServingCommand(); } catch { /* no reliable relaunch identity; update admission fails closed */ }
|
|
105
|
-
return { pid, port, hostname: "127.0.0.1", attestationSecret, ...(command ? { command } : {}), ...siblingRuntimeField(), ...(clientStopping ? { clientStopping: true as const } : {}) };
|
|
117
|
+
return { pid, port, hostname: "127.0.0.1", attestationSecret, ...(command ? { command } : {}), ...siblingRuntimeField(), ...(clientStopping ? { clientStopping: true as const } : {}), ...(owner ? { restartOwner: owner } : {}) };
|
|
106
118
|
}
|
|
107
119
|
|
|
120
|
+
/** Evaluated once: the launch environment and parent of this process do not change. */
|
|
121
|
+
let ownerMemo: { value: RestartOwner | null } | undefined;
|
|
122
|
+
function classifiedOwner(): RestartOwner | null {
|
|
123
|
+
ownerMemo ??= { value: restartOwnerEvidence({ desktop: isDesktopSupervised(), env: process.env }) };
|
|
124
|
+
return ownerMemo.value;
|
|
125
|
+
}
|
|
126
|
+
const ownerProven = (): boolean => classifiedOwner() !== null;
|
|
127
|
+
/** The record's owner: the proven one, or legacy-flag for a bare OCX_SERVICE=1 (#8545; recordedRestartOwner). */
|
|
128
|
+
const recordedOwner = (): RecordedRestartOwner => classifiedOwner() ?? LEGACY_FLAG_RESTART_OWNER;
|
|
129
|
+
|
|
108
130
|
export function standaloneRecycleEnv(
|
|
109
131
|
env: NodeJS.ProcessEnv,
|
|
110
132
|
disconnectedTokenFingerprint: string,
|
|
111
133
|
): NodeJS.ProcessEnv {
|
|
112
134
|
const childEnv = { ...env };
|
|
113
|
-
// A detached replacement is not the desktop app's
|
|
114
|
-
|
|
135
|
+
// A detached replacement is nobody's child: not the desktop app's, not a service's, not a Windows
|
|
136
|
+
// wrapper's. It must carry no supervisor marker it would otherwise misread as its own.
|
|
137
|
+
for (const name of SUPERVISOR_MARKER_ENVS) delete childEnv[name];
|
|
138
|
+
delete childEnv.OCX_SERVICE;
|
|
115
139
|
const admissionToken = childEnv.OPENCODEX_API_AUTH_TOKEN?.trim();
|
|
116
140
|
if (admissionToken && serviceApiTokenFingerprint(admissionToken) !== disconnectedTokenFingerprint) {
|
|
117
141
|
// A surviving env token shadows OCX_API_TOKEN_FILE entirely, so nothing below can
|
|
@@ -164,9 +188,14 @@ export async function recycleStandalone(
|
|
|
164
188
|
const port = activePort ?? (io.configuredPort ?? configuredTcpPort)();
|
|
165
189
|
const exit = io.exitProcess ?? ((code: number) => { process.exit(code); });
|
|
166
190
|
// Capture the one-use sibling handoff before this process removes its runtime record.
|
|
167
|
-
const
|
|
191
|
+
const serviceSupervised = (io.serviceSupervised ?? (() => process.env.OCX_SERVICE === "1"))();
|
|
192
|
+
const replacementEnv = port && !serviceSupervised
|
|
168
193
|
? withSiblingMarker(standaloneRecycleEnv(process.env, disconnectedTokenFingerprint), issueSiblingHandoff)
|
|
169
194
|
: null;
|
|
195
|
+
activeCredentialObservation?.stop(); activeCredentialObservation = null;
|
|
196
|
+
activeReporter?.stop(); activeReporter = null;
|
|
197
|
+
activeRouteWatch?.stop(); activeRouteWatch = null;
|
|
198
|
+
activeRouteSync?.stop(); activeRouteSync = null;
|
|
170
199
|
try {
|
|
171
200
|
await activeSupervisor?.stop();
|
|
172
201
|
} catch (error) {
|
|
@@ -201,7 +230,7 @@ export async function recycleStandalone(
|
|
|
201
230
|
//
|
|
202
231
|
// launchd's KeepAlive is failure-only too (`SuccessfulExit` false), so exit 1 is what
|
|
203
232
|
// relaunches it as well; an exit 0 would leave the job stopped.
|
|
204
|
-
if (
|
|
233
|
+
if (serviceSupervised) {
|
|
205
234
|
exit(1);
|
|
206
235
|
return;
|
|
207
236
|
}
|
|
@@ -326,8 +355,6 @@ export async function startClientRuntime(
|
|
|
326
355
|
&& !isChildInitiatedLink(state.value.link.linkId);
|
|
327
356
|
// One secret for the life of this process: a rollback republishes the same identity.
|
|
328
357
|
const attestationSecret = createLocalAttestationSecret();
|
|
329
|
-
// The local-credential observer lives exactly while this process serves (status attestation).
|
|
330
|
-
let credentialObservation: { stop(): void } | null = null;
|
|
331
358
|
|
|
332
359
|
// Bind, start a fresh tunnel supervisor and publish. Runs once at start and again when a failed
|
|
333
360
|
// restart rolls back (OCX-6); the stopped supervisor cannot be started twice, so each call builds one.
|
|
@@ -371,12 +398,17 @@ export async function startClientRuntime(
|
|
|
371
398
|
servedPort = boundPort;
|
|
372
399
|
activeSupervisor = supervisor;
|
|
373
400
|
supervisor?.start();
|
|
374
|
-
|
|
401
|
+
activeCredentialObservation ??= observeLocalCredentials();
|
|
375
402
|
writePid(process.pid);
|
|
376
|
-
|
|
403
|
+
// A new generation per publication: syncs admitted before a failed restart refuse to commit
|
|
404
|
+
// into the runtime that serves again, while syncs admitted from here on proceed.
|
|
405
|
+
writeRuntimePort({ ...clientRuntimeRecord(process.pid, boundPort, attestationSecret), servingGeneration: randomUUID() });
|
|
377
406
|
if (linkMode && state.value.link && linkKey) {
|
|
378
407
|
activeReporter = createLinkParityReporter({ connection: state.value, linkKey, runtimeStartedAt: CLIENT_RUNTIME_STARTED_AT });
|
|
379
408
|
activeReporter.start();
|
|
409
|
+
const scheduler = startRouteIntentTick(state.value, { onApplied: () => activeReporter?.requestReport() });
|
|
410
|
+
activeRouteSync = scheduler;
|
|
411
|
+
activeRouteWatch = startRouteIntentWatch(state.value, linkKey, { requestSync: () => scheduler.requestSync() });
|
|
380
412
|
}
|
|
381
413
|
};
|
|
382
414
|
if (!rollback) {
|
|
@@ -404,10 +436,12 @@ export async function startClientRuntime(
|
|
|
404
436
|
|
|
405
437
|
// Stop everything this process serves, giving in-flight requests up to `drainMs`.
|
|
406
438
|
const stopServing = async (drainMs: number): Promise<void> => {
|
|
407
|
-
|
|
408
|
-
|
|
439
|
+
activeCredentialObservation?.stop();
|
|
440
|
+
activeCredentialObservation = null;
|
|
409
441
|
activeReporter?.stop();
|
|
410
442
|
activeReporter = null;
|
|
443
|
+
activeRouteWatch?.stop(); activeRouteWatch = null;
|
|
444
|
+
activeRouteSync?.stop(); activeRouteSync = null;
|
|
411
445
|
try {
|
|
412
446
|
await activeSupervisor?.stop();
|
|
413
447
|
} catch (error) {
|
|
@@ -433,6 +467,18 @@ export async function startClientRuntime(
|
|
|
433
467
|
const restartController: ClientRestartController = createClientRestartController({
|
|
434
468
|
stopping: () => shuttingDown,
|
|
435
469
|
supervisor: io.restartSupervisor ?? clientRestartSupervisor,
|
|
470
|
+
connectionChanged: () => clientConnectionEnded(state.value, readClientConnectionStateWithEvidence()),
|
|
471
|
+
ownerProven,
|
|
472
|
+
recycle: supervisor => recycleStandalone(state.value.tokenFingerprint, {
|
|
473
|
+
isDesktopSupervised: () => supervisor === "desktop",
|
|
474
|
+
serviceSupervised: () => supervisor === "service",
|
|
475
|
+
}),
|
|
476
|
+
// Fence Link syncs before the teardown: a sync already past admission would otherwise keep
|
|
477
|
+
// writing client files and receipts while the listener closes. Marking the record makes every
|
|
478
|
+
// later commit stand down under C; the replacement's record, or the fresh generation a rollback
|
|
479
|
+
// publishes, keeps those syncs refused and admits new ones. A mark that cannot be written
|
|
480
|
+
// abandons the restart before anything stops.
|
|
481
|
+
fence: async () => !linkMode || await markClientRuntimeStoppingWithRetry({ pid: process.pid, port: servedPort, attestationSecret }),
|
|
436
482
|
stop: stopServing,
|
|
437
483
|
spawnReplacement: async deadlineAt => {
|
|
438
484
|
const { replacementStartEnvironment } = await import("../server/management/system-restart");
|
|
@@ -483,10 +529,12 @@ export async function startClientRuntime(
|
|
|
483
529
|
if (recycleFlight) await recycleFlight.catch(() => {});
|
|
484
530
|
// A rollback may have republished its runtime record while shutdown joined it.
|
|
485
531
|
syncFenced = !linkMode || await markClientRuntimeStoppingWithRetry({ pid: process.pid, port: servedPort, attestationSecret });
|
|
486
|
-
|
|
487
|
-
|
|
532
|
+
activeCredentialObservation?.stop();
|
|
533
|
+
activeCredentialObservation = null;
|
|
488
534
|
activeReporter?.stop();
|
|
489
535
|
activeReporter = null;
|
|
536
|
+
activeRouteWatch?.stop(); activeRouteWatch = null;
|
|
537
|
+
activeRouteSync?.stop(); activeRouteSync = null;
|
|
490
538
|
try {
|
|
491
539
|
await activeSupervisor?.stop();
|
|
492
540
|
} catch (error) {
|
package/src/client/state.ts
CHANGED
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
withConfigMutationLockSync,
|
|
12
12
|
} from "../config";
|
|
13
13
|
import { atomicWriteFileNoFollowUnclaimed } from "../config/atomic-write";
|
|
14
|
+
import { readConfigFileSnapshot } from "../config/diagnostics";
|
|
14
15
|
import type { OcxClientConnectionConfig } from "../types";
|
|
15
16
|
import { inspectRemoteDesktopStore, readDesktopDisconnectReceipt } from "../claude/desktop-remote-store";
|
|
16
17
|
import { withClientLifecycleSync, type ClientLifecycleLockDeps } from "./lifecycle-lock";
|
|
@@ -82,6 +83,27 @@ function rawTopLevelConfig(): Record<string, unknown> | null {
|
|
|
82
83
|
}
|
|
83
84
|
}
|
|
84
85
|
|
|
86
|
+
/**
|
|
87
|
+
* The client state with evidence required for "disconnected", decided from ONE read of the saved
|
|
88
|
+
* file (readConfigFileSnapshot): the bytes and their validation belong together, so a connect that
|
|
89
|
+
* commits meanwhile cannot pair old bytes with a validation of new ones. "disconnected" means a
|
|
90
|
+
* saved config.json that validates and records no client; a missing, unreadable or invalid file is
|
|
91
|
+
* invalid with its reason. Used wherever "disconnected" authorizes a restart, a recycle or exit 0.
|
|
92
|
+
*/
|
|
93
|
+
export function readClientConnectionStateWithEvidence(): ClientConnectionState {
|
|
94
|
+
const snapshot = readConfigFileSnapshot({ passive: true });
|
|
95
|
+
if (snapshot.raw === undefined) {
|
|
96
|
+
return { kind: "invalid", reason: snapshot.diagnostics.source === "default" ? "config.json is missing" : "config.json is unreadable" };
|
|
97
|
+
}
|
|
98
|
+
if (snapshot.diagnostics.source !== "file") {
|
|
99
|
+
return { kind: "invalid", reason: `config.json failed validation (${snapshot.diagnostics.error ?? "invalid"})` };
|
|
100
|
+
}
|
|
101
|
+
let parsed: unknown;
|
|
102
|
+
try { parsed = JSON.parse(snapshot.raw.replace(/^\uFEFF/, "")); } catch { return { kind: "invalid", reason: "config.json is unreadable" }; }
|
|
103
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return { kind: "invalid", reason: "config.json is not an object" };
|
|
104
|
+
return classifyClientConnection(parsed as Record<string, unknown>, snapshot.diagnostics);
|
|
105
|
+
}
|
|
106
|
+
|
|
85
107
|
export function readClientConnectionState(): ClientConnectionState {
|
|
86
108
|
const raw = rawTopLevelConfig();
|
|
87
109
|
const diagnostics = readConfigDiagnostics({ passive: true });
|
|
@@ -90,6 +112,14 @@ export function readClientConnectionState(): ClientConnectionState {
|
|
|
90
112
|
? { kind: "disconnected" }
|
|
91
113
|
: { kind: "invalid", reason: "config.json is missing or unreadable" };
|
|
92
114
|
}
|
|
115
|
+
return classifyClientConnection(raw, diagnostics);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/** The client verdict for one saved top-level object and the diagnostics of the same bytes. */
|
|
119
|
+
function classifyClientConnection(
|
|
120
|
+
raw: Record<string, unknown>,
|
|
121
|
+
diagnostics: Pick<ReturnType<typeof readConfigDiagnostics>, "config" | "warnings">,
|
|
122
|
+
): ClientConnectionState {
|
|
93
123
|
const hasClient = Object.hasOwn(raw, "client") && raw.client !== undefined;
|
|
94
124
|
const role = raw.runtimeRole;
|
|
95
125
|
if (role !== undefined && role !== "standalone" && role !== "hub" && role !== "client") {
|
|
@@ -132,6 +162,20 @@ export function assertNoClientDisconnectPending(): void {
|
|
|
132
162
|
}
|
|
133
163
|
}
|
|
134
164
|
|
|
165
|
+
/**
|
|
166
|
+
* The message client startup refuses with. A pending disconnect names the command that clears it:
|
|
167
|
+
* under the desktop app or a service the supervisor only logs this line, and on 2.100.2 a person
|
|
168
|
+
* had to move desktop-remote/ aside by hand because nothing said a retry would finish or roll back.
|
|
169
|
+
*/
|
|
170
|
+
export function clientStartupRefusalMessage(reason: string): string {
|
|
171
|
+
if (reason !== "client_disconnect_pending") return `client startup refused: ${reason}`;
|
|
172
|
+
const receipt = readDesktopDisconnectReceipt();
|
|
173
|
+
const valid = receipt.kind === "valid" ? receipt.value : null;
|
|
174
|
+
const command = valid?.keepCatalog ? "ocx disconnect --keep-catalog" : "ocx disconnect";
|
|
175
|
+
return `client startup refused: an ocx disconnect on this machine stopped part way${valid ? ` at phase ${valid.phase}` : ""}. `
|
|
176
|
+
+ `Run ${command} again to finish it or roll it back. (code client_disconnect_pending)`;
|
|
177
|
+
}
|
|
178
|
+
|
|
135
179
|
/** Full snapshot CAS for work returning from an await, including selection and rotation state. */
|
|
136
180
|
export function assertClientConnectionUnchanged(expected: OcxClientConnectionConfig): void {
|
|
137
181
|
assertNoClientDisconnectPending();
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import type { DesktopDisconnectReceipt } from "../claude/desktop-remote-store";
|
|
11
11
|
import { readDesktopDisconnectReceipt } from "../claude/desktop-remote-store";
|
|
12
|
-
import { isLinkConnection, pendingClientConnectMayOwnToken, readClientConnectionState, type ClientConnectionState } from "./state";
|
|
12
|
+
import { isLinkConnection, pendingClientConnectMayOwnToken, readClientConnectionState, sameClientConnectionOwner, type ClientConnectionState } from "./state";
|
|
13
13
|
|
|
14
14
|
export type ClientSyncExpectation =
|
|
15
15
|
| { kind: "link"; linkId: string }
|
|
@@ -25,7 +25,9 @@ export type ClientSyncMismatchReason =
|
|
|
25
25
|
| "hub_client"
|
|
26
26
|
| "link_client"
|
|
27
27
|
| "other_link"
|
|
28
|
-
| "other_key"
|
|
28
|
+
| "other_key"
|
|
29
|
+
/** ocx disconnect --expect-link only: this machine joined that link itself (sidecar or marker). */
|
|
30
|
+
| "client_initiated_link";
|
|
29
31
|
|
|
30
32
|
type DisconnectReceiptRead =
|
|
31
33
|
| { kind: "absent" }
|
|
@@ -116,3 +118,35 @@ export function assertClientSyncExpectation(expectation: ClientSyncExpectation):
|
|
|
116
118
|
);
|
|
117
119
|
if (reason) throw new ClientSyncExpectationError(expectation, reason);
|
|
118
120
|
}
|
|
121
|
+
|
|
122
|
+
/**
|
|
123
|
+
* `ocx disconnect --expect-link` (a Home's revoke): the link expectation, except that an unfinished disconnect
|
|
124
|
+
* may resume when the machine is still connected to that very link and the receipt belongs to that connection, or
|
|
125
|
+
* once the connection is cleared (no link can be attached then), so a Home whose earlier bound disconnect was
|
|
126
|
+
* interrupted or lost its answer can finish it. Pure verdict: null when it may proceed.
|
|
127
|
+
*/
|
|
128
|
+
export function classifyDisconnectLinkExpectation(
|
|
129
|
+
state: ClientConnectionState,
|
|
130
|
+
receipt: { kind: "absent" } | { kind: "unsafe" } | { kind: "valid"; value: Pick<DesktopDisconnectReceipt, "phase" | "owner"> },
|
|
131
|
+
linkId: string,
|
|
132
|
+
pendingConnect: PendingConnectRead = "absent",
|
|
133
|
+
): ClientSyncMismatchReason | null {
|
|
134
|
+
const reason = classifyClientSyncExpectation(state, receipt, { kind: "link", linkId }, pendingConnect);
|
|
135
|
+
if (reason !== "disconnect_pending") return reason;
|
|
136
|
+
const resumesOwnDisconnect = receipt.kind === "valid" && receipt.value.phase !== "complete"
|
|
137
|
+
&& state.kind === "connected" && !state.value.pendingOperation && isLinkConnection(state.value)
|
|
138
|
+
&& state.value.link?.linkId === linkId && sameClientConnectionOwner(receipt.value.owner, state.value);
|
|
139
|
+
// Once the connection is cleared no link is attached: connect refuses while a disconnect is unfinished, so finishing
|
|
140
|
+
// the leftover cleanup cannot detach a newer link, whichever link the receipt was for. A plain disconnect resumes it
|
|
141
|
+
// the same way. Not while a connect is pending or its marker is unreadable.
|
|
142
|
+
const resumesClearedDisconnect = receipt.kind === "valid" && receipt.value.phase !== "complete"
|
|
143
|
+
&& state.kind === "disconnected" && pendingConnect === "absent";
|
|
144
|
+
return resumesOwnDisconnect || resumesClearedDisconnect ? null : reason;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/** Read-only; the caller holds the client lifecycle and config mutation locks. */
|
|
148
|
+
export function assertDisconnectLinkExpectation(linkId: string): void {
|
|
149
|
+
const state = readClientConnectionState();
|
|
150
|
+
const reason = classifyDisconnectLinkExpectation(state, readDesktopDisconnectReceipt(), linkId, state.kind === "disconnected" ? readPendingConnect() : "absent");
|
|
151
|
+
if (reason) throw new ClientSyncExpectationError({ kind: "link", linkId }, reason);
|
|
152
|
+
}
|
|
@@ -35,6 +35,13 @@ export function clientSyncRuntimeGuard(): () => void {
|
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
/** Offline enrollment keeps the configured port. A published runtime must agree before apply. */
|
|
39
|
+
export function assertRouteIntentPort(port: number): void {
|
|
40
|
+
const runtime = readSyncRuntime();
|
|
41
|
+
if (runtime?.clientStopping) throw new ClientSyncRuntimeError("client_runtime_stopping");
|
|
42
|
+
if (runtime && runtime.port !== port) throw new ClientSyncRuntimeError("client_runtime_changed");
|
|
43
|
+
}
|
|
44
|
+
|
|
38
45
|
/** The same C transaction excludes every sync commit; never mark a replacement runtime. */
|
|
39
46
|
export function markClientRuntimeStopping(expected: Required<Pick<RuntimePortState, "pid" | "port" | "attestationSecret">>): void {
|
|
40
47
|
withConfigMutationLockSync(() => {
|
|
@@ -14,45 +14,43 @@ function sameIdentity(left: RouteResult, right: RouteResult): boolean {
|
|
|
14
14
|
&& left.codexAccountId === right.codexAccountId && left.codexAccountMode === right.codexAccountMode;
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
/**
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
if (parsed.fastRow || parsed.effortRow) return undefined;
|
|
38
|
-
const baseline = previewRouteModel(config, model.namespaced);
|
|
39
|
-
const proposed = previewRouteModel(config, candidate);
|
|
40
|
-
if (proposed.providerName !== model.provider || proposed.modelId !== model.id || !sameIdentity(baseline, proposed)) return undefined;
|
|
41
|
-
if (model.fastRowAvailable) {
|
|
42
|
-
const baselineFast = parseSyntheticRowId(`${model.namespaced}--fast`, config).fastRow;
|
|
43
|
-
const proposedFast = parseSyntheticRowId(`${candidate}--fast`, config).fastRow;
|
|
44
|
-
if (!baselineFast || !proposedFast || !sameIdentity(
|
|
45
|
-
previewRouteModel(config, baselineFast.baseId), previewRouteModel(config, proposedFast.baseId),
|
|
46
|
-
)) return undefined;
|
|
47
|
-
}
|
|
48
|
-
return candidate;
|
|
49
|
-
} catch {
|
|
50
|
-
// Refused or ambiguous selectors keep the canonical spelling, never a decoded guess.
|
|
51
|
-
return undefined;
|
|
17
|
+
/**
|
|
18
|
+
* Whether `candidate` reaches exactly the concrete provider, model and account that the row's
|
|
19
|
+
* canonical key reaches, through the read-only router of this exact configuration. Refused,
|
|
20
|
+
* ambiguous, policy/combo or synthetic-suffix selectors are never proven.
|
|
21
|
+
*/
|
|
22
|
+
export function proveExportSelector(config: OcxConfig, model: ExportModel, candidate: string): boolean {
|
|
23
|
+
try {
|
|
24
|
+
// Ingress parses synthetic suffixes before routing. A successful direct
|
|
25
|
+
// route cannot prove a literal selector that ingress interprets as effort/Fast.
|
|
26
|
+
const parsed = parseSyntheticRowId(candidate, config);
|
|
27
|
+
if (parsed.fastRow || parsed.effortRow) return false;
|
|
28
|
+
const baseline = previewRouteModel(config, model.namespaced);
|
|
29
|
+
const proposed = previewRouteModel(config, candidate);
|
|
30
|
+
if (proposed.providerName !== model.provider || proposed.modelId !== model.id || !sameIdentity(baseline, proposed)) return false;
|
|
31
|
+
if (model.fastRowAvailable) {
|
|
32
|
+
const baselineFast = parseSyntheticRowId(`${model.namespaced}--fast`, config).fastRow;
|
|
33
|
+
const proposedFast = parseSyntheticRowId(`${candidate}--fast`, config).fastRow;
|
|
34
|
+
if (!baselineFast || !proposedFast || !sameIdentity(
|
|
35
|
+
previewRouteModel(config, baselineFast.baseId), previewRouteModel(config, proposedFast.baseId),
|
|
36
|
+
)) return false;
|
|
52
37
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
38
|
+
return true;
|
|
39
|
+
} catch {
|
|
40
|
+
// Refused or ambiguous selectors keep the canonical spelling, never a decoded guess.
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Keep only candidates that claim no selector another row also claims. Every canonical/native/combo
|
|
47
|
+
* key, including its synthetic Fast row, is reserved, so a candidate never displaces a different row
|
|
48
|
+
* through first-wins normalization.
|
|
49
|
+
*/
|
|
50
|
+
export function uniqueExportCandidates(
|
|
51
|
+
models: readonly ExportModel[],
|
|
52
|
+
candidates: readonly (string | undefined)[],
|
|
53
|
+
): (string | undefined)[] {
|
|
56
54
|
const claims = new Map<string, Set<number>>();
|
|
57
55
|
const claim = (key: string, index: number) => {
|
|
58
56
|
const owners = claims.get(key) ?? new Set<number>();
|
|
@@ -69,8 +67,33 @@ export function attachExportAliasSelectors(config: OcxConfig, input: readonly Ex
|
|
|
69
67
|
return models.map((model, index) => {
|
|
70
68
|
const candidate = candidates[index];
|
|
71
69
|
if (!candidate || claims.get(candidate)!.size !== 1
|
|
72
|
-
|| (model.fastRowAvailable && claims.get(`${candidate}--fast`)!.size !== 1)) return
|
|
73
|
-
return
|
|
70
|
+
|| (model.fastRowAvailable && claims.get(`${candidate}--fast`)!.size !== 1)) return undefined;
|
|
71
|
+
return candidate;
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** One context per full roster, before visibility filtering; never a serializer lookup. */
|
|
76
|
+
export function attachExportAliasSelectors(config: OcxConfig, input: readonly ExportModel[]): ExportModel[] {
|
|
77
|
+
// A roster may predate a config/cache change during discovery. Candidate
|
|
78
|
+
// metadata is evidence to refresh, never authority to reuse across that change.
|
|
79
|
+
const models = input.map(({ aliasNamespaced: _priorCandidate, ...model }) => model);
|
|
80
|
+
// A minimal or partially repaired config can omit providers; it then has no aliases.
|
|
81
|
+
const aliases = new Map(Object.entries(config.providers ?? {}).map(([name, provider]) => [name, {
|
|
82
|
+
namespace: effectiveProviderAlias(name, provider, config) ?? name,
|
|
83
|
+
models: effectiveModelAliases(config, provider, knownModelIdsForProvider(name, provider, config), name),
|
|
84
|
+
}]));
|
|
85
|
+
const candidates = models.map(model => {
|
|
86
|
+
if (model.native || model.provider === "combo") return undefined;
|
|
87
|
+
const provider = aliases.get(model.provider);
|
|
88
|
+
const alias = provider?.models.get(model.id)?.alias;
|
|
89
|
+
if (!provider || !alias || !MODEL_ALIAS_PATTERN.test(provider.namespace)) return undefined;
|
|
90
|
+
const candidate = `${provider.namespace}/${alias}`;
|
|
91
|
+
return proveExportSelector(config, model, candidate) ? candidate : undefined;
|
|
92
|
+
});
|
|
93
|
+
const unique = uniqueExportCandidates(models, candidates);
|
|
94
|
+
return models.map((model, index) => {
|
|
95
|
+
const candidate = unique[index];
|
|
96
|
+
return candidate === undefined ? model : { ...model, aliasNamespaced: candidate };
|
|
74
97
|
});
|
|
75
98
|
}
|
|
76
99
|
|
|
@@ -84,6 +84,8 @@ export interface ExportModel {
|
|
|
84
84
|
namespaced: string;
|
|
85
85
|
/** Provider-qualified alias proven equivalent by the shared management row loader. */
|
|
86
86
|
aliasNamespaced?: string;
|
|
87
|
+
/** Raw nested upstream selector the serving proxy proved equivalent (#8172); Pi only. */
|
|
88
|
+
nestedNamespaced?: string;
|
|
87
89
|
/** Hub-resolved Fast availability; exporters never infer it from local config. */
|
|
88
90
|
fastRowAvailable?: boolean;
|
|
89
91
|
provider: string;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { ExportModel } from "./contracts";
|
|
2
|
+
import { proveExportSelector, uniqueExportCandidates } from "./alias-selectors";
|
|
3
|
+
import { routedSlug } from "../../providers/slug-codec";
|
|
4
|
+
import type { OcxConfig } from "../../types";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Raw nested selectors for Pi (#8172), proven by the serving proxy.
|
|
8
|
+
*
|
|
9
|
+
* A routed row whose upstream ID contains a slash is keyed by its encoded slug
|
|
10
|
+
* (`openrouter/openrouter-free` for `openrouter/free`). That key routes only while the router's
|
|
11
|
+
* inventory can decode it, so the raw `provider/upstream-id` spelling is offered when it is proven:
|
|
12
|
+
* `config` is the admitted configuration of the process that builds the roster. Only Pi reads
|
|
13
|
+
* these candidates, and every Pi document is built inside the serving proxy: `ocx export` reads
|
|
14
|
+
* `/api/client-config`, and `ocx sync` refreshes Pi through `/api/client-integrations/pi/sync`,
|
|
15
|
+
* so the CLI's saved configuration never proves a selector Pi writes. The raw selector reaches the same concrete provider, model and
|
|
16
|
+
* account as the encoded key, and so does its Fast row, and no other row of the full roster claims
|
|
17
|
+
* it. A cold inventory, a self-namespaced model that would win the raw spelling, a policy or combo
|
|
18
|
+
* result, or a collision leaves the row without a candidate, and the encoded key stays.
|
|
19
|
+
*/
|
|
20
|
+
export function attachNestedSelectors(config: OcxConfig, input: readonly ExportModel[]): ExportModel[] {
|
|
21
|
+
// A candidate is evidence for this configuration and inventory only; never carried across a reload.
|
|
22
|
+
const models = input.map(({ nestedNamespaced: _priorCandidate, ...model }) => model);
|
|
23
|
+
const candidates = models.map(model => {
|
|
24
|
+
if (model.native || model.provider === "combo" || !model.provider || !model.id.includes("/")) return undefined;
|
|
25
|
+
// Explicit aliases and other spellings are the operator's choice; only the encoded slug is replaced.
|
|
26
|
+
if (model.namespaced !== routedSlug(model.provider, model.id)) return undefined;
|
|
27
|
+
const candidate = `${model.provider}/${model.id}`;
|
|
28
|
+
if (candidate === model.namespaced) return undefined;
|
|
29
|
+
return proveExportSelector(config, model, candidate) ? candidate : undefined;
|
|
30
|
+
});
|
|
31
|
+
const unique = uniqueExportCandidates(models, candidates);
|
|
32
|
+
return models.map((model, index) => {
|
|
33
|
+
const candidate = unique[index];
|
|
34
|
+
return candidate === undefined ? model : { ...model, nestedNamespaced: candidate };
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Pi's spelling: the proven raw selector where the serving proxy attached one, else the canonical key. */
|
|
39
|
+
export function selectNestedSelectors(models: readonly ExportModel[]): ExportModel[] {
|
|
40
|
+
return models.map(({ nestedNamespaced, ...model }) => nestedNamespaced === undefined
|
|
41
|
+
? model : { ...model, namespaced: nestedNamespaced });
|
|
42
|
+
}
|
|
@@ -29,6 +29,8 @@ import { shouldInjectApiAuthHeader, standaloneCodexRoutingTarget } from "../code
|
|
|
29
29
|
import { FORMAT_MEDIA_TYPE, serializeDocument, type ConfigFormat } from "../integrations/serialize";
|
|
30
30
|
import { fileIO } from "../integrations/config-io";
|
|
31
31
|
import { canonicalizeReasoningEfforts } from "../reasoning-effort";
|
|
32
|
+
import { selectNestedSelectors } from "./config-export/nested-selectors";
|
|
33
|
+
import { providerCodexAccountMode } from "../providers/registry";
|
|
32
34
|
import { expandFastExportModels } from "./config-export/fast-models";
|
|
33
35
|
import { namedExportContext } from "./config-export/alias-selectors";
|
|
34
36
|
import { probeHostname } from "../server/proxy-liveness";
|
|
@@ -909,6 +911,18 @@ export interface PiProviderCompat {
|
|
|
909
911
|
|
|
910
912
|
interface PiExportOptions {
|
|
911
913
|
sendSessionAffinityHeaders?: boolean;
|
|
914
|
+
/**
|
|
915
|
+
* Drop native OpenAI rows when the serving proxy runs Codex Direct (`codexAccountMode: direct`).
|
|
916
|
+
* Direct mode forwards the caller's own bearer, and Pi sends the loopback placeholder key, so a
|
|
917
|
+
* native row would only ever answer 401. The CLI-built Pi export omitted them before the export
|
|
918
|
+
* moved onto the serving proxy's roster (#8172); this keeps that behaviour.
|
|
919
|
+
*/
|
|
920
|
+
omitNativeInCodexDirect?: boolean;
|
|
921
|
+
/**
|
|
922
|
+
* Use the raw nested upstream selector the serving proxy proved for a row (#8172). A row
|
|
923
|
+
* without that proof keeps its canonical key.
|
|
924
|
+
*/
|
|
925
|
+
rawNestedModelIds?: boolean;
|
|
912
926
|
/**
|
|
913
927
|
* Tell Pi to send its system prompt as `system` rather than `developer` (#5664).
|
|
914
928
|
*
|
|
@@ -1080,7 +1094,11 @@ export interface GajaeGeneratedConfig {
|
|
|
1080
1094
|
*/
|
|
1081
1095
|
function buildPiClientConfig(ctx: ExportContext, options: PiExportOptions = {}): PiGeneratedConfig {
|
|
1082
1096
|
const models: PiModelEntry[] = [];
|
|
1083
|
-
|
|
1097
|
+
const roster = options.rawNestedModelIds ? selectNestedSelectors(ctx.models) : ctx.models;
|
|
1098
|
+
const omitNative = options.omitNativeInCodexDirect === true
|
|
1099
|
+
&& providerCodexAccountMode("openai", ctx.config?.providers?.openai) === "direct";
|
|
1100
|
+
for (const model of normalizeExportModels(roster)) {
|
|
1101
|
+
if (omitNative && model.native === true) continue;
|
|
1084
1102
|
// Text is the one modality every routed model supports; anything richer must come
|
|
1085
1103
|
// from the catalog rather than an assumption — and must still be inside the enum
|
|
1086
1104
|
// Pi accepts, because one rejected value empties the whole config.
|
|
@@ -1138,6 +1156,7 @@ function buildPiClientConfig(ctx: ExportContext, options: PiExportOptions = {}):
|
|
|
1138
1156
|
* its models.json `compat` block (docs/models.md, docs/custom-provider.md).
|
|
1139
1157
|
*/
|
|
1140
1158
|
const PI_EXPORT_OPTIONS: PiExportOptions = { sendSessionAffinityHeaders: true, foldDeveloperRole: true };
|
|
1159
|
+
const PI_NATIVE_SELECTOR_OPTIONS: PiExportOptions = { ...PI_EXPORT_OPTIONS, rawNestedModelIds: true, omitNativeInCodexDirect: true };
|
|
1141
1160
|
|
|
1142
1161
|
/** Do not let provider-controlled catalog text become an environment lookup. */
|
|
1143
1162
|
function containsEnvInterpolation(value: string): boolean {
|
|
@@ -1345,7 +1364,7 @@ function buildOpencodeContribution(ctx: ExportContext): ManagedContribution {
|
|
|
1345
1364
|
}
|
|
1346
1365
|
|
|
1347
1366
|
function buildPiContribution(ctx: ExportContext): ManagedContribution {
|
|
1348
|
-
const doc = buildPiClientConfig(ctx,
|
|
1367
|
+
const doc = buildPiClientConfig(ctx, PI_NATIVE_SELECTOR_OPTIONS);
|
|
1349
1368
|
return singleFragment("pi", ["providers", OPENCODE_PROVIDER_ID], doc.providers[OPENCODE_PROVIDER_ID]);
|
|
1350
1369
|
}
|
|
1351
1370
|
|
|
@@ -1511,7 +1530,7 @@ export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
|
|
|
1511
1530
|
destination: env => piConfigPath(env),
|
|
1512
1531
|
apiKeyEnv: "",
|
|
1513
1532
|
exportHint: "Pi reads a non-secret placeholder from models.json; loopback needs no key.",
|
|
1514
|
-
build: ctx => buildPiClientConfig(ctx,
|
|
1533
|
+
build: ctx => buildPiClientConfig(ctx, PI_NATIVE_SELECTOR_OPTIONS),
|
|
1515
1534
|
format: "json",
|
|
1516
1535
|
summarize: summarizePi,
|
|
1517
1536
|
buildContribution: buildPiContribution,
|
|
@@ -2,6 +2,8 @@ import { randomUUID } from "node:crypto";
|
|
|
2
2
|
import type { AccountPauseDetails } from "../types/account-auto-pause";
|
|
3
3
|
import type { OcxConfig } from "../types";
|
|
4
4
|
import { deleteConfigTopLevelKey } from "../config/rebase-provenance";
|
|
5
|
+
import { MAIN_CODEX_ACCOUNT_ID } from "./account-id";
|
|
6
|
+
import { invalidateRetainedNativeMainLogin } from "./native-main-credentials";
|
|
5
7
|
|
|
6
8
|
/** Whether an account is administratively excluded from future pool selection. */
|
|
7
9
|
export function isCodexAccountPaused(config: OcxConfig, accountId: string): boolean {
|
|
@@ -10,6 +12,8 @@ export function isCodexAccountPaused(config: OcxConfig, accountId: string): bool
|
|
|
10
12
|
|
|
11
13
|
/** Persist the account's pool eligibility without changing credentials or runtime health. */
|
|
12
14
|
export function setCodexAccountPaused(config: OcxConfig, accountId: string, paused: boolean, details?: AccountPauseDetails): void {
|
|
15
|
+
// Pausing main ends a retained native-main login; resuming never revives it (#7345).
|
|
16
|
+
if (paused && accountId === MAIN_CODEX_ACCOUNT_ID) invalidateRetainedNativeMainLogin("pause");
|
|
13
17
|
config.codexAccountPauseState = { ...config.codexAccountPauseState,
|
|
14
18
|
[accountId]: { revision: randomUUID(), ...(paused && details ? { details } : {}) } };
|
|
15
19
|
const pausedIds = new Set(config.pausedCodexAccountIds ?? []);
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { setDecisionAccountUsable } from "../lib/decision-quota-sink";
|
|
2
2
|
import { captureConfigGeneration, type GenerationContext } from "../lib/state-store-sweeper";
|
|
3
3
|
import { isCodexAccountGenerationLive } from "./account-store";
|
|
4
|
+
import { MAIN_CODEX_ACCOUNT_ID } from "./account-id";
|
|
5
|
+
import { invalidateRetainedNativeMainLogin } from "./native-main-credentials";
|
|
4
6
|
|
|
5
7
|
/**
|
|
6
8
|
* Accounts quarantined for reauthentication, each remembering WHICH credential produced the
|
|
@@ -25,6 +27,7 @@ const refusedMainRefreshGrants = new Set<string>();
|
|
|
25
27
|
const MAX_REFUSED_MAIN_REFRESH_GRANTS = 64;
|
|
26
28
|
|
|
27
29
|
export function markMainRefreshGrantRejected(key: string): void {
|
|
30
|
+
invalidateRetainedNativeMainLogin("revocation");
|
|
28
31
|
refusedMainRefreshGrants.add(key);
|
|
29
32
|
if (refusedMainRefreshGrants.size > MAX_REFUSED_MAIN_REFRESH_GRANTS) {
|
|
30
33
|
refusedMainRefreshGrants.delete(refusedMainRefreshGrants.values().next().value!);
|
|
@@ -47,6 +50,7 @@ export function markAccountNeedsReauth(
|
|
|
47
50
|
credentialGeneration?: number,
|
|
48
51
|
): void {
|
|
49
52
|
if (writerGeneration < lastReconciledGeneration && !liveAccountIds.has(id)) return;
|
|
53
|
+
if (id === MAIN_CODEX_ACCOUNT_ID) invalidateRetainedNativeMainLogin("revocation");
|
|
50
54
|
setDecisionAccountUsable(id === "__main__" ? "codex-main" : "codex", id, false, credentialGeneration);
|
|
51
55
|
// An account-wide mark supersedes a generation-scoped one: it is the stronger claim.
|
|
52
56
|
if (credentialGeneration === undefined || !reauthAccounts.has(id)) {
|
|
@@ -420,14 +420,23 @@ export function capturePoolQuotaWriter(accountId: string, dispatched: Dispatched
|
|
|
420
420
|
export function poolQuotaHistoryIdentity(accountId: string): string | undefined {
|
|
421
421
|
if (!isValidCodexAccountId(accountId)) return undefined;
|
|
422
422
|
try {
|
|
423
|
-
|
|
424
|
-
return record?.credential && record.deletedAt == null && validQuotaHistoryIdentity(record.quotaHistoryIdentity)
|
|
425
|
-
? record.quotaHistoryIdentity : undefined;
|
|
423
|
+
return poolQuotaHistoryIdentityOf(readCodexAccountRecord(accountId));
|
|
426
424
|
} catch {
|
|
427
425
|
return undefined;
|
|
428
426
|
}
|
|
429
427
|
}
|
|
430
428
|
|
|
429
|
+
/** {@link poolQuotaHistoryIdentity} for a record the caller already loaded, e.g. from one snapshot. */
|
|
430
|
+
export function poolQuotaHistoryIdentityOf(record: CodexAccountCredentialRecord | null | undefined): string | undefined {
|
|
431
|
+
return record?.credential && record.deletedAt == null && validQuotaHistoryIdentity(record.quotaHistoryIdentity)
|
|
432
|
+
? record.quotaHistoryIdentity : undefined;
|
|
433
|
+
}
|
|
434
|
+
|
|
435
|
+
/** One id out of {@link loadCodexAccountRecordSnapshot}; an invalid id or an inherited key is no record. */
|
|
436
|
+
export function codexAccountRecordFromSnapshot(records: Readonly<Record<string, CodexAccountCredentialRecord>>, accountId: string): CodexAccountCredentialRecord | null {
|
|
437
|
+
return isValidCodexAccountId(accountId) && Object.hasOwn(records, accountId) ? records[accountId]! : null;
|
|
438
|
+
}
|
|
439
|
+
|
|
431
440
|
/** Recheck append admission after upstream I/O; refresh may retire a writer without erasing history. */
|
|
432
441
|
export function isPoolQuotaWriterLive(writer: PoolQuotaWriter): boolean {
|
|
433
442
|
if (!isValidCodexAccountId(writer.accountId)) return false;
|