@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
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { effectiveAzureOutputBudget } from "../../adapters/azure";
|
|
2
|
+
import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
|
|
3
|
+
import { isMetaAiResponsesDestination } from "../../responses/muse-tool-name-alias";
|
|
4
|
+
import { hasMandatoryToolChoice } from "./combo-required-tool-contract";
|
|
5
|
+
import { isCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
|
|
2
6
|
import { resolveWireProtocolOverride } from "../adapter-resolve";
|
|
3
|
-
import { comboCooldownRetryAfterSeconds, type CodexAccountModelRefusal } from "../../combos/failover";
|
|
7
|
+
import { comboCooldownRetryAfterSeconds, isDefiniteContextOverflow, type CodexAccountModelRefusal } from "../../combos/failover";
|
|
4
8
|
import { fallbackTriggerForStatus, guardFallbackHop } from "../../routing/fallback-policy";
|
|
5
9
|
import {
|
|
6
10
|
isCodexReasoningEffort,
|
|
@@ -35,6 +39,7 @@ import {
|
|
|
35
39
|
comboExclusionReasons,
|
|
36
40
|
comboTargetSkipTrigger,
|
|
37
41
|
noteComboSuccess,
|
|
42
|
+
settleComboReprobeSuccess,
|
|
38
43
|
comboFailureDecision,
|
|
39
44
|
advanceComboAfterFailure,
|
|
40
45
|
comboFailureCooldownScope,
|
|
@@ -54,7 +59,7 @@ import {
|
|
|
54
59
|
previousResponseProviderState,
|
|
55
60
|
} from "../../responses/state";
|
|
56
61
|
import { hasUnreadableEncryptedAgentTask } from "./encrypted-payload";
|
|
57
|
-
import { routeConcreteModel, comboRouteDecisionTrace } from "../../router";
|
|
62
|
+
import { captureRouteStaticPolicy, routeConcreteModel, comboRouteDecisionTrace } from "../../router";
|
|
58
63
|
import { memoryModelRouteReason } from "./memory-models";
|
|
59
64
|
import { baseProviderLabel, poolAccountProviderLabel } from "../../providers/label";
|
|
60
65
|
import { getAccountSet } from "../../oauth/store";
|
|
@@ -113,9 +118,11 @@ import {
|
|
|
113
118
|
markEagerRelaySseResponse,
|
|
114
119
|
} from "../relay";
|
|
115
120
|
import { preflightComboStreamResponse } from "./combo-stream-preflight";
|
|
121
|
+
import { requiredToolContractOf } from "./combo-required-tool-contract";
|
|
116
122
|
import { streamingContextOverflowResponse, jsonContextOverflowResponse, lateAttributionLimitResponse } from "./context-overflow";
|
|
117
123
|
import { mandatoryResponsesReasoningReplayUnavailable } from "./core-replay";
|
|
118
|
-
import { settleOperatorReplacement } from "../../lib/upstream-retry";
|
|
124
|
+
import { isReplayRefusalResponse, settleOperatorReplacement, UPSTREAM_RESET_REPLAY_REFUSED_CODE } from "../../lib/upstream-retry";
|
|
125
|
+
import { attributeFinalRequest } from "../request-log-failure-attribution";
|
|
119
126
|
import { createComboProtocolLanes, dispatchNativeComboChild } from "./core-combo-native";
|
|
120
127
|
import { createJevModelInvoker } from "./jev-model-invoke";
|
|
121
128
|
import { comboRequestedEffortLabel } from "./combo-requested-effort";
|
|
@@ -319,19 +326,23 @@ interface JevComboChoice {
|
|
|
319
326
|
candidate: JevCandidate;
|
|
320
327
|
}
|
|
321
328
|
|
|
322
|
-
/** Enumerate
|
|
329
|
+
/** Enumerate this request's eligible targets without reserving another recovery pass. */
|
|
323
330
|
function eligibleJevComboChoices(
|
|
324
331
|
config: OcxConfig,
|
|
325
332
|
comboId: string,
|
|
326
333
|
eligible: (target: NonNullable<ReturnType<typeof getCombo>>["targets"][number]) => boolean,
|
|
327
334
|
now: number,
|
|
335
|
+
cooldownReprobeTargets?: ComboPick["cooldownReprobeTargets"],
|
|
328
336
|
): JevComboChoice[] {
|
|
329
337
|
const combo = getCombo(config, comboId);
|
|
330
338
|
if (!combo) return [];
|
|
331
339
|
const excluded = new Set<string>();
|
|
332
340
|
const choices: JevComboChoice[] = [];
|
|
341
|
+
const reserved = cooldownReprobeTargets ? Object.entries(cooldownReprobeTargets) : undefined;
|
|
333
342
|
while (excluded.size < combo.targets.length) {
|
|
334
|
-
const pick = pickComboTarget(config, comboId, {
|
|
343
|
+
const pick = pickComboTarget(config, comboId, {
|
|
344
|
+
exclude: excluded, eligible, now, allowCooldownReprobe: false, cooldownReprobeTargets: reserved,
|
|
345
|
+
});
|
|
335
346
|
if (!pick) break;
|
|
336
347
|
const key = targetKey(pick.target);
|
|
337
348
|
excluded.add(key);
|
|
@@ -388,6 +399,10 @@ export async function executeComboResponses(
|
|
|
388
399
|
// result after its provisional Authorization is removed, including an explicitly keyless result.
|
|
389
400
|
const replayPrincipal = options.replayPrincipal
|
|
390
401
|
?? { clientPrincipalId: resolveContextPrincipal(req, config, options.admission) };
|
|
402
|
+
// The caller's model scope, resolved once from the request options. A capability-authenticated
|
|
403
|
+
// internal request carries the caller's captured scope on options.admissionScope even though
|
|
404
|
+
// its own admission is the host's broad key; recomputing from options.admission would lose it.
|
|
405
|
+
const admissionScope = options.admissionScope ?? resolveAdmissionModelScope(config, options.admission);
|
|
391
406
|
// PF-07: present only for a Chat combo with `nativeChatCombos` on; otherwise every child
|
|
392
407
|
// takes the bridge below exactly as before.
|
|
393
408
|
const protocolLanes = createComboProtocolLanes({
|
|
@@ -395,7 +410,7 @@ export async function executeComboResponses(
|
|
|
395
410
|
req,
|
|
396
411
|
config,
|
|
397
412
|
logCtx,
|
|
398
|
-
|
|
413
|
+
admissionScope,
|
|
399
414
|
droidDefaultEffort: options.droidDefaultEffort,
|
|
400
415
|
comboId,
|
|
401
416
|
targets: combo.targets,
|
|
@@ -480,6 +495,18 @@ export async function executeComboResponses(
|
|
|
480
495
|
const adoptFailedChildLog = (childLog: RequestLogContext): void => {
|
|
481
496
|
// Attempts remain the complete physical history; the logical row mirrors the failed
|
|
482
497
|
// target whose response is returned, including an earlier quota refusal on exhaustion.
|
|
498
|
+
// The ingress finalizer cannot stamp this child once activeAttempt is cleared below.
|
|
499
|
+
if (childLog.activeAttempt) {
|
|
500
|
+
attributeFinalRequest({
|
|
501
|
+
status: childLog.activeAttempt.status,
|
|
502
|
+
terminalSource: childLog.terminalSource,
|
|
503
|
+
transportPhase: childLog.transportPhase,
|
|
504
|
+
causeHint: childLog.causeHint,
|
|
505
|
+
outputObserved: childLog.firstOutputMs !== undefined,
|
|
506
|
+
locallyAnswered: childLog.localTerminalReason !== undefined,
|
|
507
|
+
attempt: childLog.activeAttempt,
|
|
508
|
+
});
|
|
509
|
+
}
|
|
483
510
|
Object.assign(logCtx, childLog, {
|
|
484
511
|
requestedModel,
|
|
485
512
|
model: requestedModel,
|
|
@@ -509,10 +536,29 @@ export async function executeComboResponses(
|
|
|
509
536
|
const payloadEligible = (target: (typeof combo.targets)[number]): boolean =>
|
|
510
537
|
comboPayloadReadable || !unreadableEncryptedAgentTask || canDecryptUnreadableAgentTask(target);
|
|
511
538
|
const meteredAllowed = admissionMayUseMeteredComboTargets(config, options.admission, combo);
|
|
539
|
+
const museToolEligible = (target: (typeof combo.targets)[number]): boolean => {
|
|
540
|
+
if (!hasMandatoryToolChoice(body)) return true;
|
|
541
|
+
try {
|
|
542
|
+
const route = routeConcreteModel(config, `${target.provider}/${target.model}`);
|
|
543
|
+
const inboundWire = options.inboundWire ?? "responses";
|
|
544
|
+
const policy = captureRouteStaticPolicy(route.providerName, route.modelId, route.provider,
|
|
545
|
+
route.staticPolicy.effectiveAlias, inboundWire);
|
|
546
|
+
const provider = resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire, policy);
|
|
547
|
+
return provider.adapter !== "openai-responses"
|
|
548
|
+
|| !isMetaAiResponsesDestination(buildResponsesTransport(provider, { headers: req.headers }).url);
|
|
549
|
+
} catch {
|
|
550
|
+
return true;
|
|
551
|
+
}
|
|
552
|
+
};
|
|
553
|
+
const onlyMuseToolIncompatible = (): boolean => {
|
|
554
|
+
const enabled = combo.targets.filter(target => config.providers[target.provider]?.disabled !== true);
|
|
555
|
+
return enabled.length > 0 && enabled.every(target => !museToolEligible(target));
|
|
556
|
+
};
|
|
512
557
|
// Recovery can replace unreadable encrypted input, but cannot relax other admission checks.
|
|
513
558
|
const recoveryEligible = (target: (typeof combo.targets)[number]): boolean =>
|
|
514
559
|
(meteredAllowed || !target.metered)
|
|
515
560
|
&& (combo.strategy !== "jev" || target.provider !== JEV_PROVIDER_ID)
|
|
561
|
+
&& museToolEligible(target)
|
|
516
562
|
&& reasoningReplayEligible(target)
|
|
517
563
|
&& (protocolLanes?.pickable(target) ?? true);
|
|
518
564
|
const targetEligible = (target: (typeof combo.targets)[number]): boolean =>
|
|
@@ -582,6 +628,8 @@ export async function executeComboResponses(
|
|
|
582
628
|
exclude?: Iterable<string>;
|
|
583
629
|
eligible?: (target: NonNullable<typeof combo>["targets"][number]) => boolean;
|
|
584
630
|
allowCooldownReprobe?: boolean;
|
|
631
|
+
/** This request's own cooldown-reprobe reservation, carried through its failover hops. */
|
|
632
|
+
cooldownReprobeTargets?: Iterable<readonly [string, number]>;
|
|
585
633
|
now?: number;
|
|
586
634
|
}) => pickComboTargetWithWait(config, comboId, {
|
|
587
635
|
...pickOptions,
|
|
@@ -625,6 +673,9 @@ export async function executeComboResponses(
|
|
|
625
673
|
config,
|
|
626
674
|
{ parentThreadId: inboundClientThreadId },
|
|
627
675
|
);
|
|
676
|
+
if (!options.abortSignal?.aborted && onlyMuseToolIncompatible()) {
|
|
677
|
+
return comboUnavailableResponse(`No available targets for combo: ${comboId}; Meta Responses does not support mandatory tool_choice`);
|
|
678
|
+
}
|
|
628
679
|
return options.abortSignal?.aborted
|
|
629
680
|
? clientCancelledResponse()
|
|
630
681
|
: comboUnavailable(comboId, undefined,
|
|
@@ -642,6 +693,9 @@ export async function executeComboResponses(
|
|
|
642
693
|
const protocolRefusal = protocolLanes?.refusal();
|
|
643
694
|
if (protocolRefusal) return protocolRefusal;
|
|
644
695
|
if (onlyReplayIncompatibleTargetsRemain()) return targetIncompatibleResponse();
|
|
696
|
+
if (!options.abortSignal?.aborted && onlyMuseToolIncompatible()) {
|
|
697
|
+
return comboUnavailableResponse(`No available targets for combo: ${comboId}; Meta Responses does not support mandatory tool_choice`);
|
|
698
|
+
}
|
|
645
699
|
return options.abortSignal?.aborted
|
|
646
700
|
? clientCancelledResponse()
|
|
647
701
|
: comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, targetEligible));
|
|
@@ -672,22 +726,20 @@ export async function executeComboResponses(
|
|
|
672
726
|
}
|
|
673
727
|
let jevDecision: JevDecision | undefined;
|
|
674
728
|
if (combo.strategy === "jev" && !toolLoopPin) {
|
|
675
|
-
const choices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now());
|
|
729
|
+
const choices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now(), pick.cooldownReprobeTargets);
|
|
676
730
|
const first = choices[0];
|
|
677
731
|
if (!first) {
|
|
678
732
|
return comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, target =>
|
|
679
733
|
targetEligible(target) && target.provider !== JEV_PROVIDER_ID && jevChoiceEfforts(config, target, false) !== undefined));
|
|
680
734
|
}
|
|
681
|
-
const
|
|
682
|
-
"medium",
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
effort: resolvedFailOpenEffort && isCodexReasoningEffort(resolvedFailOpenEffort)
|
|
688
|
-
? resolvedFailOpenEffort as OcxComboDefaultEffort
|
|
689
|
-
: null,
|
|
735
|
+
const fallbackFor = (choice: JevComboChoice): Pick<JevDecision, "targetKey" | "effort"> => {
|
|
736
|
+
const effort = resolveEffortAtOrBelow("medium", choice.candidate.reasoningEfforts);
|
|
737
|
+
return {
|
|
738
|
+
targetKey: choice.candidate.key,
|
|
739
|
+
effort: effort && isCodexReasoningEffort(effort) ? effort as OcxComboDefaultEffort : null,
|
|
740
|
+
};
|
|
690
741
|
};
|
|
742
|
+
const fallback = fallbackFor(first);
|
|
691
743
|
const decisionStartedAt = Date.now();
|
|
692
744
|
const pinReuse = jevPin?.reuse(
|
|
693
745
|
choices.map(choice => choice.candidate),
|
|
@@ -702,7 +754,7 @@ export async function executeComboResponses(
|
|
|
702
754
|
fallback,
|
|
703
755
|
config,
|
|
704
756
|
isDestinationAllowed: (providerName, modelId) => routeAllowedByScope(
|
|
705
|
-
|
|
757
|
+
admissionScope, { providerName, modelId },
|
|
706
758
|
),
|
|
707
759
|
...(combo.decisionQuotaSignals === true ? { decisionQuotaSignals: true, decisionQuotaTiers: combo.decisionQuotaTiers } : {}),
|
|
708
760
|
...(combo.decisionProvider ? { decisionProvider: combo.decisionProvider } : {}),
|
|
@@ -712,7 +764,7 @@ export async function executeComboResponses(
|
|
|
712
764
|
invokeModel: createJevModelInvoker({
|
|
713
765
|
req,
|
|
714
766
|
config,
|
|
715
|
-
options,
|
|
767
|
+
options: { ...options, admissionScope },
|
|
716
768
|
handleResponses: requestDispatchers.handleResponses,
|
|
717
769
|
}),
|
|
718
770
|
}
|
|
@@ -729,9 +781,32 @@ export async function executeComboResponses(
|
|
|
729
781
|
latencyMs: Math.max(0, Date.now() - decisionStartedAt),
|
|
730
782
|
};
|
|
731
783
|
}
|
|
784
|
+
let selected = choices.find(choice => choice.candidate.key === decision.targetKey) ?? first;
|
|
785
|
+
let selectionUnavailable = false;
|
|
786
|
+
if (pick.cooldownReprobeTargets && !options.abortSignal?.aborted) {
|
|
787
|
+
// Another request can replace a cooldown while the decision is awaited. Recheck the
|
|
788
|
+
// original reservation, current availability and request eligibility without reserving again.
|
|
789
|
+
const currentChoices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now(), pick.cooldownReprobeTargets);
|
|
790
|
+
const current = currentChoices.find(choice => choice.candidate.key === decision.targetKey
|
|
791
|
+
&& (decision.effort === null ? choice.candidate.reasoningEfforts.length === 0
|
|
792
|
+
: choice.candidate.reasoningEfforts.includes(decision.effort)));
|
|
793
|
+
const available = current ?? currentChoices[0];
|
|
794
|
+
if (available) selected = available;
|
|
795
|
+
else selectionUnavailable = true;
|
|
796
|
+
if (!current) {
|
|
797
|
+
// Keep completed decision usage even when no target remains. Old scores and quota
|
|
798
|
+
// selection describe neither a fail-open replacement nor a rejected selection.
|
|
799
|
+
decision = {
|
|
800
|
+
backend: decision.backend,
|
|
801
|
+
...(available ? fallbackFor(available) : { targetKey: decision.targetKey, effort: decision.effort }),
|
|
802
|
+
gate: decision.gate === "apply" ? "invalid" : decision.gate,
|
|
803
|
+
latencyMs: decision.latencyMs,
|
|
804
|
+
...(decision.usage ? { usage: decision.usage } : {}),
|
|
805
|
+
};
|
|
806
|
+
}
|
|
807
|
+
}
|
|
732
808
|
if (pinReuse?.released) decision = { ...decision, pinReason: pinReuse.released };
|
|
733
809
|
jevDecision = decision;
|
|
734
|
-
const selected = choices.find(choice => choice.candidate.key === decision.targetKey) ?? first;
|
|
735
810
|
pick = { ...selected.pick, attempted: [targetKey(selected.pick.target)] };
|
|
736
811
|
logCtx.jevDecision = normalizePersistedJevDecision({
|
|
737
812
|
version: 1,
|
|
@@ -766,6 +841,11 @@ export async function executeComboResponses(
|
|
|
766
841
|
: {}),
|
|
767
842
|
...(decision.usage ? { usage: decision.usage } : {}),
|
|
768
843
|
});
|
|
844
|
+
// A completed decision belongs to the parent log even if no model can be dispatched.
|
|
845
|
+
if (selectionUnavailable) {
|
|
846
|
+
return comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, target =>
|
|
847
|
+
targetEligible(target) && target.provider !== JEV_PROVIDER_ID && jevChoiceEfforts(config, target, false) !== undefined));
|
|
848
|
+
}
|
|
769
849
|
}
|
|
770
850
|
// One immutable combo selection trace, before any child dispatch; child
|
|
771
851
|
// adoption below must never replace it with a concrete child route trace.
|
|
@@ -817,10 +897,15 @@ export async function executeComboResponses(
|
|
|
817
897
|
// "OpenAI account pool has no usable account credential" while every Claude account was spent.
|
|
818
898
|
let quotaFailure: Response | undefined;
|
|
819
899
|
let quotaFailedChildLog: RequestLogContext | undefined;
|
|
900
|
+
let contextFailure: { response: Response; childLog: RequestLogContext } | undefined;
|
|
820
901
|
// Snapshotted before dispatch: a 401/403 inside this ladder cools its own provider, and that
|
|
821
902
|
// fresh cooldown is not a reason the request found no target.
|
|
822
903
|
const quotaCooldownSnapshot = snapshotComboQuotaCooldowns(config, comboId);
|
|
823
904
|
const exhaustedFailure = (): Response => {
|
|
905
|
+
if (contextFailure) {
|
|
906
|
+
adoptFailedChildLog(contextFailure.childLog);
|
|
907
|
+
return contextFailure.response;
|
|
908
|
+
}
|
|
824
909
|
const returnsQuota = lastFailure && [400, 401, 403].includes(lastFailure.status) && quotaFailure;
|
|
825
910
|
const failedChildLog = returnsQuota ? quotaFailedChildLog : lastFailedChildLog;
|
|
826
911
|
if (failedChildLog) adoptFailedChildLog(failedChildLog);
|
|
@@ -1016,6 +1101,19 @@ export async function executeComboResponses(
|
|
|
1016
1101
|
finishRequestAttempt(attempt, 499, Date.now() - started, childLog.usage);
|
|
1017
1102
|
attemptRetained = true;
|
|
1018
1103
|
};
|
|
1104
|
+
// The row is written from `logCtx`, which copies `childLog` only when the child commits. A
|
|
1105
|
+
// bridge child binds its usage later, at the terminal frame, so the binding is forwarded here
|
|
1106
|
+
// after that point. Left on `childLog`, the row would re-read the bridged wire instead of the
|
|
1107
|
+
// adapter's usage, and that wire has no providerCredits and a context-derived input count.
|
|
1108
|
+
// A binding that arrives before the commit waits for it, and a child that never commits
|
|
1109
|
+
// forwards nothing: both flags belong to this target only.
|
|
1110
|
+
let childCommitted = false;
|
|
1111
|
+
let childUsageBound = false;
|
|
1112
|
+
const forwardChildUsage = (): void => {
|
|
1113
|
+
if (!childCommitted || !childUsageBound) return;
|
|
1114
|
+
logCtx.usageFromBridge = true;
|
|
1115
|
+
if (childLog.usage) logCtx.usage = childLog.usage;
|
|
1116
|
+
};
|
|
1019
1117
|
const completedTarget = { provider: pick.target.provider, model: pick.target.model };
|
|
1020
1118
|
const writerGeneration = pick.writerGeneration;
|
|
1021
1119
|
let consumedChildFailure: ConsumedComboFailure | undefined;
|
|
@@ -1096,6 +1194,10 @@ export async function executeComboResponses(
|
|
|
1096
1194
|
comboDispatchPermit: hopDecision?.allowed ? hopDecision.permit : undefined,
|
|
1097
1195
|
comboReplaySnapshot,
|
|
1098
1196
|
deferCodexResetDerivedCooldown,
|
|
1197
|
+
onBridgeUsageBound: () => {
|
|
1198
|
+
childUsageBound = true;
|
|
1199
|
+
forwardChildUsage();
|
|
1200
|
+
},
|
|
1099
1201
|
// Attempt-relative TTFT is recorded HERE (not via childLog.firstOutputMs — a later
|
|
1100
1202
|
// Object.assign(logCtx, childLog) would overwrite the request-relative value).
|
|
1101
1203
|
onFirstOutput: () => {
|
|
@@ -1138,7 +1240,10 @@ export async function executeComboResponses(
|
|
|
1138
1240
|
const eagerRelay = isEagerRelaySseResponse(response);
|
|
1139
1241
|
let preflight;
|
|
1140
1242
|
try {
|
|
1141
|
-
preflight = await preflightComboStreamResponse(response, childLog
|
|
1243
|
+
preflight = await preflightComboStreamResponse(response, childLog, undefined, {
|
|
1244
|
+
signal: options.abortSignal,
|
|
1245
|
+
requiredToolPrelude: childLog.providerAdapter === "openai-responses" && requiredToolContractOf(rawBody) !== undefined,
|
|
1246
|
+
});
|
|
1142
1247
|
} catch (error) {
|
|
1143
1248
|
callbackGate.discard();
|
|
1144
1249
|
if (options.abortSignal?.aborted) {
|
|
@@ -1161,6 +1266,13 @@ export async function executeComboResponses(
|
|
|
1161
1266
|
}
|
|
1162
1267
|
}
|
|
1163
1268
|
|
|
1269
|
+
if (options.abortSignal?.aborted) {
|
|
1270
|
+
callbackGate.discard();
|
|
1271
|
+
await response.body?.cancel().catch(() => undefined);
|
|
1272
|
+
retainCancelledAttempt();
|
|
1273
|
+
return clientCancelledResponse();
|
|
1274
|
+
}
|
|
1275
|
+
|
|
1164
1276
|
if (response.ok) {
|
|
1165
1277
|
sealRequestAttemptIdentity(
|
|
1166
1278
|
attempt,
|
|
@@ -1170,6 +1282,7 @@ export async function executeComboResponses(
|
|
|
1170
1282
|
);
|
|
1171
1283
|
attemptRetained = true;
|
|
1172
1284
|
noteComboSuccess(comboId, combo, pick.target, pick.writerGeneration);
|
|
1285
|
+
settleComboReprobeSuccess(pick);
|
|
1173
1286
|
Object.assign(logCtx, childLog, {
|
|
1174
1287
|
requestedModel,
|
|
1175
1288
|
model: requestedModel,
|
|
@@ -1184,6 +1297,8 @@ export async function executeComboResponses(
|
|
|
1184
1297
|
options.onCodexAuthContextResolved?.(resolvedAuth);
|
|
1185
1298
|
options.setTerminalOutcomeRecorder?.(terminalRecorder);
|
|
1186
1299
|
callbackGate.commit();
|
|
1300
|
+
childCommitted = true;
|
|
1301
|
+
forwardChildUsage();
|
|
1187
1302
|
return response;
|
|
1188
1303
|
}
|
|
1189
1304
|
|
|
@@ -1226,6 +1341,12 @@ export async function executeComboResponses(
|
|
|
1226
1341
|
Date.now() - started,
|
|
1227
1342
|
failure.usage,
|
|
1228
1343
|
);
|
|
1344
|
+
if (isReplayRefusalResponse(failure.response)) {
|
|
1345
|
+
// Numeric 429 is a client replay policy here, not an upstream quota observation.
|
|
1346
|
+
childLog.causeHint = "transport-ambiguous";
|
|
1347
|
+
childLog.terminalSource = "synthetic";
|
|
1348
|
+
childLog.errorCode = attempt.errorCode = UPSTREAM_RESET_REPLAY_REFUSED_CODE;
|
|
1349
|
+
}
|
|
1229
1350
|
if (failure.upstreamCode === "input_admission_refused" && attempt.sendCount === 0) {
|
|
1230
1351
|
attempt.errorCode = failure.upstreamCode;
|
|
1231
1352
|
localAdmissionRefusals?.push(failure.upstreamMessage ?? "");
|
|
@@ -1314,6 +1435,12 @@ export async function executeComboResponses(
|
|
|
1314
1435
|
}
|
|
1315
1436
|
return lastFailure;
|
|
1316
1437
|
}
|
|
1438
|
+
// Retain a confirmed target context refusal when later retryable failures exhaust the ladder.
|
|
1439
|
+
// Hard stops above still return their own verdict, and every attempt keeps its own usage.
|
|
1440
|
+
if (!contextFailure && failure.response.status === 400 && isDefiniteContextOverflow(400, failure.classificationText)) {
|
|
1441
|
+
contextFailure = { childLog, response: formatErrorResponse(400, "invalid_request_error",
|
|
1442
|
+
failure.upstreamMessage ?? failure.classificationText, { code: "context_length_exceeded", classified: true }) };
|
|
1443
|
+
}
|
|
1317
1444
|
// A bare status made a revoked credential read as a provider outage. Log only the parsed
|
|
1318
1445
|
// code and message, never the raw envelope, as one redacted, bounded line.
|
|
1319
1446
|
const failureReason = sanitizeLogMetadataString(
|
|
@@ -1347,9 +1474,10 @@ export async function executeComboResponses(
|
|
|
1347
1474
|
const poolLocalRefusal = isAnthropicPoolLocalRefusal(
|
|
1348
1475
|
config, pick.target.provider, failure.response.status, failedAccount, failureNow,
|
|
1349
1476
|
);
|
|
1477
|
+
const codexLocalRefusal = isCodexAccountCooldownResponse(failure.response);
|
|
1350
1478
|
const nextPick = advanceComboAfterFailure(config, pick, {
|
|
1351
|
-
retryAfter: poolLocalRefusal ? undefined : failure.retryAfter,
|
|
1352
|
-
resetAt: failure.resetAt,
|
|
1479
|
+
retryAfter: poolLocalRefusal || codexLocalRefusal ? undefined : failure.retryAfter,
|
|
1480
|
+
resetAt: codexLocalRefusal ? undefined : failure.resetAt,
|
|
1353
1481
|
cooldownMs: combo.cooldownMs,
|
|
1354
1482
|
now: failureNow,
|
|
1355
1483
|
cooldownScope: failureCooldownScope,
|
|
@@ -1368,10 +1496,13 @@ export async function executeComboResponses(
|
|
|
1368
1496
|
&& failedTargetCooldownRecorded
|
|
1369
1497
|
&& isComboTargetInCooldown(comboId, pick.target, failureNow);
|
|
1370
1498
|
// Drop exclusions for the single-target retry, but wait for normal cooldown
|
|
1371
|
-
// expiry: an in-flight request cannot reserve a fresh recovery pass
|
|
1372
|
-
|
|
1499
|
+
// expiry: an in-flight request cannot reserve a fresh recovery pass, though the
|
|
1500
|
+
// reservation it already owns still applies to entries unchanged since it was made.
|
|
1501
|
+
const carriedReprobe: ComboPick["cooldownReprobeTargets"] = pick.cooldownReprobeTargets;
|
|
1502
|
+
const retryAfterCooldown = (): Promise<ComboPick | null> =>
|
|
1373
1503
|
pickWithWait({
|
|
1374
1504
|
allowCooldownReprobe: false,
|
|
1505
|
+
cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
|
|
1375
1506
|
eligible: targetEligible,
|
|
1376
1507
|
now: failureNow,
|
|
1377
1508
|
});
|
|
@@ -1381,6 +1512,7 @@ export async function executeComboResponses(
|
|
|
1381
1512
|
pick = await pickWithWait({
|
|
1382
1513
|
exclude: pick.attempted,
|
|
1383
1514
|
eligible: targetEligible,
|
|
1515
|
+
cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
|
|
1384
1516
|
now: failureNow,
|
|
1385
1517
|
});
|
|
1386
1518
|
// A single-target combo with waitForCooldownMs has no alternate target to fail over to,
|
|
@@ -1407,6 +1539,7 @@ export async function executeComboResponses(
|
|
|
1407
1539
|
if (!pick) {
|
|
1408
1540
|
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
1409
1541
|
if (onlyReplayIncompatibleTargetsRemain(attemptedTargets)) {
|
|
1542
|
+
if (contextFailure) return exhaustedFailure();
|
|
1410
1543
|
adoptFailedChildLog(childLog);
|
|
1411
1544
|
return targetIncompatibleResponse();
|
|
1412
1545
|
}
|
|
@@ -1414,6 +1547,7 @@ export async function executeComboResponses(
|
|
|
1414
1547
|
const recoveredTarget = await pickWithWait({
|
|
1415
1548
|
exclude: attemptedTargets,
|
|
1416
1549
|
eligible: recoveryEligible,
|
|
1550
|
+
cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
|
|
1417
1551
|
now: failureNow,
|
|
1418
1552
|
});
|
|
1419
1553
|
if (recoveredTarget && await recoverUnreadableEncryptedTask()) {
|
|
@@ -1432,7 +1566,7 @@ export async function executeComboResponses(
|
|
|
1432
1566
|
}
|
|
1433
1567
|
const failure = exhaustedFailure();
|
|
1434
1568
|
if (
|
|
1435
|
-
lastFailure?.status === 413
|
|
1569
|
+
failure === lastFailure && lastFailure?.status === 413
|
|
1436
1570
|
&& lastFailureClassifiesOverflow
|
|
1437
1571
|
) {
|
|
1438
1572
|
if (localAdmissionRefusals?.length) logCtx.errorCode = "input_admission_refused";
|
|
@@ -3,6 +3,7 @@ import { carryResponseToolOwnership } from "./response-tool-ownership";
|
|
|
3
3
|
import { finalizeTranslatorBudgetResponse } from "../../lib/translator-budget";
|
|
4
4
|
import { carryReplayRefusal, isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
5
5
|
import { isVerifiedModelNotInPlanResponse, markVerifiedModelNotInPlanResponse } from "../../lib/errors";
|
|
6
|
+
import { carryCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
|
|
6
7
|
import {
|
|
7
8
|
isNativePassthroughSseResponse,
|
|
8
9
|
markNativePassthroughSseResponse,
|
|
@@ -53,6 +54,7 @@ export function finalizeOwnedTranslatorBudget(response: Response, budget: Transl
|
|
|
53
54
|
if (isNonReplayableResponse(response)) markResponseNonReplayable(finalizedResponse);
|
|
54
55
|
if (isVerifiedModelNotInPlanResponse(response)) markVerifiedModelNotInPlanResponse(finalizedResponse);
|
|
55
56
|
if (runTurnAdapterSseResponses.has(response)) runTurnAdapterSseResponses.add(finalizedResponse);
|
|
57
|
+
carryCodexAccountCooldownResponse(response, finalizedResponse);
|
|
56
58
|
return carryResponseToolOwnership(response, finalizedResponse);
|
|
57
59
|
}
|
|
58
60
|
|
|
@@ -79,6 +81,8 @@ export function finalizeAccountLease(response: Response, release: () => void, on
|
|
|
79
81
|
if (isEagerRelaySseResponse(response)) markEagerRelaySseResponse(wrapped);
|
|
80
82
|
if (isPreinspectedJsonResponse(response)) markPreinspectedJsonResponse(wrapped);
|
|
81
83
|
if (runTurnAdapterSseResponses.has(response)) runTurnAdapterSseResponses.add(wrapped);
|
|
84
|
+
// Retained compaction delivers through this lease wrapper; keep a local cooldown refusal local (#7850).
|
|
85
|
+
carryCodexAccountCooldownResponse(response, wrapped);
|
|
82
86
|
return carryResponseToolOwnership(response, carryReplayRefusal(response, wrapped));
|
|
83
87
|
}
|
|
84
88
|
|
|
@@ -6,6 +6,7 @@ import type { SingleUseDispatchPermit } from "../../lib/request-execution-budget
|
|
|
6
6
|
import type { CodexAuthPolicyConfig, CodexAuthContext } from "../../codex/auth-context";
|
|
7
7
|
import type { AdmissionLease } from "../../lib/admission";
|
|
8
8
|
import type { DataPlaneAdmission } from "../auth-cors";
|
|
9
|
+
import type { AdmissionModelScope } from "../admission-model-scope";
|
|
9
10
|
import { resolveCodexModelEntitlements } from "../../codex/model-entitlements";
|
|
10
11
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
11
12
|
import type { ResponsesTerminalRepairScheduler } from "../responses-terminal-repair";
|
|
@@ -95,6 +96,10 @@ export interface DirectRequestOption {
|
|
|
95
96
|
}
|
|
96
97
|
|
|
97
98
|
export interface HandleResponsesOptions {
|
|
99
|
+
/** Immutable caller scope inherited by a capability-authenticated internal sidecar request. */
|
|
100
|
+
admissionScope?: AdmissionModelScope;
|
|
101
|
+
/** Captured synchronously at ingress, before parsing or child replay can suspend. */
|
|
102
|
+
advisorAdmissionPolicy?: import("../../types/admission-policy").CapturedAdmissionPolicy;
|
|
98
103
|
/** Internal request-owned policy authorization; never read from client headers or body. */
|
|
99
104
|
policyRequestScope?: PolicyRequestScope;
|
|
100
105
|
/** Internal concrete selector chosen from the original policy evaluation. */
|
|
@@ -186,6 +191,8 @@ export interface HandleResponsesOptions {
|
|
|
186
191
|
anthropicServerTools?: readonly Record<string, unknown>[];
|
|
187
192
|
/** The Claude client's replayable server-tool exchanges (`replayedAnthropicServerBlocks`); same scope. */
|
|
188
193
|
anthropicServerReplay?: ReadonlyMap<string, readonly Record<string, unknown>[]>;
|
|
194
|
+
/** Metadata-qualified Messages discovery evidence, never caller JSON or a preselected destination. */
|
|
195
|
+
anthropicToolLoadingSource?: Readonly<Record<string, unknown>>;
|
|
189
196
|
/** Droid's per-request effort default; each concrete combo or policy target applies it only if its ladder allows it. */
|
|
190
197
|
droidDefaultEffort?: string;
|
|
191
198
|
/** PF-07: the Chat source a combo child may send natively; set only by the Chat ingress. */
|
|
@@ -210,6 +217,13 @@ export interface HandleResponsesOptions {
|
|
|
210
217
|
callerDirectAuth?: CallerDirectAuth | null;
|
|
211
218
|
/** Internal recursion guard; callers outside this module must not set it. */
|
|
212
219
|
comboAttempt?: boolean;
|
|
220
|
+
/**
|
|
221
|
+
* Set by the combo loop for each child. A child logs into its own context, which the combo
|
|
222
|
+
* copies once when the child commits, and the bridge reports usage after that, at the terminal
|
|
223
|
+
* frame. The transport calls this when it binds that usage on the child's context, so the combo
|
|
224
|
+
* can carry the binding to the context that writes the row.
|
|
225
|
+
*/
|
|
226
|
+
onBridgeUsageBound?: () => void;
|
|
213
227
|
/** Child-owned prepaid initial send; capacity remains charged until dispatch or unsent release. */
|
|
214
228
|
comboInitialSend?: { permit: SingleUseDispatchPermit; producerOwned?: boolean };
|
|
215
229
|
/** Exact externally booked combo hop, used for its child's spend preflight and send reports. */
|
|
@@ -268,6 +282,8 @@ export interface HandleResponsesOptions {
|
|
|
268
282
|
* returning a Responses body, which the ingress converts as before.
|
|
269
283
|
*/
|
|
270
284
|
clientEncoder?: ClientEncoderOption;
|
|
285
|
+
/** Chat ingress raw-channel delivery preference; never an upstream generation option. */
|
|
286
|
+
chatRawReasoningVisible?: boolean;
|
|
271
287
|
/** Set only by the Chat or Messages ingress on an eligible Antigravity route; see {@link DirectRequestOption}. */
|
|
272
288
|
directRequest?: DirectRequestOption;
|
|
273
289
|
}
|
|
@@ -14,6 +14,7 @@ import type { TranslatorBudget } from "../../lib/translator-budget";
|
|
|
14
14
|
import { executeComboResponses } from "./core-combo";
|
|
15
15
|
import { registerTurn, unregisterTurn } from "../lifecycle";
|
|
16
16
|
import { runWithCompactionRecovery } from "./compaction-recovery";
|
|
17
|
+
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
17
18
|
/**
|
|
18
19
|
* Route one `/v1/responses` request through the adapter pipeline: recovery loop, passthrough
|
|
19
20
|
* wire, image/web-search bridges, and the terminal-guard continuation.
|
|
@@ -35,6 +36,7 @@ export async function handleResponses(
|
|
|
35
36
|
try {
|
|
36
37
|
const response = await runWithCompactionRecovery(req, config, logCtx, {
|
|
37
38
|
...options, abortSignal,
|
|
39
|
+
advisorAdmissionPolicy: options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, options.admission, options.admissionScope),
|
|
38
40
|
openAiSidecarAuth: options.openAiSidecarAuth === undefined
|
|
39
41
|
? captureExplicitOpenAiCallerAuth(req.headers, config) : options.openAiSidecarAuth,
|
|
40
42
|
nativeCallerAuth: options.nativeCallerAuth === undefined
|
|
@@ -558,7 +558,7 @@ export async function fetchWithHeaderTimeout(
|
|
|
558
558
|
_manualRedirect = false,
|
|
559
559
|
): Promise<Response> {
|
|
560
560
|
const pacing = executor as ProviderFetch;
|
|
561
|
-
const slot = await pacing.waitForPacing
|
|
561
|
+
const slot = pacing.waitForPacing ? await pacing.waitForPacing(abortSignal) : undefined;
|
|
562
562
|
const fetchExecutor = pacing.unpacedFetch ?? executor;
|
|
563
563
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
564
564
|
try {
|
|
@@ -568,6 +568,10 @@ export async function fetchWithHeaderTimeout(
|
|
|
568
568
|
pause() { if (timer) clearTimeout(timer); timer = undefined; },
|
|
569
569
|
resume() {
|
|
570
570
|
this.pause();
|
|
571
|
+
// A non-positive budget disables the header deadline: a local upstream (LM Studio, Ollama)
|
|
572
|
+
// can stay silent for minutes during prompt prefill, so the request is bounded only by the
|
|
573
|
+
// caller's own abort signal. See resolveConnectTimeoutMs in src/stall-timeout.ts.
|
|
574
|
+
if (timeoutMs <= 0) return;
|
|
571
575
|
timer = setTimeout(() => {
|
|
572
576
|
if (!timeout.signal.aborted) timeout.abort(new DOMException("Timeout elapsed", "TimeoutError"));
|
|
573
577
|
}, timeoutMs);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readBoundedResponseBytes } from "../../lib/bounded-body";
|
|
2
|
+
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
2
3
|
import { JevModelInvokeError, type JevModelInvoke, type JevModelInvokeResult } from "../../combos/jev-model-backend";
|
|
3
4
|
import { JEV_MAX_REQUEST_BYTES, JEV_MAX_RESPONSE_BYTES } from "../../combos/jev";
|
|
4
5
|
import { serializeJevModelRequest } from "../../combos/jev-model-request";
|
|
@@ -23,8 +24,8 @@ export interface JevModelInvokerContext {
|
|
|
23
24
|
/** The request that owns the combo; only its spend root is reused, never its headers. */
|
|
24
25
|
req: Pick<Request, "headers">;
|
|
25
26
|
config: OcxConfig;
|
|
26
|
-
/** Parent options: only the
|
|
27
|
-
options: Pick<HandleResponsesOptions, "admission" | "codexAuthPolicy">;
|
|
27
|
+
/** Parent options: only the resolved admission scope, Advisor caller policy and Codex auth policy cross over. */
|
|
28
|
+
options: Pick<HandleResponsesOptions, "admission" | "admissionScope" | "advisorAdmissionPolicy" | "codexAuthPolicy">;
|
|
28
29
|
handleResponses: HandleResponses;
|
|
29
30
|
}
|
|
30
31
|
|
|
@@ -149,6 +150,12 @@ export function createJevModelInvoker(context: JevModelInvokerContext): JevModel
|
|
|
149
150
|
const response = await context.handleResponses(request, context.config, childLog, {
|
|
150
151
|
abortSignal: signal,
|
|
151
152
|
...(context.options.admission ? { admission: context.options.admission } : {}),
|
|
153
|
+
// The parent's resolved snapshot, not a scope recomputed from its admission: a
|
|
154
|
+
// capability-authenticated internal call carries the caller's scope while its own
|
|
155
|
+
// admission is the host's broad key.
|
|
156
|
+
...(context.options.admissionScope ? { admissionScope: context.options.admissionScope } : {}),
|
|
157
|
+
// The parent's ingress snapshot; without it the detached turn would re-read mutable config (#7859).
|
|
158
|
+
...(context.options.advisorAdmissionPolicy ? { advisorAdmissionPolicy: context.options.advisorAdmissionPolicy } : {}),
|
|
152
159
|
...(context.options.codexAuthPolicy ? { codexAuthPolicy: context.options.codexAuthPolicy } : {}),
|
|
153
160
|
// Explicit nulls: handleResponses captures caller credentials only when these are undefined.
|
|
154
161
|
callerDirectAuth: null,
|
|
@@ -164,7 +171,7 @@ export function createJevModelInvoker(context: JevModelInvokerContext): JevModel
|
|
|
164
171
|
}
|
|
165
172
|
const bounded = await readBoundedResponseBytes(response, { maxBytes: JEV_MAX_RESPONSE_BYTES, signal });
|
|
166
173
|
if (bounded.oversized) throw new JevModelInvokeError("malformed", "decision response too large");
|
|
167
|
-
const result = response.headers
|
|
174
|
+
const result = hasResponseMediaType(response.headers, "text/event-stream")
|
|
168
175
|
? decodeSse(bounded.bytes)
|
|
169
176
|
: (() => {
|
|
170
177
|
let parsed: unknown;
|
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
* Codex writes memories in two background phases, and both ask the provider for a bare native
|
|
5
5
|
* model: Phase 1 ("extract") summarizes one finished thread per call and asks for
|
|
6
6
|
* `gpt-5.6-luna` at effort `low`; Phase 2 ("consolidation") is one agent run that merges those
|
|
7
|
-
* summaries into the files under `$CODEX_HOME/memories` and asks for
|
|
8
|
-
* `medium
|
|
7
|
+
* summaries into the files under `$CODEX_HOME/memories` and asks for a Terra model at effort
|
|
8
|
+
* `medium` (`gpt-5.6-terra` on current clients, with `gpt-6.1-terra` available as clients move).
|
|
9
|
+
* Without a configured target each keeps its existing route; Phase 1 additionally looks like the app's
|
|
9
10
|
* title/commit helper traffic, because the app uses the same model id for those.
|
|
10
11
|
*
|
|
11
12
|
* A phase is therefore recognized from Codex's own turn metadata, never inferred from the model
|