@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
package/src/types/provider.ts
CHANGED
|
@@ -10,6 +10,21 @@ import type { AnthropicAccountPoolConfig } from "./anthropic-account-pool";
|
|
|
10
10
|
*/
|
|
11
11
|
export type RefreshPolicy = "proactive" | "lazy-only" | "disabled";
|
|
12
12
|
|
|
13
|
+
/**
|
|
14
|
+
* Per-provider conversation affinity to the credential that served a conversation's
|
|
15
|
+
* last turn, so that credential's upstream prompt cache is read again instead of
|
|
16
|
+
* rebuilt on another key. `auto` keeps a binding only while the cache it built is
|
|
17
|
+
* measured to be worth keeping and still warm; `session` keeps it while the
|
|
18
|
+
* credential stays eligible; `turn` only across immediate continuations; `off`
|
|
19
|
+
* disables binding entirely. See src/providers/cache-affinity.ts.
|
|
20
|
+
*/
|
|
21
|
+
export type CacheAffinityMode = "auto" | "session" | "turn" | "off";
|
|
22
|
+
|
|
23
|
+
/** Provider cache-affinity outcome recorded on a request-log row. */
|
|
24
|
+
export type CacheAffinityOutcome = "kept" | "bound" | "released";
|
|
25
|
+
/** Why that outcome happened; mirrors the store's keep reasons plus lifecycle outcomes. */
|
|
26
|
+
export type CacheAffinityLogReason = "cache" | "session" | "turn" | "continuation" | "new" | "quota" | "auth";
|
|
27
|
+
|
|
13
28
|
/** Request-owned identity of the configured key, before env/keychain resolution. */
|
|
14
29
|
export interface ProviderApiKeySelection {
|
|
15
30
|
entryId?: string;
|
|
@@ -17,6 +32,10 @@ export interface ProviderApiKeySelection {
|
|
|
17
32
|
revision?: string;
|
|
18
33
|
/** Request-local allocation; does not replace the saved active key. */
|
|
19
34
|
distributed?: boolean;
|
|
35
|
+
/** Request-local cache-affinity pick; survives selection re-reads while its entry stays live. */
|
|
36
|
+
cacheAffinity?: boolean;
|
|
37
|
+
/** Opaque process-local credential and destination generation for an affinity pick. */
|
|
38
|
+
cacheAffinityGeneration?: string;
|
|
20
39
|
}
|
|
21
40
|
|
|
22
41
|
export interface OpenRouterProviderRouting {
|
|
@@ -296,6 +315,8 @@ export interface ModelCapabilities extends ReasoningCapabilities {
|
|
|
296
315
|
deepseekImageFiles?: boolean;
|
|
297
316
|
/** Images a first-party Mistral Chat request may carry for this model; older ones are pruned. */
|
|
298
317
|
mistralMaxImages?: number;
|
|
318
|
+
/** Exact-model Responses custom-tool support; absent inherits the provider contract. */
|
|
319
|
+
responsesCustomTools?: boolean;
|
|
299
320
|
}
|
|
300
321
|
|
|
301
322
|
/**
|
|
@@ -313,6 +334,12 @@ export interface OcxProviderConfig {
|
|
|
313
334
|
alias?: string;
|
|
314
335
|
/** Native model id -> short, slash-free request alias. */
|
|
315
336
|
modelAliases?: Record<string, string>;
|
|
337
|
+
/**
|
|
338
|
+
* Opt-in alias template for models without a manual or built-in alias (#7705), for example
|
|
339
|
+
* `{providerAlias}-{modelBasename}`. Derived at resolution time and never written back; only the
|
|
340
|
+
* literal `{providerAlias}` and `{modelBasename}` placeholders are allowed.
|
|
341
|
+
*/
|
|
342
|
+
aliasTemplate?: string;
|
|
316
343
|
/** Display-only labels for exact native model ids discovered under this provider. */
|
|
317
344
|
modelDisplayNames?: Record<string, string>;
|
|
318
345
|
/** Override the global built-in model-alias switch for this provider. */
|
|
@@ -649,8 +676,11 @@ export interface OcxProviderConfig {
|
|
|
649
676
|
* visible. Empty/undefined = no opt-in (default behavior). See #1690.
|
|
650
677
|
*/
|
|
651
678
|
retainModels?: string[];
|
|
652
|
-
/**
|
|
653
|
-
|
|
679
|
+
/**
|
|
680
|
+
* Override for newly discovered models. Absent/"inherit" uses the install policy. `admit`
|
|
681
|
+
* appends arrivals to a custom `selectedModels` (never a preset-derived one).
|
|
682
|
+
*/
|
|
683
|
+
newModelPolicy?: "on" | "off" | "admit" | "inherit";
|
|
654
684
|
/**
|
|
655
685
|
* Model-preset marker for `selectedModels` (#2465). Absent means "all", exactly today's
|
|
656
686
|
* semantics — an existing provider is never narrowed by an upgrade.
|
|
@@ -934,6 +964,11 @@ export interface OcxProviderConfig {
|
|
|
934
964
|
* buffered JSON reconstructed from upstream SSE; ordinary upstream JSON is unchanged.
|
|
935
965
|
*/
|
|
936
966
|
messagePhaseInference?: boolean;
|
|
967
|
+
/**
|
|
968
|
+
* Opt-in (#7427): on a native Responses route, add estimated `usage` to a completed response the
|
|
969
|
+
* provider sent without one, marked by `x-opencodex-usage-estimated`. Never used for cost, spend or quota.
|
|
970
|
+
*/
|
|
971
|
+
estimateMissingUsage?: boolean;
|
|
937
972
|
/**
|
|
938
973
|
* Opt-in hosted-web-search bridge for this KEY-auth Responses passthrough provider (#3761).
|
|
939
974
|
* Absent or disabled leaves the passthrough byte-identical to today.
|
|
@@ -1060,6 +1095,14 @@ export interface OcxProviderConfig {
|
|
|
1060
1095
|
* fields. Default off; only enable for providers that document this parameter.
|
|
1061
1096
|
*/
|
|
1062
1097
|
promptCacheKey?: boolean;
|
|
1098
|
+
/**
|
|
1099
|
+
* Conversation affinity to the key-pool credential that served a conversation's
|
|
1100
|
+
* last turn, so its upstream prompt cache is read again on the next turn instead
|
|
1101
|
+
* of rebuilt on another key. Only affects providers with 2+ key-pool entries;
|
|
1102
|
+
* eligibility (cooldowns, pacing, disabled keys) always outranks the preference.
|
|
1103
|
+
* Default `auto`. See src/providers/cache-affinity.ts.
|
|
1104
|
+
*/
|
|
1105
|
+
cacheAffinity?: CacheAffinityMode;
|
|
1063
1106
|
/**
|
|
1064
1107
|
* Opt-in: forward caller `service_tier` values to the upstream `/chat/completions` body.
|
|
1065
1108
|
* On a classified route it governs foreign values (for example `flex`), not proxy-owned
|
|
@@ -1168,6 +1211,21 @@ export interface OcxProviderConfig {
|
|
|
1168
1211
|
* other EOFs remain truncation errors. Absent = strict default behavior.
|
|
1169
1212
|
*/
|
|
1170
1213
|
anthropicEofTolerance?: boolean;
|
|
1214
|
+
/**
|
|
1215
|
+
* Claude Code's typed Advisor server tool (`advisor_20260301`) on the translated Messages lane.
|
|
1216
|
+
* Absent: forwarded only to an `anthropic`-adapter provider on first-party `api.anthropic.com`.
|
|
1217
|
+
* `true`: an Anthropic-compatible gateway that runs it receives the declaration, its history and
|
|
1218
|
+
* the `advisor-tool-2026-03-01` beta too. `false`: never forwarded, even first-party.
|
|
1219
|
+
*/
|
|
1220
|
+
forwardAdvisorTool?: boolean;
|
|
1221
|
+
/**
|
|
1222
|
+
* Experimental, default off (#6895). On an `anthropic`-adapter provider that sends to
|
|
1223
|
+
* `api.anthropic.com` with an API key, a Codex conversation that changes reasoning effort keeps
|
|
1224
|
+
* the top-level `output_config.effort` at its first turn's value and sends each change as an
|
|
1225
|
+
* effort-only system message (beta `mid-conversation-output-config-2026-07-01`), so the prompt
|
|
1226
|
+
* cache survives the change. Any turn the history cannot prove is sent exactly as without it.
|
|
1227
|
+
*/
|
|
1228
|
+
perMessageEffort?: boolean;
|
|
1171
1229
|
/**
|
|
1172
1230
|
* Model ids that do NOT accept image inputs. The proxy gives them "eyes" via the vision sidecar:
|
|
1173
1231
|
* attached images are described by a gpt vision model and replaced with text before the call.
|
package/src/types/request.ts
CHANGED
|
@@ -93,6 +93,8 @@ export interface OcxParsedRequest {
|
|
|
93
93
|
* adapter ends a system block there so the breakpoint stays off the per-turn tail.
|
|
94
94
|
*/
|
|
95
95
|
_anthropicSystemCachePrefix?: string;
|
|
96
|
+
/** The request arrived on the Anthropic Messages surface (Claude Code, Claude Desktop). */
|
|
97
|
+
_anthropicInbound?: boolean;
|
|
96
98
|
/**
|
|
97
99
|
* Boundary between replayed history and this turn's newly appended input. Usually the
|
|
98
100
|
* items the proxy restored from local previous_response_id state; also set when the
|
|
@@ -146,6 +148,8 @@ export interface OcxParsedRequest {
|
|
|
146
148
|
_dropForeignReasoningItemIds?: boolean;
|
|
147
149
|
/** Final-route opt-in: emit v2 collaboration message arguments as plaintext on ChatGPT. */
|
|
148
150
|
_plaintextV2AgentMessages?: boolean;
|
|
151
|
+
_plaintextV2Decision?: boolean;
|
|
152
|
+
_plaintextV2EverPrepared?: boolean;
|
|
149
153
|
/**
|
|
150
154
|
* Optional authenticated tenant/operator namespace for Cursor thread→conversation derivation.
|
|
151
155
|
* When absent (single-operator local proxy), derivation stays local-scoped.
|
|
@@ -217,6 +221,14 @@ export interface OcxParsedRequest {
|
|
|
217
221
|
* provider-private continuation caches again on every later turn.
|
|
218
222
|
*/
|
|
219
223
|
_contextCompactionBoundary?: boolean;
|
|
224
|
+
/**
|
|
225
|
+
* Codex's own per-turn metadata for this request says `history_initialization: "New"` (HTTP header,
|
|
226
|
+
* or a WebSocket frame's own `client_metadata`). Read once in request preparation; the experimental
|
|
227
|
+
* Anthropic `perMessageEffort` option takes it as the new-transcript receipt (#6895).
|
|
228
|
+
*/
|
|
229
|
+
_codexNewHistory?: boolean;
|
|
230
|
+
/** This turn's per-message effort bookkeeping (src/adapters/anthropic/per-message-effort.ts). */
|
|
231
|
+
_perMessageEffort?: PerMessageEffortTurn;
|
|
220
232
|
/**
|
|
221
233
|
* Core-owned registration slot for the optional advisor subsystem (src/advisor). Set per request
|
|
222
234
|
* by the sidecar planner, never at module load: the core Responses path only sees this
|
|
@@ -559,6 +571,17 @@ export interface OcxUrlCitation {
|
|
|
559
571
|
title?: string;
|
|
560
572
|
}
|
|
561
573
|
|
|
574
|
+
/**
|
|
575
|
+
* One turn's per-message effort state (#6895). Spread copies of the parsed request share it, so a
|
|
576
|
+
* rebuild of the same turn is seen as a second build.
|
|
577
|
+
*/
|
|
578
|
+
export interface PerMessageEffortTurn {
|
|
579
|
+
/** The pending decision this turn owns, until it commits or is abandoned. */
|
|
580
|
+
token?: string;
|
|
581
|
+
generation: string;
|
|
582
|
+
builds: number;
|
|
583
|
+
}
|
|
584
|
+
|
|
562
585
|
/**
|
|
563
586
|
* Canonical usage convention (devlog/260711_claude_inbound/070):
|
|
564
587
|
* - `inputTokens` is the TOTAL prompt size, INCLUDING cache reads and cache writes
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Operator defaults for routed Codex catalog rows (#6872), stored as top-level
|
|
3
|
+
* `routedCatalogDefaults` in config.json. Every field is optional: omission keeps the derived
|
|
4
|
+
* value and explicit `false` stays `false`. Concrete provider/model declarations still win, and
|
|
5
|
+
* a row without verbosity support never carries `default_verbosity`. Validation lives in
|
|
6
|
+
* src/config/schema/routed-catalog-defaults.ts; derivation in src/codex/catalog/routed-defaults.ts.
|
|
7
|
+
*/
|
|
8
|
+
export interface OcxRoutedCatalogDefaultsConfig {
|
|
9
|
+
/** Serialized as `include_skills_usage_instructions`. */
|
|
10
|
+
includeSkillsUsageInstructions?: boolean;
|
|
11
|
+
/** Serialized as `include_apps_usage_instructions`. */
|
|
12
|
+
includeAppsUsageInstructions?: boolean;
|
|
13
|
+
/** Serialized as `include_plugin_usage_instructions`. */
|
|
14
|
+
includePluginUsageInstructions?: boolean;
|
|
15
|
+
/** Serialized as `default_verbosity`; applies only to rows that support verbosity, and never turns support on. */
|
|
16
|
+
defaultVerbosity?: "low" | "medium" | "high";
|
|
17
|
+
}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/** Routing-profile configuration types (`routingProfiles` in config.json). */
|
|
2
|
+
|
|
3
|
+
export type OcxRoutingUnknownEvidenceMode = "allow" | "penalize" | "exclude";
|
|
4
|
+
|
|
5
|
+
export interface OcxRoutingProfileCandidate {
|
|
6
|
+
provider: string;
|
|
7
|
+
model: string;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export interface OcxRoutingProfileRequirements {
|
|
11
|
+
/** Minimum model context window in tokens. */
|
|
12
|
+
minContextWindow?: number;
|
|
13
|
+
/** Minimum remaining quota headroom fraction (0..1). */
|
|
14
|
+
minQuotaHeadroom?: number;
|
|
15
|
+
tools?: boolean;
|
|
16
|
+
imageInput?: boolean;
|
|
17
|
+
structuredOutput?: boolean;
|
|
18
|
+
reasoningEffort?: string;
|
|
19
|
+
serviceTier?: string;
|
|
20
|
+
localOnly?: boolean;
|
|
21
|
+
remoteAllowed?: boolean;
|
|
22
|
+
/** Special encrypted Codex task readability (ChatGPT forward pool). */
|
|
23
|
+
encryptedCodexTasks?: boolean;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export interface OcxRoutingProfileOptimize {
|
|
27
|
+
latency?: number;
|
|
28
|
+
health?: number;
|
|
29
|
+
cost?: number;
|
|
30
|
+
quota?: number;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Policy for the hard cost ceiling when a candidate has no finite cost
|
|
35
|
+
* estimate. `"allow"` (default) preserves the documented dry-run contract:
|
|
36
|
+
* the cap only excludes evidence known to exceed it, and the candidate's
|
|
37
|
+
* `cost.capOutcome` is `"unknown-allowed"`. `"exclude"` makes the ceiling
|
|
38
|
+
* fail-closed (`cost-limit-unknown` + `capOutcome: "unknown-excluded"`).
|
|
39
|
+
*/
|
|
40
|
+
export type OcxRoutingUnknownCostCapMode = "allow" | "exclude";
|
|
41
|
+
|
|
42
|
+
export interface OcxRoutingProfileLimits {
|
|
43
|
+
/** Hard per-request estimated-cost ceiling in USD. */
|
|
44
|
+
maxEstimatedCostUsd?: number;
|
|
45
|
+
/**
|
|
46
|
+
* How `maxEstimatedCostUsd` behaves when the estimate is unknown.
|
|
47
|
+
* Defaults to `"allow"` (eligible + `cost.capOutcome: "unknown-allowed"`);
|
|
48
|
+
* opt in to `"exclude"` for a true hard ceiling.
|
|
49
|
+
*/
|
|
50
|
+
onUnknownCost?: OcxRoutingUnknownCostCapMode;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export interface OcxRoutingProfileUnknownEvidence {
|
|
54
|
+
capability?: OcxRoutingUnknownEvidenceMode;
|
|
55
|
+
health?: OcxRoutingUnknownEvidenceMode;
|
|
56
|
+
quota?: OcxRoutingUnknownEvidenceMode;
|
|
57
|
+
cost?: OcxRoutingUnknownEvidenceMode;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export interface OcxRoutingProfileCompatibilitySuite {
|
|
61
|
+
suiteId: string;
|
|
62
|
+
evidenceLayer: "protocol_conformance" | "live_route_compatibility";
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
export interface OcxRoutingProfileCompatibility {
|
|
66
|
+
requiredSuites?: OcxRoutingProfileCompatibilitySuite[];
|
|
67
|
+
minStatus?: "PROBED" | "VERIFIED";
|
|
68
|
+
maxEvidenceAgeMs?: number;
|
|
69
|
+
unknownEvidence?: OcxRoutingUnknownEvidenceMode;
|
|
70
|
+
degradedEvidence?: OcxRoutingUnknownEvidenceMode;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export interface OcxRoutingProfileConfig {
|
|
74
|
+
/**
|
|
75
|
+
* Explicit candidate allowlist (`provider/model` refs). No implicit
|
|
76
|
+
* expansion in v1.
|
|
77
|
+
*/
|
|
78
|
+
candidates: OcxRoutingProfileCandidate[];
|
|
79
|
+
/** Optional public model name replacing the default `policy/<id>` slug. */
|
|
80
|
+
alias?: string;
|
|
81
|
+
/** Hard requirements evaluated before scoring. */
|
|
82
|
+
require?: OcxRoutingProfileRequirements;
|
|
83
|
+
/** Optimization weights; normalized deterministically. */
|
|
84
|
+
optimize?: OcxRoutingProfileOptimize;
|
|
85
|
+
limits?: OcxRoutingProfileLimits;
|
|
86
|
+
/** How unknown evidence is handled per dimension. */
|
|
87
|
+
unknownEvidence?: OcxRoutingProfileUnknownEvidence;
|
|
88
|
+
/** Optional Compatibility Lab policy (CL-06). */
|
|
89
|
+
compatibility?: OcxRoutingProfileCompatibility;
|
|
90
|
+
}
|
package/src/types.ts
CHANGED
|
@@ -69,6 +69,7 @@ export type {
|
|
|
69
69
|
AnthropicServerBlocks,
|
|
70
70
|
OcxUrlCitation,
|
|
71
71
|
OcxUsage,
|
|
72
|
+
PerMessageEffortTurn,
|
|
72
73
|
} from "./types/request";
|
|
73
74
|
|
|
74
75
|
export type {
|
|
@@ -122,6 +123,9 @@ export type {
|
|
|
122
123
|
|
|
123
124
|
export type {
|
|
124
125
|
RefreshPolicy,
|
|
126
|
+
CacheAffinityMode,
|
|
127
|
+
CacheAffinityOutcome,
|
|
128
|
+
CacheAffinityLogReason,
|
|
125
129
|
OpenRouterProviderRouting,
|
|
126
130
|
VercelGatewayRouting,
|
|
127
131
|
ResponsesItemIdRepairConfig,
|
|
@@ -4,8 +4,7 @@ import { atomicWriteFile } from "../config/atomic-write";
|
|
|
4
4
|
import { removePid, removeRuntimePort } from "../config/process-state";
|
|
5
5
|
import { dropWindowsTcpRowsForLocalPort } from "../server/windows-tcp-drop";
|
|
6
6
|
import { stopWinswService } from "../lib/winsw";
|
|
7
|
-
import {
|
|
8
|
-
import { killWindowsSchedulerWrappers } from "../lib/windows-service-wrappers";
|
|
7
|
+
import { runWindowsServiceStopPartA } from "../service/windows-service-stop";
|
|
9
8
|
import { guardedRun, guardedKill, guardedExecFileSync, materializeMutationData, UpdateMutationRefusedError, type UpdateMutationAuthorizer } from "./mutation-guard.mjs";
|
|
10
9
|
|
|
11
10
|
export type KillProxy = typeof killProxy;
|
|
@@ -50,9 +49,8 @@ export function guardedDropWindowsTcp(authorize: (kind: "runtime") => boolean, p
|
|
|
50
49
|
export function guardedStopWinsw(authorize: UpdateMutationAuthorizer) {
|
|
51
50
|
return stopWinswService(mutationGate(authorize, "service"));
|
|
52
51
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return killWindowsSchedulerWrappers(materializeMutationData(paths), mutationGate(authorize, "service"));
|
|
52
|
+
/** Part A of the checked Windows stop (#7771), the service gate at entry and before each terminate. */
|
|
53
|
+
export async function guardedStopWindowsChecked(authorize: UpdateMutationAuthorizer) {
|
|
54
|
+
// The update worker descends from the service-run proxy, so its own wrapper is fair game.
|
|
55
|
+
return (await runWindowsServiceStopPartA({ authorize: mutationGate(authorize, "service"), allowUnderOwnWrapper: true })).outcome;
|
|
58
56
|
}
|
package/src/update/index.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { verifyOrchestratedInstall } from "./orchestrated-tree.mjs";
|
|
|
9
9
|
import { decidePostStopUpdate } from "./stop-decision.mjs";
|
|
10
10
|
import { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
|
|
11
11
|
import { fileURLToPath } from "node:url";
|
|
12
|
-
import { dirname, join, resolve } from "node:path";
|
|
12
|
+
import { dirname, isAbsolute, join, resolve } from "node:path";
|
|
13
13
|
import { getConfigDir, getConfigPath, loadConfig } from "../config";
|
|
14
14
|
import { runConfigPreflight } from "./config-preflight";
|
|
15
15
|
import { readPid, readRuntimePort, getRuntimePortPath } from "../config/process-state";
|
|
@@ -29,6 +29,7 @@ import type {
|
|
|
29
29
|
} from "./install-detection.d.mts";
|
|
30
30
|
import {
|
|
31
31
|
pnpmOwnerInvocation,
|
|
32
|
+
pnpmOwnerEnvironment,
|
|
32
33
|
readPnpmGlobalPackage,
|
|
33
34
|
resolvePnpmGlobalOwner,
|
|
34
35
|
runPnpmGlobalUpdate,
|
|
@@ -48,6 +49,7 @@ import { selfLaunchArgv } from "../lib/self-launch-argv";
|
|
|
48
49
|
import { createLegacyUpdateSession, createOrchestratedChildSession, decodeOrchestratedExpect } from "./orchestrated-session.mjs";
|
|
49
50
|
import { runPosixInstallerSync } from "./posix-install-supervisor.mjs";
|
|
50
51
|
import { runWindowsInstallerSync } from "./npm-install.mjs";
|
|
52
|
+
import { staleUpdateMarkerHint } from "./sync-update-mutex.mjs";
|
|
51
53
|
import { protectOrchestratedWorkerSignals } from "./orchestrated-child.mjs";
|
|
52
54
|
import type { OrchestratedChildArgs } from "./orchestrated-arguments.mjs";
|
|
53
55
|
import { PNPM_READ_CWD, withPnpmCommandCwd, pnpmReadEnvironment } from "./pnpm-read-policy.mjs";
|
|
@@ -74,7 +76,7 @@ export const PKG = "@bitkyc08/opencodex";
|
|
|
74
76
|
const HERE = dirname(fileURLToPath(import.meta.url)); // .../opencodex/src/update
|
|
75
77
|
|
|
76
78
|
export type Installer = DetectedInstall | "standalone";
|
|
77
|
-
export const STANDALONE_UPDATE_HINT = "Update via OpenCodex Desktop (Check for Updates…) or reinstall the standalone binary from GitHub Releases.";
|
|
79
|
+
export const STANDALONE_UPDATE_HINT = "Update via OpenCodex Desktop (Check for Updates…), on a Windows Desktop installation from a terminal or remote session with 'ocx update --desktop', or reinstall the standalone binary from GitHub Releases.";
|
|
78
80
|
export type Channel = "latest" | "preview";
|
|
79
81
|
export type InstallOwnership = PackageInstallOwnership | { installer: "standalone" };
|
|
80
82
|
export type { MiseInstallOwner };
|
|
@@ -117,18 +119,19 @@ function runPnpmCandidate(
|
|
|
117
119
|
capture = false,
|
|
118
120
|
probeSpawn: typeof probeSpawnSync = probeSpawnSync,
|
|
119
121
|
probeEnv: NodeJS.ProcessEnv = process.env,
|
|
122
|
+
owner?: PnpmGlobalOwner,
|
|
120
123
|
): { status: number | null; stdout?: string | null; stderr?: string | null } {
|
|
121
|
-
const invocation = pnpmInvocationForPath(commandPath, args);
|
|
124
|
+
const invocation = owner ? pnpmOwnerInvocation(owner, args, process.platform, probeEnv) : pnpmInvocationForPath(commandPath, args);
|
|
122
125
|
if (!invocation) return { status: 1 };
|
|
123
|
-
return probeSpawn(invocation.file, invocation.args, {
|
|
126
|
+
return withPnpmCommandCwd(args, cwd => probeSpawn(invocation.file, invocation.args, {
|
|
124
127
|
stdio: capture ? "pipe" : "ignore",
|
|
125
128
|
encoding: "utf8",
|
|
126
129
|
timeout: 20_000,
|
|
127
130
|
windowsHide: true,
|
|
128
|
-
cwd
|
|
129
|
-
env: pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(probeEnv)),
|
|
131
|
+
cwd,
|
|
132
|
+
env: pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(owner ? pnpmOwnerEnvironment(owner, probeEnv) : probeEnv)),
|
|
130
133
|
...invocation.options,
|
|
131
|
-
});
|
|
134
|
+
}));
|
|
132
135
|
}
|
|
133
136
|
|
|
134
137
|
/** Resolve the exact pnpm executable/group/bin that own this package. */
|
|
@@ -142,7 +145,8 @@ export function resolveCurrentPnpmGlobalOwner(
|
|
|
142
145
|
packagePath: packageRoot(),
|
|
143
146
|
commandPaths: deps.commandPaths ?? resolvePnpmCommands(),
|
|
144
147
|
runningShimPath: runningPnpmShimPath(invoked),
|
|
145
|
-
runPnpm: (commandPath, args, capture) => runPnpmCandidate(commandPath, args, capture, probeSpawn, deps.env),
|
|
148
|
+
runPnpm: (commandPath, args, capture, owner) => runPnpmCandidate(commandPath, args, capture, probeSpawn, deps.env, owner),
|
|
149
|
+
env: deps.env ?? process.env,
|
|
146
150
|
});
|
|
147
151
|
}
|
|
148
152
|
|
|
@@ -166,7 +170,9 @@ export function runOwnedPnpm(
|
|
|
166
170
|
capture: boolean,
|
|
167
171
|
stdio: "inherit" | "pipe" | "ignore" = capture ? "pipe" : "inherit",
|
|
168
172
|
probeSpawn: typeof probeSpawnSync = probeSpawnSync,
|
|
169
|
-
authorizeMutation: (kind: "package") => boolean = () => ["root", "bin", "list", "config", "view", "--version"].includes(args[0] ?? "")
|
|
173
|
+
authorizeMutation: (kind: "package") => boolean = () => ["root", "bin", "list", "config", "view", "--version"].includes(args[0] ?? "")
|
|
174
|
+
|| (args[0] === "store" && args[1] === "path" && args.length === 3
|
|
175
|
+
&& args[2]?.startsWith("--dir=") === true && isAbsolute(args[2].slice("--dir=".length))),
|
|
170
176
|
session?: Pick<ReturnType<typeof createOrchestratedChildSession>, "retainInstallerFence" | "noteUntrackedInstaller" | "confirmInstallerExit">,
|
|
171
177
|
markerPath = join(getConfigDir(), "update-orchestrated.json"),
|
|
172
178
|
): { status: number | null; stdout?: string | null; stderr?: string | null; processTreeExited?: boolean } {
|
|
@@ -178,7 +184,7 @@ export function runOwnedPnpm(
|
|
|
178
184
|
const env = pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(target.env));
|
|
179
185
|
if (process.platform === "win32") {
|
|
180
186
|
session.noteUntrackedInstaller();
|
|
181
|
-
const result = runWindowsInstallerSync({ file: target.bin, args: target.args, options: target.options }, { cwd, env, authorizeMutation });
|
|
187
|
+
const result = runWindowsInstallerSync({ file: target.bin, args: target.args, options: target.options }, { cwd, env, authorizeMutation, markerPath });
|
|
182
188
|
if (result.processTreeExited && Number.isInteger(result.status)) session.confirmInstallerExit();
|
|
183
189
|
else { session.retainInstallerFence(); return { ...result, processTreeExited: false }; }
|
|
184
190
|
return result;
|
|
@@ -208,6 +214,7 @@ export function runOwnedPnpm(
|
|
|
208
214
|
|
|
209
215
|
/** Re-read the owning group's active package and return its verified launcher. */
|
|
210
216
|
export function resolvePnpmActiveLauncher(owner: PnpmGlobalOwner): string | null {
|
|
217
|
+
if (owner.globalStore && !Array.isArray(owner.virtualStoreDirs)) return null;
|
|
211
218
|
const active = readPnpmGlobalPackage(
|
|
212
219
|
PKG,
|
|
213
220
|
(args, capture = false) => runOwnedPnpm(owner, args, capture),
|
|
@@ -473,7 +480,12 @@ export async function runUpdate(child?: Extract<OrchestratedChildArgs, { ok: tru
|
|
|
473
480
|
} else {
|
|
474
481
|
session = createLegacyUpdateSession({ home: getConfigDir() });
|
|
475
482
|
const started = session.start();
|
|
476
|
-
if (!started.ok) {
|
|
483
|
+
if (!started.ok) {
|
|
484
|
+
console.error(`opencodex: ${started.error}`);
|
|
485
|
+
if (started.staleMarker) for (const line of staleUpdateMarkerHint(getConfigDir())) console.error(line);
|
|
486
|
+
process.exitCode = 1;
|
|
487
|
+
return;
|
|
488
|
+
}
|
|
477
489
|
process.once("exit", () => session?.finishPreflight());
|
|
478
490
|
}
|
|
479
491
|
try { await runUpdateWithSession(child, session); }
|
|
@@ -687,6 +699,8 @@ async function runUpdateWithSession(child: Extract<OrchestratedChildArgs, { ok:
|
|
|
687
699
|
// An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
|
|
688
700
|
const env = mutation.controlEnvironment(withoutSiblingMarker(process.env));
|
|
689
701
|
delete env.OCX_SERVICE;
|
|
702
|
+
// Not launched by a supervisor: none of its markers (src/lib/supervisor-markers.ts) may ride along.
|
|
703
|
+
for (const name of ["OCX_DESKTOP_SUPERVISED", "OCX_SERVICE_MANAGED", "OCX_WINDOWS_WRAPPER_PROTOCOL"]) delete env[name];
|
|
690
704
|
const runtimeEnv = withProcessRuntimeProvenance(env);
|
|
691
705
|
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
692
706
|
const child = guardedSpawn(homePolicy.authorizeMutation, "runtime", process.execPath, [postUpdateLauncher, "start", "--port", String(capturedListen.port)], {
|
|
@@ -1007,6 +1021,7 @@ async function runUpdateWithSession(child: Extract<OrchestratedChildArgs, { ok:
|
|
|
1007
1021
|
session.noteUntrackedInstaller();
|
|
1008
1022
|
const supervised = runWindowsInstallerSync({ file: target.bin, args: target.args, options: target.options }, {
|
|
1009
1023
|
env: mutation.unprivilegedEnvironment(), authorizeMutation: homePolicy.authorizeMutation,
|
|
1024
|
+
markerPath: join(getConfigDir(), "update-orchestrated.json"),
|
|
1010
1025
|
});
|
|
1011
1026
|
if (supervised.processTreeExited === true && Number.isInteger(supervised.status)) session.confirmInstallerExit();
|
|
1012
1027
|
else session.retainInstallerFence();
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
|
|
2
|
+
import { isInMarkedPnpmCustomStore, isInPnpmGlobalStoreLinks } from "./pnpm-store-layout.mjs";
|
|
2
3
|
|
|
3
4
|
const OPENCODEX_MISE_BACKEND = "npm:@bitkyc08/opencodex";
|
|
4
5
|
const OPENCODEX_MISE_BACKEND_DIR = "npm-bitkyc08-opencodex";
|
|
@@ -252,7 +253,8 @@ function detectInstallCandidate(packagePath, exists) {
|
|
|
252
253
|
// npm prefix such as `/opt/global/v11` from its directory name alone.
|
|
253
254
|
if (
|
|
254
255
|
/(?:^|\/)node_modules\/\.pnpm(?:\/|$)/i.test(normalized)
|
|
255
|
-
||
|
|
256
|
+
|| isInPnpmGlobalStoreLinks(normalized, exists)
|
|
257
|
+
|| isInMarkedPnpmCustomStore(normalized, exists)
|
|
256
258
|
) return "pnpm";
|
|
257
259
|
|
|
258
260
|
// `--preserve-symlinks` can leave a v10/v11 group path visible. Corroborate it with the
|
|
@@ -12,6 +12,8 @@ export function spawnWorkerPinnedStart(cmd: { bin: string; args: string[]; displ
|
|
|
12
12
|
// An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
|
|
13
13
|
const env: NodeJS.ProcessEnv = withoutSiblingMarker(process.env);
|
|
14
14
|
delete env.OCX_SERVICE;
|
|
15
|
+
// Not launched by a supervisor: none of its markers (src/lib/supervisor-markers.ts) may ride along.
|
|
16
|
+
for (const name of ["OCX_DESKTOP_SUPERVISED", "OCX_SERVICE_MANAGED", "OCX_WINDOWS_WRAPPER_PROTOCOL"]) delete env[name];
|
|
15
17
|
report(`$ ${cmd.display}`);
|
|
16
18
|
let stdio: "ignore" | [ "ignore", number, number ] = "ignore";
|
|
17
19
|
let logFd: number | undefined;
|
|
@@ -1,39 +1,26 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getConfigDir } from "../config";
|
|
3
|
-
import { guardedStopWinsw, guardedStopWindows, guardedKillWindowsWrappers } from "./guarded-runtime-ops";
|
|
4
|
-
import { readServiceBackend } from "../service";
|
|
1
|
+
import { guardedStopWindowsChecked } from "./guarded-runtime-ops";
|
|
5
2
|
import type { UpdateMutationAuthorizer } from "./mutation-guard.mjs";
|
|
6
3
|
|
|
7
|
-
/**
|
|
8
|
-
export
|
|
9
|
-
|
|
10
|
-
try {
|
|
11
|
-
if (readServiceBackend() === "native") {
|
|
12
|
-
if (!authorizeMutation("service")) return;
|
|
13
|
-
guardedStopWinsw(authorizeMutation);
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
if (!authorizeMutation("service")) return;
|
|
17
|
-
guardedStopWindows(authorizeMutation);
|
|
18
|
-
} catch { /* already stopped */ }
|
|
19
|
-
if (!authorizeMutation("service")) return;
|
|
20
|
-
killWindowsServiceWrapperProcesses(authorizeMutation);
|
|
21
|
-
}
|
|
4
|
+
/** Why an automatic update restart stopped instead of starting a runtime over a live service. */
|
|
5
|
+
export const WINDOWS_SERVICE_STOP_ABORT = "Automatic update restart stopped: the Windows service could not be proven stopped, "
|
|
6
|
+
+ "so no runtime was started over it. Run 'ocx stop' from a terminal, then 'ocx start'.";
|
|
22
7
|
|
|
23
8
|
/**
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
* `:loop` batch, which brings the proxy back during post-update reclaim.
|
|
9
|
+
* Stop the installed Windows backend before the updater replaces or restarts the runtime.
|
|
10
|
+
* Returns false when the restart must abort; true when nothing can relaunch the proxy.
|
|
27
11
|
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
12
|
+
* Both backends use Part A of the checked stop (#7771) through the authorizer-gated
|
|
13
|
+
* variant: the service authorization runs at entry and before every terminate, and only
|
|
14
|
+
* stopped or absent lets the restart go on.
|
|
31
15
|
*/
|
|
32
|
-
function
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
16
|
+
export async function stopWindowsServiceForRestart(authorizeMutation: UpdateMutationAuthorizer): Promise<boolean> {
|
|
17
|
+
if (process.platform !== "win32") return true;
|
|
18
|
+
if (!authorizeMutation("service")) return false;
|
|
19
|
+
try {
|
|
20
|
+
const outcome = await guardedStopWindowsChecked(authorizeMutation);
|
|
21
|
+
return outcome === "stopped" || outcome === "absent";
|
|
22
|
+
} catch {
|
|
23
|
+
// A refusal by the service authorizer (at entry or before a terminate) aborts too.
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
39
26
|
}
|
package/src/update/job.ts
CHANGED
|
@@ -22,7 +22,7 @@ import {
|
|
|
22
22
|
type HealthzIdentity,
|
|
23
23
|
} from "../server/proxy-liveness";
|
|
24
24
|
import { isServiceInstalled, isServiceViable } from "../service";
|
|
25
|
-
import {
|
|
25
|
+
import { stopWindowsServiceForRestart, WINDOWS_SERVICE_STOP_ABORT } from "./job-windows-restart";
|
|
26
26
|
import { createUpdateServiceHomePolicy, inspectUpdateServiceHome, type UpdateServiceHomeInspector } from "./service-home-authority";
|
|
27
27
|
import { runUpdateRestartWithOwnershipLease, type ServiceOwnershipResolution } from "./restart-ownership";
|
|
28
28
|
import { restartServiceManagerAfterUpdate, unsettledManagerRestartFailure, unsupervisedRestartFailure, type ManagerRestartFn } from "./job-supervised-restart";
|
|
@@ -396,6 +396,10 @@ export function readUpdateJob(jobId?: string | null): UpdateJobState | null {
|
|
|
396
396
|
function updateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?: string): UpdateJobState {
|
|
397
397
|
const next = prepareUpdateJob(job, patch, logLine); writeJob(next); return next;
|
|
398
398
|
}
|
|
399
|
+
/** A Windows service that could not be proven stopped aborts the restart (#7771). */
|
|
400
|
+
function windowsServiceStopAborted(job: UpdateJobState): false {
|
|
401
|
+
updateJob(job, { status: "failed", restarted: false, error: WINDOWS_SERVICE_STOP_ABORT }, WINDOWS_SERVICE_STOP_ABORT); return false;
|
|
402
|
+
}
|
|
399
403
|
function prepareUpdateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?: string): UpdateJobState {
|
|
400
404
|
const current = readUpdateJob(job.id) ?? job;
|
|
401
405
|
const next = {
|
|
@@ -954,7 +958,8 @@ export interface RestartIo {
|
|
|
954
958
|
serviceInstalledFn?: () => boolean;
|
|
955
959
|
serviceHomeAuthorityFn?: UpdateServiceHomeInspector;
|
|
956
960
|
serviceHomeBaseline?: ReturnType<UpdateServiceHomeInspector>; // Worker delegation pins its original authority.
|
|
957
|
-
|
|
961
|
+
/** Windows service stop before a restart; an explicit false aborts the restart (#7771). */
|
|
962
|
+
stopServiceWrappersFn?: (authorizeMutation: UpdateMutationAuthorizer) => boolean | void | Promise<boolean | void>;
|
|
958
963
|
readPidFn?: typeof readPid;
|
|
959
964
|
/**
|
|
960
965
|
* After a service reinstall exits 0, only trust the service path when this is true.
|
|
@@ -1121,7 +1126,7 @@ async function restartAfterUpdate(
|
|
|
1121
1126
|
if (!homePolicy.authorizeMutation("runtime")) return false; // a home change during the service-args import refuses before stop/reclaim
|
|
1122
1127
|
// schtasks /end often leaves the hidden wrapper alive; its :loop respawns
|
|
1123
1128
|
// `ocx start` and races reclaim, so end wrappers before the socket.
|
|
1124
|
-
if (homePolicy.authorizeMutation("service")
|
|
1129
|
+
if (homePolicy.authorizeMutation("service") && await (io.stopServiceWrappersFn ?? stopWindowsServiceForRestart)(homePolicy.authorizeMutation) === false) return windowsServiceStopAborted(job);
|
|
1125
1130
|
const preServiceAllow = reclaimKillAllowlist();
|
|
1126
1131
|
const freed = await waitFn(port, hostname, reclaimOptsFor(preServiceAllow));
|
|
1127
1132
|
if (!freed && !reclaimGate()) return false; // a latched denial already refused the job
|
|
@@ -1249,7 +1254,7 @@ async function restartAfterUpdate(
|
|
|
1249
1254
|
// below are the path that repairs stuck Windows listeners.
|
|
1250
1255
|
}
|
|
1251
1256
|
}
|
|
1252
|
-
if (serviceInstalled && homePolicy.authorizeMutation("service")
|
|
1257
|
+
if (serviceInstalled && homePolicy.authorizeMutation("service") && await (io.stopServiceWrappersFn ?? stopWindowsServiceForRestart)(homePolicy.authorizeMutation) === false) return windowsServiceStopAborted(job);
|
|
1253
1258
|
// Reclaim before the pinned start: a busy old socket used to hop ports or fail health.
|
|
1254
1259
|
const directAllow = reclaimKillAllowlist();
|
|
1255
1260
|
const freed = await waitFn(port, hostname, reclaimOptsFor(directAllow));
|
|
@@ -1348,7 +1353,9 @@ async function restartAfterUpdate(
|
|
|
1348
1353
|
lastChild = null;
|
|
1349
1354
|
}
|
|
1350
1355
|
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1351
|
-
|
|
1356
|
+
// #7771: the service stop runs before the synchronous preparation so its outcome can abort.
|
|
1357
|
+
if (serviceInstalled && homePolicy.authorizeMutation("service") && await (io.stopServiceWrappersFn ?? stopWindowsServiceForRestart)(homePolicy.authorizeMutation) === false) return windowsServiceStopAborted(job);
|
|
1358
|
+
if (preparePort(job, port, listPids, aliveFn, verifyOcx, undefined, reclaimGate) === false) return false;
|
|
1352
1359
|
const ready = await waitForGhost(
|
|
1353
1360
|
port,
|
|
1354
1361
|
hostname,
|
|
@@ -5,4 +5,15 @@ export declare function runWindowsInstallerSync(invocation: NpmInvocation, optio
|
|
|
5
5
|
cwd?: string;
|
|
6
6
|
timeoutMs?: number;
|
|
7
7
|
authorizeMutation?: (kind: "package") => boolean;
|
|
8
|
+
markerPath?: string;
|
|
8
9
|
}): { status: number | null; processTreeExited: boolean };
|
|
10
|
+
export declare function runNpmInstall(invocation: NpmInvocation | null, options?: {
|
|
11
|
+
env?: NodeJS.ProcessEnv;
|
|
12
|
+
timeoutMs?: number;
|
|
13
|
+
authorizeMutation?: (kind: "package") => boolean;
|
|
14
|
+
markerPath?: string;
|
|
15
|
+
}): Promise<{ status: number | null; processTreeExited: boolean; error?: { code?: string; message: string } }>;
|
|
16
|
+
export declare function setWindowsInstallerSupervisorForTests(seams: {
|
|
17
|
+
platform?: NodeJS.Platform;
|
|
18
|
+
launch?: (file: string, args: string[], options: { env: NodeJS.ProcessEnv; windowsHide: boolean; stdio: ["pipe", "pipe", "pipe"] }) => import("node:child_process").ChildProcess;
|
|
19
|
+
} | null): void;
|