@bitkyc08/opencodex 2.100.2 → 2.100.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Replacing the runtime that still serves an old version after a Desktop MSI install (#8246).
|
|
3
|
+
*
|
|
4
|
+
* Windows Installer replaces `ocx.exe` on disk but leaves running processes alone, so the old
|
|
5
|
+
* runtime keeps answering /healthz with its old version. This module only ever acts on a runtime
|
|
6
|
+
* this home attests (its runtime record and per-process secret) whose image is the installed
|
|
7
|
+
* `ocx.exe` being updated. It asks that runtime for its own bound in-place restart, the same
|
|
8
|
+
* owner-aware path `ocx restart` uses: a Desktop-supervised child hands its replacement to the
|
|
9
|
+
* Desktop app (which starts the sibling `ocx.exe`), a service child exits for its manager, and a
|
|
10
|
+
* detached runtime relaunches its own image. All three now run the installed bytes.
|
|
11
|
+
*
|
|
12
|
+
* A connected-client runtime under the Desktop app refuses that restart (409
|
|
13
|
+
* `restart_supervised_desktop`): it keeps itself until its owner replaces it. When the Desktop
|
|
14
|
+
* supervision probe proves this installation's app is the parent of exactly that pid, the runtime
|
|
15
|
+
* is drained with the installed `ocx stop --json`, the same stop the app's own updater drain runs,
|
|
16
|
+
* and the app's supervisor starts its sibling `ocx.exe` again after its backoff.
|
|
17
|
+
*
|
|
18
|
+
* Success is a different process answering with the target version; anything else is reported,
|
|
19
|
+
* never assumed. A runtime from another installation, an unattested one, or a newer one is not
|
|
20
|
+
* touched.
|
|
21
|
+
*/
|
|
22
|
+
import { win32 } from "node:path";
|
|
23
|
+
import type { LiveProxy } from "../server/proxy-liveness";
|
|
24
|
+
import type { ProxyRestartRequestOutcome } from "../cli/tray-proxy";
|
|
25
|
+
import { computeVersionSkew } from "../cli/version-skew";
|
|
26
|
+
|
|
27
|
+
export interface RuntimeReplaceDeps {
|
|
28
|
+
findLive(): Promise<LiveProxy | null>;
|
|
29
|
+
/** Drive-qualified image path of the process, or null when it cannot be read. */
|
|
30
|
+
runtimeImage(pid: number): string | null;
|
|
31
|
+
requestRestart(live: LiveProxy & { pid: number }, targetVersion: string): Promise<ProxyRestartRequestOutcome>;
|
|
32
|
+
/** The Desktop app image proven to supervise exactly this runtime pid, or null. */
|
|
33
|
+
desktopSupervisor(pid: number): string | null;
|
|
34
|
+
/** Drain the runtime with the installed CLI's `ocx stop --json`; ok only for a confirmed stop. */
|
|
35
|
+
drainRuntime(): Promise<{ ok: boolean; detail?: string }>;
|
|
36
|
+
/** Restart this installation's background service with the installed `ocx service restart`. */
|
|
37
|
+
restartService(): Promise<{ ok: boolean; detail?: string }>;
|
|
38
|
+
now(): number;
|
|
39
|
+
wait(ms: number): Promise<void>;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
export type StaleRuntimeReason =
|
|
43
|
+
| "unknown-version"
|
|
44
|
+
| "runtime-newer"
|
|
45
|
+
| "incomparable"
|
|
46
|
+
| "unattested"
|
|
47
|
+
| "foreign-image"
|
|
48
|
+
| "restart-refused"
|
|
49
|
+
| "drain-failed"
|
|
50
|
+
| "service-restart-failed"
|
|
51
|
+
| "replacement-timeout";
|
|
52
|
+
|
|
53
|
+
export type RuntimeOutcome =
|
|
54
|
+
| { kind: "serving-target"; live: LiveProxy; replaced: boolean }
|
|
55
|
+
| { kind: "not-running" }
|
|
56
|
+
| { kind: "stale"; live: LiveProxy | null; reason: StaleRuntimeReason; detail?: string };
|
|
57
|
+
|
|
58
|
+
export const RUNTIME_OBSERVE_INTERVAL_MS = 250;
|
|
59
|
+
|
|
60
|
+
/** Windows paths compare case-insensitively and with either separator. */
|
|
61
|
+
export function sameWindowsPath(left: string, right: string): boolean {
|
|
62
|
+
const normalize = (path: string) => path.replaceAll("/", "\\").replace(/\\+$/, "").toLowerCase();
|
|
63
|
+
return normalize(left) === normalize(right);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** Name the updater gives the running `ocx.exe` it moves aside before Windows Installer runs. */
|
|
67
|
+
export const MOVED_IMAGE_PATTERN = /^ocx\.exe\.\d+-\d+\.update-old$/i;
|
|
68
|
+
|
|
69
|
+
export function movedImageName(pid: number, at: number): string {
|
|
70
|
+
return `ocx.exe.${pid}-${at}.update-old`;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* The installed executable, or a previous image of it that this updater moved aside in the same
|
|
75
|
+
* directory: Windows may report a running process under the name its image file has now.
|
|
76
|
+
*/
|
|
77
|
+
export function isInstalledImage(image: string, installedExe: string): boolean {
|
|
78
|
+
if (sameWindowsPath(image, installedExe)) return true;
|
|
79
|
+
const normalized = image.replaceAll("/", "\\");
|
|
80
|
+
return sameWindowsPath(win32.dirname(normalized), win32.dirname(installedExe)) && MOVED_IMAGE_PATTERN.test(win32.basename(normalized));
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Make the serving runtime the installed version.
|
|
85
|
+
*
|
|
86
|
+
* `wasRunning` says whether a runtime answered before the install; without one this never starts
|
|
87
|
+
* a runtime just to prove the update, and reports `not-running` instead.
|
|
88
|
+
*/
|
|
89
|
+
export async function settleRuntime(
|
|
90
|
+
input: { installedExe: string; targetVersion: string; deadlineAt: number; wasRunning: boolean; expectedPort?: number },
|
|
91
|
+
deps: RuntimeReplaceDeps,
|
|
92
|
+
): Promise<RuntimeOutcome> {
|
|
93
|
+
const found = await deps.findLive();
|
|
94
|
+
// Only this home's attested runtime record identifies the runtime this installation serves; a
|
|
95
|
+
// proxy found on the configured port without it may belong to another home.
|
|
96
|
+
const live = found && found.source === "runtime" && found.pid !== null ? found : null;
|
|
97
|
+
if (!live) {
|
|
98
|
+
if (input.wasRunning && input.expectedPort !== undefined) return observe(input, deps, null, input.expectedPort);
|
|
99
|
+
if (!found || found.version === input.targetVersion) return { kind: "not-running" };
|
|
100
|
+
return { kind: "stale", live: found, reason: "unattested" };
|
|
101
|
+
}
|
|
102
|
+
if (live.version === input.targetVersion) return { kind: "serving-target", live, replaced: false };
|
|
103
|
+
if (!live.version) return { kind: "stale", live, reason: "unknown-version" };
|
|
104
|
+
const relation = computeVersionSkew(input.targetVersion, live.version).relation;
|
|
105
|
+
if (relation === "proxy-newer") return { kind: "stale", live, reason: "runtime-newer" };
|
|
106
|
+
if (relation !== "cli-newer") return { kind: "stale", live, reason: "incomparable" };
|
|
107
|
+
const pid = live.pid!;
|
|
108
|
+
let image: string | null;
|
|
109
|
+
try { image = deps.runtimeImage(pid); } catch { image = null; }
|
|
110
|
+
if (!image || !isInstalledImage(image, input.installedExe)) {
|
|
111
|
+
return { kind: "stale", live, reason: "foreign-image", ...(image ? { detail: image } : {}) };
|
|
112
|
+
}
|
|
113
|
+
const request = await deps.requestRestart({ ...live, pid }, input.targetVersion);
|
|
114
|
+
if (!request.accepted && !request.uncertain) {
|
|
115
|
+
const detail = request.error instanceof Error ? request.error.message : undefined;
|
|
116
|
+
if (detail === "restart_supervised_service") {
|
|
117
|
+
// The runtime's own image is this installation's, so its service runs the installed bytes;
|
|
118
|
+
// `ocx service restart` is the owner path the refusal names.
|
|
119
|
+
const restarted = await deps.restartService();
|
|
120
|
+
if (!restarted.ok) return { kind: "stale", live, reason: "service-restart-failed", ...(restarted.detail ? { detail: restarted.detail } : {}) };
|
|
121
|
+
return observe(input, deps, pid, live.port);
|
|
122
|
+
}
|
|
123
|
+
if (detail === "restart_supervised_desktop") {
|
|
124
|
+
let app: string | null;
|
|
125
|
+
try { app = deps.desktopSupervisor(pid); } catch { app = null; }
|
|
126
|
+
if (app && sameWindowsPath(win32.dirname(app), win32.dirname(input.installedExe))) {
|
|
127
|
+
const drained = await deps.drainRuntime();
|
|
128
|
+
if (!drained.ok) return { kind: "stale", live, reason: "drain-failed", ...(drained.detail ? { detail: drained.detail } : {}) };
|
|
129
|
+
return observe(input, deps, pid, live.port);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return { kind: "stale", live, reason: "restart-refused", ...(detail ? { detail } : {}) };
|
|
133
|
+
}
|
|
134
|
+
// An uncertain answer may still have been accepted: observe instead of asking twice.
|
|
135
|
+
return observe(input, deps, pid, live.port);
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
async function observe(
|
|
139
|
+
input: { targetVersion: string; deadlineAt: number },
|
|
140
|
+
deps: RuntimeReplaceDeps,
|
|
141
|
+
oldPid: number | null,
|
|
142
|
+
port: number,
|
|
143
|
+
): Promise<RuntimeOutcome> {
|
|
144
|
+
let last: LiveProxy | null = null;
|
|
145
|
+
while (deps.now() < input.deadlineAt) {
|
|
146
|
+
last = await deps.findLive();
|
|
147
|
+
// Bound to the replaced runtime: this home's attested record, on the same port, with a new pid.
|
|
148
|
+
if (last && last.source === "runtime" && last.port === port && last.version === input.targetVersion
|
|
149
|
+
&& last.pid !== null && last.pid !== oldPid) {
|
|
150
|
+
return { kind: "serving-target", live: last, replaced: true };
|
|
151
|
+
}
|
|
152
|
+
await deps.wait(Math.max(0, Math.min(RUNTIME_OBSERVE_INTERVAL_MS, input.deadlineAt - deps.now())));
|
|
153
|
+
}
|
|
154
|
+
return { kind: "stale", live: last, reason: "replacement-timeout" };
|
|
155
|
+
}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Where `ocx update --desktop` stages the verified MSI and the installer log (#8246).
|
|
3
|
+
*
|
|
4
|
+
* msiexec opens the package by path after this process has verified it. When the command runs
|
|
5
|
+
* elevated, a directory in the user's TEMP would let any non-elevated process of the same user
|
|
6
|
+
* swap the package, plant a link at the log path, or move the directory away between that
|
|
7
|
+
* verification and msiexec opening the file, and the elevated installer would act on the
|
|
8
|
+
* substitute. So an elevated run stages under the Windows directory's Temp, in a fresh directory
|
|
9
|
+
* created with a protected security descriptor that lets only SYSTEM and Administrators write.
|
|
10
|
+
* Non-elevated processes may create entries in that Temp but cannot delete or rename another
|
|
11
|
+
* account's, and cannot write inside this one. A run that is not elevated keeps its own TEMP: its
|
|
12
|
+
* msiexec has no more rights than a process that could change the file there.
|
|
13
|
+
*/
|
|
14
|
+
import { mkdtempSync } from "node:fs";
|
|
15
|
+
import { randomBytes } from "node:crypto";
|
|
16
|
+
import { tmpdir } from "node:os";
|
|
17
|
+
import { join, win32 } from "node:path";
|
|
18
|
+
import { dlopen, ptr } from "bun:ffi";
|
|
19
|
+
import { trustedWindowsSystemDirectory } from "../service/desktop-supervision.mjs";
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Protected (no inherited entries); full access for SYSTEM and Administrators, inherited by the
|
|
23
|
+
* files inside; the owner's implicit right to rewrite the descriptor reduced to reading it.
|
|
24
|
+
*/
|
|
25
|
+
export const PROTECTED_STAGING_SDDL = "D:P(A;OICI;FA;;;SY)(A;OICI;FA;;;BA)(A;OICI;RC;;;OW)";
|
|
26
|
+
export const STAGING_PREFIX = "ocx-desktop-update-";
|
|
27
|
+
|
|
28
|
+
export interface StagingDirectoryDeps {
|
|
29
|
+
/** Whether this process runs with an elevated token; a throw counts as elevated. */
|
|
30
|
+
elevated(): boolean;
|
|
31
|
+
windowsDirectory(): string;
|
|
32
|
+
/** Create a new directory with this descriptor; throws when the path already exists. */
|
|
33
|
+
createProtectedDirectory(path: string, sddl: string): void;
|
|
34
|
+
createPrivateTempDirectory(): string;
|
|
35
|
+
randomSuffix(): string;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export function createStagingDirectory(deps: StagingDirectoryDeps): string {
|
|
39
|
+
let elevated = true;
|
|
40
|
+
try { elevated = deps.elevated(); } catch { /* unknown: stage as if elevated */ }
|
|
41
|
+
if (!elevated) return deps.createPrivateTempDirectory();
|
|
42
|
+
const path = win32.join(deps.windowsDirectory(), "Temp", `${STAGING_PREFIX}${deps.randomSuffix()}`);
|
|
43
|
+
deps.createProtectedDirectory(path, PROTECTED_STAGING_SDDL);
|
|
44
|
+
return path;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
const TOKEN_QUERY = 0x0008;
|
|
48
|
+
const TOKEN_ELEVATION_CLASS = 20;
|
|
49
|
+
const SDDL_REVISION_1 = 1;
|
|
50
|
+
|
|
51
|
+
function loadSystemLibraries<A extends Parameters<typeof dlopen>[1], K extends Parameters<typeof dlopen>[1]>(advapiSymbols: A, kernelSymbols: K) {
|
|
52
|
+
const directory = trustedWindowsSystemDirectory();
|
|
53
|
+
const advapi = dlopen(win32.join(directory, "advapi32.dll"), advapiSymbols);
|
|
54
|
+
try {
|
|
55
|
+
const kernel = dlopen(win32.join(directory, "kernel32.dll"), kernelSymbols);
|
|
56
|
+
return { advapi, kernel, close: () => { kernel.close(); advapi.close(); } };
|
|
57
|
+
} catch (error) {
|
|
58
|
+
advapi.close();
|
|
59
|
+
throw error;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
function processIsElevated(): boolean {
|
|
64
|
+
const lib = loadSystemLibraries({
|
|
65
|
+
OpenProcessToken: { args: ["u64", "u32", "ptr"], returns: "i32" },
|
|
66
|
+
GetTokenInformation: { args: ["u64", "u32", "ptr", "u32", "ptr"], returns: "i32" },
|
|
67
|
+
}, {
|
|
68
|
+
GetCurrentProcess: { args: [], returns: "u64" },
|
|
69
|
+
CloseHandle: { args: ["u64"], returns: "i32" },
|
|
70
|
+
});
|
|
71
|
+
try {
|
|
72
|
+
const token = new BigUint64Array(1);
|
|
73
|
+
if (!lib.advapi.symbols.OpenProcessToken(lib.kernel.symbols.GetCurrentProcess(), TOKEN_QUERY, ptr(token))) throw new Error("OpenProcessToken failed");
|
|
74
|
+
try {
|
|
75
|
+
const elevation = new Uint32Array(1);
|
|
76
|
+
const length = new Uint32Array(1);
|
|
77
|
+
if (!lib.advapi.symbols.GetTokenInformation(token[0]!, TOKEN_ELEVATION_CLASS, ptr(elevation), 4, ptr(length))) throw new Error("GetTokenInformation failed");
|
|
78
|
+
return elevation[0] !== 0;
|
|
79
|
+
} finally { lib.kernel.symbols.CloseHandle(token[0]!); }
|
|
80
|
+
} finally { lib.close(); }
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function createProtectedDirectoryWin32(path: string, sddl: string): void {
|
|
84
|
+
const lib = loadSystemLibraries({
|
|
85
|
+
ConvertStringSecurityDescriptorToSecurityDescriptorW: { args: ["ptr", "u32", "ptr", "ptr"], returns: "i32" },
|
|
86
|
+
}, {
|
|
87
|
+
CreateDirectoryW: { args: ["ptr", "ptr"], returns: "i32" },
|
|
88
|
+
LocalFree: { args: ["u64"], returns: "u64" },
|
|
89
|
+
GetLastError: { args: [], returns: "u32" },
|
|
90
|
+
});
|
|
91
|
+
try {
|
|
92
|
+
const descriptor = new BigUint64Array(1);
|
|
93
|
+
const text = Buffer.from(`${sddl}\0`, "utf16le");
|
|
94
|
+
if (!lib.advapi.symbols.ConvertStringSecurityDescriptorToSecurityDescriptorW(ptr(text), SDDL_REVISION_1, ptr(descriptor), null)) {
|
|
95
|
+
throw new Error(`the staging security descriptor was rejected (Windows error ${lib.kernel.symbols.GetLastError()})`);
|
|
96
|
+
}
|
|
97
|
+
try {
|
|
98
|
+
// SECURITY_ATTRIBUTES on x64: DWORD nLength, (pad), LPVOID lpSecurityDescriptor, BOOL bInheritHandle, (pad).
|
|
99
|
+
const attributes = Buffer.alloc(24);
|
|
100
|
+
attributes.writeUInt32LE(24, 0);
|
|
101
|
+
attributes.writeBigUInt64LE(descriptor[0]!, 8);
|
|
102
|
+
attributes.writeInt32LE(0, 16);
|
|
103
|
+
const wide = Buffer.from(`${path}\0`, "utf16le");
|
|
104
|
+
if (!lib.kernel.symbols.CreateDirectoryW(ptr(wide), ptr(attributes))) {
|
|
105
|
+
throw new Error(`could not create the protected staging directory ${path} (Windows error ${lib.kernel.symbols.GetLastError()})`);
|
|
106
|
+
}
|
|
107
|
+
} finally { lib.kernel.symbols.LocalFree(descriptor[0]!); }
|
|
108
|
+
} finally { lib.close(); }
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
export const windowsStagingDeps: StagingDirectoryDeps = {
|
|
112
|
+
elevated: processIsElevated,
|
|
113
|
+
windowsDirectory: () => win32.dirname(trustedWindowsSystemDirectory()),
|
|
114
|
+
createProtectedDirectory: createProtectedDirectoryWin32,
|
|
115
|
+
createPrivateTempDirectory: () => mkdtempSync(join(tmpdir(), STAGING_PREFIX)),
|
|
116
|
+
randomSuffix: () => randomBytes(16).toString("hex"),
|
|
117
|
+
};
|
|
118
|
+
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Trust and transport constants for the headless Windows Desktop updater (#8246).
|
|
3
|
+
*
|
|
4
|
+
* The public key and feed are the ones the Desktop GUI updater embeds in
|
|
5
|
+
* `desktop/src-tauri/tauri.conf.json` (`plugins.updater`). They are restated here because a
|
|
6
|
+
* compiled `ocx.exe` cannot read the Tauri configuration at run time;
|
|
7
|
+
* `tests/update/update-desktop-headless-release.test.ts` fails if either copy drifts, so the headless path
|
|
8
|
+
* can never verify with a key the GUI would not use.
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
/** Base64 of the minisign public-key box; byte-identical to `plugins.updater.pubkey`. */
|
|
12
|
+
export const DESKTOP_UPDATER_PUBKEY =
|
|
13
|
+
"dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEFDNzZCMDg0NkVCRUJGODEKUldTQnY3NXVoTEIyckhRUXJMOXJRUDR0aHQ2L3pLVHVweXFSc1lzS24vWDNiSUJ5MXJIZmpyb2sK";
|
|
14
|
+
|
|
15
|
+
/** The published channel the GUI updater checks; identical to `plugins.updater.endpoints[0]`. */
|
|
16
|
+
export const DESKTOP_UPDATE_FEED_URL = "https://github.com/lidge-jun/opencodex/releases/latest/download/latest.json";
|
|
17
|
+
|
|
18
|
+
/** Every request starts on this exact release source. */
|
|
19
|
+
export const DESKTOP_RELEASE_ORIGIN = "https://github.com";
|
|
20
|
+
export const DESKTOP_RELEASE_PATH_PREFIX = "/lidge-jun/opencodex/releases/";
|
|
21
|
+
|
|
22
|
+
/** Redirect targets GitHub uses for release assets. Anything else is refused, never widened. */
|
|
23
|
+
export const DESKTOP_REDIRECT_HOSTS: readonly string[] = Object.freeze([
|
|
24
|
+
"github.com",
|
|
25
|
+
"release-assets.githubusercontent.com",
|
|
26
|
+
"objects.githubusercontent.com",
|
|
27
|
+
]);
|
|
28
|
+
|
|
29
|
+
/** The latest.json platform key the Windows x64 MSI is published under. */
|
|
30
|
+
export const DESKTOP_WINDOWS_PLATFORM = "windows-x86_64";
|
|
31
|
+
|
|
32
|
+
export const DESKTOP_ACQUIRE_LIMITS = Object.freeze({
|
|
33
|
+
maxRedirects: 3,
|
|
34
|
+
/** Implementation maximum for the installer; a Content-Length header is advisory only. */
|
|
35
|
+
maxArtifactBytes: 1024 * 1024 * 1024,
|
|
36
|
+
maxFeedBytes: 256 * 1024,
|
|
37
|
+
connectMs: 10_000,
|
|
38
|
+
idleReadMs: 30_000,
|
|
39
|
+
totalMs: 20 * 60_000,
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
/** Exact asset URL a verified release record must name for this version. */
|
|
43
|
+
export function desktopInstallerUrl(version: string): string {
|
|
44
|
+
return `${DESKTOP_RELEASE_ORIGIN}${DESKTOP_RELEASE_PATH_PREFIX}download/v${version}/OpenCodex-${version}-windows-x64.msi`;
|
|
45
|
+
}
|