@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -71,12 +71,20 @@ import {
|
|
|
71
71
|
readBoundedDiscoveryJson,
|
|
72
72
|
resolveProviderModelDiscovery,
|
|
73
73
|
} from "../../providers/model-discovery";
|
|
74
|
-
import {
|
|
74
|
+
import {
|
|
75
|
+
buildVertexProviderModelsRequest,
|
|
76
|
+
collectVertexPublisherModelPages,
|
|
77
|
+
countDiscoveryResponseBytes,
|
|
78
|
+
extractGoogleNativeModelItems,
|
|
79
|
+
resolveVertexDiscoveryAuth,
|
|
80
|
+
vertexDiscoveryAuthIsCurrent,
|
|
81
|
+
vertexDiscoveryDeadline,
|
|
82
|
+
type VertexDiscoveryAuth,
|
|
83
|
+
} from "../../providers/google-vertex-model-discovery";
|
|
75
84
|
import { routedSlug, slugEquals } from "../../providers/slug-codec";
|
|
76
85
|
import { clearAccountQuotaCache, clearProviderQuotaCache, fetchProviderQuotaReports } from "../../providers/quota";
|
|
77
|
-
import {
|
|
78
|
-
import {
|
|
79
|
-
import { cachedProviderQuotaIsExhausted } from "../../combos/resolve";
|
|
86
|
+
import { clearPassiveKeyLimits, listPassiveKeyLimits, passiveProviderOwnership } from "../../providers/passive-key-observation";
|
|
87
|
+
import { providerRoutingQuota } from "./provider-routing-quota";
|
|
80
88
|
import { probeJevDecisionProvider } from "../../combos/jev";
|
|
81
89
|
import { comboDependsOnProviderRoute } from "./decision-model-validation";
|
|
82
90
|
import { clearKeyCooldowns, forgetApiKeyRotationCursor } from "../../providers/key-failover";
|
|
@@ -154,7 +162,7 @@ type ProviderPatchApplication =
|
|
|
154
162
|
headersTouched: boolean;
|
|
155
163
|
};
|
|
156
164
|
|
|
157
|
-
const PROVIDER_ALIAS_OVERLAY_FIELDS = ["alias", "modelAliases", "defaultAliases"] as const;
|
|
165
|
+
const PROVIDER_ALIAS_OVERLAY_FIELDS = ["alias", "modelAliases", "defaultAliases", "aliasTemplate"] as const;
|
|
158
166
|
type ProviderAliasOverlayField = typeof PROVIDER_ALIAS_OVERLAY_FIELDS[number];
|
|
159
167
|
|
|
160
168
|
/**
|
|
@@ -863,40 +871,6 @@ function canonicalOpenAiBudgetPatchError(
|
|
|
863
871
|
?? providerEmptyToolOutputConfigError("openai", applied.next);
|
|
864
872
|
}
|
|
865
873
|
|
|
866
|
-
function providerRoutingQuota(config: OcxConfig, name: string, now: number): ProviderRoutingQuota {
|
|
867
|
-
const provider = hasOwnProvider(config.providers, name) ? config.providers[name] : undefined;
|
|
868
|
-
const quota = getCachedProviderRoutingQuota(name, provider, now);
|
|
869
|
-
if (!quota || !Number.isFinite(quota.updatedAt) || quota.updatedAt < 0 || quota.updatedAt > now
|
|
870
|
-
|| now >= quota.updatedAt + PROVIDER_QUOTA_MAX_AGE_MS) return { state: "unknown" };
|
|
871
|
-
|
|
872
|
-
// Removing search/MCP windows may leave only a timestamp. That is not inference evidence.
|
|
873
|
-
const percentages = [quota.fiveHourPercent, quota.weeklyPercent, quota.monthlyPercent,
|
|
874
|
-
...(quota.customWindows ?? []).filter(window => window.modelId === undefined).map(window => window.percent)];
|
|
875
|
-
const hasPercentage = percentages.some(value => typeof value === "number" && Number.isFinite(value) && value >= 0);
|
|
876
|
-
const credits = quota.creditsUsd;
|
|
877
|
-
const hasCredits = credits !== undefined && Number.isFinite(credits.percent)
|
|
878
|
-
&& credits.percent >= 0 && Number.isFinite(credits.remaining);
|
|
879
|
-
if (!hasPercentage && !hasCredits) return { state: "unknown" };
|
|
880
|
-
|
|
881
|
-
const state = cachedProviderQuotaIsExhausted(quota, now) ? "exhausted" : "available";
|
|
882
|
-
let validUntil = quota.updatedAt + PROVIDER_QUOTA_MAX_AGE_MS;
|
|
883
|
-
if (state === "exhausted") {
|
|
884
|
-
const resets = [quota.fiveHourResetAt, quota.weeklyResetAt, quota.monthlyResetAt,
|
|
885
|
-
...(quota.customWindows ?? []).filter(window => window.modelId === undefined).map(window => window.resetAt)]
|
|
886
|
-
.filter((reset): reset is number => typeof reset === "number" && Number.isFinite(reset)
|
|
887
|
-
&& reset > now && reset < validUntil)
|
|
888
|
-
.sort((left, right) => left - right);
|
|
889
|
-
// Reuse dispatch's predicate: another exhausted window or USD cap may still block.
|
|
890
|
-
for (const reset of resets) {
|
|
891
|
-
if (!cachedProviderQuotaIsExhausted(quota, reset)) {
|
|
892
|
-
validUntil = reset;
|
|
893
|
-
break;
|
|
894
|
-
}
|
|
895
|
-
}
|
|
896
|
-
}
|
|
897
|
-
return { state, updatedAt: quota.updatedAt, validUntil };
|
|
898
|
-
}
|
|
899
|
-
|
|
900
874
|
export async function handleProviderRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
901
875
|
const { req, url, config, deps, principal, convergeCodexCatalog, syncClaudeAgentDefsBestEffort } = ctx;
|
|
902
876
|
|
|
@@ -906,6 +880,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
906
880
|
const now = Date.now();
|
|
907
881
|
return jsonResponse({
|
|
908
882
|
...snapshot,
|
|
883
|
+
passiveKeyLimits: listPassiveKeyLimits(config),
|
|
909
884
|
reports: snapshot.reports.map(report => ({
|
|
910
885
|
...report,
|
|
911
886
|
routingQuota: providerRoutingQuota(config, report.provider, now),
|
|
@@ -925,6 +900,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
925
900
|
allowPrivateNetwork: p.allowPrivateNetwork === true,
|
|
926
901
|
preserveResponsesReasoningContent: p.preserveResponsesReasoningContent,
|
|
927
902
|
promoteAdditionalTools: p.promoteAdditionalTools,
|
|
903
|
+
forwardAdvisorTool: p.forwardAdvisorTool,
|
|
928
904
|
liveModels: p.liveModels !== false,
|
|
929
905
|
requestPacing: p.requestPacing,
|
|
930
906
|
models: p.models ?? [],
|
|
@@ -1026,6 +1002,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1026
1002
|
if (sourceChanged || currentDiskConfig === null) {
|
|
1027
1003
|
return jsonResponse({ error: "provider reload source changed" }, 409);
|
|
1028
1004
|
}
|
|
1005
|
+
clearPassiveKeyLimits(name);
|
|
1029
1006
|
reconcileLiveStateStores();
|
|
1030
1007
|
// The complete disk snapshot owns display overlays, including providers that this
|
|
1031
1008
|
// live routing instance deliberately does not adopt.
|
|
@@ -1133,6 +1110,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1133
1110
|
|
|
1134
1111
|
cleanupRemovedGcpCredentials(removedCredentials);
|
|
1135
1112
|
adoptProviderEditorCandidate(config, outcome.value.config);
|
|
1113
|
+
clearPassiveKeyLimits();
|
|
1136
1114
|
reconcileLiveStateStores();
|
|
1137
1115
|
refreshConfigDerivedRegistries(outcome.value.config);
|
|
1138
1116
|
clearGatherRoutedModelsInflight();
|
|
@@ -1274,6 +1252,10 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1274
1252
|
// An overwrite must not spend a second subscription account's quota as a side effect.
|
|
1275
1253
|
const existingFailover = config.providers[name]?.oauthAccountFailover;
|
|
1276
1254
|
if (existingFailover && !prov.oauthAccountFailover) prov.oauthAccountFailover = existingFailover;
|
|
1255
|
+
|
|
1256
|
+
if (!Object.hasOwn(body.provider, "cacheAffinity") && config.providers[name]?.cacheAffinity !== undefined) {
|
|
1257
|
+
prov.cacheAffinity = config.providers[name]!.cacheAffinity;
|
|
1258
|
+
}
|
|
1277
1259
|
// ...and to hand-edited context windows. `ProviderPayload` (gui/src/provider-payload.ts)
|
|
1278
1260
|
// has no member for either field, so the add/edit form structurally cannot send them:
|
|
1279
1261
|
// absence in the request means "not carried", never "the user deleted it". Deletion goes
|
|
@@ -1412,6 +1394,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1412
1394
|
}
|
|
1413
1395
|
});
|
|
1414
1396
|
if (validationError !== undefined) return jsonResponse({ error: validationError }, 400);
|
|
1397
|
+
clearPassiveKeyLimits(name);
|
|
1415
1398
|
cleanupRemovedGcpCredentials(removedCredentials);
|
|
1416
1399
|
reconcileLiveStateStores();
|
|
1417
1400
|
if (prov.apiKey && prov.apiKeyPool) {
|
|
@@ -1603,9 +1586,18 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1603
1586
|
const validation = validateConfigCandidate({ ...config, providers: { ...config.providers, [name]: candidate } });
|
|
1604
1587
|
if (!validation.ok) { replayError = validation.error; return; }
|
|
1605
1588
|
}
|
|
1606
|
-
|
|
1607
|
-
|
|
1608
|
-
|
|
1589
|
+
const previousOwnership = passiveProviderOwnership(config.providers[name]);
|
|
1590
|
+
try {
|
|
1591
|
+
commitProviderPatch(config, () => {
|
|
1592
|
+
config.providers[name] = candidate;
|
|
1593
|
+
}, deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode);
|
|
1594
|
+
} finally {
|
|
1595
|
+
// Persistence may rebase the row or publish before throwing. Compare the resulting
|
|
1596
|
+
// live owner under the lock, after rollback when the save did not publish.
|
|
1597
|
+
if (!isDeepStrictEqual(previousOwnership, passiveProviderOwnership(config.providers[name]))) {
|
|
1598
|
+
clearPassiveKeyLimits(name);
|
|
1599
|
+
}
|
|
1600
|
+
}
|
|
1609
1601
|
});
|
|
1610
1602
|
if (replayError !== undefined) return jsonResponse({ error: replayError }, 409);
|
|
1611
1603
|
reconcileLiveStateStores();
|
|
@@ -1669,8 +1661,14 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1669
1661
|
const snapshot = prov.authMode === "oauth" && mayResolveModelsOAuth(name, config.providers[name])
|
|
1670
1662
|
? await getModelsOAuthAccessSnapshot(name, prov).catch(() => undefined)
|
|
1671
1663
|
: undefined;
|
|
1672
|
-
const
|
|
1673
|
-
|
|
1664
|
+
const vertexDeadline = effectiveGoogleMode(name, prov) === "vertex" ? vertexDiscoveryDeadline(req.signal) : undefined;
|
|
1665
|
+
let vertexAuth: VertexDiscoveryAuth | undefined;
|
|
1666
|
+
const apiKey = prov.authMode === "oauth"
|
|
1667
|
+
? snapshot?.accessToken
|
|
1668
|
+
: vertexDeadline
|
|
1669
|
+
? (vertexAuth = await resolveVertexDiscoveryAuth(prov, vertexDeadline))?.token
|
|
1670
|
+
: await resolveModelsAuthToken(name, prov);
|
|
1671
|
+
if ((prov.authMode === "oauth" || effectiveGoogleMode(name, prov) === "vertex") && !apiKey) {
|
|
1674
1672
|
return jsonResponse({ ok: false, latencyMs: 0, error: "static catalog only — upstream not verified (not logged in)" });
|
|
1675
1673
|
}
|
|
1676
1674
|
if (prov.adapter === "zed") return (await import("./zed-provider-probe")).probeZedProvider(prov, apiKey, snapshot?.providerUserId);
|
|
@@ -1726,9 +1724,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1726
1724
|
if (antigravity && !project) {
|
|
1727
1725
|
return jsonResponse({ ok: false, latencyMs: 0, error: "Antigravity project unavailable — re-run `ocx login google-antigravity`" });
|
|
1728
1726
|
}
|
|
1729
|
-
const { method, url: modelsUrl, headers } =
|
|
1730
|
-
oauthApiBaseUrl: snapshot?.apiBaseUrl, workbuddy: snapshot?.workbuddy
|
|
1731
|
-
});
|
|
1727
|
+
const { method, url: modelsUrl, headers } = buildVertexProviderModelsRequest(name, prov, apiKey)
|
|
1728
|
+
?? buildModelsRequest(prov, apiKey, name, { oauthApiBaseUrl: snapshot?.apiBaseUrl, workbuddy: snapshot?.workbuddy });
|
|
1732
1729
|
const discovery = resolveProviderModelDiscovery(name, prov);
|
|
1733
1730
|
const started = Date.now();
|
|
1734
1731
|
try {
|
|
@@ -1736,9 +1733,10 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1736
1733
|
// own fixed discovery URL survives purely-benchmark (Clash/Surge/Mihomo
|
|
1737
1734
|
// fake-IP) DNS without proxy env.
|
|
1738
1735
|
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
|
|
1739
|
-
beforeSend: () =>
|
|
1736
|
+
beforeSend: () => (!vertexAuth || vertexDiscoveryAuthIsCurrent(prov, vertexAuth, headers))
|
|
1737
|
+
&& (prov.authMode !== "oauth" || (mayResolveModelsOAuth(name, config.providers[name])
|
|
1740
1738
|
&& modelsOAuthTargetMatches(name, config.providers[name], authorizedTarget)
|
|
1741
|
-
&& (name !== "anthropic2" || new URL(modelsUrl).href === authorizedTarget)) };
|
|
1739
|
+
&& (name !== "anthropic2" || new URL(modelsUrl).href === authorizedTarget))) };
|
|
1742
1740
|
const res = method === "POST"
|
|
1743
1741
|
? await providerOutboundPost(name, prov, modelsUrl, {
|
|
1744
1742
|
headers,
|
|
@@ -1747,7 +1745,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1747
1745
|
}, outboundDependencies)
|
|
1748
1746
|
: await providerOutboundGet(name, prov, modelsUrl, {
|
|
1749
1747
|
headers,
|
|
1750
|
-
signal: AbortSignal.timeout(8000),
|
|
1748
|
+
signal: vertexDeadline ?? AbortSignal.timeout(8000),
|
|
1751
1749
|
}, outboundDependencies);
|
|
1752
1750
|
const latencyMs = Date.now() - started;
|
|
1753
1751
|
const redirectError = await providerRedirectError(res, modelsUrl);
|
|
@@ -1766,7 +1764,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1766
1764
|
}
|
|
1767
1765
|
return jsonResponse({ ok: false, latencyMs, error: `upstream model discovery returned ${res.status}` });
|
|
1768
1766
|
}
|
|
1769
|
-
const
|
|
1767
|
+
const vertexFirstPage = vertexDeadline ? countDiscoveryResponseBytes(res) : undefined;
|
|
1768
|
+
const bounded = await readBoundedDiscoveryJson(vertexFirstPage?.response ?? res, discovery.maxResponseBytes);
|
|
1770
1769
|
if (!bounded.ok) {
|
|
1771
1770
|
return jsonResponse({
|
|
1772
1771
|
ok: false,
|
|
@@ -1780,23 +1779,27 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1780
1779
|
if (antigravity && !ccaModels) {
|
|
1781
1780
|
return jsonResponse({ ok: false, latencyMs, error: "upstream CCA model discovery returned an unexpected shape" });
|
|
1782
1781
|
}
|
|
1782
|
+
const listing = !ccaModels && vertexDeadline
|
|
1783
|
+
? await collectVertexPublisherModelPages(modelsUrl, bounded.value,
|
|
1784
|
+
{ ...discovery, firstPageBytes: vertexFirstPage?.bytes(), signal: vertexDeadline },
|
|
1785
|
+
(pageUrl, signal) => providerOutboundGet(name, prov, pageUrl, { headers, signal }, outboundDependencies))
|
|
1786
|
+
: { ok: true as const, value: bounded.value };
|
|
1787
|
+
if (!listing.ok) return jsonResponse({ ok: false, latencyMs, error: `upstream Vertex model listing is incomplete: ${listing.diagnostic}` });
|
|
1783
1788
|
// OpenAI-style lists (and Together top-level arrays) use the same validation/dedupe/filter
|
|
1784
1789
|
// as catalog discovery. Google AI Studio parses the native `models[]` envelope and filters to
|
|
1785
1790
|
// `generateContent`, while other providers fall back to generic envelope rows if they return `models[]`.
|
|
1786
|
-
const record =
|
|
1787
|
-
?
|
|
1791
|
+
const record = listing.value !== null && typeof listing.value === "object" && !Array.isArray(listing.value)
|
|
1792
|
+
? listing.value as Record<string, unknown>
|
|
1788
1793
|
: undefined;
|
|
1789
|
-
const
|
|
1790
|
-
|
|
1791
|
-
? extractGoogleAiStudioModelItems(bounded.value, discovery.maxModels)
|
|
1794
|
+
const googleNative = !ccaModels
|
|
1795
|
+
? extractGoogleNativeModelItems(name, prov, listing.value, discovery.maxModels)
|
|
1792
1796
|
: undefined;
|
|
1793
1797
|
const extracted = ccaModels
|
|
1794
1798
|
? undefined
|
|
1795
|
-
:
|
|
1796
|
-
|
|
1797
|
-
|
|
1798
|
-
|
|
1799
|
-
: extractModelEnvelopeRows(bounded.value, discovery.maxModels, ["models"]);
|
|
1799
|
+
: googleNative
|
|
1800
|
+
?? (Array.isArray(listing.value) || Array.isArray(record?.data)
|
|
1801
|
+
? extractProviderModelItems(listing.value, discovery)
|
|
1802
|
+
: extractModelEnvelopeRows(listing.value, discovery.maxModels, ["models"]));
|
|
1800
1803
|
if (extracted && !extracted.ok) {
|
|
1801
1804
|
return jsonResponse({
|
|
1802
1805
|
ok: false,
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { OcxConfig } from "../../types";
|
|
2
|
+
import { hasOwnProvider } from "../../config/provider-name";
|
|
3
|
+
import { getCachedProviderRoutingQuota } from "../../providers/quota-routing-cache";
|
|
4
|
+
import { PROVIDER_QUOTA_MAX_AGE_MS, type ProviderRoutingQuota } from "../../providers/quota-types";
|
|
5
|
+
import { cachedProviderQuotaIsExhausted } from "../../combos/resolve";
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Project cached inference evidence into the Combo editor routing quota.
|
|
9
|
+
*
|
|
10
|
+
* Only state, observation time and an exclusive `validUntil` leave the process: cached display
|
|
11
|
+
* reports and private credential bindings are unchanged. A row that carries a timestamp but no
|
|
12
|
+
* percentage or USD figure is not inference evidence, so it stays unknown.
|
|
13
|
+
*/
|
|
14
|
+
export function providerRoutingQuota(config: OcxConfig, name: string, now: number): ProviderRoutingQuota {
|
|
15
|
+
const provider = hasOwnProvider(config.providers, name) ? config.providers[name] : undefined;
|
|
16
|
+
const quota = getCachedProviderRoutingQuota(name, provider, now);
|
|
17
|
+
if (!quota || !Number.isFinite(quota.updatedAt) || quota.updatedAt < 0 || quota.updatedAt > now
|
|
18
|
+
|| now >= quota.updatedAt + PROVIDER_QUOTA_MAX_AGE_MS) return { state: "unknown" };
|
|
19
|
+
|
|
20
|
+
const percentages = [quota.fiveHourPercent, quota.weeklyPercent, quota.monthlyPercent,
|
|
21
|
+
...(quota.customWindows ?? []).filter(window => window.modelId === undefined).map(window => window.percent)];
|
|
22
|
+
const hasPercentage = percentages.some(value => typeof value === "number" && Number.isFinite(value) && value >= 0);
|
|
23
|
+
const credits = quota.creditsUsd;
|
|
24
|
+
const hasCredits = credits !== undefined && Number.isFinite(credits.percent)
|
|
25
|
+
&& credits.percent >= 0 && Number.isFinite(credits.remaining);
|
|
26
|
+
if (!hasPercentage && !hasCredits) return { state: "unknown" };
|
|
27
|
+
|
|
28
|
+
const state = cachedProviderQuotaIsExhausted(quota, now) ? "exhausted" : "available";
|
|
29
|
+
let validUntil = quota.updatedAt + PROVIDER_QUOTA_MAX_AGE_MS;
|
|
30
|
+
if (state === "exhausted") {
|
|
31
|
+
const resets = [quota.fiveHourResetAt, quota.weeklyResetAt, quota.monthlyResetAt,
|
|
32
|
+
...(quota.customWindows ?? []).filter(window => window.modelId === undefined).map(window => window.resetAt)]
|
|
33
|
+
.filter((reset): reset is number => typeof reset === "number" && Number.isFinite(reset)
|
|
34
|
+
&& reset > now && reset < validUntil)
|
|
35
|
+
.sort((left, right) => left - right);
|
|
36
|
+
// Reuse dispatch predicate: another exhausted window or USD cap may still block.
|
|
37
|
+
for (const reset of resets) {
|
|
38
|
+
if (!cachedProviderQuotaIsExhausted(quota, reset)) {
|
|
39
|
+
validUntil = reset;
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return { state, updatedAt: quota.updatedAt, validUntil };
|
|
45
|
+
}
|
|
@@ -173,12 +173,14 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
173
173
|
// server/management/claude-desktop-picker-routes
|
|
174
174
|
{ method: "GET", path: "/api/claude-desktop/picker", module: "server/management/claude-desktop-picker-routes", mutates: false },
|
|
175
175
|
{ method: "PUT", path: "/api/claude-desktop/picker", module: "server/management/claude-desktop-picker-routes", mutates: true },
|
|
176
|
+
{ method: "GET", path: "/api/codex/desktop-compatibility/authorization", module: "server/management/desktop-authorization", mutates: false, mechanism: "path-constant", exempt: { reason: "session-only", why: "Reports Desktop scope for the current local GUI session. The credential is the browser session itself, so no CLI caller can observe it; the path constant is imported from gui-desktop-authorization.ts rather than written literally in this route file." } },
|
|
177
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/authorization", module: "server/management/desktop-authorization", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Spends one Desktop-purpose grant on the current local GUI session, which is consent a CLI cannot give for a browser session it does not own. The handler mints only Desktop scope and never issues pairing credentials or data keys." } },
|
|
176
178
|
{ method: "GET", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "Certificate status is available over authenticated HTTP while the desktop compatibility runtime/CLI status contract is integrated." } },
|
|
177
|
-
{ method: "POST", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Certificate setup
|
|
179
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Certificate setup needs a local GUI session that has already consumed a Desktop-purpose grant, so a raw admin token cannot enroll or remove OS trust. A loopback session refuses every trust mutation until that step-up completes; the grant is the part no CLI verb can supply, and it widens neither pairing nor key disclosure." } },
|
|
178
180
|
{ method: "GET", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "Experimental runtime status is authenticated HTTP while the native compatibility UI and CLI contract are integrated." } },
|
|
179
|
-
{ method: "POST", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Native app launch and account-wide UI trial require explicit confirmation
|
|
181
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Native app launch and the account-wide UI trial act on the operator's machine state and require a local GUI session with a consumed Desktop-purpose grant plus explicit confirmation; a raw admin token is refused." } },
|
|
180
182
|
{ method: "GET", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "The persisted startup preference is currently owned by the local desktop compatibility panel." } },
|
|
181
|
-
{ method: "POST", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "
|
|
183
|
+
{ method: "POST", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Saving native observation intent is a dashboard action bound to the current startup revision and needs a local GUI session with a consumed Desktop-purpose grant; a raw admin token is refused." } },
|
|
182
184
|
// server/management/codex-cli-update-routes
|
|
183
185
|
{ method: "GET", path: "/api/codex/cli-update/plan", module: "server/management/codex-cli-update-routes", mutates: false, exempt: { reason: "local-transport", why: "The CLI runs the same proof-bound plan builder locally; the authenticated route also supplies the dashboard plan." } },
|
|
184
186
|
{ method: "POST", path: "/api/codex/cli-update/apply", module: "server/management/codex-cli-update-routes", mutates: true, exempt: { reason: "session-only", why: "HTTP apply requires a current paired dashboard session on trusted loopback ingress, matching origin, CSRF and confirmed: true; the local CLI uses --yes independently." } },
|
|
@@ -258,6 +260,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
258
260
|
{ method: "POST", path: "/api/client-integrations/restore/preview", module: "server/management/integration-routes", mutates: false },
|
|
259
261
|
{ method: "POST", path: "/api/client-integrations/commandcode/restore", module: "server/management/integration-routes", mutates: true },
|
|
260
262
|
{ method: "POST", path: "/api/client-integrations/commandcode/restore/preview", module: "server/management/integration-routes", mutates: false },
|
|
263
|
+
{ method: "POST", path: "/api/client-integrations/pi/sync", module: "server/management/integration-routes", mutates: true, mechanism: "path-constant" },
|
|
261
264
|
// server/management/lab-automation-routes
|
|
262
265
|
{ method: "GET", path: "/api/lab/automation", module: "server/management/lab-automation-routes", mutates: false, exempt: { reason: "local-transport", why: "ocx lab reads the same rows from the local SQLite projection; src/cli/lab.ts imports ../lab/query directly and never fetches /api/lab." } },
|
|
263
266
|
{ method: "GET", path: "/api/lab/automation/runs", module: "server/management/lab-automation-routes", mutates: false, exempt: { reason: "local-transport", why: "ocx lab reads the same rows from the local SQLite projection; src/cli/lab.ts imports ../lab/query directly and never fetches /api/lab." } },
|
|
@@ -383,6 +386,9 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
383
386
|
{ method: "GET", path: "/api/provider-quotas", module: "server/management/provider-routes", mutates: false },
|
|
384
387
|
{ method: "GET", path: "/api/quota-pool", module: "server/management/quota-pool-routes", mutates: false, exempt: { reason: "deferred-verb", why: "The ocx.quota-pool/1 read is a machine contract GOAT consumes over management and the link relay; the CLI shows the same caches through ocx provider quota and ocx account.", owner: "ocx-1 quota pool", ownerDoc: "structure/quota-pool.md" } },
|
|
385
388
|
{ method: "GET", path: "/api/fallback", module: "server/management/fallback-routes", mutates: false },
|
|
389
|
+
{ method: "GET", path: "/api/route-to", module: "server/management/route-to-routes", mutates: false },
|
|
390
|
+
{ method: "PUT", path: "/api/route-to", module: "server/management/route-to-routes", mutates: true },
|
|
391
|
+
{ method: "POST", path: "/api/route-to/sync", module: "server/management/route-to-routes", mutates: true },
|
|
386
392
|
{ method: "PUT", path: "/api/fallback", module: "server/management/fallback-routes", mutates: true },
|
|
387
393
|
{ method: "GET", path: "/api/provider-request-pacing", module: "server/management/provider-key-pacing-routes", mutates: false },
|
|
388
394
|
{ method: "GET", path: "/api/providers", module: "server/management/provider-routes", mutates: false },
|
|
@@ -429,6 +435,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
429
435
|
{ method: "POST", path: "/api/storage/codex-logs/unprotect", module: "server/management/storage-log-guard-routes", mutates: true },
|
|
430
436
|
// server/management/link-routes
|
|
431
437
|
{ method: "GET", path: "/api/link/status", module: "server/management/link-routes", mutates: false },
|
|
438
|
+
{ method: "GET", path: "/api/link/diagnostics", module: "server/management/link-routes", mutates: false, exempt: { reason: "local-transport", why: "ocx link diagnostics reads the same bounded diagnostics file directly through src/link/diagnostics-read.ts and needs no running proxy; the route serves the dashboard's read-only view of it." } },
|
|
432
439
|
{ method: "GET", path: "/api/link/candidates", module: "server/management/link-routes", mutates: false, exempt: { reason: "session-only", why: "SSH candidates are a dashboard surface: a paired session, or on a standalone runtime the current loopback dashboard session on trusted loopback ingress; admin-token and Tailscale identity sessions are refused." } },
|
|
433
440
|
{ method: "POST", path: "/api/link/probe", module: "server/management/link-routes", mutates: true },
|
|
434
441
|
{ method: "POST", path: "/api/link/confirm-host", module: "server/management/link-routes", mutates: true },
|
|
@@ -436,10 +443,21 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
436
443
|
{ method: "POST", path: "/api/link/apply", module: "server/management/link-routes", mutates: true },
|
|
437
444
|
{ method: "DELETE", path: "/api/link/{id}", module: "server/management/link-routes", mutates: true, mechanism: "regex" },
|
|
438
445
|
{ method: "POST", path: "/api/link/{id}/reconnect", module: "server/management/link-routes", mutates: true, mechanism: "regex" },
|
|
446
|
+
{ method: "GET", path: "/api/link/{id}/routes", module: "server/management/link-routes", mutates: false, mechanism: "regex" },
|
|
447
|
+
{ method: "POST", path: "/api/link/{id}/routes", module: "server/management/link-routes", mutates: true, mechanism: "regex" },
|
|
448
|
+
// server/management/link-operation (reached through link-routes)
|
|
449
|
+
{ method: "GET", path: "/api/link/operations", module: "server/management/link-operation", mutates: false },
|
|
450
|
+
{ method: "GET", path: "/api/link/operations/{id}", module: "server/management/link-operation", mutates: false, mechanism: "regex" },
|
|
451
|
+
{ method: "POST", path: "/api/link/operations/{id}/resolve", module: "server/management/link-operation", mutates: true, mechanism: "regex" },
|
|
439
452
|
{ method: "POST", path: "/api/link/issue", module: "server/management/link-routes", mutates: true },
|
|
453
|
+
{ method: "POST", path: "/api/link/recover", module: "server/management/link-routes", mutates: true },
|
|
454
|
+
{ method: "GET", path: "/api/link/recover", module: "server/management/link-routes", mutates: false },
|
|
440
455
|
// server/management/link-child-ops-routes (reached through link-routes)
|
|
441
456
|
{ method: "POST", path: "/api/link/children/operations", module: "server/management/link-child-ops-routes", mutates: true },
|
|
442
457
|
{ method: "GET", path: "/api/link/children/jobs/{jobId}", module: "server/management/link-child-ops-routes", mutates: false, mechanism: "regex" },
|
|
458
|
+
{ method: "GET", path: "/api/link/children/policy", module: "server/management/link-child-ops-routes", mutates: false },
|
|
459
|
+
{ method: "PUT", path: "/api/link/children/policy", module: "server/management/link-child-ops-routes", mutates: true },
|
|
460
|
+
{ method: "POST", path: "/api/link/children/activity/clear", module: "server/management/link-child-ops-routes", mutates: true },
|
|
443
461
|
// server/management/remote-workspace-routes
|
|
444
462
|
{ method: "GET", path: "/api/remote-workspace", module: "server/management/remote-workspace-routes", mutates: false },
|
|
445
463
|
{ method: "GET", path: "/api/remote-workspace/runtimes", module: "server/management/remote-workspace-routes", mutates: false },
|
|
@@ -475,6 +493,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
475
493
|
{ method: "GET", path: "/api/request-history/{id}/route-decision", module: "server/management/request-history-routes", mutates: false, mechanism: "ends-with" },
|
|
476
494
|
{ method: "PUT", path: "/api/providers/{provider}/alias", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|
|
477
495
|
{ method: "PUT", path: "/api/providers/{provider}/model-aliases", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|
|
496
|
+
{ method: "PUT", path: "/api/providers/{provider}/alias-template", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|
|
478
497
|
{ method: "GET", path: "/api/providers/{provider}/model-costs", module: "server/management/model-routes", mutates: false, mechanism: "regex" },
|
|
479
498
|
{ method: "PUT", path: "/api/providers/{provider}/model-costs", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|
|
480
499
|
{ method: "PUT", path: "/api/providers/{provider}/model-display-names", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|