@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- 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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- 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/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- 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 +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +178 -0
- package/src/cli/dispatch.ts +61 -13
- 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 +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- 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-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- 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/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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 +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- 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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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/budget.ts +23 -5
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- 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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- 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-billing-refusal.ts +27 -3
- 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 +515 -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 +5 -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/workbuddy.ts +6 -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/workbuddy-credit-balance.ts +125 -16
- 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/effort-history.ts +732 -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/history/integrity.ts +41 -4
- 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 +111 -3
- 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 +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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 +196 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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/config-routes.ts +39 -3
- 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 +192 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- 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/static-catalog-probe.ts +33 -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 +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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 +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- 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 +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- 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 +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- 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 +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,53 +1,250 @@
|
|
|
1
|
-
import { REDACTED_SECRET, SENSITIVE_KEY_PATTERN, redactSecrets } from "../../lib/redact";
|
|
1
|
+
import { REDACTED_SECRET, SENSITIVE_KEY_PATTERN, redactSecretString, redactSecrets } from "../../lib/redact";
|
|
2
|
+
import {
|
|
3
|
+
CREDENTIAL_SUBSTRING_MIN_LENGTH,
|
|
4
|
+
SENT_VALUE_GUARD_SCAN_CHARS,
|
|
5
|
+
SecretIndex,
|
|
6
|
+
createSentValueGuard,
|
|
7
|
+
createSentValueMask,
|
|
8
|
+
credentialComponents,
|
|
9
|
+
maskSecretSpans,
|
|
10
|
+
} from "../../lib/outbound-credential-registry";
|
|
2
11
|
import { replaceSseDataPayload, sseDataPayload, type SseBlockRewrite } from "../sse-payload-rewrite";
|
|
12
|
+
import { isUntypedBareUpstreamError } from "../bare-upstream-error";
|
|
13
|
+
import { CYBER_POLICY_ERROR_CODE, isCyberPolicyCode, isCyberPolicyMessage, isTerminalRefusalCode, recognizedUpstreamError } from "../../lib/errors";
|
|
3
14
|
|
|
4
|
-
/**
|
|
15
|
+
/**
|
|
16
|
+
* A custom header carries a credential when a credential word is a whole segment of its name
|
|
17
|
+
* (x-auth-token, x-proxy-secret), so a name that merely contains one (x-author) is not swept in.
|
|
18
|
+
*/
|
|
19
|
+
const CREDENTIAL_HEADER_SEGMENT = /(?:^|[-_])(?:api[-_]?key|secret|passwd|password|credentials?|auth|token)(?:$|[-_])/i;
|
|
20
|
+
/** A split-out part made only of letters, dots and underscores reads as protocol vocabulary (response, type). */
|
|
21
|
+
const PROTOCOL_WORD = /^[A-Za-z._]+$/;
|
|
22
|
+
/** An SSE event line naming a protocol event, which masking never rewrites. */
|
|
23
|
+
const PROTOCOL_EVENT_LINE = /^event:[ \t]*(?:response\.[a-z_.]+|error|done|ping)[ \t]*\r?$/;
|
|
24
|
+
/**
|
|
25
|
+
* Field names of the Responses frames this rewrite touches. They are protocol, not upstream copy, so
|
|
26
|
+
* masking never renames them, whatever a credential happens to equal.
|
|
27
|
+
*/
|
|
28
|
+
const PROTOCOL_KEYS = new Set([
|
|
29
|
+
"type", "response", "error", "last_error", "message", "code", "param", "status", "id", "object",
|
|
30
|
+
"incomplete_details", "reason", "output", "usage", "metadata", "sequence_number", "model", "created_at",
|
|
31
|
+
"retryable",
|
|
32
|
+
]);
|
|
33
|
+
|
|
34
|
+
function withEscapedSpelling(part: string): string[] {
|
|
35
|
+
const escaped = JSON.stringify(part).slice(1, -1);
|
|
36
|
+
return escaped === part ? [part] : [part, escaped];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* A recognized error class (a refusal, policy, rate-limit, overload or client-error class) is public
|
|
41
|
+
* protocol vocabulary, not a secret: masking it hides nothing and would make a reader that classifies
|
|
42
|
+
* the masked frame disagree with one that reads the original. An unrecognized code or type is masked.
|
|
43
|
+
*/
|
|
44
|
+
function isPublicClassValue(key: string, value: unknown): boolean {
|
|
45
|
+
if (typeof value !== "string") return false;
|
|
46
|
+
if (key === "code") return isTerminalRefusalCode(value) || isCyberPolicyCode(value) || recognizedUpstreamError({ code: value }) !== undefined;
|
|
47
|
+
if (key === "type") return recognizedUpstreamError({ type: value }) !== undefined;
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** An error identity a client acts on (recognized class, refusal code, generic upstream failure). */
|
|
52
|
+
function isPublicErrorVocabulary(value: string): boolean {
|
|
53
|
+
return value === "upstream_error" || value === "upstream_server_error" || value === "invalid_request_error"
|
|
54
|
+
|| isPublicClassValue("code", value) || isPublicClassValue("type", value);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Masking can remove the copy that makes a genuine terminal a policy refusal (policy wording that
|
|
59
|
+
* overlaps a credential). The terminal boundary behind the tee rewrite must still reach the verdict
|
|
60
|
+
* the eager boundary and the inspector reach from the original, so a record whose policy evidence
|
|
61
|
+
* masking removed carries the policy code instead. Nothing of the masked copy is restored.
|
|
62
|
+
*/
|
|
63
|
+
function keepPolicyEvidence(original: unknown, masked: unknown): unknown {
|
|
64
|
+
const record = (value: unknown): Record<string, unknown> | undefined =>
|
|
65
|
+
value !== null && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : undefined;
|
|
66
|
+
const isPolicy = (entry: Record<string, unknown> | undefined): boolean => !!entry && (
|
|
67
|
+
isCyberPolicyCode(typeof entry.code === "string" ? entry.code : undefined)
|
|
68
|
+
|| (typeof entry.message === "string" && isCyberPolicyMessage(entry.message)));
|
|
69
|
+
const pick = (root: unknown): Array<Record<string, unknown> | undefined> => {
|
|
70
|
+
const top = record(root);
|
|
71
|
+
const response = record(top?.response);
|
|
72
|
+
return [record(top?.error), record(top?.last_error), record(response?.error), record(response?.incomplete_details)];
|
|
73
|
+
};
|
|
74
|
+
const before = pick(original);
|
|
75
|
+
const after = pick(masked);
|
|
76
|
+
if (after.some(isPolicy)) return masked;
|
|
77
|
+
const index = before.findIndex(isPolicy);
|
|
78
|
+
if (index < 0 || after[index] === undefined) return masked;
|
|
79
|
+
after[index]!.code = CYBER_POLICY_ERROR_CODE;
|
|
80
|
+
return masked;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Mask the selected outbound credential even when upstream echoes only its raw value. A secret
|
|
85
|
+
* containing a quote, backslash or control character appears JSON-escaped inside an SSE payload,
|
|
86
|
+
* so the escaped spelling is masked too. Custom credential headers count as well as the fixed list,
|
|
87
|
+
* and every part a server could authenticate with on its own is masked once it is long enough not
|
|
88
|
+
* to occur in copy by chance and is not a protocol word. The full credential is masked at any
|
|
89
|
+
* length. Spans are merged before replacement, so overlapping credentials leave nothing between them.
|
|
90
|
+
*/
|
|
5
91
|
export function createOutboundCredentialMask(outboundHeaders: Record<string, string>): (text: string) => string {
|
|
6
|
-
const
|
|
7
|
-
.filter(([name]) => SENSITIVE_KEY_PATTERN.test(name))
|
|
92
|
+
const secrets = Object.entries(outboundHeaders)
|
|
93
|
+
.filter(([name]) => SENSITIVE_KEY_PATTERN.test(name) || CREDENTIAL_HEADER_SEGMENT.test(name))
|
|
8
94
|
.flatMap(([name, value]) => {
|
|
9
95
|
const credential = /^(?:authorization|proxy-authorization)$/i.test(name)
|
|
10
96
|
? value.replace(/^\S+\s+/, "")
|
|
11
97
|
: value;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
98
|
+
if (!credential) return [];
|
|
99
|
+
const parts = new Set([credential, ...credentialComponents(value)
|
|
100
|
+
.filter(part => part.length >= CREDENTIAL_SUBSTRING_MIN_LENGTH && !PROTOCOL_WORD.test(part))]);
|
|
101
|
+
return [...parts].flatMap(withEscapedSpelling);
|
|
102
|
+
});
|
|
103
|
+
// Indexed once per request: masking each string of a frame is then linear in that string alone.
|
|
104
|
+
const index = new SecretIndex(secrets);
|
|
105
|
+
return (text) => maskSecretSpans(text, REDACTED_SECRET, index);
|
|
16
106
|
}
|
|
17
107
|
|
|
18
|
-
/**
|
|
19
|
-
|
|
108
|
+
/**
|
|
109
|
+
* The mask for copy a terminal boundary synthesizes from upstream evidence (verdict tails, policy
|
|
110
|
+
* terminals, buffered error presentations). Beyond the exact credential mask, copy that repeats any
|
|
111
|
+
* value this request sent is refused whole ({@link createSentValueGuard}: credential-named values
|
|
112
|
+
* whole or by any 8+ character excerpt, other non-correlation values whole at 8+). Only the scanned
|
|
113
|
+
* head of the copy is returned, so nothing unread is emitted. Request-correlation identifiers are
|
|
114
|
+
* not credentials and are left to diagnostics, as the outbound registry leaves them.
|
|
115
|
+
*/
|
|
116
|
+
export function createSynthesizedCopyMask(
|
|
20
117
|
outboundHeaders: Record<string, string>,
|
|
21
|
-
|
|
22
|
-
):
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
118
|
+
repeatsSentValue = createSentValueGuard(outboundHeaders),
|
|
119
|
+
): (text: string) => string {
|
|
120
|
+
const exact = createOutboundCredentialMask(outboundHeaders);
|
|
121
|
+
return (text) => {
|
|
122
|
+
// Error identities are public protocol vocabulary (buffered presentations pass type and code here).
|
|
123
|
+
if (isPublicErrorVocabulary(text)) return text;
|
|
124
|
+
const head = text.length > SENT_VALUE_GUARD_SCAN_CHARS ? text.slice(0, SENT_VALUE_GUARD_SCAN_CHARS) : text;
|
|
125
|
+
return repeatsSentValue(head) ? REDACTED_SECRET : exact(head);
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* The redaction helpers one request's rewrite and terminal boundary share. Protocol structure is never
|
|
131
|
+
* masked: the `event:` line, the root `type`, Responses field names and recognized error classes stay
|
|
132
|
+
* as they are, so the client always recognizes the frame the inspector saw.
|
|
133
|
+
*/
|
|
134
|
+
function createRedactionTools(outboundHeaders: Record<string, string>, maskCredential: (text: string) => string) {
|
|
135
|
+
// Upstream copy that is not a Responses terminal has every sent value masked in place (only the
|
|
136
|
+
// scanned head is emitted), so refusal wording a reader classifies survives.
|
|
137
|
+
const maskSentValues = createSentValueMask(outboundHeaders, REDACTED_SECRET);
|
|
138
|
+
// Whole credentials first, then the pattern rules, then excerpts: an excerpt window shared with
|
|
139
|
+
// another credential, or one inside a "Bearer <token>" the pattern rules recognize, would otherwise
|
|
140
|
+
// split it and leave a remainder neither the exact mask nor the pattern rules can find.
|
|
141
|
+
const guardedText = (text: string): string => maskSentValues(redactSecretString(maskCredential(text)));
|
|
142
|
+
// A genuine terminal is masked for every excerpt of a sent credential too, never for other header
|
|
143
|
+
// values (ordinary text there), and never cut: its output must reach the client whole.
|
|
144
|
+
const maskCredentialExcerpts = createSentValueMask(outboundHeaders, REDACTED_SECRET, { credentialOnly: true, wholeText: true });
|
|
145
|
+
const credentialText = (text: string): string => maskCredentialExcerpts(redactSecretString(maskCredential(text)));
|
|
146
|
+
// `refuseSentValues`: a payload that is upstream copy throughout masks every sent value in its
|
|
147
|
+
// strings and non-protocol keys, not only the selected credentials.
|
|
148
|
+
const redactDiagnostic = (value: unknown, refuseSentValues = false): unknown => {
|
|
149
|
+
// A number is upstream text too once serialized: one that repeats a sent value is dropped from
|
|
150
|
+
// an object (keeping every field's type valid) and replaced inside an array.
|
|
151
|
+
const numberMask = refuseSentValues ? maskSentValues : maskCredentialExcerpts;
|
|
152
|
+
const repeatsSentNumber = (entry: unknown): boolean => typeof entry === "number" && numberMask(String(entry)) !== String(entry);
|
|
153
|
+
const maskKnown = (entry: unknown, root = false): unknown => {
|
|
154
|
+
if (typeof entry === "string") return refuseSentValues ? guardedText(entry) : credentialText(entry);
|
|
155
|
+
if (Array.isArray(entry)) return entry.map(item => repeatsSentNumber(item) ? REDACTED_SECRET : maskKnown(item));
|
|
28
156
|
if (entry && typeof entry === "object") {
|
|
29
|
-
|
|
157
|
+
// A key is upstream text too: a rewritten terminal copies extra root fields verbatim. Its
|
|
158
|
+
// sensitivity is decided before masking, which could rename a key such as authorization.
|
|
159
|
+
return Object.fromEntries(Object.entries(entry).filter(([, item]) => !repeatsSentNumber(item)).map(([key, item]) => [
|
|
160
|
+
PROTOCOL_KEYS.has(key) ? key : refuseSentValues ? guardedText(key) : credentialText(key),
|
|
161
|
+
SENSITIVE_KEY_PATTERN.test(key) ? REDACTED_SECRET
|
|
162
|
+
: (root && key === "type") || isPublicClassValue(key, item) ? item : maskKnown(item),
|
|
163
|
+
]));
|
|
30
164
|
}
|
|
31
165
|
return entry;
|
|
32
166
|
};
|
|
33
|
-
|
|
167
|
+
// The exact selected credential first: a pattern rule that matches a token inside it (sk-...,
|
|
168
|
+
// Bearer ...) would otherwise split it and leave a prefix the exact mask can no longer find.
|
|
169
|
+
return redactSecrets(maskKnown(value, true));
|
|
34
170
|
};
|
|
171
|
+
// SSE comments and extension fields can also carry upstream text. A protocol event name and the
|
|
172
|
+
// data payload (already masked structurally) are left as they are; any other event name is
|
|
173
|
+
// provider text and is masked like the rest.
|
|
174
|
+
// Lines end in CRLF, CR or LF as the SSE parser accepts them; each separator is kept as it was.
|
|
175
|
+
const maskExtensionLines = (block: string): string => block
|
|
176
|
+
.split(/(\r\n|\r|\n)/)
|
|
177
|
+
.map((line, index) => {
|
|
178
|
+
if (index % 2 === 1 || /^data:/.test(line) || PROTOCOL_EVENT_LINE.test(line)) return line;
|
|
179
|
+
const event = /^event:[ \t]*/.exec(line);
|
|
180
|
+
return event ? `${event[0]}${guardedText(line.slice(event[0].length))}` : guardedText(line);
|
|
181
|
+
})
|
|
182
|
+
.join("");
|
|
183
|
+
// A frame that cannot be restructured (unparsable or non-object JSON) has its data masked as text.
|
|
184
|
+
const maskUnstructuredBlock = (block: string, payload: string | null): string => {
|
|
185
|
+
if (payload === null) return maskExtensionLines(block);
|
|
186
|
+
const masked = guardedText(payload);
|
|
187
|
+
return maskExtensionLines(masked === payload ? block : replaceSseDataPayload(block, masked));
|
|
188
|
+
};
|
|
189
|
+
// Upstream copy throughout (a non-terminal payload under a terminal line, a forwarded typed error).
|
|
190
|
+
const redactUpstreamCopyBlock = (block: string, payload: string | null, event: unknown): string => {
|
|
191
|
+
if (payload === null || !event || typeof event !== "object" || Array.isArray(event)) return maskUnstructuredBlock(block, payload);
|
|
192
|
+
const rewritten = JSON.stringify(redactDiagnostic(event, true));
|
|
193
|
+
return maskExtensionLines(rewritten === payload ? block : replaceSseDataPayload(block, rewritten));
|
|
194
|
+
};
|
|
195
|
+
return { redactDiagnostic, maskExtensionLines, maskUnstructuredBlock, redactUpstreamCopyBlock };
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
/**
|
|
199
|
+
* Redaction the terminal boundary applies to a typed bare `error` frame it forwards to the client,
|
|
200
|
+
* after it has reduced the frame's verdict from the original. Running it inside the boundary keeps
|
|
201
|
+
* classification on the provider's own words on both relays; the client still never receives a sent
|
|
202
|
+
* value from the frame.
|
|
203
|
+
*/
|
|
204
|
+
export function createForwardedEvidenceRedaction(
|
|
205
|
+
outboundHeaders: Record<string, string>,
|
|
206
|
+
maskCredential = createOutboundCredentialMask(outboundHeaders),
|
|
207
|
+
): (block: string) => string {
|
|
208
|
+
const { redactUpstreamCopyBlock } = createRedactionTools(outboundHeaders, maskCredential);
|
|
209
|
+
return (block) => {
|
|
210
|
+
const payload = sseDataPayload(block);
|
|
211
|
+
let event: unknown;
|
|
212
|
+
try { event = payload === null ? undefined : JSON.parse(payload); } catch { event = undefined; }
|
|
213
|
+
return redactUpstreamCopyBlock(block, payload, event);
|
|
214
|
+
};
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
/**
|
|
218
|
+
* Mask upstream diagnostics before either SSE delivery or buffered JSON reconstruction. Bare evidence
|
|
219
|
+
* passes through unchanged: an untyped envelope reaches no client (every delivery path ends in a
|
|
220
|
+
* terminal boundary or the buffered collector, which withhold it and build the terminal from guarded
|
|
221
|
+
* copy), and a typed `error` frame is redacted by the boundary after it is classified
|
|
222
|
+
* ({@link createForwardedEvidenceRedaction}), so the boundary behind the tee rewrite classifies the
|
|
223
|
+
* provider's own frame exactly as the inspector does.
|
|
224
|
+
*/
|
|
225
|
+
export function createTerminalErrorRedactionBlockRewrite(
|
|
226
|
+
outboundHeaders: Record<string, string>,
|
|
227
|
+
maskCredential = createOutboundCredentialMask(outboundHeaders),
|
|
228
|
+
): SseBlockRewrite {
|
|
229
|
+
const { redactDiagnostic, maskExtensionLines, maskUnstructuredBlock, redactUpstreamCopyBlock } = createRedactionTools(outboundHeaders, maskCredential);
|
|
35
230
|
return (block) => {
|
|
36
231
|
const terminalFrame = /^event:[ \t]*response\.(?:failed|incomplete)[ \t]*\r?$/m.test(block);
|
|
37
232
|
const payload = sseDataPayload(block);
|
|
38
|
-
if (payload === null) return [terminalFrame ?
|
|
233
|
+
if (payload === null) return [terminalFrame ? maskUnstructuredBlock(block, payload) : block];
|
|
39
234
|
let event: Record<string, unknown>;
|
|
40
235
|
try {
|
|
41
236
|
event = JSON.parse(payload) as Record<string, unknown>;
|
|
42
237
|
} catch {
|
|
43
|
-
return [terminalFrame ?
|
|
238
|
+
return [terminalFrame ? maskUnstructuredBlock(block, payload) : block];
|
|
44
239
|
}
|
|
240
|
+
if (isUntypedBareUpstreamError(event) || event?.type === "error") return [block];
|
|
45
241
|
if (event?.type !== "response.failed" && event?.type !== "response.incomplete") {
|
|
46
|
-
|
|
242
|
+
// A terminal event line over another JSON payload is upstream copy throughout, masked field by
|
|
243
|
+
// field so recognized classes survive for every reader.
|
|
244
|
+
return [terminalFrame ? redactUpstreamCopyBlock(block, payload, event) : block];
|
|
47
245
|
}
|
|
48
|
-
const safeEvent = redactDiagnostic(event);
|
|
246
|
+
const safeEvent = keepPolicyEvidence(event, redactDiagnostic(event));
|
|
49
247
|
const rewritten = JSON.stringify(safeEvent);
|
|
50
|
-
|
|
51
|
-
return [maskCredential(rewritten === payload ? block : replaceSseDataPayload(block, rewritten))];
|
|
248
|
+
return [maskExtensionLines(rewritten === payload ? block : replaceSseDataPayload(block, rewritten))];
|
|
52
249
|
};
|
|
53
250
|
}
|
|
@@ -163,7 +163,7 @@ export async function codexWsUpstreamFetch(
|
|
|
163
163
|
beforeDispatch?: (headers: Headers) => void,
|
|
164
164
|
nativeControl?: NativeResponseControl,
|
|
165
165
|
beforeContinuation?: () => Promise<void>,
|
|
166
|
-
onPhysicalDispatch?: () => void,
|
|
166
|
+
onPhysicalDispatch?: (body: BodyInit | null | undefined) => void,
|
|
167
167
|
/** Opt-in pre-output refusal hold (#6969); see codexWsExchange. */
|
|
168
168
|
preOutputRefusalHold?: CodexWsPreOutputRefusalHold,
|
|
169
169
|
onContinuationDispatch?: (frame: { body: Record<string, unknown>; text: string }) => void,
|
|
@@ -251,7 +251,7 @@ export async function codexWsUpstreamFetch(
|
|
|
251
251
|
return codexWsExchange({
|
|
252
252
|
session, url, init, prepared, sseFallback, onQuota, beforeDispatch,
|
|
253
253
|
nativeControl: control,
|
|
254
|
-
beforeContinuation, onPhysicalDispatch, onContinuationDispatch,
|
|
254
|
+
beforeContinuation, onPhysicalDispatch: () => onPhysicalDispatch?.(frameText), onContinuationDispatch,
|
|
255
255
|
preOutputRefusalHold,
|
|
256
256
|
bunVersion: typeof runtime === "string" ? runtime : runtime.version,
|
|
257
257
|
metadataContext: codexWsMetadataContext(init, prepared.model),
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { MessagesSseErrorFilter } from "./messages-sse-error-filter";
|
|
2
2
|
import type { MessagesSseFrameHooks } from "../lib/messages-sse-error-presentation";
|
|
3
3
|
import type { TranslatorBudget } from "../lib/translator-budget";
|
|
4
|
+
import { carryPacedStream, pacedQueuingStrategy } from "../lib/paced-stream";
|
|
4
5
|
import { Buffer } from "node:buffer";
|
|
5
6
|
|
|
6
7
|
/**
|
|
@@ -384,7 +385,7 @@ export function relaySseWithBlockRewrite(
|
|
|
384
385
|
return 0;
|
|
385
386
|
};
|
|
386
387
|
|
|
387
|
-
return new ReadableStream<Uint8Array>({
|
|
388
|
+
return carryPacedStream(body, new ReadableStream<Uint8Array>({
|
|
388
389
|
async pull(controller) {
|
|
389
390
|
try {
|
|
390
391
|
// A network chunk is not an SSE-event boundary. Bun may not issue a
|
|
@@ -427,5 +428,5 @@ export function relaySseWithBlockRewrite(
|
|
|
427
428
|
disposeRewrite();
|
|
428
429
|
reader.cancel(reason).catch(() => {});
|
|
429
430
|
},
|
|
430
|
-
});
|
|
431
|
+
}, pacedQueuingStrategy(body)));
|
|
431
432
|
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The service stop inside POST /api/stop (#7771, 030 "/api/stop").
|
|
3
|
+
*
|
|
4
|
+
* The route runs inside the proxy that holds the port, so it can never confirm the port
|
|
5
|
+
* itself; Part B belongs to the parent ocx stop. On Windows the route splits by case:
|
|
6
|
+
*
|
|
7
|
+
* - a receipt whose Part A record names the manager that is still registered: the parent
|
|
8
|
+
* already ran Part A, so the route skips it (no second enumeration, /end or wait);
|
|
9
|
+
* - a receipt without that record (an older CLI, or one claimed before Part A): today's
|
|
10
|
+
* behavior, the service stop, now Part A capped at 6 s; an overrun is
|
|
11
|
+
* service_state_unknown;
|
|
12
|
+
* - no receipt (the caller already refused a respawnable task, so nothing is registered
|
|
13
|
+
* with the Task Scheduler): a registered WinSW service keeps today's in-process stop,
|
|
14
|
+
* because WinSW's own stop ends this very process and cannot be capped from inside it;
|
|
15
|
+
* otherwise Part A's stray sweep for a deleted task's wrapper, capped at 4 s, so the
|
|
16
|
+
* route still answers inside the parent's 10 s POST abort.
|
|
17
|
+
*
|
|
18
|
+
* Off Windows it is today's stopServiceIfInstalledDetailed.
|
|
19
|
+
*/
|
|
20
|
+
import { pendingTeardownPartA, type PendingTeardownPartA } from "../config/pending-teardown";
|
|
21
|
+
import type { ServiceStopOutcome } from "../service/orchestration";
|
|
22
|
+
|
|
23
|
+
export const ROUTE_PART_A_CAP_MS = 6_000;
|
|
24
|
+
export const ROUTE_STRAY_SWEEP_CAP_MS = 4_000;
|
|
25
|
+
const REGISTRATION_PROBE_MS = 2_000;
|
|
26
|
+
|
|
27
|
+
export interface RouteServiceStopIo {
|
|
28
|
+
platform?: NodeJS.Platform;
|
|
29
|
+
stop?: (request: { capMs?: number; allowUnderOwnWrapper?: boolean }) => Promise<ServiceStopOutcome>;
|
|
30
|
+
assertEnvironment?: () => void;
|
|
31
|
+
readRecord?: (nonce: string | null) => PendingTeardownPartA | null;
|
|
32
|
+
registration?: () => Promise<{ scheduler: "present" | "absent" | "unknown"; winsw: "started" | "stopped" | "nonexistent" | "unknown" }>;
|
|
33
|
+
winswRegistered?: () => boolean;
|
|
34
|
+
stopWinsw?: () => void;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
async function liveRegistration(): Promise<Awaited<ReturnType<NonNullable<RouteServiceStopIo["registration"]>>>> {
|
|
38
|
+
const { windowsServiceStopHooks } = await import("../service/windows-service-stop");
|
|
39
|
+
const hooked = windowsServiceStopHooks()?.registration;
|
|
40
|
+
if (hooked) return hooked();
|
|
41
|
+
const { windowsCheckedStopLiveDeps } = await import("../service/windows-checked-stop-live");
|
|
42
|
+
const deps = windowsCheckedStopLiveDeps();
|
|
43
|
+
const [scheduler, winsw] = await Promise.all([
|
|
44
|
+
Promise.resolve(deps.probeScheduler(REGISTRATION_PROBE_MS)).then(probe => probe.status, () => "unknown" as const),
|
|
45
|
+
Promise.resolve(deps.probeWinsw(REGISTRATION_PROBE_MS)).catch(() => "unknown" as const),
|
|
46
|
+
]);
|
|
47
|
+
return { scheduler, winsw };
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** The record still describes this machine: the same managers are registered. */
|
|
51
|
+
export function partARecordMatchesRegistration(
|
|
52
|
+
record: PendingTeardownPartA,
|
|
53
|
+
current: Awaited<ReturnType<NonNullable<RouteServiceStopIo["registration"]>>>,
|
|
54
|
+
): boolean {
|
|
55
|
+
if (current.scheduler === "unknown" || current.winsw === "unknown") return false;
|
|
56
|
+
return record.manager.scheduler === (current.scheduler === "present")
|
|
57
|
+
&& record.manager.winsw === (current.winsw !== "nonexistent");
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export async function routeServiceStop(url: URL, holdsReceipt: boolean, io: RouteServiceStopIo = {}): Promise<ServiceStopOutcome> {
|
|
61
|
+
const service = await import("../service");
|
|
62
|
+
const stop = io.stop ?? (request => service.stopServiceIfInstalledDetailed(request));
|
|
63
|
+
if ((io.platform ?? process.platform) !== "win32") return stop({});
|
|
64
|
+
// The ownership check every service stop ran before still runs first.
|
|
65
|
+
(io.assertEnvironment ?? service.assertServiceEnvironmentMatchesInstall)();
|
|
66
|
+
if (holdsReceipt) {
|
|
67
|
+
const record = (io.readRecord ?? pendingTeardownPartA)(url.searchParams.get("teardownNonce"));
|
|
68
|
+
if (record && partARecordMatchesRegistration(record, await (io.registration ?? liveRegistration)())) {
|
|
69
|
+
return record.partA;
|
|
70
|
+
}
|
|
71
|
+
// The route runs inside the proxy its wrapper supervises: ending that wrapper is the point.
|
|
72
|
+
return stop({ capMs: ROUTE_PART_A_CAP_MS, allowUnderOwnWrapper: true });
|
|
73
|
+
}
|
|
74
|
+
const winsw = await import("../lib/winsw");
|
|
75
|
+
const winswRegistered = io.winswRegistered ?? (() => winsw.statusWinswRaw() !== "nonexistent");
|
|
76
|
+
if (winswRegistered()) {
|
|
77
|
+
try {
|
|
78
|
+
(io.stopWinsw ?? (() => winsw.stopWinswService()))();
|
|
79
|
+
return "stopped";
|
|
80
|
+
} catch {
|
|
81
|
+
return "failed";
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return stop({ capMs: ROUTE_STRAY_SWEEP_CAP_MS, allowUnderOwnWrapper: true });
|
|
85
|
+
}
|
|
@@ -2,7 +2,7 @@ import { accessSync, constants, readFileSync, writeFileSync, unlinkSync, mkdirSy
|
|
|
2
2
|
import { delimiter, join } from "node:path";
|
|
3
3
|
import { getConfigDir } from "../config";
|
|
4
4
|
import { claudeTierDisplayName, claudeToolSearchEnv, isClaudeTierLabelSlot, resolveAutoContext, type AutoContextMode } from "../claude/context-windows";
|
|
5
|
-
import { PROXY_MARKER, defaultAuthDetectDeps, detectClaudeAuth, ownAdmissionTokens, type AuthDetectDeps } from "../claude/auth-detect";
|
|
5
|
+
import { PROXY_MARKER, defaultAuthDetectDeps, detectClaudeAuth, ownAdmissionTokens, resolveClaudeKeychainPresence, type AuthDetectDeps } from "../claude/auth-detect";
|
|
6
6
|
import { resolveClaudeAuthMode } from "../claude/auth-mode";
|
|
7
7
|
import { ANTHROPIC_PARENT_ENV_SLOTS, trustedNodeLauncherContext, type AnthropicParentEnvSlot } from "../cli/launcher-context";
|
|
8
8
|
import type { OcxConfig } from "../types";
|
|
@@ -27,6 +27,16 @@ export type SystemEnvDeps = {
|
|
|
27
27
|
authDetect?: Omit<Partial<AuthDetectDeps>, "env" | "ownTokens">;
|
|
28
28
|
};
|
|
29
29
|
|
|
30
|
+
/**
|
|
31
|
+
* Resolve the Keychain source once, asynchronously, so the synchronous marker decision below
|
|
32
|
+
* never spawns `security` itself (#8161). A caller-supplied probe (a test seam) is kept as is.
|
|
33
|
+
*/
|
|
34
|
+
export async function withResolvedKeychainPresence(deps: SystemEnvDeps, authMode?: string): Promise<SystemEnvDeps> {
|
|
35
|
+
if (deps.authDetect?.keychainProbe) return deps;
|
|
36
|
+
const presence = await resolveClaudeKeychainPresence(authMode);
|
|
37
|
+
return { ...deps, authDetect: { ...deps.authDetect, keychainProbe: () => presence } };
|
|
38
|
+
}
|
|
39
|
+
|
|
30
40
|
/**
|
|
31
41
|
* Bun may synthesize Anthropic variables from a project `.env` before this module runs.
|
|
32
42
|
* Only values recorded by the plain-Node launcher are trusted as parent exports. Direct
|
|
@@ -51,6 +61,7 @@ function systemEnvAnthropicEnv(
|
|
|
51
61
|
export function systemEnvMarkerMode(config: OcxConfig, deps: SystemEnvDeps = {}): "proxy" | "subscription" {
|
|
52
62
|
const env = systemEnvAnthropicEnv(process.env, deps.preBunAnthropicSlots);
|
|
53
63
|
const ownTokens = ownAdmissionTokens(config);
|
|
64
|
+
// Without a resolved Keychain source this reads `unknown` on macOS: subscription, never proxy.
|
|
54
65
|
return resolveClaudeAuthMode(config, detectClaudeAuth({
|
|
55
66
|
...defaultAuthDetectDeps(env, ownTokens),
|
|
56
67
|
...(deps.authDetect ?? {}),
|
package/src/server/system-env.ts
CHANGED
|
@@ -14,7 +14,7 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
|
|
|
14
14
|
import { siblingOfLivePort } from "../codex/sibling-start";
|
|
15
15
|
export { getShellEnvFilePath, installShellHook, uninstallShellHook, claudeCodeCliInstalled, reconcileShellHook } from "./system-env-shell";
|
|
16
16
|
export type { SystemEnvDeps } from "./system-env-shell";
|
|
17
|
-
import { systemEnvMarkerMode, writeShellEnvFile, removeShellEnvFile } from "./system-env-shell";
|
|
17
|
+
import { systemEnvMarkerMode, withResolvedKeychainPresence, writeShellEnvFile, removeShellEnvFile } from "./system-env-shell";
|
|
18
18
|
import type { SystemEnvDeps } from "./system-env-shell";
|
|
19
19
|
|
|
20
20
|
const SYSTEM_ENV_NAMES = [
|
|
@@ -218,7 +218,9 @@ export async function injectSystemEnv(
|
|
|
218
218
|
bindHost: probeHostname(config.hostname),
|
|
219
219
|
clientBaseUrl: destination.origin,
|
|
220
220
|
};
|
|
221
|
-
|
|
221
|
+
// One asynchronous Keychain observation serves both the launchd marker and the shell env file.
|
|
222
|
+
const resolvedDeps = await withResolvedKeychainPresence(deps, config.claudeCode?.authMode);
|
|
223
|
+
const markerMode = systemEnvMarkerMode(config, resolvedDeps);
|
|
222
224
|
// The data-plane credential this host can present to its own public listener: env token,
|
|
223
225
|
// hardened service token file, then a configured key. Never the admin token.
|
|
224
226
|
const hostAdmissionToken = destination.requiresAdmissionToken ? localAdmissionToken(config) : undefined;
|
|
@@ -358,7 +360,7 @@ export async function injectSystemEnv(
|
|
|
358
360
|
}
|
|
359
361
|
|
|
360
362
|
// Shell-hook env file: works for new shells in already-running Terminal.app.
|
|
361
|
-
writeShellEnvFile(port, config, modelEnv, auto,
|
|
363
|
+
writeShellEnvFile(port, config, modelEnv, auto, resolvedDeps);
|
|
362
364
|
|
|
363
365
|
// Gateway-model cache pre-write (devlog 030): plain `claude` sessions read the
|
|
364
366
|
// picker list from ~/.claude/cache/gateway-models.json and cannot refresh it
|
|
@@ -13,8 +13,14 @@ export type TcpQuad = {
|
|
|
13
13
|
state: string;
|
|
14
14
|
};
|
|
15
15
|
|
|
16
|
-
/**
|
|
17
|
-
|
|
16
|
+
/**
|
|
17
|
+
* Parse netstat -ano rows whose local address uses `port`. Exported for tests.
|
|
18
|
+
*
|
|
19
|
+
* `ownerPids` restricts the rows to those the listed processes own. A row left by a process
|
|
20
|
+
* that has exited is that process's to clear; a program that took the port between scans owns
|
|
21
|
+
* its own rows, and resetting them would break a connection this stop does not own.
|
|
22
|
+
*/
|
|
23
|
+
export function parseTcpQuadsForLocalPort(output: string, port: number, ownerPids?: readonly number[]): TcpQuad[] {
|
|
18
24
|
const rows: TcpQuad[] = [];
|
|
19
25
|
const portSuffix = `:${port}`;
|
|
20
26
|
for (const rawLine of output.split(/\r?\n/)) {
|
|
@@ -26,6 +32,10 @@ export function parseTcpQuadsForLocalPort(output: string, port: number): TcpQuad
|
|
|
26
32
|
const remote = parts[2]!;
|
|
27
33
|
const state = parts[3]!;
|
|
28
34
|
if (!local.endsWith(portSuffix) && !local.endsWith(`]:${port}`)) continue;
|
|
35
|
+
if (ownerPids !== undefined) {
|
|
36
|
+
const rowPid = Number(parts[4]);
|
|
37
|
+
if (!Number.isSafeInteger(rowPid) || !ownerPids.includes(rowPid)) continue;
|
|
38
|
+
}
|
|
29
39
|
const localAddr = stripPort(local, port);
|
|
30
40
|
const remoteParsed = splitHostPort(remote);
|
|
31
41
|
if (!localAddr || !remoteParsed) continue;
|
|
@@ -134,10 +144,17 @@ function readNetstatAno(): string {
|
|
|
134
144
|
/**
|
|
135
145
|
* Force-delete IPv4 TCP rows bound to `localPort` via SetTcpEntry(DELETE_TCB).
|
|
136
146
|
* Does not kill foreign processes — only resets sockets so the listen port can bind again.
|
|
147
|
+
* `ownerPids` restricts the deletion to rows those processes own (see
|
|
148
|
+
* parseTcpQuadsForLocalPort); omitted, every row on the port is cleared, which is what the
|
|
149
|
+
* hard-kill path wants and what a stale-port sweep must not do.
|
|
137
150
|
* Bare IPv6 rows (`::1`, `::`, etc.) are skipped (not coerced into IPv4 wildcards);
|
|
138
151
|
* IPv6 TCB reclamation is unsupported on this path.
|
|
139
152
|
*/
|
|
140
|
-
export function dropWindowsTcpRowsForLocalPort(
|
|
153
|
+
export function dropWindowsTcpRowsForLocalPort(
|
|
154
|
+
port: number,
|
|
155
|
+
mayMutate?: () => boolean,
|
|
156
|
+
ownerPids?: readonly number[],
|
|
157
|
+
): WindowsTcpDropResult {
|
|
141
158
|
if (process.platform !== "win32" || !Number.isFinite(port) || port <= 0) {
|
|
142
159
|
return { dropped: 0, skippedIpv6: 0, accessDenied: 0 };
|
|
143
160
|
}
|
|
@@ -151,7 +168,7 @@ export function dropWindowsTcpRowsForLocalPort(port: number, mayMutate?: () => b
|
|
|
151
168
|
return { dropped: 0, skippedIpv6: 0, accessDenied: 0 };
|
|
152
169
|
}
|
|
153
170
|
|
|
154
|
-
const rows = parseTcpQuadsForLocalPort(output, Math.trunc(port));
|
|
171
|
+
const rows = parseTcpQuadsForLocalPort(output, Math.trunc(port), ownerPids);
|
|
155
172
|
let dropped = 0;
|
|
156
173
|
let skippedIpv6 = 0;
|
|
157
174
|
let accessDenied = 0;
|
|
@@ -31,6 +31,7 @@ import {
|
|
|
31
31
|
type WorkflowSpendDenialDetail,
|
|
32
32
|
} from "../lib/workflow-budget";
|
|
33
33
|
import { currentWorkflowBudgetPolicy } from "../lib/workflow-budget-config";
|
|
34
|
+
import { SEND_BUDGET_EXHAUSTED_CODE } from "../lib/errors";
|
|
34
35
|
|
|
35
36
|
/**
|
|
36
37
|
* What a caller needs to hand over for the refusal to become a row on `/api/logs`.
|
|
@@ -152,6 +153,13 @@ export function unboundPoolSpendRefusalResponse(logCtx: RequestLogContext): Resp
|
|
|
152
153
|
return workflowRefusalResponse("workflow-spend-exhausted", logCtx, undefined, undefined, detail);
|
|
153
154
|
}
|
|
154
155
|
|
|
156
|
+
/** Preserve affinity when the proxy, rather than the serving credential, refuses a send. */
|
|
157
|
+
export function adapterSendBudgetRefusal(logCtx: RequestLogContext, rootId: string | undefined, message: string): Response {
|
|
158
|
+
logCtx.terminalSource = "synthetic";
|
|
159
|
+
return unboundPoolSpendRefusalResponse(logCtx) ?? workflowSendCeilingRefusalResponse(logCtx, rootId)
|
|
160
|
+
?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, message));
|
|
161
|
+
}
|
|
162
|
+
|
|
155
163
|
/**
|
|
156
164
|
* Admit one HTTP turn against its root workflow budget.
|
|
157
165
|
*
|