@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
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, restartOwnerEvidence, type ClientRestartController, 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,30 @@ export function clientRuntimeRecord(
|
|
|
99
110
|
pid: number,
|
|
100
111
|
port: number,
|
|
101
112
|
attestationSecret: string = createLocalAttestationSecret(),
|
|
113
|
+
owner: RestartOwner | null = classifiedOwner(),
|
|
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
|
+
|
|
108
128
|
export function standaloneRecycleEnv(
|
|
109
129
|
env: NodeJS.ProcessEnv,
|
|
110
130
|
disconnectedTokenFingerprint: string,
|
|
111
131
|
): NodeJS.ProcessEnv {
|
|
112
132
|
const childEnv = { ...env };
|
|
113
|
-
// A detached replacement is not the desktop app's
|
|
114
|
-
|
|
133
|
+
// A detached replacement is nobody's child: not the desktop app's, not a service's, not a Windows
|
|
134
|
+
// wrapper's. It must carry no supervisor marker it would otherwise misread as its own.
|
|
135
|
+
for (const name of SUPERVISOR_MARKER_ENVS) delete childEnv[name];
|
|
136
|
+
delete childEnv.OCX_SERVICE;
|
|
115
137
|
const admissionToken = childEnv.OPENCODEX_API_AUTH_TOKEN?.trim();
|
|
116
138
|
if (admissionToken && serviceApiTokenFingerprint(admissionToken) !== disconnectedTokenFingerprint) {
|
|
117
139
|
// A surviving env token shadows OCX_API_TOKEN_FILE entirely, so nothing below can
|
|
@@ -164,9 +186,14 @@ export async function recycleStandalone(
|
|
|
164
186
|
const port = activePort ?? (io.configuredPort ?? configuredTcpPort)();
|
|
165
187
|
const exit = io.exitProcess ?? ((code: number) => { process.exit(code); });
|
|
166
188
|
// Capture the one-use sibling handoff before this process removes its runtime record.
|
|
167
|
-
const
|
|
189
|
+
const serviceSupervised = (io.serviceSupervised ?? (() => process.env.OCX_SERVICE === "1"))();
|
|
190
|
+
const replacementEnv = port && !serviceSupervised
|
|
168
191
|
? withSiblingMarker(standaloneRecycleEnv(process.env, disconnectedTokenFingerprint), issueSiblingHandoff)
|
|
169
192
|
: null;
|
|
193
|
+
activeCredentialObservation?.stop(); activeCredentialObservation = null;
|
|
194
|
+
activeReporter?.stop(); activeReporter = null;
|
|
195
|
+
activeRouteWatch?.stop(); activeRouteWatch = null;
|
|
196
|
+
activeRouteSync?.stop(); activeRouteSync = null;
|
|
170
197
|
try {
|
|
171
198
|
await activeSupervisor?.stop();
|
|
172
199
|
} catch (error) {
|
|
@@ -201,7 +228,7 @@ export async function recycleStandalone(
|
|
|
201
228
|
//
|
|
202
229
|
// launchd's KeepAlive is failure-only too (`SuccessfulExit` false), so exit 1 is what
|
|
203
230
|
// relaunches it as well; an exit 0 would leave the job stopped.
|
|
204
|
-
if (
|
|
231
|
+
if (serviceSupervised) {
|
|
205
232
|
exit(1);
|
|
206
233
|
return;
|
|
207
234
|
}
|
|
@@ -326,8 +353,6 @@ export async function startClientRuntime(
|
|
|
326
353
|
&& !isChildInitiatedLink(state.value.link.linkId);
|
|
327
354
|
// One secret for the life of this process: a rollback republishes the same identity.
|
|
328
355
|
const attestationSecret = createLocalAttestationSecret();
|
|
329
|
-
// The local-credential observer lives exactly while this process serves (status attestation).
|
|
330
|
-
let credentialObservation: { stop(): void } | null = null;
|
|
331
356
|
|
|
332
357
|
// Bind, start a fresh tunnel supervisor and publish. Runs once at start and again when a failed
|
|
333
358
|
// restart rolls back (OCX-6); the stopped supervisor cannot be started twice, so each call builds one.
|
|
@@ -371,12 +396,17 @@ export async function startClientRuntime(
|
|
|
371
396
|
servedPort = boundPort;
|
|
372
397
|
activeSupervisor = supervisor;
|
|
373
398
|
supervisor?.start();
|
|
374
|
-
|
|
399
|
+
activeCredentialObservation ??= observeLocalCredentials();
|
|
375
400
|
writePid(process.pid);
|
|
376
|
-
|
|
401
|
+
// A new generation per publication: syncs admitted before a failed restart refuse to commit
|
|
402
|
+
// into the runtime that serves again, while syncs admitted from here on proceed.
|
|
403
|
+
writeRuntimePort({ ...clientRuntimeRecord(process.pid, boundPort, attestationSecret), servingGeneration: randomUUID() });
|
|
377
404
|
if (linkMode && state.value.link && linkKey) {
|
|
378
405
|
activeReporter = createLinkParityReporter({ connection: state.value, linkKey, runtimeStartedAt: CLIENT_RUNTIME_STARTED_AT });
|
|
379
406
|
activeReporter.start();
|
|
407
|
+
const scheduler = startRouteIntentTick(state.value, { onApplied: () => activeReporter?.requestReport() });
|
|
408
|
+
activeRouteSync = scheduler;
|
|
409
|
+
activeRouteWatch = startRouteIntentWatch(state.value, linkKey, { requestSync: () => scheduler.requestSync() });
|
|
380
410
|
}
|
|
381
411
|
};
|
|
382
412
|
if (!rollback) {
|
|
@@ -404,10 +434,12 @@ export async function startClientRuntime(
|
|
|
404
434
|
|
|
405
435
|
// Stop everything this process serves, giving in-flight requests up to `drainMs`.
|
|
406
436
|
const stopServing = async (drainMs: number): Promise<void> => {
|
|
407
|
-
|
|
408
|
-
|
|
437
|
+
activeCredentialObservation?.stop();
|
|
438
|
+
activeCredentialObservation = null;
|
|
409
439
|
activeReporter?.stop();
|
|
410
440
|
activeReporter = null;
|
|
441
|
+
activeRouteWatch?.stop(); activeRouteWatch = null;
|
|
442
|
+
activeRouteSync?.stop(); activeRouteSync = null;
|
|
411
443
|
try {
|
|
412
444
|
await activeSupervisor?.stop();
|
|
413
445
|
} catch (error) {
|
|
@@ -433,6 +465,18 @@ export async function startClientRuntime(
|
|
|
433
465
|
const restartController: ClientRestartController = createClientRestartController({
|
|
434
466
|
stopping: () => shuttingDown,
|
|
435
467
|
supervisor: io.restartSupervisor ?? clientRestartSupervisor,
|
|
468
|
+
connectionChanged: () => clientConnectionEnded(state.value, readClientConnectionStateWithEvidence()),
|
|
469
|
+
ownerProven,
|
|
470
|
+
recycle: supervisor => recycleStandalone(state.value.tokenFingerprint, {
|
|
471
|
+
isDesktopSupervised: () => supervisor === "desktop",
|
|
472
|
+
serviceSupervised: () => supervisor === "service",
|
|
473
|
+
}),
|
|
474
|
+
// Fence Link syncs before the teardown: a sync already past admission would otherwise keep
|
|
475
|
+
// writing client files and receipts while the listener closes. Marking the record makes every
|
|
476
|
+
// later commit stand down under C; the replacement's record, or the fresh generation a rollback
|
|
477
|
+
// publishes, keeps those syncs refused and admits new ones. A mark that cannot be written
|
|
478
|
+
// abandons the restart before anything stops.
|
|
479
|
+
fence: async () => !linkMode || await markClientRuntimeStoppingWithRetry({ pid: process.pid, port: servedPort, attestationSecret }),
|
|
436
480
|
stop: stopServing,
|
|
437
481
|
spawnReplacement: async deadlineAt => {
|
|
438
482
|
const { replacementStartEnvironment } = await import("../server/management/system-restart");
|
|
@@ -483,10 +527,12 @@ export async function startClientRuntime(
|
|
|
483
527
|
if (recycleFlight) await recycleFlight.catch(() => {});
|
|
484
528
|
// A rollback may have republished its runtime record while shutdown joined it.
|
|
485
529
|
syncFenced = !linkMode || await markClientRuntimeStoppingWithRetry({ pid: process.pid, port: servedPort, attestationSecret });
|
|
486
|
-
|
|
487
|
-
|
|
530
|
+
activeCredentialObservation?.stop();
|
|
531
|
+
activeCredentialObservation = null;
|
|
488
532
|
activeReporter?.stop();
|
|
489
533
|
activeReporter = null;
|
|
534
|
+
activeRouteWatch?.stop(); activeRouteWatch = null;
|
|
535
|
+
activeRouteSync?.stop(); activeRouteSync = null;
|
|
490
536
|
try {
|
|
491
537
|
await activeSupervisor?.stop();
|
|
492
538
|
} 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") {
|
|
@@ -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";
|
|
@@ -530,6 +532,19 @@ export function commandCodeConfigPath(env: OpencodeLaunchEnv = process.env, home
|
|
|
530
532
|
return join(commandCodeHomeDir(env, home, platform), "providers.json");
|
|
531
533
|
}
|
|
532
534
|
|
|
535
|
+
/**
|
|
536
|
+
* Command Code's credential store, next to the provider file.
|
|
537
|
+
*
|
|
538
|
+
* Only the DESKTOP app reads this before it will show a workspace; the published
|
|
539
|
+
* CLI is content with `apiKey: false` in `providers.json`. It is the vendor's file,
|
|
540
|
+
* shared with real logins and other providers' tokens, so this integration NEVER
|
|
541
|
+
* writes it: the desktop user signs in themselves. Exported so callers and tests
|
|
542
|
+
* can name the path they must leave alone.
|
|
543
|
+
*/
|
|
544
|
+
export function commandCodeAuthPath(env: OpencodeLaunchEnv = process.env, home: string = homedir(), platform: NodeJS.Platform = process.platform): string {
|
|
545
|
+
return join(commandCodeHomeDir(env, home, platform), "auth.json");
|
|
546
|
+
}
|
|
547
|
+
|
|
533
548
|
/**
|
|
534
549
|
* The provider store a current ZCode reads, which is NOT the file above.
|
|
535
550
|
*
|
|
@@ -896,6 +911,18 @@ export interface PiProviderCompat {
|
|
|
896
911
|
|
|
897
912
|
interface PiExportOptions {
|
|
898
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;
|
|
899
926
|
/**
|
|
900
927
|
* Tell Pi to send its system prompt as `system` rather than `developer` (#5664).
|
|
901
928
|
*
|
|
@@ -1067,7 +1094,11 @@ export interface GajaeGeneratedConfig {
|
|
|
1067
1094
|
*/
|
|
1068
1095
|
function buildPiClientConfig(ctx: ExportContext, options: PiExportOptions = {}): PiGeneratedConfig {
|
|
1069
1096
|
const models: PiModelEntry[] = [];
|
|
1070
|
-
|
|
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;
|
|
1071
1102
|
// Text is the one modality every routed model supports; anything richer must come
|
|
1072
1103
|
// from the catalog rather than an assumption — and must still be inside the enum
|
|
1073
1104
|
// Pi accepts, because one rejected value empties the whole config.
|
|
@@ -1125,6 +1156,7 @@ function buildPiClientConfig(ctx: ExportContext, options: PiExportOptions = {}):
|
|
|
1125
1156
|
* its models.json `compat` block (docs/models.md, docs/custom-provider.md).
|
|
1126
1157
|
*/
|
|
1127
1158
|
const PI_EXPORT_OPTIONS: PiExportOptions = { sendSessionAffinityHeaders: true, foldDeveloperRole: true };
|
|
1159
|
+
const PI_NATIVE_SELECTOR_OPTIONS: PiExportOptions = { ...PI_EXPORT_OPTIONS, rawNestedModelIds: true, omitNativeInCodexDirect: true };
|
|
1128
1160
|
|
|
1129
1161
|
/** Do not let provider-controlled catalog text become an environment lookup. */
|
|
1130
1162
|
function containsEnvInterpolation(value: string): boolean {
|
|
@@ -1332,7 +1364,7 @@ function buildOpencodeContribution(ctx: ExportContext): ManagedContribution {
|
|
|
1332
1364
|
}
|
|
1333
1365
|
|
|
1334
1366
|
function buildPiContribution(ctx: ExportContext): ManagedContribution {
|
|
1335
|
-
const doc = buildPiClientConfig(ctx,
|
|
1367
|
+
const doc = buildPiClientConfig(ctx, PI_NATIVE_SELECTOR_OPTIONS);
|
|
1336
1368
|
return singleFragment("pi", ["providers", OPENCODE_PROVIDER_ID], doc.providers[OPENCODE_PROVIDER_ID]);
|
|
1337
1369
|
}
|
|
1338
1370
|
|
|
@@ -1498,7 +1530,7 @@ export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
|
|
|
1498
1530
|
destination: env => piConfigPath(env),
|
|
1499
1531
|
apiKeyEnv: "",
|
|
1500
1532
|
exportHint: "Pi reads a non-secret placeholder from models.json; loopback needs no key.",
|
|
1501
|
-
build: ctx => buildPiClientConfig(ctx,
|
|
1533
|
+
build: ctx => buildPiClientConfig(ctx, PI_NATIVE_SELECTOR_OPTIONS),
|
|
1502
1534
|
format: "json",
|
|
1503
1535
|
summarize: summarizePi,
|
|
1504
1536
|
buildContribution: buildPiContribution,
|
|
@@ -1623,7 +1655,7 @@ export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
|
|
|
1623
1655
|
// No env var exists behind this integration: buildCommandCodeClientConfig
|
|
1624
1656
|
// writes `apiKey: false`, the documented keyless form for a loopback endpoint.
|
|
1625
1657
|
apiKeyEnv: "",
|
|
1626
|
-
exportHint: "The provider is written with `apiKey: false
|
|
1658
|
+
exportHint: "The provider is written with `apiKey: false`, the keyless form the CLI accepts. The desktop app needs its own Command Code sign-in; opencodex never writes `~/.commandcode/auth.json`.",
|
|
1627
1659
|
build: buildCommandCodeClientConfig,
|
|
1628
1660
|
format: "json",
|
|
1629
1661
|
summarize: summarizeCommandCode,
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { OcxConfig } from "../types";
|
|
2
|
+
import { isCodexAccountPaused } from "./account-pause";
|
|
3
|
+
import { isCodexAccountGenerationLive } from "./account-store";
|
|
4
|
+
import { MAIN_CODEX_ACCOUNT_ID } from "./account-id";
|
|
5
|
+
import { PERMANENT_PAUSE_REASONS, type ResumeHealthRefusal } from "../oauth/account-resume-health";
|
|
6
|
+
import type { PoolQuotaResult } from "./auth-api/pool-quota-probe";
|
|
7
|
+
|
|
8
|
+
export type CodexResumeHealthVerdict = { ok: true; pauseRevision: string | undefined } | { ok: false; reason: ResumeHealthRefusal };
|
|
9
|
+
|
|
10
|
+
/** An explicit refresh probe of one pool account: forced, operator-initiated, never a cached read. */
|
|
11
|
+
export type CodexHealthProbe = (accountId: string, plan: string | undefined) => Promise<PoolQuotaResult>;
|
|
12
|
+
|
|
13
|
+
const defaultProbe: CodexHealthProbe = async (accountId, plan) => {
|
|
14
|
+
const { fetchPoolAccountQuota } = await import("./auth-api/pool-quota-probe");
|
|
15
|
+
return await fetchPoolAccountQuota(accountId, true, plan, undefined, false, undefined, undefined, true);
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Health gate for `ocx account resume openai <id> --if-healthy` (#8398): the same rules as the OAuth
|
|
20
|
+
* gate, read through the pool's own WHAM quota probe, which may refresh a pool credential. Healthy
|
|
21
|
+
* means a fresh quota read by a credential generation that is still live; an exhausted window is
|
|
22
|
+
* still healthy, because routing already handles a spent window. Null when the account is not paused.
|
|
23
|
+
*/
|
|
24
|
+
export async function checkCodexResumeHealth(config: OcxConfig, accountId: string, probe: CodexHealthProbe = defaultProbe): Promise<CodexResumeHealthVerdict | null> {
|
|
25
|
+
if (!isCodexAccountPaused(config, accountId)) return null;
|
|
26
|
+
const state = config.codexAccountPauseState?.[accountId];
|
|
27
|
+
if (state?.details && PERMANENT_PAUSE_REASONS.has(state.details.reason)) return { ok: false, reason: "pause_not_remote_clearable" };
|
|
28
|
+
if (accountId === MAIN_CODEX_ACCOUNT_ID) return { ok: false, reason: "health_check_unsupported" };
|
|
29
|
+
const pauseRevision = state?.revision;
|
|
30
|
+
const plan = (config.codexAccounts ?? []).find(account => account.id === accountId && !account.isMain)?.plan;
|
|
31
|
+
let result: PoolQuotaResult | undefined;
|
|
32
|
+
try { result = await probe(accountId, plan); } catch { result = undefined; }
|
|
33
|
+
if (!result) return { ok: false, reason: "usage_read_failed" };
|
|
34
|
+
if (result.needsReauth) return { ok: false, reason: "needs_reauth" };
|
|
35
|
+
const generation = result.freshCredentialGeneration;
|
|
36
|
+
if (!result.freshQuota || generation === undefined || !isCodexAccountGenerationLive(accountId, generation)) return { ok: false, reason: "usage_read_failed" };
|
|
37
|
+
if (!isCodexAccountPaused(config, accountId) || config.codexAccountPauseState?.[accountId]?.revision !== pauseRevision) {
|
|
38
|
+
return { ok: false, reason: "account_changed" };
|
|
39
|
+
}
|
|
40
|
+
return { ok: true, pauseRevision };
|
|
41
|
+
}
|
|
@@ -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;
|