@bitkyc08/opencodex 2.93.0 → 2.95.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -12,6 +12,7 @@ import { transientSendCapFor } from "./request-send-budget";
|
|
|
12
12
|
import { isNonReplayableResponse, isSameTargetRetryHold } from "../../lib/upstream-retry";
|
|
13
13
|
import { sanitizeNonReplayableUpstreamError } from "./non-replayable-error";
|
|
14
14
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
15
|
+
import { resolveConnectTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
|
|
15
16
|
import type { ResponsesRequestContext, ResponsesAdmissionState } from "./core-options";
|
|
16
17
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
17
18
|
import type { ResponsesTransport } from "./request-transport";
|
|
@@ -116,6 +117,7 @@ import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
|
116
117
|
import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
|
|
117
118
|
import { chargeWorkflowSends } from "../../lib/workflow-budget";
|
|
118
119
|
import { isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
|
|
120
|
+
import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
|
|
119
121
|
import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
|
|
120
122
|
import { AdmissionModelDeniedError, admissionModelDeniedResponse } from "../admission-model-scope";
|
|
121
123
|
|
|
@@ -127,7 +129,7 @@ export async function prepareAdapterExchange(
|
|
|
127
129
|
PreparedResponsesRequest,
|
|
128
130
|
| "parsed"
|
|
129
131
|
| "toolBridgeMaps"
|
|
130
|
-
| "translatorBudget"
|
|
132
|
+
| "translatorBudget" | "completedToolBlocks"
|
|
131
133
|
| "selectedForwardHeaders"
|
|
132
134
|
| "route"
|
|
133
135
|
| "inboundWire"
|
|
@@ -257,19 +259,16 @@ export async function prepareAdapterExchange(
|
|
|
257
259
|
?? formatErrorResponse(502, "upstream_error", "GitHub Copilot Auto negotiation failed.");
|
|
258
260
|
}
|
|
259
261
|
};
|
|
260
|
-
const connectMs = config.connectTimeoutMs ?? 200_000;
|
|
261
|
-
// Bridge stall budget (seconds of silence before upstream_stall_timeout); the retry backoff
|
|
262
|
-
// heartbeat interval is derived from it so the watchdog is always fed during deliberate waits.
|
|
263
|
-
const stallTimeoutMs = typeof config.stallTimeoutSec === "number" && Number.isFinite(config.stallTimeoutSec) && config.stallTimeoutSec > 0
|
|
264
|
-
? Math.floor(config.stallTimeoutSec * 1000)
|
|
265
|
-
: 300_000;
|
|
266
262
|
// Where this exchange dials. Local upstreams (loopback / private / `.local` / `.lan`) are
|
|
267
263
|
// operator-trusted and often CPU-bound, so an unset stall budget resolves to disabled for them.
|
|
268
|
-
// Key/OAuth rotation re-resolves credentials, never the origin, so the routed baseUrl is stable.
|
|
269
264
|
const localUpstream = isLocalUpstream(route.provider.baseUrl);
|
|
265
|
+
// Header arrival and body silence are separate clocks (structure/transports/timeouts.md).
|
|
266
|
+
const connectMs = resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream });
|
|
267
|
+
const sendConnectMs = () => route.provider.authMode === "forward" ? resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(route.provider.baseUrl) }) : 0;
|
|
270
268
|
transportState.activeAdapter = transportState.adapter;
|
|
271
269
|
const antigravityPoolActivated = route.providerName === "google-antigravity"
|
|
272
270
|
&& isGenericOAuthFailoverEnabled(config, route.providerName);
|
|
271
|
+
const antigravityDenial = createAntigravityModelDenialRecovery();
|
|
273
272
|
|
|
274
273
|
// One immutable, body-safe outbound request per same-target sequence (URL, serialized body,
|
|
275
274
|
// auth headers, generated compat headers). Same-target 429 replays reuse it verbatim; the
|
|
@@ -336,8 +335,8 @@ export async function prepareAdapterExchange(
|
|
|
336
335
|
}
|
|
337
336
|
try {
|
|
338
337
|
initialRequest = await transportState.activeAdapter.buildRequest(parsed, {
|
|
339
|
-
headers: requestState.selectedForwardHeaders,
|
|
340
|
-
|
|
338
|
+
headers: requestState.selectedForwardHeaders, completedToolBlocks: requestState.completedToolBlocks,
|
|
339
|
+
providerName: route.providerName,
|
|
341
340
|
translatorBudget,
|
|
342
341
|
abortSignal: upstream.signal,
|
|
343
342
|
});
|
|
@@ -414,9 +413,9 @@ export async function prepareAdapterExchange(
|
|
|
414
413
|
transportState.activeAdapter.fetchResponse!(builtInitialRequest, {
|
|
415
414
|
kiroPreferAccountFailover: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro"),
|
|
416
415
|
abortSignal: upstream.signal,
|
|
417
|
-
timeoutMs:
|
|
416
|
+
timeoutMs: sendConnectMs(),
|
|
418
417
|
sendBudget: adapterDispatchBudget,
|
|
419
|
-
onPhysicalSend: send => noteAdapterPhysicalSend(inputTokenEstimate, send),
|
|
418
|
+
onPhysicalSend: send => { antigravityDenial.beforeSend(); noteAdapterPhysicalSend(inputTokenEstimate, send); },
|
|
420
419
|
onRecoveryWithheld: noteAdapterRecoveryWithheld,
|
|
421
420
|
stream: parsed.stream,
|
|
422
421
|
executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
@@ -496,7 +495,7 @@ export async function prepareAdapterExchange(
|
|
|
496
495
|
method: builtInitialRequest.method,
|
|
497
496
|
headers: builtInitialRequest.headers,
|
|
498
497
|
body: builtInitialRequest.body,
|
|
499
|
-
}, recovery), upstream.signal,
|
|
498
|
+
}, recovery), upstream.signal, sendConnectMs(), parsed.stream,
|
|
500
499
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
501
500
|
dispatchOverride: oauthDispatch(builtInitialRequest),
|
|
502
501
|
providerName: route.providerName,
|
|
@@ -654,7 +653,7 @@ export async function prepareAdapterExchange(
|
|
|
654
653
|
} else {
|
|
655
654
|
try {
|
|
656
655
|
retryRequest = await transportState.activeAdapter.buildRequest(parsed, {
|
|
657
|
-
headers: requestState.selectedForwardHeaders,
|
|
656
|
+
headers: requestState.selectedForwardHeaders, completedToolBlocks: requestState.completedToolBlocks,
|
|
658
657
|
providerName: route.providerName,
|
|
659
658
|
translatorBudget,
|
|
660
659
|
abortSignal: upstream.signal,
|
|
@@ -713,11 +712,11 @@ export async function prepareAdapterExchange(
|
|
|
713
712
|
return transportState.activeAdapter.fetchResponse!(retryRequest, {
|
|
714
713
|
kiroPreferAccountFailover: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro"),
|
|
715
714
|
abortSignal: upstream.signal,
|
|
716
|
-
timeoutMs:
|
|
715
|
+
timeoutMs: sendConnectMs(),
|
|
717
716
|
sendBudget: adapterDispatchBudget,
|
|
718
717
|
onPhysicalSend: send => {
|
|
719
718
|
if (preserveFailureResponse) replacementAdmitted = true;
|
|
720
|
-
noteAdapterPhysicalSend(retryEstimate, send);
|
|
719
|
+
antigravityDenial.beforeSend(); noteAdapterPhysicalSend(retryEstimate, send);
|
|
721
720
|
chargeFastDowngradeWorkflowSend();
|
|
722
721
|
},
|
|
723
722
|
onRecoveryWithheld: noteAdapterRecoveryWithheld,
|
|
@@ -791,7 +790,7 @@ export async function prepareAdapterExchange(
|
|
|
791
790
|
return fetchWithHeaderTimeout(retryRequest.url,
|
|
792
791
|
applyUpstreamRecoveryInit({
|
|
793
792
|
method: retryRequest.method, headers: retryRequest.headers, body: retryRequest.body,
|
|
794
|
-
}, recoveryKind), upstream.signal,
|
|
793
|
+
}, recoveryKind), upstream.signal, sendConnectMs(), parsed.stream,
|
|
795
794
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
796
795
|
dispatchOverride: oauthDispatch(retryRequest),
|
|
797
796
|
onPhysicalDispatch: deferredRefetch ? () => {
|
|
@@ -883,23 +882,23 @@ export async function prepareAdapterExchange(
|
|
|
883
882
|
const rotateAntigravityAuth = async (
|
|
884
883
|
failedResponse: Response,
|
|
885
884
|
recovery: AttemptRecoveryKind,
|
|
885
|
+
modelAccountId?: string,
|
|
886
886
|
): Promise<Response | null> => {
|
|
887
887
|
const sent = transportState.replayOAuthCredentialSnapshot ?? transportState.sentOAuthSnapshot;
|
|
888
888
|
if (!antigravityPoolActivated || !sent
|
|
889
889
|
|| transportState.genericFailovers >= transportState.genericFailoverLimit) return null;
|
|
890
|
-
const nextId = rotateAntigravityAccountOnAuthRefusal(
|
|
890
|
+
const nextId = modelAccountId ?? rotateAntigravityAccountOnAuthRefusal(
|
|
891
891
|
antigravityPoolActivated, sent.accountId, sent.generation, route.modelId,
|
|
892
892
|
);
|
|
893
893
|
if (!nextId) return null;
|
|
894
894
|
const adapterOwnsDispatch = transportState.activeAdapter.fetchResponse !== undefined;
|
|
895
|
-
|
|
896
|
-
`${route.providerName}|${route.modelId}|antigravity-auth`,
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
if (admitted?.accountId !== nextId) return null;
|
|
895
|
+
return recoverAntigravityAccount({ nextId, failedResponse, adapterOwnsDispatch,
|
|
896
|
+
reserve: () => reserveCredentialHop("auth-recovery", `${route.providerName}|${route.modelId}|antigravity-auth`,
|
|
897
|
+
!adapterOwnsDispatch && genericRefetchCountsSends()),
|
|
898
|
+
applyFailoverSnapshot, setPermit: permit => { sendBudgetState.pendingHopPermit = permit; },
|
|
899
|
+
complete: () => { transportState.genericFailovers += 1; },
|
|
900
|
+
refetch: onDispatch => rebuildAndRefetch(recovery, onDispatch, failedResponse),
|
|
901
|
+
prepare: () => {
|
|
903
902
|
invalidateSameTargetRequest();
|
|
904
903
|
transportState.activeAdapter = resolveSelectionAdapter(
|
|
905
904
|
resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire, route.staticPolicy),
|
|
@@ -913,23 +912,18 @@ export async function prepareAdapterExchange(
|
|
|
913
912
|
transportState.activeAdapter.name, logCtx.accountLogLabel);
|
|
914
913
|
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName,
|
|
915
914
|
route.provider, transportState.activeAdapter.name);
|
|
916
|
-
|
|
917
|
-
|
|
918
|
-
if (!adapterOwnsDispatch) hop.permit?.use();
|
|
919
|
-
}, failedResponse);
|
|
920
|
-
if ("failed" in result) return result.failed === failedResponse ? null : result.failed;
|
|
921
|
-
transportState.genericFailovers += 1;
|
|
922
|
-
try { void failedResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
923
|
-
return result;
|
|
924
|
-
} catch {
|
|
925
|
-
return null;
|
|
926
|
-
} finally {
|
|
927
|
-
sendBudgetState.pendingHopPermit = undefined;
|
|
928
|
-
hop.permit?.release();
|
|
929
|
-
}
|
|
915
|
+
},
|
|
916
|
+
});
|
|
930
917
|
};
|
|
931
918
|
// Keep recovery kinds in sync with the native Responses `passthroughRecovery:` loop above.
|
|
932
919
|
recovery: for (;;) {
|
|
920
|
+
const modelRotation = await antigravityDenial.recover(upstreamResponse,
|
|
921
|
+
transportState.replayOAuthCredentialSnapshot ?? transportState.sentOAuthSnapshot, {
|
|
922
|
+
config, model: route.modelId, enabled: antigravityPoolActivated && transportState.activeAdapter.name === "google",
|
|
923
|
+
remaining: transportState.genericFailovers < transportState.genericFailoverLimit, signal: options.abortSignal,
|
|
924
|
+
rotate: id => rotateAntigravityAuth(upstreamResponse, "oauth-account-403", id),
|
|
925
|
+
});
|
|
926
|
+
if (modelRotation) { upstreamResponse = modelRotation; continue recovery; }
|
|
933
927
|
if (wasAccountAutoPaused(upstreamResponse) && route.provider.authMode !== "forward") {
|
|
934
928
|
const recovered = await recoverAutoPausedAccount({ requestKey: transportState, reserve: reserveCredentialHop,
|
|
935
929
|
remaining: transientSendCapFor(transientRetryPolicyFor(route.provider)?.attempts, sendBudgetState.targetSendsUsed),
|
|
@@ -1934,7 +1928,7 @@ export async function prepareAdapterExchange(
|
|
|
1934
1928
|
errorType: normalized.type, code: normalized.code,
|
|
1935
1929
|
message: "Structured upstream failure observed before client formatting",
|
|
1936
1930
|
});
|
|
1937
|
-
const message = normalized.cyberPolicy
|
|
1931
|
+
const message = antigravityDenial.message(route.modelId, normalized.cyberPolicy
|
|
1938
1932
|
? normalized.message
|
|
1939
1933
|
?? (isCyberPolicyCode(normalized.code) ? CYBER_POLICY_FALLBACK_MESSAGE : normalized.safeText)
|
|
1940
1934
|
: enrichOpenCodeZenUpstreamMessage(
|
|
@@ -1953,7 +1947,7 @@ export async function prepareAdapterExchange(
|
|
|
1953
1947
|
// never reach enrichOpenCodeZenUpstreamMessage here.
|
|
1954
1948
|
supportsHttpSameKeyRetry: true,
|
|
1955
1949
|
},
|
|
1956
|
-
);
|
|
1950
|
+
));
|
|
1957
1951
|
const retryAfter = normalized.cyberPolicy
|
|
1958
1952
|
? undefined
|
|
1959
1953
|
: resolveClientRetryAfter({
|
|
@@ -1980,9 +1974,9 @@ export async function prepareAdapterExchange(
|
|
|
1980
1974
|
return {
|
|
1981
1975
|
upstream,
|
|
1982
1976
|
cleanupUpstreamAbort,
|
|
1983
|
-
connectMs,
|
|
1984
|
-
stallTimeoutMs,
|
|
1985
|
-
localUpstream,
|
|
1977
|
+
get connectMs() { return resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: this.localUpstream }); },
|
|
1978
|
+
get stallTimeoutMs() { return resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: this.localUpstream }); },
|
|
1979
|
+
get localUpstream() { return isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl); },
|
|
1986
1980
|
upstreamResponse,
|
|
1987
1981
|
thinkingSignatureRecovery,
|
|
1988
1982
|
refetchThinkingSignature,
|
|
@@ -1,15 +1,22 @@
|
|
|
1
1
|
/** Core-owned, config-scoped registration. An inactive install has no Advisor factory. */
|
|
2
2
|
import type { OcxConfig, OcxParsedRequest, OcxTool } from "../../types";
|
|
3
|
+
import type { AdmissionModelScope } from "../admission-model-scope";
|
|
4
|
+
import type { AdvisorPlan } from "./advisor-slot";
|
|
3
5
|
|
|
4
6
|
export interface AdvisorPlanInput {
|
|
5
7
|
config: OcxConfig;
|
|
6
8
|
workerIdentity: string;
|
|
7
9
|
workerModelId: string;
|
|
10
|
+
/** Immutable scope captured from the request that is paying for this sidecar. */
|
|
11
|
+
admissionScope?: AdmissionModelScope;
|
|
12
|
+
admissionPolicy?: import("../../types/admission-policy").CapturedAdmissionPolicy;
|
|
8
13
|
abortSignal?: AbortSignal;
|
|
9
14
|
}
|
|
10
15
|
|
|
11
16
|
export interface RegisteredAdvisorPlan {
|
|
12
17
|
tool: OcxTool;
|
|
18
|
+
consult?: AdvisorPlan["consult"];
|
|
19
|
+
formatUnavailable?: AdvisorPlan["formatUnavailable"];
|
|
13
20
|
preflightInject(parsed: OcxParsedRequest): Promise<boolean>;
|
|
14
21
|
attachGuard(parsed: OcxParsedRequest): void;
|
|
15
22
|
}
|
|
@@ -69,6 +69,7 @@ export interface AdvisorPlan {
|
|
|
69
69
|
parsed: OcxParsedRequest,
|
|
70
70
|
reason: "manual",
|
|
71
71
|
question: string | undefined,
|
|
72
|
+
abortSignal?: AbortSignal,
|
|
72
73
|
): Promise<AdvisorConsultOutcome>;
|
|
73
74
|
/**
|
|
74
75
|
* Runtime-owned text for a failed or limited consultation. The guard never composes failure
|
|
@@ -78,6 +79,68 @@ export interface AdvisorPlan {
|
|
|
78
79
|
formatUnavailable(kind: "manual" | "limit", error: string): string;
|
|
79
80
|
}
|
|
80
81
|
|
|
82
|
+
export interface AdvisorSidecarCall {
|
|
83
|
+
id: string;
|
|
84
|
+
name: string;
|
|
85
|
+
question?: string;
|
|
86
|
+
providerMetadata?: import("../../types").OcxProviderOpaqueToolCallMetadata;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* Shares continuation/consultation bounds between the normal guard and fetch sidecar loops.
|
|
91
|
+
* Each leg is reserved before any expert await, while repeated calls receive one bounded limit
|
|
92
|
+
* result instead of starting another consultation. The tool result preserves the worker call id.
|
|
93
|
+
*/
|
|
94
|
+
export function createAdvisorSidecarStep(plan: AdvisorPlan) {
|
|
95
|
+
let consultations = 0;
|
|
96
|
+
let continuations = 0;
|
|
97
|
+
let finalContinuationUsed = false;
|
|
98
|
+
return {
|
|
99
|
+
beginLeg(): Extract<AdapterEvent, { type: "error" }> | undefined {
|
|
100
|
+
const final = consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST;
|
|
101
|
+
if (continuations >= MAX_ADVISOR_CONTINUATIONS_PER_REQUEST || finalContinuationUsed) {
|
|
102
|
+
return {
|
|
103
|
+
type: "error",
|
|
104
|
+
status: 502,
|
|
105
|
+
errorType: "advisor_continuation_limit",
|
|
106
|
+
message: "Advisor worker continuation limit reached; no further worker calls were sent.",
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
continuations += 1;
|
|
110
|
+
finalContinuationUsed ||= final;
|
|
111
|
+
return undefined;
|
|
112
|
+
},
|
|
113
|
+
async consultCall(parsed: OcxParsedRequest, call: AdvisorSidecarCall, abortSignal?: AbortSignal) {
|
|
114
|
+
let outcome: AdvisorConsultOutcome;
|
|
115
|
+
if (consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST) {
|
|
116
|
+
outcome = {
|
|
117
|
+
ok: false,
|
|
118
|
+
isError: true,
|
|
119
|
+
content: plan.formatUnavailable("limit", "consultation limit reached for this request"),
|
|
120
|
+
};
|
|
121
|
+
} else {
|
|
122
|
+
consultations += 1;
|
|
123
|
+
try {
|
|
124
|
+
outcome = await plan.consult(parsed, "manual", call.question, abortSignal);
|
|
125
|
+
} catch (error) {
|
|
126
|
+
if (isTranslatorBudgetExceededError(error)) throw error;
|
|
127
|
+
outcome = {
|
|
128
|
+
ok: false,
|
|
129
|
+
isError: true,
|
|
130
|
+
content: plan.formatUnavailable("manual", error instanceof Error ? error.message : String(error)),
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
return { outcome, message: advisorToolResult(call, outcome, Date.now()) };
|
|
135
|
+
},
|
|
136
|
+
exhausted(): boolean {
|
|
137
|
+
return consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST;
|
|
138
|
+
},
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
export type AdvisorSidecarStep = ReturnType<typeof createAdvisorSidecarStep>;
|
|
143
|
+
|
|
81
144
|
interface HeldAdvisorCall {
|
|
82
145
|
id: string;
|
|
83
146
|
name: string;
|
|
@@ -90,10 +153,10 @@ interface HeldAdvisorCall {
|
|
|
90
153
|
|
|
91
154
|
function parseAdvisorArgs(call: HeldAdvisorCall, retention: AdvisorRetention): { question?: string } {
|
|
92
155
|
// Reserve both the joined input and parsed JSON before either is materialized.
|
|
93
|
-
return retention.copy(call.argumentBytes * 2 + 4, () =>
|
|
156
|
+
return retention.copy(call.argumentBytes * 2 + 4, () => parseAdvisorQuestionArgs(call.args.join("")));
|
|
94
157
|
}
|
|
95
158
|
|
|
96
|
-
function
|
|
159
|
+
export function parseAdvisorQuestionArgs(argsBuf: string): { question?: string } {
|
|
97
160
|
if (argsBuf.trim() === "") return {};
|
|
98
161
|
try {
|
|
99
162
|
const parsed: unknown = JSON.parse(argsBuf);
|
|
@@ -129,7 +192,7 @@ function assistantMessageFromLeg(
|
|
|
129
192
|
}
|
|
130
193
|
|
|
131
194
|
function advisorToolResult(
|
|
132
|
-
call:
|
|
195
|
+
call: AdvisorSidecarCall,
|
|
133
196
|
outcome: AdvisorConsultOutcome,
|
|
134
197
|
timestamp: number,
|
|
135
198
|
): OcxToolResultMessage {
|
|
@@ -163,11 +226,8 @@ export function createAdvisorStreamGuard(options: AdvisorGuardOptions): AsyncGen
|
|
|
163
226
|
}
|
|
164
227
|
export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequest["_advisorGuard"]> {
|
|
165
228
|
// Shared across invocations of this request's guard, including an empty-completion retry.
|
|
166
|
-
|
|
167
|
-
let continuations = 0;
|
|
168
|
-
let finalContinuationUsed = false;
|
|
229
|
+
const sidecar = createAdvisorSidecarStep(plan);
|
|
169
230
|
return async function* guardAdvisorStream(options: Omit<AdvisorGuardOptions, "plan">): AsyncGenerator<AdapterEvent> {
|
|
170
|
-
const maxConsultations = MAX_ADVISOR_CONSULTATIONS_PER_REQUEST;
|
|
171
231
|
let parsed = options.parsed;
|
|
172
232
|
let accumulatedUsage: OcxUsage | undefined;
|
|
173
233
|
let source: AsyncIterable<AdapterEvent> = options.firstEvents;
|
|
@@ -183,6 +243,7 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
183
243
|
// held from the output; real calls pass through untouched.
|
|
184
244
|
let holdingCurrent = false;
|
|
185
245
|
let hasRealToolCall = false;
|
|
246
|
+
let hasIncompleteToolCall = false;
|
|
186
247
|
let terminalConsumed = false;
|
|
187
248
|
let terminalEvent: Extract<AdapterEvent, { type: "done" }> | undefined;
|
|
188
249
|
|
|
@@ -214,9 +275,10 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
214
275
|
}
|
|
215
276
|
if (holdingCurrent) continue;
|
|
216
277
|
} else if (event.type === "tool_call_end") {
|
|
278
|
+
hasIncompleteToolCall ||= event.incomplete === true;
|
|
217
279
|
if (pending) {
|
|
218
280
|
retention.retain(event);
|
|
219
|
-
pending.closed =
|
|
281
|
+
pending.closed = !event.incomplete;
|
|
220
282
|
if (pending.name === ADVISOR_TOOL_NAME) held.push(pending);
|
|
221
283
|
pending = null;
|
|
222
284
|
}
|
|
@@ -260,7 +322,7 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
260
322
|
&& terminalEvent?.stopReason !== "max_tokens"
|
|
261
323
|
&& terminalEvent?.stopReason !== "content_filter"
|
|
262
324
|
&& advisorCalls.length > 0
|
|
263
|
-
&& !hasRealToolCall;
|
|
325
|
+
&& !hasRealToolCall && !hasIncompleteToolCall;
|
|
264
326
|
|
|
265
327
|
if (!shouldIntercept) {
|
|
266
328
|
// Plain leg: surface the terminal with merged usage from any earlier intercepted legs.
|
|
@@ -273,61 +335,28 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
273
335
|
|
|
274
336
|
// Consume this leg's done — the continuation replaces it.
|
|
275
337
|
accumulatedUsage = retention.usage(accumulatedUsage, terminalEvent?.usage);
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
status: 502,
|
|
280
|
-
errorType: "advisor_continuation_limit",
|
|
281
|
-
message: "Advisor worker continuation limit reached; no further worker calls were sent.",
|
|
282
|
-
...(accumulatedUsage ? { usage: accumulatedUsage } : {}),
|
|
283
|
-
};
|
|
338
|
+
const continuationError = sidecar.beginLeg();
|
|
339
|
+
if (continuationError) {
|
|
340
|
+
yield accumulatedUsage ? { ...continuationError, usage: accumulatedUsage } : continuationError;
|
|
284
341
|
return;
|
|
285
342
|
}
|
|
286
|
-
// A repeated call after tool removal gets one last paired limit result, never a loop.
|
|
287
|
-
const isFinalContinuation = consultations >= maxConsultations;
|
|
288
|
-
// Reserve before any consultation await, so simultaneous guard entries share the bound.
|
|
289
|
-
continuations += 1;
|
|
290
|
-
finalContinuationUsed ||= isFinalContinuation;
|
|
291
343
|
const timestamp = Date.now();
|
|
292
344
|
const assistant = retention.history(retention.replayReservation(), () => assistantMessageFromLeg(legEvents, advisorCalls, timestamp, retention));
|
|
293
345
|
const messages: OcxMessage[] = [...parsed.context.messages];
|
|
294
346
|
if (assistant) messages.push(assistant);
|
|
295
347
|
|
|
296
348
|
for (const call of advisorCalls) {
|
|
297
|
-
if (consultations >= maxConsultations) {
|
|
298
|
-
// Runtime-owned limit text: not advice, and never a genuine advice wrapper.
|
|
299
|
-
const outcome = {
|
|
300
|
-
ok: false,
|
|
301
|
-
isError: true,
|
|
302
|
-
content: plan.formatUnavailable("limit", "consultation limit reached for this request"),
|
|
303
|
-
};
|
|
304
|
-
messages.push(retention.history(jsonUtf8Bytes(outcome) + jsonUtf8Bytes(call.id) + 256, () => advisorToolResult(call, outcome, timestamp))!);
|
|
305
|
-
continue;
|
|
306
|
-
}
|
|
307
|
-
consultations += 1;
|
|
308
349
|
// Later calls in the same leg must see what came before them: the rebuilt worker turn
|
|
309
350
|
// and every earlier advisor result in this leg's accumulated messages.
|
|
310
351
|
const consultParsed: OcxParsedRequest = {
|
|
311
352
|
...parsed,
|
|
312
353
|
context: { ...parsed.context, messages },
|
|
313
354
|
};
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
outcome = await plan.consult(consultParsed, "manual", call.question);
|
|
317
|
-
} catch (error) {
|
|
318
|
-
if (isTranslatorBudgetExceededError(error)) throw error;
|
|
319
|
-
// Runtime-owned failure text only: the implementation neutralizes untrusted exception
|
|
320
|
-
// text so it can never forge a genuine advice wrapper.
|
|
321
|
-
outcome = {
|
|
322
|
-
ok: false,
|
|
323
|
-
isError: true,
|
|
324
|
-
content: plan.formatUnavailable("manual", error instanceof Error ? error.message : String(error)),
|
|
325
|
-
};
|
|
326
|
-
}
|
|
327
|
-
messages.push(retention.history(jsonUtf8Bytes(outcome) + jsonUtf8Bytes(call.id) + 256, () => advisorToolResult(call, outcome, timestamp))!);
|
|
355
|
+
const consulted = await sidecar.consultCall(consultParsed, call);
|
|
356
|
+
messages.push(retention.history(jsonUtf8Bytes(consulted.outcome) + jsonUtf8Bytes(call.id) + 256, () => consulted.message)!);
|
|
328
357
|
}
|
|
329
358
|
|
|
330
|
-
const exhausted =
|
|
359
|
+
const exhausted = sidecar.exhausted();
|
|
331
360
|
const tools = exhausted
|
|
332
361
|
? parsed.context.tools?.filter(tool => !tool.advisor && tool.name !== ADVISOR_TOOL_NAME)
|
|
333
362
|
: parsed.context.tools;
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { getConfigDir } from "../../config/paths";
|
|
2
|
+
import type { OAuthAccessSnapshot } from "../../oauth";
|
|
3
|
+
import { failoverAccountSnapshot, rotateAntigravityAccountOnModelNotFound } from "../../oauth/generic-account-failover";
|
|
4
|
+
import { captureAntigravityModelObservation, recordAntigravityModelDenial } from "../../providers/antigravity-account-roster";
|
|
5
|
+
import { isNonReplayableResponse } from "../../lib/upstream-retry";
|
|
6
|
+
import type { OcxConfig } from "../../types";
|
|
7
|
+
import type { ResponsesSendBudget } from "./request-send-budget";
|
|
8
|
+
import { isAntigravityModelNotFoundRefusal } from "./antigravity-validation-refusal";
|
|
9
|
+
|
|
10
|
+
/** Common guarded credential-hop lifecycle for Antigravity auth and model recovery. */
|
|
11
|
+
export async function recoverAntigravityAccount(options: {
|
|
12
|
+
nextId: string; failedResponse: Response;
|
|
13
|
+
reserve: () => ReturnType<ResponsesSendBudget["reserveCredentialHop"]>;
|
|
14
|
+
applyFailoverSnapshot: (snapshot: OAuthAccessSnapshot) => Promise<OAuthAccessSnapshot | null | undefined>;
|
|
15
|
+
prepare: () => void;
|
|
16
|
+
refetch: (onDispatch: () => void) => Promise<Response | { failed: Response }>;
|
|
17
|
+
adapterOwnsDispatch: boolean;
|
|
18
|
+
setPermit: (permit: ResponsesSendBudget["pendingHopPermit"]) => void;
|
|
19
|
+
complete: () => void;
|
|
20
|
+
}): Promise<Response | null> {
|
|
21
|
+
const hop = options.reserve();
|
|
22
|
+
if (!hop.allowed) return null;
|
|
23
|
+
try {
|
|
24
|
+
const snapshot = await failoverAccountSnapshot("google-antigravity", options.nextId);
|
|
25
|
+
if ((await options.applyFailoverSnapshot(snapshot))?.accountId !== options.nextId) return null;
|
|
26
|
+
options.prepare();
|
|
27
|
+
options.setPermit(hop.permit);
|
|
28
|
+
const result = await options.refetch(() => { if (!options.adapterOwnsDispatch) hop.permit?.use(); });
|
|
29
|
+
if ("failed" in result) return result.failed === options.failedResponse ? null : result.failed;
|
|
30
|
+
options.complete();
|
|
31
|
+
try { void options.failedResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
32
|
+
return result;
|
|
33
|
+
} catch { return null; }
|
|
34
|
+
finally { options.setPermit(undefined); hop.permit?.release(); }
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/** Request-local ordering fence and attempted-account set; never infer exhaustion from a failed hop. */
|
|
38
|
+
export function createAntigravityModelDenialRecovery() {
|
|
39
|
+
const root = getConfigDir();
|
|
40
|
+
let observation = captureAntigravityModelObservation();
|
|
41
|
+
const attempted = new Set<string>();
|
|
42
|
+
let exhaustion: "none" | "ineligible" | "recovery" = "none";
|
|
43
|
+
return {
|
|
44
|
+
beforeSend: () => { observation = captureAntigravityModelObservation(); },
|
|
45
|
+
async recover(response: Response, sent: Pick<OAuthAccessSnapshot, "accountId" | "generation"> | undefined, context: {
|
|
46
|
+
config: OcxConfig; model: string | null | undefined; enabled: boolean; remaining: boolean;
|
|
47
|
+
signal?: AbortSignal; rotate: (id: string) => Promise<Response | null>;
|
|
48
|
+
}): Promise<Response | null> {
|
|
49
|
+
if (!context.enabled || !sent || !context.model || isNonReplayableResponse(response)
|
|
50
|
+
|| !await isAntigravityModelNotFoundRefusal(response, context.signal)) return null;
|
|
51
|
+
// Capture BEFORE the bounded response read: another discovery can finish during it.
|
|
52
|
+
if (getConfigDir() !== root || !recordAntigravityModelDenial("google-antigravity", sent.accountId,
|
|
53
|
+
context.model, { ...observation, configDir: root, generation: sent.generation })) return null;
|
|
54
|
+
attempted.add(sent.accountId);
|
|
55
|
+
const next = rotateAntigravityAccountOnModelNotFound(context.config, sent.accountId, context.model, attempted);
|
|
56
|
+
if (!next) { exhaustion = "ineligible"; return null; }
|
|
57
|
+
if (!context.remaining) { exhaustion = "recovery"; return null; }
|
|
58
|
+
const result = await context.rotate(next);
|
|
59
|
+
exhaustion = result ? "none" : "recovery";
|
|
60
|
+
return result;
|
|
61
|
+
},
|
|
62
|
+
message(model: string | null | undefined, fallback: string): string {
|
|
63
|
+
return exhaustion === "ineligible"
|
|
64
|
+
? `No eligible stored Google Antigravity account can serve the model "${model}". ${fallback}`
|
|
65
|
+
: exhaustion === "recovery"
|
|
66
|
+
? `Google Antigravity could not recover the model "${model}": an eligible account could not be resolved, admitted, or sent within the request budget. ${fallback}`
|
|
67
|
+
: fallback;
|
|
68
|
+
},
|
|
69
|
+
};
|
|
70
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX, safeAntigravityHttpErrorMessage } from "../../adapters/google-errors";
|
|
2
2
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
3
|
+
import { hasAntigravityModelNotFoundProvenance } from "../../adapters/antigravity-refusal";
|
|
3
4
|
|
|
4
5
|
/** Match only the normalized Antigravity validation-refusal marker. */
|
|
5
6
|
export function hasAntigravityValidationRefusalMarker(text: string): boolean {
|
|
@@ -32,3 +33,8 @@ async function inspectValidationRefusal(response: Response, signal: AbortSignal
|
|
|
32
33
|
return false;
|
|
33
34
|
}
|
|
34
35
|
}
|
|
36
|
+
|
|
37
|
+
/** Only original-body, model-specific Google adapter evidence qualifies for account rotation. */
|
|
38
|
+
export async function isAntigravityModelNotFoundRefusal(response: Response, signal?: AbortSignal): Promise<boolean> {
|
|
39
|
+
return response.status === 404 && !signal?.aborted && hasAntigravityModelNotFoundProvenance(response);
|
|
40
|
+
}
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
MainAuthJsonChangedDuringRefreshError,
|
|
18
18
|
} from "../../codex/main-account";
|
|
19
19
|
import { NativeProfileError } from "../../codex/native-profile-types";
|
|
20
|
+
import { markCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
|
|
20
21
|
|
|
21
22
|
export interface CodexAuthContextErrorResponseOptions {
|
|
22
23
|
accountSelector?: string;
|
|
@@ -78,7 +79,10 @@ export function mapCodexAuthContextErrorToResponse(
|
|
|
78
79
|
options: CodexAuthContextErrorResponseOptions,
|
|
79
80
|
): Response | undefined {
|
|
80
81
|
if (error instanceof CodexAccountCooldownError) {
|
|
81
|
-
|
|
82
|
+
const response = cooldownErrorResponse(error, options.now, options.accountSelector);
|
|
83
|
+
// Exact class only (#7850): main hard-lock, credit, Reserve, recovery-withheld and future
|
|
84
|
+
// policy subclasses keep their own retry semantics, including in combo target cooldowns.
|
|
85
|
+
return error.constructor === CodexAccountCooldownError ? markCodexAccountCooldownResponse(response) : response;
|
|
82
86
|
}
|
|
83
87
|
if (error instanceof CodexMainProfileDrainingError) {
|
|
84
88
|
return codexMainProfileDrainingResponse();
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
|
|
2
|
+
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
2
3
|
import { applyReplayRefusalClientHeaders, isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
3
4
|
import { clientWireOf } from "../inference/client-wire";
|
|
4
5
|
import { isPreinspectedJsonResponse, markPreinspectedJsonResponse } from "../relay";
|
|
@@ -9,6 +10,33 @@ export type RequiredToolContract =
|
|
|
9
10
|
| { kind: "any"; hostedCallTypes: ReadonlySet<string> }
|
|
10
11
|
| { kind: "named"; name: string };
|
|
11
12
|
|
|
13
|
+
const allowedHostedSelectors = new Set([
|
|
14
|
+
"web_search", "web_search_preview", "file_search", "computer_use_preview", "computer_use",
|
|
15
|
+
"code_interpreter", "image_generation", "image_gen", "tool_search",
|
|
16
|
+
]);
|
|
17
|
+
|
|
18
|
+
/** Only definite, well-formed mandatory selectors justify excluding a destination. */
|
|
19
|
+
export function hasMandatoryToolChoice(rawBody: unknown): boolean {
|
|
20
|
+
if (!rawBody || typeof rawBody !== "object" || Array.isArray(rawBody)) return false;
|
|
21
|
+
const choice = (rawBody as Record<string, unknown>).tool_choice;
|
|
22
|
+
if (choice === "required") return true;
|
|
23
|
+
if (!choice || typeof choice !== "object" || Array.isArray(choice)) return false;
|
|
24
|
+
const selector = choice as Record<string, unknown>;
|
|
25
|
+
if (selector.type === "function" || selector.type === "custom") {
|
|
26
|
+
return typeof selector.name === "string" && selector.name.trim().length > 0;
|
|
27
|
+
}
|
|
28
|
+
return selector.type === "allowed_tools" && selector.mode === "required"
|
|
29
|
+
&& Array.isArray(selector.tools) && selector.tools.length > 0
|
|
30
|
+
&& selector.tools.every((tool: unknown) => {
|
|
31
|
+
if (!tool || typeof tool !== "object" || Array.isArray(tool)) return false;
|
|
32
|
+
const entry = tool as Record<string, unknown>;
|
|
33
|
+
if (entry.name !== undefined && (typeof entry.name !== "string" || !entry.name.trim())) return false;
|
|
34
|
+
if (entry.type === "function" || entry.type === "custom") return typeof entry.name === "string";
|
|
35
|
+
if (entry.type === "mcp") return typeof entry.server_label === "string" && !!entry.server_label.trim();
|
|
36
|
+
return typeof entry.type === "string" && allowedHostedSelectors.has(entry.type);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
|
|
12
40
|
const hostedCalls = new Map([
|
|
13
41
|
["web_search", "web_search_call"], ["web_search_preview", "web_search_call"],
|
|
14
42
|
["file_search", "file_search_call"], ["code_interpreter", "code_interpreter_call"],
|
|
@@ -97,7 +125,7 @@ export async function judgeBufferedRequiredTool(response: Response, requirement:
|
|
|
97
125
|
export async function guardBufferedComboRequiredTool(response: Response, rawBody: unknown, adapter?: string): Promise<Response> {
|
|
98
126
|
if (!response.ok || adapter !== "openai-responses" || clientWireOf(response) !== undefined
|
|
99
127
|
|| isNonReplayableResponse(response)
|
|
100
|
-
|| !(response.headers
|
|
128
|
+
|| !hasResponseMediaType(response.headers, "application/json")) return response;
|
|
101
129
|
const requirement = requiredToolContractOf(rawBody);
|
|
102
130
|
return requirement ? judgeBufferedRequiredTool(response, requirement) : response;
|
|
103
131
|
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import type { AdapterRequest } from "../../adapters/base";
|
|
2
|
+
import { collectResponsesToolGroups } from "../../responses/tool-groups";
|
|
3
|
+
import { requiredToolContractOf, type RequiredToolContract } from "./combo-required-tool-contract";
|
|
4
|
+
import { parseOutboundRequestBody } from "./passthrough-completion";
|
|
5
|
+
|
|
6
|
+
type Item = Record<string, unknown>;
|
|
7
|
+
const record = (value: unknown): Item | undefined => value !== null && typeof value === "object" && !Array.isArray(value) ? value as Item : undefined;
|
|
8
|
+
const namespaceOf = (item: Item) => item.namespace === "functions" ? undefined : item.namespace;
|
|
9
|
+
const sameIdentity = (a: Item, b: Item) => a.name === b.name && namespaceOf(a) === namespaceOf(b);
|
|
10
|
+
|
|
11
|
+
function declarations(body: unknown, normalize: (item: unknown) => unknown) {
|
|
12
|
+
const clients: Item[] = [];
|
|
13
|
+
const hosted = new Set<string>();
|
|
14
|
+
const visit = (value: unknown, namespace?: string) => {
|
|
15
|
+
const tool = record(value);
|
|
16
|
+
if (!tool) return;
|
|
17
|
+
if (tool.type === "namespace" && typeof tool.name === "string" && Array.isArray(tool.tools)) {
|
|
18
|
+
for (const inner of tool.tools) visit(inner, tool.name);
|
|
19
|
+
} else if ((tool.type === "function" || tool.type === "custom") && typeof tool.name === "string") {
|
|
20
|
+
const item = record(normalize({ ...tool, ...(namespace ? { namespace } : {}),
|
|
21
|
+
type: tool.type === "custom" ? "custom_tool_call" : "function_call" }));
|
|
22
|
+
if (item) clients.push(item);
|
|
23
|
+
} else {
|
|
24
|
+
const contract = requiredToolContractOf({ tools: [tool], tool_choice: "required" });
|
|
25
|
+
if (contract?.kind === "any") for (const type of contract.hostedCallTypes) hosted.add(type);
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
for (const group of collectResponsesToolGroups(body)) for (const tool of group) visit(tool);
|
|
29
|
+
return { clients, hosted };
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** Caller intent never depends on capability filtering. Only this physical build grants substitutions. */
|
|
33
|
+
export function requiredToolFulfillments(
|
|
34
|
+
callerBody: unknown, contract: RequiredToolContract, normalize: (item: unknown) => unknown,
|
|
35
|
+
request?: AdapterRequest,
|
|
36
|
+
): (item: Item, clientCall: boolean) => boolean {
|
|
37
|
+
const caller = declarations(callerBody, normalize);
|
|
38
|
+
const choice = record(record(callerBody)?.tool_choice);
|
|
39
|
+
const selected = record(normalize({ ...choice, type: choice?.type === "custom" ? "custom_tool_call" : "function_call" }));
|
|
40
|
+
const intendedClient = (item: Item) => contract.kind === "any"
|
|
41
|
+
? caller.clients.some(tool => sameIdentity(item, tool))
|
|
42
|
+
: selected !== undefined && sameIdentity(item, selected) && caller.clients.some(tool => sameIdentity(item, tool));
|
|
43
|
+
const hosted = new Set(contract.kind === "any" ? contract.hostedCallTypes : []);
|
|
44
|
+
// request is the same object oauthDispatch replaces in place after queued revalidation.
|
|
45
|
+
const outbound = request ? parseOutboundRequestBody(request.body) : undefined;
|
|
46
|
+
const wire = request ? declarations(outbound, normalize) : undefined;
|
|
47
|
+
for (const substitution of request?.hostedToolSubstitutions ?? []) {
|
|
48
|
+
const identity = record(normalize({ ...substitution, type: "function_call" }));
|
|
49
|
+
if (identity && intendedClient(identity) && wire?.hosted.has(substitution.callType)) hosted.add(substitution.callType);
|
|
50
|
+
}
|
|
51
|
+
return (item, clientCall) => {
|
|
52
|
+
if (request && (outbound?.tool_choice === "none" || !outbound)) return false;
|
|
53
|
+
if (!clientCall) return hosted.has(String(item.type)) && (!wire || wire.hosted.has(String(item.type)));
|
|
54
|
+
// Sparse calls keep the existing uncertain-name policy; explicit identities must be declared.
|
|
55
|
+
if (typeof item.name !== "string") return !wire || wire.clients.length > 0;
|
|
56
|
+
return intendedClient(item) && (!wire || wire.clients.some(tool => sameIdentity(item, tool)));
|
|
57
|
+
};
|
|
58
|
+
}
|