@bitkyc08/opencodex 2.100.2 → 2.100.3
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 +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -24,10 +24,23 @@ function resultKey(type: string, id: string): string {
|
|
|
24
24
|
return createHash("sha256").update(JSON.stringify([type, id])).digest("hex");
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
function resultKeyOfItem(item: unknown): string | null {
|
|
28
|
+
if (!record(item) || typeof item.type !== "string") return null;
|
|
29
|
+
const id = item.type === "mcp_approval_response" ? item.approval_request_id : item.call_id;
|
|
30
|
+
if (typeof id !== "string" || id.length > MAX_RESULT_ID_LENGTH) return null;
|
|
31
|
+
return resultKey(item.type === "local_shell_call_output" ? "function_call_output" : item.type, id);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The hashed result keys an input returns, in the tracker's own encoding (content-free). */
|
|
35
|
+
export function resultKeysOf(input: unknown): string[] {
|
|
36
|
+
if (!Array.isArray(input)) return [];
|
|
37
|
+
return input.map(resultKeyOfItem).filter((key): key is string => key !== null);
|
|
38
|
+
}
|
|
39
|
+
|
|
27
40
|
/** Content-free activity owned by one admitted incoming Responses socket. */
|
|
28
41
|
export class CodexWebSocketActivity {
|
|
29
42
|
lastUsed = ++activityOrder;
|
|
30
|
-
|
|
43
|
+
private closingFlag = false;
|
|
31
44
|
private turns = 0;
|
|
32
45
|
private pendingResults = new Set<string>();
|
|
33
46
|
private returnedResults = new Set<string>();
|
|
@@ -35,11 +48,115 @@ export class CodexWebSocketActivity {
|
|
|
35
48
|
private argumentCalls = new Map<string, { type: string; result: string | null }>();
|
|
36
49
|
// Unknown/oversized identities cannot safely prove that client work finished.
|
|
37
50
|
private untrackedResults = false;
|
|
51
|
+
// Remote Link sockets observe their own activity; local sockets register nothing.
|
|
52
|
+
private listeners: Array<() => void> = [];
|
|
53
|
+
private acceptedListeners: Array<(input: unknown) => void> = [];
|
|
54
|
+
private beginListeners: Array<(input: unknown) => void> = [];
|
|
55
|
+
/**
|
|
56
|
+
* Remote Link sockets only: a turn the shared handler never reports as accepted (notifyAccepted)
|
|
57
|
+
* puts the results it settled back to pending when it finishes, so a refused or failed turn cannot
|
|
58
|
+
* make unfinished client work look done. Local sockets keep settling at admission.
|
|
59
|
+
*/
|
|
60
|
+
restoreRefusedResults = false;
|
|
61
|
+
private turnRecords = new Map<unknown, { seq: number; settled: string[]; accepted: boolean }>();
|
|
62
|
+
private turnSeq = 0;
|
|
63
|
+
// Keys an unaccepted turn put back, with that turn's sequence; a key observed again as new work
|
|
64
|
+
// loses its marker, so a late acceptance of an older turn never settles newer work.
|
|
65
|
+
private restoredKeys = new Map<string, number>();
|
|
66
|
+
|
|
67
|
+
get closing(): boolean { return this.closingFlag; }
|
|
68
|
+
|
|
69
|
+
set closing(value: boolean) {
|
|
70
|
+
if (this.closingFlag === value) return;
|
|
71
|
+
this.closingFlag = value;
|
|
72
|
+
this.changed();
|
|
73
|
+
}
|
|
38
74
|
|
|
39
75
|
get idle(): boolean {
|
|
40
76
|
return !this.closing && this.turns === 0 && this.pendingResults.size === 0 && !this.untrackedResults;
|
|
41
77
|
}
|
|
42
78
|
|
|
79
|
+
/** A turn admitted on this socket has not finished, superseded cleanup included. */
|
|
80
|
+
get running(): boolean { return this.turns > 0; }
|
|
81
|
+
|
|
82
|
+
/** How many admitted turns have not finished, superseded cleanup included. */
|
|
83
|
+
get runningTurns(): number { return this.turns; }
|
|
84
|
+
|
|
85
|
+
/** The hashed keys of the results this socket is waiting for (content-free). */
|
|
86
|
+
pendingKeys(): string[] { return [...this.pendingResults]; }
|
|
87
|
+
|
|
88
|
+
/** Identities overflowed or were ambiguous: completion of client work cannot be proved. */
|
|
89
|
+
get untracked(): boolean { return this.untrackedResults; }
|
|
90
|
+
|
|
91
|
+
/** Read-only: whether this input returns at least one result the socket is waiting for. */
|
|
92
|
+
returnsPending(input: unknown): boolean {
|
|
93
|
+
if (this.untrackedResults || !Array.isArray(input)) return false;
|
|
94
|
+
for (const item of input) {
|
|
95
|
+
const key = this.resultKeyOf(item);
|
|
96
|
+
if (key !== null && this.pendingResults.has(key)) return true;
|
|
97
|
+
}
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** Called after any change that can move idle, running or the pending set. */
|
|
102
|
+
onChange(listener: () => void): () => void {
|
|
103
|
+
this.listeners.push(listener);
|
|
104
|
+
return () => { this.listeners = this.listeners.filter(candidate => candidate !== listener); };
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** Called with a turn's input when it begins (Remote Link: the hold sequence a later acceptance may settle up to). */
|
|
108
|
+
onBegin(listener: (input: unknown) => void): () => void {
|
|
109
|
+
this.beginListeners.push(listener);
|
|
110
|
+
return () => { this.beginListeners = this.beginListeners.filter(candidate => candidate !== listener); };
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Called with a turn's input once the shared handler got a successful response for it, after turn,
|
|
115
|
+
* workflow and pipeline admission (notifyAccepted). Never for a warmup or any refusal.
|
|
116
|
+
*/
|
|
117
|
+
onAccepted(listener: (input: unknown) => void): () => void {
|
|
118
|
+
this.acceptedListeners.push(listener);
|
|
119
|
+
return () => { this.acceptedListeners = this.acceptedListeners.filter(candidate => candidate !== listener); };
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** The shared handler's turn was accepted by every admission and the pipeline answered ok. */
|
|
123
|
+
notifyAccepted(input: unknown): void {
|
|
124
|
+
const record = this.turnRecords.get(input);
|
|
125
|
+
if (record) record.accepted = true;
|
|
126
|
+
// Only sockets that restore refused results (Remote Link) reconcile, and only against turns that
|
|
127
|
+
// began before the accepted one: newer turns own newer work, even when it reuses a call id.
|
|
128
|
+
const returned = new Set(this.restoreRefusedResults && record ? resultKeysOf(input) : []);
|
|
129
|
+
if (record && returned.size) {
|
|
130
|
+
// An older turn still finishing (superseded, refused) must not put these results back...
|
|
131
|
+
for (const other of this.turnRecords.values()) {
|
|
132
|
+
if (other.seq < record.seq) other.settled = other.settled.filter(key => !returned.has(key));
|
|
133
|
+
}
|
|
134
|
+
// ...and one an older turn already put back is settled again.
|
|
135
|
+
let changed = false;
|
|
136
|
+
for (const key of returned) {
|
|
137
|
+
const by = this.restoredKeys.get(key);
|
|
138
|
+
if (by !== undefined && by < record.seq && this.pendingResults.delete(key)) {
|
|
139
|
+
this.restoredKeys.delete(key);
|
|
140
|
+
// Not added to returnedResults: like beginTurn, a settled wait never suppresses a later
|
|
141
|
+
// call that reuses its id, even from an upstream that omits response.created.
|
|
142
|
+
changed = true;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (changed) this.changed();
|
|
146
|
+
}
|
|
147
|
+
for (const listener of [...this.acceptedListeners]) {
|
|
148
|
+
try { listener(input); } catch { /* an observer never breaks the socket's own bookkeeping */ }
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
private changed(): void {
|
|
153
|
+
for (const listener of [...this.listeners]) {
|
|
154
|
+
try { listener(); } catch { /* an observer never breaks the socket's own bookkeeping */ }
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
private resultKeyOf(item: unknown): string | null { return resultKeyOfItem(item); }
|
|
159
|
+
|
|
43
160
|
touch(): void {
|
|
44
161
|
this.lastUsed = ++activityOrder;
|
|
45
162
|
}
|
|
@@ -48,39 +165,64 @@ export class CodexWebSocketActivity {
|
|
|
48
165
|
beginTurn(input: unknown): () => void {
|
|
49
166
|
this.turns += 1;
|
|
50
167
|
this.touch();
|
|
51
|
-
this.
|
|
168
|
+
const record = { seq: ++this.turnSeq, settled: this.settleResults(input), accepted: false };
|
|
169
|
+
if (this.restoreRefusedResults) this.turnRecords.set(input, record);
|
|
170
|
+
for (const listener of [...this.beginListeners]) {
|
|
171
|
+
try { listener(input); } catch { /* an observer never breaks the socket's own bookkeeping */ }
|
|
172
|
+
}
|
|
52
173
|
// Ordinary creates start a new response even when its upstream omits response.created.
|
|
53
174
|
// Prior results settle old waits, but cannot suppress new calls reusing their IDs.
|
|
54
175
|
this.returnedResults.clear();
|
|
55
176
|
this.argumentCalls.clear();
|
|
56
177
|
let finished = false;
|
|
178
|
+
this.changed();
|
|
57
179
|
return () => {
|
|
58
180
|
if (finished) return;
|
|
59
181
|
finished = true;
|
|
182
|
+
if (this.turnRecords.get(input) === record) this.turnRecords.delete(input);
|
|
183
|
+
if (this.restoreRefusedResults && !record.accepted) this.restoreResults(record.settled, record.seq);
|
|
60
184
|
this.turns -= 1;
|
|
61
185
|
if (this.turns === 0) this.touch();
|
|
186
|
+
this.changed();
|
|
62
187
|
};
|
|
63
188
|
}
|
|
64
189
|
|
|
65
190
|
/** Called only after admission or native control accepts the client's results. */
|
|
66
191
|
acceptResults(input: unknown): void {
|
|
67
|
-
if (this.
|
|
192
|
+
if (this.settleResults(input).length) this.changed();
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
/** Settles returned results; the keys taken off the pending set. Notifies nobody. */
|
|
196
|
+
private settleResults(input: unknown): string[] {
|
|
197
|
+
const settled: string[] = [];
|
|
198
|
+
if (this.untrackedResults) return settled;
|
|
68
199
|
if (Array.isArray(input)) {
|
|
69
200
|
for (const item of input) {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (this.returnedResults.size >= MAX_PENDING_RESULTS) { this.protectUntracked(); return; }
|
|
79
|
-
else this.returnedResults.add(key);
|
|
80
|
-
}
|
|
201
|
+
// Ordinary Codex shell results use function_call_output; native steering
|
|
202
|
+
// also accepts its explicit local_shell_call_output continuation stub.
|
|
203
|
+
const key = this.resultKeyOf(item);
|
|
204
|
+
if (key !== null && this.pendingResults.delete(key)) {
|
|
205
|
+
settled.push(key);
|
|
206
|
+
this.restoredKeys.delete(key);
|
|
207
|
+
if (this.returnedResults.size >= MAX_PENDING_RESULTS) { this.protectUntracked(); return []; }
|
|
208
|
+
else this.returnedResults.add(key);
|
|
81
209
|
}
|
|
82
210
|
}
|
|
83
211
|
}
|
|
212
|
+
return settled;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/** A refused turn's results are owed again (restoreRefusedResults). */
|
|
216
|
+
private restoreResults(keys: readonly string[], seq: number): void {
|
|
217
|
+
if (this.untrackedResults) return;
|
|
218
|
+
for (const key of keys) {
|
|
219
|
+
// Already pending means newer work under the same key: it keeps its own generation, untagged.
|
|
220
|
+
if (this.pendingResults.has(key)) continue;
|
|
221
|
+
this.returnedResults.delete(key);
|
|
222
|
+
if (this.pendingResults.size >= MAX_PENDING_RESULTS) { this.protectUntracked(); return; }
|
|
223
|
+
this.pendingResults.add(key);
|
|
224
|
+
this.restoredKeys.set(key, seq);
|
|
225
|
+
}
|
|
84
226
|
}
|
|
85
227
|
|
|
86
228
|
/** Preserve tool waits even when the response terminal omits its output array. */
|
|
@@ -133,7 +275,9 @@ export class CodexWebSocketActivity {
|
|
|
133
275
|
if (this.untrackedResults) return;
|
|
134
276
|
if (!record(item) || typeof item.type !== "string") return;
|
|
135
277
|
// Hosted execution may publish both the call and its result in the output stream.
|
|
136
|
-
|
|
278
|
+
// On a Remote Link socket only an accepted client turn returns a client result: provider-executed
|
|
279
|
+
// calls never become pending, so an upstream output settling one would be ambiguous (design 5).
|
|
280
|
+
if (!this.restoreRefusedResults) this.acceptResults([item]);
|
|
137
281
|
if (!Object.hasOwn(resultTypes, item.type)) return;
|
|
138
282
|
if (providerExecuted && isAuthorizedProviderExecutedCall(item, providerExecuted)) return;
|
|
139
283
|
if (item.type === "tool_search_call" && item.execution !== "client") return;
|
|
@@ -147,9 +291,19 @@ export class CodexWebSocketActivity {
|
|
|
147
291
|
}
|
|
148
292
|
|
|
149
293
|
private observeResultKey(key: string): void {
|
|
294
|
+
// A call observed now is new work, whatever an older turn restored under the same key.
|
|
295
|
+
this.restoredKeys.delete(key);
|
|
296
|
+
// An in-flight turn may still restore an earlier call under this id. The key cannot tell the two
|
|
297
|
+
// generations apart, so the socket's results become untracked: its close leaves an operator-only
|
|
298
|
+
// hold rather than possibly forgetting either piece of owed work (Remote Link sockets only).
|
|
299
|
+
if (this.restoreRefusedResults) {
|
|
300
|
+
for (const record of this.turnRecords.values()) {
|
|
301
|
+
if (record.settled.includes(key)) { this.protectUntracked(); return; }
|
|
302
|
+
}
|
|
303
|
+
}
|
|
150
304
|
if (this.pendingResults.has(key) || this.returnedResults.has(key)) return;
|
|
151
305
|
if (this.pendingResults.size >= MAX_PENDING_RESULTS) this.protectUntracked();
|
|
152
|
-
else this.pendingResults.add(key);
|
|
306
|
+
else { this.pendingResults.add(key); this.changed(); }
|
|
153
307
|
}
|
|
154
308
|
|
|
155
309
|
private protectUntracked(): void {
|
|
@@ -157,5 +311,6 @@ export class CodexWebSocketActivity {
|
|
|
157
311
|
this.pendingResults.clear();
|
|
158
312
|
this.returnedResults.clear();
|
|
159
313
|
this.argumentCalls.clear();
|
|
314
|
+
this.changed();
|
|
160
315
|
}
|
|
161
316
|
}
|
|
@@ -7,11 +7,11 @@ export const MAX_TRACKED_CODEX_WEBSOCKETS = 128;
|
|
|
7
7
|
const websocketGate = createAdmissionGate("codex_websockets", MAX_TRACKED_CODEX_WEBSOCKETS);
|
|
8
8
|
const admittedSockets = new Set<ServerWebSocket<WsData>>();
|
|
9
9
|
|
|
10
|
-
function reclaimOldestIdleSocket(): void {
|
|
10
|
+
function reclaimOldestIdleSocket(eligible: (ws: ServerWebSocket<WsData>) => boolean = () => true): void {
|
|
11
11
|
let oldest: ServerWebSocket<WsData> | undefined;
|
|
12
12
|
for (const ws of admittedSockets) {
|
|
13
13
|
const activity = ws.data.responsesActivity;
|
|
14
|
-
if (!activity?.idle || ws.data.nativeControl || ws.readyState !== 1 || ws.getBufferedAmount() !== 0) continue;
|
|
14
|
+
if (!activity?.idle || ws.data.nativeControl || ws.readyState !== 1 || ws.getBufferedAmount() !== 0 || !eligible(ws)) continue;
|
|
15
15
|
if (!oldest || activity.lastUsed < oldest.data.responsesActivity!.lastUsed) oldest = ws;
|
|
16
16
|
}
|
|
17
17
|
if (!oldest) return;
|
|
@@ -25,8 +25,15 @@ function reclaimOldestIdleSocket(): void {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
/**
|
|
29
|
+
* A slot in the shared socket gate. A local upgrade may reclaim the least recently used idle
|
|
30
|
+
* socket when the gate is full. A Remote Link upgrade passes reclaim: "link" and may reclaim only
|
|
31
|
+
* an idle Remote Link socket, never a local client's; reclaim: false never reclaims.
|
|
32
|
+
*/
|
|
33
|
+
export function tryReserveCodexWebSocket(options: { reclaim?: boolean | "link" } = {}): AdmissionReservation<ServerWebSocket<WsData>> | null {
|
|
34
|
+
if (options.reclaim !== false && websocketGate.metrics().active >= MAX_TRACKED_CODEX_WEBSOCKETS) {
|
|
35
|
+
reclaimOldestIdleSocket(options.reclaim === "link" ? ws => ws.data.link !== undefined : undefined);
|
|
36
|
+
}
|
|
30
37
|
const gateLease = websocketGate.tryAcquire();
|
|
31
38
|
if (!gateLease) return null;
|
|
32
39
|
let socket: ServerWebSocket<WsData> | undefined;
|
|
@@ -15,8 +15,10 @@
|
|
|
15
15
|
* - `dropLocal()` (and the Map `delete()`/`clear()` it backs) forgets a row in memory only. Expiry
|
|
16
16
|
* checks, sweeps and the revision-guarded probe lift use it, so an expired local copy can never
|
|
17
17
|
* erase a row another process has since extended.
|
|
18
|
-
* -
|
|
19
|
-
* user-requested clears (combo save, rename, delete).
|
|
18
|
+
* - Explicit key, prefix and global clears are the only deletes written to disk: they record
|
|
19
|
+
* user-requested clears (combo save, rename, delete). Prefix clears also remove peer rows absent
|
|
20
|
+
* from memory. Deletes exclude old disk rows before dirty values are overlaid, so a subsequent
|
|
21
|
+
* `set()` starts a new cooldown even when the cleared row had a later expiry.
|
|
20
22
|
* A busy lock or I/O failure keeps the pending state and retries with bounded backoff.
|
|
21
23
|
*
|
|
22
24
|
* Loading: once per config dir, on first use. Rows already in memory win; a file row loads only
|
|
@@ -73,6 +75,7 @@ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<str
|
|
|
73
75
|
private scheduledDir: string | undefined;
|
|
74
76
|
private readonly dirty = new Set<string>();
|
|
75
77
|
private readonly tombstones = new Set<string>();
|
|
78
|
+
private readonly clearedPrefixes = new Set<string>();
|
|
76
79
|
private clearAll = false;
|
|
77
80
|
private readonly nextRevision: () => number;
|
|
78
81
|
|
|
@@ -103,7 +106,7 @@ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<str
|
|
|
103
106
|
}
|
|
104
107
|
|
|
105
108
|
private pending(): boolean {
|
|
106
|
-
return this.clearAll || this.dirty.size > 0 || this.tombstones.size > 0;
|
|
109
|
+
return this.clearAll || this.dirty.size > 0 || this.tombstones.size > 0 || this.clearedPrefixes.size > 0;
|
|
107
110
|
}
|
|
108
111
|
|
|
109
112
|
private schedule(): void {
|
|
@@ -123,9 +126,11 @@ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<str
|
|
|
123
126
|
const file = readStoredRows(path);
|
|
124
127
|
const now = Date.now();
|
|
125
128
|
const out: Record<string, StoredRow> = {};
|
|
129
|
+
const clearedPrefixes = [...this.clearedPrefixes];
|
|
126
130
|
if (!this.clearAll) {
|
|
127
131
|
for (const [key, row] of Object.entries(file)) {
|
|
128
|
-
if (row.cooldownUntil > now && !this.tombstones.has(key)
|
|
132
|
+
if (row.cooldownUntil > now && !this.tombstones.has(key)
|
|
133
|
+
&& !clearedPrefixes.some(prefix => key.startsWith(prefix))) out[key] = row;
|
|
129
134
|
}
|
|
130
135
|
}
|
|
131
136
|
for (const key of this.dirty) {
|
|
@@ -147,6 +152,7 @@ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<str
|
|
|
147
152
|
}
|
|
148
153
|
this.dirty.clear();
|
|
149
154
|
this.tombstones.clear();
|
|
155
|
+
this.clearedPrefixes.clear();
|
|
150
156
|
this.clearAll = false;
|
|
151
157
|
this.scheduledDir = undefined;
|
|
152
158
|
this.delayMs = FLUSH_DELAY_MS;
|
|
@@ -178,12 +184,26 @@ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<str
|
|
|
178
184
|
this.schedule();
|
|
179
185
|
}
|
|
180
186
|
|
|
187
|
+
/** Clear a combo prefix in memory and in the fresh file read under the mutation lock. */
|
|
188
|
+
clearPrefixPersisted(prefix: string): void {
|
|
189
|
+
this.ensureLoaded();
|
|
190
|
+
for (const key of super.keys()) {
|
|
191
|
+
if (key.startsWith(prefix)) {
|
|
192
|
+
super.delete(key);
|
|
193
|
+
this.dirty.delete(key);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
this.clearedPrefixes.add(prefix);
|
|
197
|
+
this.schedule();
|
|
198
|
+
}
|
|
199
|
+
|
|
181
200
|
/** A user-requested clear of every row, written to disk as a global reset. */
|
|
182
201
|
clearAllPersisted(): void {
|
|
183
202
|
this.ensureLoaded();
|
|
184
203
|
super.clear();
|
|
185
204
|
this.dirty.clear();
|
|
186
205
|
this.tombstones.clear();
|
|
206
|
+
this.clearedPrefixes.clear();
|
|
187
207
|
this.clearAll = true;
|
|
188
208
|
this.schedule();
|
|
189
209
|
}
|
|
@@ -198,7 +218,7 @@ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<str
|
|
|
198
218
|
override set(key: string, value: V): this {
|
|
199
219
|
this.ensureLoaded();
|
|
200
220
|
super.set(key, value);
|
|
201
|
-
this.
|
|
221
|
+
// Keep queued clears until flush excludes the previous disk row, then overlays this value.
|
|
202
222
|
this.dirty.add(key);
|
|
203
223
|
this.schedule();
|
|
204
224
|
return this;
|