@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -38,8 +38,12 @@ type DiskFile = {
|
|
|
38
38
|
/** provider\u0000accountId -> quota, the same key the in-memory cache uses. */
|
|
39
39
|
rows: Record<string, ProviderQuota | KiroPersistedQuota>;
|
|
40
40
|
kiroVerdicts?: Record<string, KiroPersistedVerdict>;
|
|
41
|
+
/** Private Anthropic ownership by row key. Older readers project the row itself into DTOs. */
|
|
42
|
+
anthropicCredentialKeys?: Record<string, string>;
|
|
41
43
|
};
|
|
42
44
|
|
|
45
|
+
type PersistedQuotaRow = [key: string, quota: ProviderQuota | KiroPersistedQuota, anthropicCredentialKey?: string];
|
|
46
|
+
|
|
43
47
|
let persistTimer: ReturnType<typeof setTimeout> | null = null;
|
|
44
48
|
let persistStartedAt: number | null = null;
|
|
45
49
|
/** Bumped by cancellation so a fired callback still waiting for ACL admission writes nothing. */
|
|
@@ -48,14 +52,17 @@ let persistWrite: Promise<void> = Promise.resolve();
|
|
|
48
52
|
/** Test seam: wait for a fired persistence callback's admitted write (as settleQuotaPersistenceForTests). */
|
|
49
53
|
export function settleAccountQuotaPersistForTests(): Promise<void> { return persistWrite; }
|
|
50
54
|
|
|
51
|
-
/** Read the snapshot.
|
|
52
|
-
export function
|
|
55
|
+
/** Read the snapshot. Missing, corrupt or stale files supply no quota rows. */
|
|
56
|
+
export function readPersistedAccountQuotaSnapshot(now = Date.now()): {
|
|
57
|
+
rows: Map<string, ProviderQuota>;
|
|
58
|
+
anthropicCredentialKeys?: Record<string, unknown>;
|
|
59
|
+
} {
|
|
53
60
|
const rows = new Map<string, ProviderQuota>();
|
|
54
61
|
try {
|
|
55
62
|
const path = join(getConfigDir(), FILENAME);
|
|
56
|
-
if (!existsSync(path)) return rows;
|
|
63
|
+
if (!existsSync(path)) return { rows };
|
|
57
64
|
const parsed = JSON.parse(readFileSync(path, "utf8")) as DiskFile;
|
|
58
|
-
if (!parsed || parsed.version !== 1 || !parsed.rows || typeof parsed.rows !== "object") return rows;
|
|
65
|
+
if (!parsed || parsed.version !== 1 || !parsed.rows || typeof parsed.rows !== "object") return { rows };
|
|
59
66
|
for (const [key, quota] of Object.entries(parsed.rows)) {
|
|
60
67
|
if (!quota || typeof quota !== "object" || typeof quota.updatedAt !== "number"
|
|
61
68
|
|| !Number.isFinite(quota.updatedAt)) continue;
|
|
@@ -65,10 +72,15 @@ export function readPersistedAccountQuotas(now = Date.now()): Map<string, Provid
|
|
|
65
72
|
|| !/^[a-f0-9]{64}$/.test((quota as KiroPersistedQuota).identity))) continue;
|
|
66
73
|
rows.set(key, quota);
|
|
67
74
|
}
|
|
75
|
+
return { rows, anthropicCredentialKeys: parsed.anthropicCredentialKeys };
|
|
68
76
|
} catch {
|
|
69
77
|
// A corrupt cache must never block routing or the dashboard.
|
|
70
78
|
}
|
|
71
|
-
return rows;
|
|
79
|
+
return { rows };
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
export function readPersistedAccountQuotas(now = Date.now()): Map<string, ProviderQuota> {
|
|
83
|
+
return readPersistedAccountQuotaSnapshot(now).rows;
|
|
72
84
|
}
|
|
73
85
|
|
|
74
86
|
export function readPersistedKiroVerdicts(now = Date.now()): Map<string, KiroPersistedVerdict> {
|
|
@@ -97,7 +109,7 @@ export function readPersistedKiroVerdicts(now = Date.now()): Map<string, KiroPer
|
|
|
97
109
|
|
|
98
110
|
/** Debounce snapshots without starving writes under load. Failures remain best-effort. */
|
|
99
111
|
export function schedulePersistAccountQuotas(
|
|
100
|
-
rows: () => Iterable<
|
|
112
|
+
rows: () => Iterable<PersistedQuotaRow>,
|
|
101
113
|
verdicts: () => Iterable<[string, KiroPersistedVerdict]> = () => [],
|
|
102
114
|
): void {
|
|
103
115
|
const now = performance.now();
|
|
@@ -117,12 +129,18 @@ export function schedulePersistAccountQuotas(
|
|
|
117
129
|
persistWrite = withConfigDirHardeningSettled(dir, () => {
|
|
118
130
|
if (generation !== persistGeneration) return;
|
|
119
131
|
const out: Record<string, ProviderQuota> = {};
|
|
120
|
-
|
|
132
|
+
const anthropicCredentialKeys: Record<string, string> = {};
|
|
133
|
+
for (const [key, quota, anthropicCredentialKey] of rows()) {
|
|
134
|
+
out[key] = quota;
|
|
135
|
+
if (anthropicCredentialKey !== undefined) anthropicCredentialKeys[key] = anthropicCredentialKey;
|
|
136
|
+
}
|
|
121
137
|
const kiroVerdicts: Record<string, KiroPersistedVerdict> = {};
|
|
122
138
|
for (const [key, verdict] of verdicts()) {
|
|
123
139
|
if (key.startsWith("kiro\0") && /^[a-f0-9]{64}$/.test(verdict.identity)) kiroVerdicts[key] = verdict;
|
|
124
140
|
}
|
|
125
|
-
const body: DiskFile = { version: 1, rows: out, kiroVerdicts
|
|
141
|
+
const body: DiskFile = { version: 1, rows: out, kiroVerdicts,
|
|
142
|
+
...(Object.keys(anthropicCredentialKeys).length ? { anthropicCredentialKeys } : {}),
|
|
143
|
+
};
|
|
126
144
|
atomicWriteFile(join(dir, FILENAME), `${JSON.stringify(body)}\n`);
|
|
127
145
|
}).catch(() => {
|
|
128
146
|
// Best-effort persistence only.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { accountAutoPauseFenceMatchesDisk, type AccountAutoPauseFence } from "../config/account-auto-pause-revisions";
|
|
1
|
+
import { accountAutoPauseFenceMatchesDisk, effectiveAccountAutoPause, type AccountAutoPauseFence } from "../config/account-auto-pause-revisions";
|
|
2
2
|
import { randomUUID } from "node:crypto";
|
|
3
3
|
import { clearModelCache } from "../codex/model-cache";
|
|
4
4
|
import type { OcxConfig } from "../types";
|
|
@@ -38,7 +38,7 @@ export function setProviderApiKeyPausedWithResult(config: OcxConfig, name: strin
|
|
|
38
38
|
};
|
|
39
39
|
const entry = pool.find(e => e.id === id);
|
|
40
40
|
if (!entry || automatic && (entry.disabled || entry.key !== automatic.selection.reference || entry.pauseRevision !== automatic.pauseRevision
|
|
41
|
-
|| provider
|
|
41
|
+
|| !effectiveAccountAutoPause(provider) || resolveProviderApiKey(entry.key) !== automatic.resolvedKey)) {
|
|
42
42
|
return { changed: false, value: resultForCurrentSelection(false) };
|
|
43
43
|
}
|
|
44
44
|
const beforeApiKey = provider.apiKey;
|
|
@@ -13,6 +13,17 @@ interface KeyResponseOwner {
|
|
|
13
13
|
const owners = new WeakMap<Response, KeyResponseOwner | null>();
|
|
14
14
|
registerProviderResponseProvenance(owners);
|
|
15
15
|
|
|
16
|
+
/** Any key-auth header besides the one written by the credential owner makes attribution ambiguous. */
|
|
17
|
+
export function hasConflictingApiKeyHeaders(
|
|
18
|
+
names: Iterable<string>, ownedHeader?: "authorization" | "x-api-key",
|
|
19
|
+
): boolean {
|
|
20
|
+
for (const name of names) {
|
|
21
|
+
const header = name.toLowerCase();
|
|
22
|
+
if (header !== ownedHeader && (header === "authorization" || header === "x-api-key" || header === "api-key")) return true;
|
|
23
|
+
}
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
|
|
16
27
|
/** Capture the credential after connection-policy rewrites, immediately before fetch. */
|
|
17
28
|
export function distributedKeyPhysicalFetch(
|
|
18
29
|
physicalFetch: typeof globalThis.fetch, providerName: string, provider: OcxProviderConfig, target: string,
|
|
@@ -22,10 +33,9 @@ export function distributedKeyPhysicalFetch(
|
|
|
22
33
|
const wrapped = (async (input, init) => {
|
|
23
34
|
const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
|
|
24
35
|
const destination = input instanceof Request ? input.url : String(input);
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
: headers.get("x-api-key") === provider.apiKey && !headers.has("authorization"));
|
|
36
|
+
const expected = authHeader === "authorization" ? `Bearer ${provider.apiKey}` : provider.apiKey;
|
|
37
|
+
const ownsCredential = destination === target && headers.get(authHeader) === expected
|
|
38
|
+
&& !hasConflictingApiKeyHeaders(headers.keys(), authHeader);
|
|
29
39
|
const owner: KeyResponseOwner | null = provider._apiKeyAttempt?.distributed && ownsCredential
|
|
30
40
|
? Object.freeze({ providerName, provider: Object.freeze({ ...provider,
|
|
31
41
|
_apiKeyAttempt: Object.freeze({ ...provider._apiKeyAttempt }) }) }) : null;
|
|
@@ -48,6 +48,7 @@ export function loadClaudeUsageSnapshot(path: string): ClaudeUsageSnapshot | und
|
|
|
48
48
|
if (saved.quota !== undefined) {
|
|
49
49
|
const q = saved.quota;
|
|
50
50
|
if (!q || typeof q !== "object" || !finite(q.updatedAt)) return;
|
|
51
|
+
if (q.claudeExtraUsage !== undefined && !["enabled", "disabled", "exhausted"].includes(q.claudeExtraUsage)) return;
|
|
51
52
|
for (const field of ["fiveHourPercent", "fiveHourResetAt", "weeklyPercent", "weeklyResetAt"])
|
|
52
53
|
if (q[field] !== undefined && !finite(q[field])) return;
|
|
53
54
|
// Display-only rows (an inactive model limit) reach the dashboard too, so they pass the same check.
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { markAnthropicFamilyEnumeration } from "./quota/anthropic-family-headers";
|
|
2
2
|
import { rawAnthropicUsageWindows } from "./quota/anthropic-decision-windows";
|
|
3
|
-
import { anthropicUsageBuckets, type AnthropicUsageBucket } from "./quota/anthropic-usage-windows";
|
|
3
|
+
import { anthropicExtraUsageMonthlyPercent, anthropicUsageBuckets, parseAnthropicExtraUsage, type AnthropicUsageBucket } from "./quota/anthropic-usage-windows";
|
|
4
4
|
import { bindRawDecisionWindows } from "./quota-decision-publication";
|
|
5
5
|
import { decisionQuotaSinkActive } from "../lib/decision-quota-sink";
|
|
6
6
|
import { CLAUDE_CLI_USER_AGENT } from "./claude-cli-identity";
|
|
7
7
|
import { asRecord, normalizePercent, normalizeResetAt, readQuotaJson, REQUEST_TIMEOUT_MS } from "./quota-wire";
|
|
8
8
|
import type { ProviderQuota, ProviderQuotaWindow, QuotaFailureCode } from "./quota-types";
|
|
9
9
|
import { httpQuotaFailure } from "./quota/failure-codes";
|
|
10
|
-
const hasQuotaRows = (q: ProviderQuota) =>
|
|
10
|
+
const hasQuotaRows = (q: ProviderQuota) =>
|
|
11
|
+
q.fiveHourPercent !== undefined || q.weeklyPercent !== undefined || q.monthlyPercent !== undefined || Boolean(q.customWindows?.length);
|
|
11
12
|
|
|
12
13
|
const FAMILY_LABELS: Partial<Record<AnthropicUsageBucket["window"], string>> = { fable: "Fable", opus: "Opus", sonnet: "Sonnet" };
|
|
13
14
|
|
|
@@ -28,13 +29,22 @@ export async function readAnthropicUsageQuota(accessToken: string): Promise<Prov
|
|
|
28
29
|
return (await probeAnthropicUsageQuota(accessToken)).quota;
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
/**
|
|
32
|
+
/** Read quota with the paid-usage state that Claude CLI admission needs. */
|
|
33
|
+
export async function readClaudeCliUsageQuota(accessToken: string): Promise<ProviderQuota | null> {
|
|
34
|
+
return (await probeAnthropicUsageQuota(accessToken, { includeClaudeExtraUsage: true })).quota;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/** A usage read with a closed failure when no quota was usable, and optional monthly retirement evidence. A thrown fetch still throws. */
|
|
32
38
|
export interface AnthropicUsageProbe {
|
|
33
39
|
quota: ProviderQuota | null;
|
|
40
|
+
retireMonthlyFallback?: true;
|
|
34
41
|
failure?: QuotaFailureCode;
|
|
35
42
|
}
|
|
36
43
|
|
|
37
|
-
export async function probeAnthropicUsageQuota(
|
|
44
|
+
export async function probeAnthropicUsageQuota(
|
|
45
|
+
accessToken: string,
|
|
46
|
+
{ includeClaudeExtraUsage = false }: { includeClaudeExtraUsage?: boolean } = {},
|
|
47
|
+
): Promise<AnthropicUsageProbe> {
|
|
38
48
|
const response = await fetch("https://api.anthropic.com/api/oauth/usage", {
|
|
39
49
|
// Like the profile probe: a redirect must never carry the bearer to another host.
|
|
40
50
|
redirect: "error",
|
|
@@ -53,7 +63,8 @@ export async function probeAnthropicUsageQuota(accessToken: string): Promise<Ant
|
|
|
53
63
|
}
|
|
54
64
|
const body = asRecord(await readQuotaJson(response));
|
|
55
65
|
if (!body) return { quota: null, failure: "response_unusable" };
|
|
56
|
-
const
|
|
66
|
+
const windows = anthropicUsageBuckets(body);
|
|
67
|
+
const { buckets, displayBuckets, familyEnumeration } = windows;
|
|
57
68
|
const shared: Partial<ProviderQuota> = {};
|
|
58
69
|
const customWindows: ProviderQuotaWindow[] = [];
|
|
59
70
|
for (const bucket of buckets) {
|
|
@@ -71,15 +82,21 @@ export async function probeAnthropicUsageQuota(accessToken: string): Promise<Ant
|
|
|
71
82
|
}
|
|
72
83
|
}
|
|
73
84
|
const displayWindows = displayBuckets.flatMap(bucket => familyWindow(bucket) ?? []);
|
|
85
|
+
const paidUsage = parseAnthropicExtraUsage(body.extra_usage)?.state;
|
|
86
|
+
const monthlyPercent = anthropicExtraUsageMonthlyPercent(body, windows);
|
|
87
|
+
if (monthlyPercent !== undefined) shared.monthlyPercent = monthlyPercent;
|
|
74
88
|
const quota: ProviderQuota = {
|
|
75
89
|
...shared,
|
|
90
|
+
...(includeClaudeExtraUsage && paidUsage !== undefined ? { claudeExtraUsage: paidUsage } : {}),
|
|
76
91
|
...(customWindows.length > 0 ? { customWindows } : {}),
|
|
77
92
|
...(displayWindows.length > 0 ? { displayWindows } : {}),
|
|
78
93
|
updatedAt: Date.now(),
|
|
79
94
|
};
|
|
95
|
+
if (!hasQuotaRows(quota)) {
|
|
96
|
+
const retireMonthlyFallback = windows.hasPlanWindow || paidUsage === "disabled";
|
|
97
|
+
return { quota: null, failure: "response_unusable", ...(retireMonthlyFallback ? { retireMonthlyFallback: true } : {}) };
|
|
98
|
+
}
|
|
80
99
|
if (decisionQuotaSinkActive()) bindRawDecisionWindows(quota, rawAnthropicUsageWindows(body, quota.updatedAt));
|
|
81
|
-
// Empty / schema-changed payloads must not cache as "success with no bars".
|
|
82
|
-
if (!hasQuotaRows(quota)) return { quota: null, failure: "response_unusable" };
|
|
83
100
|
return { quota: markAnthropicFamilyEnumeration(quota, familyEnumeration) };
|
|
84
101
|
}
|
|
85
102
|
|
|
@@ -68,12 +68,13 @@ function builtinRule(id: string): { match: RegExp; alias: string } | undefined {
|
|
|
68
68
|
return DEFAULT_MODEL_ALIASES.find(rule => rule.match.test(id) || rule.match.test(tail));
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
export function defaultAliasesEnabled(config: Pick<OcxConfig, "defaultModelAliases">, provider: OcxProviderConfig): boolean {
|
|
71
|
+
export function defaultAliasesEnabled(config: Pick<OcxConfig, "defaultModelAliases">, provider: Pick<OcxProviderConfig, "defaultAliases">): boolean {
|
|
72
72
|
return provider.defaultAliases ?? config.defaultModelAliases ?? false;
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
/** The parts of the config an alias view reads; `providers` and `combos` only matter to templates. */
|
|
76
76
|
export type AliasViewConfig = Pick<OcxConfig, "defaultModelAliases"> & Partial<Pick<OcxConfig, "providers" | "combos">>;
|
|
77
|
+
type AliasViewProvider = Pick<OcxProviderConfig, "defaultAliases" | "modelAliases" | "aliasTemplate" | "alias">;
|
|
77
78
|
|
|
78
79
|
/**
|
|
79
80
|
* Manual aliases, then built-in ones (when enabled), then the provider's opt-in template (#7705).
|
|
@@ -82,7 +83,7 @@ export type AliasViewConfig = Pick<OcxConfig, "defaultModelAliases"> & Partial<P
|
|
|
82
83
|
*/
|
|
83
84
|
export function effectiveModelAliases(
|
|
84
85
|
config: AliasViewConfig,
|
|
85
|
-
provider:
|
|
86
|
+
provider: AliasViewProvider,
|
|
86
87
|
knownIds: Iterable<string>,
|
|
87
88
|
providerName?: string,
|
|
88
89
|
): Map<string, EffectiveModelAlias> {
|
|
@@ -98,7 +99,9 @@ export function effectiveModelAliases(
|
|
|
98
99
|
const rule = builtinRule(id);
|
|
99
100
|
if (!rule) continue;
|
|
100
101
|
const key = rule.alias.toLowerCase();
|
|
101
|
-
|
|
102
|
+
const ids = claims.get(key);
|
|
103
|
+
if (ids) ids.push(id);
|
|
104
|
+
else claims.set(key, [id]);
|
|
102
105
|
}
|
|
103
106
|
for (const [alias, ids] of claims) {
|
|
104
107
|
if (ids.length !== 1) continue;
|
|
@@ -131,7 +134,7 @@ export interface TemplateAliasPlan {
|
|
|
131
134
|
*/
|
|
132
135
|
export function templateAliasPlan(
|
|
133
136
|
config: AliasViewConfig,
|
|
134
|
-
provider:
|
|
137
|
+
provider: Pick<AliasViewProvider, "aliasTemplate" | "alias">,
|
|
135
138
|
providerName: string,
|
|
136
139
|
knownIds: readonly string[],
|
|
137
140
|
existing: ReadonlyMap<string, EffectiveModelAlias>,
|
|
@@ -161,7 +164,10 @@ export function templateAliasPlan(
|
|
|
161
164
|
const expanded = expandAliasTemplate(template, providerAlias, id);
|
|
162
165
|
if ("skip" in expanded) { plan.skipped.push({ id, reason: expanded.skip }); continue; }
|
|
163
166
|
const key = expanded.alias.toLowerCase();
|
|
164
|
-
|
|
167
|
+
const rows = candidates.get(key);
|
|
168
|
+
const row = { id, alias: expanded.alias };
|
|
169
|
+
if (rows) rows.push(row);
|
|
170
|
+
else candidates.set(key, [row]);
|
|
165
171
|
}
|
|
166
172
|
for (const [key, rows] of candidates) {
|
|
167
173
|
if (rows.length > 1) {
|
package/src/providers/derive.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isAgyAcpProvider } from "../config/schema/agy-acp-references";
|
|
1
2
|
import type { CodexAccountMode, OcxProviderConfig } from "../types";
|
|
2
3
|
import { COST_VENDOR_PRIORITY, getModelMetadata, getModelMetadataCaseInsensitive } from "../generated/model-metadata";
|
|
3
4
|
import { cloneFastWire } from "./fastwire";
|
|
@@ -73,6 +74,7 @@ export interface DerivedInitProvider {
|
|
|
73
74
|
adapter: string;
|
|
74
75
|
baseUrl: string;
|
|
75
76
|
kind: "forward" | "oauth" | "key" | "local";
|
|
77
|
+
keyOptional?: boolean;
|
|
76
78
|
codexAccountMode?: CodexAccountMode;
|
|
77
79
|
dashboardUrl?: string;
|
|
78
80
|
defaultModel?: string;
|
|
@@ -323,7 +325,7 @@ export function deriveKeyLoginMap(): Record<string, DerivedKeyLoginProvider> {
|
|
|
323
325
|
if (entry.authKind !== "key") continue;
|
|
324
326
|
// A deprecated route cannot complete a login, but its entry must stay resolvable for
|
|
325
327
|
// configs saved while it still worked.
|
|
326
|
-
if (entry.deprecated) continue;
|
|
328
|
+
if (entry.deprecated || isAgyAcpProvider(entry.id, entry)) continue;
|
|
327
329
|
if (!entry.dashboardUrl) throw new Error(`Registry key provider missing dashboardUrl: ${entry.id}`);
|
|
328
330
|
const liveModels = registryEntrySupportsLiveModelDiscovery(entry) ? entry.liveModels : false;
|
|
329
331
|
out[entry.id] = {
|
|
@@ -385,6 +387,7 @@ export function deriveInitProviders(): DerivedInitProvider[] {
|
|
|
385
387
|
adapter: entry.adapter,
|
|
386
388
|
baseUrl: entry.baseUrl,
|
|
387
389
|
kind: entry.authKind,
|
|
390
|
+
...(entry.keyOptional ? { keyOptional: true } : {}),
|
|
388
391
|
...(entry.codexAccountMode ? { codexAccountMode: entry.codexAccountMode } : {}),
|
|
389
392
|
...(entry.dashboardUrl ? { dashboardUrl: entry.dashboardUrl } : {}),
|
|
390
393
|
...(entry.defaultModel ? { defaultModel: entry.defaultModel } : {}),
|
|
@@ -765,6 +768,7 @@ function customPreset(): DerivedProviderPreset {
|
|
|
765
768
|
|
|
766
769
|
function formatInitLabel(entry: ProviderRegistryEntry): string {
|
|
767
770
|
if (entry.authKind === "forward") return "OpenAI — ChatGPT login (no key; account pool default, Direct selectable)";
|
|
771
|
+
if (entry.adapter === "agy-acp") return `${entry.label} — subscription CLI (no API key)`;
|
|
768
772
|
if (entry.authKind === "oauth") {
|
|
769
773
|
if (entry.id === "xai") return "xAI (Grok) — account login";
|
|
770
774
|
if (entry.id === "anthropic") return "Anthropic (Claude) — account login";
|
|
@@ -202,12 +202,13 @@ export function resolveFastPolicy(
|
|
|
202
202
|
authority: FastPolicyAuthority,
|
|
203
203
|
modelId: string,
|
|
204
204
|
inbound: InboundWire = "responses",
|
|
205
|
+
effectiveAdapter?: string,
|
|
205
206
|
): ResolvedFastPolicy {
|
|
206
|
-
const
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
207
|
+
const policyAdapter = resolvePolicyAdapter(authority, modelId, inbound);
|
|
208
|
+
const { adapter, hardPinned, forwardCallerServiceTier } =
|
|
209
|
+
effectiveAdapter === undefined || effectiveAdapter === policyAdapter.adapter
|
|
210
|
+
? policyAdapter
|
|
211
|
+
: { adapter: effectiveAdapter, hardPinned: false, forwardCallerServiceTier: undefined };
|
|
211
212
|
const exactCapability = exactModelValue(authority.capability.models, modelId);
|
|
212
213
|
const capability = authority.capability.provider === false
|
|
213
214
|
? false
|
|
@@ -11,7 +11,7 @@ export const FREE_PROVIDER_ACCESS_GROUPS = {
|
|
|
11
11
|
"agy", "aihorde", "api-airforce", "arcee-ai", "bazaarlink", "blackbox", "bluesminds", "cerebras",
|
|
12
12
|
"cloudflare-ai", "cohere", "coze", "duckduckgo-web", "felo-web", "friendliai", "gemini", "github-models",
|
|
13
13
|
"groq", "hackclub", "huggingchat", "huggingface", "iflytek", "inference-net", "kiro", "liquid", "llm7",
|
|
14
|
-
"mistral", "morph", "muse-spark-web", "nara", "navy", "nlpcloud", "ollama-cloud", "opencode", "openrouter",
|
|
14
|
+
"llmtr", "mistral", "morph", "muse-spark-web", "nara", "navy", "nlpcloud", "ollama-cloud", "opencode", "openrouter",
|
|
15
15
|
"ovhcloud", "perch", "pollinations", "puter", "qwen-web", "reka", "runcrate", "sambanova", "sparkdesk", "t3-web", "uncloseai",
|
|
16
16
|
],
|
|
17
17
|
"recurring-uncapped": [
|
|
@@ -202,7 +202,7 @@ const LABELS: Record<string, string> = {
|
|
|
202
202
|
bazaarlink: "BazaarLink", blackbox: "Blackbox", bluesminds: "Bluesminds", "cloudflare-ai": "Cloudflare AI",
|
|
203
203
|
coze: "Coze", "duckduckgo-web": "DuckDuckGo Web", "felo-web": "Felo Web", friendliai: "FriendliAI",
|
|
204
204
|
gemini: "Google Gemini", "github-models": "GitHub Models", huggingchat: "HuggingChat", huggingface: "Hugging Face",
|
|
205
|
-
iflytek: "iFlytek", "inference-net": "Inference.net", llm7: "LLM7", "muse-spark-web": "Muse Spark Web",
|
|
205
|
+
iflytek: "iFlytek", "inference-net": "Inference.net", llm7: "LLM7", llmtr: "LLMTR", "muse-spark-web": "Muse Spark Web",
|
|
206
206
|
nlpcloud: "NLP Cloud", "ollama-cloud": "Ollama Cloud", ovhcloud: "OVHcloud", "qwen-web": "Qwen Web",
|
|
207
207
|
"t3-web": "T3 Web", uncloseai: "UncloseAI", perch: "Perch", ainative: "AI Native", baidu: "Baidu Qianfan",
|
|
208
208
|
glm: "Z.AI GLM", "glm-cn": "BigModel GLM (CN)", "kilo-gateway": "Kilo Gateway", "opencode-zen": "OpenCode Zen",
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Vertex regional hosts are formed as `<location>-aiplatform.googleapis.com
|
|
2
|
+
* Vertex regional hosts are formed as `<location>-aiplatform.googleapis.com`, and the `us`/`eu`
|
|
3
|
+
* multi-regions as `aiplatform.<location>.rep.googleapis.com` (vertexHostForLocation).
|
|
3
4
|
* Restricting the location to one lowercase DNS label keeps user configuration
|
|
4
5
|
* from changing the request authority while remaining forward-compatible with
|
|
5
6
|
* new Google regions and multi-regions.
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
GCP_CREDENTIAL_MARKER_PREFIX,
|
|
5
5
|
gcpCredentialMarkerAccount,
|
|
6
6
|
getVertexAccessTokenWithAuthority,
|
|
7
|
+
observeVertexAdcGeneration,
|
|
7
8
|
vertexRequestAuthorityIsCurrent,
|
|
8
9
|
} from "../lib/gcp-adc";
|
|
9
10
|
import type { OcxProviderConfig } from "../types";
|
|
@@ -150,6 +151,27 @@ export function selectVertexDiscoveryCredential(provider: OcxProviderConfig): Ve
|
|
|
150
151
|
return ambientKey ? { kind: "api-key", key: ambientKey, ambient: true } : { kind: "adc" };
|
|
151
152
|
}
|
|
152
153
|
|
|
154
|
+
/** Capture the credential incarnation for aggregate gather admission without refreshing it. */
|
|
155
|
+
export function captureVertexDiscoveryCredentialIdentity(provider: OcxProviderConfig, includeAdc: boolean) {
|
|
156
|
+
if (!vertexDiscoveryOrigin(provider.baseUrl) || isVertexApiKeyPoolPaused(provider)) return undefined;
|
|
157
|
+
const selection = selectVertexDiscoveryCredential(provider);
|
|
158
|
+
if (selection.kind === "api-key") {
|
|
159
|
+
return selection.ambient && selection.key ? captureVertexAmbientKey(selection.key) : selection.key;
|
|
160
|
+
}
|
|
161
|
+
if (!includeAdc) return undefined;
|
|
162
|
+
let markerAccount: string | undefined;
|
|
163
|
+
try {
|
|
164
|
+
markerAccount = gcpCredentialMarkerAccount(selection.marker);
|
|
165
|
+
} catch {
|
|
166
|
+
// A malformed marker degrades discovery without opening the host ADC scope.
|
|
167
|
+
return undefined;
|
|
168
|
+
}
|
|
169
|
+
return {
|
|
170
|
+
adcGeneration: observeVertexAdcGeneration(markerAccount),
|
|
171
|
+
ambientGeneration: selection.marker ? undefined : captureVertexAmbientKey("").generation,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
|
|
153
175
|
/** Whether a Vertex provider row authenticates discovery with an API key rather than GCP ADC. */
|
|
154
176
|
export function usesVertexApiKeyForDiscovery(provider: OcxProviderConfig): boolean {
|
|
155
177
|
return selectVertexDiscoveryCredential(provider).kind === "api-key";
|
|
@@ -17,6 +17,7 @@ export {
|
|
|
17
17
|
import { affinitySelectionIsCurrent, commitProviderApiKeySelection, providerApiKeySelectionIsCurrent } from "./api-key-selection";
|
|
18
18
|
import { currentCacheAffinityIdentity } from "./cache-affinity-identity";
|
|
19
19
|
import { providerRequestPacingStatus, REQUEST_PACING_MAX_QUEUE_AGE_MS, RequestPacingQueueOverloadError } from "./request-pacing";
|
|
20
|
+
import { isCanonicalOpenAiForwardProvider } from "./openai-tiers-destination";
|
|
20
21
|
import { isCanonicalMistralChat } from "./mistral-transport";
|
|
21
22
|
import type { ProviderApiKeySelection } from "../types/provider";
|
|
22
23
|
import { routedProviderConfig } from "./routed-config";
|
|
@@ -749,30 +750,24 @@ export function rateLimitRetryPolicyFor(
|
|
|
749
750
|
return null;
|
|
750
751
|
}
|
|
751
752
|
|
|
752
|
-
/**
|
|
753
|
-
|
|
754
|
-
* explicitly disabled, not key-auth, or not an adapter this policy governs.
|
|
755
|
-
*
|
|
756
|
-
* The adapter gate is part of the accepted scope, not incidental: it names the adapters whose
|
|
757
|
-
* lanes actually read this policy, so no generic key-auth adapter can opt in by accident.
|
|
758
|
-
* Auth mode follows the same fail-closed rule as `rateLimitRetryPolicyFor` —
|
|
759
|
-
* explicit `key` or the documented omitted default, never OAuth, forward, local, or an
|
|
760
|
-
* unknown value.
|
|
761
|
-
*/
|
|
762
|
-
export function transientRetryPolicyFor(
|
|
763
|
-
provider: Pick<OcxProviderConfig, "transientRetryOn5xx" | "authMode" | "adapter">,
|
|
764
|
-
): Required<TransientRetryPolicy> | null {
|
|
753
|
+
/** Configured total sends for key-auth OpenAI adapters and explicitly opted-in ChatGPT subscriptions. */
|
|
754
|
+
export function transientRetryPolicyFor(provider: OcxProviderConfig): Required<TransientRetryPolicy> | null {
|
|
765
755
|
const policy = provider.transientRetryOn5xx;
|
|
766
|
-
if (!policy || policy.enabled === false)
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
//
|
|
770
|
-
//
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
756
|
+
if (!policy || policy.enabled === false) {
|
|
757
|
+
return null;
|
|
758
|
+
}
|
|
759
|
+
// Keep the adapter allowlist aligned with the lanes that consume this policy.
|
|
760
|
+
// Responses passthrough and native compact read it alongside Chat Completions (#4893).
|
|
761
|
+
if (provider.adapter !== "openai-chat" && provider.adapter !== "openai-responses") {
|
|
762
|
+
return null;
|
|
763
|
+
}
|
|
764
|
+
// Like retryOn429, auth fails closed: explicit key or the documented omitted key default.
|
|
765
|
+
// The only exception is canonical ChatGPT forward auth with an explicit total. An empty
|
|
766
|
+
// block must not activate the hold or change the historical Pool allowance.
|
|
767
|
+
if (provider.authMode !== undefined && provider.authMode !== "key"
|
|
768
|
+
&& (policy.attempts === undefined || !isCanonicalOpenAiForwardProvider(provider))) {
|
|
769
|
+
return null;
|
|
770
|
+
}
|
|
776
771
|
return {
|
|
777
772
|
enabled: policy.enabled ?? DEFAULT_TRANSIENT_RETRY.enabled,
|
|
778
773
|
attempts: policy.attempts ?? DEFAULT_TRANSIENT_RETRY.attempts,
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { M365_COPILOT_BASE_URL } from "./m365-copilot-models";
|
|
2
|
+
import { M365_COPILOT_WEB_URL, normalizeM365WebSession, readM365ModelBootstrap } from "./m365-copilot-discovery";
|
|
3
|
+
import { m365CopilotClaims } from "../oauth/m365-copilot";
|
|
4
|
+
import { providerOutboundGet } from "../lib/provider-outbound";
|
|
5
|
+
import type { OAuthAccessSnapshot } from "../oauth";
|
|
6
|
+
import type { OcxProviderConfig } from "../types";
|
|
7
|
+
|
|
8
|
+
export async function fetchM365ModelRoster(name: string, provider: OcxProviderConfig, auth: Pick<OAuthAccessSnapshot, "accessToken" | "m365"> | undefined, signal: AbortSignal, beforeSend?: () => boolean) {
|
|
9
|
+
const session = normalizeM365WebSession(auth?.m365);
|
|
10
|
+
if (name !== "m365-copilot" || provider.disabled || provider.adapter !== "m365-copilot" || provider.authMode !== "oauth"
|
|
11
|
+
|| provider.baseUrl.replace(/\/+$/, "") !== M365_COPILOT_BASE_URL || !auth?.accessToken || !session) throw new Error("Microsoft 365 Copilot model discovery requires web sign-in");
|
|
12
|
+
const claims = m365CopilotClaims(auth.accessToken);
|
|
13
|
+
if (session.accountId.toLowerCase() !== (claims.oid + "@" + claims.tid).toLowerCase()) throw new Error("Microsoft 365 Copilot model discovery account mismatch");
|
|
14
|
+
const response = await providerOutboundGet(name, provider, M365_COPILOT_WEB_URL, { headers: { cookie: session.cookie }, signal }, { beforeSend });
|
|
15
|
+
if (!response.ok || response.status >= 300) { await response.body?.cancel(); throw new Error("Microsoft 365 Copilot web sign-in expired; retry login"); }
|
|
16
|
+
return readM365ModelBootstrap(response, session.accountId, signal);
|
|
17
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { readBoundedResponseBytes } from "../lib/bounded-body";
|
|
2
|
+
import type { M365CopilotWebSession } from "../oauth/types";
|
|
3
|
+
import type { ProviderModelsApiItem } from "./model-discovery";
|
|
4
|
+
|
|
5
|
+
export const M365_COPILOT_WEB_URL = "https://copilot.cloud.microsoft/chat/";
|
|
6
|
+
export const M365_COPILOT_WEB_COOKIE_NAMES = /^(?:OhpAuth(?:C\d+)?|OhpToken|SSRUserType)$/;
|
|
7
|
+
const guid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
8
|
+
export const M365_NATIVE_MODEL_ID = /^[A-Z][A-Za-z0-9_]{0,159}$/;
|
|
9
|
+
|
|
10
|
+
export function normalizeM365WebSession(value: unknown): M365CopilotWebSession | undefined {
|
|
11
|
+
if (!value || typeof value !== "object") return;
|
|
12
|
+
const { cookie, accountId } = value as M365CopilotWebSession;
|
|
13
|
+
if (typeof accountId !== "string" || accountId.split("@").length !== 2 || !accountId.split("@").every(id => guid.test(id))) return;
|
|
14
|
+
if (typeof cookie !== "string" || !cookie || cookie.length > 32_768 || /[\x00-\x1f\x7f]/.test(cookie)) return;
|
|
15
|
+
const parts = cookie.split("; ");
|
|
16
|
+
if (parts.length > 16 || !parts.some(p => p.startsWith("OhpAuth=")) || parts.some(p => {
|
|
17
|
+
const i = p.indexOf("=");
|
|
18
|
+
return i < 1 || !M365_COPILOT_WEB_COOKIE_NAMES.test(p.slice(0, i)) || !/^[\x21-\x2b\x2d-\x3a\x3c-\x7e]+$/.test(p.slice(i + 1));
|
|
19
|
+
})) return;
|
|
20
|
+
return { cookie, accountId };
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function record(value: unknown): Record<string, any> {
|
|
24
|
+
return value !== null && typeof value === "object" && !Array.isArray(value) ? value as Record<string, any> : {};
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** Read only the main chat roster; researcher and other agent menus are different products. */
|
|
28
|
+
export function parseM365ModelBootstrap(html: string): { accountId: string; items: ProviderModelsApiItem[] } {
|
|
29
|
+
const quoted = html.match(/window\.__staticRouterHydrationData\s*=\s*JSON\.parse\(\s*("(?:[^"\\]|\\.)*")\s*\)/)?.[1];
|
|
30
|
+
if (!quoted) throw new Error("Microsoft 365 Copilot model discovery requires web sign-in");
|
|
31
|
+
let root: Record<string, any>;
|
|
32
|
+
try { root = record(record(record(JSON.parse(JSON.parse(quoted))).loaderData).root); }
|
|
33
|
+
catch { throw new Error("Microsoft 365 Copilot returned invalid model metadata"); }
|
|
34
|
+
const account = record(record(root.store).accountInfo);
|
|
35
|
+
if (!guid.test(account.objectId) || !guid.test(account.tenantId)) throw new Error("Microsoft 365 Copilot returned no work-account identity");
|
|
36
|
+
const queries = record(root.__queryState).queries;
|
|
37
|
+
if (!Array.isArray(queries) || queries.length > 256) throw new Error("Microsoft 365 Copilot returned invalid model metadata");
|
|
38
|
+
const metadata = queries.map(q => record(record(record(q).state).data).bizchatAsAgentGpt?.clientPreferences?.modelSelectorMetadata).find(Boolean);
|
|
39
|
+
const options = record(metadata).availableModelSelectionOptions;
|
|
40
|
+
if (!Array.isArray(options)) throw new Error("Microsoft 365 Copilot returned no chat model roster");
|
|
41
|
+
const items: ProviderModelsApiItem[] = [], seen = new Set<string>();
|
|
42
|
+
let count = 0;
|
|
43
|
+
const walk = (rows: unknown[], depth: number) => {
|
|
44
|
+
if (depth > 8) throw new Error("Microsoft 365 Copilot model metadata exceeds its limits");
|
|
45
|
+
for (const raw of rows) {
|
|
46
|
+
if (++count > 256) throw new Error("Microsoft 365 Copilot model metadata exceeds its limits");
|
|
47
|
+
const row = record(raw);
|
|
48
|
+
if (row.type === "itemGroup" && Array.isArray(row.itemGroup)) { walk(row.itemGroup, depth + 1); continue; }
|
|
49
|
+
if (row.type !== "item" || typeof row.id !== "string" || row.id.length > 160 || !M365_NATIVE_MODEL_ID.test(row.id)) throw new Error("Microsoft 365 Copilot returned an invalid model selector");
|
|
50
|
+
if (seen.has(row.id)) continue;
|
|
51
|
+
seen.add(row.id);
|
|
52
|
+
const name = typeof row.menuItemTitle === "string" && row.menuItemTitle.length <= 256 && !/[\x00-\x1f\x7f]/.test(row.menuItemTitle) ? row.menuItemTitle : row.id;
|
|
53
|
+
// A daily quota block does not remove the model from the account's entitlement roster.
|
|
54
|
+
// The picker has no per-model modality field; chat selectors share the image attachment protocol.
|
|
55
|
+
items.push({ id: row.id, name, input_modalities: ["text", "image"], m365_disabled: row.disabled === true });
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
walk(options, 0);
|
|
59
|
+
return { accountId: account.objectId + "@" + account.tenantId, items };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export async function readM365ModelBootstrap(response: Response, expectedAccountId: string, signal?: AbortSignal) {
|
|
63
|
+
const read = await readBoundedResponseBytes(response, { maxBytes: 2 * 1024 * 1024, signal });
|
|
64
|
+
if (read.oversized) throw new Error("Microsoft 365 Copilot model metadata exceeds its limits");
|
|
65
|
+
const result = parseM365ModelBootstrap(new TextDecoder().decode(read.bytes));
|
|
66
|
+
if (result.accountId.toLowerCase() !== expectedAccountId.toLowerCase()) throw new Error("Microsoft 365 Copilot model discovery account mismatch");
|
|
67
|
+
return result.items;
|
|
68
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/** ChatHub selectors adapted from cramt/m365-copilot-proxy, MIT; see adapters/m365-copilot/LICENSE. */
|
|
2
|
+
export const M365_COPILOT_BASE_URL = "https://substrate.office.com/m365Copilot";
|
|
3
|
+
/** Display-only prefix: Microsoft's selector IDs stay the request identity. */
|
|
4
|
+
export const M365_COPILOT_DISPLAY_PREFIX = "M365 Copilot ";
|
|
5
|
+
import { M365_NATIVE_MODEL_ID } from "./m365-copilot-discovery";
|
|
6
|
+
export const M365_COPILOT_MODEL_TONES: Readonly<Record<string, string>> = {
|
|
7
|
+
"m365-copilot": "magic", auto: "magic", quick: "Gpt_5_5_Chat", "think-deeper": "Gpt_5_5_Reasoning",
|
|
8
|
+
claude: "Claude_Sonnet", "claude-sonnet": "Claude_Sonnet", "claude-sonnet-4.5": "Claude_Sonnet",
|
|
9
|
+
"claude-sonnet-4.6": "Claude_Sonnet", "claude-sonnet-5.5": "Claude_Sonnet", "claude-sonnet-5": "Claude_Sonnet_5",
|
|
10
|
+
"claude-sonnet-think-deeper": "Claude_Sonnet_Reasoning", "claude-opus": "Claude_Opus",
|
|
11
|
+
"claude-opus-5": "Claude_Opus", "claude-opus-5.5": "Claude_Opus", "claude-opus-4.8": "Claude_Opus", "claude-opus-4.5": "Claude_Opus",
|
|
12
|
+
"gpt-5.5": "Gpt_5_5_Chat", "gpt-5.5-quick": "Gpt_5_5_Chat", "gpt-5.5-think-deeper": "Gpt_5_5_Reasoning",
|
|
13
|
+
"gpt-5.6": "Gpt_5_6_Chat", "gpt-5.6-quick": "Gpt_5_6_Chat", "gpt-5.6-think-deeper": "Gpt_5_6_Reasoning",
|
|
14
|
+
"gpt-6-think-deeper": "Gpt_6_Reasoning", "gpt-6-sol": "Gpt_6_Sol_Reasoning", "gpt-6.1-sol": "Gpt_61_Sol_Reasoning",
|
|
15
|
+
"gpt-5.4": "Gpt_5_4_Reasoning", "gpt-5.4-think-deeper": "Gpt_5_4_Reasoning", "gpt-5.4-quick": "Gpt_5_4_Chat",
|
|
16
|
+
"gpt-5.3": "Gpt_5_3_Chat", "gpt-5.3-quick": "Gpt_5_3_Chat", "gpt-5.3-think-deeper": "Gpt_5_3_Reasoning",
|
|
17
|
+
"gpt-5.2": "Gpt_5_2_Chat", "gpt-5.2-quick": "Gpt_5_2_Chat", "gpt-5.2-think-deeper": "Gpt_5_2_Reasoning",
|
|
18
|
+
};
|
|
19
|
+
export const M365_COPILOT_MODELS = Object.keys(M365_COPILOT_MODEL_TONES);
|
|
20
|
+
export function getToneForModel(model: string): string {
|
|
21
|
+
if (model.length <= 160 && M365_NATIVE_MODEL_ID.test(model)) return model === "Magic" ? "magic" : model;
|
|
22
|
+
const tone = Object.hasOwn(M365_COPILOT_MODEL_TONES, model) ? M365_COPILOT_MODEL_TONES[model] : undefined;
|
|
23
|
+
if (!tone) throw new Error("Unknown Microsoft 365 Copilot model alias");
|
|
24
|
+
return tone;
|
|
25
|
+
}
|
|
26
|
+
export function isSonnet55Model(model: string): boolean { return model === "claude-sonnet-5.5" || model === "Claude_Sonnet"; }
|
|
27
|
+
const M365_COPILOT_PAID_TONES = new Set(["Claude_Opus", "Claude_Sonnet", "Claude_Sonnet_5", "Gpt_6_Reasoning", "DeepWork"]);
|
|
28
|
+
export function m365CopilotScenario(model: string): { scenario: string; licenseType: string } {
|
|
29
|
+
// Resolve the tone first so aliases and native selector IDs pick the same scenario for the same upstream model.
|
|
30
|
+
return M365_COPILOT_PAID_TONES.has(getToneForModel(model)) ? { scenario: "OfficeWebPaidCopilot", licenseType: "Premium" }
|
|
31
|
+
: { scenario: "OfficeWebIncludedCopilot", licenseType: "Starter" };
|
|
32
|
+
}
|
|
@@ -13,6 +13,8 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
13
13
|
codexToolMode: "none",
|
|
14
14
|
projectContext: "none",
|
|
15
15
|
requestPacing: "nested-models",
|
|
16
|
+
connectTimeoutMs: "none",
|
|
17
|
+
stallTimeoutSec: "none",
|
|
16
18
|
mcpMaxTools: "none",
|
|
17
19
|
mcpMaxSchemaBytes: "none",
|
|
18
20
|
mcpMaxResultBytes: "none",
|
|
@@ -78,6 +80,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
78
80
|
minMaxOutputTokens: "none",
|
|
79
81
|
modelMaxOutputTokens: "record",
|
|
80
82
|
modelCosts: "record",
|
|
83
|
+
creditPriceUsd: "none",
|
|
81
84
|
autoReviewModel: "none",
|
|
82
85
|
autoReviewModelOverrides: "record",
|
|
83
86
|
headers: "none",
|
|
@@ -144,6 +147,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
144
147
|
requiresReasoningPlaceholderModels: "list",
|
|
145
148
|
showThinkingSummary: "none",
|
|
146
149
|
hideRawReasoning: "none",
|
|
150
|
+
rawReasoningAsSummary: "none",
|
|
147
151
|
retryOn429: "none",
|
|
148
152
|
transientRetryOn5xx: "none",
|
|
149
153
|
retryOnReset: "none",
|
|
@@ -154,6 +158,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
154
158
|
thinkingBudgetModels: "list",
|
|
155
159
|
escapeBuiltinToolNames: "none",
|
|
156
160
|
anthropicEofTolerance: "none",
|
|
161
|
+
anthropicImageContextRecovery: "none",
|
|
157
162
|
forwardAdvisorTool: "none",
|
|
158
163
|
perMessageEffort: "none",
|
|
159
164
|
noVisionModels: "list",
|
|
@@ -168,6 +173,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
168
173
|
messagePhaseInference: "none",
|
|
169
174
|
estimateMissingUsage: "none",
|
|
170
175
|
tlsProfile: "none",
|
|
176
|
+
anthropicOAuthUserInstructions: "none",
|
|
171
177
|
} as const satisfies Record<keyof OcxProviderConfig, ModelRenameRole>;
|
|
172
178
|
|
|
173
179
|
function fieldsWithRole(role: ModelRenameRole): string[] {
|