@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
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-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.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
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { TASK } from "./state";
|
|
2
|
+
import { windowsTaskRegistrationMatchesForStop } from "./windows-taskxml";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Keep the registered task and captured IRunningTask objects in one COM session.
|
|
6
|
+
* Send the Unicode XML and caller identity to the existing validator through an ASCII
|
|
7
|
+
* line, then wait for its decision. Only the captured instances can receive Stop().
|
|
8
|
+
*/
|
|
9
|
+
export const WINDOWS_TASK_INSTANCE_STOP_SCRIPT = String.raw`
|
|
10
|
+
$ErrorActionPreference = 'Stop'
|
|
11
|
+
$ProgressPreference = 'SilentlyContinue'
|
|
12
|
+
$PSModuleAutoLoadingPreference = 'None'
|
|
13
|
+
$attempted = $false
|
|
14
|
+
try {
|
|
15
|
+
[Console]::OutputEncoding = [Text.Encoding]::ASCII
|
|
16
|
+
Import-Module ([IO.Path]::Combine($PSHOME,'Modules','Microsoft.PowerShell.Utility','Microsoft.PowerShell.Utility.psd1')) -Force
|
|
17
|
+
$name = '${TASK}'
|
|
18
|
+
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
|
|
19
|
+
$sid = $identity.User.Value
|
|
20
|
+
if (!$sid) { 'unverified-registration'; return }
|
|
21
|
+
$account = $null
|
|
22
|
+
try { $account = $identity.Name } catch { $account = $null } # optional: proof falls back to the SID alone
|
|
23
|
+
$service = Microsoft.PowerShell.Utility\New-Object -ComObject Schedule.Service
|
|
24
|
+
$service.Connect()
|
|
25
|
+
$folder = $service.GetFolder('\')
|
|
26
|
+
$task = $folder.GetTask($name)
|
|
27
|
+
$xml = [string]$task.Xml
|
|
28
|
+
$instances = $task.GetInstances(0)
|
|
29
|
+
if ($null -eq $instances) { 'unverified-registration'; return }
|
|
30
|
+
$verified = @()
|
|
31
|
+
$count = $instances.Count
|
|
32
|
+
if ($null -eq $count) { 'unverified-registration'; return }
|
|
33
|
+
if ($count -gt 0) {
|
|
34
|
+
Import-Module ([IO.Path]::Combine($PSHOME,'Modules','CimCmdlets','CimCmdlets.psd1')) -Force
|
|
35
|
+
}
|
|
36
|
+
for ($index = 1; $index -le $count; $index++) {
|
|
37
|
+
$instance = $instances.Item($index)
|
|
38
|
+
$instance.Refresh()
|
|
39
|
+
$id = [Guid]$instance.InstanceGuid
|
|
40
|
+
$enginePid = [uint32]$instance.EnginePID
|
|
41
|
+
if ($id -eq [Guid]::Empty -or !$enginePid -or $instance.State -ne 4) { 'unverified-registration'; return }
|
|
42
|
+
$engine = CimCmdlets\Get-CimInstance Win32_Process -Filter ('ProcessId = ' + $enginePid) -OperationTimeoutSec 1
|
|
43
|
+
if (!$engine.CreationDate) { 'unverified-registration'; return }
|
|
44
|
+
$owner = CimCmdlets\Invoke-CimMethod -InputObject $engine -MethodName GetOwnerSid -OperationTimeoutSec 1
|
|
45
|
+
$after = CimCmdlets\Get-CimInstance -InputObject $engine -OperationTimeoutSec 1
|
|
46
|
+
if ($owner.ReturnValue -ne 0 -or $owner.Sid -ne $sid -or $after.CreationDate -ne $engine.CreationDate) {
|
|
47
|
+
'unverified-registration'; return
|
|
48
|
+
}
|
|
49
|
+
$verified += @{ Instance = $instance; Id = $id; EnginePid = $enginePid }
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
$proof = Microsoft.PowerShell.Utility\ConvertTo-Json -Compress -InputObject @{ xml = $xml; sid = $sid; name = $account }
|
|
53
|
+
$utf8 = [Text.UTF8Encoding]::new($false, $true)
|
|
54
|
+
[Console]::WriteLine([Convert]::ToBase64String($utf8.GetBytes($proof)))
|
|
55
|
+
if ([Console]::ReadLine() -cne 'stop') { 'unverified-registration'; return }
|
|
56
|
+
|
|
57
|
+
# Resolve the path afresh only to detect a changed registration. It is never a stop target.
|
|
58
|
+
$current = $folder.GetTask($name)
|
|
59
|
+
if (![string]::Equals($xml, [string]$current.Xml, [StringComparison]::Ordinal)) { 'unverified-registration'; return }
|
|
60
|
+
if ($count -eq 0) {
|
|
61
|
+
# Ready or disabled; an empty collection can also mean instances were hidden by ACLs.
|
|
62
|
+
if ($current.State -in @(1, 3)) { 'not-running' } else { 'unverified-registration' }
|
|
63
|
+
return
|
|
64
|
+
}
|
|
65
|
+
foreach ($target in $verified) {
|
|
66
|
+
$target.Instance.Refresh()
|
|
67
|
+
if ([Guid]$target.Instance.InstanceGuid -ne $target.Id -or
|
|
68
|
+
$target.Instance.EnginePID -ne $target.EnginePid -or $target.Instance.State -ne 4) {
|
|
69
|
+
'unverified-registration'; return
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
foreach ($target in $verified) {
|
|
73
|
+
$attempted = $true
|
|
74
|
+
$target.Instance.Stop()
|
|
75
|
+
}
|
|
76
|
+
'ended'
|
|
77
|
+
} catch {
|
|
78
|
+
for ($cause = $_.Exception; $null -ne $cause; $cause = $cause.InnerException) {
|
|
79
|
+
if ($cause.HResult -eq -2147024891) { 'denied'; return } # E_ACCESSDENIED
|
|
80
|
+
}
|
|
81
|
+
if ($attempted) { 'failed' } else { 'unverified-registration' }
|
|
82
|
+
}
|
|
83
|
+
`;
|
|
84
|
+
|
|
85
|
+
/** Compare exactly against the existing XML policy, using the same helper's Windows token. */
|
|
86
|
+
export function verifyWindowsTaskStopProof(line: string, launcher: string): boolean {
|
|
87
|
+
try {
|
|
88
|
+
const bytes = Buffer.from(line, "base64");
|
|
89
|
+
if (bytes.toString("base64") !== line) return false;
|
|
90
|
+
const proof = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
|
|
91
|
+
if (typeof proof.xml !== "string" || typeof proof.sid !== "string"
|
|
92
|
+
|| !/^S-1-(?:5-21|12-1)(?:-\d{1,10}){4}$/i.test(proof.sid)) return false;
|
|
93
|
+
const userIds = typeof proof.name === "string" && proof.name.trim() ? [proof.sid, proof.name] : [proof.sid];
|
|
94
|
+
return windowsTaskRegistrationMatchesForStop(proof.xml, launcher, userIds);
|
|
95
|
+
} catch {
|
|
96
|
+
return false;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
@@ -518,11 +518,21 @@ export function windowsTaskHasSessionRecoveryTriggers(
|
|
|
518
518
|
scoped.some(element =>
|
|
519
519
|
taskXmlDecodedValueEquals(element, "StateChange", stateChange)
|
|
520
520
|
&& taskXmlOptionalValueEquals(element, "Enabled", "true")
|
|
521
|
-
&&
|
|
521
|
+
&& windowsTaskUserIdMatches(element, expectedUserId)));
|
|
522
|
+
}
|
|
523
|
+
|
|
524
|
+
/** Verify the exported run-as user. Trigger scopes do not identify the task principal. */
|
|
525
|
+
export function windowsTaskPrincipalMatches(xml: string, expectedUserIds: readonly string[]): boolean {
|
|
526
|
+
const scrubbed = taskXmlWithoutCommentsAndCdata(xml);
|
|
527
|
+
if (taskXmlHasPrefixedTag(scrubbed, "Principals") || taskXmlElementCount(scrubbed, "Principals") !== 1
|
|
528
|
+
|| taskXmlHasPrefixedTag(scrubbed, "Principal") || taskXmlElementCount(scrubbed, "Principal") !== 1) return false;
|
|
529
|
+
const principal = taskXmlSection(taskXmlSection(scrubbed, "Principals"), "Principal");
|
|
530
|
+
return taskXmlElementCount(principal, "GroupId") === 0 && !taskXmlHasPrefixedTag(principal, "GroupId")
|
|
531
|
+
&& windowsTaskUserIdMatches(principal, expectedUserIds);
|
|
522
532
|
}
|
|
523
533
|
|
|
524
534
|
/**
|
|
525
|
-
* A trigger
|
|
535
|
+
* A principal or trigger names the expected account only when its UserId matches exactly.
|
|
526
536
|
*
|
|
527
537
|
* An unscoped recovery trigger is not identity proof. Production registration resolves a SID
|
|
528
538
|
* before writing XML; a missing scope therefore means the fixed-name task is legacy or foreign
|
|
@@ -530,7 +540,7 @@ export function windowsTaskHasSessionRecoveryTriggers(
|
|
|
530
540
|
* Treating an unknown expected identity as a wildcard would let a fresh status process accept a
|
|
531
541
|
* task bound to another user's session and suppress the repair that should replace it.
|
|
532
542
|
*/
|
|
533
|
-
function
|
|
543
|
+
function windowsTaskUserIdMatches(
|
|
534
544
|
element: string,
|
|
535
545
|
expectedUserId: ExpectedWindowsTaskUserId | undefined,
|
|
536
546
|
): boolean {
|
|
@@ -557,7 +567,7 @@ function windowsTaskRegistrationBaseHealthy(
|
|
|
557
567
|
xml: string,
|
|
558
568
|
wscript = windowsWscript(),
|
|
559
569
|
launcher = windowsLauncherVbsPath(),
|
|
560
|
-
allowLossyPaths = true,
|
|
570
|
+
{ allowLossyPaths = true, allowDisabled = false }: { allowLossyPaths?: boolean; allowDisabled?: boolean } = {},
|
|
561
571
|
): boolean {
|
|
562
572
|
const scrubbed = taskXmlWithoutCommentsAndCdata(xml);
|
|
563
573
|
// taskXmlSection() takes the FIRST match and the schema allows arbitrary XML under
|
|
@@ -575,7 +585,8 @@ function windowsTaskRegistrationBaseHealthy(
|
|
|
575
585
|
&& taskXmlOptionalValueEquals(trigger, "Enabled", "true")
|
|
576
586
|
&& /<LogonType>\s*InteractiveToken\s*<\/LogonType>/i.test(principal)
|
|
577
587
|
&& taskXmlRunLevelAcceptable(principal)
|
|
578
|
-
&& taskXmlOptionalValueEquals(settings, "Enabled", "true")
|
|
588
|
+
&& (taskXmlOptionalValueEquals(settings, "Enabled", "true")
|
|
589
|
+
|| (allowDisabled && taskXmlDecodedValueEquals(settings, "Enabled", "false")))
|
|
579
590
|
&& /<MultipleInstancesPolicy>\s*IgnoreNew\s*<\/MultipleInstancesPolicy>/i.test(settings)
|
|
580
591
|
&& /<ExecutionTimeLimit>\s*PT0S\s*<\/ExecutionTimeLimit>/i.test(settings)
|
|
581
592
|
// Compare decoded VALUES, not encodings: Task Scheduler canonicalizes the
|
|
@@ -617,11 +628,23 @@ export function windowsTaskRegistrationRefreshableLegacy(
|
|
|
617
628
|
): boolean {
|
|
618
629
|
const scrubbed = taskXmlWithoutCommentsAndCdata(xml);
|
|
619
630
|
const triggers = taskXmlSection(scrubbed, "Triggers");
|
|
620
|
-
return windowsTaskRegistrationBaseHealthy(xml, wscript, launcher, false)
|
|
621
|
-
&&
|
|
631
|
+
return windowsTaskRegistrationBaseHealthy(xml, wscript, launcher, { allowLossyPaths: false })
|
|
632
|
+
&& windowsTaskHasNoSessionRecoveryTriggers(triggers);
|
|
633
|
+
}
|
|
634
|
+
|
|
635
|
+
function windowsTaskHasNoSessionRecoveryTriggers(triggers: string): boolean {
|
|
636
|
+
return taskXmlElementCount(triggers, "SessionStateChangeTrigger") === 0
|
|
622
637
|
&& !taskXmlHasPrefixedTag(triggers, "SessionStateChangeTrigger");
|
|
623
638
|
}
|
|
624
639
|
|
|
640
|
+
/** Stop accepts either recognized shape, including a disabled task, with exact ownership. */
|
|
641
|
+
export function windowsTaskRegistrationMatchesForStop(xml: string, launcher: string, userIds: readonly string[]): boolean {
|
|
642
|
+
if (!windowsTaskRegistrationBaseHealthy(xml, windowsWscript(), launcher, { allowLossyPaths: false, allowDisabled: true })
|
|
643
|
+
|| !windowsTaskPrincipalMatches(xml, userIds)) return false;
|
|
644
|
+
const triggers = taskXmlSection(taskXmlWithoutCommentsAndCdata(xml), "Triggers");
|
|
645
|
+
return windowsTaskHasSessionRecoveryTriggers(triggers, userIds) || windowsTaskHasNoSessionRecoveryTriggers(triggers);
|
|
646
|
+
}
|
|
647
|
+
|
|
625
648
|
export interface WindowsSchedulerXmlState {
|
|
626
649
|
installed: boolean;
|
|
627
650
|
enabled: boolean;
|
|
@@ -72,7 +72,7 @@ export async function fetchAnthropicHelper(
|
|
|
72
72
|
const writer = captureConfigGeneration();
|
|
73
73
|
const response = await fetch(url, init);
|
|
74
74
|
if (anthropicPhysicalSendOwnershipIsCurrent(owner)) {
|
|
75
|
-
recordAnthropicAccountQuotaFromHeadersForInstance(instance,
|
|
75
|
+
recordAnthropicAccountQuotaFromHeadersForInstance(instance, owner.accountId, response.headers, writer, response.status, model, owner.generation, owner.credentialKey);
|
|
76
76
|
bindAnthropicRefusalCredentialForSend(response, owner);
|
|
77
77
|
}
|
|
78
78
|
return response;
|
package/src/stall-timeout.ts
CHANGED
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
export const DEFAULT_STALL_TIMEOUT_SEC = 300;
|
|
2
2
|
|
|
3
|
+
/** The provider fields that may narrow or widen the global upstream budgets. */
|
|
4
|
+
export interface ProviderTimeoutOverrides {
|
|
5
|
+
connectTimeoutMs?: number;
|
|
6
|
+
stallTimeoutSec?: number;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
function providerBudget(value: number | undefined): number | undefined {
|
|
10
|
+
return typeof value === "number" && Number.isFinite(value) ? value : undefined;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* The configured header budget for a routed provider: the provider's own `connectTimeoutMs` when
|
|
15
|
+
* set (including `0`, which disables it for that provider), otherwise the global value. Pass the
|
|
16
|
+
* result to {@link resolveConnectTimeoutMs}, which still owns the local/public default.
|
|
17
|
+
*/
|
|
18
|
+
export function providerConnectTimeoutMs(
|
|
19
|
+
config: { connectTimeoutMs?: number },
|
|
20
|
+
provider: ProviderTimeoutOverrides | undefined,
|
|
21
|
+
): number | undefined {
|
|
22
|
+
return providerBudget(provider?.connectTimeoutMs) ?? config.connectTimeoutMs;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** The configured stall budget for a routed provider; see {@link providerConnectTimeoutMs}. */
|
|
26
|
+
export function providerStallTimeoutSec(
|
|
27
|
+
config: { stallTimeoutSec?: number },
|
|
28
|
+
provider: ProviderTimeoutOverrides | undefined,
|
|
29
|
+
): number | undefined {
|
|
30
|
+
return providerBudget(provider?.stallTimeoutSec) ?? config.stallTimeoutSec;
|
|
31
|
+
}
|
|
32
|
+
|
|
3
33
|
/**
|
|
4
34
|
* How the configured stall budget should be resolved for a request.
|
|
5
35
|
*
|
|
@@ -265,9 +265,12 @@ export function createDailyTelemetryAccumulator(day: string): DailyTelemetryAccu
|
|
|
265
265
|
errors[cause as TelemetryFailureCause] = (errors[cause as TelemetryFailureCause] ?? 0) + 1;
|
|
266
266
|
}
|
|
267
267
|
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
268
|
+
const attempts = entry.attempts;
|
|
269
|
+
const isCombo = entry.provider === "combo";
|
|
270
|
+
if (attempts?.length && (isCombo || attempts.some(attempt => attempt.usage
|
|
271
|
+
&& (attempt.provider !== entry.provider || attempt.model !== entry.model)))) {
|
|
272
|
+
for (const attempt of attempts) {
|
|
273
|
+
if (isCombo || attempt.usage) addModelAttribution(attempt.provider, attempt.model, attempt.usage);
|
|
271
274
|
}
|
|
272
275
|
} else {
|
|
273
276
|
addModelAttribution(entry.provider, entry.model, entry.usage);
|
|
@@ -7,8 +7,26 @@ export interface AccountPauseDetails {
|
|
|
7
7
|
reason: AccountPauseReason;
|
|
8
8
|
pausedAt: number;
|
|
9
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* What convicted an automatically paused account, stored beside `pauseDetails` rather than inside
|
|
12
|
+
* it: builds that predate this field read `pauseDetails` with a strict schema and would otherwise
|
|
13
|
+
* drop the whole record, reason and timestamp included.
|
|
14
|
+
*/
|
|
15
|
+
export interface AccountPauseEvidence {
|
|
16
|
+
/** HTTP status of the refusal that convicted the account. */
|
|
17
|
+
statusCode: number;
|
|
18
|
+
/** Display-safe upstream message (whitespace collapsed, redacted, at most 300 characters). */
|
|
19
|
+
message?: string;
|
|
20
|
+
/** Validated HTTPS URL supplied with a conclusive first-party Cloud Code Assist ban. */
|
|
21
|
+
appealUrl?: string;
|
|
22
|
+
/** Short, plain vendor label for the validated appeal link. */
|
|
23
|
+
appealText?: string;
|
|
24
|
+
}
|
|
10
25
|
export interface AccountAutoPausePolicy {
|
|
11
|
-
/**
|
|
26
|
+
/**
|
|
27
|
+
* Explicit opt-in to pause on any permanent account refusal. With no policy at all, only a Cloud
|
|
28
|
+
* Code Assist provider pauses, on the first Terms of Service account ban. `false` opts out of both.
|
|
29
|
+
*/
|
|
12
30
|
enabled?: boolean;
|
|
13
31
|
/** Consecutive permanent refusals; defaults to 2. */
|
|
14
32
|
consecutiveFailures?: number;
|
package/src/types/accounts.ts
CHANGED
|
@@ -59,3 +59,24 @@ export interface CodexAccountCredentialRecord {
|
|
|
59
59
|
*/
|
|
60
60
|
lastCodexValidationTerminal?: boolean;
|
|
61
61
|
}
|
|
62
|
+
|
|
63
|
+
/** `codexAuthMethod`: "auto" keeps the caller's choice; "device-only" forces the device grant. */
|
|
64
|
+
export type CodexAuthMethod = "auto" | "device-only";
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Codex pool login settings of `OcxConfig`, kept here because `config.ts` sits at its
|
|
68
|
+
* file-size cap.
|
|
69
|
+
*/
|
|
70
|
+
export interface CodexAccountLoginConfig {
|
|
71
|
+
/**
|
|
72
|
+
* How Codex (ChatGPT) pool account logins authorize.
|
|
73
|
+
*
|
|
74
|
+
* Absent and `"auto"` keep the historical behavior: a browser login with a
|
|
75
|
+
* localhost callback unless the caller explicitly asks for the device grant.
|
|
76
|
+
* `"device-only"` makes every pool add and reauthentication use the device
|
|
77
|
+
* grant, whatever the dashboard or CLI requested, so a headless hub never
|
|
78
|
+
* starts a localhost callback listener. Same-account checks for
|
|
79
|
+
* reauthentication are unchanged, and other providers are not affected.
|
|
80
|
+
*/
|
|
81
|
+
codexAuthMethod?: CodexAuthMethod;
|
|
82
|
+
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Leaf module: `config.ts` and `provider.ts` import these types, never the reverse.
|
|
7
7
|
*/
|
|
8
|
-
export type OcxAccountPoolRotationStrategy = "quota" | "round-robin" | "fill-first";
|
|
8
|
+
export type OcxAccountPoolRotationStrategy = "quota" | "round-robin" | "fill-first" | "reset-near-weighted";
|
|
9
9
|
|
|
10
10
|
export type OcxAccountPoolQuotaWindow = "five-hour" | "weekly" | "max-utilization";
|
|
11
11
|
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How a combo turns its members' capabilities into one catalog row (`capabilityPolicy`).
|
|
3
|
+
*
|
|
4
|
+
* `intersection` (default) advertises only what every member can serve as is: one text-only
|
|
5
|
+
* member removes image input, and the effort ladders intersect. `union` advertises what any
|
|
6
|
+
* member can serve, then picks per request: a member that can serve the request after a local
|
|
7
|
+
* degradation (vision sidecar describes the image, or effort snaps to a supported rung) can
|
|
8
|
+
* stay eligible. The catalog publishes the minimum context window for both policies. A
|
|
9
|
+
* degrading union can try the largest compatible window at dispatch. It publishes the minimum
|
|
10
|
+
* max output when every member declares one.
|
|
11
|
+
*/
|
|
12
|
+
export type OcxComboCapabilityPolicy = "intersection" | "union";
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* What a `union` combo does when no enabled member can serve the request (`onUnservable`).
|
|
16
|
+
* `degrade` (default) tries the largest compatible window for context or omits unservable images.
|
|
17
|
+
* `reject` answers 400 before dispatch in those cases. Both policies refuse unsupported audio.
|
|
18
|
+
*/
|
|
19
|
+
export type OcxComboOnUnservable = "degrade" | "reject";
|
package/src/types/config.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { OcxProviderConfig } from "./provider";
|
|
2
|
-
import type { CodexAccount } from "./accounts";
|
|
2
|
+
import type { CodexAccount, CodexAccountLoginConfig } from "./accounts";
|
|
3
3
|
import type { AnthropicAccountPoolConfig, OcxAccountPoolRotationStrategy } from "./anthropic-account-pool";
|
|
4
4
|
import type { AnthropicInstanceId } from "../providers/anthropic-instance-id";
|
|
5
5
|
import type { OcxFallbackConfig } from "./fallback";
|
|
@@ -48,6 +48,8 @@ export interface OcxProtocolsConfig {
|
|
|
48
48
|
* answered through the direct encoders, with no internal Responses body in either direction.
|
|
49
49
|
*/
|
|
50
50
|
antigravityDirect?: boolean;
|
|
51
|
+
/** Preserve native Gemini payloads for concrete Antigravity OAuth routes on /v1beta. Default off. */
|
|
52
|
+
geminiNativeAntigravity?: boolean;
|
|
51
53
|
/** Compare the dispatch plan with the observed path; never sends a second request. */
|
|
52
54
|
shadowPlan?: boolean;
|
|
53
55
|
};
|
|
@@ -530,7 +532,7 @@ export interface OcxClientConnectionConfig {
|
|
|
530
532
|
};
|
|
531
533
|
}
|
|
532
534
|
|
|
533
|
-
export interface OcxConfig extends OcxLinkHomeConfig {
|
|
535
|
+
export interface OcxConfig extends OcxLinkHomeConfig, CodexAccountLoginConfig {
|
|
534
536
|
/** Experimental macOS app-server stdout shim; absent or false disables it. */
|
|
535
537
|
chatgptDesktop?: { appServerShim?: boolean };
|
|
536
538
|
port: number;
|
|
@@ -679,6 +681,13 @@ export interface OcxConfig extends OcxLinkHomeConfig {
|
|
|
679
681
|
googleAntigravityStaticCatalogVersion?: 1 | 2;
|
|
680
682
|
/** Claude Code inbound + launcher settings. */
|
|
681
683
|
claudeCode?: OcxClaudeCodeConfig;
|
|
684
|
+
/** Opt-in weekly reserve for explicitly marked caller-forward Claude subscription turns. */
|
|
685
|
+
subscriptionReserve?: {
|
|
686
|
+
enabled?: boolean;
|
|
687
|
+
soft?: number;
|
|
688
|
+
hard?: number;
|
|
689
|
+
targets?: string[];
|
|
690
|
+
};
|
|
682
691
|
/**
|
|
683
692
|
* Which public inference APIs this proxy serves. Read only through
|
|
684
693
|
* `resolveApiSurfaceSettings` in `src/protocols/settings.ts`, which fails closed on a
|
|
@@ -795,6 +804,11 @@ export interface OcxConfig extends OcxLinkHomeConfig {
|
|
|
795
804
|
* would silently hide every future model behind a switch nobody knew to flip.
|
|
796
805
|
*/
|
|
797
806
|
grokExcludedModels?: string[];
|
|
807
|
+
/**
|
|
808
|
+
* Provider names the dashboard's suggested combos leave out (Combos page). View-only:
|
|
809
|
+
* existing combos that name one keep routing to it.
|
|
810
|
+
*/
|
|
811
|
+
comboSuggestionExcludedProviders?: string[];
|
|
798
812
|
/**
|
|
799
813
|
* When true, OpenAI-routed requests include `service_tier: "priority"` (fast inference).
|
|
800
814
|
* When false, service_tier is stripped so requests use default speed.
|
|
@@ -1340,6 +1354,8 @@ export interface OcxConfig extends OcxLinkHomeConfig {
|
|
|
1340
1354
|
codexPinnedTransientPolicy?: "hold" | "detour-new-threads";
|
|
1341
1355
|
/** Opt-in: retain one Codex WebSocket per account and thread across turns. Default off. */
|
|
1342
1356
|
codexWsReuseAcrossTurns?: boolean;
|
|
1357
|
+
/** Opt-in native WS upload deltas; implies cross-turn reuse. Default off. */
|
|
1358
|
+
codexWsIncrementalUpload?: boolean;
|
|
1343
1359
|
/**
|
|
1344
1360
|
* Opt-in provider-origin circuit threshold for proven pre-connection reachability failures.
|
|
1345
1361
|
* Default 0 (disabled); range 0..20. The circuit never counts timeouts or HTTP responses.
|
|
@@ -1363,6 +1379,8 @@ export interface OcxConfig extends OcxLinkHomeConfig {
|
|
|
1363
1379
|
* and every other destination are unchanged. Compression runs synchronously on the event loop.
|
|
1364
1380
|
*/
|
|
1365
1381
|
upstreamRequestCompression?: "off" | "gzip" | "zstd";
|
|
1382
|
+
/** Optional lossy shortening of historical native Codex images/tool text. */
|
|
1383
|
+
upstreamHistorySlim?: "off" | "codex";
|
|
1366
1384
|
/**
|
|
1367
1385
|
* Opt-in ceiling, in bytes, on a decompressed INBOUND data-plane request body (#3573).
|
|
1368
1386
|
*
|
|
@@ -1537,6 +1555,8 @@ export interface OcxComboConfig {
|
|
|
1537
1555
|
*/
|
|
1538
1556
|
reasoningEffortMode?: OcxComboReasoningEffortMode;
|
|
1539
1557
|
jevEffortMode?: import("./combo-jev-effort-mode").OcxComboJevEffortMode; // wire-effort owner on a `jev` combo; omitted = "decide"
|
|
1558
|
+
capabilityPolicy?: import("./combo-capability-policy").OcxComboCapabilityPolicy; // omitted = "intersection"
|
|
1559
|
+
onUnservable?: import("./combo-capability-policy").OcxComboOnUnservable; // `union` only; omitted = "degrade"
|
|
1540
1560
|
/**
|
|
1541
1561
|
* Disable image input even when every target supports it.
|
|
1542
1562
|
* Omitted / `"auto"` keeps automatic capability derivation (default: enabled when
|
package/src/types/provider.ts
CHANGED
|
@@ -75,14 +75,14 @@ export interface ResponsesItemIdRepairConfig {
|
|
|
75
75
|
* Opt-in retry for pre-stream transient upstream statuses (500/502/503/504/520/521/522) on
|
|
76
76
|
* `providers.<name>.transientRetryOn5xx`.
|
|
77
77
|
*
|
|
78
|
-
*
|
|
79
|
-
* `retryOn429`, which handles rate limiting
|
|
78
|
+
* An object opts in for supported key-auth adapters. Canonical ChatGPT forward auth
|
|
79
|
+
* requires an explicit send total. Separate from `retryOn429`, which handles rate limiting.
|
|
80
80
|
*/
|
|
81
81
|
export interface TransientRetryPolicy {
|
|
82
|
-
/** Master switch
|
|
82
|
+
/** Master switch for a qualifying policy (default true). */
|
|
83
83
|
enabled?: boolean;
|
|
84
84
|
/**
|
|
85
|
-
*
|
|
85
|
+
* Total upstream sends allowed for one request, including the first (1..10, key-auth default 3).
|
|
86
86
|
*
|
|
87
87
|
* Not a per-layer retry count: the connection-reset and transient-status recovery layers
|
|
88
88
|
* share this single budget, so `3` means at most three real requests reach the provider.
|
|
@@ -353,6 +353,21 @@ export interface OcxProviderConfig {
|
|
|
353
353
|
codexToolMode?: "code_mode_only" | "shell";
|
|
354
354
|
/** Optional outbound request-start pacing shared by this provider and its model overrides. */
|
|
355
355
|
requestPacing?: ProviderRequestPacingConfig;
|
|
356
|
+
/**
|
|
357
|
+
* Per-provider override of the global `connectTimeoutMs` (response-header arrival deadline) for
|
|
358
|
+
* routed HTTP adapter sends, including routed model sends in the image/video and web-search
|
|
359
|
+
* bridges. A runTurn owns its transport and uses adapter-specific deadlines.
|
|
360
|
+
* A positive value applies verbatim, `0` disables the header deadline on covered paths,
|
|
361
|
+
* and an omitted value inherits the global setting.
|
|
362
|
+
*/
|
|
363
|
+
connectTimeoutMs?: number;
|
|
364
|
+
/**
|
|
365
|
+
* Per-provider override of the global `stallTimeoutSec` for routed HTTP responses, streaming runTurn
|
|
366
|
+
* delivery, and inactivity in the image/video bridge. A positive value sets the inactivity budget,
|
|
367
|
+
* `0` disables it on covered paths, and an omitted value inherits the global setting.
|
|
368
|
+
* The web-search plan also uses the setting to size its independent bridge watchdog.
|
|
369
|
+
*/
|
|
370
|
+
stallTimeoutSec?: number;
|
|
356
371
|
/** Cursor MCP compatibility bounds; positive integers when configured. */
|
|
357
372
|
mcpMaxTools?: number;
|
|
358
373
|
mcpMaxSchemaBytes?: number;
|
|
@@ -613,13 +628,19 @@ export interface OcxProviderConfig {
|
|
|
613
628
|
* `Authorization: Bearer <key>` instead.
|
|
614
629
|
*/
|
|
615
630
|
apiKeyTransport?: "x-api-key" | "bearer";
|
|
631
|
+
/** Opt-in translated OAuth compatibility: move caller system instructions to user content,
|
|
632
|
+
* losing system-role precedence. Default false; API-key and native passthrough are unchanged. */
|
|
633
|
+
anthropicOAuthUserInstructions?: boolean;
|
|
616
634
|
/**
|
|
617
635
|
* Multi-key pool (API-key twin of OAuth multiauth). `apiKey` always mirrors the ACTIVE
|
|
618
636
|
* entry so routing stays single-key; managed via /api/providers/keys. A legacy bare
|
|
619
637
|
* `apiKey` seeds a one-entry pool on first management touch.
|
|
620
638
|
*/
|
|
621
639
|
apiKeyPool?: Array<{ id: string; key: string; label?: string; addedAt?: number; disabled?: boolean; pauseDetails?: AccountPauseDetails; pauseRevision?: string }>;
|
|
622
|
-
/**
|
|
640
|
+
/**
|
|
641
|
+
* Permanent account refusal policy. Explicit opt-in; with no key at all, a Cloud Code Assist
|
|
642
|
+
* provider still pauses on the first Terms of Service account ban (see `effectiveAccountAutoPause`).
|
|
643
|
+
*/
|
|
623
644
|
accountAutoPause?: AccountAutoPausePolicy;
|
|
624
645
|
/**
|
|
625
646
|
* Optional proactive ordering for `apiKeyPool` when the committed key is already
|
|
@@ -751,6 +772,11 @@ export interface OcxProviderConfig {
|
|
|
751
772
|
* all-zero entry means "not billable here" and falls through to the catalogs.
|
|
752
773
|
*/
|
|
753
774
|
modelCosts?: Record<string, ProviderCostOverlay>;
|
|
775
|
+
/**
|
|
776
|
+
* USD per provider credit (for example Kiro credits). For a model with a matched token price
|
|
777
|
+
* and a valid `providerCredits` reading, the estimate uses credits × this price.
|
|
778
|
+
*/
|
|
779
|
+
creditPriceUsd?: number;
|
|
754
780
|
/**
|
|
755
781
|
* Provider-wide auto-review (approval) model for routed models of this provider.
|
|
756
782
|
*
|
|
@@ -1137,7 +1163,7 @@ export interface OcxProviderConfig {
|
|
|
1137
1163
|
/**
|
|
1138
1164
|
* Default to displaying provider-authored summaries when Responses summary is omitted.
|
|
1139
1165
|
* Explicit wire summary:"none" wins; false disables a seeded provider default.
|
|
1140
|
-
* Raw reasoning is
|
|
1166
|
+
* Raw reasoning is controlled separately by rawReasoningAsSummary.
|
|
1141
1167
|
*/
|
|
1142
1168
|
showThinkingSummary?: boolean;
|
|
1143
1169
|
/**
|
|
@@ -1148,6 +1174,12 @@ export interface OcxProviderConfig {
|
|
|
1148
1174
|
* envelope; direct Chat/Messages encoders send no copy and replay from the server-side cache.
|
|
1149
1175
|
*/
|
|
1150
1176
|
hideRawReasoning?: boolean;
|
|
1177
|
+
/**
|
|
1178
|
+
* Default-off Chat-to-Responses display compatibility: expose raw reasoning on the summary
|
|
1179
|
+
* channel, verbatim (not a generated summary). hideRawReasoning and wire summary:"none" win.
|
|
1180
|
+
* Native Responses passthrough and direct Chat/Messages delivery are unchanged.
|
|
1181
|
+
*/
|
|
1182
|
+
rawReasoningAsSummary?: boolean;
|
|
1151
1183
|
/**
|
|
1152
1184
|
* Opt-in same-target 429 retry policy. Codex itself never retries 429 (it retries 5xx only,
|
|
1153
1185
|
* openai/codex#30471), and single-key pools have no failover, so the proxy waits and replays
|
|
@@ -1157,8 +1189,8 @@ export interface OcxProviderConfig {
|
|
|
1157
1189
|
retryOn429?: RateLimitRetryPolicy;
|
|
1158
1190
|
/**
|
|
1159
1191
|
* Opt-in retry for pre-stream transient upstream statuses
|
|
1160
|
-
* (`providers.<name>.transientRetryOn5xx`).
|
|
1161
|
-
*
|
|
1192
|
+
* (`providers.<name>.transientRetryOn5xx`). A bare `{}` opts in with defaults on supported
|
|
1193
|
+
* key-auth OpenAI adapters. Canonical ChatGPT forward providers require explicit `attempts`.
|
|
1162
1194
|
*/
|
|
1163
1195
|
transientRetryOn5xx?: TransientRetryPolicy;
|
|
1164
1196
|
/**
|
|
@@ -1211,6 +1243,8 @@ export interface OcxProviderConfig {
|
|
|
1211
1243
|
* other EOFs remain truncation errors. Absent = strict default behavior.
|
|
1212
1244
|
*/
|
|
1213
1245
|
anthropicEofTolerance?: boolean;
|
|
1246
|
+
/** Opt in to one owner-bound image-context recovery after an upstream 413. */
|
|
1247
|
+
anthropicImageContextRecovery?: boolean;
|
|
1214
1248
|
/**
|
|
1215
1249
|
* Claude Code's typed Advisor server tool (`advisor_20260301`) on the translated Messages lane.
|
|
1216
1250
|
* Absent: forwarded only to an `anthropic`-adapter provider on first-party `api.anthropic.com`.
|
package/src/types/request.ts
CHANGED
|
@@ -70,6 +70,8 @@ export interface OcxParsedRequest {
|
|
|
70
70
|
_rawBody?: unknown;
|
|
71
71
|
/** Trusted ingress provenance: preserve Chat's tool defaults only on the final Responses wire. */
|
|
72
72
|
_chatCompletionsInput?: boolean;
|
|
73
|
+
/** Server-owned request provenance. All system text on this turn belongs at system priority. */
|
|
74
|
+
_proxyOwnedSystemPrompt?: true;
|
|
73
75
|
/** Claude replay tags, retained only until each route binding verifies them. */
|
|
74
76
|
_nativeReasoningReplay?: ReadonlyMap<string, string>;
|
|
75
77
|
_nativeReasoningBoundOwner?: NativeReasoningOwner;
|
|
@@ -172,6 +174,10 @@ export interface OcxParsedRequest {
|
|
|
172
174
|
_providerContinuationCandidate?: OcxProviderContinuationState;
|
|
173
175
|
/** Exact process-local route owner attached to newly persisted provider state. */
|
|
174
176
|
_providerContinuationOwner?: OcxProviderContinuationOwner;
|
|
177
|
+
/** Serving owner of image history that was summarized within this request. */
|
|
178
|
+
_anthropicImageOwner?: OcxProviderContinuationOwner;
|
|
179
|
+
/** Internal image recovery summary that must bypass native adaptive thinking defaults. */
|
|
180
|
+
_anthropicImageSummary?: true;
|
|
175
181
|
/**
|
|
176
182
|
* The hosted `{type:"web_search", ...}` tool config, stashed when Codex enables web search. Routed
|
|
177
183
|
* (non-OpenAI) providers can't run it server-side, so the proxy re-exposes it as a function tool and
|
|
@@ -248,6 +254,9 @@ export interface OcxParsedRequest {
|
|
|
248
254
|
|
|
249
255
|
export interface OcxContext {
|
|
250
256
|
systemPrompt?: string[];
|
|
257
|
+
/** Proxy-authored suffixes in systemPrompt (including any joining separator). Keeping their
|
|
258
|
+
* provenance lets adapters relocate caller text while preserving the original system layout. */
|
|
259
|
+
proxySystemPrompt?: { blockIndex: number; suffix: string }[];
|
|
251
260
|
messages: OcxMessage[];
|
|
252
261
|
tools?: OcxTool[];
|
|
253
262
|
}
|
|
@@ -417,6 +426,10 @@ export interface OcxRequestOptions {
|
|
|
417
426
|
topP?: number;
|
|
418
427
|
stopSequences?: string[];
|
|
419
428
|
toolChoice?: OcxToolChoice;
|
|
429
|
+
/** Root functions explicitly selected by the caller. An empty list permits no synthetic root function. */
|
|
430
|
+
explicitRootFunctionChoices?: readonly string[];
|
|
431
|
+
/** Caller-owned function and custom selectors before hosted tools are lowered for the provider. */
|
|
432
|
+
explicitClientToolChoices?: readonly { type: "function" | "custom"; name: string; namespace?: string }[];
|
|
420
433
|
parallelToolCalls?: boolean;
|
|
421
434
|
reasoning?: string;
|
|
422
435
|
/**
|
|
@@ -427,6 +440,8 @@ export interface OcxRequestOptions {
|
|
|
427
440
|
hideThinkingSummary?: boolean;
|
|
428
441
|
/** Provider policy: suppress raw content-channel reasoning while summaries stay visible. */
|
|
429
442
|
hideRawReasoning?: boolean;
|
|
443
|
+
/** Final-route Chat-to-Responses display compatibility, off unless explicitly enabled. */
|
|
444
|
+
rawReasoningAsSummary?: boolean;
|
|
430
445
|
serviceTier?: string;
|
|
431
446
|
/** Final outbound tier action, resolved after the provider/model wire is settled. */
|
|
432
447
|
tierDecision?: TierDecision;
|
package/src/types/tools.ts
CHANGED
|
@@ -367,7 +367,10 @@ function toolAllowedByChoiceFromIndex(
|
|
|
367
367
|
return false;
|
|
368
368
|
}
|
|
369
369
|
|
|
370
|
-
export function resolveToolChoiceWireName(
|
|
370
|
+
export function resolveToolChoiceWireName(
|
|
371
|
+
tools: readonly ToolIdentity[] | undefined, name: string, choice?: OcxToolChoice,
|
|
372
|
+
): string {
|
|
373
|
+
if (isQualifiedToolChoiceName(choice, name)) return name;
|
|
371
374
|
const candidates = toolChoiceCandidates(tools, name);
|
|
372
375
|
if (candidates.length === 1) {
|
|
373
376
|
const match = candidates[0];
|
|
@@ -390,17 +393,26 @@ export function modelInList(list: string[] | undefined, modelId: string): boolea
|
|
|
390
393
|
return colon > 0 && list.includes(modelId.slice(0, colon));
|
|
391
394
|
}
|
|
392
395
|
|
|
396
|
+
interface QualifiedToolChoices {
|
|
397
|
+
/** Canonical wire names already resolved from explicit namespace and name coordinates. */
|
|
398
|
+
qualifiedToolNames?: readonly string[];
|
|
399
|
+
}
|
|
400
|
+
|
|
393
401
|
export type OcxToolChoice =
|
|
394
402
|
| "auto"
|
|
395
403
|
| "none"
|
|
396
404
|
| "required"
|
|
397
|
-
| { name: string }
|
|
398
|
-
| { allowedTools: string[]; mode: "auto" | "required" };
|
|
405
|
+
| ({ name: string } & QualifiedToolChoices)
|
|
406
|
+
| ({ allowedTools: string[]; mode: "auto" | "required" } & QualifiedToolChoices);
|
|
399
407
|
|
|
400
|
-
export function isAllowedToolChoice(value: OcxToolChoice | undefined): value is { allowedTools: string[]
|
|
408
|
+
export function isAllowedToolChoice(value: OcxToolChoice | undefined): value is Extract<OcxToolChoice, { allowedTools: string[] }> {
|
|
401
409
|
return typeof value === "object" && value !== null && "allowedTools" in value;
|
|
402
410
|
}
|
|
403
411
|
|
|
412
|
+
export function isQualifiedToolChoiceName(choice: OcxToolChoice | undefined, name: string): boolean {
|
|
413
|
+
return typeof choice === "object" && choice.qualifiedToolNames?.includes(name) === true;
|
|
414
|
+
}
|
|
415
|
+
|
|
404
416
|
export function requiresToolCall(choice: OcxToolChoice | undefined): boolean {
|
|
405
417
|
return choice === "required"
|
|
406
418
|
|| (typeof choice === "object" && choice !== null && (
|
|
@@ -417,9 +429,14 @@ export function toolChoiceToolPredicate(
|
|
|
417
429
|
if (choice === "none") return () => false;
|
|
418
430
|
if (isAllowedToolChoice(choice)) {
|
|
419
431
|
const allowed = new Set(choice.allowedTools);
|
|
432
|
+
const qualified = new Set<string>();
|
|
433
|
+
for (const name of choice.qualifiedToolNames ?? []) {
|
|
434
|
+
if (allowed.delete(name)) qualified.add(name);
|
|
435
|
+
}
|
|
420
436
|
const resolver = createToolChoiceResolver(tools);
|
|
421
|
-
return tool => resolver.allows(tool, allowed);
|
|
437
|
+
return tool => qualified.has(namespacedToolName(tool.namespace, tool.name)) || resolver.allows(tool, allowed);
|
|
422
438
|
}
|
|
439
|
+
if (isQualifiedToolChoiceName(choice, choice.name)) return tool => namespacedToolName(tool.namespace, tool.name) === choice.name;
|
|
423
440
|
if (!tools) return tool => toolChoiceAliases(tool).includes(choice.name);
|
|
424
441
|
const resolver = createToolChoiceResolver(tools);
|
|
425
442
|
return tool => resolver.selects(tool, choice.name);
|
package/src/types/wire.ts
CHANGED
|
@@ -113,6 +113,7 @@ function normalizedEndpoint(value: unknown): string | undefined {
|
|
|
113
113
|
const CREDENTIAL_PINNED_ADAPTERS: Readonly<Record<string, Readonly<Record<string, string>>>> = Object.freeze({
|
|
114
114
|
"workbuddy-ai": Object.freeze({ "": "workbuddy-ai" }),
|
|
115
115
|
"dsh-account": Object.freeze({ "": "dsh-account" }),
|
|
116
|
+
"m365-copilot": Object.freeze({ "": "m365-copilot" }),
|
|
116
117
|
});
|
|
117
118
|
|
|
118
119
|
function prefixPinsFor(providerName: string, provider: WirePinProvider | undefined): Readonly<Record<string, string>> | undefined {
|