@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
|
@@ -0,0 +1,408 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The enrollment and revoke journal behind ocx link add|revoke --operation-id (structure/remote-link.md,
|
|
3
|
+
* "Operation journal"). One entry per operation id: the identities its effects will create, reserved before any
|
|
4
|
+
* effect; an intent and a completion mark around each effect; and an outcome. A repeat with the same id and
|
|
5
|
+
* parameter digest reads it back instead of acting again.
|
|
6
|
+
*
|
|
7
|
+
* <configDir>/link/operations.json is a trust boundary like links.json: an unknown field is an error, a damaged
|
|
8
|
+
* file is an error and never an empty journal, and every write replaces the file atomically (0600). It holds no
|
|
9
|
+
* secret: key ids, link ids, ports and the public explicit route only. links.json is unchanged by it.
|
|
10
|
+
*/
|
|
11
|
+
import { createHash } from "node:crypto";
|
|
12
|
+
import { chmodSync, existsSync, mkdirSync, readFileSync } from "node:fs";
|
|
13
|
+
import { dirname, join } from "node:path";
|
|
14
|
+
import { atomicWriteFile, isMissingPathError } from "../config/atomic-write";
|
|
15
|
+
import { withConfigMutationLockSync } from "../config/mutation-lock";
|
|
16
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
17
|
+
import { hardenSecretDir } from "../lib/windows-secret-acl";
|
|
18
|
+
import { parseExplicitRoute, type ExplicitRoute } from "./explicit-route";
|
|
19
|
+
import { isLinkPort } from "./ports";
|
|
20
|
+
import { linkDir } from "./paths";
|
|
21
|
+
import { ALIAS_LOCK_WAIT_MS } from "./alias-lock";
|
|
22
|
+
import { isSshAlias } from "./ssh-argv";
|
|
23
|
+
|
|
24
|
+
export type OperationKind = "enroll" | "revoke";
|
|
25
|
+
export type OperationState = "open" | "committed" | "failed_clean" | "residual" | "unknown";
|
|
26
|
+
export type EnrollEffect = "plant" | "key_issued" | "link_recorded" | "child_enrolled" | "relay_verified";
|
|
27
|
+
export type RevokeEffect = "remote_cleanup" | "key_revoked" | "record_removed";
|
|
28
|
+
export type OperationEffect = EnrollEffect | RevokeEffect;
|
|
29
|
+
|
|
30
|
+
export interface EffectMark { effect: OperationEffect; phase: "intent" | "done"; at: string }
|
|
31
|
+
|
|
32
|
+
export interface EnrollReservation {
|
|
33
|
+
linkId: string;
|
|
34
|
+
apiKeyId: string;
|
|
35
|
+
/** Chosen by the Child; recorded before the first Home effect, null until then. */
|
|
36
|
+
tunnelPort: number | null;
|
|
37
|
+
explicitRoute?: ExplicitRoute;
|
|
38
|
+
exclusive?: true;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export interface LinkOperation {
|
|
42
|
+
operationId: string;
|
|
43
|
+
kind: OperationKind;
|
|
44
|
+
alias: string;
|
|
45
|
+
/** sha256 of the operation's canonical parameters; a repeat with another digest is refused. */
|
|
46
|
+
digest: string;
|
|
47
|
+
createdAt: string;
|
|
48
|
+
updatedAt: string;
|
|
49
|
+
state: OperationState;
|
|
50
|
+
/** enroll only. */
|
|
51
|
+
reserved?: EnrollReservation;
|
|
52
|
+
/** revoke only: the link it removes. */
|
|
53
|
+
linkId?: string;
|
|
54
|
+
effects: EffectMark[];
|
|
55
|
+
/** The fixed code and status the operation ended with, when it did not commit. Never remote text. */
|
|
56
|
+
error?: { code: string; status: number };
|
|
57
|
+
/** revoke --purge: the Child reported purged:true for this link id over the link's pinned route. */
|
|
58
|
+
receipt?: { purged: true; linkId: string };
|
|
59
|
+
/** When the state became terminal. */
|
|
60
|
+
finishedAt?: string;
|
|
61
|
+
/** residual or unknown only: when O5 or a person resolved it. */
|
|
62
|
+
resolvedAt?: string;
|
|
63
|
+
/** enroll only: the Child may still hold an enrollment or a plant, whatever the outcome says about the Home's key. */
|
|
64
|
+
childResidual?: true;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
export interface OperationsJournal { version: 1; operations: LinkOperation[] }
|
|
68
|
+
|
|
69
|
+
export class OperationsJournalError extends Error {
|
|
70
|
+
constructor(message: string) {
|
|
71
|
+
super(message);
|
|
72
|
+
this.name = "OperationsJournalError";
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/** Committed and failed_clean entries, and resolved residual or unknown ones, stay this long. */
|
|
77
|
+
export const OPERATION_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
|
|
78
|
+
/**
|
|
79
|
+
* At most this many unsettled entries: open ones and residual or unknown ones nobody resolved yet. Only these need a
|
|
80
|
+
* person (or O5) and only these refuse a new operation once the bound is reached; marks on existing entries are always
|
|
81
|
+
* written. A provisioning hub caps disposable machines at 10 by default, each with a handful of operations, so 256 is far
|
|
82
|
+
* past what a working fleet leaves unsettled.
|
|
83
|
+
*/
|
|
84
|
+
export const OPERATION_JOURNAL_MAX_UNSETTLED = 256;
|
|
85
|
+
/**
|
|
86
|
+
* Settled entries (committed, failed_clean, and resolved residual or unknown ones) past this many are pruned before their
|
|
87
|
+
* 30 days, oldest first (by when they finished or were resolved), but only once they are past OPERATION_PRUNE_FLOOR_MS:
|
|
88
|
+
* a repeat with the same operation id and the same parameters (another set answers operation_mismatch) that reaches the
|
|
89
|
+
* journal within 2 hours of the answer gets the recorded outcome
|
|
90
|
+
* (status, code and outcome), whatever else ran meanwhile, except that a revoke whose own removal was interrupted (its
|
|
91
|
+
* retirement receipt is outstanding) resumes it first and answers that attempt; the alias lock busy past its wait changes
|
|
92
|
+
* nothing and is retried, and after an unreadable journal or a 5xx the caller repeats with the same id (neither proves
|
|
93
|
+
* that nothing changed: a replay after a resumed removal can meet them once that removal finished). Later the id may be treated as a new operation: an
|
|
94
|
+
* enrollment whose link is there meets link_exists and a revoke whose link is gone link_not_found, but an enrollment
|
|
95
|
+
* whose link was removed meanwhile enrolls the machine again. Unsettled entries are never pruned and the 30-day
|
|
96
|
+
* retention does not depend on this.
|
|
97
|
+
*/
|
|
98
|
+
export const OPERATION_JOURNAL_MAX_SETTLED = 256;
|
|
99
|
+
/** The replay guarantee, however many operations follow an entry: 2 hours, far past any caller's retry of a lost answer. */
|
|
100
|
+
export const OPERATION_REPLAY_MIN_MS = 2 * 60 * 60 * 1000;
|
|
101
|
+
/**
|
|
102
|
+
* The age before which a settled entry is never pruned early: the 2-hour replay window, plus the longest alias-lock wait
|
|
103
|
+
* and a minute, so a retry that started within the window and then waited on the lock still finds its entry.
|
|
104
|
+
*/
|
|
105
|
+
export const OPERATION_PRUNE_FLOOR_MS = OPERATION_REPLAY_MIN_MS + ALIAS_LOCK_WAIT_MS + 60_000;
|
|
106
|
+
/**
|
|
107
|
+
* At this many entries settled within OPERATION_PRUNE_FLOOR_MS (2 hours and three minutes) a new operation is refused
|
|
108
|
+
* until the oldest is older. That is a throughput limit as much as a runaway guard: a burst of 1024, and about 500
|
|
109
|
+
* journalled operations per hour sustained (1024 / 2.05 h). Churn, not machine count, decides whether it is reached: ten
|
|
110
|
+
* disposable machines that each live ten minutes make about 120 add and revoke operations per hour, about 246 inside the
|
|
111
|
+
* window, a quarter of the bound. A runaway loop that retries with a fresh id after each failure is held for at most that
|
|
112
|
+
* window instead of locking the Home out for 30 days. With the three bounds the file holds about 256 unsettled plus
|
|
113
|
+
* 256 older settled entries (about 0.5 MiB at roughly 1 KiB each), and at most about 1.5 MiB at the limit, plus the
|
|
114
|
+
* entries an outstanding retirement receipt pins (at most two per readable receipt, every revoke entry of a link whose
|
|
115
|
+
* receipt cannot be read; receipts have no cap of their own), so every
|
|
116
|
+
* whole-file rewrite under the config mutation lock stays small while receipts are settled.
|
|
117
|
+
*/
|
|
118
|
+
export const OPERATION_JOURNAL_MAX_RECENT_SETTLED = 1024;
|
|
119
|
+
const OPERATION_ID = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/;
|
|
120
|
+
const LINK_ID = /^lnk_[0-9a-f]{16}$/;
|
|
121
|
+
const API_KEY_ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,255}$/;
|
|
122
|
+
const DIGEST = /^[0-9a-f]{64}$/;
|
|
123
|
+
const CODE = /^[a-z][a-z0-9_]{0,63}$/;
|
|
124
|
+
const STATES: readonly OperationState[] = ["open", "committed", "failed_clean", "residual", "unknown"];
|
|
125
|
+
const EFFECTS: Readonly<Record<OperationKind, readonly OperationEffect[]>> = {
|
|
126
|
+
enroll: ["plant", "key_issued", "link_recorded", "child_enrolled", "relay_verified"],
|
|
127
|
+
revoke: ["remote_cleanup", "key_revoked", "record_removed"],
|
|
128
|
+
};
|
|
129
|
+
const ENTRY_KEYS = new Set(["operationId", "kind", "alias", "digest", "createdAt", "updatedAt", "state", "reserved", "linkId", "effects", "error", "receipt", "finishedAt", "resolvedAt", "childResidual"]);
|
|
130
|
+
const RESERVED_KEYS = new Set(["linkId", "apiKeyId", "tunnelPort", "explicitRoute", "exclusive"]);
|
|
131
|
+
|
|
132
|
+
export function isOperationId(value: unknown): value is string {
|
|
133
|
+
return typeof value === "string" && OPERATION_ID.test(value);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
export function operationsJournalPath(configDir?: string): string {
|
|
137
|
+
return join(linkDir(configDir), "operations.json");
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** A stable digest of an operation's parameters: keys sorted at every level, undefined dropped. */
|
|
141
|
+
export function operationDigest(params: Record<string, unknown>): string {
|
|
142
|
+
const canonical = (value: unknown): unknown => {
|
|
143
|
+
if (Array.isArray(value)) return value.map(canonical);
|
|
144
|
+
if (value && typeof value === "object") {
|
|
145
|
+
return Object.fromEntries(Object.keys(value).sort().filter(key => (value as Record<string, unknown>)[key] !== undefined)
|
|
146
|
+
.map(key => [key, canonical((value as Record<string, unknown>)[key])]));
|
|
147
|
+
}
|
|
148
|
+
return value;
|
|
149
|
+
};
|
|
150
|
+
return createHash("sha256").update(JSON.stringify(canonical(params))).digest("hex");
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
export function hasEffect(operation: LinkOperation, effect: OperationEffect, phase: "intent" | "done"): boolean {
|
|
154
|
+
return operation.effects.some(mark => mark.effect === effect && mark.phase === phase);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
const isTime = (value: unknown): value is string => typeof value === "string" && !Number.isNaN(Date.parse(value));
|
|
158
|
+
|
|
159
|
+
function parseEntry(value: unknown, index: number): LinkOperation {
|
|
160
|
+
const fail = (field: string): never => { throw new OperationsJournalError("operations[" + index + "]." + field + " is invalid"); };
|
|
161
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) throw new OperationsJournalError("operations[" + index + "] is not an object");
|
|
162
|
+
const raw = value as Record<string, unknown>;
|
|
163
|
+
for (const key of Object.keys(raw)) if (!ENTRY_KEYS.has(key)) throw new OperationsJournalError("operations[" + index + "] has an unknown field " + JSON.stringify(key));
|
|
164
|
+
if (!isOperationId(raw.operationId)) fail("operationId");
|
|
165
|
+
if (raw.kind !== "enroll" && raw.kind !== "revoke") fail("kind");
|
|
166
|
+
const kind = raw.kind as OperationKind;
|
|
167
|
+
if (typeof raw.alias !== "string" || !isSshAlias(raw.alias)) fail("alias");
|
|
168
|
+
if (typeof raw.digest !== "string" || !DIGEST.test(raw.digest)) fail("digest");
|
|
169
|
+
if (!isTime(raw.createdAt)) fail("createdAt");
|
|
170
|
+
if (!isTime(raw.updatedAt)) fail("updatedAt");
|
|
171
|
+
if (!STATES.includes(raw.state as OperationState)) fail("state");
|
|
172
|
+
const state = raw.state as OperationState;
|
|
173
|
+
let reserved: EnrollReservation | undefined;
|
|
174
|
+
if (kind === "enroll") {
|
|
175
|
+
const r = raw.reserved;
|
|
176
|
+
if (!r || typeof r !== "object" || Array.isArray(r)) fail("reserved");
|
|
177
|
+
const res = r as Record<string, unknown>;
|
|
178
|
+
for (const key of Object.keys(res)) if (!RESERVED_KEYS.has(key)) fail("reserved");
|
|
179
|
+
if (typeof res.linkId !== "string" || !LINK_ID.test(res.linkId)) fail("reserved.linkId");
|
|
180
|
+
if (typeof res.apiKeyId !== "string" || !API_KEY_ID.test(res.apiKeyId)) fail("reserved.apiKeyId");
|
|
181
|
+
if (res.tunnelPort !== null && !isLinkPort(res.tunnelPort)) fail("reserved.tunnelPort");
|
|
182
|
+
if (res.exclusive !== undefined && res.exclusive !== true) fail("reserved.exclusive");
|
|
183
|
+
const route = res.explicitRoute === undefined ? undefined : parseExplicitRoute(res.explicitRoute);
|
|
184
|
+
if (route === null || (route && res.exclusive !== true)) fail("reserved.explicitRoute");
|
|
185
|
+
reserved = { linkId: res.linkId as string, apiKeyId: res.apiKeyId as string, tunnelPort: res.tunnelPort as number | null,
|
|
186
|
+
...(route ? { explicitRoute: route } : {}), ...(res.exclusive === true ? { exclusive: true as const } : {}) };
|
|
187
|
+
if (raw.linkId !== undefined || raw.receipt !== undefined) fail("linkId");
|
|
188
|
+
} else {
|
|
189
|
+
if (raw.reserved !== undefined) fail("reserved");
|
|
190
|
+
if (typeof raw.linkId !== "string" || !LINK_ID.test(raw.linkId)) fail("linkId");
|
|
191
|
+
}
|
|
192
|
+
if (!Array.isArray(raw.effects)) fail("effects");
|
|
193
|
+
const effects = (raw.effects as unknown[]).map((mark, at): EffectMark => {
|
|
194
|
+
if (!mark || typeof mark !== "object" || Array.isArray(mark)) fail("effects[" + at + "]");
|
|
195
|
+
const m = mark as Record<string, unknown>;
|
|
196
|
+
if (Object.keys(m).sort().join(",") !== "at,effect,phase" || !EFFECTS[kind].includes(m.effect as OperationEffect)
|
|
197
|
+
|| (m.phase !== "intent" && m.phase !== "done") || !isTime(m.at)) fail("effects[" + at + "]");
|
|
198
|
+
return { effect: m.effect as OperationEffect, phase: m.phase as "intent" | "done", at: m.at as string };
|
|
199
|
+
});
|
|
200
|
+
let error: LinkOperation["error"];
|
|
201
|
+
if (raw.error !== undefined) {
|
|
202
|
+
const e = raw.error as Record<string, unknown> | null;
|
|
203
|
+
if (!e || typeof e !== "object" || Object.keys(e).sort().join(",") !== "code,status" || typeof e.code !== "string" || !CODE.test(e.code)
|
|
204
|
+
|| typeof e.status !== "number" || !Number.isInteger(e.status) || e.status < 400 || e.status > 599) fail("error");
|
|
205
|
+
error = { code: e!.code as string, status: e!.status as number };
|
|
206
|
+
}
|
|
207
|
+
let receipt: LinkOperation["receipt"];
|
|
208
|
+
if (raw.receipt !== undefined) {
|
|
209
|
+
const p = raw.receipt as Record<string, unknown> | null;
|
|
210
|
+
if (!p || typeof p !== "object" || Object.keys(p).sort().join(",") !== "linkId,purged" || p.purged !== true || p.linkId !== raw.linkId) fail("receipt");
|
|
211
|
+
receipt = { purged: true, linkId: p!.linkId as string };
|
|
212
|
+
}
|
|
213
|
+
if (raw.finishedAt !== undefined && !isTime(raw.finishedAt)) fail("finishedAt");
|
|
214
|
+
if ((state === "open") !== (raw.finishedAt === undefined)) fail("finishedAt");
|
|
215
|
+
if (raw.resolvedAt !== undefined && (!isTime(raw.resolvedAt) || (state !== "residual" && state !== "unknown"))) fail("resolvedAt");
|
|
216
|
+
if (raw.childResidual !== undefined && (raw.childResidual !== true || kind !== "enroll")) fail("childResidual");
|
|
217
|
+
return {
|
|
218
|
+
operationId: raw.operationId as string, kind, alias: raw.alias as string, digest: raw.digest as string,
|
|
219
|
+
createdAt: raw.createdAt as string, updatedAt: raw.updatedAt as string, state,
|
|
220
|
+
...(reserved ? { reserved } : {}), ...(kind === "revoke" ? { linkId: raw.linkId as string } : {}),
|
|
221
|
+
effects, ...(error ? { error } : {}), ...(receipt ? { receipt } : {}),
|
|
222
|
+
...(raw.finishedAt !== undefined ? { finishedAt: raw.finishedAt as string } : {}),
|
|
223
|
+
...(raw.resolvedAt !== undefined ? { resolvedAt: raw.resolvedAt as string } : {}),
|
|
224
|
+
...(raw.childResidual === true ? { childResidual: true as const } : {}),
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
export function parseOperationsJournal(text: string): OperationsJournal {
|
|
229
|
+
let raw: unknown;
|
|
230
|
+
try { raw = JSON.parse(text); } catch { throw new OperationsJournalError("operations.json is not valid JSON"); }
|
|
231
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new OperationsJournalError("operations.json is not an object");
|
|
232
|
+
const body = raw as Record<string, unknown>;
|
|
233
|
+
if (Object.keys(body).sort().join(",") !== "operations,version" || body.version !== 1 || !Array.isArray(body.operations)) {
|
|
234
|
+
throw new OperationsJournalError("operations.json has an unsupported shape");
|
|
235
|
+
}
|
|
236
|
+
const operations = body.operations.map(parseEntry);
|
|
237
|
+
if (new Set(operations.map(op => op.operationId)).size !== operations.length) throw new OperationsJournalError("operations.json has duplicate operation ids");
|
|
238
|
+
return { version: 1, operations };
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
/** A missing file is an empty journal; a damaged one is an error. */
|
|
242
|
+
export function readOperationsJournal(path: string = operationsJournalPath()): OperationsJournal {
|
|
243
|
+
let text: string;
|
|
244
|
+
try { text = readFileSync(path, "utf8"); } catch (error) {
|
|
245
|
+
if (isMissingPathError(error)) return { version: 1, operations: [] };
|
|
246
|
+
throw error;
|
|
247
|
+
}
|
|
248
|
+
return parseOperationsJournal(text);
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
export function writeOperationsJournal(path: string, journal: OperationsJournal): void {
|
|
252
|
+
const normalized = parseOperationsJournal(JSON.stringify(journal));
|
|
253
|
+
const dir = dirname(path);
|
|
254
|
+
assertNotRealHomeUnderTest(dirname(dir));
|
|
255
|
+
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
256
|
+
if (process.platform === "win32") hardenSecretDir(dir, { required: true });
|
|
257
|
+
else chmodSync(dir, 0o700);
|
|
258
|
+
atomicWriteFile(path, JSON.stringify(normalized, null, 2) + "\n");
|
|
259
|
+
if (process.platform !== "win32") chmodSync(path, 0o600);
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
/**
|
|
263
|
+
* Drop what has outlived retention: a committed or failed_clean entry 30 days after it finished, a residual or
|
|
264
|
+
* unknown one only 30 days after it was resolved. An open entry, and an unresolved residual or unknown one, stays.
|
|
265
|
+
* Past OPERATION_JOURNAL_MAX_SETTLED settled entries, the oldest settled ones older than OPERATION_PRUNE_FLOOR_MS go too.
|
|
266
|
+
*/
|
|
267
|
+
export function pruneOperations(journal: OperationsJournal, nowMs: number, keep?: (op: LinkOperation) => boolean): OperationsJournal {
|
|
268
|
+
const expired = (at: string | undefined) => at !== undefined && nowMs - Date.parse(at) > OPERATION_RETENTION_MS;
|
|
269
|
+
const retained = journal.operations.filter(op => {
|
|
270
|
+
// A caller-pinned entry stays past retention: a revoke that still owns a retirement receipt (#8416).
|
|
271
|
+
if (keep?.(op)) return true;
|
|
272
|
+
if (op.state === "committed" || op.state === "failed_clean") return !expired(op.finishedAt);
|
|
273
|
+
if (op.state === "residual" || op.state === "unknown") return !expired(op.resolvedAt);
|
|
274
|
+
return true;
|
|
275
|
+
});
|
|
276
|
+
const settled = retained.filter(isSettled);
|
|
277
|
+
if (settled.length <= OPERATION_JOURNAL_MAX_SETTLED) return { version: 1, operations: retained };
|
|
278
|
+
// A stable sort: entries settled at the same moment go in journal order.
|
|
279
|
+
const candidates = settled.map((op, index) => ({ op, index })).filter(item => !keep?.(item.op) && nowMs - settledAt(item.op) > OPERATION_PRUNE_FLOOR_MS)
|
|
280
|
+
.sort((a, b) => settledAt(a.op) - settledAt(b.op) || a.index - b.index);
|
|
281
|
+
const dropped = new Set(candidates.slice(0, settled.length - OPERATION_JOURNAL_MAX_SETTLED).map(item => item.op));
|
|
282
|
+
return { version: 1, operations: retained.filter(op => !dropped.has(op)) };
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
function settledAt(op: LinkOperation): number {
|
|
286
|
+
return Date.parse(op.resolvedAt ?? op.finishedAt ?? op.updatedAt);
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
/** Committed, failed_clean, or residual or unknown and resolved: nothing about it waits on anyone. */
|
|
290
|
+
function isSettled(op: LinkOperation): boolean {
|
|
291
|
+
return op.state === "committed" || op.state === "failed_clean" || ((op.state === "residual" || op.state === "unknown") && op.resolvedAt !== undefined);
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
/**
|
|
295
|
+
* Read, change and write the journal in one section of the config mutation lock, pruning on the way. Writes only
|
|
296
|
+
* when the change or the prune altered the journal: a read that finds nothing to do (an unknown id, a state that
|
|
297
|
+
* cannot be resolved) never rewrites the file, and never creates it, because its mere existence makes every plain
|
|
298
|
+
* apply and revoke take the alias lock (journalInUse). keep pins entries against pruning.
|
|
299
|
+
*/
|
|
300
|
+
export function updateOperationsJournal<T>(path: string, nowMs: number, change: (journal: OperationsJournal) => T, keep?: (op: LinkOperation) => boolean): T {
|
|
301
|
+
return withConfigMutationLockSync(() => {
|
|
302
|
+
const journal = readOperationsJournal(path);
|
|
303
|
+
const before = JSON.stringify(journal);
|
|
304
|
+
const result = change(journal);
|
|
305
|
+
const next = pruneOperations(journal, nowMs, keep);
|
|
306
|
+
if (JSON.stringify(next) !== before) writeOperationsJournal(path, next);
|
|
307
|
+
return result;
|
|
308
|
+
});
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
export class OperationsJournalFullError extends Error {
|
|
312
|
+
/** unsettled: too many open or unresolved entries; recent: too many settled within OPERATION_PRUNE_FLOOR_MS. */
|
|
313
|
+
constructor(readonly bound: "unsettled" | "recent") {
|
|
314
|
+
super(bound === "unsettled"
|
|
315
|
+
? "operations.json holds " + OPERATION_JOURNAL_MAX_UNSETTLED + " unsettled entries"
|
|
316
|
+
: "operations.json holds " + OPERATION_JOURNAL_MAX_RECENT_SETTLED + " entries settled within 2 hours and three minutes");
|
|
317
|
+
this.name = "OperationsJournalFullError";
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
/** Throws before a new entry is added at OPERATION_JOURNAL_MAX_UNSETTLED unsettled or OPERATION_JOURNAL_MAX_RECENT_SETTLED recently settled entries. */
|
|
322
|
+
export function assertRoomForNewOperation(journal: OperationsJournal, nowMs: number): void {
|
|
323
|
+
const kept = pruneOperations(journal, nowMs).operations;
|
|
324
|
+
if (kept.filter(op => !isSettled(op)).length >= OPERATION_JOURNAL_MAX_UNSETTLED) throw new OperationsJournalFullError("unsettled");
|
|
325
|
+
if (kept.filter(op => isSettled(op) && nowMs - settledAt(op) <= OPERATION_PRUNE_FLOOR_MS).length >= OPERATION_JOURNAL_MAX_RECENT_SETTLED) throw new OperationsJournalFullError("recent");
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
export function findOperation(journal: OperationsJournal, operationId: string): LinkOperation | undefined {
|
|
329
|
+
return journal.operations.find(op => op.operationId === operationId);
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
/** An open enroll entry for this alias, in any case: no other enrollment may create an object for it meanwhile. */
|
|
333
|
+
export function openEnrollmentFor(journal: OperationsJournal, alias: string, except?: string): LinkOperation | undefined {
|
|
334
|
+
const wanted = alias.toLowerCase();
|
|
335
|
+
return journal.operations.find(op => op.kind === "enroll" && op.state === "open" && op.operationId !== except && op.alias.toLowerCase() === wanted);
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
/**
|
|
339
|
+
* Mark a residual or unknown entry resolved: O5 proved the Child clean, or a person accepted the loss. Its 30 days
|
|
340
|
+
* of retention start now. An entry in any other state is not resolvable; a missing one is null.
|
|
341
|
+
*/
|
|
342
|
+
export function resolveLinkOperation(path: string, operationId: string, nowMs: number, keep?: (op: LinkOperation) => boolean): LinkOperation | "not_resolvable" | null {
|
|
343
|
+
return updateOperationsJournal(path, nowMs, journal => {
|
|
344
|
+
const op = findOperation(journal, operationId);
|
|
345
|
+
if (!op) return null;
|
|
346
|
+
if (op.state !== "residual" && op.state !== "unknown") return "not_resolvable";
|
|
347
|
+
if (op.resolvedAt === undefined) {
|
|
348
|
+
op.resolvedAt = new Date(nowMs).toISOString();
|
|
349
|
+
op.updatedAt = op.resolvedAt;
|
|
350
|
+
}
|
|
351
|
+
return structuredClone(op);
|
|
352
|
+
}, keep);
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
/**
|
|
356
|
+
* Revokes running in this process, by journal path and operation id. While one runs, its entry is open and the tunnel
|
|
357
|
+
* decisions are its own: a failed cleanup restarts the tunnel. An open entry no process runs belongs to a revoke that died.
|
|
358
|
+
*/
|
|
359
|
+
const liveRevokes = new Set<string>();
|
|
360
|
+
|
|
361
|
+
export function markRevokeLive(path: string, operationId: string, live: boolean): void {
|
|
362
|
+
if (live) liveRevokes.add(path + "\0" + operationId);
|
|
363
|
+
else liveRevokes.delete(path + "\0" + operationId);
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
/**
|
|
367
|
+
* A revoke that reached the Child's cleanup and has not settled suspends its link's tunnel: the Child may be purged or
|
|
368
|
+
* disconnected, so the supervisor must not reconnect to it on a reload or after a restart. That is an unresolved unknown
|
|
369
|
+
* entry past its `remote_cleanup` intent (a cleanup that provably never ran settles failed_clean instead, and its revoke
|
|
370
|
+
* restarts the tunnel), and an open one no process in this Home runs (it died). Resolving the entry, or a revoke that
|
|
371
|
+
* removes the link, lifts it.
|
|
372
|
+
*/
|
|
373
|
+
export function revokeSuspendsLink(journal: OperationsJournal, linkId: string, isLive: (operationId: string) => boolean): boolean {
|
|
374
|
+
return suspendingRevoke(journal, linkId, isLive) !== undefined;
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
function suspendingRevoke(journal: OperationsJournal, linkId: string, isLive: (operationId: string) => boolean): LinkOperation | undefined {
|
|
378
|
+
return journal.operations.find(op => op.kind === "revoke" && op.linkId === linkId && op.resolvedAt === undefined
|
|
379
|
+
&& hasEffect(op, "remote_cleanup", "intent")
|
|
380
|
+
&& (op.state === "open" ? !isLive(op.operationId) : op.state === "unknown"));
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
/** The revoke that keeps a link down: its id, whether it is open (the process died) or unknown, and since when. */
|
|
384
|
+
export interface LinkSuspension { operationId: string; state: "open" | "unknown"; since: string }
|
|
385
|
+
|
|
386
|
+
/** Like linkSuspendedByRevoke, naming the revoke; null when the link is not suspended or the journal is unreadable. */
|
|
387
|
+
export function revokeSuspendingLink(path: string, linkId: string): LinkSuspension | null {
|
|
388
|
+
return revokeSuspensions(path)(linkId);
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
/** One read of the journal, then a lookup per link: a status snapshot reads the file once. */
|
|
392
|
+
export function revokeSuspensions(path: string): (linkId: string) => LinkSuspension | null {
|
|
393
|
+
if (!existsSync(path)) return () => null;
|
|
394
|
+
let journal: OperationsJournal;
|
|
395
|
+
try { journal = readOperationsJournal(path); } catch { return () => null; }
|
|
396
|
+
return linkId => {
|
|
397
|
+
const op = suspendingRevoke(journal, linkId, id => liveRevokes.has(path + "\0" + id));
|
|
398
|
+
return op ? { operationId: op.operationId, state: op.state === "open" ? "open" : "unknown", since: op.finishedAt ?? op.updatedAt } : null;
|
|
399
|
+
};
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
/**
|
|
403
|
+
* The supervisor's check: one stat on a Home that never journalled. A damaged journal suspends nothing (a tunnel toward
|
|
404
|
+
* a purged Child serves nothing without its key, and stopping every tunnel would be worse); its readers report it.
|
|
405
|
+
*/
|
|
406
|
+
export function linkSuspendedByRevoke(path: string, linkId: string): boolean {
|
|
407
|
+
return revokeSuspendingLink(path, linkId) !== null;
|
|
408
|
+
}
|
package/src/link/peer-report.ts
CHANGED
|
@@ -36,7 +36,7 @@ export function linkPeerReportHeaders(version: string, features: readonly string
|
|
|
36
36
|
return headers;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
function parseFeatureList(value: string | null): string[] | null {
|
|
39
|
+
export function parseFeatureList(value: string | null): string[] | null {
|
|
40
40
|
if (value === null || value === "") return null;
|
|
41
41
|
const ids = value.split(",");
|
|
42
42
|
if (ids.length > MAX_FEATURES || new Set(ids).size !== ids.length || ids.some(id => !FEATURE_ID.test(id))) return null;
|
package/src/link/relay-auth.ts
CHANGED
|
@@ -48,6 +48,20 @@ export function linkConnectionProof(fingerprint: string, keyId: string, linkId:
|
|
|
48
48
|
.update(`opencodex-link-connection-v1\0${keyId}\0${linkId}\0${nonce}\0${generation}`).digest("hex");
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
+
/**
|
|
52
|
+
* Whether this Home accepts the Responses WebSocket over the link, on a verified relay-auth answer.
|
|
53
|
+
* Sent only while the feature is on; a Child applies an answer without it as off. The proof binds
|
|
54
|
+
* the value to the nonce and both identities, as linkConnectionProof does.
|
|
55
|
+
*/
|
|
56
|
+
export const LINK_RELAY_WS_STATE_HEADER = "x-opencodex-link-ws-state";
|
|
57
|
+
export const LINK_RELAY_WS_STATE_PROOF_HEADER = "x-opencodex-link-ws-proof";
|
|
58
|
+
|
|
59
|
+
export function linkWebsocketStateProof(fingerprint: string, keyId: string, linkId: string, nonce: string, value: "on" | "off"): string | null {
|
|
60
|
+
if (!linkRelayProof(fingerprint, "listener", keyId, linkId, nonce)) return null;
|
|
61
|
+
return createHmac("sha256", Buffer.from(fingerprint, "hex"))
|
|
62
|
+
.update(`opencodex-link-ws-v1\0${keyId}\0${linkId}\0${nonce}\0${value}`).digest("hex");
|
|
63
|
+
}
|
|
64
|
+
|
|
51
65
|
/** The direction and both identities are covered; a caller proof is never a listener proof. */
|
|
52
66
|
export function linkRelayProof(
|
|
53
67
|
fingerprint: string, direction: "caller" | "listener", keyId: string, linkId: string, nonce: string,
|