@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
type TranslatorBudget,
|
|
6
6
|
} from "../../lib/translator-budget";
|
|
7
7
|
import type { AdapterEvent, OcxMessage, OcxUsage } from "../../types";
|
|
8
|
+
import { withMissingCreditReading } from "../../usage/credit-billing";
|
|
8
9
|
import { mergeUsage } from "./terminal-guard";
|
|
9
10
|
|
|
10
11
|
export const MAX_ADVISOR_RETAINED_EVENTS = 4_096;
|
|
@@ -16,6 +17,7 @@ export class AdvisorRetention {
|
|
|
16
17
|
private historyBytes = 0;
|
|
17
18
|
private copyBytes = 0;
|
|
18
19
|
private usageBytes = 0;
|
|
20
|
+
private dispatchedLegs = 0;
|
|
19
21
|
private events = 0;
|
|
20
22
|
private calls = 0;
|
|
21
23
|
|
|
@@ -30,17 +32,23 @@ export class AdvisorRetention {
|
|
|
30
32
|
|
|
31
33
|
/** Usage can alias a terminal payload. Keep its own owner after the raw leg ends. */
|
|
32
34
|
usage(first: OcxUsage | undefined, second: OcxUsage | undefined): OcxUsage | undefined {
|
|
33
|
-
|
|
35
|
+
const hasEarlierLeg = this.dispatchedLegs++ > 0;
|
|
36
|
+
const snapshot = second ?? first;
|
|
37
|
+
if (!snapshot) return undefined;
|
|
38
|
+
const missingReading = hasEarlierLeg && (!first || !second)
|
|
39
|
+
&& snapshot.providerCredits !== undefined && snapshot.providerCredits !== -1;
|
|
40
|
+
if (!second && !missingReading) return first;
|
|
34
41
|
// Two-input merge materializes a new object. Reserve before merging, including
|
|
35
42
|
// a conservative bound for concatenation if a provider supplied malformed scalars.
|
|
36
|
-
const bytes = first
|
|
43
|
+
const bytes = first && second
|
|
37
44
|
? (jsonUtf8Bytes(first) + jsonUtf8Bytes(second)) * 2 + 256
|
|
38
|
-
: jsonUtf8Bytes(
|
|
45
|
+
: jsonUtf8Bytes(snapshot) + (missingReading ? 3 : 1);
|
|
39
46
|
this.charge(bytes, "request_copies");
|
|
40
47
|
this.copyBytes += bytes;
|
|
41
48
|
let retained = 0;
|
|
42
49
|
try {
|
|
43
|
-
const merged = mergeUsage(first, second)
|
|
50
|
+
const merged = first && second ? mergeUsage(first, second)
|
|
51
|
+
: missingReading ? withMissingCreditReading(snapshot) : snapshot;
|
|
44
52
|
const measured = jsonUtf8Bytes(merged, bytes) + 1;
|
|
45
53
|
if (measured > bytes) throw new TranslatorBudgetExceededError("request_copies", TRANSLATOR_MAX_TURN_BYTES);
|
|
46
54
|
retained = measured;
|
|
@@ -26,16 +26,81 @@ import type {
|
|
|
26
26
|
OcxAssistantMessage,
|
|
27
27
|
OcxMessage,
|
|
28
28
|
OcxParsedRequest,
|
|
29
|
+
OcxTool,
|
|
29
30
|
OcxToolResultMessage,
|
|
30
31
|
OcxUsage,
|
|
31
32
|
} from "../../types";
|
|
33
|
+
import { createToolChoiceResolver, namespacedToolName, normalizeDeclaredToolName, toolChoiceAliases, toolChoiceToolPredicate } from "../../types";
|
|
34
|
+
import { UNDECLARED_TOOL_CALL_ERROR_CODE } from "../../lib/errors";
|
|
32
35
|
import { jsonStringPartsUtf8Bytes, jsonUtf8Bytes } from "../../lib/json-byte-size";
|
|
33
|
-
import { isTranslatorBudgetExceededError, TRANSLATOR_MAX_CALL_ARGUMENT_BYTES, TranslatorBudgetExceededError, type TranslatorBudget } from "../../lib/translator-budget";
|
|
36
|
+
import { isTranslatorBudgetExceededError, releaseTranslatedEvent, TRANSLATOR_MAX_CALL_ARGUMENT_BYTES, TranslatorBudgetExceededError, type TranslatorBudget } from "../../lib/translator-budget";
|
|
34
37
|
import { AdvisorRetention } from "./advisor-retention";
|
|
35
38
|
import { clipAdvisorQuestion } from "./advisor-question";
|
|
36
39
|
|
|
37
40
|
export const ADVISOR_TOOL_NAME = "advisor";
|
|
38
41
|
|
|
42
|
+
export function advisorToolAllowed(
|
|
43
|
+
parsed: OcxParsedRequest,
|
|
44
|
+
advisorTool: Pick<OcxTool, "name" | "namespace"> = { name: ADVISOR_TOOL_NAME },
|
|
45
|
+
): boolean {
|
|
46
|
+
const { explicitRootFunctionChoices, toolChoice } = parsed.options;
|
|
47
|
+
if (explicitRootFunctionChoices && !explicitRootFunctionChoices.includes(advisorTool.name)) return false;
|
|
48
|
+
return toolChoiceToolPredicate(toolChoice, [...(parsed.context.tools ?? []), advisorTool])(advisorTool);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
type AdvisorCallDisposition = "synthetic" | "refused" | { clientWireName: string } | undefined;
|
|
52
|
+
const ROOT_ADVISOR_ALIASES = toolChoiceAliases({ namespace: "functions", name: ADVISOR_TOOL_NAME });
|
|
53
|
+
|
|
54
|
+
/** Resolve provider echoes before interpreting them as synthetic or caller-owned Advisor calls. */
|
|
55
|
+
export function createAdvisorCallResolver(
|
|
56
|
+
parsed: OcxParsedRequest,
|
|
57
|
+
syntheticAllowed: boolean,
|
|
58
|
+
callerCatalog = parsed.context.tools ?? [],
|
|
59
|
+
): (name: string) => AdvisorCallDisposition {
|
|
60
|
+
// Keep the original identities recognizable even when a worker leg removes tools.
|
|
61
|
+
const knownAdvisorNames = new Set([ADVISOR_TOOL_NAME]);
|
|
62
|
+
for (const tool of callerCatalog) {
|
|
63
|
+
if (tool.advisor || tool.name !== ADVISOR_TOOL_NAME) continue;
|
|
64
|
+
for (const name of toolChoiceAliases(tool)) knownAdvisorNames.add(name);
|
|
65
|
+
if (!tool.namespace) for (const name of ROOT_ADVISOR_ALIASES) knownAdvisorNames.add(name);
|
|
66
|
+
}
|
|
67
|
+
if (knownAdvisorNames.size === 1) {
|
|
68
|
+
return name => name === ADVISOR_TOOL_NAME ? (syntheticAllowed ? "synthetic" : "refused") : undefined;
|
|
69
|
+
}
|
|
70
|
+
const { explicitClientToolChoices, toolChoice } = parsed.options;
|
|
71
|
+
const catalog = parsed.context.tools ?? [];
|
|
72
|
+
const effectiveChoiceAllows = toolChoiceToolPredicate(toolChoice, catalog);
|
|
73
|
+
const availableClients = catalog.filter(tool => !tool.advisor && effectiveChoiceAllows(tool));
|
|
74
|
+
const emittedNames = createToolChoiceResolver(availableClients);
|
|
75
|
+
const wireTools = new Map(availableClients.map(tool => [namespacedToolName(tool.namespace, tool.name), tool]));
|
|
76
|
+
const selectedNames = explicitClientToolChoices?.length ? createToolChoiceResolver(callerCatalog) : undefined;
|
|
77
|
+
|
|
78
|
+
return name => {
|
|
79
|
+
if (name === ADVISOR_TOOL_NAME && syntheticAllowed) return "synthetic";
|
|
80
|
+
const emittedName = name.startsWith("default.") && emittedNames.candidateCount(name) === 0
|
|
81
|
+
? normalizeDeclaredToolName(name, knownAdvisorNames) : name;
|
|
82
|
+
if (!knownAdvisorNames.has(emittedName)) return undefined;
|
|
83
|
+
// An exact wire identity wins over compatibility aliases. Bare and dotted echoes
|
|
84
|
+
// need a unique candidate, and the reserved functions wrapper only denotes a root tool.
|
|
85
|
+
let tool = wireTools.get(emittedName);
|
|
86
|
+
if (!tool) {
|
|
87
|
+
const candidates = emittedNames.candidates(emittedName);
|
|
88
|
+
if (candidates.length === 1) {
|
|
89
|
+
tool = wireTools.get(namespacedToolName(candidates[0].namespace, candidates[0].name));
|
|
90
|
+
} else if (candidates.length === 0 && ROOT_ADVISOR_ALIASES.includes(emittedName)) {
|
|
91
|
+
tool = wireTools.get(ADVISOR_TOOL_NAME);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (!tool) return "refused";
|
|
95
|
+
if (tool.name !== ADVISOR_TOOL_NAME) return undefined;
|
|
96
|
+
const selected = explicitClientToolChoices === undefined || explicitClientToolChoices.some(choice =>
|
|
97
|
+
choice.type === (tool.freeform ? "custom" : "function") && (choice.namespace === undefined
|
|
98
|
+
? selectedNames?.selects(tool, choice.name)
|
|
99
|
+
: choice.namespace === (tool.namespace ?? "") && choice.name === tool.name));
|
|
100
|
+
return selected ? { clientWireName: namespacedToolName(tool.namespace, tool.name) } : "refused";
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
|
|
39
104
|
/** Hard bound on advisor consultations per worker request (recursion guard). */
|
|
40
105
|
export const MAX_ADVISOR_CONSULTATIONS_PER_REQUEST = 3;
|
|
41
106
|
/** At most one final worker continuation after consultation exhaustion. */
|
|
@@ -236,11 +301,14 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
236
301
|
const sidecar = createAdvisorSidecarStep(plan);
|
|
237
302
|
return async function* guardAdvisorStream(options: Omit<AdvisorGuardOptions, "plan">): AsyncGenerator<AdapterEvent> {
|
|
238
303
|
let parsed = options.parsed;
|
|
304
|
+
const callerCatalog = parsed.context.tools ?? [];
|
|
239
305
|
let accumulatedUsage: OcxUsage | undefined;
|
|
240
306
|
let source: AsyncIterable<AdapterEvent> = options.firstEvents;
|
|
241
307
|
const retention = new AdvisorRetention(options.translatorBudget);
|
|
242
308
|
try {
|
|
243
309
|
while (true) {
|
|
310
|
+
// A continuation or reused guard may have a narrower choice than the original turn.
|
|
311
|
+
const resolveAdvisorCall = createAdvisorCallResolver(parsed, advisorToolAllowed(parsed), callerCatalog);
|
|
244
312
|
const held: HeldAdvisorCall[] = [];
|
|
245
313
|
const legEvents: AdapterEvent[] = [];
|
|
246
314
|
let legTextChars = 0;
|
|
@@ -253,12 +321,38 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
253
321
|
let hasIncompleteToolCall = false;
|
|
254
322
|
let terminalConsumed = false;
|
|
255
323
|
let terminalEvent: Extract<AdapterEvent, { type: "done" }> | undefined;
|
|
324
|
+
let bufferedRefusal: Extract<AdapterEvent, { type: "error" }> | undefined;
|
|
256
325
|
|
|
257
326
|
for await (const event of source) {
|
|
327
|
+
if (bufferedRefusal) {
|
|
328
|
+
// Non-streaming delivery has already parsed the response. Discard its suffix while
|
|
329
|
+
// preserving the reported worker usage; never drain a live stream after a refusal.
|
|
330
|
+
const terminal = event.type === "done" || event.type === "incomplete" || event.type === "error";
|
|
331
|
+
if (terminal) accumulatedUsage = retention.usage(accumulatedUsage, event.usage);
|
|
332
|
+
if (options.translatorBudget) releaseTranslatedEvent(event, options.translatorBudget);
|
|
333
|
+
if (terminal) {
|
|
334
|
+
yield accumulatedUsage ? { ...bufferedRefusal, usage: accumulatedUsage } : bufferedRefusal;
|
|
335
|
+
return;
|
|
336
|
+
}
|
|
337
|
+
continue;
|
|
338
|
+
}
|
|
258
339
|
if (event.type === "tool_call_start") {
|
|
340
|
+
const disposition = resolveAdvisorCall(event.name);
|
|
341
|
+
if (disposition === "refused") {
|
|
342
|
+
if (options.translatorBudget) releaseTranslatedEvent(event, options.translatorBudget);
|
|
343
|
+
const refusal: Extract<AdapterEvent, { type: "error" }> = { type: "error", status: 502, errorType: "upstream_error", code: UNDECLARED_TOOL_CALL_ERROR_CODE,
|
|
344
|
+
message: "routed provider emitted an Advisor call outside the current request's tool choice",
|
|
345
|
+
...(accumulatedUsage ? { usage: accumulatedUsage } : {}) };
|
|
346
|
+
if (parsed.stream) { yield refusal; return; }
|
|
347
|
+
bufferedRefusal = refusal;
|
|
348
|
+
continue;
|
|
349
|
+
}
|
|
259
350
|
if (pending) { held.push(pending); pending = null; }
|
|
260
|
-
holdingCurrent =
|
|
351
|
+
holdingCurrent = disposition === "synthetic";
|
|
261
352
|
if (!holdingCurrent) {
|
|
353
|
+
// The parser flattens the reserved functions namespace into the root catalog.
|
|
354
|
+
if (typeof disposition === "object" && disposition.clientWireName === ADVISOR_TOOL_NAME
|
|
355
|
+
&& ROOT_ADVISOR_ALIASES.includes(event.name)) event.name = disposition.clientWireName;
|
|
262
356
|
hasRealToolCall = true;
|
|
263
357
|
// No continuation can use this leg. Real-tool arguments are never copied.
|
|
264
358
|
held.length = legEvents.length = 0;
|
|
@@ -323,6 +417,7 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
|
|
|
323
417
|
}
|
|
324
418
|
yield event;
|
|
325
419
|
}
|
|
420
|
+
if (bufferedRefusal) { yield bufferedRefusal; return; }
|
|
326
421
|
|
|
327
422
|
const advisorCalls = held.filter(call => call.name === ADVISOR_TOOL_NAME && call.closed);
|
|
328
423
|
const shouldIntercept = terminalConsumed
|
|
@@ -60,6 +60,20 @@ export type AgentTaskRecoveryResult =
|
|
|
60
60
|
| { readonly recovered: true }
|
|
61
61
|
| { readonly recovered: false; readonly reason: AgentTaskRecoveryFailureReason };
|
|
62
62
|
|
|
63
|
+
interface RecoverySend {
|
|
64
|
+
model: string;
|
|
65
|
+
status: number | undefined;
|
|
66
|
+
durationMs: number;
|
|
67
|
+
usage: unknown;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
interface AgentTaskRecoveryContext {
|
|
71
|
+
parentThreadId?: string | null;
|
|
72
|
+
abortSignal?: AbortSignal;
|
|
73
|
+
/** Only the caller that starts a flight observes its sends. */
|
|
74
|
+
onSend?: (send: RecoverySend) => void;
|
|
75
|
+
}
|
|
76
|
+
|
|
63
77
|
export function agentTaskRecoveryConfig(config: OcxConfig): AgentTaskRecoveryOptions | null {
|
|
64
78
|
const raw = config.agentTaskRecovery;
|
|
65
79
|
if (!raw || raw.enabled !== true) return null;
|
|
@@ -400,8 +414,9 @@ function sseDataPayloads(raw: string): string[] {
|
|
|
400
414
|
return payloads;
|
|
401
415
|
}
|
|
402
416
|
|
|
403
|
-
function
|
|
417
|
+
function parseRecoverySse(raw: string, envelope: AgentEnvelope): { assignment: string | null; usage: unknown } {
|
|
404
418
|
let assignment: string | null = null;
|
|
419
|
+
let usage: unknown;
|
|
405
420
|
let completed = false;
|
|
406
421
|
let terminalFailure = false;
|
|
407
422
|
let conflictingAssignments = false;
|
|
@@ -419,6 +434,9 @@ function assignmentFromRecoverySse(raw: string, envelope: AgentEnvelope): string
|
|
|
419
434
|
|| event?.type === "response.incomplete"
|
|
420
435
|
|| event?.type === "error"
|
|
421
436
|
) terminalFailure = true;
|
|
437
|
+
if (event?.type === "response.completed" || event?.type === "response.failed" || event?.type === "response.incomplete") {
|
|
438
|
+
usage = event.response?.usage ?? usage;
|
|
439
|
+
}
|
|
422
440
|
if (event?.type === "response.completed" && event.response?.status === "completed") {
|
|
423
441
|
completed = true;
|
|
424
442
|
}
|
|
@@ -453,9 +471,12 @@ function assignmentFromRecoverySse(raw: string, envelope: AgentEnvelope): string
|
|
|
453
471
|
else if (assignment !== candidate) conflictingAssignments = true;
|
|
454
472
|
}
|
|
455
473
|
}
|
|
456
|
-
return
|
|
457
|
-
|
|
458
|
-
|
|
474
|
+
return {
|
|
475
|
+
assignment: completed && !terminalFailure && !conflictingAssignments && !malformedEvent && !invalidAssignment
|
|
476
|
+
? assignment
|
|
477
|
+
: null,
|
|
478
|
+
usage,
|
|
479
|
+
};
|
|
459
480
|
}
|
|
460
481
|
|
|
461
482
|
interface RecoveryAttempt {
|
|
@@ -471,19 +492,26 @@ async function attemptRecovery(
|
|
|
471
492
|
signal: AbortSignal,
|
|
472
493
|
abortSignal: AbortSignal | undefined,
|
|
473
494
|
deadlineSignal: AbortSignal,
|
|
495
|
+
onSend: AgentTaskRecoveryContext["onSend"],
|
|
474
496
|
): Promise<RecoveryAttempt> {
|
|
475
497
|
const terminal = (resolution: AgentTaskRecoveryResolution): RecoveryAttempt => ({
|
|
476
498
|
resolution,
|
|
477
499
|
retryable: false,
|
|
478
500
|
});
|
|
501
|
+
const model = options.model ?? "gpt-5.6-sol";
|
|
502
|
+
const bodyPayload = recoveryPayload(envelope, model);
|
|
503
|
+
const startedAt = Date.now();
|
|
504
|
+
let status: number | undefined;
|
|
505
|
+
let usage: unknown;
|
|
479
506
|
try {
|
|
480
507
|
const response = await fetch(RECOVERY_ENDPOINT, {
|
|
481
508
|
method: "POST",
|
|
482
509
|
headers: admission.headers,
|
|
483
|
-
body:
|
|
510
|
+
body: bodyPayload,
|
|
484
511
|
signal,
|
|
485
512
|
redirect: "error",
|
|
486
513
|
});
|
|
514
|
+
status = response.status;
|
|
487
515
|
if (!response.ok) {
|
|
488
516
|
// A rejected or never-settling cancellation must not extend the recovery deadline.
|
|
489
517
|
try { void response.body?.cancel().catch(() => undefined); } catch { /* already closed */ }
|
|
@@ -506,7 +534,9 @@ async function attemptRecovery(
|
|
|
506
534
|
if (abortSignal?.aborted) return terminal({ recovered: false, reason: "recovery_aborted" });
|
|
507
535
|
if (deadlineSignal.aborted || body.timedOut) return terminal({ recovered: false, reason: "recovery_timeout" });
|
|
508
536
|
if (body.truncated || body.oversized || !body.displaySafe) return terminal({ recovered: false, reason: "recovery_invalid_output" });
|
|
509
|
-
const
|
|
537
|
+
const result = parseRecoverySse(body.text, envelope);
|
|
538
|
+
usage = result.usage;
|
|
539
|
+
const { assignment } = result;
|
|
510
540
|
return terminal(assignment === null
|
|
511
541
|
? { recovered: false, reason: "recovery_invalid_output" }
|
|
512
542
|
: { recovered: true, assignment });
|
|
@@ -517,6 +547,8 @@ async function attemptRecovery(
|
|
|
517
547
|
return decodeFailure === "invalid_utf8"
|
|
518
548
|
? terminal({ recovered: false, reason: "recovery_invalid_output" })
|
|
519
549
|
: { resolution: { recovered: false, reason: "recovery_transport_error" }, retryable: true };
|
|
550
|
+
} finally {
|
|
551
|
+
onSend?.({ model, status, durationMs: Date.now() - startedAt, usage });
|
|
520
552
|
}
|
|
521
553
|
}
|
|
522
554
|
|
|
@@ -524,7 +556,8 @@ async function requestRecovery(
|
|
|
524
556
|
admission: RecoveryAdmission,
|
|
525
557
|
envelope: AgentEnvelope,
|
|
526
558
|
options: AgentTaskRecoveryOptions,
|
|
527
|
-
abortSignal
|
|
559
|
+
abortSignal: AbortSignal | undefined,
|
|
560
|
+
onSend: AgentTaskRecoveryContext["onSend"],
|
|
528
561
|
): Promise<AgentTaskRecoveryResolution> {
|
|
529
562
|
const controller = new AbortController();
|
|
530
563
|
const timeoutMs = options.timeoutMs ?? 45_000;
|
|
@@ -544,7 +577,7 @@ async function requestRecovery(
|
|
|
544
577
|
: 0;
|
|
545
578
|
for (let attempt = 0; ; attempt += 1) {
|
|
546
579
|
const { resolution, retryable, retryHeaders } = await attemptRecovery(
|
|
547
|
-
admission, envelope, options, signal, abortSignal, controller.signal,
|
|
580
|
+
admission, envelope, options, signal, abortSignal, controller.signal, onSend,
|
|
548
581
|
);
|
|
549
582
|
if (resolution.recovered || !retryable || attempt >= retries) return resolution;
|
|
550
583
|
// Retry-After is the provider's floor, not something our backoff cap may shorten.
|
|
@@ -575,7 +608,7 @@ export async function recoverEncryptedAgentTask(
|
|
|
575
608
|
input: unknown,
|
|
576
609
|
options: AgentTaskRecoveryOptions,
|
|
577
610
|
config: OcxConfig,
|
|
578
|
-
context:
|
|
611
|
+
context: AgentTaskRecoveryContext = {},
|
|
579
612
|
): Promise<boolean> {
|
|
580
613
|
return (await recoverEncryptedAgentTaskWithResult(req, input, options, config, context)).recovered;
|
|
581
614
|
}
|
|
@@ -586,7 +619,7 @@ export async function recoverEncryptedAgentTaskWithResult(
|
|
|
586
619
|
input: unknown,
|
|
587
620
|
options: AgentTaskRecoveryOptions,
|
|
588
621
|
config: OcxConfig,
|
|
589
|
-
context:
|
|
622
|
+
context: AgentTaskRecoveryContext = {},
|
|
590
623
|
): Promise<AgentTaskRecoveryResult> {
|
|
591
624
|
// Admission is deliberately checked before cache access. A cache hit must not
|
|
592
625
|
// turn this process into a plaintext oracle for an unauthenticated caller.
|
|
@@ -596,7 +629,7 @@ export async function recoverEncryptedAgentTaskWithResult(
|
|
|
596
629
|
const result = await resolveCachedAgentTaskRecoveryWithResult(
|
|
597
630
|
cacheKey,
|
|
598
631
|
options.cacheEntries ?? 200,
|
|
599
|
-
signal => requestRecovery(admission, envelope, options, signal),
|
|
632
|
+
signal => requestRecovery(admission, envelope, options, signal, context.onSend),
|
|
600
633
|
context.abortSignal,
|
|
601
634
|
);
|
|
602
635
|
if (!result.recovered) {
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pipeline preflight for the Antigravity ACP provider (plan 080): refuse a turn its use policy forbids
|
|
3
|
+
* with a structured HTTP 403 before sidecars run or a streaming response is committed. The adapter
|
|
4
|
+
* repeats the same check before it starts the CLI, so internal and direct callers cannot bypass it.
|
|
5
|
+
*/
|
|
6
|
+
import { agyAcpPolicyRefusal } from "../../adapters/agy-acp/policy";
|
|
7
|
+
import { markProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
|
|
8
|
+
import { markPolicyCandidateRefusal } from "./policy-request-scope";
|
|
9
|
+
import type { RequestLogContext } from "../request-log";
|
|
10
|
+
|
|
11
|
+
export function agyAcpPreflightResponse(input: {
|
|
12
|
+
adapterName: string;
|
|
13
|
+
requestHeaders: Headers;
|
|
14
|
+
forwardHeaders: Headers;
|
|
15
|
+
/** The parsed request body: the frame's own copy of Codex's turn metadata (memory turns). */
|
|
16
|
+
body: unknown;
|
|
17
|
+
inboundTransport?: "websocket";
|
|
18
|
+
unattendedHttpTurn?: boolean;
|
|
19
|
+
comboAttempt: boolean;
|
|
20
|
+
internalDecisionCall: boolean;
|
|
21
|
+
subagentFallback: boolean;
|
|
22
|
+
logCtx: RequestLogContext;
|
|
23
|
+
}): Response | undefined {
|
|
24
|
+
if (input.adapterName !== "agy-acp") return undefined;
|
|
25
|
+
// A marker counts wherever it arrived: on the caller's request or on the forwarded set. The merge
|
|
26
|
+
// is for this decision only; nothing here is forwarded.
|
|
27
|
+
const headers = new Headers(input.requestHeaders);
|
|
28
|
+
input.forwardHeaders.forEach((value, name) => headers.set(name, value));
|
|
29
|
+
const refusal = agyAcpPolicyRefusal({
|
|
30
|
+
headers, body: input.body, comboAttempt: input.comboAttempt, internalDecisionCall: input.internalDecisionCall,
|
|
31
|
+
subagentFallback: input.subagentFallback, inboundTransport: input.inboundTransport, unattendedHttpTurn: input.unattendedHttpTurn,
|
|
32
|
+
});
|
|
33
|
+
if (!refusal) return undefined;
|
|
34
|
+
const response = new Response(JSON.stringify({ error: {
|
|
35
|
+
type: refusal.errorType, code: refusal.code, param: null, message: refusal.message,
|
|
36
|
+
} }), { status: refusal.status, headers: { "Content-Type": "application/json" } });
|
|
37
|
+
rememberProxyErrorMessage(input.logCtx, refusal.message, { status: refusal.status, type: refusal.errorType, code: refusal.code });
|
|
38
|
+
markProxyError(response);
|
|
39
|
+
if (input.comboAttempt) markPolicyCandidateRefusal(response);
|
|
40
|
+
return response;
|
|
41
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { AdapterRequest } from "../../adapters/base";
|
|
2
|
+
import type { OcxMessage, OcxParsedRequest, OcxProviderContinuationOwner } from "../../types";
|
|
3
|
+
import type { ProviderFetchOptions } from "./fetch-helpers";
|
|
4
|
+
|
|
5
|
+
/** Authority from the physical send that returned a 413. Only that credential may read the history. */
|
|
6
|
+
export interface AnthropicImageRecoveryPin {
|
|
7
|
+
owner: OcxProviderContinuationOwner;
|
|
8
|
+
request: AdapterRequest;
|
|
9
|
+
isCurrent(): boolean;
|
|
10
|
+
recordRefusalSpend?: () => void;
|
|
11
|
+
dispatchOverride(request: AdapterRequest, parsed: OcxParsedRequest): NonNullable<ProviderFetchOptions["dispatchOverride"]>;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
function inlineImage(message: OcxMessage): boolean {
|
|
15
|
+
return Array.isArray(message.content) && message.content.some(part =>
|
|
16
|
+
part.type === "image" && part.imageUrl.startsWith("data:"));
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/** Keep the current user turn and every open tool call with its results. */
|
|
20
|
+
export function splitAnthropicImageContext(messages: OcxMessage[]): {
|
|
21
|
+
history: OcxMessage[];
|
|
22
|
+
retained: OcxMessage[];
|
|
23
|
+
} | undefined {
|
|
24
|
+
const open = new Set<string>();
|
|
25
|
+
let cut = 0;
|
|
26
|
+
let sawImage = false;
|
|
27
|
+
const newestImage = messages.findLastIndex(inlineImage);
|
|
28
|
+
for (const [index, message] of messages.entries()) {
|
|
29
|
+
if (index <= newestImage && message.role === "user" && open.size === 0 && sawImage) cut = index;
|
|
30
|
+
if (message.role === "assistant") {
|
|
31
|
+
for (const part of message.content) {
|
|
32
|
+
if (part.type === "toolCall") open.add(part.id);
|
|
33
|
+
}
|
|
34
|
+
} else if (message.role === "toolResult") {
|
|
35
|
+
open.delete(message.toolCallId);
|
|
36
|
+
}
|
|
37
|
+
sawImage ||= inlineImage(message);
|
|
38
|
+
}
|
|
39
|
+
if (cut === 0) return;
|
|
40
|
+
const history = messages.slice(0, cut);
|
|
41
|
+
// Only conversational turns can be replaced. Instruction roles have to stay verbatim.
|
|
42
|
+
if (history.some(({ role }) => role !== "user" && role !== "assistant" && role !== "toolResult")) return;
|
|
43
|
+
return { history, retained: messages.slice(cut) };
|
|
44
|
+
}
|
|
@@ -3,7 +3,31 @@ import {
|
|
|
3
3
|
GOOGLE_PERMISSION_DENIED_SUFFIX, safeAntigravityHttpErrorMessage,
|
|
4
4
|
} from "../../adapters/google-errors";
|
|
5
5
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
6
|
-
import { classifyAntigravityRefusal, hasAntigravityModelNotFoundProvenance } from "../../adapters/antigravity-refusal";
|
|
6
|
+
import { classifyAntigravityRefusal, hasAntigravityModelNotFoundProvenance, type AntigravityRefusal } from "../../adapters/antigravity-refusal";
|
|
7
|
+
import { isCanonicalAntigravityUrl } from "../../lib/provider-tls-profile";
|
|
8
|
+
import { hasUpstreamRewriters, upstreamRewriterEpoch } from "../../plugins/upstream-hooks";
|
|
9
|
+
import type { OcxProviderConfig } from "../../types";
|
|
10
|
+
import { readDisplaySafeErrorText } from "./core-errors";
|
|
11
|
+
|
|
12
|
+
export function captureAntigravityQuarantineTrust(providerName: string): number | undefined {
|
|
13
|
+
return providerName === "google-antigravity" && !hasUpstreamRewriters() ? upstreamRewriterEpoch() : undefined;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export async function classifyAntigravityQuarantine(
|
|
17
|
+
response: Response,
|
|
18
|
+
provider: Pick<OcxProviderConfig, "authMode" | "baseUrl">,
|
|
19
|
+
rewriterEpoch: number | undefined,
|
|
20
|
+
signal: AbortSignal,
|
|
21
|
+
): Promise<AntigravityRefusal> {
|
|
22
|
+
const refusal = classifyAntigravityRefusal(response.status, await readDisplaySafeErrorText(response.clone(), signal, ""));
|
|
23
|
+
// Keep durable suspension holds within the first-party Cloud Code Assist trust boundary.
|
|
24
|
+
if (refusal.kind === "tos_violation" && (
|
|
25
|
+
provider.authMode !== "oauth"
|
|
26
|
+
|| !isCanonicalAntigravityUrl(provider.baseUrl)
|
|
27
|
+
|| rewriterEpoch !== upstreamRewriterEpoch()
|
|
28
|
+
)) return { kind: "other" };
|
|
29
|
+
return refusal;
|
|
30
|
+
}
|
|
7
31
|
|
|
8
32
|
/** Match only the normalized Antigravity validation-refusal marker. */
|
|
9
33
|
export function hasAntigravityValidationRefusalMarker(text: string): boolean {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
2
|
+
import { responsesCompletionError } from "../../lib/errors";
|
|
2
3
|
import { ResponseBodyInactivityError } from "../../lib/response-body-inactivity";
|
|
3
4
|
import {
|
|
4
5
|
createSseInspector,
|
|
@@ -27,9 +28,18 @@ export const MAX_BUFFERED_RESPONSES_SSE_FRAMES = 100_000;
|
|
|
27
28
|
export const BUFFERED_RESPONSES_TOTAL_TIMEOUT_MS = 15 * 60_000;
|
|
28
29
|
const BUFFERED_SSE_PROCESSING_SLICE_BYTES = 64 * 1024;
|
|
29
30
|
|
|
31
|
+
export type BufferedFailedCompletion = {
|
|
32
|
+
payload: unknown;
|
|
33
|
+
error: NonNullable<ReturnType<typeof responsesCompletionError>>;
|
|
34
|
+
};
|
|
35
|
+
|
|
30
36
|
export type BufferedResponsesTerminal = {
|
|
31
37
|
status: ResponsesTerminalStatus;
|
|
32
38
|
response: Record<string, unknown>;
|
|
39
|
+
failedCompletion?: undefined;
|
|
40
|
+
} | {
|
|
41
|
+
status: "failed";
|
|
42
|
+
failedCompletion: BufferedFailedCompletion;
|
|
33
43
|
};
|
|
34
44
|
|
|
35
45
|
export type BufferedResponsesSseFailure = {
|
|
@@ -110,6 +120,7 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
110
120
|
let terminalCount = 0;
|
|
111
121
|
let status: ResponsesTerminalStatus | undefined;
|
|
112
122
|
let terminalResponse: Record<string, unknown> | undefined;
|
|
123
|
+
let failedCompletion: BufferedFailedCompletion | undefined;
|
|
113
124
|
const classifyTerminal = createTerminalStatusTracker();
|
|
114
125
|
const inspector = createSseInspector({
|
|
115
126
|
terminalReconstruction: {
|
|
@@ -123,12 +134,16 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
123
134
|
if (!candidateStatus) return;
|
|
124
135
|
terminalCount += 1;
|
|
125
136
|
status ??= candidateStatus;
|
|
137
|
+
if (terminalCount === 1 && candidateStatus === "failed") {
|
|
138
|
+
const error = responsesCompletionError(payload);
|
|
139
|
+
if (error) failedCompletion = { payload, error };
|
|
140
|
+
}
|
|
126
141
|
},
|
|
127
142
|
onOpaquePayload(payload) {
|
|
128
143
|
if (payload !== "[DONE]") malformed = true;
|
|
129
144
|
},
|
|
130
145
|
onTerminalResponse(candidateStatus, response) {
|
|
131
|
-
if (candidateStatus === status && terminalResponse === undefined) {
|
|
146
|
+
if (!failedCompletion && candidateStatus === status && terminalResponse === undefined) {
|
|
132
147
|
if (response.status !== undefined && response.status !== candidateStatus) {
|
|
133
148
|
malformed = true;
|
|
134
149
|
return;
|
|
@@ -150,6 +165,8 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
150
165
|
result: () => {
|
|
151
166
|
if (malformed) return { ok: false, kind: "malformed" };
|
|
152
167
|
if (terminalCount !== 1 || status === undefined) return { ok: false, kind: "missing_terminal" };
|
|
168
|
+
// A provider error on response.completed is authoritative even when the snapshot claims success.
|
|
169
|
+
if (failedCompletion) return { ok: true, terminal: { status: "failed", failedCompletion } };
|
|
153
170
|
if (!terminalResponse || terminalResponse.status !== status || !Array.isArray(terminalResponse.output)) {
|
|
154
171
|
return { ok: false, kind: "malformed" };
|
|
155
172
|
}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
import { responsesCompletionError } from "../../lib/errors";
|
|
2
|
+
import { RESPONSE_ID_MAX_BYTES as CODEX_WS_ID_MAX_BYTES } from "../../responses/id-limits";
|
|
3
|
+
|
|
4
|
+
export { CODEX_WS_ID_MAX_BYTES };
|
|
2
5
|
export const CODEX_WS_MAX_TRACKED_ITEMS = 10_000;
|
|
3
6
|
const MAX_TRACKED_ID_BYTES = 1024 * 1024;
|
|
4
7
|
|
|
@@ -58,7 +61,7 @@ export class CodexWsCorrelation {
|
|
|
58
61
|
completed(event: Record<string, unknown>): string | null {
|
|
59
62
|
const response = record(event.response) ? event.response : undefined;
|
|
60
63
|
return this.reusable && event.type === "response.completed" && response?.status === "completed"
|
|
61
|
-
&& response.id === this.responseId ? this.responseId : null;
|
|
64
|
+
&& response.id === this.responseId && responsesCompletionError(event) == null ? this.responseId : null;
|
|
62
65
|
}
|
|
63
66
|
|
|
64
67
|
finish(): void { this.items.clear(); this.itemBytes = 0; }
|