@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.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 +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -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-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -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/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- 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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -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,
|
|
@@ -1,10 +1,31 @@
|
|
|
1
|
-
import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
|
|
2
|
-
import { basename, dirname, isAbsolute, join, relative, resolve, win32 } from "node:path";
|
|
1
|
+
import { existsSync, lstatSync, readFileSync, realpathSync, statSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, isAbsolute, join, parse, relative, resolve, win32 } from "node:path";
|
|
3
3
|
import { pnpmInvocationForPath } from "./pnpm-invocation.mjs";
|
|
4
|
-
import { verifyPnpmInstallTree } from "./transactional-install.mjs";
|
|
4
|
+
import { pnpmPackageUsesGlobalStoreLinks, verifyPnpmInstallTree } from "./transactional-install.mjs";
|
|
5
5
|
|
|
6
6
|
export const PNPM_BUILD_APPROVAL = "--allow-build=bun";
|
|
7
7
|
|
|
8
|
+
/**
|
|
9
|
+
* pnpm majors whose global virtual-store install and `store path --dir=<pnpm home>` were checked to
|
|
10
|
+
* select the same store (11.20.0, 12.16.1). Another major refuses rather than assumes the same rules.
|
|
11
|
+
*/
|
|
12
|
+
const VERIFIED_GLOBAL_STORE_MAJORS = new Set([11, 12]);
|
|
13
|
+
|
|
14
|
+
/** Characters cmd.exe re-parses after quoting (same set as the npm cache preflight). */
|
|
15
|
+
const WINDOWS_CMD_METACHARACTERS = /["%!^&|<>]/;
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* On Windows pnpm.cmd re-parses its arguments in cmd.exe after quoting, so a global-store owner whose
|
|
19
|
+
* pnpm home, global directory or global bin directory carries one of these characters is refused
|
|
20
|
+
* before any owner-pinned pnpm command receives them (the npm cache preflight refuses the same set).
|
|
21
|
+
*/
|
|
22
|
+
function windowsCmdPathRefusal(owner, env, platform) {
|
|
23
|
+
if (platform !== "win32") return null;
|
|
24
|
+
const paths = [owner?.homeAnchor ?? pnpmHomeAnchor(env, platform), owner?.globalDir, owner?.globalBinDir];
|
|
25
|
+
return paths.some(path => WINDOWS_CMD_METACHARACTERS.test(String(path ?? "")))
|
|
26
|
+
? { ok: false, reason: "pnpm path contains a character cmd.exe cannot pass safely" } : null;
|
|
27
|
+
}
|
|
28
|
+
|
|
8
29
|
function outputText(value) {
|
|
9
30
|
if (typeof value === "string") return value;
|
|
10
31
|
if (value instanceof Uint8Array) return new TextDecoder().decode(value);
|
|
@@ -157,12 +178,18 @@ function ownerGlobalArgs(args, owner) {
|
|
|
157
178
|
if (arg === "--config.global-bin-dir") index += 1;
|
|
158
179
|
continue;
|
|
159
180
|
}
|
|
181
|
+
if (owner.storePath && (arg === "--store-dir" || arg.startsWith("--store-dir=")
|
|
182
|
+
|| arg === "--config.store-dir" || arg.startsWith("--config.store-dir="))) {
|
|
183
|
+
if (arg === "--store-dir" || arg === "--config.store-dir") index += 1;
|
|
184
|
+
continue;
|
|
185
|
+
}
|
|
160
186
|
rest.push(arg);
|
|
161
187
|
}
|
|
162
188
|
return [
|
|
163
189
|
command,
|
|
164
190
|
`--global-dir=${owner.globalDir}`,
|
|
165
191
|
`--config.global-bin-dir=${owner.globalBinDir}`,
|
|
192
|
+
...(["add", "install", "update", "remove", "uninstall"].includes(command) && owner.storePath ? [`--store-dir=${owner.storePath}`] : []),
|
|
166
193
|
...rest,
|
|
167
194
|
];
|
|
168
195
|
}
|
|
@@ -295,6 +322,191 @@ export function verifyPnpmGlobalShims(
|
|
|
295
322
|
: { ok: false, reason: `pnpm generated shim verification failed (${missing.join(", ")})` };
|
|
296
323
|
}
|
|
297
324
|
|
|
325
|
+
function commandLines(result) {
|
|
326
|
+
return outputText(result?.stdout).split(/\r?\n/).map(line => line.trim()).filter(Boolean);
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
/**
|
|
330
|
+
* The directory pnpm loads its global configuration from (pnpm home): PNPM_HOME, then
|
|
331
|
+
* XDG_DATA_HOME/pnpm, then the platform default. It is read from the environment the pnpm
|
|
332
|
+
* commands receive, so the anchor and the commands agree.
|
|
333
|
+
*/
|
|
334
|
+
export function pnpmHomeAnchor(env = process.env, platform = process.platform) {
|
|
335
|
+
const value = key => typeof env?.[key] === "string" && env[key].trim() ? env[key] : null;
|
|
336
|
+
const joinPath = platform === "win32" ? win32.join : join;
|
|
337
|
+
let anchor = null;
|
|
338
|
+
if (value("PNPM_HOME")) anchor = value("PNPM_HOME");
|
|
339
|
+
else if (value("XDG_DATA_HOME")) anchor = joinPath(value("XDG_DATA_HOME"), "pnpm");
|
|
340
|
+
else if (platform === "win32") anchor = value("LOCALAPPDATA") ? win32.join(value("LOCALAPPDATA"), "pnpm") : null;
|
|
341
|
+
else if (value("HOME")) {
|
|
342
|
+
anchor = platform === "darwin" ? join(value("HOME"), "Library", "pnpm") : join(value("HOME"), ".local", "share", "pnpm");
|
|
343
|
+
}
|
|
344
|
+
// A control character could split a cmd.exe command line on Windows; such a home is never trusted.
|
|
345
|
+
return anchor && isAbsolutePath(anchor, platform) && !/[\u0000-\u001f\u007f]/.test(anchor) ? anchor : null;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
/**
|
|
349
|
+
* Classify a spelling used as a confinement root (pnpm home, store path, global group). It is trusted
|
|
350
|
+
* only when it is already canonical: no "." or ".." segment (path.resolve would delete them without
|
|
351
|
+
* visiting the links they cross), no link or junction component, and realpath returns the same path.
|
|
352
|
+
* Case is folded for the last comparison only; a case-only symlink is caught by the component walk.
|
|
353
|
+
* Returns "link", "noncanonical" or "ok"; throws when the path is missing or not a directory.
|
|
354
|
+
*/
|
|
355
|
+
function spellingTrust(path) {
|
|
356
|
+
const raw = String(path);
|
|
357
|
+
const { root } = parse(raw);
|
|
358
|
+
const parts = raw.slice(root.length).split(/[\\/]+/).filter(Boolean);
|
|
359
|
+
if (!root || parts.some(part => part === "." || part === "..")) return "noncanonical";
|
|
360
|
+
let current = root;
|
|
361
|
+
for (const part of parts) {
|
|
362
|
+
current = join(current, part);
|
|
363
|
+
if (lstatSync(current).isSymbolicLink()) return "link";
|
|
364
|
+
}
|
|
365
|
+
if (!statSync(raw).isDirectory()) throw new Error("not a directory");
|
|
366
|
+
const fold = value => resolve(value).replaceAll("\\", "/").replace(/\/+$/, "").toLowerCase();
|
|
367
|
+
return fold(realpathSync.native(raw)) === fold(raw) ? "ok" : "noncanonical";
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
/** Map a spelling's trust to the refusal reason for the named root, or null when trusted. */
|
|
371
|
+
function spellingRefusal(path, label) {
|
|
372
|
+
const trust = spellingTrust(path);
|
|
373
|
+
if (trust === "link") return label + " has a symbolic link component";
|
|
374
|
+
if (trust === "noncanonical") return label + " is not a canonical path";
|
|
375
|
+
return null;
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
/** Appended to a store-proof refusal for an install whose path looks like a pnpm global store. */
|
|
379
|
+
const STORE_PROOF_HINT = "; this install's path looks like a pnpm global store (a store links directory or pnpm store markers), "
|
|
380
|
+
+ "so the updater accepts it only when pnpm 11 or 12 names that store. Update with pnpm itself: "
|
|
381
|
+
+ "pnpm add -g @bitkyc08/opencodex@latest";
|
|
382
|
+
|
|
383
|
+
/** Filesystem identity of a directory (device and inode), or null when it is not a readable directory. */
|
|
384
|
+
function directoryIdentity(path) {
|
|
385
|
+
try {
|
|
386
|
+
const stat = statSync(path);
|
|
387
|
+
return stat.isDirectory() ? `${stat.dev}:${stat.ino}` : null;
|
|
388
|
+
} catch { return null; }
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
/**
|
|
392
|
+
* A store owner's store and global group are pinned by filesystem identity for one update transaction, so a
|
|
393
|
+
* directory replaced at the same canonical path between the proof and a pnpm mutation (install or rollback)
|
|
394
|
+
* stops the transaction instead of receiving the mutation.
|
|
395
|
+
*/
|
|
396
|
+
function pinStoreOwnerIdentity(owner) {
|
|
397
|
+
const group = directoryIdentity(owner.globalRoot), store = directoryIdentity(owner.store);
|
|
398
|
+
return {
|
|
399
|
+
refusal() {
|
|
400
|
+
if (!group || directoryIdentity(owner.globalRoot) !== group) return "pnpm global group was replaced or could not be read";
|
|
401
|
+
if (!store || directoryIdentity(owner.store) !== store) return "pnpm configured store was replaced or could not be read";
|
|
402
|
+
return null;
|
|
403
|
+
},
|
|
404
|
+
};
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
/** Store-proof failures are configuration facts, not package-tree failures. */
|
|
408
|
+
function isStoreProofFailure(reason) {
|
|
409
|
+
return typeof reason === "string" && (reason.startsWith("pnpm configured store")
|
|
410
|
+
|| reason.startsWith("pnpm virtual-store") || reason.startsWith("pnpm store path")
|
|
411
|
+
|| reason.startsWith("pnpm home") || reason.startsWith("pnpm global-store behavior")
|
|
412
|
+
// A global group that lost its canonical spelling is a configuration fact too: no rollback through it.
|
|
413
|
+
|| reason.startsWith("pnpm global group"));
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
/**
|
|
417
|
+
* Ask the selected pnpm which store it uses for its global configuration. The answer counts only
|
|
418
|
+
* when the pnpm version is one whose global-store behavior was checked, the anchor is a real
|
|
419
|
+
* directory with no symbolic link component, and pnpm prints exactly one absolute versioned path.
|
|
420
|
+
* The lexical path and its canonical target are pinned separately and both must stay unchanged.
|
|
421
|
+
*/
|
|
422
|
+
function readPnpmStore(runPnpm, owner, platform, env = process.env) {
|
|
423
|
+
const unsafe = windowsCmdPathRefusal(owner, env, platform);
|
|
424
|
+
if (unsafe) return unsafe;
|
|
425
|
+
let pnpmVersion;
|
|
426
|
+
try {
|
|
427
|
+
const result = runPnpm(["--version"], true);
|
|
428
|
+
const lines = commandLines(result);
|
|
429
|
+
if (result?.status === 0 && lines.length === 1) pnpmVersion = lines[0];
|
|
430
|
+
} catch { /* refused below */ }
|
|
431
|
+
const major = /^(\d+)\.\d+\.\d+(?:[-+][0-9A-Za-z.+-]*)?$/.exec(pnpmVersion ?? "")?.[1];
|
|
432
|
+
if (!major || !VERIFIED_GLOBAL_STORE_MAJORS.has(Number(major))) {
|
|
433
|
+
return { ok: false, reason: "pnpm global-store behavior is not verified for this pnpm version" };
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
const homeAnchor = owner?.homeAnchor ?? pnpmHomeAnchor(env, platform);
|
|
437
|
+
if (!homeAnchor) return { ok: false, reason: "pnpm home could not be determined" };
|
|
438
|
+
try {
|
|
439
|
+
const refusal = spellingRefusal(homeAnchor, "pnpm home");
|
|
440
|
+
if (refusal) return { ok: false, reason: refusal };
|
|
441
|
+
} catch {
|
|
442
|
+
return { ok: false, reason: "pnpm home could not be resolved" };
|
|
443
|
+
}
|
|
444
|
+
|
|
445
|
+
let storePath;
|
|
446
|
+
try {
|
|
447
|
+
const probe = runPnpm(["store", "path", `--dir=${homeAnchor}`], true);
|
|
448
|
+
const lines = commandLines(probe);
|
|
449
|
+
if (probe?.status === 0 && lines.length === 1 && isAbsolutePath(lines[0], platform)
|
|
450
|
+
&& /^v\d+$/.test(pathBasename(lines[0], platform))) storePath = lines[0];
|
|
451
|
+
} catch { /* refused below */ }
|
|
452
|
+
if (!storePath) return { ok: false, reason: "pnpm store path is not one absolute versioned path" };
|
|
453
|
+
if (platform === "win32" && WINDOWS_CMD_METACHARACTERS.test(storePath)) {
|
|
454
|
+
return { ok: false, reason: "pnpm path contains a character cmd.exe cannot pass safely" };
|
|
455
|
+
}
|
|
456
|
+
// A link inside the store spelling would widen the root every later hop is confined to.
|
|
457
|
+
try {
|
|
458
|
+
const refusal = spellingRefusal(storePath, "pnpm store path");
|
|
459
|
+
if (refusal) return { ok: false, reason: refusal };
|
|
460
|
+
} catch {
|
|
461
|
+
return { ok: false, reason: "pnpm store path could not be resolved" };
|
|
462
|
+
}
|
|
463
|
+
let store;
|
|
464
|
+
try {
|
|
465
|
+
store = realpathSync.native(storePath);
|
|
466
|
+
if (!statSync(store).isDirectory()) throw new Error();
|
|
467
|
+
} catch {
|
|
468
|
+
return { ok: false, reason: "pnpm store path could not be resolved" };
|
|
469
|
+
}
|
|
470
|
+
if (owner?.storePath && lexicalPathKey(storePath, platform) !== lexicalPathKey(owner.storePath, platform)) {
|
|
471
|
+
return { ok: false, reason: "pnpm configured store changed" };
|
|
472
|
+
}
|
|
473
|
+
if (owner?.store && lexicalPathKey(store, platform) !== lexicalPathKey(owner.store, platform)) {
|
|
474
|
+
return { ok: false, reason: "pnpm configured store changed" };
|
|
475
|
+
}
|
|
476
|
+
const virtualStoreDirs = [];
|
|
477
|
+
for (const key of ["virtual-store-dir", "global-virtual-store-dir"]) {
|
|
478
|
+
let value;
|
|
479
|
+
try {
|
|
480
|
+
const args = ["config", "get", key, "-g", `--config.global-dir=${owner.globalDir}`, `--config.global-bin-dir=${owner.globalBinDir}`];
|
|
481
|
+
const result = runPnpm(args, true);
|
|
482
|
+
const lines = outputText(result?.stdout).split(/\r?\n/).map(line => line.trim()).filter(Boolean);
|
|
483
|
+
if (result?.status !== 0 || lines.length !== 1) throw new Error();
|
|
484
|
+
value = lines[0];
|
|
485
|
+
} catch { return { ok: false, reason: "pnpm virtual-store configuration could not be resolved" }; }
|
|
486
|
+
if (/^(?:undefined|null)$/i.test(value)) continue;
|
|
487
|
+
if (!isAbsolutePath(value, platform)) return { ok: false, reason: "pnpm virtual-store directory is not absolute" };
|
|
488
|
+
let path;
|
|
489
|
+
try { path = realpathSync.native(value); if (!statSync(path).isDirectory()) throw new Error(); }
|
|
490
|
+
catch { return { ok: false, reason: "pnpm virtual-store directory could not be resolved" }; }
|
|
491
|
+
const rel = relative(store, path);
|
|
492
|
+
if (rel === ".." || rel.startsWith("../") || rel.startsWith("..\\") || isAbsolute(rel)) {
|
|
493
|
+
return { ok: false, reason: "pnpm virtual-store directory is outside the selected store" };
|
|
494
|
+
}
|
|
495
|
+
virtualStoreDirs.push(path);
|
|
496
|
+
}
|
|
497
|
+
if (owner?.virtualStoreDirs && (owner.virtualStoreDirs.length !== virtualStoreDirs.length
|
|
498
|
+
|| virtualStoreDirs.some((path, index) => lexicalPathKey(path, platform) !== lexicalPathKey(owner.virtualStoreDirs[index], platform)))) {
|
|
499
|
+
return { ok: false, reason: "pnpm virtual-store configuration changed" };
|
|
500
|
+
}
|
|
501
|
+
return { ok: true, store, storePath, virtualStoreDirs, homeAnchor };
|
|
502
|
+
}
|
|
503
|
+
|
|
504
|
+
function isPackageInGlobalStore(packagePath, store) {
|
|
505
|
+
const path = realpathSync.native(packagePath);
|
|
506
|
+
const rel = relative(store, path);
|
|
507
|
+
return rel !== ".." && !rel.startsWith("../") && !rel.startsWith("..\\") && !isAbsolute(rel);
|
|
508
|
+
}
|
|
509
|
+
|
|
298
510
|
/**
|
|
299
511
|
* Read and verify the package manager's active global link. `owner` constraints
|
|
300
512
|
* make the listing a proof of the group selected during preflight, not merely a
|
|
@@ -310,6 +522,10 @@ export function readPnpmGlobalPackage(
|
|
|
310
522
|
const expectedGlobalDir = constraints.expectedGlobalDir ?? constraints.owner?.globalDir;
|
|
311
523
|
const expectedGlobalRoot = constraints.expectedGlobalRoot ?? constraints.owner?.globalRoot;
|
|
312
524
|
const globalBinDir = constraints.globalBinDir ?? constraints.owner?.globalBinDir;
|
|
525
|
+
if (constraints.owner?.globalStore === true) {
|
|
526
|
+
const unsafe = windowsCmdPathRefusal(constraints.owner, constraints.env, platform);
|
|
527
|
+
if (unsafe) return unsafe;
|
|
528
|
+
}
|
|
313
529
|
let result;
|
|
314
530
|
try {
|
|
315
531
|
result = runPnpm(ownerGlobalArgs(["list", "-g", "--depth=0", "--json", packageName], constraints.owner), true);
|
|
@@ -343,12 +559,35 @@ export function readPnpmGlobalPackage(
|
|
|
343
559
|
}
|
|
344
560
|
|
|
345
561
|
let tree;
|
|
562
|
+
// A legacy global group keeps the verification it had before global-store support: no store
|
|
563
|
+
// query, no store argument. The verifier still refuses any package that uses store links
|
|
564
|
+
// without a selected store, so a global-store layout cannot pass on this branch.
|
|
565
|
+
const globalStore = constraints.owner?.globalStore === true;
|
|
566
|
+
let storeResult = { ok: true };
|
|
567
|
+
if (globalStore) {
|
|
568
|
+
storeResult = readPnpmStore(runPnpm, constraints.owner, platform, constraints.env);
|
|
569
|
+
if (!storeResult.ok) return storeResult;
|
|
570
|
+
// The global group is the other hop root; a link in its spelling would widen it the same way.
|
|
571
|
+
try {
|
|
572
|
+
const refusal = rootPath ? spellingRefusal(rootPath, "pnpm global group") : "pnpm global group has a symbolic link component";
|
|
573
|
+
if (refusal) return { ok: false, reason: refusal };
|
|
574
|
+
} catch { return { ok: false, reason: "pnpm global group could not be resolved" }; }
|
|
575
|
+
try {
|
|
576
|
+
if (!isPackageInGlobalStore(packagePath, storeResult.store)) return { ok: false, reason: "pnpm global-store package is outside the selected store" };
|
|
577
|
+
} catch { return { ok: false, reason: "pnpm active package path could not be resolved" }; }
|
|
578
|
+
}
|
|
579
|
+
const verifyPath = path => globalStore
|
|
580
|
+
? verify(path, version, storeResult.store, rootPath, storeResult.storePath)
|
|
581
|
+
: verify(path, version);
|
|
346
582
|
try {
|
|
347
|
-
tree =
|
|
583
|
+
tree = verifyPath(packagePath);
|
|
584
|
+
if (tree?.ok && constraints.expectedPackagePath && constraints.expectedPackagePath !== packagePath) {
|
|
585
|
+
tree = verifyPath(constraints.expectedPackagePath);
|
|
586
|
+
}
|
|
348
587
|
} catch {
|
|
349
588
|
return { ok: false, reason: "the active pnpm package could not be verified" };
|
|
350
589
|
}
|
|
351
|
-
if (!tree?.ok) return { ok: false, reason: "the active pnpm package failed verification" };
|
|
590
|
+
if (!tree?.ok) return { ok: false, reason: tree?.failures?.[0] ?? "the active pnpm package failed verification" };
|
|
352
591
|
|
|
353
592
|
// A valid package tree/group is enough to bind the owner before an update. The
|
|
354
593
|
// existing shim may be stale from an older pnpm run; post-update and rollback
|
|
@@ -368,6 +607,12 @@ export function readPnpmGlobalPackage(
|
|
|
368
607
|
globalDir: expectedGlobalDir,
|
|
369
608
|
globalRoot: rootPath || expectedGlobalRoot,
|
|
370
609
|
globalBinDir,
|
|
610
|
+
...(globalStore ? {
|
|
611
|
+
store: storeResult.store,
|
|
612
|
+
storePath: storeResult.storePath,
|
|
613
|
+
virtualStoreDirs: storeResult.virtualStoreDirs,
|
|
614
|
+
homeAnchor: storeResult.homeAnchor,
|
|
615
|
+
} : {}),
|
|
371
616
|
};
|
|
372
617
|
}
|
|
373
618
|
|
|
@@ -400,9 +645,20 @@ export function resolvePnpmGlobalOwner({
|
|
|
400
645
|
runPnpm,
|
|
401
646
|
verify = verifyPnpmInstallTree,
|
|
402
647
|
platform = process.platform,
|
|
648
|
+
env = process.env,
|
|
649
|
+
// Re-resolving an owner already pinned to a store (orchestrated post-update verification) always runs
|
|
650
|
+
// the store proof, whatever the new tree's spelling, so a pinned store owner is never demoted.
|
|
651
|
+
requireStoreProof = false,
|
|
403
652
|
}) {
|
|
404
653
|
if (!isAbsolutePath(packagePath, platform)) return { ok: false, reason: "running pnpm package path is not absolute" };
|
|
405
654
|
let lastReason = "no pnpm global installation owns the running package";
|
|
655
|
+
// A running package that looks like a pnpm global store gets the remedy even when no pnpm candidate lists
|
|
656
|
+
// it (a failed listing, or another path), so every refusal of a store-like install says what to run.
|
|
657
|
+
let runningClassified;
|
|
658
|
+
try { runningClassified = requireStoreProof === true || pnpmPackageUsesGlobalStoreLinks(packagePath); }
|
|
659
|
+
catch { runningClassified = true; }
|
|
660
|
+
const withRunningHint = reason => runningClassified && typeof reason === "string" && !reason.endsWith(STORE_PROOF_HINT)
|
|
661
|
+
? reason + STORE_PROOF_HINT : reason;
|
|
406
662
|
|
|
407
663
|
for (const commandPath of commandPaths ?? []) {
|
|
408
664
|
const list = listGlobalPackage(commandPath, packageName, runPnpm);
|
|
@@ -411,9 +667,22 @@ export function resolvePnpmGlobalOwner({
|
|
|
411
667
|
const listedPath = typeof inspected?.entry?.path === "string" ? inspected.entry.path : "";
|
|
412
668
|
if (!listedPath || !isAbsolutePath(listedPath, platform) || !samePath(listedPath, packagePath, platform)) continue;
|
|
413
669
|
|
|
670
|
+
// Classification only decides which proof is required. Either spelling of the running package
|
|
671
|
+
// that passes through pnpm store links demands the store proof; nothing here accepts a package.
|
|
672
|
+
// It runs before any refusal below so every refusal of a store-like install carries the remedy.
|
|
673
|
+
let globalStore;
|
|
674
|
+
try {
|
|
675
|
+
globalStore = requireStoreProof === true
|
|
676
|
+
|| pnpmPackageUsesGlobalStoreLinks(listedPath) || pnpmPackageUsesGlobalStoreLinks(packagePath);
|
|
677
|
+
} catch { globalStore = true; }
|
|
678
|
+
// A path that looks like a pnpm global store is accepted only on pnpm's own store answer. Every refusal of
|
|
679
|
+
// such an install says so, so a user whose group merely sits under a store-like directory, or whose pnpm
|
|
680
|
+
// home cannot be passed safely, knows why and what to run instead. The original reason stays the prefix.
|
|
681
|
+
const refusal = reason => globalStore && typeof reason === "string" ? reason + STORE_PROOF_HINT : reason;
|
|
682
|
+
|
|
414
683
|
const paths = resolveGlobalPaths(commandPath, runPnpm, inspected?.root?.path, platform);
|
|
415
684
|
if (!paths) {
|
|
416
|
-
lastReason = "pnpm owns the running package but did not report its global group and bin directory";
|
|
685
|
+
lastReason = refusal("pnpm owns the running package but did not report its global group and bin directory");
|
|
417
686
|
continue;
|
|
418
687
|
}
|
|
419
688
|
const { globalDir, globalRoot, globalBinDir } = paths;
|
|
@@ -427,15 +696,15 @@ export function resolvePnpmGlobalOwner({
|
|
|
427
696
|
const shimName = String(runningShimPath).replaceAll("\\", "/").split("/").at(-1)?.toLowerCase();
|
|
428
697
|
const isCommandShim = ["ocx", "opencodex", "ocx.cmd", "opencodex.cmd", "ocx.ps1", "opencodex.ps1"].includes(shimName ?? "");
|
|
429
698
|
if (isCommandShim && !samePath(dirname(runningShimPath), globalBinDir, platform)) {
|
|
430
|
-
lastReason = "pnpm package owner did not match the running global shim";
|
|
699
|
+
lastReason = refusal("pnpm package owner did not match the running global shim");
|
|
431
700
|
continue;
|
|
432
701
|
}
|
|
433
702
|
}
|
|
434
703
|
|
|
435
|
-
const owner = { commandPath, packagePath: listedPath, globalDir, globalRoot, globalBinDir };
|
|
704
|
+
const owner = { commandPath, packagePath: listedPath, globalDir, globalRoot, globalBinDir, ...(globalStore ? { globalStore: true } : {}) };
|
|
436
705
|
const active = readPnpmGlobalPackage(
|
|
437
706
|
packageName,
|
|
438
|
-
(args, capture = false) => runPnpm(commandPath, args, capture),
|
|
707
|
+
(args, capture = false) => runPnpm(commandPath, args, capture, owner),
|
|
439
708
|
verify,
|
|
440
709
|
{
|
|
441
710
|
owner,
|
|
@@ -447,12 +716,16 @@ export function resolvePnpmGlobalOwner({
|
|
|
447
716
|
// the top-level shim stale; the transaction verifies it after mutation.
|
|
448
717
|
checkShims: false,
|
|
449
718
|
platform,
|
|
719
|
+
env,
|
|
450
720
|
},
|
|
451
721
|
);
|
|
452
|
-
if (active.ok)
|
|
453
|
-
|
|
722
|
+
if (active.ok) {
|
|
723
|
+
return { ok: true, owner: { ...owner, packagePath: active.path, version: active.version,
|
|
724
|
+
...(globalStore ? { store: active.store, storePath: active.storePath, virtualStoreDirs: active.virtualStoreDirs, homeAnchor: active.homeAnchor } : {}) } };
|
|
725
|
+
}
|
|
726
|
+
lastReason = refusal(active.reason);
|
|
454
727
|
}
|
|
455
|
-
return { ok: false, reason: lastReason };
|
|
728
|
+
return { ok: false, reason: withRunningHint(lastReason) };
|
|
456
729
|
}
|
|
457
730
|
|
|
458
731
|
/**
|
|
@@ -474,6 +747,8 @@ export function runPnpmGlobalUpdate({
|
|
|
474
747
|
platform = process.platform,
|
|
475
748
|
log = () => {},
|
|
476
749
|
}) {
|
|
750
|
+
// A store owner's refusals during the update carry the same cause and remedy as discovery's.
|
|
751
|
+
const storeOwnerRefusal = reason => owner?.globalStore === true && typeof reason === "string" ? reason + STORE_PROOF_HINT : reason;
|
|
477
752
|
if (
|
|
478
753
|
!owner?.commandPath
|
|
479
754
|
|| !owner?.globalDir
|
|
@@ -482,8 +757,14 @@ export function runPnpmGlobalUpdate({
|
|
|
482
757
|
|| !isAbsolutePath(owner.commandPath, platform)
|
|
483
758
|
|| !isAbsolutePath(owner.globalDir, platform)
|
|
484
759
|
|| !isAbsolutePath(owner.globalBinDir, platform)
|
|
760
|
+
|| (owner.globalStore && (
|
|
761
|
+
!isAbsolutePath(owner.store, platform)
|
|
762
|
+
|| !isAbsolutePath(owner.storePath, platform)
|
|
763
|
+
|| !isAbsolutePath(owner.homeAnchor, platform)
|
|
764
|
+
|| !Array.isArray(owner.virtualStoreDirs)))
|
|
765
|
+
|| (!owner.globalStore && (owner.store !== undefined || owner.storePath !== undefined))
|
|
485
766
|
) {
|
|
486
|
-
return { ok: false, phase: "preflight", error: "pnpm global owner was not pinned" };
|
|
767
|
+
return { ok: false, phase: "preflight", error: storeOwnerRefusal("pnpm global owner was not pinned") };
|
|
487
768
|
}
|
|
488
769
|
const constraints = {
|
|
489
770
|
owner,
|
|
@@ -500,10 +781,13 @@ export function runPnpmGlobalUpdate({
|
|
|
500
781
|
verify,
|
|
501
782
|
{ ...constraints, checkShims: false },
|
|
502
783
|
);
|
|
503
|
-
if (!before.ok) return { ok: false, phase: "preflight", error: before.reason };
|
|
784
|
+
if (!before.ok) return { ok: false, phase: "preflight", error: storeOwnerRefusal(before.reason) };
|
|
504
785
|
if (currentVersion && before.version !== currentVersion) {
|
|
505
|
-
return { ok: false, phase: "preflight", error: "pnpm's active package does not match the running package" };
|
|
786
|
+
return { ok: false, phase: "preflight", error: storeOwnerRefusal("pnpm's active package does not match the running package") };
|
|
506
787
|
}
|
|
788
|
+
const identity = owner.globalStore ? pinStoreOwnerIdentity(owner) : null;
|
|
789
|
+
const identityRefusal = identity?.refusal();
|
|
790
|
+
if (identityRefusal) return { ok: false, phase: "preflight", error: storeOwnerRefusal(identityRefusal) };
|
|
507
791
|
|
|
508
792
|
const requested = targetVersion || tag;
|
|
509
793
|
const spec = packageSpec(packageName, requested);
|
|
@@ -525,6 +809,9 @@ export function runPnpmGlobalUpdate({
|
|
|
525
809
|
verify,
|
|
526
810
|
{ ...constraints, expectedPackagePath: undefined },
|
|
527
811
|
);
|
|
812
|
+
if (!after.ok && isStoreProofFailure(after.reason)) {
|
|
813
|
+
return { ok: false, phase: "install", rolledBack: false, error: storeOwnerRefusal(after.reason) };
|
|
814
|
+
}
|
|
528
815
|
const targetMatches = after.ok && (!targetVersion || after.version === targetVersion);
|
|
529
816
|
if (install?.status === 0 && targetMatches) {
|
|
530
817
|
return {
|
|
@@ -541,7 +828,7 @@ export function runPnpmGlobalUpdate({
|
|
|
541
828
|
? `pnpm update failed (${statusText(install?.status)})`
|
|
542
829
|
: after.ok
|
|
543
830
|
? "pnpm update produced an unexpected active package version"
|
|
544
|
-
:
|
|
831
|
+
: `pnpm update completed but the active package failed verification: ${after.reason}`;
|
|
545
832
|
|
|
546
833
|
// A failed command may have left the original active group intact. Do not create a
|
|
547
834
|
// second update transaction in that case; the verified previous package is already safe.
|
|
@@ -554,10 +841,24 @@ export function runPnpmGlobalUpdate({
|
|
|
554
841
|
activePath: after.path,
|
|
555
842
|
globalDir: owner.globalDir,
|
|
556
843
|
globalBinDir: owner.globalBinDir,
|
|
557
|
-
error: `${installReason}; previous version remains active
|
|
844
|
+
error: storeOwnerRefusal(`${installReason}; previous version remains active`),
|
|
558
845
|
};
|
|
559
846
|
}
|
|
560
847
|
|
|
848
|
+
// A failed listing says nothing about the effective store: bind it again before
|
|
849
|
+
// issuing a rollback mutation, independently of whether readback succeeded.
|
|
850
|
+
if (owner.globalStore) {
|
|
851
|
+
const rollbackStore = readPnpmStore(runPnpm, owner, platform);
|
|
852
|
+
if (!rollbackStore.ok) return { ok: false, phase: "rollback", rolledBack: false, error: storeOwnerRefusal(rollbackStore.reason) };
|
|
853
|
+
// The global group is the other root every link hop is confined to: a rollback must not write through a
|
|
854
|
+
// group that has gained a link component or lost its canonical spelling since discovery.
|
|
855
|
+
let groupRefusal;
|
|
856
|
+
try { groupRefusal = spellingRefusal(owner.globalRoot, "pnpm global group"); }
|
|
857
|
+
catch { groupRefusal = "pnpm global group could not be resolved"; }
|
|
858
|
+
if (groupRefusal) return { ok: false, phase: "rollback", rolledBack: false, error: storeOwnerRefusal(groupRefusal) };
|
|
859
|
+
const replaced = identity?.refusal();
|
|
860
|
+
if (replaced) return { ok: false, phase: "rollback", rolledBack: false, error: storeOwnerRefusal(replaced) };
|
|
861
|
+
}
|
|
561
862
|
log(`Restoring ${packageName}@${before.version} with pnpm…`);
|
|
562
863
|
let rollback;
|
|
563
864
|
try {
|
|
@@ -582,9 +883,11 @@ export function runPnpmGlobalUpdate({
|
|
|
582
883
|
activePath: restored.path,
|
|
583
884
|
globalDir: owner.globalDir,
|
|
584
885
|
globalBinDir: owner.globalBinDir,
|
|
585
|
-
error: `${installReason}; previous version restored
|
|
886
|
+
error: storeOwnerRefusal(`${installReason}; previous version restored`),
|
|
586
887
|
};
|
|
587
888
|
}
|
|
889
|
+
// The readback's own reason (a store-proof failure included) leads, so the user sees why first.
|
|
890
|
+
const unverifiedPrefix = restored.ok || typeof restored.reason !== "string" ? "" : `${restored.reason}; `;
|
|
588
891
|
return {
|
|
589
892
|
ok: false,
|
|
590
893
|
phase: "rollback",
|
|
@@ -593,6 +896,6 @@ export function runPnpmGlobalUpdate({
|
|
|
593
896
|
...(restored.ok ? { activePath: restored.path } : {}),
|
|
594
897
|
globalDir: owner.globalDir,
|
|
595
898
|
globalBinDir: owner.globalBinDir,
|
|
596
|
-
error: `${installReason}; previous version could not be verified after rollback
|
|
899
|
+
error: storeOwnerRefusal(`${unverifiedPrefix}${installReason}; previous version could not be verified after rollback`),
|
|
597
900
|
};
|
|
598
901
|
}
|