@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
|
@@ -0,0 +1,497 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Opt-in SSH log capture for Remote Link tunnels (#7297).
|
|
3
|
+
*
|
|
4
|
+
* Authority: capture is on only while `<configDir>/link/ssh-capture/control.json` holds an unexpired
|
|
5
|
+
* window. Only `ocx link capture start` on this machine writes that file; it is not a config key, so no
|
|
6
|
+
* Home sync, management route or remote input can turn capture on. The runtime reads it at each
|
|
7
|
+
* tunnel spawn and refuses a control file that is a symlink, not a regular file, or (on POSIX) not
|
|
8
|
+
* owner-only and owned by this user.
|
|
9
|
+
*
|
|
10
|
+
* Lifetime: a window lasts SSH_CAPTURE_DEFAULT_MINUTES unless the operator asks for up to
|
|
11
|
+
* SSH_CAPTURE_MAX_MINUTES; a window further away than that maximum reads as off. While a window is
|
|
12
|
+
* open, the next ssh attempt of a Home (-R) or Child (-L) tunnel runs with LogLevel=DEBUG1; after
|
|
13
|
+
* stop or expiry the next attempt is back at LogLevel=ERROR. A running attempt keeps its level, but
|
|
14
|
+
* nothing it prints is stored once the window closed. Each window writes one capture file of at most
|
|
15
|
+
* SSH_CAPTURE_FILE_MAX_BYTES; files are deleted SSH_CAPTURE_RETENTION_MS after their last write, and
|
|
16
|
+
* at most SSH_CAPTURE_MAX_FILES are kept. Stop removes only the control file, so a capture the
|
|
17
|
+
* operator still needs survives until its retention passes.
|
|
18
|
+
*
|
|
19
|
+
* Content: every stderr line goes through sanitizeSshLine (src/link/ssh-capture-redact.ts), an
|
|
20
|
+
* allowlist of ssh line shapes; raw text never reaches disk.
|
|
21
|
+
*/
|
|
22
|
+
import { constants, lstatSync, mkdirSync, readdirSync, chmodSync, unlinkSync, type Stats } from "node:fs";
|
|
23
|
+
import { chmod, lstat, open } from "node:fs/promises";
|
|
24
|
+
import { dirname, join } from "node:path";
|
|
25
|
+
import { atomicWriteFileNoFollow } from "../config/atomic-write";
|
|
26
|
+
import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
|
|
27
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
28
|
+
import {
|
|
29
|
+
hardenSecretDir, hardenSecretDirAsync, hardenSecretPath, hardenSecretPathAsync, reattributeHardenedSecretPath, windowsSecretAclApplies,
|
|
30
|
+
} from "../lib/windows-secret-acl";
|
|
31
|
+
import { LINK_ID_PATTERN } from "./ssh-argv";
|
|
32
|
+
import { sanitizeSshLine, type SanitizedSshLine } from "./ssh-capture-redact";
|
|
33
|
+
|
|
34
|
+
export const SSH_CAPTURE_DEFAULT_MINUTES = 15;
|
|
35
|
+
export const SSH_CAPTURE_MAX_MINUTES = 60;
|
|
36
|
+
export const SSH_CAPTURE_FILE_MAX_BYTES = 1024 * 1024;
|
|
37
|
+
export const SSH_CAPTURE_RETENTION_MS = 72 * 60 * 60_000;
|
|
38
|
+
export const SSH_CAPTURE_MAX_FILES = 4;
|
|
39
|
+
export const SSH_CAPTURE_LOG_LEVEL = "DEBUG1";
|
|
40
|
+
|
|
41
|
+
const CONTROL_FILE = "control.json";
|
|
42
|
+
const CAPTURE_FILE = /^ssh-(\d{13})\.jsonl$/;
|
|
43
|
+
const CONTROL_MAX_BYTES = 512;
|
|
44
|
+
const QUEUE_MAX = 512;
|
|
45
|
+
const TRUNCATION_RESERVE_BYTES = 128;
|
|
46
|
+
const TRUNCATION_EVENT = '"event":"capture_truncated"';
|
|
47
|
+
const PRUNE_INTERVAL_MS = 60_000;
|
|
48
|
+
|
|
49
|
+
export type SshCaptureTunnel = "home" | "child";
|
|
50
|
+
|
|
51
|
+
export interface SshCaptureControl {
|
|
52
|
+
readonly version: 1;
|
|
53
|
+
readonly startedAt: number;
|
|
54
|
+
readonly expiresAt: number;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** What one tunnel spawn gets while capture is on. */
|
|
58
|
+
export interface SshCaptureSpawn {
|
|
59
|
+
readonly logLevel: typeof SSH_CAPTURE_LOG_LEVEL;
|
|
60
|
+
/** Stores the line's sanitized form; returns whether the exit classifier reads the raw line. */
|
|
61
|
+
stderrLine(line: string): boolean;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export type SshCaptureOpener = (tunnel: SshCaptureTunnel, linkId: string) => SshCaptureSpawn | null;
|
|
65
|
+
|
|
66
|
+
export interface SshCaptureFileStatus {
|
|
67
|
+
name: string;
|
|
68
|
+
bytes: number;
|
|
69
|
+
lastWriteAt: string;
|
|
70
|
+
deleteAfter: string;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export interface SshCaptureStatus {
|
|
74
|
+
enabled: boolean;
|
|
75
|
+
logLevel: typeof SSH_CAPTURE_LOG_LEVEL | "ERROR";
|
|
76
|
+
startedAt: string | null;
|
|
77
|
+
expiresAt: string | null;
|
|
78
|
+
directory: string;
|
|
79
|
+
retentionHours: number;
|
|
80
|
+
maxMinutes: number;
|
|
81
|
+
maxFileBytes: number;
|
|
82
|
+
files: SshCaptureFileStatus[];
|
|
83
|
+
/** Capture files this call deleted: retention, or the oldest beyond SSH_CAPTURE_MAX_FILES at start. */
|
|
84
|
+
removed: number;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export class SshCaptureError extends Error {
|
|
88
|
+
constructor(message: string) {
|
|
89
|
+
super(message);
|
|
90
|
+
this.name = "SshCaptureError";
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
export function sshCaptureDir(linkDirectory: string): string {
|
|
95
|
+
return join(linkDirectory, "ssh-capture");
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
function captureFileName(startedAt: number): string {
|
|
99
|
+
return "ssh-" + startedAt + ".jsonl";
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function isMissing(error: unknown): boolean {
|
|
103
|
+
const code = (error as NodeJS.ErrnoException | undefined)?.code;
|
|
104
|
+
return code === "ENOENT" || code === "ENOTDIR";
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
function lstatOrNull(path: string): Stats | null {
|
|
108
|
+
try { return lstatSync(path); } catch (error) { if (isMissing(error)) return null; throw error; }
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
function isSafeEpoch(value: unknown): value is number {
|
|
112
|
+
return typeof value === "number" && Number.isSafeInteger(value) && value >= 1_000_000_000_000 && value < 10_000_000_000_000;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
/** Owner-only and owned by this user on POSIX; Windows relies on the private ACL the writers apply. */
|
|
116
|
+
function privateEnough(stat: Stats, mask: number): boolean {
|
|
117
|
+
if (process.platform === "win32") return true;
|
|
118
|
+
const uid = typeof process.getuid === "function" ? process.getuid() : undefined;
|
|
119
|
+
return (stat.mode & mask) === 0 && (uid === undefined || stat.uid === uid);
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** The control window if one is open now, else null. Never throws for a damaged or foreign file. */
|
|
123
|
+
export function readSshCaptureControl(dir: string, now: number): SshCaptureControl | null {
|
|
124
|
+
try {
|
|
125
|
+
const directory = lstatOrNull(dir);
|
|
126
|
+
if (!directory || !directory.isDirectory() || directory.isSymbolicLink() || !privateEnough(directory, 0o077)) return null;
|
|
127
|
+
const path = join(dir, CONTROL_FILE);
|
|
128
|
+
const entry = lstatOrNull(path);
|
|
129
|
+
if (!entry || !entry.isFile() || entry.isSymbolicLink() || entry.nlink !== 1 || !privateEnough(entry, 0o077)) return null;
|
|
130
|
+
const raw: unknown = JSON.parse(readBoundedRegularFileSync(path, CONTROL_MAX_BYTES).toString("utf8"));
|
|
131
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
|
|
132
|
+
const body = raw as Record<string, unknown>;
|
|
133
|
+
const keys = Object.keys(body).sort().join(",");
|
|
134
|
+
if (keys !== "expiresAt,startedAt,version" || body.version !== 1 || !isSafeEpoch(body.startedAt) || !isSafeEpoch(body.expiresAt)) return null;
|
|
135
|
+
// A window further out than the hard maximum (a wrong clock or a hand edit) reads as off.
|
|
136
|
+
if (body.expiresAt <= body.startedAt || now >= body.expiresAt || body.expiresAt - now > SSH_CAPTURE_MAX_MINUTES * 60_000) return null;
|
|
137
|
+
return { version: 1, startedAt: body.startedAt, expiresAt: body.expiresAt };
|
|
138
|
+
} catch {
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
function listCaptureFiles(dir: string): Array<{ name: string; startedAt: number; bytes: number; mtimeMs: number }> {
|
|
144
|
+
let names: string[];
|
|
145
|
+
try { names = readdirSync(dir); } catch (error) { if (isMissing(error)) return []; throw error; }
|
|
146
|
+
const files: Array<{ name: string; startedAt: number; bytes: number; mtimeMs: number }> = [];
|
|
147
|
+
for (const name of names) {
|
|
148
|
+
const match = CAPTURE_FILE.exec(name);
|
|
149
|
+
if (!match) continue;
|
|
150
|
+
const stat = lstatOrNull(join(dir, name));
|
|
151
|
+
// Never follow or count anything but a plain single-link file.
|
|
152
|
+
if (!stat || !stat.isFile() || stat.isSymbolicLink() || stat.nlink !== 1) continue;
|
|
153
|
+
files.push({ name, startedAt: Number(match[1]), bytes: stat.size, mtimeMs: stat.mtimeMs });
|
|
154
|
+
}
|
|
155
|
+
return files.sort((left, right) => left.startedAt - right.startedAt);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/**
|
|
159
|
+
* Delete capture files whose last write is older than the retention period, and an expired control
|
|
160
|
+
* file. Returns the number of capture files removed. Never follows a link.
|
|
161
|
+
*/
|
|
162
|
+
export function pruneSshCapture(dir: string, now: number): number {
|
|
163
|
+
const directory = lstatOrNull(dir);
|
|
164
|
+
if (!directory || !directory.isDirectory() || directory.isSymbolicLink()) return 0;
|
|
165
|
+
let removed = 0;
|
|
166
|
+
for (const file of listCaptureFiles(dir)) {
|
|
167
|
+
if (now - file.mtimeMs < SSH_CAPTURE_RETENTION_MS) continue;
|
|
168
|
+
try { unlinkSync(join(dir, file.name)); removed += 1; } catch (error) { if (!isMissing(error)) throw error; }
|
|
169
|
+
}
|
|
170
|
+
const control = lstatOrNull(join(dir, CONTROL_FILE));
|
|
171
|
+
if (control && control.isFile() && !control.isSymbolicLink() && readSshCaptureControl(dir, now) === null) {
|
|
172
|
+
try { unlinkSync(join(dir, CONTROL_FILE)); } catch (error) { if (!isMissing(error)) throw error; }
|
|
173
|
+
}
|
|
174
|
+
return removed;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
function iso(ms: number): string {
|
|
178
|
+
return new Date(ms).toISOString();
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
export function sshCaptureStatus(linkDirectory: string, now: number, removed = 0): SshCaptureStatus {
|
|
182
|
+
const dir = sshCaptureDir(linkDirectory);
|
|
183
|
+
const control = readSshCaptureControl(dir, now);
|
|
184
|
+
return {
|
|
185
|
+
enabled: control !== null,
|
|
186
|
+
logLevel: control ? SSH_CAPTURE_LOG_LEVEL : "ERROR",
|
|
187
|
+
startedAt: control ? iso(control.startedAt) : null,
|
|
188
|
+
expiresAt: control ? iso(control.expiresAt) : null,
|
|
189
|
+
directory: dir,
|
|
190
|
+
retentionHours: SSH_CAPTURE_RETENTION_MS / 3_600_000,
|
|
191
|
+
maxMinutes: SSH_CAPTURE_MAX_MINUTES,
|
|
192
|
+
maxFileBytes: SSH_CAPTURE_FILE_MAX_BYTES,
|
|
193
|
+
files: listCaptureFiles(dir).map(file => ({
|
|
194
|
+
name: file.name,
|
|
195
|
+
bytes: file.bytes,
|
|
196
|
+
lastWriteAt: iso(file.mtimeMs),
|
|
197
|
+
deleteAfter: iso(file.mtimeMs + SSH_CAPTURE_RETENTION_MS),
|
|
198
|
+
})),
|
|
199
|
+
removed,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
/** Create the capture directory owner-only, refusing a symlink or a non-directory in its place. */
|
|
204
|
+
function ensurePrivateDir(linkDirectory: string): string {
|
|
205
|
+
const dir = sshCaptureDir(linkDirectory);
|
|
206
|
+
assertNotRealHomeUnderTest(dirname(linkDirectory));
|
|
207
|
+
mkdirSync(linkDirectory, { recursive: true, mode: 0o700 });
|
|
208
|
+
try { mkdirSync(dir, { mode: 0o700 }); } catch (error) { if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error; }
|
|
209
|
+
const stat = lstatSync(dir);
|
|
210
|
+
if (stat.isSymbolicLink() || !stat.isDirectory()) throw new SshCaptureError("the SSH capture directory is not a plain directory; remove it and try again");
|
|
211
|
+
if (windowsSecretAclApplies()) hardenSecretDir(dir, { required: true });
|
|
212
|
+
else {
|
|
213
|
+
const uid = typeof process.getuid === "function" ? process.getuid() : undefined;
|
|
214
|
+
if (uid !== undefined && stat.uid !== uid) throw new SshCaptureError("the SSH capture directory belongs to another user");
|
|
215
|
+
chmodSync(dir, 0o700);
|
|
216
|
+
}
|
|
217
|
+
return dir;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
export interface SshCaptureStartOptions {
|
|
221
|
+
linkDirectory: string;
|
|
222
|
+
now: number;
|
|
223
|
+
minutes?: number;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
/** Open or extend the capture window. Starting while a window is open keeps its capture file. */
|
|
227
|
+
export function startSshCapture(options: SshCaptureStartOptions): SshCaptureStatus {
|
|
228
|
+
const minutes = options.minutes ?? SSH_CAPTURE_DEFAULT_MINUTES;
|
|
229
|
+
if (!Number.isSafeInteger(minutes) || minutes < 1 || minutes > SSH_CAPTURE_MAX_MINUTES) {
|
|
230
|
+
throw new SshCaptureError("--minutes must be an integer from 1 to " + SSH_CAPTURE_MAX_MINUTES);
|
|
231
|
+
}
|
|
232
|
+
if (!isSafeEpoch(options.now)) throw new SshCaptureError("the system clock is not usable for an SSH capture window");
|
|
233
|
+
const dir = ensurePrivateDir(options.linkDirectory);
|
|
234
|
+
let removed = pruneSshCapture(dir, options.now);
|
|
235
|
+
const startedAt = readSshCaptureControl(dir, options.now)?.startedAt ?? options.now;
|
|
236
|
+
// Keep room for this window's file: the oldest files beyond the cap go first.
|
|
237
|
+
const others = listCaptureFiles(dir).filter(file => file.startedAt !== startedAt);
|
|
238
|
+
for (const file of others.slice(0, Math.max(0, others.length - (SSH_CAPTURE_MAX_FILES - 1)))) {
|
|
239
|
+
try { unlinkSync(join(dir, file.name)); removed += 1; } catch (error) { if (!isMissing(error)) throw error; }
|
|
240
|
+
}
|
|
241
|
+
const control: SshCaptureControl = { version: 1, startedAt, expiresAt: options.now + minutes * 60_000 };
|
|
242
|
+
const path = join(dir, CONTROL_FILE);
|
|
243
|
+
atomicWriteFileNoFollow(path, JSON.stringify(control) + "\n");
|
|
244
|
+
if (windowsSecretAclApplies()) hardenSecretPath(path, { required: true });
|
|
245
|
+
else chmodSync(path, 0o600);
|
|
246
|
+
return sshCaptureStatus(options.linkDirectory, options.now, removed);
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
/** Close the window now. Capture files stay until their retention passes. */
|
|
250
|
+
export function stopSshCapture(linkDirectory: string, now: number): SshCaptureStatus {
|
|
251
|
+
const dir = sshCaptureDir(linkDirectory);
|
|
252
|
+
const directory = lstatOrNull(dir);
|
|
253
|
+
if (directory && directory.isDirectory() && !directory.isSymbolicLink()) {
|
|
254
|
+
// unlink never follows: a planted link is removed itself, its target untouched.
|
|
255
|
+
try { unlinkSync(join(dir, CONTROL_FILE)); } catch (error) { if (!isMissing(error)) throw error; }
|
|
256
|
+
}
|
|
257
|
+
return sshCaptureStatus(linkDirectory, now, pruneSshCapture(dir, now));
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
/** Apply retention and report. Deletes only capture files past retention and an expired control file. */
|
|
261
|
+
export function readSshCaptureStatus(linkDirectory: string, now: number): SshCaptureStatus {
|
|
262
|
+
return sshCaptureStatus(linkDirectory, now, pruneSshCapture(sshCaptureDir(linkDirectory), now));
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
type CaptureRecord = {
|
|
266
|
+
at: number;
|
|
267
|
+
tunnel: SshCaptureTunnel;
|
|
268
|
+
linkId?: string;
|
|
269
|
+
level?: SanitizedSshLine["level"];
|
|
270
|
+
event: string;
|
|
271
|
+
text?: string;
|
|
272
|
+
count?: number;
|
|
273
|
+
dropped?: number;
|
|
274
|
+
};
|
|
275
|
+
|
|
276
|
+
type AppendResult = "written" | "full" | "refused";
|
|
277
|
+
|
|
278
|
+
/** Append to a capture file through a private no-follow handle, never past the per-file cap. */
|
|
279
|
+
async function appendCapture(dir: string, name: string, lines: readonly string[], truncatedLine: string): Promise<AppendResult> {
|
|
280
|
+
assertNotRealHomeUnderTest(dirname(dirname(dir)));
|
|
281
|
+
// The writer never creates the directory: only an explicit start does.
|
|
282
|
+
const directory = await lstat(dir).catch(() => null);
|
|
283
|
+
if (!directory || !directory.isDirectory() || directory.isSymbolicLink()) return "refused";
|
|
284
|
+
const windows = windowsSecretAclApplies();
|
|
285
|
+
if (windows) await hardenSecretDirAsync(dir, { required: true });
|
|
286
|
+
else await chmod(dir, 0o700);
|
|
287
|
+
const path = join(dir, name);
|
|
288
|
+
let file: Awaited<ReturnType<typeof open>> | undefined;
|
|
289
|
+
try {
|
|
290
|
+
const flags = constants.O_RDWR | constants.O_APPEND | constants.O_CREAT | constants.O_NOFOLLOW | constants.O_NONBLOCK;
|
|
291
|
+
file = await open(path, flags, 0o600);
|
|
292
|
+
const current = await file.stat();
|
|
293
|
+
if (!current.isFile() || current.nlink !== 1) return "refused";
|
|
294
|
+
if (windows) await hardenSecretPathAsync(path, { required: true });
|
|
295
|
+
else await file.chmod(0o600);
|
|
296
|
+
// A marker ends the file for every process, not only the one that wrote it.
|
|
297
|
+
if (current.size > 0) {
|
|
298
|
+
const length = Math.min(current.size, TRUNCATION_RESERVE_BYTES);
|
|
299
|
+
const tail = Buffer.alloc(length);
|
|
300
|
+
await file.read(tail, 0, length, current.size - length);
|
|
301
|
+
if (tail.toString("utf8").includes(TRUNCATION_EVENT)) return "full";
|
|
302
|
+
}
|
|
303
|
+
if (current.size >= SSH_CAPTURE_FILE_MAX_BYTES - TRUNCATION_RESERVE_BYTES) {
|
|
304
|
+
// Reached without a marker (lines that filled it exactly): end it with the one marker that fits.
|
|
305
|
+
if (current.size + Buffer.byteLength(truncatedLine) <= SSH_CAPTURE_FILE_MAX_BYTES) await file.write(truncatedLine);
|
|
306
|
+
return "full";
|
|
307
|
+
}
|
|
308
|
+
let size = current.size;
|
|
309
|
+
let data = "";
|
|
310
|
+
let full = false;
|
|
311
|
+
for (const line of lines) {
|
|
312
|
+
const bytes = Buffer.byteLength(line);
|
|
313
|
+
if (size + bytes > SSH_CAPTURE_FILE_MAX_BYTES - TRUNCATION_RESERVE_BYTES) { full = true; break; }
|
|
314
|
+
data += line;
|
|
315
|
+
size += bytes;
|
|
316
|
+
}
|
|
317
|
+
if (full) data += truncatedLine;
|
|
318
|
+
if (data) await file.write(data);
|
|
319
|
+
if (windows) {
|
|
320
|
+
const written = await file.stat({ bigint: true });
|
|
321
|
+
const named = await lstat(path, { bigint: true });
|
|
322
|
+
if (!named.isSymbolicLink() && named.dev === written.dev && named.ino === written.ino) {
|
|
323
|
+
await file.close();
|
|
324
|
+
file = undefined;
|
|
325
|
+
reattributeHardenedSecretPath(path);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
return full ? "full" : "written";
|
|
329
|
+
} finally {
|
|
330
|
+
await file?.close();
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
export interface SshCaptureOpenerOptions {
|
|
335
|
+
linkDirectory: string;
|
|
336
|
+
now?: () => number;
|
|
337
|
+
setTimer?: (callback: () => void, ms: number) => ReturnType<typeof setTimeout>;
|
|
338
|
+
clearTimer?: (timer: ReturnType<typeof setTimeout>) => void;
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
export interface SshCaptureOpenerWithFlush extends SshCaptureOpener {
|
|
342
|
+
/** Wait for queued records; tests and shutdown only. */
|
|
343
|
+
flush(): Promise<void>;
|
|
344
|
+
/** Apply retention now and arm deletion for the earliest remaining file; runs at process start. */
|
|
345
|
+
retain(): void;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
/**
|
|
349
|
+
* The per-directory opener the Home supervisor and the Child tunnel call at each spawn. With no
|
|
350
|
+
* capture directory it costs one lstat and returns null; nothing else runs and nothing is written.
|
|
351
|
+
*/
|
|
352
|
+
export function createSshCaptureOpener(options: SshCaptureOpenerOptions): SshCaptureOpenerWithFlush {
|
|
353
|
+
const dir = sshCaptureDir(options.linkDirectory);
|
|
354
|
+
const now = options.now ?? Date.now;
|
|
355
|
+
const setTimer = options.setTimer ?? ((callback, ms) => setTimeout(callback, ms));
|
|
356
|
+
const clearTimer = options.clearTimer ?? (timer => clearTimeout(timer));
|
|
357
|
+
const queue: Array<{ startedAt: number; record: CaptureRecord }> = [];
|
|
358
|
+
const fullSessions = new Set<number>();
|
|
359
|
+
let dropped = 0;
|
|
360
|
+
let flight: Promise<void> | undefined;
|
|
361
|
+
let lastPrune = Number.NEGATIVE_INFINITY;
|
|
362
|
+
let retentionTimer: ReturnType<typeof setTimeout> | undefined;
|
|
363
|
+
|
|
364
|
+
// Retention must not depend on the process that wrote a file staying alive: every prune, in any
|
|
365
|
+
// process, re-arms one unref'd timer for the earliest remaining file's expiry (#7297).
|
|
366
|
+
const prune = (): void => {
|
|
367
|
+
let earliest = Number.POSITIVE_INFINITY;
|
|
368
|
+
try {
|
|
369
|
+
pruneSshCapture(dir, now());
|
|
370
|
+
for (const file of listCaptureFiles(dir)) earliest = Math.min(earliest, file.mtimeMs);
|
|
371
|
+
} catch { /* Retention runs again at the next spawn, command or process start. */ }
|
|
372
|
+
if (retentionTimer !== undefined) { clearTimer(retentionTimer); retentionTimer = undefined; }
|
|
373
|
+
if (!Number.isFinite(earliest)) return;
|
|
374
|
+
const delay = Math.max(0, Math.ceil(earliest + SSH_CAPTURE_RETENTION_MS - now())) + 1_000;
|
|
375
|
+
retentionTimer = setTimer(() => { retentionTimer = undefined; prune(); }, Math.min(delay, SSH_CAPTURE_RETENTION_MS + 1_000));
|
|
376
|
+
(retentionTimer as { unref?: () => void } | undefined)?.unref?.();
|
|
377
|
+
};
|
|
378
|
+
const armRetention = prune;
|
|
379
|
+
|
|
380
|
+
const drain = async (): Promise<void> => {
|
|
381
|
+
while (queue.length) {
|
|
382
|
+
const batch = queue.splice(0, queue.length);
|
|
383
|
+
const overflow = dropped;
|
|
384
|
+
dropped = 0;
|
|
385
|
+
const sessions = new Map<number, CaptureRecord[]>();
|
|
386
|
+
for (const item of batch) sessions.set(item.startedAt, [...(sessions.get(item.startedAt) ?? []), item.record]);
|
|
387
|
+
for (const [startedAt, records] of sessions) {
|
|
388
|
+
try {
|
|
389
|
+
// A stop or an expiry since the line was queued stores nothing more for that window.
|
|
390
|
+
const control = readSshCaptureControl(dir, now());
|
|
391
|
+
if (!control || control.startedAt !== startedAt || fullSessions.has(startedAt)) continue;
|
|
392
|
+
if (overflow) records.push({ at: now(), tunnel: records[0]!.tunnel, event: "queue_overflow", dropped: overflow });
|
|
393
|
+
const result = await appendCapture(dir, captureFileName(startedAt), records.map(record => JSON.stringify(record) + "\n"),
|
|
394
|
+
JSON.stringify({ at: now(), event: "capture_truncated" }) + "\n");
|
|
395
|
+
if (result === "full") fullSessions.add(startedAt);
|
|
396
|
+
if (result !== "refused") armRetention();
|
|
397
|
+
} catch { /* Best effort: capture never changes a tunnel. */ }
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
};
|
|
401
|
+
const startWriter = (): void => {
|
|
402
|
+
if (flight) return;
|
|
403
|
+
flight = drain().finally(() => {
|
|
404
|
+
flight = undefined;
|
|
405
|
+
if (queue.length) startWriter();
|
|
406
|
+
});
|
|
407
|
+
};
|
|
408
|
+
|
|
409
|
+
const push = (control: SshCaptureControl, tunnel: SshCaptureTunnel, linkId: string, line: SanitizedSshLine): void => {
|
|
410
|
+
const at = now();
|
|
411
|
+
if (at >= control.expiresAt || fullSessions.has(control.startedAt)) return;
|
|
412
|
+
const last = queue.at(-1);
|
|
413
|
+
const id = LINK_ID_PATTERN.test(linkId) ? linkId : undefined;
|
|
414
|
+
if (line.event === "unrecognized" && last && last.startedAt === control.startedAt && last.record.event === "unrecognized"
|
|
415
|
+
&& last.record.tunnel === tunnel && last.record.linkId === id) {
|
|
416
|
+
last.record.count = (last.record.count ?? 1) + 1;
|
|
417
|
+
return;
|
|
418
|
+
}
|
|
419
|
+
if (queue.length >= QUEUE_MAX) {
|
|
420
|
+
// A flood of debug lines must not push out the line that explains a failure: an error-level
|
|
421
|
+
// line takes the place of the oldest queued debug or verbose record, counted as dropped.
|
|
422
|
+
const evict = line.level === "error" ? queue.findIndex(item => item.record.level !== "error") : -1;
|
|
423
|
+
dropped += 1;
|
|
424
|
+
if (evict === -1) return;
|
|
425
|
+
queue.splice(evict, 1);
|
|
426
|
+
}
|
|
427
|
+
const record: CaptureRecord = { at, tunnel, ...(id ? { linkId: id } : {}), level: line.level, event: line.event,
|
|
428
|
+
...(line.text !== undefined ? { text: line.text } : {}) };
|
|
429
|
+
queue.push({ startedAt: control.startedAt, record });
|
|
430
|
+
startWriter();
|
|
431
|
+
};
|
|
432
|
+
|
|
433
|
+
const opener = ((tunnel: SshCaptureTunnel, linkId: string): SshCaptureSpawn | null => {
|
|
434
|
+
const directory = lstatOrNull(dir);
|
|
435
|
+
if (!directory) return null;
|
|
436
|
+
const at = now();
|
|
437
|
+
if (at - lastPrune >= PRUNE_INTERVAL_MS || at < lastPrune) { lastPrune = at; prune(); }
|
|
438
|
+
const control = readSshCaptureControl(dir, at);
|
|
439
|
+
if (!control) return null;
|
|
440
|
+
// The window this spawn started in; an extension by a later `start` keeps the same startedAt and
|
|
441
|
+
// moves expiresAt, so once the cached expiry passes it is re-read (at most once a second).
|
|
442
|
+
let current = control;
|
|
443
|
+
let lastRefresh = Number.NEGATIVE_INFINITY;
|
|
444
|
+
const refresh = (): void => {
|
|
445
|
+
const at = now();
|
|
446
|
+
if (at < current.expiresAt || (at - lastRefresh < 1_000 && at >= lastRefresh)) return;
|
|
447
|
+
lastRefresh = at;
|
|
448
|
+
const fresh = readSshCaptureControl(dir, at);
|
|
449
|
+
if (fresh && fresh.startedAt === current.startedAt) current = fresh;
|
|
450
|
+
};
|
|
451
|
+
return {
|
|
452
|
+
logLevel: SSH_CAPTURE_LOG_LEVEL,
|
|
453
|
+
stderrLine(line: string): boolean {
|
|
454
|
+
const sanitized = sanitizeSshLine(line);
|
|
455
|
+
try { refresh(); push(current, tunnel, linkId, sanitized); } catch { /* Storage never changes classification. */ }
|
|
456
|
+
return sanitized.classify;
|
|
457
|
+
},
|
|
458
|
+
};
|
|
459
|
+
}) as SshCaptureOpenerWithFlush;
|
|
460
|
+
opener.flush = async () => { while (flight) await flight; };
|
|
461
|
+
opener.retain = () => {
|
|
462
|
+
if (!lstatOrNull(dir)) return;
|
|
463
|
+
lastPrune = now();
|
|
464
|
+
prune();
|
|
465
|
+
};
|
|
466
|
+
return opener;
|
|
467
|
+
}
|
|
468
|
+
|
|
469
|
+
const defaultOpeners = new Map<string, SshCaptureOpenerWithFlush>();
|
|
470
|
+
|
|
471
|
+
/** One opener (and one writer queue) per link directory for the life of the process. */
|
|
472
|
+
export function defaultSshCaptureOpener(linkDirectory: string): SshCaptureOpener {
|
|
473
|
+
return defaultOpenerFor(linkDirectory);
|
|
474
|
+
}
|
|
475
|
+
|
|
476
|
+
function defaultOpenerFor(linkDirectory: string): SshCaptureOpenerWithFlush {
|
|
477
|
+
let opener = defaultOpeners.get(linkDirectory);
|
|
478
|
+
if (!opener) {
|
|
479
|
+
opener = createSshCaptureOpener({ linkDirectory });
|
|
480
|
+
defaultOpeners.set(linkDirectory, opener);
|
|
481
|
+
}
|
|
482
|
+
return opener;
|
|
483
|
+
}
|
|
484
|
+
|
|
485
|
+
/**
|
|
486
|
+
* Apply retention at process start, before any tunnel spawns, so files a previous process wrote are
|
|
487
|
+
* deleted on time even when this process never spawns a tunnel or writes a capture.
|
|
488
|
+
*/
|
|
489
|
+
export function retainSshCapture(linkDirectory: string): void {
|
|
490
|
+
try { defaultOpenerFor(linkDirectory).retain(); } catch { /* Capture never blocks startup. */ }
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
/** Open capture for one spawn. Any failure means "off": capture can never stop a tunnel from starting. */
|
|
494
|
+
export function openSshCapture(opener: SshCaptureOpener, tunnel: SshCaptureTunnel, linkId: string): SshCaptureSpawn | null {
|
|
495
|
+
try { return opener(tunnel, linkId); } catch { return null; }
|
|
496
|
+
}
|
|
497
|
+
|