@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
|
@@ -3,16 +3,28 @@
|
|
|
3
3
|
import { guardedSpawn, guardedSpawnSync, materializeMutationData } from "./mutation-guard.mjs";
|
|
4
4
|
import { dirname, join, win32 } from "node:path";
|
|
5
5
|
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { publishWindowsInstallerPid } from "./windows-installer-marker.mjs";
|
|
7
|
+
import { isTestHomeGuardArmed } from "./test-home-guard.mjs";
|
|
6
8
|
|
|
7
9
|
const JOIN_MS = 10000;
|
|
8
10
|
const failure = message => ({ status: null, processTreeExited: false, error: { code: "EINSTALLJOIN", message } });
|
|
9
11
|
|
|
12
|
+
let windowsSupervisorSeamsForTests = null;
|
|
13
|
+
/**
|
|
14
|
+
* Test seam: drive the Windows supervisor branch with a fake platform and supervisor launcher. A
|
|
15
|
+
* fake launcher skips guardedSpawn, so the seam refuses outside a test process.
|
|
16
|
+
*/
|
|
17
|
+
export function setWindowsInstallerSupervisorForTests(seams) {
|
|
18
|
+
if (seams !== null && !isTestHomeGuardArmed()) throw Error("the Windows installer supervisor seam is test-only");
|
|
19
|
+
windowsSupervisorSeamsForTests = seams;
|
|
20
|
+
}
|
|
21
|
+
|
|
10
22
|
/** Bridge synchronous pnpm transactions to the same Windows Job Object barrier. */
|
|
11
|
-
export function runWindowsInstallerSync(invocation, { env = process.env, cwd, timeoutMs = 180000, authorizeMutation = () => false } = {}) {
|
|
23
|
+
export function runWindowsInstallerSync(invocation, { env = process.env, cwd, timeoutMs = 180000, authorizeMutation = () => false, markerPath } = {}) {
|
|
12
24
|
const moduleUrl = import.meta.url;
|
|
13
|
-
const script = `import {readFileSync} from 'node:fs';import {runNpmInstall} from ${JSON.stringify(moduleUrl)};const input=JSON.parse(readFileSync(0,'utf8'));console.log(JSON.stringify(await runNpmInstall(input.invocation,{timeoutMs:input.timeoutMs,authorizeMutation:()=>true})));`;
|
|
25
|
+
const script = `import {readFileSync} from 'node:fs';import {runNpmInstall} from ${JSON.stringify(moduleUrl)};const input=JSON.parse(readFileSync(0,'utf8'));console.log(JSON.stringify(await runNpmInstall(input.invocation,{timeoutMs:input.timeoutMs,markerPath:input.markerPath,authorizeMutation:()=>true})));`;
|
|
14
26
|
const result = guardedSpawnSync(authorizeMutation, "package", process.execPath, ["--input-type=module", "-e", script], {
|
|
15
|
-
input: JSON.stringify({ invocation, timeoutMs }), env, cwd, encoding: "utf8", windowsHide: true, stdio: ["pipe", "pipe", "inherit"],
|
|
27
|
+
input: JSON.stringify({ invocation, timeoutMs, markerPath }), env, cwd, encoding: "utf8", windowsHide: true, stdio: ["pipe", "pipe", "inherit"],
|
|
16
28
|
});
|
|
17
29
|
try {
|
|
18
30
|
const value = JSON.parse(result.stdout);
|
|
@@ -25,11 +37,12 @@ function quoteWindowsArg(value) {
|
|
|
25
37
|
return '"' + value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\*)$/, "$1$1") + '"';
|
|
26
38
|
}
|
|
27
39
|
|
|
28
|
-
export async function runNpmInstall(invocation, { env = process.env, timeoutMs = 180000, authorizeMutation = () => false } = {}) {
|
|
40
|
+
export async function runNpmInstall(invocation, { env = process.env, timeoutMs = 180000, authorizeMutation = () => false, markerPath } = {}) {
|
|
29
41
|
invocation = materializeMutationData(invocation);
|
|
30
42
|
env = materializeMutationData(env);
|
|
31
43
|
if (!invocation) return { status: 1, processTreeExited: true, error: { code: "ENOENT", message: "npm invocation unavailable" } };
|
|
32
|
-
|
|
44
|
+
const seams = windowsSupervisorSeamsForTests;
|
|
45
|
+
if ((seams?.platform ?? process.platform) === "win32") {
|
|
33
46
|
// The PowerShell helper assigns npm to a kill-on-close Job Object before it
|
|
34
47
|
// resumes the suspended process, then terminates the job on timeout and
|
|
35
48
|
// waits for the job to become empty. An unconfirmed join retains the stage.
|
|
@@ -43,13 +56,26 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
|
|
|
43
56
|
const supervisor = win32.join(root, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
|
|
44
57
|
const helper = join(dirname(fileURLToPath(import.meta.url)), "npm-install-job.ps1");
|
|
45
58
|
return new Promise(resolve => {
|
|
46
|
-
const
|
|
47
|
-
|
|
59
|
+
const supervisorArgs = ["-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", helper];
|
|
60
|
+
const supervisorOptions = { env, windowsHide: true, stdio: ["pipe", "pipe", "pipe"] };
|
|
61
|
+
const child = seams?.launch ? seams.launch(supervisor, supervisorArgs, supervisorOptions) : guardedSpawn(authorizeMutation, "package", supervisor, supervisorArgs, {
|
|
62
|
+
...supervisorOptions,
|
|
48
63
|
});
|
|
49
64
|
let output = "";
|
|
50
65
|
let invalid = false;
|
|
51
66
|
let spawned = false;
|
|
52
67
|
let completed = false;
|
|
68
|
+
// Record the supervisor pid before it receives its request: the supervisor creates no installer
|
|
69
|
+
// until stdin closes, so a launcher killed after this point leaves a marker whose witness is
|
|
70
|
+
// the supervisor itself (#8524). "unrecorded" means nothing could be published and no
|
|
71
|
+
// installer will start; "live" means an earlier supervisor still runs and keeps its witness.
|
|
72
|
+
let witness = null;
|
|
73
|
+
if (markerPath !== undefined) {
|
|
74
|
+
try {
|
|
75
|
+
if (!Number.isSafeInteger(child.pid) || child.pid <= 0) throw Error("installer supervisor has no pid");
|
|
76
|
+
publishWindowsInstallerPid(markerPath, child.pid);
|
|
77
|
+
} catch (error) { witness = error?.code === "EINSTALLWITNESS" ? "live" : "unrecorded"; }
|
|
78
|
+
}
|
|
53
79
|
const complete = result => {
|
|
54
80
|
if (completed) return;
|
|
55
81
|
completed = true;
|
|
@@ -57,6 +83,9 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
|
|
|
57
83
|
child.stdin.destroy(); child.stdout.destroy(); child.stderr.destroy();
|
|
58
84
|
resolve(result);
|
|
59
85
|
};
|
|
86
|
+
const completeUnstarted = () => complete(witness === "live"
|
|
87
|
+
? { status: null, processTreeExited: false, error: { code: "EINSTALLJOIN", message: "an earlier installer supervisor is still running; installer not started" } }
|
|
88
|
+
: { status: 1, processTreeExited: true, error: { code: "EINSTALLJOIN", message: "installer supervisor pid could not be recorded; installer not started" } });
|
|
60
89
|
const watchdog = setTimeout(() => {
|
|
61
90
|
child.kill();
|
|
62
91
|
complete(failure(`npm supervisor exceeded ${timeoutMs} ms install budget and exit-confirmation budget; stage retained`));
|
|
@@ -69,10 +98,12 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
|
|
|
69
98
|
else output += chunk.toString("utf8");
|
|
70
99
|
});
|
|
71
100
|
child.on("error", error => {
|
|
101
|
+
if (witness !== null) { if (!spawned) completeUnstarted(); return; }
|
|
72
102
|
complete({ status: null, processTreeExited: !spawned, error: { code: error.code, message: error.message } });
|
|
73
103
|
});
|
|
74
104
|
child.on("close", status => {
|
|
75
105
|
clearTimeout(watchdog);
|
|
106
|
+
if (witness !== null) { completeUnstarted(); return; }
|
|
76
107
|
try {
|
|
77
108
|
const result = JSON.parse(output);
|
|
78
109
|
if (invalid || status !== 0 || typeof result.processTreeExited !== "boolean"
|
|
@@ -81,6 +112,12 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
|
|
|
81
112
|
} catch { complete(failure("npm supervisor did not confirm process-tree exit; stage retained")); }
|
|
82
113
|
});
|
|
83
114
|
child.stdin.on("error", () => { /* close/result decides whether the helper ran */ });
|
|
115
|
+
if (witness !== null) {
|
|
116
|
+
// No request: the supervisor never creates the job or the installer.
|
|
117
|
+
child.stdin.end();
|
|
118
|
+
child.kill();
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
84
121
|
const args = invocation.options?.windowsVerbatimArguments ? invocation.args.join(" ") : invocation.args.map(quoteWindowsArg).join(" ");
|
|
85
122
|
child.stdin.end(JSON.stringify({ file: invocation.file, commandLine: quoteWindowsArg(invocation.file) + " " + args,
|
|
86
123
|
cwd: process.cwd(), timeoutMs, joinMs: JOIN_MS }));
|
|
@@ -104,7 +104,7 @@ export async function inspectNodeOrchestratedIdentity(cliRoot: string, targetVer
|
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
export async function verifyOrchestratedChildIdentity(expected: OrchestratedExpect, targetVersion: string): Promise<boolean> {
|
|
107
|
-
if (getConfigDir() !== expected.home) return false;
|
|
107
|
+
if (getConfigDir() !== expected.home || expected.pnpmOwner !== undefined) return false;
|
|
108
108
|
const install = defaultDeps.install();
|
|
109
109
|
const identity = await defaultDeps.identity();
|
|
110
110
|
if (install.installer !== "bun" || install.cliRoot !== expected.cliRoot || (identity.kind !== "live" && identity.kind !== "absent")) return false;
|
|
@@ -5,7 +5,7 @@ import { createUpdatePlanToken } from "./orchestrated-token.mjs";
|
|
|
5
5
|
import { waitForOrchestratedChild } from "./orchestrated-child.mjs";
|
|
6
6
|
import { classifyOrchestratedOutcome } from "./orchestrated-outcome.mjs";
|
|
7
7
|
import { verifyOrchestratedInstall } from "./orchestrated-tree.mjs";
|
|
8
|
-
import { verifyOrchestratedPnpmInstall } from "./orchestrated-pnpm.mjs";
|
|
8
|
+
import { canonicalOrchestratedPnpmOwner, verifyOrchestratedPnpmInstall } from "./orchestrated-pnpm.mjs";
|
|
9
9
|
import { resolvePnpmGlobalOwner } from "./pnpm-global-install.mjs";
|
|
10
10
|
import { parseOrchestratedUpdateArgs } from "./orchestrated-arguments.mjs";
|
|
11
11
|
|
|
@@ -58,7 +58,8 @@ export async function applyNodeOrchestratedUpdate(request, deps) {
|
|
|
58
58
|
const start = Date.now();
|
|
59
59
|
channel = createOrchestratedResultChannel();
|
|
60
60
|
const expect = encodeOrchestratedExpect({ home: deps.home, cliRoot: plan.cliPath, servingRoot: live?.servingRoot ?? null,
|
|
61
|
-
runtimePid: live?.runtime.pid ?? null, planToken: plan.planToken
|
|
61
|
+
runtimePid: live?.runtime.pid ?? null, planToken: plan.planToken,
|
|
62
|
+
...(owner ? { pnpmOwner: canonicalOrchestratedPnpmOwner(owner) } : {}) });
|
|
62
63
|
const args = [deps.launcher, "update", "--version", plan.targetVersion, "--orchestrated-expect", expect,
|
|
63
64
|
"--orchestrated-result", channel.resultPath, ...(request.notAfter === undefined ? [] : ["--not-after", String(request.notAfter)])];
|
|
64
65
|
const child = deps.spawn(process.execPath, args, { env: { ...process.env, OCX_UPDATE_ORCHESTRATED_CHILD: "1", OCX_UPDATE_RESULT_CAPABILITY: channel.capability }, stdio: ["ignore", 2, 2] });
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { PnpmGlobalOwner, RunPnpmCandidate } from "./pnpm-global-install.mjs";
|
|
2
|
+
import type { OrchestratedExpect } from "./orchestrated-session.mjs";
|
|
3
|
+
|
|
4
|
+
export declare function canonicalOrchestratedPnpmOwner(owner: PnpmGlobalOwner): NonNullable<OrchestratedExpect["pnpmOwner"]>;
|
|
5
|
+
export declare function matchesOrchestratedPnpmOwner(expected: OrchestratedExpect["pnpmOwner"], owner: PnpmGlobalOwner | undefined): boolean;
|
|
2
6
|
|
|
3
7
|
export declare function verifyOrchestratedPnpmInstall(options: {
|
|
4
8
|
owner: PnpmGlobalOwner;
|
|
@@ -1,10 +1,46 @@
|
|
|
1
1
|
import { readFileSync, realpathSync, statSync } from "node:fs";
|
|
2
|
-
import { join } from "node:path";
|
|
2
|
+
import { join, resolve } from "node:path";
|
|
3
3
|
import { readPnpmGlobalPackage, resolvePnpmGlobalOwner } from "./pnpm-global-install.mjs";
|
|
4
4
|
import { verifyPnpmInstallTree } from "./transactional-install.mjs";
|
|
5
5
|
|
|
6
6
|
const PACKAGE_NAME = "@bitkyc08/opencodex";
|
|
7
7
|
|
|
8
|
+
const OWNER_PATHS = ["commandPath", "packagePath", "globalDir", "globalRoot", "globalBinDir"];
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Freeze physical owner paths at observation time; failure to resolve any path refuses the update.
|
|
12
|
+
* A global-store owner also carries its canonical store, lexical store path and virtual-store
|
|
13
|
+
* directories; a legacy group carries none of them.
|
|
14
|
+
*/
|
|
15
|
+
export function canonicalOrchestratedPnpmOwner(owner) {
|
|
16
|
+
const base = Object.fromEntries(OWNER_PATHS.map(field => [field, realpathSync.native(owner[field])]));
|
|
17
|
+
if (!owner.globalStore) {
|
|
18
|
+
if (owner.store !== undefined || owner.storePath !== undefined) throw new Error("pnpm legacy owner carries a store");
|
|
19
|
+
return base;
|
|
20
|
+
}
|
|
21
|
+
if (!Array.isArray(owner.virtualStoreDirs)) throw new Error("pnpm virtual-store configuration is unpinned");
|
|
22
|
+
const storePath = resolve(owner.storePath);
|
|
23
|
+
const store = realpathSync.native(owner.store);
|
|
24
|
+
if (realpathSync.native(storePath) !== store) throw new Error("pnpm store path changed");
|
|
25
|
+
return { ...base, store, storePath,
|
|
26
|
+
virtualStoreDirs: owner.virtualStoreDirs.map(path => realpathSync.native(path)) };
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function matchesOrchestratedPnpmOwner(expected, owner) {
|
|
30
|
+
if (!expected || !owner) return false;
|
|
31
|
+
try {
|
|
32
|
+
const actual = canonicalOrchestratedPnpmOwner(owner);
|
|
33
|
+
const equal = (left, right) => process.platform === "win32" ? left.toLowerCase() === right.toLowerCase() : left === right;
|
|
34
|
+
if (!OWNER_PATHS.every(field => equal(actual[field], expected[field]))) return false;
|
|
35
|
+
if ((expected.store === undefined) !== (actual.store === undefined)) return false;
|
|
36
|
+
if (actual.store === undefined) return true;
|
|
37
|
+
return equal(actual.store, expected.store)
|
|
38
|
+
&& equal(actual.storePath, expected.storePath)
|
|
39
|
+
&& Array.isArray(expected.virtualStoreDirs) && actual.virtualStoreDirs.length === expected.virtualStoreDirs.length
|
|
40
|
+
&& actual.virtualStoreDirs.every((path, index) => equal(path, expected.virtualStoreDirs[index]));
|
|
41
|
+
} catch { return false; }
|
|
42
|
+
}
|
|
43
|
+
|
|
8
44
|
/** Re-resolve the selected pnpm group and verify its active tree and generated shims. */
|
|
9
45
|
export function verifyOrchestratedPnpmInstall({ owner, activeRoot, version, runPnpm }) {
|
|
10
46
|
try {
|
|
@@ -12,21 +48,29 @@ export function verifyOrchestratedPnpmInstall({ owner, activeRoot, version, runP
|
|
|
12
48
|
const result = realpathSync.native(path);
|
|
13
49
|
return process.platform === "win32" ? result.toLowerCase() : result;
|
|
14
50
|
};
|
|
15
|
-
|
|
51
|
+
// The lexical store path is compared without following links, folded like matchesOrchestratedPnpmOwner.
|
|
52
|
+
const lexicalKey = path => process.platform === "win32" ? resolve(path).toLowerCase() : resolve(path);
|
|
53
|
+
const verify = (path, expected, store, globalRoot, lexicalStore) => {
|
|
16
54
|
try {
|
|
17
55
|
const manifest = JSON.parse(readFileSync(join(path, "package.json"), "utf8"));
|
|
18
56
|
const source = statSync(join(path, "src", "cli", "index.ts"));
|
|
19
57
|
return { ok: manifest.version === expected && Boolean(manifest.dependencies?.bun && manifest.dependencies?.zod)
|
|
20
|
-
&& source.isFile() && source.size > 0 && verifyPnpmInstallTree(path, expected).ok };
|
|
58
|
+
&& source.isFile() && source.size > 0 && verifyPnpmInstallTree(path, expected, store, globalRoot, lexicalStore).ok };
|
|
21
59
|
} catch { return { ok: false }; }
|
|
22
60
|
};
|
|
23
61
|
const resolved = resolvePnpmGlobalOwner({ packageName: PACKAGE_NAME, packagePath: activeRoot,
|
|
24
|
-
commandPaths: [owner.commandPath], runPnpm, verify });
|
|
62
|
+
commandPaths: [owner.commandPath], runPnpm, verify, requireStoreProof: owner.globalStore === true });
|
|
25
63
|
if (!resolved.ok || key(resolved.owner.globalDir) !== key(owner.globalDir)
|
|
26
64
|
|| key(resolved.owner.globalRoot) !== key(owner.globalRoot)
|
|
27
|
-
|| key(resolved.owner.globalBinDir) !== key(owner.globalBinDir)
|
|
65
|
+
|| key(resolved.owner.globalBinDir) !== key(owner.globalBinDir)
|
|
66
|
+
|| Boolean(resolved.owner.globalStore) !== Boolean(owner.globalStore)) return false;
|
|
67
|
+
if (owner.globalStore && (key(resolved.owner.store) !== key(owner.store)
|
|
68
|
+
|| lexicalKey(resolved.owner.storePath) !== lexicalKey(owner.storePath)
|
|
69
|
+
|| !Array.isArray(owner.virtualStoreDirs) || !Array.isArray(resolved.owner.virtualStoreDirs)
|
|
70
|
+
|| owner.virtualStoreDirs.length !== resolved.owner.virtualStoreDirs.length
|
|
71
|
+
|| owner.virtualStoreDirs.some((path, index) => key(path) !== key(resolved.owner.virtualStoreDirs[index])))) return false;
|
|
28
72
|
const active = readPnpmGlobalPackage(PACKAGE_NAME,
|
|
29
|
-
(args, capture) => runPnpm(owner.commandPath, args, capture), verify,
|
|
73
|
+
(args, capture) => runPnpm(owner.commandPath, args, capture, owner), verify,
|
|
30
74
|
{ owner, expectedPackagePath: activeRoot, expectedGlobalRoot: owner.globalRoot, globalBinDir: owner.globalBinDir });
|
|
31
75
|
return active.ok && active.version === version && key(active.path) === key(activeRoot);
|
|
32
76
|
} catch { return false; }
|
|
@@ -4,6 +4,8 @@ export interface OrchestratedExpect {
|
|
|
4
4
|
servingRoot: string | null;
|
|
5
5
|
runtimePid: number | null;
|
|
6
6
|
planToken: string;
|
|
7
|
+
/** Store fields are present only for a global virtual-store owner. */
|
|
8
|
+
pnpmOwner?: { commandPath: string; packagePath: string; globalDir: string; globalRoot: string; globalBinDir: string; store?: string; storePath?: string; virtualStoreDirs?: string[] };
|
|
7
9
|
}
|
|
8
10
|
export declare function encodeOrchestratedExpect(value: OrchestratedExpect): string;
|
|
9
11
|
export declare function decodeOrchestratedExpect(encoded: string): OrchestratedExpect;
|
|
@@ -26,7 +28,7 @@ export declare function createOrchestratedChildSession(options: {
|
|
|
26
28
|
pid?: number;
|
|
27
29
|
verifyIdentity: () => boolean | Promise<boolean>;
|
|
28
30
|
}): {
|
|
29
|
-
start(): { ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight" };
|
|
31
|
+
start(): { ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight"; staleMarker?: true };
|
|
30
32
|
finishPreflight(): void;
|
|
31
33
|
enterMutation(): Promise<{ ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight" | "deadline-passed" | "plan-changed" }>;
|
|
32
34
|
noteUntrackedInstaller(): void;
|
|
@@ -139,8 +139,17 @@ function publishResult(fd, value) {
|
|
|
139
139
|
}
|
|
140
140
|
|
|
141
141
|
function validateExpect(value) {
|
|
142
|
+
const keys = Object.keys(value ?? {}).sort().join(",");
|
|
143
|
+
const owner = value?.pnpmOwner;
|
|
142
144
|
if (!value || typeof value !== "object" || Array.isArray(value)
|
|
143
|
-
||
|
|
145
|
+
|| !["cliRoot,home,planToken,runtimePid,servingRoot", "cliRoot,home,planToken,pnpmOwner,runtimePid,servingRoot"].includes(keys)
|
|
146
|
+
|| (keys.includes(",pnpmOwner,") && (!owner || typeof owner !== "object" || Array.isArray(owner)
|
|
147
|
+
|| !["commandPath,globalBinDir,globalDir,globalRoot,packagePath", "commandPath,globalBinDir,globalDir,globalRoot,packagePath,store,storePath,virtualStoreDirs"]
|
|
148
|
+
.includes(Object.keys(owner).sort().join(","))
|
|
149
|
+
|| [owner.commandPath, owner.globalBinDir, owner.globalDir, owner.globalRoot, owner.packagePath].some(path => typeof path !== "string" || !isAbsolute(path))
|
|
150
|
+
|| ("store" in owner && ([owner.store, owner.storePath].some(path => typeof path !== "string" || !isAbsolute(path))
|
|
151
|
+
|| !Array.isArray(owner.virtualStoreDirs) || owner.virtualStoreDirs.length > 2
|
|
152
|
+
|| owner.virtualStoreDirs.some(path => typeof path !== "string" || !isAbsolute(path))))))
|
|
144
153
|
|| typeof value.home !== "string" || !isAbsolute(value.home)
|
|
145
154
|
|| typeof value.cliRoot !== "string" || !isAbsolute(value.cliRoot)
|
|
146
155
|
|| (value.servingRoot !== null && (typeof value.servingRoot !== "string" || !isAbsolute(value.servingRoot)))
|
|
@@ -176,12 +185,16 @@ export function createOrchestratedChildSession({ home, resultPath, resultCapabil
|
|
|
176
185
|
const result = value => { if (resultFd !== undefined) publishResult(resultFd, value); };
|
|
177
186
|
const closeResult = () => { if (resultFd !== undefined) { const fd = resultFd; resultFd = undefined; closeSync(fd); } };
|
|
178
187
|
let state = "new", mutex, startedAt, untrackedPending = false, retainFence = false;
|
|
179
|
-
const marker = (phase, preserveInstaller = false, terminationUnconfirmed = false, retainFence = false) => {
|
|
188
|
+
const marker = (phase, preserveInstaller = false, terminationUnconfirmed = false, retainFence = false, dropWindowsWitness = false) => {
|
|
180
189
|
let installer = {};
|
|
181
190
|
if (preserveInstaller) {
|
|
182
191
|
const current = JSON.parse(readFileSync(markerPath, "utf8"));
|
|
183
192
|
if (current.pid !== pid || current.startedAt !== startedAt) throw new Error("orchestrated marker changed");
|
|
184
|
-
|
|
193
|
+
// A Windows supervisor pid (no POSIX group beside it) only witnesses an unconfirmed installer;
|
|
194
|
+
// once its exit is confirmed it is dropped so a later run in this session can record its own.
|
|
195
|
+
if (current.installerPid !== undefined && !(dropWindowsWitness && current.installerPgid === undefined)) {
|
|
196
|
+
installer.installerPid = current.installerPid;
|
|
197
|
+
}
|
|
185
198
|
if (current.installerPgid !== undefined) installer.installerPgid = current.installerPgid;
|
|
186
199
|
}
|
|
187
200
|
atomicJson(markerPath, { pid, phase, startedAt, ...installer,
|
|
@@ -199,10 +212,12 @@ export function createOrchestratedChildSession({ home, resultPath, resultCapabil
|
|
|
199
212
|
return { ok: false, error };
|
|
200
213
|
}
|
|
201
214
|
mutex = acquired;
|
|
202
|
-
|
|
215
|
+
const detail = {};
|
|
216
|
+
if (inspectUpdateMarker(home, { detail }) !== "free") {
|
|
203
217
|
mutex.release(); mutex = undefined;
|
|
204
218
|
result({ phase: "refused", error: "update-in-flight" }); state = "refused"; closeResult();
|
|
205
|
-
|
|
219
|
+
// staleMarker never enters the result record; it lets the launcher print recovery guidance.
|
|
220
|
+
return { ok: false, error: "update-in-flight", ...(detail.witnessless ? { staleMarker: true } : {}) };
|
|
206
221
|
}
|
|
207
222
|
try { startedAt = now(); marker("preflight"); }
|
|
208
223
|
catch (error) { mutex.release(); mutex = undefined; throw error; }
|
|
@@ -241,7 +256,7 @@ export function createOrchestratedChildSession({ home, resultPath, resultCapabil
|
|
|
241
256
|
},
|
|
242
257
|
confirmInstallerExit() {
|
|
243
258
|
if (state !== "mutating" || !untrackedPending) throw new Error("no untracked installer");
|
|
244
|
-
marker("mutating", true); untrackedPending = false;
|
|
259
|
+
marker("mutating", true, false, false, true); untrackedPending = false;
|
|
245
260
|
},
|
|
246
261
|
retainInstallerFence() {
|
|
247
262
|
if (state !== "mutating") throw new Error("orchestrated session is not mutating");
|
|
@@ -11,6 +11,7 @@ export type RunPnpmCandidate = (
|
|
|
11
11
|
commandPath: string,
|
|
12
12
|
args: readonly string[],
|
|
13
13
|
capture?: boolean,
|
|
14
|
+
owner?: PnpmGlobalOwner,
|
|
14
15
|
) => PnpmRunResult;
|
|
15
16
|
|
|
16
17
|
export interface PnpmGlobalOwner {
|
|
@@ -21,6 +22,13 @@ export interface PnpmGlobalOwner {
|
|
|
21
22
|
/** Actual versioned global group reported by pnpm root/list. */
|
|
22
23
|
globalRoot: string;
|
|
23
24
|
globalBinDir: string;
|
|
25
|
+
store?: string;
|
|
26
|
+
/** Lexical versioned store path reported by pnpm and pinned on mutations. */
|
|
27
|
+
storePath?: string;
|
|
28
|
+
globalStore?: boolean;
|
|
29
|
+
virtualStoreDirs?: string[];
|
|
30
|
+
/** pnpm home the store query was anchored at; pinned for every later store re-check. */
|
|
31
|
+
homeAnchor?: string;
|
|
24
32
|
version?: string;
|
|
25
33
|
}
|
|
26
34
|
|
|
@@ -72,6 +80,11 @@ export type PnpmGlobalPackage =
|
|
|
72
80
|
globalDir?: string;
|
|
73
81
|
globalRoot?: string;
|
|
74
82
|
globalBinDir?: string;
|
|
83
|
+
/** Present only for a global virtual-store owner. */
|
|
84
|
+
store?: string;
|
|
85
|
+
storePath?: string;
|
|
86
|
+
virtualStoreDirs?: string[];
|
|
87
|
+
homeAnchor?: string;
|
|
75
88
|
}
|
|
76
89
|
| { ok: false; reason: string };
|
|
77
90
|
|
|
@@ -84,6 +97,8 @@ export interface PnpmGlobalReadConstraints {
|
|
|
84
97
|
/** Set false only for pre-update owner binding; post-update reads verify shims by default. */
|
|
85
98
|
checkShims?: boolean;
|
|
86
99
|
platform?: NodeJS.Platform;
|
|
100
|
+
/** Environment the pnpm commands receive; locates pnpm home for the store query. */
|
|
101
|
+
env?: NodeJS.ProcessEnv;
|
|
87
102
|
verifyShims?: (
|
|
88
103
|
packageDir: string,
|
|
89
104
|
globalBinDir: string,
|
|
@@ -94,7 +109,7 @@ export interface PnpmGlobalReadConstraints {
|
|
|
94
109
|
export declare function readPnpmGlobalPackage(
|
|
95
110
|
packageName: string,
|
|
96
111
|
runPnpm: RunPnpm,
|
|
97
|
-
verify?: (packageDir: string, expectedVersion?: string) => PnpmVerificationResult,
|
|
112
|
+
verify?: (packageDir: string, expectedVersion?: string, store?: string, globalRoot?: string, lexicalStore?: string) => PnpmVerificationResult,
|
|
98
113
|
constraints?: PnpmGlobalReadConstraints,
|
|
99
114
|
): PnpmGlobalPackage;
|
|
100
115
|
|
|
@@ -104,8 +119,11 @@ export declare function resolvePnpmGlobalOwner(options: {
|
|
|
104
119
|
commandPaths: readonly string[];
|
|
105
120
|
runningShimPath?: string;
|
|
106
121
|
runPnpm: RunPnpmCandidate;
|
|
107
|
-
verify?: (packageDir: string, expectedVersion?: string) => PnpmVerificationResult;
|
|
122
|
+
verify?: (packageDir: string, expectedVersion?: string, store?: string, globalRoot?: string, lexicalStore?: string) => PnpmVerificationResult;
|
|
108
123
|
platform?: NodeJS.Platform;
|
|
124
|
+
env?: NodeJS.ProcessEnv;
|
|
125
|
+
/** Re-resolving a store-pinned owner: always run the store proof, whatever the tree's spelling. */
|
|
126
|
+
requireStoreProof?: boolean;
|
|
109
127
|
}): PnpmGlobalOwnerResult;
|
|
110
128
|
|
|
111
129
|
export type PnpmGlobalUpdateResult =
|
|
@@ -139,7 +157,7 @@ export declare function runPnpmGlobalUpdate(options: {
|
|
|
139
157
|
owner: PnpmGlobalOwner;
|
|
140
158
|
runningPackagePath?: string;
|
|
141
159
|
runPnpm: RunPnpm;
|
|
142
|
-
verify?: (packageDir: string, expectedVersion?: string) => PnpmVerificationResult;
|
|
160
|
+
verify?: (packageDir: string, expectedVersion?: string, store?: string, globalRoot?: string, lexicalStore?: string) => PnpmVerificationResult;
|
|
143
161
|
verifyShims?: (
|
|
144
162
|
packageDir: string,
|
|
145
163
|
globalBinDir: string,
|