@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
package/src/responses/state.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { chmodSync, existsSync, mkdirSync,
|
|
1
|
+
import { chmodSync, existsSync, mkdirSync, rmSync, statSync, unlinkSync } from "node:fs";
|
|
2
2
|
import { dirname, join } from "node:path";
|
|
3
3
|
import { atomicWriteFileAsync, getConfigDir, resolveWriteTarget } from "../config";
|
|
4
|
-
import { enforceAppOwnedMemoryBudget, type RetainedStoreSnapshot } from "../lib/app-owned-memory";
|
|
4
|
+
import { appOwnedBytesSnapshot, enforceAppOwnedMemoryBudget, type RetainedStoreSnapshot } from "../lib/app-owned-memory";
|
|
5
5
|
import { windowsSecretAclApplies } from "../lib/windows-secret-acl";
|
|
6
6
|
import type { OcxProviderContinuationState } from "../types";
|
|
7
|
+
import type { ResidentResponseState, SpilledResponseState, SpillFailedResponseState, StoredResponseState, ResidentInput, PreviousResponseReplayFailure } from "./state/entry-types";
|
|
8
|
+
export type { ResidentResponseState, SpilledResponseState, SpillFailedResponseState, StoredResponseState, ResidentInput, PreviousResponseReplayFailure } from "./state/entry-types";
|
|
7
9
|
import {
|
|
8
10
|
deleteResponseSpill,
|
|
9
11
|
inspectResponseSpillDir,
|
|
@@ -22,6 +24,8 @@ import { collectReferencedSpillFileNames, snapshotReferencedSpillFileNames } fro
|
|
|
22
24
|
import { selectSnapshotEntries, snapshotPayload } from "./state/snapshot-select";
|
|
23
25
|
import { expandStoredResponseInput } from "./state/replay-input";
|
|
24
26
|
import { normalizedClientThreadId, replayScopeMatches, validReplayOwnerKey } from "./state/replay-owner";
|
|
27
|
+
import { bindConnectionScopeStore, connectionReplayScopeAcceptsEntry, connectionScopeEntryExpired, forgetConnectionScopeEntry, isConnectionOwnedResponseState, noteConnectionScopeEntry, oldestConnectionScopeResident, planConnectionScopeEvictions, type ConnectionReplayScope } from "./state/connection-scope";
|
|
28
|
+
export { mintConnectionReplayScope, connectionReplayScopeLive, connectionReplayScopeForThread, connectionReplayScopeOwnerKey, releaseConnectionReplayScope, type ConnectionReplayScope } from "./state/connection-scope";
|
|
25
29
|
import { hasPendingClientToolCall } from "./state/unforced-store-false";
|
|
26
30
|
import { computeResponseStateMetrics, type ResponseStateMetrics } from "./state/metrics";
|
|
27
31
|
export type { ResponseStateMetrics } from "./state/metrics";
|
|
@@ -33,7 +37,7 @@ export type { ResponseSpillWriteFailureCode, ResponseSpillWriteStatus, ResponseS
|
|
|
33
37
|
import type { ResponseSpillWriteFailureCode, ResponseSpillWriteStatus, ResponseSpillWriteFailureOrigin } from "./state/spill-failure";
|
|
34
38
|
export { responseAdmissionCountersForTests } from "./state/spill-failure";
|
|
35
39
|
import { admissionCounters, noteSpillWriteFailure, noteSpillWriteSuccess, resetSpillCountersForTests, spillCounters, spillWriteHealth } from "./state/spill-failure";
|
|
36
|
-
import {
|
|
40
|
+
import { loadSnapshotEntries, snapshotFileFingerprint, stageSnapshotEntries, type SnapshotLoadStore } from "./state/snapshot-codec";
|
|
37
41
|
import { isBodyNonPersistable } from "./state/body-policy";
|
|
38
42
|
export { isBodyNonPersistable, markBodyNonPersistable } from "./state/body-policy";
|
|
39
43
|
export { flushPendingResponseSpillsForTests, awaitResponseSpillPublicationTailForTests, pendingResponseSpillMetricsForTests, setResponseSpillShutdownBudgetForTests, setResponseSpillAsyncAclAttemptBudgetForTests, setResponseSpillShutdownTerminalizationPassLimitForTests } from "./state/spill-queue";
|
|
@@ -64,7 +68,7 @@ const MAX_STORED_RESPONSES = 1_000;
|
|
|
64
68
|
*
|
|
65
69
|
* A day is safe to hold because retention is no longer what bounds this store: the resident cap
|
|
66
70
|
* (MAX_STORED_RESPONSE_BYTES), the spill ceiling (MAX_SPILLED_RESPONSE_BYTES) and the entry count
|
|
67
|
-
*
|
|
71
|
+
* evict older entries first within each retention class. Every turn re-stores the chain under a fresh id, so the live
|
|
68
72
|
* conversation is the last thing any of those three caps would drop. Raising the TTL therefore
|
|
69
73
|
* moves eviction from the clock to those budgets rather than growing the ceiling.
|
|
70
74
|
*/
|
|
@@ -114,54 +118,13 @@ const SNAPSHOT_FILE_MAX_BYTES = 32 * 1024 * 1024;
|
|
|
114
118
|
const MAX_SNAPSHOT_REWRITE_ATTEMPTS = 4;
|
|
115
119
|
const RESPONSE_SPILL_SHUTDOWN_TERMINALIZATION_MAX_PASSES = MAX_STORED_RESPONSES + 1;
|
|
116
120
|
|
|
117
|
-
export interface ResidentResponseState {
|
|
118
|
-
kind: "resident";
|
|
119
|
-
createdAt: number;
|
|
120
|
-
clientThreadId?: string;
|
|
121
|
-
replayOwnerKey?: string;
|
|
122
|
-
items: unknown[];
|
|
123
|
-
/** Index in `items` where provider output begins; see clientCarriedPrefixLength. */
|
|
124
|
-
providerOutputStart?: number;
|
|
125
|
-
providers?: OcxProviderContinuationState;
|
|
126
|
-
unforcedStoreFalse?: boolean;
|
|
127
|
-
sizeBytes: number;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
export interface SpilledResponseState {
|
|
131
|
-
kind: "spill";
|
|
132
|
-
createdAt: number;
|
|
133
|
-
clientThreadId?: string;
|
|
134
|
-
replayOwnerKey?: string;
|
|
135
|
-
/** Mirrors the spilled payload boundary so a spilled entry keeps its anchor. */
|
|
136
|
-
providerOutputStart?: number;
|
|
137
|
-
providers?: OcxProviderContinuationState;
|
|
138
|
-
unforcedStoreFalse?: boolean;
|
|
139
|
-
spill: ResponseSpillRef;
|
|
140
|
-
sizeBytes: number;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
export interface SpillFailedResponseState {
|
|
144
|
-
kind: "spill-failed";
|
|
145
|
-
createdAt: number;
|
|
146
|
-
sizeBytes: number;
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
export type StoredResponseState = ResidentResponseState | SpilledResponseState | SpillFailedResponseState;
|
|
150
|
-
export type ResidentInput = Omit<ResidentResponseState, "kind" | "sizeBytes">;
|
|
151
|
-
|
|
152
|
-
export type PreviousResponseReplayFailure = {
|
|
153
|
-
code: "previous_response_not_found";
|
|
154
|
-
reason: "spill_missing" | "spill_corrupt" | "spill_failed" | "spill_too_large" | "scope_mismatch";
|
|
155
|
-
};
|
|
156
|
-
|
|
157
121
|
const states = new Map<string, StoredResponseState>();
|
|
158
122
|
let storedResponseBytes = 0;
|
|
159
123
|
let residentResponseBytes = 0;
|
|
160
|
-
let
|
|
161
|
-
let oldestResidentAt: number | null = null;
|
|
124
|
+
let budgetCandidate: [string, ResidentResponseState] | undefined;
|
|
162
125
|
let byteCapOverride: number | null = null;
|
|
163
126
|
let snapshotTotalCapOverride: number | null = null;
|
|
164
|
-
let
|
|
127
|
+
let durableRevision = 0;
|
|
165
128
|
/** Byte length and digest of the last snapshot actually written, for the
|
|
166
129
|
* identical-payload skip and the size-scaled debounce. The payload itself is not
|
|
167
130
|
* retained: at the 24 MiB bound that would double the snapshot's memory cost. */
|
|
@@ -217,6 +180,7 @@ const PENDING_SPILL_UNLINKS_MAX = 128;
|
|
|
217
180
|
function deferSupersededSpill(ref: ResponseSpillRef | undefined): void {
|
|
218
181
|
if (!ref) return;
|
|
219
182
|
pendingSpillUnlinks.push(ref);
|
|
183
|
+
noteDurableMutation();
|
|
220
184
|
while (pendingSpillUnlinks.length > PENDING_SPILL_UNLINKS_MAX) {
|
|
221
185
|
deleteResponseSpill(pendingSpillUnlinks.shift()!);
|
|
222
186
|
}
|
|
@@ -329,16 +293,17 @@ function measureResidentEntry(id: string, entry: ResidentInput): ResidentRespons
|
|
|
329
293
|
return sizeBytes === null ? null : { kind: "resident", ...entry, sizeBytes };
|
|
330
294
|
}
|
|
331
295
|
|
|
296
|
+
function considerBudgetCandidate(id: string, entry: StoredResponseState): void {
|
|
297
|
+
if (entry.kind !== "resident" || spillQueueHoldsResidentCandidate(id, entry)) return;
|
|
298
|
+
const oldest = budgetCandidate?.[1];
|
|
299
|
+
// Prefer memory-only residents, then the oldest eligible resident within that class.
|
|
300
|
+
if (!oldest || (entry.connectionOwned === oldest.connectionOwned
|
|
301
|
+
? entry.createdAt < oldest.createdAt : entry.connectionOwned === true)) budgetCandidate = [id, entry];
|
|
302
|
+
}
|
|
303
|
+
|
|
332
304
|
function recomputeOldestResident(): void {
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
for (const [id, state] of states) {
|
|
336
|
-
if (state.kind !== "resident") continue;
|
|
337
|
-
if (spillQueueHoldsResidentCandidate(id, state)) continue;
|
|
338
|
-
if (oldestResidentAt !== null && state.createdAt >= oldestResidentAt) continue;
|
|
339
|
-
oldestResidentId = id;
|
|
340
|
-
oldestResidentAt = state.createdAt;
|
|
341
|
-
}
|
|
305
|
+
budgetCandidate = undefined;
|
|
306
|
+
for (const [id, entry] of states) considerBudgetCandidate(id, entry);
|
|
342
307
|
}
|
|
343
308
|
|
|
344
309
|
function replaceMapEntry(id: string, next: StoredResponseState, expected?: StoredResponseState): boolean {
|
|
@@ -348,6 +313,7 @@ function replaceMapEntry(id: string, next: StoredResponseState, expected?: Store
|
|
|
348
313
|
storedResponseBytes += next.sizeBytes;
|
|
349
314
|
if (existing?.kind === "resident") {
|
|
350
315
|
residentResponseBytes -= existing.sizeBytes;
|
|
316
|
+
forgetConnectionScopeEntry(id, existing);
|
|
351
317
|
}
|
|
352
318
|
if (next.kind === "resident") {
|
|
353
319
|
residentResponseBytes += next.sizeBytes;
|
|
@@ -356,13 +322,9 @@ function replaceMapEntry(id: string, next: StoredResponseState, expected?: Store
|
|
|
356
322
|
if (residentResponseBytes < 0) residentResponseBytes = 0;
|
|
357
323
|
if (existing) states.delete(id);
|
|
358
324
|
states.set(id, next);
|
|
359
|
-
if (
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
oldestResidentId = id;
|
|
363
|
-
oldestResidentAt = next.createdAt;
|
|
364
|
-
}
|
|
365
|
-
stateRevision += 1;
|
|
325
|
+
if (budgetCandidate?.[0] === id) recomputeOldestResident();
|
|
326
|
+
else considerBudgetCandidate(id, next);
|
|
327
|
+
if (!isConnectionOwnedResponseState(next) || (existing && !isConnectionOwnedResponseState(existing))) noteDurableMutation();
|
|
366
328
|
return true;
|
|
367
329
|
}
|
|
368
330
|
|
|
@@ -383,16 +345,18 @@ function deleteOwnedSpills(entry: StoredResponseState): void {
|
|
|
383
345
|
function deleteEntry(id: string, options: { deleteSpill?: boolean } = {}): void {
|
|
384
346
|
const existing = states.get(id);
|
|
385
347
|
if (!existing) return;
|
|
386
|
-
const
|
|
348
|
+
const scoped = isConnectionOwnedResponseState(existing);
|
|
349
|
+
const supersededSpill = scoped ? undefined : cancelPendingResponseSpill(id);
|
|
387
350
|
storedResponseBytes -= existing.sizeBytes;
|
|
388
351
|
if (existing.kind === "resident") {
|
|
389
352
|
residentResponseBytes -= existing.sizeBytes;
|
|
353
|
+
forgetConnectionScopeEntry(id, existing);
|
|
390
354
|
}
|
|
391
355
|
if (storedResponseBytes < 0) storedResponseBytes = 0;
|
|
392
356
|
if (residentResponseBytes < 0) residentResponseBytes = 0;
|
|
393
357
|
states.delete(id);
|
|
394
|
-
if (
|
|
395
|
-
|
|
358
|
+
if (budgetCandidate?.[0] === id) recomputeOldestResident();
|
|
359
|
+
if (!scoped) noteDurableMutation();
|
|
396
360
|
if (options.deleteSpill !== false) deleteOwnedSpills(existing);
|
|
397
361
|
if (options.deleteSpill !== false && supersededSpill) deleteResponseSpill(supersededSpill);
|
|
398
362
|
}
|
|
@@ -411,10 +375,7 @@ function replaceWithSpillFailure(
|
|
|
411
375
|
// Crash consistency (same rule as replaceSpillEntryAtomically): the old
|
|
412
376
|
// durable snapshot still references this generation until the tombstone
|
|
413
377
|
// itself is durable — queue the unlink for the next stable persist.
|
|
414
|
-
|
|
415
|
-
while (pendingSpillUnlinks.length > PENDING_SPILL_UNLINKS_MAX) {
|
|
416
|
-
deleteResponseSpill(pendingSpillUnlinks.shift()!);
|
|
417
|
-
}
|
|
378
|
+
deferSupersededSpill(existing.spill);
|
|
418
379
|
} else {
|
|
419
380
|
deleteOwnedSpills(existing);
|
|
420
381
|
}
|
|
@@ -423,6 +384,13 @@ function replaceWithSpillFailure(
|
|
|
423
384
|
}
|
|
424
385
|
|
|
425
386
|
function swapResidentForSpill(id: string, expected: ResidentResponseState, ref: ResponseSpillRef): boolean {
|
|
387
|
+
if (expected.connectionOwned === true) {
|
|
388
|
+
// Memory-only entries can never become stubs. A queued write reaching this sink is
|
|
389
|
+
// already off-invariant: unlink the file it produced and keep the resident — the
|
|
390
|
+
// scope's own eviction or release removes it, never a spill swap.
|
|
391
|
+
deleteResponseSpill(ref);
|
|
392
|
+
return false;
|
|
393
|
+
}
|
|
426
394
|
const base: Omit<SpilledResponseState, "sizeBytes"> = {
|
|
427
395
|
kind: "spill",
|
|
428
396
|
createdAt: expected.createdAt,
|
|
@@ -447,6 +415,9 @@ function replaceSpillEntryAtomically(
|
|
|
447
415
|
expected: SpilledResponseState,
|
|
448
416
|
candidate: ResidentResponseState,
|
|
449
417
|
): void {
|
|
418
|
+
// A memory-only candidate never displaces a durable spill entry: the foreign stub is
|
|
419
|
+
// left exactly as it was and the scoped write is refused.
|
|
420
|
+
if (candidate.connectionOwned === true) return;
|
|
450
421
|
try {
|
|
451
422
|
const ref = writeResponseSpillDurably(id, {
|
|
452
423
|
createdAt: candidate.createdAt,
|
|
@@ -478,10 +449,7 @@ function replaceSpillEntryAtomically(
|
|
|
478
449
|
// only durable once the debounced snapshot flushes — a crash before that
|
|
479
450
|
// reloads the OLD stub, which must still find its file. Queue the unlink;
|
|
480
451
|
// persistNow() drains the queue only after the snapshot write succeeds.
|
|
481
|
-
|
|
482
|
-
while (pendingSpillUnlinks.length > PENDING_SPILL_UNLINKS_MAX) {
|
|
483
|
-
deleteResponseSpill(pendingSpillUnlinks.shift()!);
|
|
484
|
-
}
|
|
452
|
+
deferSupersededSpill(expected.spill);
|
|
485
453
|
} catch (error) {
|
|
486
454
|
noteSpillWriteFailure(error);
|
|
487
455
|
// deferSpillUnlink: the durable snapshot may still reference the old
|
|
@@ -493,6 +461,49 @@ function replaceSpillEntryAtomically(
|
|
|
493
461
|
function setResidentEntry(id: string, entry: ResidentInput): void {
|
|
494
462
|
const expected = states.get(id);
|
|
495
463
|
const candidate = measureResidentEntry(id, entry);
|
|
464
|
+
const scope = entry.connectionScope;
|
|
465
|
+
if (scope) {
|
|
466
|
+
if (!candidate || (expected && (!isConnectionOwnedResponseState(expected) || expected.connectionScope !== scope))) return;
|
|
467
|
+
if (candidate.sizeBytes > byteCap()) {
|
|
468
|
+
admissionCounters.oversizedDrops += 1;
|
|
469
|
+
return;
|
|
470
|
+
}
|
|
471
|
+
const plan = (coldBytes: number, coldCount: number) => {
|
|
472
|
+
const { budgetBytes, retainedBytes } = appOwnedBytesSnapshot();
|
|
473
|
+
const headroom = Math.min(byteCap() - storedResponseBytes, budgetBytes - retainedBytes) - coldBytes;
|
|
474
|
+
const countToFree = states.size + coldCount + (expected ? 0 : 1) - MAX_STORED_RESPONSES;
|
|
475
|
+
return planConnectionScopeEvictions(states, scope, id, countToFree,
|
|
476
|
+
candidate.sizeBytes - (expected?.sizeBytes ?? 0) - headroom);
|
|
477
|
+
};
|
|
478
|
+
const path = loaded ? undefined : snapshotPath();
|
|
479
|
+
const cutoff = responseExpiryCutoff(now());
|
|
480
|
+
const cached = coldSnapshotAdmission;
|
|
481
|
+
// Cache only bounded admission facts, never decoded payloads outside the memory budget.
|
|
482
|
+
// A changed file or the next durable expiry invalidates them before they can reject a write.
|
|
483
|
+
if (path && cached?.path === path && cutoff <= cached.oldestCreatedAt
|
|
484
|
+
&& snapshotFileFingerprint(path) === cached.fingerprint) {
|
|
485
|
+
if (cached.conflictingId === id || !plan(cached.bytes, cached.count)) return;
|
|
486
|
+
}
|
|
487
|
+
// Live cold rows protect durable response IDs and count against both byte budgets.
|
|
488
|
+
const staged = path ? stageSnapshotEntries(path, SNAPSHOT_FILE_MAX_BYTES, snapshotLoadStore, cutoff) : undefined;
|
|
489
|
+
if (staged?.failed) return;
|
|
490
|
+
if (staged?.fingerprint !== undefined) coldSnapshotAdmission = {
|
|
491
|
+
path: staged.path, fingerprint: staged.fingerprint, bytes: staged.bytes, count: staged.entries.size,
|
|
492
|
+
oldestCreatedAt: staged.oldestCreatedAt, ...(staged.entries.has(id) ? { conflictingId: id } : {}),
|
|
493
|
+
};
|
|
494
|
+
if (staged?.entries.has(id)) return;
|
|
495
|
+
const evictions = plan(staged?.bytes ?? 0, staged?.entries.size ?? 0);
|
|
496
|
+
if (!evictions || !connectionReplayScopeAcceptsEntry(scope, id, entry.replayOwnerKey, entry.clientThreadId)) return;
|
|
497
|
+
if (staged) {
|
|
498
|
+
recoverSnapshotTemps(staged.path);
|
|
499
|
+
for (const [rowId, row] of staged.entries) replaceMapEntry(rowId, row);
|
|
500
|
+
finishSnapshotLoad(staged.oversized);
|
|
501
|
+
}
|
|
502
|
+
for (const evictedId of evictions) deleteEntry(evictedId);
|
|
503
|
+
replaceMapEntry(id, candidate, expected);
|
|
504
|
+
noteConnectionScopeEntry(scope, id);
|
|
505
|
+
return;
|
|
506
|
+
}
|
|
496
507
|
if (!candidate) {
|
|
497
508
|
replaceWithSpillFailure(id, expected);
|
|
498
509
|
// A tombstone is tiny but still resident state: the hard-cap invariant
|
|
@@ -584,10 +595,7 @@ function admitOversizedCandidate(
|
|
|
584
595
|
// Same deferred-unlink rule as replaceSpillEntryAtomically: the new stub
|
|
585
596
|
// is durable only after the debounced snapshot, so the old generation
|
|
586
597
|
// stays until a stable persist drains the queue.
|
|
587
|
-
|
|
588
|
-
while (pendingSpillUnlinks.length > PENDING_SPILL_UNLINKS_MAX) {
|
|
589
|
-
deleteResponseSpill(pendingSpillUnlinks.shift()!);
|
|
590
|
-
}
|
|
598
|
+
deferSupersededSpill(expected.spill);
|
|
591
599
|
}
|
|
592
600
|
} catch (error) {
|
|
593
601
|
noteSpillWriteFailure(error);
|
|
@@ -604,13 +612,13 @@ bindSpillQueueStore({
|
|
|
604
612
|
currentEntry: (id: string) => states.get(id),
|
|
605
613
|
residentEntries: () => [...states],
|
|
606
614
|
recomputeOldestResident,
|
|
607
|
-
schedulePersist,
|
|
608
615
|
pruneResponses,
|
|
609
616
|
accountedResponseSpillBytes,
|
|
610
617
|
spillByteCap,
|
|
611
618
|
enforceSpilledResponseBudget,
|
|
612
619
|
terminalizationMaxPasses: () => RESPONSE_SPILL_SHUTDOWN_TERMINALIZATION_MAX_PASSES,
|
|
613
620
|
});
|
|
621
|
+
bindConnectionScopeStore({ deleteEntry, currentEntry: id => states.get(id) });
|
|
614
622
|
|
|
615
623
|
// Replay provenance must stay proxy-private: a WeakMap distinguishes replayed history from the
|
|
616
624
|
// newly appended input suffix without adding an unknown field that native passthrough could send
|
|
@@ -621,6 +629,9 @@ const replayedInputPrefixLengths = new WeakMap<object, number>();
|
|
|
621
629
|
const clientCarriedReplays = new WeakSet<object>(); // overlap skip: the client resent the window itself
|
|
622
630
|
const replayFailures = new WeakMap<object, PreviousResponseReplayFailure>();
|
|
623
631
|
let loaded = false;
|
|
632
|
+
let coldSnapshotAdmission: {
|
|
633
|
+
path: string; fingerprint: string; bytes: number; count: number; oldestCreatedAt: number; conflictingId?: string;
|
|
634
|
+
} | undefined;
|
|
624
635
|
let persistTimer: ReturnType<typeof setTimeout> | null = null;
|
|
625
636
|
let pendingPersistPath: string | null = null;
|
|
626
637
|
/** Single-flight gate: overlapping response-state writes serialize (#612). */
|
|
@@ -635,17 +646,7 @@ function snapshotPath(): string {
|
|
|
635
646
|
return join(getConfigDir(), "responses-state.json");
|
|
636
647
|
}
|
|
637
648
|
|
|
638
|
-
|
|
639
|
-
* Best-effort disk snapshot so previous_response_id chains survive a proxy restart (the
|
|
640
|
-
* dominant expansion-miss cause: an in-memory-only store dies with the process, and the next
|
|
641
|
-
* chained turn then reaches the upstream as a naked delta). Load is lazy on first store access;
|
|
642
|
-
* persistence is debounced + unref'd so the hot path never blocks and the process can exit.
|
|
643
|
-
* Every disk failure is swallowed — the snapshot is a cache, not a source of truth.
|
|
644
|
-
*/
|
|
645
|
-
function ensureLoaded(): void {
|
|
646
|
-
if (loaded) return;
|
|
647
|
-
loaded = true;
|
|
648
|
-
const path = snapshotPath();
|
|
649
|
+
function recoverSnapshotTemps(path: string): void {
|
|
649
650
|
// Atomic writes place their temp beside the RESOLVED target, so a symlinked
|
|
650
651
|
// snapshot (dotfiles-managed config dir) strands temps in the link's real
|
|
651
652
|
// directory where a scan of the literal config dir would never see them.
|
|
@@ -664,40 +665,37 @@ function ensureLoaded(): void {
|
|
|
664
665
|
/* best-effort cleanup only; snapshot loading must remain independent */
|
|
665
666
|
}
|
|
666
667
|
}
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
replaceMapEntry,
|
|
686
|
-
stubSize,
|
|
687
|
-
tombstone,
|
|
688
|
-
measureResidentEntry,
|
|
689
|
-
admitOversizedCandidate,
|
|
690
|
-
byteCap,
|
|
691
|
-
});
|
|
692
|
-
}
|
|
693
|
-
}
|
|
694
|
-
}
|
|
695
|
-
}
|
|
696
|
-
} catch {
|
|
697
|
-
/* missing/corrupt snapshot: start empty */
|
|
698
|
-
}
|
|
668
|
+
}
|
|
669
|
+
|
|
670
|
+
const snapshotLoadStore: SnapshotLoadStore = {
|
|
671
|
+
replaceMapEntry,
|
|
672
|
+
stubSize,
|
|
673
|
+
tombstone,
|
|
674
|
+
measureResidentEntry,
|
|
675
|
+
// Spill oversized durable rows directly so first-load prune cannot demote unrelated rows.
|
|
676
|
+
admitResident(id, entry) {
|
|
677
|
+
if (entry.sizeBytes > byteCap()) admitOversizedCandidate(id, entry);
|
|
678
|
+
else replaceMapEntry(id, entry);
|
|
679
|
+
},
|
|
680
|
+
};
|
|
681
|
+
|
|
682
|
+
function finishSnapshotLoad(oversized: boolean): void {
|
|
683
|
+
if (oversized) admissionCounters.snapshotOversizedRefusals += 1;
|
|
684
|
+
loaded = true;
|
|
685
|
+
coldSnapshotAdmission = undefined;
|
|
699
686
|
try { recoverOrphanedResponseSpills(ownedSpillFileNames()); } catch { /* best effort */ }
|
|
687
|
+
}
|
|
688
|
+
|
|
689
|
+
/** Best-effort lazy load so durable previous_response_id chains can survive a restart. */
|
|
690
|
+
function ensureLoaded(): boolean {
|
|
691
|
+
if (loaded) return true;
|
|
692
|
+
const path = snapshotPath();
|
|
693
|
+
const result = loadSnapshotEntries(path, SNAPSHOT_FILE_MAX_BYTES, snapshotLoadStore);
|
|
694
|
+
if (result.failed) return false;
|
|
695
|
+
recoverSnapshotTemps(path);
|
|
696
|
+
finishSnapshotLoad(result.oversized);
|
|
700
697
|
pruneResponses();
|
|
698
|
+
return true;
|
|
701
699
|
}
|
|
702
700
|
|
|
703
701
|
/** Every file name the process still needs: live stubs, deferred unlinks, and queued publications. */
|
|
@@ -722,7 +720,7 @@ type SnapshotWriteOutcome = "stable" | "unstable" | "failed";
|
|
|
722
720
|
async function writeBoundedSnapshot(path: string, attemptLimit: number): Promise<SnapshotWriteOutcome> {
|
|
723
721
|
try {
|
|
724
722
|
for (let attempt = 0; attempt < attemptLimit; attempt += 1) {
|
|
725
|
-
const revision =
|
|
723
|
+
const revision = durableRevision;
|
|
726
724
|
const payload = snapshotPayload(selectSnapshotEntries(states, snapshotTotalBytes(), SNAPSHOT_ENTRY_MAX_BYTES));
|
|
727
725
|
const payloadBytes = Buffer.byteLength(payload, "utf8");
|
|
728
726
|
const payloadDigest = Bun.hash(payload).toString(36);
|
|
@@ -756,7 +754,7 @@ async function writeBoundedSnapshot(path: string, attemptLimit: number): Promise
|
|
|
756
754
|
lastSnapshotTarget = resolveWriteTarget(path);
|
|
757
755
|
}
|
|
758
756
|
persistAttemptHookForTests?.();
|
|
759
|
-
if (revision ===
|
|
757
|
+
if (revision === durableRevision) {
|
|
760
758
|
// Cancel only the timer whose mutation this stable revision includes,
|
|
761
759
|
// before an awaiting caller's microtask can record a newer revision.
|
|
762
760
|
if (persistTimer) clearTimeout(persistTimer);
|
|
@@ -829,7 +827,9 @@ async function persistNow(path: string, awaitFollowUp = false): Promise<void> {
|
|
|
829
827
|
}
|
|
830
828
|
}
|
|
831
829
|
|
|
832
|
-
function
|
|
830
|
+
function noteDurableMutation(): void {
|
|
831
|
+
durableRevision += 1;
|
|
832
|
+
if (!loaded) return;
|
|
833
833
|
// Resolve the target path NOW: tests (and anything else) may swap OPENCODEX_HOME before the
|
|
834
834
|
// debounce fires, and a late write must land in the home that owned the recorded state.
|
|
835
835
|
schedulePersistAt(snapshotPath());
|
|
@@ -937,25 +937,44 @@ function enforceSpilledResponseBudget(requiredHeadroomBytes?: number): number {
|
|
|
937
937
|
return before - spilledBytes;
|
|
938
938
|
}
|
|
939
939
|
|
|
940
|
-
function
|
|
940
|
+
function responseExpiryCutoff(at: number): number {
|
|
941
|
+
return at - RESPONSE_TTL_MS;
|
|
942
|
+
}
|
|
943
|
+
|
|
944
|
+
function deleteExpiredEntries(at: number): number {
|
|
945
|
+
const cutoff = responseExpiryCutoff(at);
|
|
946
|
+
let removed = 0;
|
|
941
947
|
for (const [id, state] of states) {
|
|
942
|
-
if (
|
|
948
|
+
if (state.createdAt >= cutoff && !connectionScopeEntryExpired(state, at)) continue;
|
|
949
|
+
deleteEntry(id);
|
|
950
|
+
removed += 1;
|
|
943
951
|
}
|
|
952
|
+
return removed;
|
|
953
|
+
}
|
|
954
|
+
|
|
955
|
+
function pruneResponses(at = now()): void {
|
|
956
|
+
deleteExpiredEntries(at);
|
|
944
957
|
while (states.size > MAX_STORED_RESPONSES) {
|
|
945
|
-
const oldest = states.keys().next().value;
|
|
946
|
-
if (
|
|
958
|
+
const oldest = oldestConnectionScopeResident(states, spillQueueHoldsResidentCandidate) ?? states.keys().next().value;
|
|
959
|
+
if (oldest === undefined) break;
|
|
947
960
|
deleteEntry(oldest);
|
|
948
961
|
}
|
|
949
962
|
// Unconditional RAM cap. Resident payloads demote durably; stubs/tombstones are
|
|
950
963
|
// deleted only when even their bounded metadata cannot fit the override.
|
|
951
964
|
while (storedResponseBytes > byteCap() && states.size > 0) {
|
|
965
|
+
// Memory-only connection residents drop before any durable entry pays a disk demotion.
|
|
966
|
+
const connectionOldest = oldestConnectionScopeResident(states, spillQueueHoldsResidentCandidate);
|
|
967
|
+
if (connectionOldest !== undefined) {
|
|
968
|
+
deleteEntry(connectionOldest);
|
|
969
|
+
continue;
|
|
970
|
+
}
|
|
952
971
|
const oldestResident = [...states].find(([id, entry]) => entry.kind === "resident"
|
|
953
972
|
&& !spillQueueHoldsResidentCandidate(id, entry));
|
|
954
973
|
const hasPendingResident = !oldestResident && [...states].some(([id, entry]) => entry.kind === "resident"
|
|
955
974
|
&& spillQueueHoldsResidentCandidate(id, entry));
|
|
956
975
|
if (hasPendingResident) break;
|
|
957
976
|
const oldestId = oldestResident?.[0] ?? states.keys().next().value as string | undefined;
|
|
958
|
-
if (
|
|
977
|
+
if (oldestId === undefined) break;
|
|
959
978
|
const entry = states.get(oldestId)!;
|
|
960
979
|
if (entry.kind !== "resident") {
|
|
961
980
|
deleteEntry(oldestId);
|
|
@@ -986,16 +1005,10 @@ function pruneResponses(at = now()): void {
|
|
|
986
1005
|
|
|
987
1006
|
/** Periodic TTL-only sweep; count/byte eviction remains owned by mutation paths. */
|
|
988
1007
|
export function sweepExpiredResponseStates(at = now()): number {
|
|
989
|
-
|
|
990
|
-
for (const [id, state] of states) {
|
|
991
|
-
if (at - state.createdAt <= RESPONSE_TTL_MS) continue;
|
|
992
|
-
deleteEntry(id);
|
|
993
|
-
removed += 1;
|
|
994
|
-
}
|
|
1008
|
+
const removed = deleteExpiredEntries(at);
|
|
995
1009
|
// The disk ceiling needs a caller that does not depend on traffic. The return
|
|
996
1010
|
// value stays the TTL count so this function's existing contract is unchanged.
|
|
997
|
-
|
|
998
|
-
if (removed > 0 || reclaimed > 0) schedulePersist();
|
|
1011
|
+
enforceSpilledResponseBudget();
|
|
999
1012
|
return removed;
|
|
1000
1013
|
}
|
|
1001
1014
|
|
|
@@ -1012,18 +1025,16 @@ export function responseContinuationRetainedStoreSnapshot(): RetainedStoreSnapsh
|
|
|
1012
1025
|
bytes,
|
|
1013
1026
|
evictableBytes,
|
|
1014
1027
|
pinnedBytes: Math.max(0, bytes - evictableBytes),
|
|
1015
|
-
oldestAt:
|
|
1028
|
+
oldestAt: budgetCandidate?.[1].createdAt ?? null,
|
|
1016
1029
|
};
|
|
1017
1030
|
}
|
|
1018
1031
|
|
|
1019
1032
|
export function evictOldestResponseContinuationForBudget(): number {
|
|
1020
|
-
if (
|
|
1021
|
-
const id =
|
|
1022
|
-
|
|
1023
|
-
if (!entry || entry.kind !== "resident") return 0;
|
|
1033
|
+
if (!budgetCandidate) return 0;
|
|
1034
|
+
const [id, entry] = budgetCandidate;
|
|
1035
|
+
if (entry.connectionOwned === true) { deleteEntry(id); return entry.sizeBytes; }
|
|
1024
1036
|
if (windowsSecretAclApplies()) {
|
|
1025
1037
|
queuePendingResponseSpill(id, entry);
|
|
1026
|
-
schedulePersist();
|
|
1027
1038
|
return 0;
|
|
1028
1039
|
}
|
|
1029
1040
|
try {
|
|
@@ -1041,7 +1052,6 @@ export function evictOldestResponseContinuationForBudget(): number {
|
|
|
1041
1052
|
noteSpillWriteFailure(error);
|
|
1042
1053
|
replaceWithSpillFailure(id, entry);
|
|
1043
1054
|
}
|
|
1044
|
-
schedulePersist();
|
|
1045
1055
|
const replacement = states.get(id);
|
|
1046
1056
|
return !replacement || replacement.kind === "resident"
|
|
1047
1057
|
? 0
|
|
@@ -1068,7 +1078,6 @@ function materializeEntry(
|
|
|
1068
1078
|
: "spill_corrupt",
|
|
1069
1079
|
};
|
|
1070
1080
|
replaceWithSpillFailure(id, entry);
|
|
1071
|
-
schedulePersist();
|
|
1072
1081
|
return { ok: false, failure };
|
|
1073
1082
|
}
|
|
1074
1083
|
if (entry.replayOwnerKey !== result.payload.replayOwnerKey || entry.clientThreadId !== result.payload.clientThreadId) {
|
|
@@ -1080,7 +1089,6 @@ function materializeEntry(
|
|
|
1080
1089
|
|| entry.providerOutputStart !== result.payload.providerOutputStart)) {
|
|
1081
1090
|
spillCounters.readFailures += 1;
|
|
1082
1091
|
replaceWithSpillFailure(id, entry);
|
|
1083
|
-
schedulePersist();
|
|
1084
1092
|
return { ok: false, failure: { code: "previous_response_not_found", reason: "spill_corrupt" } };
|
|
1085
1093
|
}
|
|
1086
1094
|
const state = measureResidentEntry(id, {
|
|
@@ -1097,7 +1105,6 @@ function materializeEntry(
|
|
|
1097
1105
|
if (!state) {
|
|
1098
1106
|
spillCounters.readFailures += 1;
|
|
1099
1107
|
replaceWithSpillFailure(id, entry);
|
|
1100
|
-
schedulePersist();
|
|
1101
1108
|
return { ok: false, failure: { code: "previous_response_not_found", reason: "spill_corrupt" } };
|
|
1102
1109
|
}
|
|
1103
1110
|
return { ok: true, state };
|
|
@@ -1108,10 +1115,18 @@ export function expandPreviousResponseInput(body: unknown, clientThreadId?: stri
|
|
|
1108
1115
|
const request = body as Record<string, unknown>;
|
|
1109
1116
|
const previousId = typeof request.previous_response_id === "string" ? request.previous_response_id : undefined;
|
|
1110
1117
|
if (!previousId) return body;
|
|
1111
|
-
ensureLoaded()
|
|
1118
|
+
if (!ensureLoaded()) {
|
|
1119
|
+
if (replayOwnerKey !== undefined) replayFailures.set(request, { code: "previous_response_not_found", reason: "missing" });
|
|
1120
|
+
return body;
|
|
1121
|
+
}
|
|
1112
1122
|
pruneResponses();
|
|
1113
1123
|
const previous = states.get(previousId);
|
|
1114
|
-
if (!previous)
|
|
1124
|
+
if (!previous) {
|
|
1125
|
+
// Strict replay needs a local ownership proof even after a scoped entry was released.
|
|
1126
|
+
// Legacy callers leave the owner undefined and retain their existing upstream continuation.
|
|
1127
|
+
if (replayOwnerKey !== undefined) replayFailures.set(request, { code: "previous_response_not_found", reason: "missing" });
|
|
1128
|
+
return body;
|
|
1129
|
+
}
|
|
1115
1130
|
// Authorize metadata BEFORE opening a spill or exposing provider continuation state.
|
|
1116
1131
|
if (previous.kind !== "spill-failed" && !replayScopeMatches(previous, clientThreadId, replayOwnerKey)) {
|
|
1117
1132
|
replayFailures.set(request, { code: "previous_response_not_found", reason: "scope_mismatch" });
|
|
@@ -1171,7 +1186,7 @@ export function previousResponseConversationId(responseId: string | undefined):
|
|
|
1171
1186
|
|
|
1172
1187
|
export function previousResponseProviderState(responseId: string | undefined): OcxProviderContinuationState | undefined {
|
|
1173
1188
|
if (!responseId) return undefined;
|
|
1174
|
-
ensureLoaded();
|
|
1189
|
+
if (!ensureLoaded()) return undefined;
|
|
1175
1190
|
pruneResponses();
|
|
1176
1191
|
const state = states.get(responseId);
|
|
1177
1192
|
const providers = state?.kind === "spill-failed" ? undefined : state?.providers;
|
|
@@ -1229,7 +1244,7 @@ export function rememberResponseState(
|
|
|
1229
1244
|
requestBody: unknown,
|
|
1230
1245
|
response: { id?: unknown; output?: unknown; status?: unknown; incomplete_details?: unknown },
|
|
1231
1246
|
providerState?: OcxProviderContinuationState | string,
|
|
1232
|
-
opts?: { force?: boolean; clientThreadId?: string; retainForToolContinuation?: boolean; replayOwnerKey?: string | null; compiledPlaintext?: boolean },
|
|
1247
|
+
opts?: { force?: boolean; clientThreadId?: string; retainForToolContinuation?: boolean; replayOwnerKey?: string | null; compiledPlaintext?: boolean; connectionScope?: ConnectionReplayScope },
|
|
1233
1248
|
): void {
|
|
1234
1249
|
if (!requestBody || typeof requestBody !== "object" || Array.isArray(requestBody)) return;
|
|
1235
1250
|
const request = requestBody as Record<string, unknown>;
|
|
@@ -1249,10 +1264,13 @@ export function rememberResponseState(
|
|
|
1249
1264
|
|| (details as { reason?: unknown }).reason !== "max_output_tokens") return;
|
|
1250
1265
|
} else if (response.status !== undefined && response.status !== "completed") return;
|
|
1251
1266
|
if ((opts?.compiledPlaintext && !validReplayOwnerKey(opts.replayOwnerKey)) || opts?.replayOwnerKey === null || (opts?.replayOwnerKey !== undefined && !validReplayOwnerKey(opts.replayOwnerKey))) return;
|
|
1252
|
-
|
|
1267
|
+
const connectionScope = opts?.connectionScope;
|
|
1268
|
+
if (connectionScope && !connectionReplayScopeAcceptsEntry(connectionScope, response.id, opts?.replayOwnerKey, opts?.clientThreadId)) return;
|
|
1269
|
+
if (!connectionScope && !ensureLoaded()) return;
|
|
1253
1270
|
const existing = states.get(response.id);
|
|
1254
1271
|
// Never let a colliding upstream id replace a different caller's retained response.
|
|
1255
|
-
if (existing && existing.kind !== "spill-failed" && !replayScopeMatches(existing, opts?.clientThreadId, opts?.replayOwnerKey)
|
|
1272
|
+
if (existing && existing.kind !== "spill-failed" && !replayScopeMatches(existing, opts?.clientThreadId, opts?.replayOwnerKey)
|
|
1273
|
+
&& !(!connectionScope && validReplayOwnerKey(opts?.replayOwnerKey) && isConnectionOwnedResponseState(existing))) return;
|
|
1256
1274
|
const normalizedProviderState: OcxProviderContinuationState = typeof providerState === "string"
|
|
1257
1275
|
? { cursor: { conversationId: providerState } }
|
|
1258
1276
|
: structuredClone(providerState ?? {});
|
|
@@ -1270,6 +1288,7 @@ export function rememberResponseState(
|
|
|
1270
1288
|
...(clientThreadId ? { clientThreadId } : {}),
|
|
1271
1289
|
...(opts?.replayOwnerKey ? { replayOwnerKey: opts.replayOwnerKey } : {}),
|
|
1272
1290
|
items: [...requestItems, ...response.output],
|
|
1291
|
+
...(connectionScope ? { connectionOwned: true as const, connectionScope } : {}),
|
|
1273
1292
|
// Where response.output begins. A replay skip requires a matched item at or past this
|
|
1274
1293
|
// index that also carries a provider-issued id — position alone proves only that an item
|
|
1275
1294
|
// sits on the provider side, not that the provider authored it.
|
|
@@ -1282,8 +1301,7 @@ export function rememberResponseState(
|
|
|
1282
1301
|
...(Object.keys(normalizedProviderState).length > 0 ? { providers: normalizedProviderState } : {}),
|
|
1283
1302
|
...(unforcedStoreFalse ? { unforcedStoreFalse: true } : {}),
|
|
1284
1303
|
});
|
|
1285
|
-
enforceAppOwnedMemoryBudget();
|
|
1286
|
-
schedulePersist();
|
|
1304
|
+
if (!connectionScope) enforceAppOwnedMemoryBudget();
|
|
1287
1305
|
}
|
|
1288
1306
|
|
|
1289
1307
|
/** Test-only persistence churn hook; invoked after each atomic snapshot rewrite. */
|
|
@@ -1311,12 +1329,12 @@ export function clearResponseStateMemoryForTests(): void {
|
|
|
1311
1329
|
pendingPersistPath = null;
|
|
1312
1330
|
resetSpillQueueForTests();
|
|
1313
1331
|
resetPeriodicSpillSweepCursorForTests();
|
|
1332
|
+
for (const [id, entry] of states) forgetConnectionScopeEntry(id, entry);
|
|
1314
1333
|
states.clear();
|
|
1315
1334
|
storedResponseBytes = 0;
|
|
1316
1335
|
residentResponseBytes = 0;
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
stateRevision = 0;
|
|
1336
|
+
budgetCandidate = undefined;
|
|
1337
|
+
durableRevision = 0;
|
|
1320
1338
|
pendingSpillUnlinks.length = 0;
|
|
1321
1339
|
resetSpillCountersForTests();
|
|
1322
1340
|
spillWriteHealth.consecutiveFailures = 0;
|
|
@@ -1331,6 +1349,7 @@ export function clearResponseStateMemoryForTests(): void {
|
|
|
1331
1349
|
lastSnapshotDigest = null;
|
|
1332
1350
|
lastSnapshotTarget = null;
|
|
1333
1351
|
loaded = false;
|
|
1352
|
+
coldSnapshotAdmission = undefined;
|
|
1334
1353
|
}
|
|
1335
1354
|
|
|
1336
1355
|
export function clearResponseStateForTests(): void {
|
package/src/router.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isBareOpenAiFamilyModel } from "./codex/control-plane-models";
|
|
2
2
|
import type { CodexAccountMode, OcxConfig, OcxProviderConfig } from "./types";
|
|
3
3
|
import { createHash } from "node:crypto";
|
|
4
4
|
import { peekAuthStore } from "./oauth/store";
|
|
@@ -327,11 +327,7 @@ function crossProviderRedirectTarget(config: OcxConfig, providerName: string, va
|
|
|
327
327
|
}
|
|
328
328
|
}
|
|
329
329
|
|
|
330
|
-
|
|
331
|
-
export function isBareOpenAiFamilyModel(modelId: string): boolean {
|
|
332
|
-
return !modelId.includes("/")
|
|
333
|
-
&& (/^(?:gpt-|o1-|o3-|o4-)/.test(modelId) || CODEX_INTERNAL_OPENAI_MODELS.has(modelId));
|
|
334
|
-
}
|
|
330
|
+
export { isBareOpenAiFamilyModel } from "./codex/control-plane-models";
|
|
335
331
|
|
|
336
332
|
function routeResult(
|
|
337
333
|
config: OcxConfig | undefined,
|