@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
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
transientRetryOn5xxPolicyConfigError,
|
|
6
6
|
} from "../../config/load-degrade";
|
|
7
7
|
import type { OcxProviderConfig } from "../../types";
|
|
8
|
+
import { providerModelDiscoveryConfigError } from "../../providers/model-discovery-config";
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* The retry policies. They are the one carried group the PATCH field mask did not know, and they
|
|
@@ -57,6 +58,14 @@ export const PROVIDER_COMPAT_CARRY_FIELDS = [
|
|
|
57
58
|
"singleLeadingSystemMessage",
|
|
58
59
|
"reasoningWireFormat",
|
|
59
60
|
"omitReasoningEffortWithToolsModels",
|
|
61
|
+
// Hosted-tool denials describe the same upstream, and the form sends neither. They travel
|
|
62
|
+
// together: carrying only the conditional list (#8204) would let a hosted-only request
|
|
63
|
+
// forward a tool the dropped unconditional list had denied.
|
|
64
|
+
"unsupportedHostedTools",
|
|
65
|
+
"unsupportedHostedToolsWithClientTools",
|
|
66
|
+
// Whether this gateway runs Claude Code's Advisor server tool (#8448): a fact about the upstream,
|
|
67
|
+
// so a move to another gateway must not keep forwarding it there.
|
|
68
|
+
"forwardAdvisorTool",
|
|
60
69
|
...RETRY_POLICY_FIELDS,
|
|
61
70
|
] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
62
71
|
|
|
@@ -71,6 +80,15 @@ export const PROVIDER_DISPLAY_CARRY_FIELDS = [
|
|
|
71
80
|
export type ProviderCompatCarryField = typeof PROVIDER_COMPAT_CARRY_FIELDS[number];
|
|
72
81
|
type ProviderDisplayCarryField = typeof PROVIDER_DISPLAY_CARRY_FIELDS[number];
|
|
73
82
|
|
|
83
|
+
/**
|
|
84
|
+
* Discovery compatibility (#7910). `modelDiscovery.skipInvalidRows` records that one gateway
|
|
85
|
+
* publishes invalid `/models` rows, so it follows the compatibility settings' destination rule:
|
|
86
|
+
* kept on a same-destination overwrite that omits it, dropped when the provider moves. It is a
|
|
87
|
+
* separate group because it changes discovery, not the request the compatibility cases probe.
|
|
88
|
+
*/
|
|
89
|
+
export const PROVIDER_DISCOVERY_CARRY_FIELDS = ["modelDiscovery"] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
90
|
+
type ProviderDiscoveryCarryField = typeof PROVIDER_DISCOVERY_CARRY_FIELDS[number];
|
|
91
|
+
|
|
74
92
|
/** The only `reasoningWireFormat` value the adapters understand. */
|
|
75
93
|
export const PROVIDER_REASONING_WIRE_FORMATS: readonly NonNullable<OcxProviderConfig["reasoningWireFormat"]>[] = [
|
|
76
94
|
"gateway-object",
|
|
@@ -81,13 +99,14 @@ export const PROVIDER_REASONING_WIRE_FORMATS: readonly NonNullable<OcxProviderCo
|
|
|
81
99
|
* omitted this" and "the registry supplied it" look the same.
|
|
82
100
|
*/
|
|
83
101
|
export interface ProviderOverwriteSample {
|
|
84
|
-
readonly submitted: ReadonlySet<ProviderCompatCarryField | ProviderDisplayCarryField>;
|
|
102
|
+
readonly submitted: ReadonlySet<ProviderCompatCarryField | ProviderDisplayCarryField | ProviderDiscoveryCarryField>;
|
|
85
103
|
readonly namesAuthMode: boolean;
|
|
86
104
|
}
|
|
87
105
|
|
|
88
106
|
export function sampleProviderOverwrite(provider: object): ProviderOverwriteSample {
|
|
89
107
|
return {
|
|
90
|
-
submitted: new Set([...PROVIDER_COMPAT_CARRY_FIELDS, ...PROVIDER_DISPLAY_CARRY_FIELDS
|
|
108
|
+
submitted: new Set([...PROVIDER_COMPAT_CARRY_FIELDS, ...PROVIDER_DISPLAY_CARRY_FIELDS, ...PROVIDER_DISCOVERY_CARRY_FIELDS]
|
|
109
|
+
.filter(field => Object.hasOwn(provider, field))),
|
|
91
110
|
namesAuthMode: Object.hasOwn(provider, "authMode"),
|
|
92
111
|
};
|
|
93
112
|
}
|
|
@@ -141,7 +160,7 @@ export function carryProviderCompatFields(
|
|
|
141
160
|
if (stored !== undefined) target[field] = stored !== null && typeof stored === "object" ? structuredClone(stored) : stored;
|
|
142
161
|
}
|
|
143
162
|
if (!providerOverwriteKeepsDestination(candidate, live, sample)) return;
|
|
144
|
-
for (const field of PROVIDER_COMPAT_CARRY_FIELDS) {
|
|
163
|
+
for (const field of [...PROVIDER_COMPAT_CARRY_FIELDS, ...PROVIDER_DISCOVERY_CARRY_FIELDS]) {
|
|
145
164
|
if (sample.submitted.has(field)) continue;
|
|
146
165
|
const stored = live[field];
|
|
147
166
|
if (stored === undefined) continue;
|
|
@@ -177,6 +196,7 @@ export function providerCompatFieldConfigError(provider: Record<string, unknown>
|
|
|
177
196
|
if (preserveResponses !== undefined && typeof preserveResponses !== "boolean") return "preserveResponsesReasoningContent must be a boolean";
|
|
178
197
|
const promoteAdditionalTools = provider.promoteAdditionalTools;
|
|
179
198
|
if (promoteAdditionalTools !== undefined && typeof promoteAdditionalTools !== "boolean") return "promoteAdditionalTools must be a boolean";
|
|
199
|
+
if (provider.forwardAdvisorTool !== undefined && typeof provider.forwardAdvisorTool !== "boolean") return "forwardAdvisorTool must be a boolean";
|
|
180
200
|
const wire = provider.reasoningWireFormat;
|
|
181
201
|
if (wire !== undefined && !PROVIDER_REASONING_WIRE_FORMATS.includes(wire as never)) {
|
|
182
202
|
return `reasoningWireFormat must be one of: ${PROVIDER_REASONING_WIRE_FORMATS.join(", ")}`;
|
|
@@ -242,6 +262,13 @@ export function applyProviderCompatPatchFields(
|
|
|
242
262
|
else return { error: "promoteAdditionalTools must be a boolean" };
|
|
243
263
|
touched = true;
|
|
244
264
|
}
|
|
265
|
+
if (Object.hasOwn(rawBody, "forwardAdvisorTool")) {
|
|
266
|
+
const value = rawBody.forwardAdvisorTool;
|
|
267
|
+
if (value === null) delete next.forwardAdvisorTool;
|
|
268
|
+
else if (typeof value === "boolean") next.forwardAdvisorTool = value;
|
|
269
|
+
else return { error: "forwardAdvisorTool must be a boolean" };
|
|
270
|
+
touched = true;
|
|
271
|
+
}
|
|
245
272
|
if (Object.hasOwn(rawBody, "inferContextWindow")) {
|
|
246
273
|
const value = rawBody.inferContextWindow;
|
|
247
274
|
if (value === null) delete next.inferContextWindow;
|
|
@@ -278,5 +305,14 @@ export function applyProviderCompatPatchFields(
|
|
|
278
305
|
}
|
|
279
306
|
touched = true;
|
|
280
307
|
}
|
|
308
|
+
// `null` or `{}` clears the block; anything else must pass the same check POST applies.
|
|
309
|
+
if (Object.hasOwn(rawBody, "modelDiscovery")) {
|
|
310
|
+
const value = rawBody.modelDiscovery;
|
|
311
|
+
const error = value === null ? null : providerModelDiscoveryConfigError(value);
|
|
312
|
+
if (error) return { error };
|
|
313
|
+
if (value === null || Object.keys(value as object).length === 0) delete next.modelDiscovery;
|
|
314
|
+
else next.modelDiscovery = structuredClone(value) as NonNullable<OcxProviderConfig["modelDiscovery"]>;
|
|
315
|
+
touched = true;
|
|
316
|
+
}
|
|
281
317
|
return { touched };
|
|
282
318
|
}
|
|
@@ -2,6 +2,7 @@ import { contextTierRecordConfigError, modelCapabilitiesConfigError, mergeModelC
|
|
|
2
2
|
import { DECLARABLE_HOSTED_TOOL_TYPES } from "../../responses/hosted-tool-policy";
|
|
3
3
|
import { randomUUID } from "node:crypto";
|
|
4
4
|
import { cleanupRemovedGcpCredentials, providerGcpCredentialMarkers, snapshotProviderGcpCredentialMarkers } from "../../providers/gcp-credential-cleanup";
|
|
5
|
+
import { providerHasStoredApiKey } from "../../providers/api-keys";
|
|
5
6
|
import { providerGcpCredentialInputResponse, removeProviderWithGcpCredentials } from "./provider-gcp-credential-routes";
|
|
6
7
|
import { readFileSync } from "node:fs";
|
|
7
8
|
import { isDeepStrictEqual } from "node:util";
|
|
@@ -70,12 +71,20 @@ import {
|
|
|
70
71
|
readBoundedDiscoveryJson,
|
|
71
72
|
resolveProviderModelDiscovery,
|
|
72
73
|
} from "../../providers/model-discovery";
|
|
73
|
-
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";
|
|
74
84
|
import { routedSlug, slugEquals } from "../../providers/slug-codec";
|
|
75
85
|
import { clearAccountQuotaCache, clearProviderQuotaCache, fetchProviderQuotaReports } from "../../providers/quota";
|
|
76
|
-
import {
|
|
77
|
-
import {
|
|
78
|
-
import { cachedProviderQuotaIsExhausted } from "../../combos/resolve";
|
|
86
|
+
import { clearPassiveKeyLimits, listPassiveKeyLimits, passiveProviderOwnership } from "../../providers/passive-key-observation";
|
|
87
|
+
import { providerRoutingQuota } from "./provider-routing-quota";
|
|
79
88
|
import { probeJevDecisionProvider } from "../../combos/jev";
|
|
80
89
|
import { comboDependsOnProviderRoute } from "./decision-model-validation";
|
|
81
90
|
import { clearKeyCooldowns, forgetApiKeyRotationCursor } from "../../providers/key-failover";
|
|
@@ -153,7 +162,7 @@ type ProviderPatchApplication =
|
|
|
153
162
|
headersTouched: boolean;
|
|
154
163
|
};
|
|
155
164
|
|
|
156
|
-
const PROVIDER_ALIAS_OVERLAY_FIELDS = ["alias", "modelAliases", "defaultAliases"] as const;
|
|
165
|
+
const PROVIDER_ALIAS_OVERLAY_FIELDS = ["alias", "modelAliases", "defaultAliases", "aliasTemplate"] as const;
|
|
157
166
|
type ProviderAliasOverlayField = typeof PROVIDER_ALIAS_OVERLAY_FIELDS[number];
|
|
158
167
|
|
|
159
168
|
/**
|
|
@@ -720,23 +729,25 @@ function applyProviderPatchFields(
|
|
|
720
729
|
}
|
|
721
730
|
touched = true;
|
|
722
731
|
}
|
|
723
|
-
|
|
724
|
-
|
|
732
|
+
// The conditional list (#8204) shares the unconditional list's vocabulary and clearing rules.
|
|
733
|
+
for (const field of ["unsupportedHostedTools", "unsupportedHostedToolsWithClientTools"] as const) {
|
|
734
|
+
if (!Object.hasOwn(rawBody, field)) continue;
|
|
735
|
+
const value = rawBody[field];
|
|
725
736
|
if (value === null) {
|
|
726
|
-
delete next
|
|
737
|
+
delete next[field];
|
|
727
738
|
} else {
|
|
728
|
-
const error = nonBlankStringArrayConfigError(value,
|
|
739
|
+
const error = nonBlankStringArrayConfigError(value, field);
|
|
729
740
|
if (error) return { error };
|
|
730
741
|
const tools = normalizeNonBlankStringArray(value as string[]);
|
|
731
742
|
const unknownTool = tools.find(tool => !DECLARABLE_HOSTED_TOOL_TYPES.has(tool));
|
|
732
743
|
if (unknownTool !== undefined) {
|
|
733
744
|
return {
|
|
734
|
-
error:
|
|
745
|
+
error: `${field} must name only hosted tool types: `
|
|
735
746
|
+ `${[...DECLARABLE_HOSTED_TOOL_TYPES].join(", ")}`,
|
|
736
747
|
};
|
|
737
748
|
}
|
|
738
|
-
if (tools.length > 0) next
|
|
739
|
-
else delete next
|
|
749
|
+
if (tools.length > 0) next[field] = tools;
|
|
750
|
+
else delete next[field];
|
|
740
751
|
}
|
|
741
752
|
touched = true;
|
|
742
753
|
}
|
|
@@ -860,40 +871,6 @@ function canonicalOpenAiBudgetPatchError(
|
|
|
860
871
|
?? providerEmptyToolOutputConfigError("openai", applied.next);
|
|
861
872
|
}
|
|
862
873
|
|
|
863
|
-
function providerRoutingQuota(config: OcxConfig, name: string, now: number): ProviderRoutingQuota {
|
|
864
|
-
const provider = hasOwnProvider(config.providers, name) ? config.providers[name] : undefined;
|
|
865
|
-
const quota = getCachedProviderRoutingQuota(name, provider, now);
|
|
866
|
-
if (!quota || !Number.isFinite(quota.updatedAt) || quota.updatedAt < 0 || quota.updatedAt > now
|
|
867
|
-
|| now >= quota.updatedAt + PROVIDER_QUOTA_MAX_AGE_MS) return { state: "unknown" };
|
|
868
|
-
|
|
869
|
-
// Removing search/MCP windows may leave only a timestamp. That is not inference evidence.
|
|
870
|
-
const percentages = [quota.fiveHourPercent, quota.weeklyPercent, quota.monthlyPercent,
|
|
871
|
-
...(quota.customWindows ?? []).filter(window => window.modelId === undefined).map(window => window.percent)];
|
|
872
|
-
const hasPercentage = percentages.some(value => typeof value === "number" && Number.isFinite(value) && value >= 0);
|
|
873
|
-
const credits = quota.creditsUsd;
|
|
874
|
-
const hasCredits = credits !== undefined && Number.isFinite(credits.percent)
|
|
875
|
-
&& credits.percent >= 0 && Number.isFinite(credits.remaining);
|
|
876
|
-
if (!hasPercentage && !hasCredits) return { state: "unknown" };
|
|
877
|
-
|
|
878
|
-
const state = cachedProviderQuotaIsExhausted(quota, now) ? "exhausted" : "available";
|
|
879
|
-
let validUntil = quota.updatedAt + PROVIDER_QUOTA_MAX_AGE_MS;
|
|
880
|
-
if (state === "exhausted") {
|
|
881
|
-
const resets = [quota.fiveHourResetAt, quota.weeklyResetAt, quota.monthlyResetAt,
|
|
882
|
-
...(quota.customWindows ?? []).filter(window => window.modelId === undefined).map(window => window.resetAt)]
|
|
883
|
-
.filter((reset): reset is number => typeof reset === "number" && Number.isFinite(reset)
|
|
884
|
-
&& reset > now && reset < validUntil)
|
|
885
|
-
.sort((left, right) => left - right);
|
|
886
|
-
// Reuse dispatch's predicate: another exhausted window or USD cap may still block.
|
|
887
|
-
for (const reset of resets) {
|
|
888
|
-
if (!cachedProviderQuotaIsExhausted(quota, reset)) {
|
|
889
|
-
validUntil = reset;
|
|
890
|
-
break;
|
|
891
|
-
}
|
|
892
|
-
}
|
|
893
|
-
}
|
|
894
|
-
return { state, updatedAt: quota.updatedAt, validUntil };
|
|
895
|
-
}
|
|
896
|
-
|
|
897
874
|
export async function handleProviderRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
898
875
|
const { req, url, config, deps, principal, convergeCodexCatalog, syncClaudeAgentDefsBestEffort } = ctx;
|
|
899
876
|
|
|
@@ -903,6 +880,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
903
880
|
const now = Date.now();
|
|
904
881
|
return jsonResponse({
|
|
905
882
|
...snapshot,
|
|
883
|
+
passiveKeyLimits: listPassiveKeyLimits(config),
|
|
906
884
|
reports: snapshot.reports.map(report => ({
|
|
907
885
|
...report,
|
|
908
886
|
routingQuota: providerRoutingQuota(config, report.provider, now),
|
|
@@ -915,12 +893,14 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
915
893
|
|
|
916
894
|
if (url.pathname === "/api/providers" && req.method === "GET") {
|
|
917
895
|
return jsonResponse(Object.entries(config.providers).map(([name, p]) => ({
|
|
918
|
-
name, adapter: p.adapter, baseUrl: publicProviderBaseUrl(p.baseUrl), defaultModel: p.defaultModel,
|
|
896
|
+
name, adapter: p.adapter, baseUrl: publicProviderBaseUrl(p.baseUrl), defaultModel: p.defaultModel,
|
|
897
|
+
hasApiKey: providerHasStoredApiKey(p),
|
|
919
898
|
// Presence only (#959 review): header names and values never leave the process.
|
|
920
899
|
hasHeaders: !!p.headers && Object.keys(p.headers).length > 0,
|
|
921
900
|
allowPrivateNetwork: p.allowPrivateNetwork === true,
|
|
922
901
|
preserveResponsesReasoningContent: p.preserveResponsesReasoningContent,
|
|
923
902
|
promoteAdditionalTools: p.promoteAdditionalTools,
|
|
903
|
+
forwardAdvisorTool: p.forwardAdvisorTool,
|
|
924
904
|
liveModels: p.liveModels !== false,
|
|
925
905
|
requestPacing: p.requestPacing,
|
|
926
906
|
models: p.models ?? [],
|
|
@@ -937,6 +917,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
937
917
|
noStructuredOutputModels: p.noStructuredOutputModels,
|
|
938
918
|
noJsonSchemaModels: p.noJsonSchemaModels,
|
|
939
919
|
unsupportedHostedTools: p.unsupportedHostedTools,
|
|
920
|
+
unsupportedHostedToolsWithClientTools: p.unsupportedHostedToolsWithClientTools,
|
|
940
921
|
retainModels: p.retainModels,
|
|
941
922
|
omitReasoningEffortWithToolsModels: p.omitReasoningEffortWithToolsModels,
|
|
942
923
|
upstreamHttpVersion: p.upstreamHttpVersion,
|
|
@@ -1021,6 +1002,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1021
1002
|
if (sourceChanged || currentDiskConfig === null) {
|
|
1022
1003
|
return jsonResponse({ error: "provider reload source changed" }, 409);
|
|
1023
1004
|
}
|
|
1005
|
+
clearPassiveKeyLimits(name);
|
|
1024
1006
|
reconcileLiveStateStores();
|
|
1025
1007
|
// The complete disk snapshot owns display overlays, including providers that this
|
|
1026
1008
|
// live routing instance deliberately does not adopt.
|
|
@@ -1128,6 +1110,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1128
1110
|
|
|
1129
1111
|
cleanupRemovedGcpCredentials(removedCredentials);
|
|
1130
1112
|
adoptProviderEditorCandidate(config, outcome.value.config);
|
|
1113
|
+
clearPassiveKeyLimits();
|
|
1131
1114
|
reconcileLiveStateStores();
|
|
1132
1115
|
refreshConfigDerivedRegistries(outcome.value.config);
|
|
1133
1116
|
clearGatherRoutedModelsInflight();
|
|
@@ -1269,6 +1252,10 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1269
1252
|
// An overwrite must not spend a second subscription account's quota as a side effect.
|
|
1270
1253
|
const existingFailover = config.providers[name]?.oauthAccountFailover;
|
|
1271
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
|
+
}
|
|
1272
1259
|
// ...and to hand-edited context windows. `ProviderPayload` (gui/src/provider-payload.ts)
|
|
1273
1260
|
// has no member for either field, so the add/edit form structurally cannot send them:
|
|
1274
1261
|
// absence in the request means "not carried", never "the user deleted it". Deletion goes
|
|
@@ -1407,6 +1394,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1407
1394
|
}
|
|
1408
1395
|
});
|
|
1409
1396
|
if (validationError !== undefined) return jsonResponse({ error: validationError }, 400);
|
|
1397
|
+
clearPassiveKeyLimits(name);
|
|
1410
1398
|
cleanupRemovedGcpCredentials(removedCredentials);
|
|
1411
1399
|
reconcileLiveStateStores();
|
|
1412
1400
|
if (prov.apiKey && prov.apiKeyPool) {
|
|
@@ -1598,9 +1586,18 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1598
1586
|
const validation = validateConfigCandidate({ ...config, providers: { ...config.providers, [name]: candidate } });
|
|
1599
1587
|
if (!validation.ok) { replayError = validation.error; return; }
|
|
1600
1588
|
}
|
|
1601
|
-
|
|
1602
|
-
|
|
1603
|
-
|
|
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
|
+
}
|
|
1604
1601
|
});
|
|
1605
1602
|
if (replayError !== undefined) return jsonResponse({ error: replayError }, 409);
|
|
1606
1603
|
reconcileLiveStateStores();
|
|
@@ -1613,7 +1610,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1613
1610
|
success: true,
|
|
1614
1611
|
name,
|
|
1615
1612
|
disabled: config.providers[name]!.disabled === true,
|
|
1616
|
-
hasApiKey:
|
|
1613
|
+
hasApiKey: providerHasStoredApiKey(config.providers[name]!),
|
|
1617
1614
|
...(shadowDependency ? { dependentShadowIntercept: shadowDependency } : {}),
|
|
1618
1615
|
...(name === "xai"
|
|
1619
1616
|
? { xaiResponsesOptInState: xaiResponsesOptInState(config.providers[name]!) }
|
|
@@ -1664,8 +1661,14 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1664
1661
|
const snapshot = prov.authMode === "oauth" && mayResolveModelsOAuth(name, config.providers[name])
|
|
1665
1662
|
? await getModelsOAuthAccessSnapshot(name, prov).catch(() => undefined)
|
|
1666
1663
|
: undefined;
|
|
1667
|
-
const
|
|
1668
|
-
|
|
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) {
|
|
1669
1672
|
return jsonResponse({ ok: false, latencyMs: 0, error: "static catalog only — upstream not verified (not logged in)" });
|
|
1670
1673
|
}
|
|
1671
1674
|
if (prov.adapter === "zed") return (await import("./zed-provider-probe")).probeZedProvider(prov, apiKey, snapshot?.providerUserId);
|
|
@@ -1721,9 +1724,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1721
1724
|
if (antigravity && !project) {
|
|
1722
1725
|
return jsonResponse({ ok: false, latencyMs: 0, error: "Antigravity project unavailable — re-run `ocx login google-antigravity`" });
|
|
1723
1726
|
}
|
|
1724
|
-
const { method, url: modelsUrl, headers } =
|
|
1725
|
-
oauthApiBaseUrl: snapshot?.apiBaseUrl, workbuddy: snapshot?.workbuddy
|
|
1726
|
-
});
|
|
1727
|
+
const { method, url: modelsUrl, headers } = buildVertexProviderModelsRequest(name, prov, apiKey)
|
|
1728
|
+
?? buildModelsRequest(prov, apiKey, name, { oauthApiBaseUrl: snapshot?.apiBaseUrl, workbuddy: snapshot?.workbuddy });
|
|
1727
1729
|
const discovery = resolveProviderModelDiscovery(name, prov);
|
|
1728
1730
|
const started = Date.now();
|
|
1729
1731
|
try {
|
|
@@ -1731,9 +1733,10 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1731
1733
|
// own fixed discovery URL survives purely-benchmark (Clash/Surge/Mihomo
|
|
1732
1734
|
// fake-IP) DNS without proxy env.
|
|
1733
1735
|
const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
|
|
1734
|
-
beforeSend: () =>
|
|
1736
|
+
beforeSend: () => (!vertexAuth || vertexDiscoveryAuthIsCurrent(prov, vertexAuth, headers))
|
|
1737
|
+
&& (prov.authMode !== "oauth" || (mayResolveModelsOAuth(name, config.providers[name])
|
|
1735
1738
|
&& modelsOAuthTargetMatches(name, config.providers[name], authorizedTarget)
|
|
1736
|
-
&& (name !== "anthropic2" || new URL(modelsUrl).href === authorizedTarget)) };
|
|
1739
|
+
&& (name !== "anthropic2" || new URL(modelsUrl).href === authorizedTarget))) };
|
|
1737
1740
|
const res = method === "POST"
|
|
1738
1741
|
? await providerOutboundPost(name, prov, modelsUrl, {
|
|
1739
1742
|
headers,
|
|
@@ -1742,7 +1745,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1742
1745
|
}, outboundDependencies)
|
|
1743
1746
|
: await providerOutboundGet(name, prov, modelsUrl, {
|
|
1744
1747
|
headers,
|
|
1745
|
-
signal: AbortSignal.timeout(8000),
|
|
1748
|
+
signal: vertexDeadline ?? AbortSignal.timeout(8000),
|
|
1746
1749
|
}, outboundDependencies);
|
|
1747
1750
|
const latencyMs = Date.now() - started;
|
|
1748
1751
|
const redirectError = await providerRedirectError(res, modelsUrl);
|
|
@@ -1761,7 +1764,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1761
1764
|
}
|
|
1762
1765
|
return jsonResponse({ ok: false, latencyMs, error: `upstream model discovery returned ${res.status}` });
|
|
1763
1766
|
}
|
|
1764
|
-
const
|
|
1767
|
+
const vertexFirstPage = vertexDeadline ? countDiscoveryResponseBytes(res) : undefined;
|
|
1768
|
+
const bounded = await readBoundedDiscoveryJson(vertexFirstPage?.response ?? res, discovery.maxResponseBytes);
|
|
1765
1769
|
if (!bounded.ok) {
|
|
1766
1770
|
return jsonResponse({
|
|
1767
1771
|
ok: false,
|
|
@@ -1775,30 +1779,34 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1775
1779
|
if (antigravity && !ccaModels) {
|
|
1776
1780
|
return jsonResponse({ ok: false, latencyMs, error: "upstream CCA model discovery returned an unexpected shape" });
|
|
1777
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}` });
|
|
1778
1788
|
// OpenAI-style lists (and Together top-level arrays) use the same validation/dedupe/filter
|
|
1779
1789
|
// as catalog discovery. Google AI Studio parses the native `models[]` envelope and filters to
|
|
1780
1790
|
// `generateContent`, while other providers fall back to generic envelope rows if they return `models[]`.
|
|
1781
|
-
const record =
|
|
1782
|
-
?
|
|
1791
|
+
const record = listing.value !== null && typeof listing.value === "object" && !Array.isArray(listing.value)
|
|
1792
|
+
? listing.value as Record<string, unknown>
|
|
1783
1793
|
: undefined;
|
|
1784
|
-
const
|
|
1785
|
-
|
|
1786
|
-
? extractGoogleAiStudioModelItems(bounded.value, discovery.maxModels)
|
|
1794
|
+
const googleNative = !ccaModels
|
|
1795
|
+
? extractGoogleNativeModelItems(name, prov, listing.value, discovery.maxModels)
|
|
1787
1796
|
: undefined;
|
|
1788
1797
|
const extracted = ccaModels
|
|
1789
1798
|
? undefined
|
|
1790
|
-
:
|
|
1791
|
-
|
|
1792
|
-
|
|
1793
|
-
|
|
1794
|
-
: 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"]));
|
|
1795
1803
|
if (extracted && !extracted.ok) {
|
|
1796
1804
|
return jsonResponse({
|
|
1797
1805
|
ok: false,
|
|
1798
1806
|
latencyMs,
|
|
1799
1807
|
error: extracted.reason === "too_many_models"
|
|
1800
1808
|
? `upstream /models exceeded the ${discovery.maxModels}-row model limit`
|
|
1801
|
-
: `upstream /models returned an unexpected shape${invalidModelDiscoveryHint("diagnostic" in extracted && typeof extracted.diagnostic === "string" ? extracted.diagnostic : undefined)}`,
|
|
1809
|
+
: `upstream /models returned an unexpected shape${invalidModelDiscoveryHint("diagnostic" in extracted && typeof extracted.diagnostic === "string" ? extracted.diagnostic : undefined, discovery.skipInvalidRows === true)}`,
|
|
1802
1810
|
});
|
|
1803
1811
|
}
|
|
1804
1812
|
const models = ccaModels?.length ?? ("items" in extracted! ? extracted!.items.length : extracted!.rows.length);
|
|
@@ -1806,7 +1814,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1806
1814
|
ok: true,
|
|
1807
1815
|
latencyMs,
|
|
1808
1816
|
models,
|
|
1809
|
-
message: `Connected — ${models} model${models === 1 ? "" : "s"} available.`,
|
|
1817
|
+
message: `Connected — ${models} model${models === 1 ? "" : "s"} available${extracted && "skippedInvalidRows" in extracted && extracted.skippedInvalidRows ? ` (${extracted.skippedInvalidRows} invalid row${extracted.skippedInvalidRows === 1 ? "" : "s"} skipped)` : ""}.`,
|
|
1810
1818
|
});
|
|
1811
1819
|
} catch (err) {
|
|
1812
1820
|
return jsonResponse({
|
|
@@ -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,7 +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 },
|
|
455
|
+
// server/management/link-child-ops-routes (reached through link-routes)
|
|
456
|
+
{ method: "POST", path: "/api/link/children/operations", module: "server/management/link-child-ops-routes", mutates: true },
|
|
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 },
|
|
440
461
|
// server/management/remote-workspace-routes
|
|
441
462
|
{ method: "GET", path: "/api/remote-workspace", module: "server/management/remote-workspace-routes", mutates: false },
|
|
442
463
|
{ method: "GET", path: "/api/remote-workspace/runtimes", module: "server/management/remote-workspace-routes", mutates: false },
|
|
@@ -472,6 +493,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
472
493
|
{ method: "GET", path: "/api/request-history/{id}/route-decision", module: "server/management/request-history-routes", mutates: false, mechanism: "ends-with" },
|
|
473
494
|
{ method: "PUT", path: "/api/providers/{provider}/alias", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|
|
474
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" },
|
|
475
497
|
{ method: "GET", path: "/api/providers/{provider}/model-costs", module: "server/management/model-routes", mutates: false, mechanism: "regex" },
|
|
476
498
|
{ method: "PUT", path: "/api/providers/{provider}/model-costs", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|
|
477
499
|
{ method: "PUT", path: "/api/providers/{provider}/model-display-names", module: "server/management/model-routes", mutates: true, mechanism: "regex" },
|