@bitkyc08/opencodex 2.100.2 → 2.100.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
// Limits apply to UTF-16 code units, before any scan or candidate allocation.
|
|
2
|
+
const MAX_WIRE_BODY_LENGTH = 16 * 1024 * 1024;
|
|
3
|
+
const MAX_JSON_DEPTH = 128;
|
|
4
|
+
const MODEL_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:/-]{0,127}$/;
|
|
5
|
+
|
|
6
|
+
/** Extract the last top-level wire model only from a complete, bounded JSON object. */
|
|
7
|
+
export function extractPassiveWireModel(body: BodyInit | null | undefined): string | undefined {
|
|
8
|
+
if (typeof body !== "string" || body.length > MAX_WIRE_BODY_LENGTH) return undefined;
|
|
9
|
+
const input = body;
|
|
10
|
+
let index = 0;
|
|
11
|
+
let model: string | undefined;
|
|
12
|
+
|
|
13
|
+
function whitespace(): void {
|
|
14
|
+
while (input[index] === " " || input[index] === "\n" || input[index] === "\r" || input[index] === "\t") index++;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function string(): boolean {
|
|
18
|
+
if (input[index++] !== '"') return false;
|
|
19
|
+
while (index < input.length) {
|
|
20
|
+
const code = input.charCodeAt(index++);
|
|
21
|
+
if (code === 34) return true;
|
|
22
|
+
if (code < 32) return false;
|
|
23
|
+
if (code !== 92) continue;
|
|
24
|
+
const escape = input[index++];
|
|
25
|
+
if (escape === "u") {
|
|
26
|
+
for (let n = 0; n < 4; n++) {
|
|
27
|
+
const hex = input.charCodeAt(index++);
|
|
28
|
+
if (!((hex >= 48 && hex <= 57) || (hex >= 65 && hex <= 70) || (hex >= 97 && hex <= 102))) return false;
|
|
29
|
+
}
|
|
30
|
+
} else if (escape !== '"' && escape !== "\\" && escape !== "/" && escape !== "b" && escape !== "f" && escape !== "n" && escape !== "r" && escape !== "t") {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function digit(): boolean {
|
|
38
|
+
const code = input.charCodeAt(index);
|
|
39
|
+
return code >= 48 && code <= 57;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function modelKey(start: number, end: number): boolean {
|
|
43
|
+
if (end - start < 7 || end - start > 32) return false;
|
|
44
|
+
let position = start + 1;
|
|
45
|
+
for (const expected of "model") {
|
|
46
|
+
if (input[position] === "\\") {
|
|
47
|
+
if (input[position + 1] !== "u" || parseInt(input.slice(position + 2, position + 6), 16) !== expected.charCodeAt(0)) return false;
|
|
48
|
+
position += 6;
|
|
49
|
+
} else if (input[position++] !== expected) return false;
|
|
50
|
+
}
|
|
51
|
+
return position === end - 1;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function number(): boolean {
|
|
55
|
+
if (input[index] === "-") index++;
|
|
56
|
+
if (input[index] === "0") index++;
|
|
57
|
+
else {
|
|
58
|
+
if (!digit()) return false;
|
|
59
|
+
while (digit()) index++;
|
|
60
|
+
}
|
|
61
|
+
if (input[index] === ".") {
|
|
62
|
+
index++;
|
|
63
|
+
if (!digit()) return false;
|
|
64
|
+
while (digit()) index++;
|
|
65
|
+
}
|
|
66
|
+
if (input[index] === "e" || input[index] === "E") {
|
|
67
|
+
index++;
|
|
68
|
+
if (input[index] === "+" || input[index] === "-") index++;
|
|
69
|
+
if (!digit()) return false;
|
|
70
|
+
while (digit()) index++;
|
|
71
|
+
}
|
|
72
|
+
return true;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function value(depth: number): boolean {
|
|
76
|
+
whitespace();
|
|
77
|
+
const char = input[index];
|
|
78
|
+
if (char === '"') return string();
|
|
79
|
+
if (char === "{" || char === "[") return container(depth + 1, char === "{");
|
|
80
|
+
if (char === "-" || digit()) return number();
|
|
81
|
+
if (input.startsWith("true", index) || input.startsWith("null", index)) { index += 4; return true; }
|
|
82
|
+
if (input.startsWith("false", index)) { index += 5; return true; }
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
function container(depth: number, object: boolean): boolean {
|
|
87
|
+
if (depth > MAX_JSON_DEPTH) return false;
|
|
88
|
+
index++;
|
|
89
|
+
whitespace();
|
|
90
|
+
const close = object ? "}" : "]";
|
|
91
|
+
if (input[index] === close) { index++; return true; }
|
|
92
|
+
while (index < input.length) {
|
|
93
|
+
let isModel = false;
|
|
94
|
+
if (object) {
|
|
95
|
+
const start = index;
|
|
96
|
+
if (!string()) return false;
|
|
97
|
+
if (depth === 1) isModel = modelKey(start, index);
|
|
98
|
+
whitespace();
|
|
99
|
+
if (input[index++] !== ":") return false;
|
|
100
|
+
whitespace();
|
|
101
|
+
}
|
|
102
|
+
if (isModel) {
|
|
103
|
+
model = undefined;
|
|
104
|
+
if (input[index] === '"') {
|
|
105
|
+
const start = index;
|
|
106
|
+
if (!string()) return false;
|
|
107
|
+
// 128 decoded characters can occupy at most 768 escaped code units.
|
|
108
|
+
if (index - start <= 770) {
|
|
109
|
+
const candidate: string = JSON.parse(input.slice(start, index));
|
|
110
|
+
if (MODEL_PATTERN.test(candidate)) model = candidate;
|
|
111
|
+
}
|
|
112
|
+
} else if (!value(depth)) return false;
|
|
113
|
+
} else if (!value(depth)) return false;
|
|
114
|
+
whitespace();
|
|
115
|
+
if (input[index] === close) { index++; return true; }
|
|
116
|
+
if (input[index++] !== ",") return false;
|
|
117
|
+
whitespace();
|
|
118
|
+
}
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
whitespace();
|
|
123
|
+
if (input[index] !== "{" || !container(1, true)) return undefined;
|
|
124
|
+
whitespace();
|
|
125
|
+
return index === input.length ? model : undefined;
|
|
126
|
+
}
|
|
@@ -7,6 +7,7 @@ import { CODEX_EXHAUSTED_USAGE_PERCENT, withoutRetiredCodexQuota, type StoredAcc
|
|
|
7
7
|
import { isMainAccountIdentityGenerationLive } from "../../codex/main-account-cache";
|
|
8
8
|
import { codexPlanKey } from "../../codex/plan";
|
|
9
9
|
import { isKeychainReference, resolveProviderApiKey } from "../key-store";
|
|
10
|
+
import { passiveKeychainGeneration, peekResolvedProviderKey } from "../api-key-resolve";
|
|
10
11
|
import { resolveEnvValue } from "../../config/proxy-env";
|
|
11
12
|
import { apiKeyPoolEntryId } from "../api-keys";
|
|
12
13
|
import { getProviderRegistryEntry, providerCodexAccountMode } from "../registry";
|
|
@@ -22,6 +23,27 @@ import type { ProviderQuota, ProviderRoutingQuota } from "../quota-types";
|
|
|
22
23
|
export const LAST_GOOD_MAX_AGE_MS = CODEX_CAPACITY_MAX_QUOTA_AGE_MS;
|
|
23
24
|
const nativeMainReportGenerations = new WeakMap<ProviderQuotaReport, number>();
|
|
24
25
|
export const accountReportCurrent = new WeakMap<ProviderQuotaReport, () => boolean>();
|
|
26
|
+
const reportOwners = new WeakMap<ProviderQuotaReport, { name: string; signature: string; credentialBound: boolean }>();
|
|
27
|
+
function ownerSignature(provider: OcxProviderConfig, credentialBound = false): string {
|
|
28
|
+
return createHash("sha256").update(JSON.stringify([provider.adapter, provider.baseUrl, provider.authMode ?? "key", credentialBound ? undefined : provider.apiKey, provider.disabled])).digest("hex");
|
|
29
|
+
}
|
|
30
|
+
export function captureReportOwner(name: string, provider: OcxProviderConfig): (report: ProviderQuotaReport) => void {
|
|
31
|
+
const owner = { name, signature: ownerSignature(provider), credentialBound: false };
|
|
32
|
+
return report => { if (!reportOwners.has(report)) reportOwners.set(report, owner); };
|
|
33
|
+
}
|
|
34
|
+
export async function collectOwnedReport(name: string, provider: OcxProviderConfig, probe: () => Promise<ProviderQuotaProbeResult>): Promise<ProviderQuotaProbeResult> {
|
|
35
|
+
const bind = captureReportOwner(name, provider);
|
|
36
|
+
const result = await probe();
|
|
37
|
+
if (result && typeof result !== "symbol") bind(result);
|
|
38
|
+
return result;
|
|
39
|
+
}
|
|
40
|
+
function reportOwnerCurrent(report: ProviderQuotaReport, provider: OcxProviderConfig | undefined, passive = false): boolean {
|
|
41
|
+
const owner = reportOwners.get(report);
|
|
42
|
+
// Only a key-authenticated report depends on the keychain value a passive read cannot verify.
|
|
43
|
+
return !!owner && !!provider && !provider.disabled && owner.name === report.provider
|
|
44
|
+
&& !(passive && (provider.authMode ?? "key") === "key" && isKeychainReference(provider.apiKey))
|
|
45
|
+
&& owner.signature === ownerSignature(provider, owner.credentialBound);
|
|
46
|
+
}
|
|
25
47
|
/** The measured quota a reset detector should observe when the shown quota is an estimate (pooled rows). */
|
|
26
48
|
export const observedQuotaFor = new WeakMap<ProviderQuotaReport, ProviderQuota>();
|
|
27
49
|
export const routingEvidence = new WeakMap<ProviderQuotaReport, ProviderQuotaRoutingEvidence>();
|
|
@@ -54,13 +76,17 @@ export function keyReportCredentialCurrent(value: ProviderQuotaReport, provider:
|
|
|
54
76
|
export function validateJoinedReports(response: ProviderQuotaResponse, config: OcxConfig): ProviderQuotaResponse {
|
|
55
77
|
return { ...response, reports: response.reports.filter(item => {
|
|
56
78
|
const provider = config.providers[item.provider];
|
|
57
|
-
return
|
|
79
|
+
return reportOwnerCurrent(item, provider) && isProviderQuotaReportCurrent(item)
|
|
58
80
|
&& keyReportCredentialCurrent(item, provider);
|
|
59
81
|
}) };
|
|
60
82
|
}
|
|
61
83
|
/** Only the live Antigravity probe binds this projection; display/last-good rows cannot create it. */
|
|
62
84
|
export const antigravityEvidence = new WeakMap<ProviderQuotaReport, { receipt: AntigravityQuotaReceipt; windows: readonly DecisionQuotaWindow[] }>();
|
|
63
85
|
export let providerQuotaBeforePublishForTests: (() => void | Promise<void>) | null = null;
|
|
86
|
+
export let providerQuotaBeforeObservationForTests: (() => void | Promise<void>) | null = null;
|
|
87
|
+
export function setProviderQuotaBeforeObservationForTests(hook: (() => void | Promise<void>) | null): void {
|
|
88
|
+
providerQuotaBeforeObservationForTests = hook;
|
|
89
|
+
}
|
|
64
90
|
|
|
65
91
|
/** Test-only seam for identity/config invalidation after probes but before publication. */
|
|
66
92
|
export function setProviderQuotaBeforePublishForTests(
|
|
@@ -153,6 +179,38 @@ export function providerReportEpochChanged(captured: ReadonlyMap<string, number>
|
|
|
153
179
|
return (providerReportEpochs.get(provider) ?? 0) !== (captured.get(provider) ?? 0);
|
|
154
180
|
}
|
|
155
181
|
|
|
182
|
+
/** Capture publication authority before queued reset observations can yield. */
|
|
183
|
+
export function captureObservationAuthority(config: OcxConfig, reports: readonly ProviderQuotaReport[]): (report: ProviderQuotaReport) => boolean {
|
|
184
|
+
const epoch = invalidationEpoch;
|
|
185
|
+
const providerEpochs = captureProviderReportEpochs();
|
|
186
|
+
const keychainProofs = new Map<ProviderQuotaReport, { reference: string; generation: number } | undefined>();
|
|
187
|
+
for (const report of reports) {
|
|
188
|
+
const reference = config.providers[report.provider]?.apiKey;
|
|
189
|
+
if (!keyReportCredentialIds.has(report) || !isKeychainReference(reference)) continue;
|
|
190
|
+
keychainProofs.set(report, undefined);
|
|
191
|
+
const key = peekResolvedProviderKey(reference);
|
|
192
|
+
const generation = key === undefined ? undefined : passiveKeychainGeneration(reference, key);
|
|
193
|
+
if (key?.trim() && generation !== undefined && createHash("sha256").update(key.trim()).digest("hex") === keyReportCredentialIds.get(report)) {
|
|
194
|
+
keychainProofs.set(report, { reference, generation });
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
return report => {
|
|
198
|
+
const provider = config.providers[report.provider];
|
|
199
|
+
const proof = keychainProofs.get(report);
|
|
200
|
+
const key = proof && provider?.apiKey === proof.reference ? peekResolvedProviderKey(proof.reference) : undefined;
|
|
201
|
+
const destination = keyReportDestinations.get(report);
|
|
202
|
+
const keyCurrent = keychainProofs.has(report)
|
|
203
|
+
? !!proof && !!provider && !provider.disabled && (provider.authMode ?? "key") === "key"
|
|
204
|
+
&& destination?.adapter === provider.adapter && destination.baseUrl === provider.baseUrl
|
|
205
|
+
&& !!key?.trim() && passiveKeychainGeneration(proof.reference, key) === proof.generation
|
|
206
|
+
&& createHash("sha256").update(key.trim()).digest("hex") === keyReportCredentialIds.get(report)
|
|
207
|
+
: keyReportCredentialCurrent(report, provider, true);
|
|
208
|
+
return epoch === invalidationEpoch && !providerReportEpochChanged(providerEpochs, report.provider)
|
|
209
|
+
&& reportOwnerCurrent(report, provider) && isProviderQuotaReportCurrent(report)
|
|
210
|
+
&& keyCurrent;
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
|
|
156
214
|
/**
|
|
157
215
|
* Provider-scoped invalidation: drop one provider's report and routing row. The global epoch
|
|
158
216
|
* is untouched, so another provider's cached row and in-flight commit authority survive; an
|
|
@@ -368,6 +426,7 @@ export function keyReport(
|
|
|
368
426
|
if (options?.bindCredential === true) {
|
|
369
427
|
keyReportCredentialIds.set(result, createHash("sha256").update(probedCredential).digest("hex"));
|
|
370
428
|
keyReportDestinations.set(result, { adapter: config.adapter, baseUrl: config.baseUrl });
|
|
429
|
+
reportOwners.set(result, { name: provider, signature: ownerSignature(config, true), credentialBound: true });
|
|
371
430
|
}
|
|
372
431
|
if (!inferenceQuota) return result;
|
|
373
432
|
const binding = providerQuotaRoutingBinding(provider, config, probedCredential);
|
|
@@ -438,7 +497,7 @@ export function heldProviderQuotaReports(config: OcxConfig): ProviderQuotaRespon
|
|
|
438
497
|
generatedAt: held?.generatedAt ?? Date.now(),
|
|
439
498
|
reports: (held?.reports ?? []).filter(item => {
|
|
440
499
|
const provider = config.providers[item.provider];
|
|
441
|
-
return
|
|
500
|
+
return reportOwnerCurrent(item, provider, true) && isProviderQuotaReportCurrent(item) && keyReportCredentialCurrent(item, provider, true);
|
|
442
501
|
}),
|
|
443
502
|
};
|
|
444
503
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { OAuthCredentials } from "../../oauth/types";
|
|
2
2
|
import { workBuddyApi, WorkBuddyApiError } from "../../oauth/workbuddy";
|
|
3
3
|
import { workBuddyHeaders } from "../workbuddy";
|
|
4
|
-
import { parseWorkBuddyCredits, remainingWorkBuddyCredits, workBuddyCapacity, workBuddyRecord, type WorkBuddyCreditBalance } from "../workbuddy-credit-balance";
|
|
4
|
+
import { parseWorkBuddyCredits, remainingWorkBuddyCredits, workBuddyCapacity, workBuddyExactCredits, workBuddyRecord, type WorkBuddyCreditBalance } from "../workbuddy-credit-balance";
|
|
5
5
|
import { REQUEST_TIMEOUT_MS } from "../quota-wire";
|
|
6
6
|
import { TERMINAL_QUOTA_FAILURE, type ProviderQuotaProbeResult } from "./report-cache";
|
|
7
7
|
|
|
@@ -56,6 +56,7 @@ async function expiringCredits(summary: Record<string, unknown>, headers: Record
|
|
|
56
56
|
return workBuddyExpiringCredits(lists.flat(), new Set(codes), now);
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
+
/** Display-only credit balance for one account; the enterprise meter fills an empty personal summary. */
|
|
59
60
|
export async function fetchWorkBuddyQuota(provider: string, credential: OAuthCredentials): Promise<ProviderQuotaProbeResult> {
|
|
60
61
|
if (!credential.workbuddy) return null;
|
|
61
62
|
const signal = AbortSignal.timeout(REQUEST_TIMEOUT_MS), now = Date.now();
|
|
@@ -67,7 +68,10 @@ export async function fetchWorkBuddyQuota(provider: string, credential: OAuthCre
|
|
|
67
68
|
const team = await workBuddyApi("/billing/meter/get-enterprise-user-usage", headers, signal, true);
|
|
68
69
|
const total = workBuddyCapacity(team.limitNum), used = workBuddyCapacity(team.credit);
|
|
69
70
|
if (total === undefined || used === undefined) return null;
|
|
70
|
-
|
|
71
|
+
const exact = workBuddyExactCredits(team.limitNum, team.credit);
|
|
72
|
+
credits = exact
|
|
73
|
+
? { total: Number(exact.total), used, remaining: Number(exact.remaining), frozen: 0, groups: [], exact }
|
|
74
|
+
: { total, used, remaining: remainingWorkBuddyCredits(total, used), frozen: 0, groups: [] };
|
|
71
75
|
}
|
|
72
76
|
if (!credits) return null;
|
|
73
77
|
if (credits.remaining > 0) {
|
|
@@ -8,7 +8,8 @@ import { ACCOUNT_QUOTA_TTL_MS } from "./quota-wire";
|
|
|
8
8
|
|
|
9
9
|
const MAX_ENTRIES = 256;
|
|
10
10
|
const LAST_GOOD_MS = 30 * 60_000;
|
|
11
|
-
|
|
11
|
+
/** `unread` marks a synthesized row: no read happened, so `ts` is not a read time. */
|
|
12
|
+
type Entry = { ts: number; quota: ProviderQuota | null; unavailable?: true; unread?: true };
|
|
12
13
|
export type KeyQuotaProbeOutcome =
|
|
13
14
|
| { kind: "quota"; quota: ProviderQuota }
|
|
14
15
|
| { kind: "empty" | "terminal" | "unavailable" };
|
|
@@ -16,6 +17,8 @@ export interface ProviderApiKeyQuota {
|
|
|
16
17
|
keyId: string;
|
|
17
18
|
quota: ProviderQuota | null;
|
|
18
19
|
unavailable?: true;
|
|
20
|
+
/** When this key's quota was last read, success or failure; absent when no read happened. */
|
|
21
|
+
readAt?: number;
|
|
19
22
|
/** Server-only, non-enumerable; call immediately before the safe DTO join. */
|
|
20
23
|
isCurrent: () => boolean;
|
|
21
24
|
}
|
|
@@ -128,7 +131,7 @@ async function readEntry(
|
|
|
128
131
|
if (running) return running;
|
|
129
132
|
const lastGood = previous?.quota && Date.now() - previous.quota.updatedAt < LAST_GOOD_MS
|
|
130
133
|
? previous.quota : null;
|
|
131
|
-
if (flights.size >= MAX_ENTRIES) return { ts: Date.now(), quota: lastGood, unavailable: true };
|
|
134
|
+
if (flights.size >= MAX_ENTRIES) return { ts: Date.now(), quota: lastGood, unavailable: true, unread: true };
|
|
132
135
|
const flight = (async (): Promise<Entry> => {
|
|
133
136
|
let result: KeyQuotaProbeOutcome;
|
|
134
137
|
try { result = await probe(); } catch { result = { kind: "unavailable" }; }
|
|
@@ -181,17 +184,19 @@ export async function readProviderApiKeyQuotas(
|
|
|
181
184
|
? isPaused()
|
|
182
185
|
? (cached && (!cached.quota || Date.now() - cached.quota.updatedAt < LAST_GOOD_MS)
|
|
183
186
|
? cached
|
|
184
|
-
: { ts: Date.now(), quota: null, unavailable: true as const })
|
|
187
|
+
: { ts: Date.now(), quota: null, unavailable: true as const, unread: true as const })
|
|
185
188
|
: await readEntry(key, force, isCurrent, () => {
|
|
186
189
|
const isolatedProvider = { ...providerSnapshot, apiKey: resolved, apiKeyPool: undefined };
|
|
187
190
|
const isolatedConfig = { ...config, providers: { [name]: isolatedProvider } };
|
|
188
191
|
return probe(isolatedProvider, isolatedConfig);
|
|
189
192
|
})
|
|
190
|
-
: { ts: Date.now(), quota: null, unavailable: true as const };
|
|
193
|
+
: { ts: Date.now(), quota: null, unavailable: true as const, unread: true as const };
|
|
194
|
+
const current = isCurrent();
|
|
191
195
|
const result = {
|
|
192
196
|
keyId: row.id,
|
|
193
|
-
quota:
|
|
194
|
-
...(!
|
|
197
|
+
quota: current ? entry.quota : null,
|
|
198
|
+
...(!current || entry.unavailable ? { unavailable: true as const } : {}),
|
|
199
|
+
...(current && !entry.unread ? { readAt: entry.ts } : {}),
|
|
195
200
|
};
|
|
196
201
|
return Object.defineProperty(result, "isCurrent", { value: isCurrent }) as ProviderApiKeyQuota;
|
|
197
202
|
});
|
|
@@ -104,6 +104,24 @@ export interface AccountQuotaFields {
|
|
|
104
104
|
quota?: ProviderQuota | null;
|
|
105
105
|
quotaUnavailable?: boolean;
|
|
106
106
|
quotaFailure?: QuotaFailureCode;
|
|
107
|
+
/** Why the current balance is unknown (#8397); a last-good value may still ride along with read_failed. */
|
|
108
|
+
quotaUnknownReason?: QuotaUnknownReason;
|
|
109
|
+
/** When the balance was last read (epoch ms), success or failure; absent when never read. */
|
|
110
|
+
quotaReadAt?: number;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Closed reasons a balance is unknown. A row with a reason must never be rendered as zero.
|
|
115
|
+
* no_balance_source: no reader exists for this destination. passive_not_observed: a passive
|
|
116
|
+
* provider has not observed usage yet. read_failed: a reader exists and its last read failed.
|
|
117
|
+
* not_read: a reader exists but no read was made (paused key, or the key changed mid-read).
|
|
118
|
+
* not_reported: the read succeeded and the provider authoritatively reported no balance to meter
|
|
119
|
+
* (for example zero total credits, or a plan with no model window).
|
|
120
|
+
*/
|
|
121
|
+
export const QUOTA_UNKNOWN_REASONS = ["no_balance_source", "passive_not_observed", "read_failed", "not_read", "not_reported"] as const;
|
|
122
|
+
export type QuotaUnknownReason = typeof QUOTA_UNKNOWN_REASONS[number];
|
|
123
|
+
export function parseQuotaUnknownReason(value: unknown): QuotaUnknownReason | undefined {
|
|
124
|
+
return QUOTA_UNKNOWN_REASONS.find(reason => reason === value);
|
|
107
125
|
}
|
|
108
126
|
|
|
109
127
|
|
package/src/providers/quota.ts
CHANGED
|
@@ -18,10 +18,10 @@ import {
|
|
|
18
18
|
import { mapQuotaRoster, readProviderApiKeyQuotas, type ProviderApiKeyQuota } from "./quota-key-accounts";
|
|
19
19
|
import { mistralUnknownBudgetWindows } from "./quota-mistral-budget";
|
|
20
20
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
21
|
-
import { isPassiveRead } from "../lib/passive-read";
|
|
21
|
+
import { isPassiveRead, runPassiveReadSync } from "../lib/passive-read";
|
|
22
22
|
import type { ProviderQuota, QuotaFailureCode } from "./quota-types";
|
|
23
23
|
import {
|
|
24
|
-
accountReportCurrent, observedQuotaFor,
|
|
24
|
+
accountReportCurrent, observedQuotaFor, captureReportOwner, collectOwnedReport, providerQuotaBeforeObservationForTests, captureObservationAuthority,
|
|
25
25
|
AUTHORITATIVE_EMPTY_QUOTA,
|
|
26
26
|
bumpProviderQuotaInvalidationEpoch,
|
|
27
27
|
captureProviderReportEpochs, providerReportEpochChanged,
|
|
@@ -208,7 +208,8 @@ function notifyProviderQuotaSnapshot(
|
|
|
208
208
|
// Resolved here, synchronously, while the identity is still the one that produced these
|
|
209
209
|
// reports.
|
|
210
210
|
// Claude CLI rows are display-only: one reset key would span every account that signs in.
|
|
211
|
-
const observations = reports.filter(report => config.providers[report.provider]?.adapter !== "claude-cli").map(report => ({
|
|
211
|
+
const current = captureObservationAuthority(config, reports), observations = reports.filter(report => config.providers[report.provider]?.adapter !== "claude-cli").map(report => ({
|
|
212
|
+
report,
|
|
212
213
|
scope: report.provider,
|
|
213
214
|
accountKey: providerObservationAccountKey(report.provider, config, report),
|
|
214
215
|
quota: observedQuotaFor.get(report) ?? report.quota,
|
|
@@ -217,10 +218,10 @@ function notifyProviderQuotaSnapshot(
|
|
|
217
218
|
if (observations.length === 0) return;
|
|
218
219
|
pendingProviderObservation = pendingProviderObservation
|
|
219
220
|
.then(async () => {
|
|
220
|
-
const observer = await import("../quota/reset-observer");
|
|
221
|
+
await providerQuotaBeforeObservationForTests?.(); const observer = await import("../quota/reset-observer");
|
|
221
222
|
if (!observer.hasQuotaResetSink()) return;
|
|
222
223
|
const { providerWindowObservations } = await import("../quota/window-mapping");
|
|
223
|
-
for (const observation of observations) observer.observeQuotaSnapshot({ scope: observation.scope, accountKey: observation.accountKey, windows: providerWindowObservations(observation.quota), ...(observation.retainUnknownWindows ? { retainUnknownWindows: observation.retainUnknownWindows } : {}) });
|
|
224
|
+
for (const observation of observations) if (runPassiveReadSync(() => current(observation.report))) observer.observeQuotaSnapshot({ scope: observation.scope, accountKey: observation.accountKey, windows: providerWindowObservations(observation.quota), ...(observation.retainUnknownWindows ? { retainUnknownWindows: observation.retainUnknownWindows } : {}) });
|
|
224
225
|
})
|
|
225
226
|
.catch(() => {
|
|
226
227
|
// Detection is best-effort: a quota refresh must never fail because of it. Swallowing
|
|
@@ -276,9 +277,7 @@ export async function fetchProviderQuotaReports(config: OcxConfig, forceRefresh
|
|
|
276
277
|
const previousCache = getProviderQuotaReportCache();
|
|
277
278
|
const previous = previousCache && previousCache.key === key ? previousCache.response.reports : [];
|
|
278
279
|
const probeResults = await Promise.all(
|
|
279
|
-
Object.entries(config.providers).map(([name, provider]) => (
|
|
280
|
-
maybeFetchProviderQuota(name, provider, config, forceRefresh, prefetchedCodexSnapshot)
|
|
281
|
-
)),
|
|
280
|
+
Object.entries(config.providers).map(([name, provider]) => collectOwnedReport(name, provider, () => maybeFetchProviderQuota(name, provider, config, forceRefresh, prefetchedCodexSnapshot))),
|
|
282
281
|
);
|
|
283
282
|
await providerQuotaBeforePublishForTests?.();
|
|
284
283
|
let commitKey: string | null = null;
|
|
@@ -288,7 +287,7 @@ export async function fetchProviderQuotaReports(config: OcxConfig, forceRefresh
|
|
|
288
287
|
}
|
|
289
288
|
// Reconcile both rows and empty results after all awaits against the last recorded sign-in.
|
|
290
289
|
Object.entries(config.providers).forEach(([name, provider], index) => {
|
|
291
|
-
if (provider.adapter === "claude-cli" && provider.disabled !== true)
|
|
290
|
+
if (provider.adapter === "claude-cli" && provider.disabled !== true) { const held = heldClaudeCliObservedQuota(name); if (held && typeof held !== "symbol") captureReportOwner(name, provider)(held); probeResults[index] = held; }
|
|
292
291
|
});
|
|
293
292
|
const fresh = probeResults.filter((item): item is ProviderQuotaReport => (
|
|
294
293
|
item !== null && item !== TERMINAL_QUOTA_FAILURE && item !== AUTHORITATIVE_EMPTY_QUOTA
|
|
@@ -418,12 +417,12 @@ async function fetchExplicitAccountQuota(provider: string, accountId: string, fo
|
|
|
418
417
|
return flight;
|
|
419
418
|
}
|
|
420
419
|
async function fetchExplicitCurrentQuota(provider: string, config: OcxProviderConfig, liveConfig: OcxConfig): Promise<ProviderQuotaProbeResult> {
|
|
421
|
-
const
|
|
420
|
+
const selection = getAccountSet(provider), id = selection?.activeAccountId;
|
|
422
421
|
if (!id) return null;
|
|
423
422
|
const read = await readExplicitAccountQuota(provider, id, config);
|
|
424
423
|
if (!read) return null;
|
|
425
|
-
|
|
426
|
-
|
|
424
|
+
// A switch away and back keeps the same active id, so the revision is what proves this caller's selection survived.
|
|
425
|
+
const isCurrent = () => liveConfig.providers[provider] === config && read.isCurrent() && getAccountSet(provider)?.activeAccountId === id && getAccountSet(provider)?.selectionRevision === selection.selectionRevision;
|
|
427
426
|
if (!isCurrent()) return TERMINAL_QUOTA_FAILURE;
|
|
428
427
|
if (read.result && typeof read.result !== "symbol") accountReportCurrent.set(read.result, isCurrent);
|
|
429
428
|
return read.result;
|
|
@@ -120,6 +120,28 @@ const ANTHROPIC_FAST_MODELS: Readonly<Record<string, boolean>> = Object.freeze({
|
|
|
120
120
|
"claude-opus-5": true,
|
|
121
121
|
"claude-opus-4-8": true,
|
|
122
122
|
});
|
|
123
|
+
/**
|
|
124
|
+
* Gemini thinking ladders shared by the Gemini API (`google`) and Vertex AI (`google-vertex`)
|
|
125
|
+
* presets, so the two routes cannot advertise different rungs for one model.
|
|
126
|
+
* 3.7 and 3.8 omit `minimal`: Google documents it as a validation error on both model pages, so
|
|
127
|
+
* advertising it hands the user a rung the API rejects. 3.5/3.6 keep theirs — their pages still
|
|
128
|
+
* list it, and this unit has no evidence to change them. Gemini 4 Argon (GA 2026-10-13):
|
|
129
|
+
* low/medium(default)/high; `minimal` and thinking_budget return HTTP 400 per
|
|
130
|
+
* ai.google.dev/gemini-api/docs/models/gemini-4-argon. Gemini 4 Hydrogen: low/medium/high/xhigh,
|
|
131
|
+
* default high, verified live on Vertex AI by the author of #8583 (2026-11-13).
|
|
132
|
+
*/
|
|
133
|
+
const GEMINI_MODEL_REASONING_EFFORTS: Readonly<Record<string, string[]>> = {
|
|
134
|
+
"gemini-4-hydrogen": ["low", "medium", "high", "xhigh"],
|
|
135
|
+
"gemini-4-carbon": ["low", "medium", "high"],
|
|
136
|
+
"gemini-4-argon": ["low", "medium", "high"],
|
|
137
|
+
"gemini-3.8-flash": ["low", "medium", "high"],
|
|
138
|
+
"gemini-3.7-flash": ["low", "medium", "high"],
|
|
139
|
+
"gemini-3.6-flash": ["minimal", "low", "medium", "high"],
|
|
140
|
+
"gemini-3.5-flash": ["minimal", "low", "medium", "high"],
|
|
141
|
+
"gemini-3.1-pro-preview": ["low", "medium", "high"],
|
|
142
|
+
};
|
|
143
|
+
const GEMINI_MODEL_DEFAULT_REASONING_EFFORTS: Readonly<Record<string, string>> = { "gemini-4-hydrogen": "high" };
|
|
144
|
+
|
|
123
145
|
const ANTHROPIC_FAST_TIER_DESCRIPTION =
|
|
124
146
|
"Claude fast mode: faster output at 2x price; needs usage credits (subscription) or fast-mode access (API)";
|
|
125
147
|
|
|
@@ -1214,26 +1236,22 @@ export const PROVIDER_REGISTRY_CORE: readonly ProviderRegistryEntry[] = [
|
|
|
1214
1236
|
{
|
|
1215
1237
|
id: "google", label: "Google Gemini", adapter: "google", baseUrl: "https://generativelanguage.googleapis.com", authKind: "key", featured: true,
|
|
1216
1238
|
dashboardUrl: "https://aistudio.google.com/apikey", defaultModel: "gemini-3.5-flash", models: ["gemini-4-argon", "gemini-3.8-flash", "gemini-3.6-flash", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.1-pro-preview", "gemini-3.7-flash"],
|
|
1217
|
-
modelContextWindows: { "gemini-4-argon": 1_048_576, "gemini-3.8-flash": 1_048_576, "gemini-3.6-flash": 1_048_576, "gemini-3.5-flash": 1_000_000, "gemini-3.5-flash-lite": 1_048_576, "gemini-3.7-flash": 1_048_576 },
|
|
1218
|
-
modelInputModalities: { "gemini-4-argon": ["text", "image"], "gemini-3.8-flash": ["text", "image"], "gemini-3.6-flash": ["text", "image"], "gemini-3.5-flash-lite": ["text", "image"], "gemini-3.7-flash": ["text", "image"] },
|
|
1219
|
-
modelReasoningEfforts: {
|
|
1220
|
-
|
|
1221
|
-
// pages, so advertising it hands the user a rung the API rejects. 3.5/3.6 keep theirs —
|
|
1222
|
-
// their pages still list it, and this unit has no evidence to change them.
|
|
1223
|
-
// Gemini 4 Argon (GA 2026-10-13): low/medium(default)/high; `minimal` and thinking_budget
|
|
1224
|
-
// return HTTP 400 per ai.google.dev/gemini-api/docs/models/gemini-4-argon.
|
|
1225
|
-
"gemini-4-argon": ["low", "medium", "high"],
|
|
1226
|
-
"gemini-3.8-flash": ["low", "medium", "high"],
|
|
1227
|
-
"gemini-3.7-flash": ["low", "medium", "high"],
|
|
1228
|
-
"gemini-3.6-flash": ["minimal", "low", "medium", "high"],
|
|
1229
|
-
"gemini-3.5-flash": ["minimal", "low", "medium", "high"],
|
|
1230
|
-
"gemini-3.1-pro-preview": ["low", "medium", "high"],
|
|
1231
|
-
},
|
|
1239
|
+
modelContextWindows: { "gemini-4-hydrogen": 1_048_576, "gemini-4-carbon": 1_048_576, "gemini-4-argon": 1_048_576, "gemini-3.8-flash": 1_048_576, "gemini-3.6-flash": 1_048_576, "gemini-3.5-flash": 1_000_000, "gemini-3.5-flash-lite": 1_048_576, "gemini-3.7-flash": 1_048_576 },
|
|
1240
|
+
modelInputModalities: { "gemini-4-hydrogen": ["text", "image"], "gemini-4-carbon": ["text", "image"], "gemini-4-argon": ["text", "image"], "gemini-3.8-flash": ["text", "image"], "gemini-3.6-flash": ["text", "image"], "gemini-3.5-flash-lite": ["text", "image"], "gemini-3.7-flash": ["text", "image"] },
|
|
1241
|
+
modelReasoningEfforts: { ...GEMINI_MODEL_REASONING_EFFORTS },
|
|
1242
|
+
modelDefaultReasoningEfforts: { ...GEMINI_MODEL_DEFAULT_REASONING_EFFORTS },
|
|
1232
1243
|
jawcodeBundle: "google", extraMetadataAliases: ["gemini"],
|
|
1233
1244
|
},
|
|
1234
1245
|
// 2026-07-10: defaultModel is frozen pending Vertex-specific Tier-2 evidence; Gemini API
|
|
1235
1246
|
// evidence from ai.google.dev does not establish Vertex publisher availability.
|
|
1236
|
-
{
|
|
1247
|
+
{
|
|
1248
|
+
id: "google-vertex", label: "Google Vertex AI", adapter: "google", baseUrl: "https://aiplatform.googleapis.com", authKind: "key", dashboardUrl: "https://console.cloud.google.com/vertex-ai", defaultModel: "gemini-3-pro", googleMode: "vertex", jawcodeBundle: "google", extraMetadataAliases: ["gemini-vertex"],
|
|
1249
|
+
modelDiscovery: { path: "/v1beta1/publishers/google/models", query: { pageSize: "300" } },
|
|
1250
|
+
modelContextWindows: { "gemini-4-hydrogen": 1_048_576, "gemini-4-carbon": 1_048_576, "gemini-4-argon": 1_048_576, "gemini-3.8-flash": 1_048_576, "gemini-3.6-flash": 1_048_576, "gemini-3.5-flash": 1_048_576, "gemini-3.5-flash-lite": 1_048_576 },
|
|
1251
|
+
modelInputModalities: { "gemini-4-hydrogen": ["text", "image"], "gemini-4-carbon": ["text", "image"], "gemini-4-argon": ["text", "image"], "gemini-3.8-flash": ["text", "image"], "gemini-3.6-flash": ["text", "image"], "gemini-3.5-flash": ["text", "image"], "gemini-3.5-flash-lite": ["text", "image"] },
|
|
1252
|
+
modelReasoningEfforts: { ...GEMINI_MODEL_REASONING_EFFORTS },
|
|
1253
|
+
modelDefaultReasoningEfforts: { ...GEMINI_MODEL_DEFAULT_REASONING_EFFORTS },
|
|
1254
|
+
},
|
|
1237
1255
|
// Antigravity discovers models with a POST to the CCA `:fetchAvailableModels` RPC, which
|
|
1238
1256
|
// `buildModelsRequest` already built by hand. Declaring it here changes no request URL — the
|
|
1239
1257
|
// relative path resolves to the same destination — but it lets `isRegistryModelDiscoveryUrl`
|
|
@@ -120,6 +120,11 @@ import {
|
|
|
120
120
|
STEPFUN_MODEL_INPUT_MODALITIES,
|
|
121
121
|
STEPFUN_NO_VISION_MODELS,
|
|
122
122
|
STEPFUN_REASONING_EFFORTS,
|
|
123
|
+
MORPH_ULTRA_MODELS,
|
|
124
|
+
MORPH_ULTRA_MODEL_CONTEXT_WINDOWS,
|
|
125
|
+
MORPH_ULTRA_MODEL_INPUT_MODALITIES,
|
|
126
|
+
MORPH_ULTRA_REASONING_EFFORTS,
|
|
127
|
+
MORPH_ULTRA_REASONING_EFFORT_MAPS,
|
|
123
128
|
ANTHROPIC_MODELS,
|
|
124
129
|
ANTHROPIC_MODEL_CONTEXT_WINDOWS,
|
|
125
130
|
ANTHROPIC_MODEL_INPUT_MODALITIES,
|
|
@@ -498,6 +503,33 @@ export const PROVIDER_REGISTRY_EXTENDED: readonly ProviderRegistryEntry[] = [
|
|
|
498
503
|
foldDeveloperRoleToSystem: true,
|
|
499
504
|
note: "International default (api.moonshot.ai). China accounts: choose China (.cn) or Custom for api.moonshot.cn.",
|
|
500
505
|
},
|
|
506
|
+
{
|
|
507
|
+
// Morph Ultra plan (https://www.morphllm.com/products/ultra, verified 2026-11-13): one
|
|
508
|
+
// subscription with no token meter on Kimi K3.1 and DeepSeek V4.1 Flash. Only the covered rows
|
|
509
|
+
// are seeded — every other Morph model bills per token, and the abliterated variant needs
|
|
510
|
+
// privileged-access approval. Discovery stays off for the same reason: GET /v1/models lists
|
|
511
|
+
// per-token rows too, and a live roster would re-add models this plan does not include.
|
|
512
|
+
id: "morph", label: "Morph (Ultra plan)", baseUrl: "https://api.morphllm.com/v1",
|
|
513
|
+
adapter: "openai-chat", authKind: "key",
|
|
514
|
+
// A user who already configured a custom provider named "morph" keeps that destination: the
|
|
515
|
+
// registry only claims rows that still point at Morph's own endpoint.
|
|
516
|
+
preserveCustomDestination: true,
|
|
517
|
+
dashboardUrl: "https://www.morphllm.com/dashboard/api-keys",
|
|
518
|
+
defaultModel: "morph-dsv41flash-1017",
|
|
519
|
+
models: MORPH_ULTRA_MODELS,
|
|
520
|
+
liveModels: false,
|
|
521
|
+
modelContextWindows: MORPH_ULTRA_MODEL_CONTEXT_WINDOWS,
|
|
522
|
+
modelInputModalities: MORPH_ULTRA_MODEL_INPUT_MODALITIES,
|
|
523
|
+
modelReasoningEfforts: MORPH_ULTRA_REASONING_EFFORTS,
|
|
524
|
+
modelReasoningEffortMap: MORPH_ULTRA_REASONING_EFFORT_MAPS,
|
|
525
|
+
// Both families require the complete assistant message to be replayed, reasoning_content
|
|
526
|
+
// included (https://www.morphllm.com/kimi-k3-1-api, "The Thinking-Replay Gotcha", read
|
|
527
|
+
// 2026-11-13): a harness that keeps only `content` erases earlier turns' reasoning and the
|
|
528
|
+
// model degrades after a few turns. Neither seeded id matches the DeepSeek/Reflection name
|
|
529
|
+
// fallback, so the preservation has to be declared here.
|
|
530
|
+
preserveReasoningContentModels: MORPH_ULTRA_MODELS,
|
|
531
|
+
note: "Morph Ultra plan ($200/month, no token meter) on the OpenAI-compatible endpoint https://api.morphllm.com/v1. Seeded models are the Ultra-covered ones: morph-kimik31 (Kimi K3.1) and morph-dsv41flash-1017 (DeepSeek V4.1 Flash, Oct 17 snapshot). morph-dsv41flash is the same Flash pool under its undated id, and morph-dsv41flash-abliterated needs privileged-access approval, so neither is seeded. Every other Morph model (GLM-5.3, Fast Apply, WarpGrep, Router) bills per token and is not part of the plan. Ultra removes the token meter but not the per-minute rate limits, and a 429 means retry after Retry-After.",
|
|
532
|
+
},
|
|
501
533
|
{ id: "huggingface", label: "Hugging Face", baseUrl: "https://router.huggingface.co/v1", adapter: "openai-chat", authKind: "key", dashboardUrl: "https://huggingface.co/settings/tokens" },
|
|
502
534
|
// 260715 NIM hardening (issue #126, devlog/_plan/260715_issue126_nim_kimi):
|
|
503
535
|
// - NIM kimi rejects `parallel_tool_calls: true` with 400 "This model only supports single
|
|
@@ -1260,3 +1260,38 @@ export const STEPFUN_MODEL_INPUT_MODALITIES: Record<string, string[]> = {
|
|
|
1260
1260
|
export const STEPFUN_NO_VISION_MODELS = ["step-3.5-flash"];
|
|
1261
1261
|
|
|
1262
1262
|
export const STEPFUN_REASONING_EFFORTS = ["low", "medium", "high"];
|
|
1263
|
+
|
|
1264
|
+
/*
|
|
1265
|
+
* Morph Ultra plan (https://www.morphllm.com/products/ultra, verified 2026-11-13). Ultra is one
|
|
1266
|
+
* subscription with no token meter on Kimi K3.1 and DeepSeek V4.1 Flash; every other Morph model
|
|
1267
|
+
* bills per token, and `morph-dsv41flash-abliterated` is Ultra-covered only for accounts approved
|
|
1268
|
+
* for privileged access (403 otherwise). Only the covered rows are seeded, so the picker cannot
|
|
1269
|
+
* offer a model the subscription does not include. Per docs.morphllm.com/sdk/components/fast-models
|
|
1270
|
+
* all of them are 1,048,576-token, text+image, tool- and reasoning-capable.
|
|
1271
|
+
*/
|
|
1272
|
+
export const MORPH_ULTRA_MODELS = ["morph-kimik31", "morph-dsv41flash-1017"];
|
|
1273
|
+
export const MORPH_ULTRA_CONTEXT_WINDOW = 1_048_576;
|
|
1274
|
+
export const MORPH_ULTRA_MODEL_CONTEXT_WINDOWS: Record<string, number> = Object.fromEntries(
|
|
1275
|
+
MORPH_ULTRA_MODELS.map(id => [id, MORPH_ULTRA_CONTEXT_WINDOW]),
|
|
1276
|
+
);
|
|
1277
|
+
export const MORPH_ULTRA_MODEL_INPUT_MODALITIES: Record<string, string[]> = Object.fromEntries(
|
|
1278
|
+
MORPH_ULTRA_MODELS.map(id => [id, ["text", "image"]]),
|
|
1279
|
+
);
|
|
1280
|
+
/*
|
|
1281
|
+
* Kimi K3.1 documents none/low/medium/high/xhigh/max. DeepSeek V4.1 Flash documents
|
|
1282
|
+
* none/low/high/xhigh/max and folds medium into high; `minimal` is a Codex-side sentinel that
|
|
1283
|
+
* requestToCodexEffort maps to `low`, so it needs no wire entry there.
|
|
1284
|
+
*
|
|
1285
|
+
* `none` needs an explicit identity entry on both models. Without one, mapReasoningEffort turns
|
|
1286
|
+
* `none` into `undefined` (requestToCodexEffort) and the adapter omits `reasoning_effort`
|
|
1287
|
+
* entirely — which Morph reads as "reasoning on by default", the opposite of what the picker
|
|
1288
|
+
* promised. The identity entry sends `reasoning_effort: "none"` and actually disables it.
|
|
1289
|
+
*/
|
|
1290
|
+
export const MORPH_ULTRA_REASONING_EFFORTS: Record<string, string[]> = {
|
|
1291
|
+
"morph-kimik31": ["none", "low", "medium", "high", "xhigh", "max"],
|
|
1292
|
+
"morph-dsv41flash-1017": ["none", "low", "high", "xhigh", "max"],
|
|
1293
|
+
};
|
|
1294
|
+
export const MORPH_ULTRA_REASONING_EFFORT_MAPS: Record<string, Record<string, string>> = {
|
|
1295
|
+
"morph-kimik31": { none: "none" },
|
|
1296
|
+
"morph-dsv41flash-1017": { none: "none", medium: "high" },
|
|
1297
|
+
};
|
|
@@ -61,6 +61,7 @@ export interface ResolvedPerModelStaticPolicy extends Readonly<ReasoningCapabili
|
|
|
61
61
|
readonly supportsReasoningSummaries?: boolean;
|
|
62
62
|
readonly supportsVerbosity?: boolean;
|
|
63
63
|
readonly supportsServiceTier?: boolean;
|
|
64
|
+
readonly supportsResponsesCustomTools?: boolean;
|
|
64
65
|
readonly fastTierDescription?: string;
|
|
65
66
|
readonly directReasoningEffort?: boolean;
|
|
66
67
|
readonly responsesUpstreamStreaming?: boolean;
|
|
@@ -348,6 +349,8 @@ export function resolveModelPolicy(input: ResolveModelPolicyInput): ResolvedMode
|
|
|
348
349
|
const modelSupportsServiceTier = fastOff
|
|
349
350
|
? false
|
|
350
351
|
: modelValue(providerPolicy.modelSupportsServiceTier) ?? providerPolicy.supportsServiceTier;
|
|
352
|
+
const modelSupportsResponsesCustomTools = input.modelCapabilities?.responsesCustomTools
|
|
353
|
+
?? providerPolicy.supportsResponsesCustomTools;
|
|
351
354
|
const model: ResolvedPerModelStaticPolicy = {
|
|
352
355
|
adapter,
|
|
353
356
|
...reasoningCapabilities,
|
|
@@ -362,6 +365,7 @@ export function resolveModelPolicy(input: ResolveModelPolicyInput): ResolvedMode
|
|
|
362
365
|
...(modelSupportsReasoningSummaries !== undefined ? { supportsReasoningSummaries: modelSupportsReasoningSummaries } : {}),
|
|
363
366
|
...(modelSupportsVerbosity !== undefined ? { supportsVerbosity: modelSupportsVerbosity } : {}),
|
|
364
367
|
...(modelSupportsServiceTier !== undefined ? { supportsServiceTier: modelSupportsServiceTier } : {}),
|
|
368
|
+
...(modelSupportsResponsesCustomTools !== undefined ? { supportsResponsesCustomTools: modelSupportsResponsesCustomTools } : {}),
|
|
365
369
|
...(modelSupportsServiceTier === true && entry?.fastTierDescription !== undefined
|
|
366
370
|
? { fastTierDescription: entry.fastTierDescription }
|
|
367
371
|
: {}),
|
|
@@ -412,6 +416,9 @@ export function resolveModelPolicy(input: ResolveModelPolicyInput): ResolvedMode
|
|
|
412
416
|
const exactServiceTierSource = modelSource(provider.modelSupportsServiceTier, registryServiceTierDefaults);
|
|
413
417
|
modelProvenance.supportsServiceTier = !fastOff && exactServiceTierSource !== "unknown" ? exactServiceTierSource
|
|
414
418
|
: providerProvenance.supportsServiceTier ?? "unknown";
|
|
419
|
+
modelProvenance.supportsResponsesCustomTools = input.modelCapabilities?.responsesCustomTools !== undefined
|
|
420
|
+
? "operator-capability"
|
|
421
|
+
: providerProvenance.supportsResponsesCustomTools ?? "unknown";
|
|
415
422
|
modelProvenance.responsesUpstreamStreaming = model.responsesUpstreamStreaming === undefined ? "unknown" : "registry";
|
|
416
423
|
modelProvenance.responsesTerminalRepair = model.responsesTerminalRepair === undefined ? "unknown" : "registry";
|
|
417
424
|
modelProvenance.fastTierDescription = model.fastTierDescription === undefined ? "unknown" : "registry";
|