@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
|
@@ -552,6 +552,12 @@ export interface ResetRetryOptions {
|
|
|
552
552
|
* `attempts`, exactly like every other send this leg makes.
|
|
553
553
|
*/
|
|
554
554
|
claimAmbiguousResend?: () => boolean;
|
|
555
|
+
/**
|
|
556
|
+
* Opt-in offline wait (#7958): asked once a send failed before reaching the origin; true means
|
|
557
|
+
* the destination is reachable again and one resend may follow inside `attempts`. See
|
|
558
|
+
* `createOfflineResendWait` in offline-resend.ts, which owns the single-use and pre-connect rules.
|
|
559
|
+
*/
|
|
560
|
+
offlineWait?: (error: unknown, signal?: AbortSignal) => Promise<boolean>;
|
|
555
561
|
}
|
|
556
562
|
|
|
557
563
|
export interface TransientRetryOptions extends ResetRetryOptions {
|
|
@@ -568,7 +574,8 @@ export interface TransientRetryOptions extends ResetRetryOptions {
|
|
|
568
574
|
retryAfterCeilingMs?: number;
|
|
569
575
|
}
|
|
570
576
|
|
|
571
|
-
|
|
577
|
+
/** `offline-resend` is the single send after an offline wait (#7958), never a reset retry. */
|
|
578
|
+
export type UpstreamSendRecovery = "connection-reset" | "transient-5xx" | "offline-resend";
|
|
572
579
|
type ReplayableFetch = (recovery?: UpstreamSendRecovery) => Promise<Response>;
|
|
573
580
|
|
|
574
581
|
/**
|
|
@@ -604,20 +611,25 @@ export class UpstreamRetryEvidenceError extends Error {
|
|
|
604
611
|
}
|
|
605
612
|
|
|
606
613
|
/**
|
|
607
|
-
* Opt out of Bun's keep-alive pool after a connection-reset retry.
|
|
614
|
+
* Opt out of Bun's keep-alive pool after a connection-reset retry or an offline resend.
|
|
608
615
|
*
|
|
609
616
|
* Prefer the Bun fetch extension `keepalive: false` (transport-level) over
|
|
610
617
|
* relying on the hop-by-hop `Connection: close` header alone — Bun has ignored
|
|
611
618
|
* that header in past releases (oven-sh/bun#20492), so a header-only retry can
|
|
612
619
|
* still reuse the same half-closed pooled socket. Still set Connection: close
|
|
613
620
|
* as a belt-and-suspenders signal for intermediaries that honor it.
|
|
621
|
+
*
|
|
622
|
+
* An offline resend (#7958) follows a DNS outage, typically a sleep or a network change, so any
|
|
623
|
+
* socket still pooled for that origin or proxy was opened on the network that went away. Reusing
|
|
624
|
+
* one fails after the body may have left, which turns a provably unsent request into an ambiguous
|
|
625
|
+
* reset; a fresh connection is what the resend needs anyway.
|
|
614
626
|
*/
|
|
615
627
|
export function applyUpstreamRecoveryInit<T extends RequestInit>(
|
|
616
628
|
init: T,
|
|
617
629
|
recovery?: UpstreamSendRecovery,
|
|
618
630
|
): T & { headers: Headers } {
|
|
619
631
|
const headers = new Headers(init.headers);
|
|
620
|
-
if (recovery !== "connection-reset") {
|
|
632
|
+
if (recovery !== "connection-reset" && recovery !== "offline-resend") {
|
|
621
633
|
return { ...init, headers };
|
|
622
634
|
}
|
|
623
635
|
headers.set("connection", "close");
|
|
@@ -664,6 +676,8 @@ export async function fetchWithResetRetry(
|
|
|
664
676
|
// settles as the refusal or an unambiguous answer: a second send of a possibly-executed turn
|
|
665
677
|
// is already out, and handing the client anything it would retry compounds it.
|
|
666
678
|
let spentOperatorReplacement = false;
|
|
679
|
+
// The recovery the next send reports: the caller's for the first, then whichever path resent it.
|
|
680
|
+
let recovery = firstRecovery;
|
|
667
681
|
for (let attempt = 0; attempt < attempts; attempt++) {
|
|
668
682
|
if (opts.abortSignal?.aborted) throw abortError(opts.abortSignal);
|
|
669
683
|
// Reported before the await, one physical send at a time: a send that rejects has still
|
|
@@ -673,7 +687,7 @@ export async function fetchWithResetRetry(
|
|
|
673
687
|
if (!opts.onSendsConsumed?.beforeSend) opts.onSendsConsumed?.(1);
|
|
674
688
|
try {
|
|
675
689
|
let response: Response;
|
|
676
|
-
try { const run = () => doFetch(
|
|
690
|
+
try { const sendRecovery = recovery; const run = () => doFetch(sendRecovery);
|
|
677
691
|
response = await (opts.onSendsConsumed?.execute ? opts.onSendsConsumed.execute(run) : run()); }
|
|
678
692
|
finally { if (opts.onSendsConsumed?.beforeSend) opts.onSendsConsumed(1); }
|
|
679
693
|
return spentOperatorReplacement ? settleOperatorReplacement(response) : response;
|
|
@@ -688,6 +702,13 @@ export async function fetchWithResetRetry(
|
|
|
688
702
|
// evidence: keep it attached so the terminal rejection cannot be
|
|
689
703
|
// downgraded to the pre-connection neutral class (#914 review).
|
|
690
704
|
if (sawReset) throw new UpstreamRetryEvidenceError([], err, true);
|
|
705
|
+
// Nothing reached the origin, so one resend after reachability returns cannot repeat an effect.
|
|
706
|
+
// A client that left during the wait gets this failure back, never the abort reason.
|
|
707
|
+
if (attempt + 1 < attempts && opts.offlineWait && await opts.offlineWait(err, opts.abortSignal)
|
|
708
|
+
&& !opts.abortSignal?.aborted) {
|
|
709
|
+
recovery = "offline-resend";
|
|
710
|
+
continue;
|
|
711
|
+
}
|
|
691
712
|
throw err;
|
|
692
713
|
}
|
|
693
714
|
if (opts.replaySafe === true) {
|
|
@@ -707,6 +728,7 @@ export async function fetchWithResetRetry(
|
|
|
707
728
|
}
|
|
708
729
|
sawReset = true;
|
|
709
730
|
lastError = err;
|
|
731
|
+
recovery = "connection-reset";
|
|
710
732
|
console.warn(
|
|
711
733
|
`[upstream-retry] connection reset${opts.label ? ` (${opts.label})` : ""} — ${
|
|
712
734
|
spentOperatorReplacement ? "replacing" : "retrying"
|
|
@@ -844,6 +866,8 @@ export async function fetchWithTransientRetry(
|
|
|
844
866
|
...opts,
|
|
845
867
|
attempts: remaining(),
|
|
846
868
|
onSendsConsumed: undefined,
|
|
869
|
+
// The offline wait belongs to the request's first send only (see below); later legs never wait.
|
|
870
|
+
offlineWait: undefined,
|
|
847
871
|
});
|
|
848
872
|
// Reported in `finally` rather than at each exit: this function returns from five places
|
|
849
873
|
// and throws from one, and a caller sharing the budget across request legs must be told the
|
|
@@ -851,7 +875,16 @@ export async function fetchWithTransientRetry(
|
|
|
851
875
|
try {
|
|
852
876
|
if (budget === 0) throw new SendBudgetExhaustedError(opts.destination ?? (opts.label ? errorDestinationLabel(opts.label) : undefined));
|
|
853
877
|
let attemptStart = Date.now();
|
|
854
|
-
|
|
878
|
+
// Time spent waiting for the network to return is not part of the resend's own attempt.
|
|
879
|
+
const offlineWait = opts.offlineWait;
|
|
880
|
+
let res = await fetchWithResetRetry(countedFetch, {
|
|
881
|
+
...innerResetOptions(),
|
|
882
|
+
...(offlineWait ? { offlineWait: async (error: unknown, signal?: AbortSignal) => {
|
|
883
|
+
const resumed = await offlineWait(error, signal);
|
|
884
|
+
if (resumed) attemptStart = Date.now();
|
|
885
|
+
return resumed;
|
|
886
|
+
} } : {}),
|
|
887
|
+
});
|
|
855
888
|
for (let attempt = 0; sent < budget; attempt++) {
|
|
856
889
|
// A non-replayable gateway status was settled after the request body had already left
|
|
857
890
|
// for the origin; retrying it here is the automatic resend the marker exists to forbid.
|
|
@@ -913,6 +946,14 @@ export async function fetchWithTransientRetry(
|
|
|
913
946
|
|
|
914
947
|
export type ProtocolSafeRefetch = (signal?: AbortSignal) => Promise<Response>;
|
|
915
948
|
|
|
949
|
+
/** A Responses SSE stream ended after only uncommitted protocol control frames. */
|
|
950
|
+
export class ProtocolPreOutputEof extends Error {
|
|
951
|
+
constructor() {
|
|
952
|
+
super("upstream Responses stream ended before output or a terminal event");
|
|
953
|
+
this.name = "ProtocolPreOutputEof";
|
|
954
|
+
}
|
|
955
|
+
}
|
|
956
|
+
|
|
916
957
|
export interface ProtocolSafeRefetchOptions extends ResetRetryOptions {
|
|
917
958
|
/** The replacement must match the response contract already selected for the client. */
|
|
918
959
|
acceptResponse?: (response: Response) => boolean;
|
|
@@ -927,7 +968,7 @@ export interface ProtocolSafeRefetchOptions extends ResetRetryOptions {
|
|
|
927
968
|
}
|
|
928
969
|
|
|
929
970
|
/**
|
|
930
|
-
* Attempt ONE caller-authorized replacement of a
|
|
971
|
+
* Attempt ONE caller-authorized replacement of a reset or pre-output EOF after the response head.
|
|
931
972
|
*
|
|
932
973
|
* The caller owns the proof that nothing was observed -- it comes from protocol inspection,
|
|
933
974
|
* not from this module -- and owns the physical-send budget. What lives here is the part that
|
|
@@ -940,12 +981,14 @@ export async function refetchAfterProtocolSafeReset(
|
|
|
940
981
|
err: unknown,
|
|
941
982
|
opts: ProtocolSafeRefetchOptions = {},
|
|
942
983
|
): Promise<Response | null> {
|
|
943
|
-
if (!isConnectionResetError(err)
|
|
984
|
+
if ((!isConnectionResetError(err) && !(err instanceof ProtocolPreOutputEof))
|
|
985
|
+
|| opts.abortSignal?.aborted || opts.attempts === 0) return null;
|
|
944
986
|
const label = opts.label
|
|
945
987
|
? " (" + redactSecretString(opts.label).replace(/[\r\n\u0000-\u001f\u007f]/g, "").slice(0, 128) + ")"
|
|
946
988
|
: "";
|
|
989
|
+
const failure = err instanceof ProtocolPreOutputEof ? "pre-output stream EOF" : "pre-output stream reset";
|
|
947
990
|
if (opts.authorize && !opts.authorize()) {
|
|
948
|
-
console.warn("[upstream-retry]
|
|
991
|
+
console.warn("[upstream-retry] " + failure + " replacement refused" + label + "; preserving original stream");
|
|
949
992
|
return null;
|
|
950
993
|
}
|
|
951
994
|
let replacement: Response;
|
|
@@ -965,7 +1008,7 @@ export async function refetchAfterProtocolSafeReset(
|
|
|
965
1008
|
console.warn("[upstream-retry] protocol-safe refetch rejected" + label + "; preserving original stream error");
|
|
966
1009
|
return null;
|
|
967
1010
|
}
|
|
968
|
-
console.warn("[upstream-retry]
|
|
1011
|
+
console.warn("[upstream-retry] " + failure + label + "; using one replacement stream");
|
|
969
1012
|
return replacement;
|
|
970
1013
|
}
|
|
971
1014
|
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The per-alias lock that enrollment and revoke of a Home-initiated link take (structure/remote-link.md,
|
|
3
|
+
* "Operation journal"). One private SQLite file per alias (lowercased, hashed) under <configDir>/link/locks, held
|
|
4
|
+
* with BEGIN IMMEDIATE for the whole operation, so a second holder anywhere, this process included, waits. The OS
|
|
5
|
+
* releases it when the holding process dies, which is what lets a repeat recover an open journal entry.
|
|
6
|
+
*
|
|
7
|
+
* Waiting polls with an injected sleep and clock up to a bound; past it the caller answers 409.
|
|
8
|
+
*/
|
|
9
|
+
import { Database } from "bun:sqlite";
|
|
10
|
+
import { createHash } from "node:crypto";
|
|
11
|
+
import { chmodSync, closeSync, lstatSync, mkdirSync, openSync } from "node:fs";
|
|
12
|
+
import { dirname, join } from "node:path";
|
|
13
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
14
|
+
import { hardenSecretDir, hardenSecretPath } from "../lib/windows-secret-acl";
|
|
15
|
+
import { linkDir } from "./paths";
|
|
16
|
+
|
|
17
|
+
export interface AliasLockDeps {
|
|
18
|
+
/** Defaults to <configDir>/link/locks. */
|
|
19
|
+
lockDir?: string;
|
|
20
|
+
sleep?: (ms: number) => Promise<void>;
|
|
21
|
+
now?: () => number;
|
|
22
|
+
/** How long a second holder waits; defaults to ALIAS_LOCK_WAIT_MS. */
|
|
23
|
+
waitMs?: number;
|
|
24
|
+
pollMs?: number;
|
|
25
|
+
/** The caller's request: once it aborts (the client went away), the wait ends at the next poll. */
|
|
26
|
+
signal?: AbortSignal;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export interface AliasLock { release(): void }
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Two minutes: a third of the CLI's 360 s enrollment deadline (ENROLLMENT_DEADLINE_MS in src/cli/link-enrollment.ts),
|
|
33
|
+
* which bounds the wait itself. It does not promise the waiter time to finish: an apply's own worst case can outrun the
|
|
34
|
+
* deadline, and then the CLI reports the outcome uncertain and a repeat with the same operation id replays it. A waiting
|
|
35
|
+
* revoke holds its link's Child-operation reservation no longer than this.
|
|
36
|
+
*/
|
|
37
|
+
export const ALIAS_LOCK_WAIT_MS = 120_000;
|
|
38
|
+
const ALIAS_LOCK_POLL_MS = 250;
|
|
39
|
+
|
|
40
|
+
export class AliasLockError extends Error {
|
|
41
|
+
constructor(readonly code: "link_alias_lock_busy" | "link_alias_lock_failed" | "link_alias_lock_aborted", options?: ErrorOptions) {
|
|
42
|
+
super(code, options);
|
|
43
|
+
this.name = "AliasLockError";
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export function aliasLockPath(alias: string, lockDir: string = join(linkDir(), "locks")): string {
|
|
48
|
+
return join(lockDir, createHash("sha256").update(alias.toLowerCase()).digest("hex").slice(0, 32) + ".lock");
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
function errorCode(error: unknown): unknown {
|
|
52
|
+
return error !== null && typeof error === "object" && "code" in error ? (error as { code: unknown }).code : undefined;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function assertPrivate(path: string, directory: boolean): void {
|
|
56
|
+
const stat = lstatSync(path);
|
|
57
|
+
if (stat.isSymbolicLink() || (directory ? !stat.isDirectory() : !stat.isFile() || stat.nlink !== 1)) throw new AliasLockError("link_alias_lock_failed");
|
|
58
|
+
if (process.platform !== "win32" && stat.uid !== process.getuid!()) throw new AliasLockError("link_alias_lock_failed");
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
function prepare(path: string, directory: string): void {
|
|
62
|
+
// <configDir>/link/locks: refuse before any mkdir when a test points it at the real OpenCodex home.
|
|
63
|
+
assertNotRealHomeUnderTest(dirname(dirname(directory)));
|
|
64
|
+
mkdirSync(directory, { recursive: true, mode: 0o700 });
|
|
65
|
+
assertPrivate(directory, true);
|
|
66
|
+
if (process.platform !== "win32") chmodSync(directory, 0o700);
|
|
67
|
+
hardenSecretDir(directory, { required: true });
|
|
68
|
+
// Created privately before SQLite opens it; an existing symlink or hard link is refused, never followed.
|
|
69
|
+
try { closeSync(openSync(path, "wx", 0o600)); } catch (error) { if (errorCode(error) !== "EEXIST") throw error; }
|
|
70
|
+
assertPrivate(path, false);
|
|
71
|
+
if (process.platform !== "win32") chmodSync(path, 0o600);
|
|
72
|
+
hardenSecretPath(path, { required: true });
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function tryAcquire(path: string): Database | null {
|
|
76
|
+
let database: Database | undefined;
|
|
77
|
+
try {
|
|
78
|
+
database = new Database(path, { create: true });
|
|
79
|
+
database.exec("PRAGMA busy_timeout = 0; BEGIN IMMEDIATE");
|
|
80
|
+
return database;
|
|
81
|
+
} catch (error) {
|
|
82
|
+
try { database?.close(); } catch { /* the acquisition failure is what matters */ }
|
|
83
|
+
const code = errorCode(error);
|
|
84
|
+
if (code === "SQLITE_BUSY" || code === "SQLITE_LOCKED" || (error instanceof Error && /database (?:is|table is) locked/i.test(error.message))) return null;
|
|
85
|
+
throw new AliasLockError("link_alias_lock_failed", { cause: error });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** Take the alias lock, waiting while another holder has it; AliasLockError link_alias_lock_busy past the bound. */
|
|
90
|
+
export async function acquireAliasLock(alias: string, deps: AliasLockDeps = {}): Promise<AliasLock> {
|
|
91
|
+
const directory = deps.lockDir ?? join(linkDir(), "locks");
|
|
92
|
+
const path = aliasLockPath(alias, directory);
|
|
93
|
+
try { prepare(path, directory); } catch (error) {
|
|
94
|
+
throw error instanceof AliasLockError ? error : new AliasLockError("link_alias_lock_failed", { cause: error });
|
|
95
|
+
}
|
|
96
|
+
const now = deps.now ?? Date.now, sleep = deps.sleep ?? ((ms: number) => Bun.sleep(ms));
|
|
97
|
+
const deadline = now() + (deps.waitMs ?? ALIAS_LOCK_WAIT_MS);
|
|
98
|
+
for (;;) {
|
|
99
|
+
if (deps.signal?.aborted) throw new AliasLockError("link_alias_lock_aborted");
|
|
100
|
+
const database = tryAcquire(path);
|
|
101
|
+
if (database) {
|
|
102
|
+
let held = true;
|
|
103
|
+
return { release() {
|
|
104
|
+
if (!held) return;
|
|
105
|
+
held = false;
|
|
106
|
+
try { database.exec("ROLLBACK"); } catch { /* close releases the OS lock regardless */ }
|
|
107
|
+
database.close();
|
|
108
|
+
} };
|
|
109
|
+
}
|
|
110
|
+
if (now() >= deadline) throw new AliasLockError("link_alias_lock_busy");
|
|
111
|
+
await sleep(deps.pollMs ?? ALIAS_LOCK_POLL_MS);
|
|
112
|
+
if (deps.signal?.aborted) throw new AliasLockError("link_alias_lock_aborted");
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
export async function withAliasLock<T>(alias: string, deps: AliasLockDeps, action: () => Promise<T>): Promise<T> {
|
|
117
|
+
const lock = await acquireAliasLock(alias, deps);
|
|
118
|
+
try { return await action(); } finally { lock.release(); }
|
|
119
|
+
}
|
|
@@ -5,12 +5,20 @@ export const DEFAULT_IDLE_AFTER_MS = 600_000;
|
|
|
5
5
|
|
|
6
6
|
export interface LinkActivitySnapshot { inFlight: number; lastDataEndAt: number | null; observedSince: number }
|
|
7
7
|
|
|
8
|
+
/** One Remote Link WebSocket in the book: it counts in flight while busy (design T4 section 5). */
|
|
9
|
+
export interface LinkSocketActivity {
|
|
10
|
+
busy(value: boolean): void;
|
|
11
|
+
end(): void;
|
|
12
|
+
}
|
|
13
|
+
|
|
8
14
|
export interface LinkActivity {
|
|
9
15
|
/**
|
|
10
16
|
* Start one relayed model request. null = a legacy key admission without a relay session; it counts against every
|
|
11
17
|
* link. The returned end is idempotent and stamps lastDataEndAt.
|
|
12
18
|
*/
|
|
13
19
|
begin(linkId: string | null): () => void;
|
|
20
|
+
/** A link WebSocket; busy while a turn runs or client work is pending. Idempotent end. */
|
|
21
|
+
beginSocket(linkId: string): LinkSocketActivity;
|
|
14
22
|
snapshot(linkId: string, now: number): LinkActivitySnapshot;
|
|
15
23
|
}
|
|
16
24
|
|
|
@@ -26,7 +34,8 @@ export function isLinkIdle(snapshot: LinkActivitySnapshot, now: number, idleAfte
|
|
|
26
34
|
interface ActivityEntry { inFlight: number; lastDataEndAt: number | null }
|
|
27
35
|
|
|
28
36
|
/** In memory, no timers. One small entry per link id that ever relayed; links are bounded by links.json. */
|
|
29
|
-
|
|
37
|
+
/** held: durable link WebSocket holds (src/link/ws-activity-holds.ts), counted as in flight. */
|
|
38
|
+
export function createLinkActivity(deps: { now?: () => number; held?: (linkId: string) => number } = {}): LinkActivity {
|
|
30
39
|
const now = deps.now ?? Date.now;
|
|
31
40
|
const observedSince = now();
|
|
32
41
|
const perLink = new Map<string, ActivityEntry>();
|
|
@@ -48,10 +57,27 @@ export function createLinkActivity(deps: { now?: () => number } = {}): LinkActiv
|
|
|
48
57
|
entry.lastDataEndAt = now();
|
|
49
58
|
};
|
|
50
59
|
},
|
|
60
|
+
beginSocket(linkId) {
|
|
61
|
+
const entry = entryFor(linkId);
|
|
62
|
+
let counted = false;
|
|
63
|
+
let ended = false;
|
|
64
|
+
const set = (value: boolean): void => {
|
|
65
|
+
if (ended || value === counted) return;
|
|
66
|
+
counted = value;
|
|
67
|
+
entry.inFlight += value ? 1 : -1;
|
|
68
|
+
if (!value) entry.lastDataEndAt = now();
|
|
69
|
+
};
|
|
70
|
+
return {
|
|
71
|
+
busy: set,
|
|
72
|
+
end() { set(false); ended = true; },
|
|
73
|
+
};
|
|
74
|
+
},
|
|
51
75
|
snapshot(linkId) {
|
|
52
76
|
const entry = perLink.get(linkId);
|
|
53
77
|
const ends = [entry?.lastDataEndAt ?? null, legacy.lastDataEndAt].filter((value): value is number => value !== null);
|
|
54
|
-
|
|
78
|
+
let held = 0;
|
|
79
|
+
try { held = deps.held?.(linkId) ?? 0; } catch { held = 1; }
|
|
80
|
+
return { inFlight: (entry?.inFlight ?? 0) + legacy.inFlight + held, lastDataEndAt: ends.length ? Math.max(...ends) : null, observedSince };
|
|
55
81
|
},
|
|
56
82
|
};
|
|
57
83
|
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
export declare const CHILD_RELEASE_DIGESTS_PATH: string;
|
|
2
|
+
export declare const CHILD_RELEASE_REPOSITORY: string;
|
|
3
|
+
export declare const CHILD_CACHE_ARTIFACT_FILES: readonly string[];
|
|
4
|
+
export declare function childReleaseAssetUrl(version: string, file: string): string;
|
|
5
|
+
/** "ocx-child-builds": the fill's own directory under OPENCODEX_HOME. */
|
|
6
|
+
export declare const CHILD_FILL_DIR: string;
|
|
7
|
+
export declare function childBinaryCacheDir(opencodexHome: string, version: string): string;
|
|
8
|
+
export declare function compareReleaseVersions(left: string, right: string): -1 | 0 | 1 | null;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Why the startup step's ownership claim stopped a fill before any write: an ocx-child-builds directory
|
|
12
|
+
* the ownership manifest does not list that already holds files (OpenCodex did not create it), an
|
|
13
|
+
* uninstall in progress, or a manifest that is full or locked by another process (the next start tries again).
|
|
14
|
+
*/
|
|
15
|
+
export type ChildCacheClaimRefusal = "foreign_directory" | "uninstall_in_progress" | "ownership_unavailable";
|
|
16
|
+
|
|
17
|
+
export type ChildCacheFillOutcome =
|
|
18
|
+
/** first_start: no record of an earlier version (a fresh install), so the version is recorded and nothing fetched. */
|
|
19
|
+
/** invalid_digests: the package's digest file is there but unreadable or unusable (the record is left alone); busy: another process is filling. */
|
|
20
|
+
| { readonly kind: "skipped"; readonly reason: "invalid_version" | "no_digests" | "invalid_digests" | "downgrade" | "first_start" | "not_an_upgrade" | "busy" | "source_checkout" | "unsupported_platform" | "disabled" | "version_mismatch" | ChildCacheClaimRefusal }
|
|
21
|
+
/** cached: every verified build now in the cache; fetched: those downloaded now; failed: listed builds withdrawn from the manifest. */
|
|
22
|
+
| { readonly kind: "filled"; readonly cached: readonly string[]; readonly fetched: readonly string[]; readonly failed: readonly string[] };
|
|
23
|
+
|
|
24
|
+
export interface ChildCacheFillOptions {
|
|
25
|
+
/** Root of the running package tree, which its installer verified. */
|
|
26
|
+
readonly packageRoot: string;
|
|
27
|
+
readonly version: string;
|
|
28
|
+
/** Required: the Home the reader resolves (getConfigDir() in the startup step); there is no environment fallback. */
|
|
29
|
+
readonly opencodexHome: string;
|
|
30
|
+
readonly fetchImpl?: typeof fetch;
|
|
31
|
+
/** Per download. */
|
|
32
|
+
readonly timeoutMs?: number;
|
|
33
|
+
/** Defaults to process.platform; on win32 the fill does nothing (no mode bits to prove the cache private). */
|
|
34
|
+
readonly platform?: NodeJS.Platform;
|
|
35
|
+
/** Clock for the fill lock's age; defaults to Date.now. */
|
|
36
|
+
readonly now?: () => number;
|
|
37
|
+
/** The running code's own version (startup); a package.json that differs records nothing (version_mismatch). */
|
|
38
|
+
readonly bundledVersion?: string;
|
|
39
|
+
/** Called once after the gates and before the first write; a refusal ends the fill with that reason. */
|
|
40
|
+
readonly claimCache?: () => ChildCacheClaimRefusal | null;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export declare function runningPackageRoot(): string;
|
|
44
|
+
export declare function fillChildBinaryCacheForVersion(options: ChildCacheFillOptions): Promise<ChildCacheFillOutcome>;
|
|
45
|
+
export declare function runningPackageVersion(packageRoot?: string): string | null;
|
|
46
|
+
/** Defaults: the running package root and its package.json version. */
|
|
47
|
+
export declare function fillChildBinaryCacheOnStart(
|
|
48
|
+
options: Partial<ChildCacheFillOptions> & { readonly opencodexHome: string },
|
|
49
|
+
out?: { log: (line: string) => void; warn: (line: string) => void },
|
|
50
|
+
): Promise<ChildCacheFillOutcome | null>;
|