@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
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { TranslatorBudgetExceededError } from "./translator-budget";
|
|
2
|
+
|
|
1
3
|
/** Line-aware filter for echoed tool envelopes in incremental assistant text. */
|
|
2
4
|
const MARKERS = ["[Tool Result]", "[Tool Error]", "[tool_result]", "[Tool Call]", "[Tool call:"] as const;
|
|
3
5
|
const UNTERMINATED_MARKERS = ["[Tool Result", "[Tool Error", "[tool_result", "[Tool Call"] as const;
|
|
@@ -77,6 +79,9 @@ export function closedFenceLines(lines: readonly string[]): boolean[] {
|
|
|
77
79
|
// closes. Output from that line is held: a matching closer releases it as code, the end of the turn
|
|
78
80
|
// drops it as an echo. The hold is bounded, so a long block cannot stall the stream.
|
|
79
81
|
const MAX_HELD_CHARS = 64 * 1024;
|
|
82
|
+
// A whole marker followed only by whitespace is still ambiguous until newline/EOF or prose.
|
|
83
|
+
// Bound the unresolved line content independently of the fenced hold; LF and CRLF settle it.
|
|
84
|
+
const MAX_PENDING_CHARS = 64 * 1024;
|
|
80
85
|
|
|
81
86
|
interface Fence {
|
|
82
87
|
char: string;
|
|
@@ -88,6 +93,8 @@ interface Fence {
|
|
|
88
93
|
|
|
89
94
|
export class ToolEnvelopeEchoFilter {
|
|
90
95
|
private pending = "";
|
|
96
|
+
private pendingWholeMarker = false;
|
|
97
|
+
private failure: TranslatorBudgetExceededError | null = null;
|
|
91
98
|
private safeLine = false;
|
|
92
99
|
private fence: Fence | null = null;
|
|
93
100
|
private held: string | null = null;
|
|
@@ -96,6 +103,7 @@ export class ToolEnvelopeEchoFilter {
|
|
|
96
103
|
unverifiedMarker = false;
|
|
97
104
|
|
|
98
105
|
feed(delta: string): string {
|
|
106
|
+
if (this.failure) throw this.failure;
|
|
99
107
|
if (this.matched) return "";
|
|
100
108
|
let output = "";
|
|
101
109
|
for (const char of delta) {
|
|
@@ -105,11 +113,19 @@ export class ToolEnvelopeEchoFilter {
|
|
|
105
113
|
if (char === "\n") this.safeLine = false;
|
|
106
114
|
continue;
|
|
107
115
|
}
|
|
108
|
-
this.pending += char;
|
|
109
116
|
if (char === "\n") {
|
|
110
|
-
output += this.completeLine();
|
|
117
|
+
output += this.completeLine(char);
|
|
111
118
|
continue;
|
|
112
119
|
}
|
|
120
|
+
// Allow one CR of lookahead at the limit, including across deltas. It is content unless LF follows.
|
|
121
|
+
const possibleCRLF = char === "\r" && this.pending.length === MAX_PENDING_CHARS;
|
|
122
|
+
if (this.pending.length + char.length > MAX_PENDING_CHARS && !possibleCRLF) {
|
|
123
|
+
this.failPendingOverflow();
|
|
124
|
+
}
|
|
125
|
+
this.pending += char;
|
|
126
|
+
// Check only the new scalar, not the growing whitespace suffix. A non-whitespace scalar
|
|
127
|
+
// either completes an unterminated marker (']') or makes the line prose below.
|
|
128
|
+
if (this.pendingWholeMarker && char.trimEnd() === "") continue;
|
|
113
129
|
const probe = this.pending.replace(/^[ \t]*/, "");
|
|
114
130
|
const indent = this.pending.length - probe.length;
|
|
115
131
|
if (indent <= MAX_INDENT && probe === TOOL_CALL_LINE) {
|
|
@@ -129,10 +145,11 @@ export class ToolEnvelopeEchoFilter {
|
|
|
129
145
|
const fenceCandidate = indent <= MAX_FENCE_INDENT
|
|
130
146
|
&& this.pending.length <= MAX_FENCE_LINE
|
|
131
147
|
&& (FENCE_PREFIX.test(probe) || FENCE_RUN.test(probe));
|
|
148
|
+
this.pendingWholeMarker = indent <= MAX_INDENT && WHOLE_LINE_MARKERS.includes(probe);
|
|
132
149
|
const markerCandidate = indent <= MAX_INDENT
|
|
133
150
|
&& (probe === ""
|
|
134
151
|
|| MARKERS.some(marker => marker.startsWith(probe))
|
|
135
|
-
||
|
|
152
|
+
|| this.pendingWholeMarker);
|
|
136
153
|
if (fenceCandidate || markerCandidate) continue;
|
|
137
154
|
this.flushLineStart();
|
|
138
155
|
output += this.emit(this.takePending());
|
|
@@ -146,7 +163,9 @@ export class ToolEnvelopeEchoFilter {
|
|
|
146
163
|
* line that merely starts with a result or error marker, is prose.
|
|
147
164
|
*/
|
|
148
165
|
finish(): string {
|
|
166
|
+
if (this.failure) throw this.failure;
|
|
149
167
|
if (this.matched) return "";
|
|
168
|
+
if (this.pending.length > MAX_PENDING_CHARS) this.failPendingOverflow();
|
|
150
169
|
// A closing fence may end the stream without a trailing newline; settle it before the hold.
|
|
151
170
|
const settled = this.pending !== "" && parseFenceLine(this.pending) ? this.completeLine() : "";
|
|
152
171
|
const pending = this.takePending();
|
|
@@ -163,8 +182,8 @@ export class ToolEnvelopeEchoFilter {
|
|
|
163
182
|
return settled + pending;
|
|
164
183
|
}
|
|
165
184
|
|
|
166
|
-
private completeLine(): string {
|
|
167
|
-
const raw = this.takePending();
|
|
185
|
+
private completeLine(ending = ""): string {
|
|
186
|
+
const raw = this.takePending() + ending;
|
|
168
187
|
const probe = raw.replace(/^[ \t]*/, "");
|
|
169
188
|
const indent = raw.length - probe.length;
|
|
170
189
|
const line = probe.replace(/\r?\n$/, "");
|
|
@@ -211,9 +230,18 @@ export class ToolEnvelopeEchoFilter {
|
|
|
211
230
|
private takePending(): string {
|
|
212
231
|
const pending = this.pending;
|
|
213
232
|
this.pending = "";
|
|
233
|
+
this.pendingWholeMarker = false;
|
|
214
234
|
return pending;
|
|
215
235
|
}
|
|
216
236
|
|
|
237
|
+
private failPendingOverflow(): never {
|
|
238
|
+
this.takePending();
|
|
239
|
+
this.held = null;
|
|
240
|
+
this.fence = null;
|
|
241
|
+
this.failure = new TranslatorBudgetExceededError("live_transient", MAX_PENDING_CHARS * 2);
|
|
242
|
+
throw this.failure;
|
|
243
|
+
}
|
|
244
|
+
|
|
217
245
|
/** Route text to the client, or into the fence hold while one is open. */
|
|
218
246
|
private emit(text: string): string {
|
|
219
247
|
if (this.held === null) return text;
|
|
@@ -45,6 +45,10 @@ const MAX_TOKEN_LENGTH = 128;
|
|
|
45
45
|
// Keyword matching reads at most this much of the message.
|
|
46
46
|
const MAX_MESSAGE_SCAN = 4096;
|
|
47
47
|
|
|
48
|
+
const TRANSPORT_FAILURE_CODES: ReadonlySet<string> = new Set([
|
|
49
|
+
"upstream_reset_replay_refused", "upstream_closed_before_response", "upstream_no_response",
|
|
50
|
+
]);
|
|
51
|
+
|
|
48
52
|
const STRUCTURED: ReadonlyArray<readonly [UpstreamCondition, ReadonlySet<string>]> = [
|
|
49
53
|
["context_overflow", new Set(["context_length_exceeded", "string_above_max_length", "context_window_exceeded", "prompt_too_long"])],
|
|
50
54
|
["location_unsupported", new Set(["location_not_supported", "unsupported_country_region_territory", "unsupported_country", "user_location_is_not_supported"])],
|
|
@@ -53,6 +57,7 @@ const STRUCTURED: ReadonlyArray<readonly [UpstreamCondition, ReadonlySet<string>
|
|
|
53
57
|
["model_unavailable", new Set(["model_not_found", "unsupported_model", "model_not_available", "model_not_supported", "deployment_not_found"])],
|
|
54
58
|
["rate_limited", new Set(["rate_limit_exceeded", "rate_limit_error", "too_many_requests", "throttling", "throttled", "rate_limited"])],
|
|
55
59
|
["upstream_unavailable", new Set(["server_is_overloaded", "overloaded_error", "service_unavailable", "unavailable"])],
|
|
60
|
+
["upstream_failed", TRANSPORT_FAILURE_CODES],
|
|
56
61
|
];
|
|
57
62
|
|
|
58
63
|
// Context overflow from message text uses the same verdict the combo router trusts, so a validation
|
|
@@ -95,14 +100,16 @@ function statusFallback(status: number): UpstreamCondition | undefined {
|
|
|
95
100
|
}
|
|
96
101
|
|
|
97
102
|
/**
|
|
98
|
-
* Precedence
|
|
99
|
-
*
|
|
103
|
+
* Precedence starts with 401, then exact transport codes, then other structured evidence.
|
|
104
|
+
* Keywords apply only to 4xx statuses. The bare status is the final fallback.
|
|
100
105
|
*/
|
|
101
106
|
export function classifyUpstreamCondition(evidence: UpstreamConditionEvidence): UpstreamCondition | undefined {
|
|
102
107
|
const { status } = evidence;
|
|
103
108
|
if (!Number.isInteger(status)) return undefined;
|
|
104
109
|
if (status === 401) return "auth_failed";
|
|
105
|
-
const
|
|
110
|
+
const code = token(evidence.code);
|
|
111
|
+
if (code !== undefined && TRANSPORT_FAILURE_CODES.has(code)) return "upstream_failed";
|
|
112
|
+
const tokens = [code, token(evidence.type), token(evidence.reason)].filter((value): value is string => value !== undefined);
|
|
106
113
|
const structured = structuredCondition(tokens);
|
|
107
114
|
if (structured) return structured;
|
|
108
115
|
const message = typeof evidence.message === "string" ? evidence.message.slice(0, MAX_MESSAGE_SCAN).toLowerCase() : "";
|
|
@@ -249,6 +249,8 @@ export interface RetryBackoffOptions {
|
|
|
249
249
|
baseDelayMs: number;
|
|
250
250
|
maxDelayMs: number;
|
|
251
251
|
headers?: Headers;
|
|
252
|
+
/** Delay already validated by the caller, including an explicit zero. */
|
|
253
|
+
retryAfterMs?: number;
|
|
252
254
|
/**
|
|
253
255
|
* Treat a provider's `Retry-After` as the earliest legal send rather than something the
|
|
254
256
|
* local maximum may shorten. Opt-in per caller so the change lands on the transient path
|
|
@@ -408,7 +410,7 @@ export function isConnectionResetError(err: unknown): boolean {
|
|
|
408
410
|
|| msg.includes("connection reset by peer");
|
|
409
411
|
}
|
|
410
412
|
|
|
411
|
-
function retryAfterDelayMs(headers: Headers): number | undefined {
|
|
413
|
+
export function retryAfterDelayMs(headers: Headers): number | undefined {
|
|
412
414
|
const raw = headers.get("retry-after")?.trim();
|
|
413
415
|
if (!raw) return undefined;
|
|
414
416
|
const seconds = Number(raw);
|
|
@@ -419,7 +421,7 @@ function retryAfterDelayMs(headers: Headers): number | undefined {
|
|
|
419
421
|
}
|
|
420
422
|
|
|
421
423
|
export function retryBackoffDelayMs(attempt: number, opts: RetryBackoffOptions): number {
|
|
422
|
-
const retryAfter = opts.headers ? retryAfterDelayMs(opts.headers) : undefined;
|
|
424
|
+
const retryAfter = opts.retryAfterMs ?? (opts.headers ? retryAfterDelayMs(opts.headers) : undefined);
|
|
423
425
|
const exp = Math.min(opts.baseDelayMs * (2 ** attempt), opts.maxDelayMs);
|
|
424
426
|
const jittered = Math.floor(exp * (0.8 + Math.random() * 0.4));
|
|
425
427
|
if (retryAfter === undefined) return jittered;
|
|
@@ -523,6 +525,8 @@ export interface ResetRetryOptions {
|
|
|
523
525
|
destination?: ErrorDestinationLabel;
|
|
524
526
|
/** Total upstream sends allowed, including the first one. Not a per-layer retry count. */
|
|
525
527
|
attempts?: number;
|
|
528
|
+
/** Live shared allowance, also forwarded to nested reset retries. */
|
|
529
|
+
remainingSends?: () => number;
|
|
526
530
|
/**
|
|
527
531
|
* Reports how many upstream sends this call actually consumed, so a caller that spans
|
|
528
532
|
* several legs of one request (initial send, then a 429/account-recovery refetch) can
|
|
@@ -534,9 +538,10 @@ export interface ResetRetryOptions {
|
|
|
534
538
|
* uncounted but UNCOUNTABLE: the callback existed on a type those call sites never reach.
|
|
535
539
|
*/
|
|
536
540
|
onSendsConsumed?: ((sends: number) => void) & {
|
|
537
|
-
|
|
541
|
+
remaining?: () => number;
|
|
542
|
+
beforeSend?: (reserveRetrySpend?: boolean) => boolean;
|
|
538
543
|
close?: () => void;
|
|
539
|
-
execute?: <T>(run: () => Promise<T
|
|
544
|
+
execute?: <T>(run: () => Promise<T>, recoveryAdmission?: RetryRecoveryAdmission) => Promise<T>;
|
|
540
545
|
};
|
|
541
546
|
/**
|
|
542
547
|
* Spend one operator-granted replacement for a pre-header reset this helper would otherwise
|
|
@@ -561,6 +566,12 @@ export interface ResetRetryOptions {
|
|
|
561
566
|
}
|
|
562
567
|
|
|
563
568
|
export interface TransientRetryOptions extends ResetRetryOptions {
|
|
569
|
+
/** Require a fresh spend reservation for replacement sends when this ladder is enforcing spend. */
|
|
570
|
+
reserveRetrySpend?: () => boolean;
|
|
571
|
+
/** Read the preceding paced response under the receiving path's body policy. */
|
|
572
|
+
readRetryResponseBody?: PacedRetryBodyReader;
|
|
573
|
+
/** This leg starts with a recovery send. Keep the preceding response until admission. */
|
|
574
|
+
retryFrom?: Response;
|
|
564
575
|
/** Test seam: per-attempt slow budget override (defaults to TRANSIENT_RETRY_SLOW_ATTEMPT_MS). */
|
|
565
576
|
slowAttemptMs?: number;
|
|
566
577
|
/**
|
|
@@ -574,10 +585,42 @@ export interface TransientRetryOptions extends ResetRetryOptions {
|
|
|
574
585
|
retryAfterCeilingMs?: number;
|
|
575
586
|
}
|
|
576
587
|
|
|
588
|
+
export type PacedRetryBodyReader = (response: Response, signal?: AbortSignal) => Promise<Uint8Array<ArrayBuffer>>;
|
|
589
|
+
|
|
590
|
+
type PacedRetryRetention = (signal?: AbortSignal, readBody?: PacedRetryBodyReader) => Promise<Response>;
|
|
591
|
+
const pacedRetryResponses = new WeakMap<Response, PacedRetryRetention>();
|
|
592
|
+
|
|
593
|
+
/** The pacing owner can materialize its response and return its body lease before a retry. */
|
|
594
|
+
export function registerPacedRetryResponse(response: Response, retain: PacedRetryRetention): void {
|
|
595
|
+
pacedRetryResponses.set(response, retain);
|
|
596
|
+
}
|
|
597
|
+
|
|
598
|
+
export function retainPacedRetryResponse(
|
|
599
|
+
response: Response,
|
|
600
|
+
signal?: AbortSignal,
|
|
601
|
+
readBody?: PacedRetryBodyReader,
|
|
602
|
+
): Response | Promise<Response> {
|
|
603
|
+
return pacedRetryResponses.get(response)?.(signal, readBody) ?? response;
|
|
604
|
+
}
|
|
605
|
+
|
|
577
606
|
/** `offline-resend` is the single send after an offline wait (#7958), never a reset retry. */
|
|
578
607
|
export type UpstreamSendRecovery = "connection-reset" | "transient-5xx" | "offline-resend";
|
|
579
608
|
type ReplayableFetch = (recovery?: UpstreamSendRecovery) => Promise<Response>;
|
|
580
609
|
|
|
610
|
+
/** A nested transport recovery must spend a slot in the retry helper that owns the send. */
|
|
611
|
+
export type RetryRecoveryAdmission = {
|
|
612
|
+
canSend: () => boolean;
|
|
613
|
+
claim: (admit: () => boolean) => boolean;
|
|
614
|
+
};
|
|
615
|
+
|
|
616
|
+
function retryRecoveryAdmission(canSend: () => boolean, debit: () => void): RetryRecoveryAdmission {
|
|
617
|
+
return { canSend, claim(admit) {
|
|
618
|
+
if (!canSend() || !admit()) return false;
|
|
619
|
+
debit();
|
|
620
|
+
return true;
|
|
621
|
+
} };
|
|
622
|
+
}
|
|
623
|
+
|
|
581
624
|
/**
|
|
582
625
|
* Rejection thrown by the upstream retry helpers when the terminal attempt
|
|
583
626
|
* rejects after earlier attempts already produced credential-visible evidence:
|
|
@@ -665,6 +708,7 @@ export async function fetchWithResetRetry(
|
|
|
665
708
|
firstRecovery?: UpstreamSendRecovery,
|
|
666
709
|
): Promise<Response> {
|
|
667
710
|
const attempts = normalizeSendAttempts(opts.attempts, RESET_RETRY_MAX_ATTEMPTS);
|
|
711
|
+
const remainingSends = opts.remainingSends ?? opts.onSendsConsumed?.remaining;
|
|
668
712
|
// Zero is zero. The old Math.max(1, ...) floor meant an exhausted budget still bought one
|
|
669
713
|
// more send on every recovery leg, which is most of what made a bounded per-layer retry
|
|
670
714
|
// compose into an unbounded per-request count.
|
|
@@ -678,34 +722,45 @@ export async function fetchWithResetRetry(
|
|
|
678
722
|
let spentOperatorReplacement = false;
|
|
679
723
|
// The recovery the next send reports: the caller's for the first, then whichever path resent it.
|
|
680
724
|
let recovery = firstRecovery;
|
|
725
|
+
let offlineFailure: { error: unknown } | undefined;
|
|
726
|
+
const budgetRefusal = () => recovery === "offline-resend" && offlineFailure
|
|
727
|
+
? offlineFailure.error
|
|
728
|
+
: new SendBudgetExhaustedError(opts.destination ?? (opts.label ? errorDestinationLabel(opts.label) : undefined));
|
|
681
729
|
for (let attempt = 0; attempt < attempts; attempt++) {
|
|
682
730
|
if (opts.abortSignal?.aborted) throw abortError(opts.abortSignal);
|
|
731
|
+
if (remainingSends && remainingSends() <= 0) throw budgetRefusal();
|
|
683
732
|
// Reported before the await, one physical send at a time: a send that rejects has still
|
|
684
733
|
// been made, and this helper leaves through four exits (return, reset give-up, non-reset
|
|
685
734
|
// rethrow, abort), so a per-send report is the only shape that is correct on all of them.
|
|
686
|
-
if (opts.onSendsConsumed?.beforeSend && !opts.onSendsConsumed.beforeSend()) throw
|
|
735
|
+
if (opts.onSendsConsumed?.beforeSend && !opts.onSendsConsumed.beforeSend()) throw budgetRefusal();
|
|
687
736
|
if (!opts.onSendsConsumed?.beforeSend) opts.onSendsConsumed?.(1);
|
|
688
737
|
try {
|
|
689
738
|
let response: Response;
|
|
690
739
|
try { const sendRecovery = recovery; const run = () => doFetch(sendRecovery);
|
|
691
|
-
response = await (opts.onSendsConsumed?.execute
|
|
740
|
+
response = await (opts.onSendsConsumed?.execute
|
|
741
|
+
? opts.onSendsConsumed.execute(run, retryRecoveryAdmission(() => attempt + 1 < attempts, () => { attempt++; }))
|
|
742
|
+
: run()); }
|
|
692
743
|
finally { if (opts.onSendsConsumed?.beforeSend) opts.onSendsConsumed(1); }
|
|
693
744
|
return spentOperatorReplacement ? settleOperatorReplacement(response) : response;
|
|
694
745
|
} catch (err) {
|
|
746
|
+
if (offlineFailure && recovery === "offline-resend" && err instanceof SendBudgetExhaustedError) throw offlineFailure.error;
|
|
695
747
|
if (opts.abortSignal?.aborted) throw err;
|
|
696
748
|
if (!isConnectionResetError(err)) {
|
|
697
749
|
// Whatever ended the leg, an operator replacement already went out, so the first send
|
|
698
750
|
// may have run the turn. Settle it as the refusal instead of throwing into a caller
|
|
699
751
|
// whose transport-failure path answers with a client-retryable 502.
|
|
700
752
|
if (spentOperatorReplacement) return replayRefusalResponse();
|
|
753
|
+
if (err instanceof SendBudgetExhaustedError) throw err;
|
|
701
754
|
// A reset that already reached the origin is credential-visible
|
|
702
755
|
// evidence: keep it attached so the terminal rejection cannot be
|
|
703
756
|
// downgraded to the pre-connection neutral class (#914 review).
|
|
704
757
|
if (sawReset) throw new UpstreamRetryEvidenceError([], err, true);
|
|
705
758
|
// Nothing reached the origin, so one resend after reachability returns cannot repeat an effect.
|
|
706
759
|
// A client that left during the wait gets this failure back, never the abort reason.
|
|
707
|
-
if (attempt + 1 < attempts &&
|
|
760
|
+
if (attempt + 1 < attempts && (!remainingSends || remainingSends() > 0)
|
|
761
|
+
&& opts.offlineWait && await opts.offlineWait(err, opts.abortSignal)
|
|
708
762
|
&& !opts.abortSignal?.aborted) {
|
|
763
|
+
offlineFailure = { error: err };
|
|
709
764
|
recovery = "offline-resend";
|
|
710
765
|
continue;
|
|
711
766
|
}
|
|
@@ -714,14 +769,14 @@ export async function fetchWithResetRetry(
|
|
|
714
769
|
if (opts.replaySafe === true) {
|
|
715
770
|
// Repeating this operation cannot duplicate anything, so an exhausted budget rethrows
|
|
716
771
|
// and the caller's own error path takes over.
|
|
717
|
-
if (attempt === attempts - 1) throw err;
|
|
772
|
+
if (attempt === attempts - 1 || (remainingSends && remainingSends() <= 0)) throw err;
|
|
718
773
|
} else {
|
|
719
774
|
// The stage table refuses an ambiguous pre-header reset. The only thing that overrides
|
|
720
775
|
// it is an operator allowance, and claiming it here is what keeps the grant single --
|
|
721
776
|
// the post-header protocol gate spends the same counter for the same logical request.
|
|
722
777
|
// Return evidence rather than throwing a generic transport error: outer catches
|
|
723
778
|
// otherwise turn it into a replayable 502 and a combo/account recovery resends it.
|
|
724
|
-
if (attempt + 1 >= attempts || opts.claimAmbiguousResend?.() !== true) {
|
|
779
|
+
if (attempt + 1 >= attempts || (remainingSends && remainingSends() <= 0) || opts.claimAmbiguousResend?.() !== true) {
|
|
725
780
|
return replayRefusalResponse();
|
|
726
781
|
}
|
|
727
782
|
spentOperatorReplacement = true;
|
|
@@ -846,18 +901,29 @@ export async function fetchWithTransientRetry(
|
|
|
846
901
|
// `transientRetryOn5xx` policy is the first one that does, and multiplying load against an
|
|
847
902
|
// already-failing provider is worse than not retrying at all.
|
|
848
903
|
let sent = 0;
|
|
904
|
+
let retainedResponse = opts.retryFrom;
|
|
905
|
+
const adoptReplacement = (response: Response): Response => {
|
|
906
|
+
if (retainedResponse && retainedResponse !== response) cancelResponseBodyBestEffort(retainedResponse);
|
|
907
|
+
retainedResponse = undefined;
|
|
908
|
+
return response;
|
|
909
|
+
};
|
|
910
|
+
let recovered = 0;
|
|
911
|
+
const remainingLocal = () => budget - sent - recovered;
|
|
912
|
+
const recoveryAdmission = retryRecoveryAdmission(() => remainingLocal() > 0, () => { recovered++; });
|
|
849
913
|
const countedFetch: ReplayableFetch = (recovery) => {
|
|
850
914
|
// Incremented BEFORE the await so a rejected send still consumes budget; counting only
|
|
851
915
|
// successes would let a reset storm loop without bound.
|
|
852
|
-
|
|
916
|
+
const reserveRetrySpend = retainedResponse !== undefined || sent > 0 && opts.reserveRetrySpend?.() === true;
|
|
917
|
+
if (remaining() <= 0 || opts.onSendsConsumed?.beforeSend?.(reserveRetrySpend) === false) throw new SendBudgetExhaustedError(opts.destination ?? (opts.label ? errorDestinationLabel(opts.label) : undefined));
|
|
853
918
|
sent += 1;
|
|
854
919
|
const run = () => doFetch(recovery);
|
|
855
|
-
return opts.onSendsConsumed?.execute ? opts.onSendsConsumed.execute(run) : run();
|
|
920
|
+
return opts.onSendsConsumed?.execute ? opts.onSendsConsumed.execute(run, recoveryAdmission) : run();
|
|
856
921
|
};
|
|
857
922
|
// No floor. A spent budget hands the inner helper 0, which refuses rather than buying one
|
|
858
923
|
// more send -- the loop condition alone was never enough, because every later recovery leg
|
|
859
924
|
// called this helper again and the floor funded each of them.
|
|
860
|
-
const remaining = () => Math.max(0,
|
|
925
|
+
const remaining = () => Math.max(0, Math.min(remainingLocal(),
|
|
926
|
+
opts.remainingSends?.() ?? Infinity, opts.onSendsConsumed?.remaining?.() ?? Infinity));
|
|
861
927
|
// The inner reset layer now has its own `onSendsConsumed`, and these are the same physical
|
|
862
928
|
// sends `countedFetch` already counts. Forwarding the reporter down the `remaining()` path
|
|
863
929
|
// would report each of them twice, which is how a four-send cap becomes a two-send cap. One
|
|
@@ -865,6 +931,7 @@ export async function fetchWithTransientRetry(
|
|
|
865
931
|
const innerResetOptions = (): ResetRetryOptions => ({
|
|
866
932
|
...opts,
|
|
867
933
|
attempts: remaining(),
|
|
934
|
+
remainingSends: remaining,
|
|
868
935
|
onSendsConsumed: undefined,
|
|
869
936
|
// The offline wait belongs to the request's first send only (see below); later legs never wait.
|
|
870
937
|
offlineWait: undefined,
|
|
@@ -877,15 +944,15 @@ export async function fetchWithTransientRetry(
|
|
|
877
944
|
let attemptStart = Date.now();
|
|
878
945
|
// Time spent waiting for the network to return is not part of the resend's own attempt.
|
|
879
946
|
const offlineWait = opts.offlineWait;
|
|
880
|
-
let res = await fetchWithResetRetry(countedFetch, {
|
|
947
|
+
let res = adoptReplacement(await fetchWithResetRetry(countedFetch, {
|
|
881
948
|
...innerResetOptions(),
|
|
882
949
|
...(offlineWait ? { offlineWait: async (error: unknown, signal?: AbortSignal) => {
|
|
883
950
|
const resumed = await offlineWait(error, signal);
|
|
884
951
|
if (resumed) attemptStart = Date.now();
|
|
885
952
|
return resumed;
|
|
886
953
|
} } : {}),
|
|
887
|
-
});
|
|
888
|
-
for (let attempt = 0;
|
|
954
|
+
}));
|
|
955
|
+
for (let attempt = 0; remaining() > 0; attempt++) {
|
|
889
956
|
// A non-replayable gateway status was settled after the request body had already left
|
|
890
957
|
// for the origin; retrying it here is the automatic resend the marker exists to forbid.
|
|
891
958
|
// An upstream that answers with the exact `x-should-retry: false` verdict has said the same
|
|
@@ -913,7 +980,7 @@ export async function fetchWithTransientRetry(
|
|
|
913
980
|
return res;
|
|
914
981
|
}
|
|
915
982
|
console.warn(
|
|
916
|
-
`[upstream-retry] transient ${res.status}${opts.label ? ` (${opts.label})` : ""} — retrying (${sent + 1}/${budget})`,
|
|
983
|
+
`[upstream-retry] transient ${res.status}${opts.label ? ` (${opts.label})` : ""} — retrying (${sent + recovered + 1}/${budget})`,
|
|
917
984
|
);
|
|
918
985
|
const delay = retryBackoffDelayMs(attempt, {
|
|
919
986
|
baseDelayMs: TRANSIENT_RETRY_BASE_DELAY_MS,
|
|
@@ -921,14 +988,16 @@ export async function fetchWithTransientRetry(
|
|
|
921
988
|
headers: res.headers,
|
|
922
989
|
retryAfterIsLowerBound: true,
|
|
923
990
|
});
|
|
924
|
-
|
|
925
|
-
//
|
|
926
|
-
|
|
991
|
+
// Funded retries can lose spend admission during backoff. Keep the upstream refusal
|
|
992
|
+
// readable until the replacement is admitted.
|
|
993
|
+
if (opts.reserveRetrySpend?.()) {
|
|
994
|
+
retainedResponse = await retainPacedRetryResponse(res, opts.abortSignal, opts.readRetryResponseBody);
|
|
995
|
+
} else cancelResponseBodyBestEffort(res);
|
|
927
996
|
await sleepWithAbort(delay, opts.abortSignal);
|
|
928
997
|
attemptStart = Date.now();
|
|
929
998
|
transientStatuses.push(res.status);
|
|
930
999
|
try {
|
|
931
|
-
res = await fetchWithResetRetry(countedFetch, innerResetOptions(), "transient-5xx");
|
|
1000
|
+
res = adoptReplacement(await fetchWithResetRetry(countedFetch, innerResetOptions(), "transient-5xx"));
|
|
932
1001
|
} catch (err) {
|
|
933
1002
|
// Keep the prior 5xx evidence attached: the origin already responded, so
|
|
934
1003
|
// this rejection is not pre-connection and must not classify as neutral.
|
|
@@ -939,7 +1008,13 @@ export async function fetchWithTransientRetry(
|
|
|
939
1008
|
}
|
|
940
1009
|
// Budget exhausted: the last response is returned with its body intact.
|
|
941
1010
|
return res;
|
|
1011
|
+
} catch (err) {
|
|
1012
|
+
if (!(err instanceof SendBudgetExhaustedError) || !retainedResponse) throw err;
|
|
1013
|
+
const preceding = retainedResponse;
|
|
1014
|
+
retainedResponse = undefined;
|
|
1015
|
+
return preceding;
|
|
942
1016
|
} finally {
|
|
1017
|
+
if (retainedResponse) cancelResponseBodyBestEffort(retainedResponse);
|
|
943
1018
|
try { opts.onSendsConsumed?.(sent); } finally { opts.onSendsConsumed?.close?.(); }
|
|
944
1019
|
}
|
|
945
1020
|
}
|
|
@@ -54,6 +54,7 @@ import {
|
|
|
54
54
|
} from "./windows-user-principal";
|
|
55
55
|
|
|
56
56
|
const hardenedDirectories = new Map<string, HardenedIdentity>();
|
|
57
|
+
const verifiedRuntimeDirectories = new Map<string, HardenedIdentity>();
|
|
57
58
|
const hardenedPaths = new Map<string, HardenedIdentity>();
|
|
58
59
|
/** Elevated-stage memos are kept apart from the secret ones: the ACL shapes differ. */
|
|
59
60
|
const hardenedStageDirectories = new Map<string, HardenedIdentity>();
|
|
@@ -732,6 +733,7 @@ export function setNowForTests(fn: (() => number) | null): void {
|
|
|
732
733
|
/** Test seam: clear memo/failure caches between cases. */
|
|
733
734
|
export function resetHardenedStateForTests(): void {
|
|
734
735
|
hardenedDirectories.clear();
|
|
736
|
+
verifiedRuntimeDirectories.clear();
|
|
735
737
|
hardenedPaths.clear();
|
|
736
738
|
hardenedStageDirectories.clear();
|
|
737
739
|
hardenedStagePaths.clear();
|
|
@@ -1004,13 +1006,20 @@ function shouldVerifyExistingAcl(): boolean {
|
|
|
1004
1006
|
return env["OPENCODEX_ACL_VERIFY_EXISTING"] === "1";
|
|
1005
1007
|
}
|
|
1006
1008
|
|
|
1009
|
+
function rememberRuntimeDirectoryAcl(targetPath: string, before: PathObservation | null, verified: boolean, deadline: number): boolean {
|
|
1010
|
+
const after = observe(targetPath);
|
|
1011
|
+
if (!verified || before === null || after === null || !sameObservation(before, after) || nowFn() >= deadline) return false;
|
|
1012
|
+
// Keep this stricter descriptor proof separate from the general harden memo.
|
|
1013
|
+
verifiedRuntimeDirectories.set(targetPath, after);
|
|
1014
|
+
return true;
|
|
1015
|
+
}
|
|
1016
|
+
|
|
1007
1017
|
function existingAclAlreadyCompliant(targetPath: string, directory: boolean, deadline: number, strictDirectory = false): boolean {
|
|
1008
1018
|
if (strictDirectory) {
|
|
1019
|
+
if (memoSatisfied(verifiedRuntimeDirectories, targetPath)) return true;
|
|
1009
1020
|
const before = observe(targetPath);
|
|
1010
1021
|
const verified = verifyWindowsEntriesAcl([{ path: targetPath, directory: true, policy: "private-runtime-directory" }], deadline - nowFn());
|
|
1011
|
-
|
|
1012
|
-
// No name-only fallback or success memo: this proof belongs to this observation only.
|
|
1013
|
-
return verified && before !== null && after !== null && sameObservation(before, after) && nowFn() < deadline;
|
|
1022
|
+
return rememberRuntimeDirectoryAcl(targetPath, before, verified, deadline);
|
|
1014
1023
|
}
|
|
1015
1024
|
if (!shouldVerifyExistingAcl()) return false;
|
|
1016
1025
|
const identity = cachedCurrentWindowsIdentity();
|
|
@@ -1039,10 +1048,10 @@ async function existingAclAlreadyCompliantAsync(
|
|
|
1039
1048
|
strictDirectory = false,
|
|
1040
1049
|
): Promise<boolean> {
|
|
1041
1050
|
if (strictDirectory) {
|
|
1051
|
+
if (memoSatisfied(verifiedRuntimeDirectories, targetPath)) return true;
|
|
1042
1052
|
const before = observe(targetPath);
|
|
1043
1053
|
const verified = await verifyWindowsEntriesAclAsync([{ path: targetPath, directory: true, policy: "private-runtime-directory" }], deadline - nowFn());
|
|
1044
|
-
|
|
1045
|
-
return verified && before !== null && after !== null && sameObservation(before, after) && nowFn() < deadline;
|
|
1054
|
+
return rememberRuntimeDirectoryAcl(targetPath, before, verified, deadline);
|
|
1046
1055
|
}
|
|
1047
1056
|
if (!shouldVerifyExistingAcl()) return false;
|
|
1048
1057
|
const identity = cachedCurrentWindowsIdentity();
|
|
@@ -1387,7 +1396,11 @@ function hardenEntry(
|
|
|
1387
1396
|
): HardenResult {
|
|
1388
1397
|
// Observed absence retires the memo. Leaving it would let a later file at this
|
|
1389
1398
|
// path satisfy the cache if the filesystem ever hands back a matching identity.
|
|
1390
|
-
if (!existsSync(targetPath)) {
|
|
1399
|
+
if (!existsSync(targetPath)) {
|
|
1400
|
+
cache.delete(targetPath);
|
|
1401
|
+
if (directory) verifiedRuntimeDirectories.delete(targetPath);
|
|
1402
|
+
return { ok: true };
|
|
1403
|
+
}
|
|
1391
1404
|
if (effectivePlatform() !== "win32") return { ok: true };
|
|
1392
1405
|
if (memoSatisfied(cache, targetPath)) return { ok: true };
|
|
1393
1406
|
const deadline = nowFn() + resolveHardenDeadlineMs(opts.deadlineMs);
|
|
@@ -1442,7 +1455,11 @@ function hardenEntryAsync(
|
|
|
1442
1455
|
cache: Map<string, HardenedIdentity>,
|
|
1443
1456
|
extraReadAces: readonly string[],
|
|
1444
1457
|
): Promise<HardenResult> {
|
|
1445
|
-
if (!existsSync(targetPath)) {
|
|
1458
|
+
if (!existsSync(targetPath)) {
|
|
1459
|
+
cache.delete(targetPath);
|
|
1460
|
+
if (directory) verifiedRuntimeDirectories.delete(targetPath);
|
|
1461
|
+
return Promise.resolve({ ok: true });
|
|
1462
|
+
}
|
|
1446
1463
|
if (effectivePlatform() !== "win32" || memoSatisfied(cache, targetPath)) return Promise.resolve({ ok: true });
|
|
1447
1464
|
return startTrackedAsyncAclWork(targetPath,
|
|
1448
1465
|
() => runHardenEntryAsync(targetPath, directory, opts, cache, extraReadAces)).work;
|
|
@@ -3,7 +3,24 @@ import { linkRouteAllowed } from "./routes";
|
|
|
3
3
|
/** A link with no relayed model turn for this long reads as idle (D5). */
|
|
4
4
|
export const DEFAULT_IDLE_AFTER_MS = 600_000;
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
const DELIVERY_WINDOW_MS = 120_000;
|
|
7
|
+
export const LINK_DELIVERY_SAMPLE_LIMIT = 5;
|
|
8
|
+
export const LINK_DELIVERY_DEGRADED_THRESHOLD = 3;
|
|
9
|
+
|
|
10
|
+
export type LinkHttpDeliveryOutcome = "observed" | "upstream_failure" | "client_cancelled";
|
|
11
|
+
|
|
12
|
+
export interface LinkActivitySnapshot {
|
|
13
|
+
inFlight: number;
|
|
14
|
+
lastDataEndAt: number | null;
|
|
15
|
+
observedSince: number;
|
|
16
|
+
httpDelivery?: {
|
|
17
|
+
generation: string;
|
|
18
|
+
recentAuthentication: boolean;
|
|
19
|
+
recentSettled: number;
|
|
20
|
+
recentInterruptions: number;
|
|
21
|
+
recentCancellations: number;
|
|
22
|
+
};
|
|
23
|
+
}
|
|
7
24
|
|
|
8
25
|
/** One Remote Link WebSocket in the book: it counts in flight while busy (design T4 section 5). */
|
|
9
26
|
export interface LinkSocketActivity {
|
|
@@ -17,6 +34,8 @@ export interface LinkActivity {
|
|
|
17
34
|
* link. The returned end is idempotent and stamps lastDataEndAt.
|
|
18
35
|
*/
|
|
19
36
|
begin(linkId: string | null): () => void;
|
|
37
|
+
/** One model HTTP request admitted on an authenticated relay session for this generation. */
|
|
38
|
+
beginHttpDelivery(linkId: string, generation: string): (outcome: LinkHttpDeliveryOutcome) => void;
|
|
20
39
|
/** A link WebSocket; busy while a turn runs or client work is pending. Idempotent end. */
|
|
21
40
|
beginSocket(linkId: string): LinkSocketActivity;
|
|
22
41
|
snapshot(linkId: string, now: number): LinkActivitySnapshot;
|
|
@@ -31,7 +50,13 @@ export function isLinkIdle(snapshot: LinkActivitySnapshot, now: number, idleAfte
|
|
|
31
50
|
return snapshot.inFlight === 0 && now - (snapshot.lastDataEndAt ?? snapshot.observedSince) >= idleAfterMs;
|
|
32
51
|
}
|
|
33
52
|
|
|
34
|
-
interface
|
|
53
|
+
interface HttpDelivery {
|
|
54
|
+
generation: string;
|
|
55
|
+
lastAdmissionAt: number;
|
|
56
|
+
settled: Array<{ at: number; outcome: LinkHttpDeliveryOutcome }>;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
interface ActivityEntry { inFlight: number; lastDataEndAt: number | null; httpDelivery?: HttpDelivery }
|
|
35
60
|
|
|
36
61
|
/** In memory, no timers. One small entry per link id that ever relayed; links are bounded by links.json. */
|
|
37
62
|
/** held: durable link WebSocket holds (src/link/ws-activity-holds.ts), counted as in flight. */
|
|
@@ -57,6 +82,20 @@ export function createLinkActivity(deps: { now?: () => number; held?: (linkId: s
|
|
|
57
82
|
entry.lastDataEndAt = now();
|
|
58
83
|
};
|
|
59
84
|
},
|
|
85
|
+
beginHttpDelivery(linkId, generation) {
|
|
86
|
+
const entry = entryFor(linkId);
|
|
87
|
+
const admittedAt = now();
|
|
88
|
+
if (entry.httpDelivery?.generation !== generation) entry.httpDelivery = { generation, lastAdmissionAt: admittedAt, settled: [] };
|
|
89
|
+
const delivery = entry.httpDelivery;
|
|
90
|
+
delivery.lastAdmissionAt = admittedAt;
|
|
91
|
+
let ended = false;
|
|
92
|
+
return outcome => {
|
|
93
|
+
if (ended || entry.httpDelivery !== delivery) return;
|
|
94
|
+
ended = true;
|
|
95
|
+
delivery.settled.push({ at: now(), outcome });
|
|
96
|
+
if (delivery.settled.length > LINK_DELIVERY_SAMPLE_LIMIT) delivery.settled.shift();
|
|
97
|
+
};
|
|
98
|
+
},
|
|
60
99
|
beginSocket(linkId) {
|
|
61
100
|
const entry = entryFor(linkId);
|
|
62
101
|
let counted = false;
|
|
@@ -72,12 +111,29 @@ export function createLinkActivity(deps: { now?: () => number; held?: (linkId: s
|
|
|
72
111
|
end() { set(false); ended = true; },
|
|
73
112
|
};
|
|
74
113
|
},
|
|
75
|
-
snapshot(linkId) {
|
|
114
|
+
snapshot(linkId, at) {
|
|
76
115
|
const entry = perLink.get(linkId);
|
|
77
116
|
const ends = [entry?.lastDataEndAt ?? null, legacy.lastDataEndAt].filter((value): value is number => value !== null);
|
|
78
117
|
let held = 0;
|
|
79
118
|
try { held = deps.held?.(linkId) ?? 0; } catch { held = 1; }
|
|
80
|
-
|
|
119
|
+
const snapshot: LinkActivitySnapshot = {
|
|
120
|
+
inFlight: (entry?.inFlight ?? 0) + legacy.inFlight + held,
|
|
121
|
+
lastDataEndAt: ends.length ? Math.max(...ends) : null,
|
|
122
|
+
observedSince,
|
|
123
|
+
};
|
|
124
|
+
const delivery = entry?.httpDelivery;
|
|
125
|
+
if (delivery) {
|
|
126
|
+
const isRecent = (time: number): boolean => at >= time && at - time < DELIVERY_WINDOW_MS;
|
|
127
|
+
const recent = delivery.settled.filter(sample => isRecent(sample.at));
|
|
128
|
+
snapshot.httpDelivery = {
|
|
129
|
+
generation: delivery.generation,
|
|
130
|
+
recentAuthentication: isRecent(delivery.lastAdmissionAt) || recent.length > 0,
|
|
131
|
+
recentSettled: recent.length,
|
|
132
|
+
recentInterruptions: recent.filter(sample => sample.outcome === "upstream_failure").length,
|
|
133
|
+
recentCancellations: recent.filter(sample => sample.outcome === "client_cancelled").length,
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
return snapshot;
|
|
81
137
|
},
|
|
82
138
|
};
|
|
83
139
|
}
|
|
@@ -21,7 +21,8 @@
|
|
|
21
21
|
* history) stay the Child's own because they describe how the Child's Codex reaches the Child.
|
|
22
22
|
*
|
|
23
23
|
* It rides on its own authenticated link read rather than inside the catalog because the
|
|
24
|
-
* catalog bytes are written verbatim to
|
|
24
|
+
* catalog bytes are written verbatim to the Child's catalog file. The Child's
|
|
25
|
+
* injector writes the local `model_catalog_json` binding.
|
|
25
26
|
*/
|
|
26
27
|
import { createHash } from "node:crypto";
|
|
27
28
|
import { hostname } from "node:os";
|
package/src/link/relay-auth.ts
CHANGED
|
@@ -10,6 +10,7 @@ export const LINK_RELAY_SESSION_HEADER = "x-opencodex-link-session";
|
|
|
10
10
|
export const LINK_RELAY_PROBE_HEADER = "x-opencodex-link-probe";
|
|
11
11
|
export const LINK_RELAY_AUTH_VERSION = "2";
|
|
12
12
|
export const LINK_RELAY_AUTH_TIMEOUT_MS = 5_000;
|
|
13
|
+
export const LINK_RELAY_AUTH_FAILED_CODE = "link_relay_auth_failed";
|
|
13
14
|
/**
|
|
14
15
|
* An additive part of a Home's relay-auth answer: which tunnel connection the proof crossed, as
|
|
15
16
|
* `<Home runtime instance>:<tunnel generation>`, bound to the same nonce and link key by its own
|