@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,172 @@
|
|
|
1
|
+
import {
|
|
2
|
+
CliUsageError, RuntimeApiError, printData, rejectArgs, runCliAction, runtimeRequest, terminalSafeText,
|
|
3
|
+
type RuntimeApiDeps,
|
|
4
|
+
} from "./runtime-api";
|
|
5
|
+
import { integrationFlag, integrationOption } from "./integration-input";
|
|
6
|
+
import { readLinkChildContext, linkChildRefusal, type LinkChildContext } from "./link-child";
|
|
7
|
+
import { isRouteClientId, parseRouteClientIntent } from "../link/route-intent";
|
|
8
|
+
import type { RouteToStatus } from "../routing/route-to-status";
|
|
9
|
+
|
|
10
|
+
export const ROUTE_TO_USAGE = `Usage:
|
|
11
|
+
ocx route to status [--device <alias|id|all|this>] [--json]
|
|
12
|
+
ocx route to sync [--device <alias|id|all|this>] [--overwrite-conflict] [--json]
|
|
13
|
+
ocx route to <client> <on|off|inherit> [--device <alias|id|this>] [--accounts <all|none|userId,...>] [--model-names <alias|routed>] [--overwrite-conflict] [--json]
|
|
14
|
+
ocx route to <client> <off|inherit> --local [--device this] [--json]`;
|
|
15
|
+
|
|
16
|
+
const loadLocal = () => import("../routing/route-to-local");
|
|
17
|
+
export interface RouteToDeps extends RuntimeApiDeps {
|
|
18
|
+
readChildContext?: () => LinkChildContext | null;
|
|
19
|
+
loadLocal?: typeof loadLocal;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export function routeToStatusLines(status: RouteToStatus): string[] {
|
|
23
|
+
return ["DEVICE CLIENT INTENT SOURCE APPLIED TARGET", ...status.devices.flatMap(device =>
|
|
24
|
+
device.routeIntent === "unsupported" ? [`${device.alias || device.id} route intent unsupported (${device.reason ?? "unsupported"})`]
|
|
25
|
+
: device.clients.map(row => [device.alias || device.id, row.client, row.intent, row.source,
|
|
26
|
+
row.applied ?? "-", row.target ?? "-"].join(" "))),
|
|
27
|
+
...(status.syncs ?? []).map(row => `sync ${row.id}: ${row.state}${row.reason ? ` (${row.reason})` : ""}`),
|
|
28
|
+
...(status.deferred ? [`Local reconciliation deferred: Home intent or the Child catalog is unavailable${status.deferred.clients.length ? ` (${status.deferred.clients.join(", ")})` : ""}.`] : [])];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function accountsOption(raw: string | undefined): "all" | "none" | string[] | undefined {
|
|
32
|
+
if (raw === undefined || raw === "all" || raw === "none") return raw;
|
|
33
|
+
const values = raw.split(",").map(value => value.trim());
|
|
34
|
+
if (!parseRouteClientIntent({ enabled: true, accounts: values }, "aside")
|
|
35
|
+
|| values.some(value => value === "all" || value === "none")) {
|
|
36
|
+
throw new CliUsageError("--accounts requires all, none, or unique Aside userIds (not u/N slots)", ROUTE_TO_USAGE);
|
|
37
|
+
}
|
|
38
|
+
return values;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Shared with legacy toggle aliases, inside their existing error boundary. */
|
|
42
|
+
export async function routeToAction(argv: string[], deps: RouteToDeps = {}): Promise<void> {
|
|
43
|
+
const args = [...argv];
|
|
44
|
+
const json = integrationFlag(args, "--json");
|
|
45
|
+
const local = integrationFlag(args, "--local");
|
|
46
|
+
const overwriteConflict = integrationFlag(args, "--overwrite-conflict");
|
|
47
|
+
const device = integrationOption(args, "--device");
|
|
48
|
+
const accounts = accountsOption(integrationOption(args, "--accounts"));
|
|
49
|
+
const modelNames = integrationOption(args, "--model-names");
|
|
50
|
+
const subject = args.shift() ?? "status";
|
|
51
|
+
const read = subject === "status";
|
|
52
|
+
const sync = subject === "sync";
|
|
53
|
+
const client = read || sync ? undefined : subject;
|
|
54
|
+
const action = client === undefined ? undefined : args.shift();
|
|
55
|
+
rejectArgs(args, ROUTE_TO_USAGE);
|
|
56
|
+
if (device !== undefined && (!device.trim() || /[\x00-\x20\x7f]/.test(device))) {
|
|
57
|
+
throw new CliUsageError("--device requires an alias, id, all or this", ROUTE_TO_USAGE);
|
|
58
|
+
}
|
|
59
|
+
if (client !== undefined && !isRouteClientId(client)) {
|
|
60
|
+
throw new CliUsageError("Expected a supported route-to client", ROUTE_TO_USAGE);
|
|
61
|
+
}
|
|
62
|
+
if (client !== undefined && !["on", "off", "inherit"].includes(action ?? "")) {
|
|
63
|
+
throw new CliUsageError("Expected a supported client and on, off or inherit", ROUTE_TO_USAGE);
|
|
64
|
+
}
|
|
65
|
+
if (client !== undefined && device === "all") {
|
|
66
|
+
throw new CliUsageError("--device all applies only to status or sync; omit --device to change the Home default", ROUTE_TO_USAGE);
|
|
67
|
+
}
|
|
68
|
+
if (modelNames !== undefined && (modelNames !== "alias" && modelNames !== "routed")) {
|
|
69
|
+
throw new CliUsageError("--model-names must be alias or routed", ROUTE_TO_USAGE);
|
|
70
|
+
}
|
|
71
|
+
if (accounts !== undefined && (client !== "aside" || action !== "on")) {
|
|
72
|
+
throw new CliUsageError("--accounts requires aside on", ROUTE_TO_USAGE);
|
|
73
|
+
}
|
|
74
|
+
if (modelNames !== undefined && (action !== "on" || (client !== "hermes" && client !== "commandcode"))) {
|
|
75
|
+
throw new CliUsageError("--model-names requires hermes or commandcode on", ROUTE_TO_USAGE);
|
|
76
|
+
}
|
|
77
|
+
if (overwriteConflict && !sync && action !== "on") {
|
|
78
|
+
throw new CliUsageError("--overwrite-conflict applies only to on or sync", ROUTE_TO_USAGE);
|
|
79
|
+
}
|
|
80
|
+
if (local && (client === undefined || !["off", "inherit"].includes(action ?? "") || overwriteConflict)) {
|
|
81
|
+
throw new CliUsageError("--local supports only client off or inherit", ROUTE_TO_USAGE);
|
|
82
|
+
}
|
|
83
|
+
if (action === "inherit" && device === undefined && !local) {
|
|
84
|
+
throw new CliUsageError("inherit requires --device or --local", ROUTE_TO_USAGE);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// Detect Child before runtimeRequest: these operations must never enter its Home relay.
|
|
88
|
+
const child = (deps.readChildContext ?? readLinkChildContext)();
|
|
89
|
+
let result: unknown;
|
|
90
|
+
let requestFailure: RuntimeApiError | undefined;
|
|
91
|
+
if (child) {
|
|
92
|
+
if (device !== undefined && device !== "this" && device !== child.linkId) {
|
|
93
|
+
throw new CliUsageError("A Child can target only --device this or its own link id", ROUTE_TO_USAGE);
|
|
94
|
+
}
|
|
95
|
+
if (client !== undefined && !local) {
|
|
96
|
+
const command = ["ocx route to", client, action, "--device", child.linkId,
|
|
97
|
+
...(accounts === undefined ? [] : ["--accounts", Array.isArray(accounts) ? accounts.join(",") : accounts]),
|
|
98
|
+
...(modelNames === undefined ? [] : ["--model-names", modelNames]),
|
|
99
|
+
...(overwriteConflict ? ["--overwrite-conflict"] : [])].join(" ");
|
|
100
|
+
throw new RuntimeApiError(`${linkChildRefusal(child)}\nRun on the Home: ${command}`, 409, null);
|
|
101
|
+
}
|
|
102
|
+
const api = await (deps.loadLocal ?? loadLocal)();
|
|
103
|
+
result = read ? await api.readLocalRouteToStatus(child)
|
|
104
|
+
: sync ? await api.syncLocalRouteTo(child, overwriteConflict)
|
|
105
|
+
: await api.setLocalRouteToOff(child, client!, action === "off");
|
|
106
|
+
} else {
|
|
107
|
+
if (local) throw new CliUsageError("--local requires a Remote Link Child", ROUTE_TO_USAGE);
|
|
108
|
+
const body = { ...(device === undefined ? {} : { device }),
|
|
109
|
+
...(overwriteConflict ? { overwriteConflict: true } : {}) };
|
|
110
|
+
try {
|
|
111
|
+
result = read ? await runtimeRequest(`/api/route-to${device === undefined ? "" : `?device=${encodeURIComponent(device)}`}`, { redirect: "error" }, deps)
|
|
112
|
+
: await runtimeRequest(sync ? "/api/route-to/sync" : "/api/route-to", {
|
|
113
|
+
method: sync ? "POST" : "PUT", redirect: "error",
|
|
114
|
+
headers: { "content-type": "application/json" },
|
|
115
|
+
body: JSON.stringify(sync ? body : { client, action, ...body,
|
|
116
|
+
...(accounts === undefined ? {} : { accounts }), ...(modelNames === undefined ? {} : { modelNames }) }),
|
|
117
|
+
}, deps);
|
|
118
|
+
} catch (error) {
|
|
119
|
+
if (!(error instanceof RuntimeApiError) || !error.body || typeof error.body !== "object"
|
|
120
|
+
|| !("schema" in error.body) || error.body.schema !== "ocx.route-to/1") throw error;
|
|
121
|
+
requestFailure = error;
|
|
122
|
+
result = error.body;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
const status = result as RouteToStatus;
|
|
126
|
+
if (!status || status.schema !== "ocx.route-to/1" || !Array.isArray(status.devices) || status.devices.length === 0
|
|
127
|
+
|| (status.deferred !== undefined && (!status.deferred || status.deferred.reason !== "intent_or_catalog_pending"
|
|
128
|
+
|| !Array.isArray(status.deferred.clients) || status.deferred.clients.some(client => !isRouteClientId(client))))
|
|
129
|
+
|| (status.syncs !== undefined && (!Array.isArray(status.syncs) || status.syncs.some(row => !row || typeof row.id !== "string"
|
|
130
|
+
|| !["synced", "failed", "pending", "unsupported"].includes(row.state) || (row.reason !== undefined && typeof row.reason !== "string"))))
|
|
131
|
+
|| (status.warnings !== undefined && (!Array.isArray(status.warnings) || status.warnings.some(row => typeof row !== "string")))
|
|
132
|
+
|| status.devices.some(row => !row || typeof row.id !== "string" || !Array.isArray(row.clients)
|
|
133
|
+
|| (row.routeIntent === undefined ? row.clients.length === 0
|
|
134
|
+
: row.routeIntent !== "unsupported" || row.clients.length !== 0 || typeof row.reason !== "string")
|
|
135
|
+
|| (row.alias !== undefined && typeof row.alias !== "string")
|
|
136
|
+
|| row.clients.some(client => !client || !isRouteClientId(client.client)
|
|
137
|
+
|| (client.intent !== "on" && client.intent !== "off" && !(client.intent === "unresolved" && client.client === "aside"))
|
|
138
|
+
|| !["builtin", "default", "device", "native", "local"].includes(client.source)
|
|
139
|
+
|| (client.applied !== null && !["current", "stale", "not_installed", "conflict", "failed"].includes(client.applied))
|
|
140
|
+
|| (client.target !== undefined && typeof client.target !== "string")))) {
|
|
141
|
+
throw new RuntimeApiError("Invalid route-to status response; outcome is unverified. Read status before retrying.", 502, null);
|
|
142
|
+
}
|
|
143
|
+
if (!read) {
|
|
144
|
+
const requested = child?.linkId ?? (device === undefined || device === "this" ? "home" : device);
|
|
145
|
+
const matching = status.devices.filter(row => row.id === requested || row.alias === requested);
|
|
146
|
+
if ((requested !== "all" && matching.length !== 1)
|
|
147
|
+
|| (client !== undefined && !matching[0]?.clients.some(row => row.client === client))) {
|
|
148
|
+
throw new RuntimeApiError("Invalid route-to status response; requested device/client is unverified. Read status before retrying.", 502, null);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
printData(status, json, routeToStatusLines(status));
|
|
152
|
+
// Notices about a client the request left alone; the JSON body carries them too.
|
|
153
|
+
for (const warning of status.warnings ?? []) console.error(terminalSafeText(warning));
|
|
154
|
+
if (requestFailure) throw requestFailure;
|
|
155
|
+
if (status.syncs?.some(row => row.state === "failed")) {
|
|
156
|
+
throw new RuntimeApiError("Route sync failed for one or more devices. Read status before retrying.", 502, null);
|
|
157
|
+
}
|
|
158
|
+
if (sync && status.deferred) {
|
|
159
|
+
throw new RuntimeApiError("Local route sync is deferred; not all client configurations were reconciled. Retry when the Home and Child catalog are available.", 503, null);
|
|
160
|
+
}
|
|
161
|
+
const failedClients = status.devices.flatMap(row => row.clients.filter(entry => entry.applied === "failed" || entry.applied === "conflict"));
|
|
162
|
+
if (!read && failedClients.some(entry => client === undefined || entry.client === client)) {
|
|
163
|
+
throw new RuntimeApiError("Route intent returned unresolved client failures or conflicts. Read status before retrying.", 409, null);
|
|
164
|
+
}
|
|
165
|
+
if (!read && client !== undefined && failedClients.length > 0) {
|
|
166
|
+
console.error("Route status includes unresolved failures or conflicts for other clients; review their status.");
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
export function handleRouteToCommand(argv: string[], deps: RouteToDeps = {}): Promise<number> {
|
|
171
|
+
return runCliAction(() => routeToAction(argv, deps));
|
|
172
|
+
}
|
package/src/cli/runtime-api.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import { findLiveProxy, probeHostname, type LivenessIo, type LiveProxy } from "../server/proxy-liveness";
|
|
13
13
|
import { runningProxyUpdateHeaders } from "../oauth/login-cli";
|
|
14
|
+
import { terminalSafeText } from "../lib/terminal-safe-text";
|
|
14
15
|
import { redactSecretArgs } from "./secret-args";
|
|
15
16
|
import type { LinkHomeDeps } from "../client/link-home";
|
|
16
17
|
export { redactSecretArgs };
|
|
@@ -19,6 +20,8 @@ export type CliStdin = NodeJS.ReadableStream & { isTTY?: boolean; readableEnded?
|
|
|
19
20
|
|
|
20
21
|
export const MAX_LINK_CREDENTIAL_BYTES = 4 * 1024;
|
|
21
22
|
|
|
23
|
+
import type { AntigravityRiskSeams } from "../oauth/antigravity-risk";
|
|
24
|
+
|
|
22
25
|
export interface RuntimeApiDeps {
|
|
23
26
|
baseUrl?: string;
|
|
24
27
|
fetchImpl?: typeof fetch;
|
|
@@ -31,6 +34,8 @@ export interface RuntimeApiDeps {
|
|
|
31
34
|
findLiveProxy?: (io?: LivenessIo) => Promise<LiveProxy | null>;
|
|
32
35
|
/** Remote Link Child: how allowlisted reads reach the Home (#6957). */
|
|
33
36
|
linkHome?: LinkHomeDeps;
|
|
37
|
+
/** Test seams for the Google Antigravity acknowledgement (agent detection, prompt visibility). */
|
|
38
|
+
antigravityRisk?: AntigravityRiskSeams;
|
|
34
39
|
}
|
|
35
40
|
|
|
36
41
|
export class CliUsageError extends Error {
|
|
@@ -503,15 +508,11 @@ export function desktopSwitchApplyReason(reason: unknown): string {
|
|
|
503
508
|
* connected `ocx sync` refresh both print them -- so the escaping sits beside `printData`, at the
|
|
504
509
|
* one boundary that already separates human output from structured output. Structured output keeps
|
|
505
510
|
* the exact value: escaping is a rendering decision for a tty, not a change to the data.
|
|
511
|
+
*
|
|
512
|
+
* Re-exported from `src/lib/terminal-safe-text.ts` because the OAuth device login prints the same
|
|
513
|
+
* class of untrusted value and importing this module from there would close an import cycle.
|
|
506
514
|
*/
|
|
507
|
-
export
|
|
508
|
-
return value.replace(/[\x00-\x1f\x7f-\x9f\u2028\u2029]/g, character => {
|
|
509
|
-
const code = character.charCodeAt(0);
|
|
510
|
-
return code <= 0x7f
|
|
511
|
-
? `\\x${code.toString(16).padStart(2, "0")}`
|
|
512
|
-
: `\\u${code.toString(16).padStart(4, "0")}`;
|
|
513
|
-
});
|
|
514
|
-
}
|
|
515
|
+
export { terminalSafeText };
|
|
515
516
|
|
|
516
517
|
/**
|
|
517
518
|
* The same rendering for a failure about to be printed or rethrown. The original is kept as
|
package/src/cli/status.ts
CHANGED
|
@@ -38,6 +38,7 @@ import { LOCAL_MANAGEMENT_READ_PATHS } from "../lib/local-management-capability"
|
|
|
38
38
|
import { fetchBoundLocalManagementRead } from "../server/local-management-read-client";
|
|
39
39
|
import { collectAppliedCodexSettingsStatus, type CliAppliedCodexSettingsStatus } from "./status-codex-settings";
|
|
40
40
|
import { installDetectionStatus, type InstallDetectionStatus } from "./status-install";
|
|
41
|
+
import { windowsDesktopInstall, withDesktopSkewAdvice } from "../desktop-update/install";
|
|
41
42
|
import { collectLocalCredentials, type LocalCredentialSnapshot } from "../local-credentials/inventory";
|
|
42
43
|
import { collectLinkConnectionGeneration } from "./status-link";
|
|
43
44
|
|
|
@@ -753,9 +754,11 @@ export function unusedProxyWarningLines(input: {
|
|
|
753
754
|
];
|
|
754
755
|
}
|
|
755
756
|
if (!input.proxyUp) return [];
|
|
757
|
+
// `ocx start` refuses beside a live proxy (and under the desktop app); `ocx sync` writes the
|
|
758
|
+
// routing to the running one under every owner.
|
|
756
759
|
return [
|
|
757
760
|
"⚠️ Codex routing is native — the running proxy is unused.",
|
|
758
|
-
" Codex requests go to OpenAI, not this proxy. Re-point with: ocx
|
|
761
|
+
" Codex requests go to OpenAI, not this proxy. Re-point with: ocx sync",
|
|
759
762
|
];
|
|
760
763
|
}
|
|
761
764
|
|
|
@@ -942,7 +945,9 @@ export async function collectStatus(options: { mainAccountPolicy?: boolean } = {
|
|
|
942
945
|
const pid = resolveStatusPid(live, pidFile);
|
|
943
946
|
// No extra request: findLiveProxy's identity probe already parsed and validated the
|
|
944
947
|
// healthz body, so the version came back with the liveness result.
|
|
945
|
-
|
|
948
|
+
// #8246: on a Windows Desktop installation a newer CLI means the MSI installed an update that the
|
|
949
|
+
// running runtime has not picked up; the warning says so with the command that finishes it.
|
|
950
|
+
const versionSkew = withDesktopSkewAdvice(computeVersionSkew(packageVersion(), live?.version), windowsDesktopInstall(), live?.source);
|
|
946
951
|
// OCX-6: what this machine applied and, on a Child, when its runtime started. Additive and
|
|
947
952
|
// always present (null when unknown), so `schemaVersion` stays 1.
|
|
948
953
|
const appliedCodexSettings = await collectAppliedCodexSettingsStatus(config, live);
|
package/src/cli/stop-approval.ts
CHANGED
|
@@ -4,7 +4,9 @@ import { waitForPortAvailable } from "../server/ports";
|
|
|
4
4
|
import { probeEndpointLiveness, probeHostname } from "../server/proxy-liveness";
|
|
5
5
|
import type { GuardedManagerTarget } from "../service/guarded-manager-target";
|
|
6
6
|
import type { ResolveJson } from "./resolve";
|
|
7
|
-
import { STOP_SUMMARY_SCHEMA, type StopOutcome, type StopRunRecord, type StopServiceOutcome } from "./stop-report";
|
|
7
|
+
import { STOP_SUMMARY_SCHEMA, stopReasonFields, type StopOutcome, type StopRunRecord, type StopServiceOutcome, type StopServiceReason } from "./stop-report";
|
|
8
|
+
|
|
9
|
+
type MaybePromise<T> = T | Promise<T>;
|
|
8
10
|
|
|
9
11
|
export interface StopApproval {
|
|
10
12
|
pid: number;
|
|
@@ -36,15 +38,43 @@ function sameGuardedManager(
|
|
|
36
38
|
current: GuardedManagerTarget,
|
|
37
39
|
): boolean {
|
|
38
40
|
if (expected.kind === "absent") return current.kind === "absent";
|
|
41
|
+
if (expected.kind === "bound-stray") {
|
|
42
|
+
// The bound wrapper set is the identity (#7771): same PIDs with the same creation times.
|
|
43
|
+
if (current.kind !== "bound-stray" || current.pid !== expected.pid) return false;
|
|
44
|
+
const key = (set: { pid: number; startTime: number }[]) =>
|
|
45
|
+
set.map(wrapper => `${wrapper.pid}@${wrapper.startTime}`).sort().join(",");
|
|
46
|
+
return key(current.wrappers) === key(expected.wrappers);
|
|
47
|
+
}
|
|
39
48
|
return current.kind === "bound" && current.pid === expected.pid
|
|
40
49
|
&& current.managerPid === expected.managerPid && current.backend === expected.backend;
|
|
41
50
|
}
|
|
42
51
|
|
|
43
|
-
export type StopApprovalParse =
|
|
52
|
+
export type StopApprovalParse =
|
|
53
|
+
| { ok: true; json: boolean; approval: StopApproval | null; deadlineMs: number | null }
|
|
54
|
+
| { ok: false };
|
|
44
55
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
56
|
+
/**
|
|
57
|
+
* --deadline-ms <n> (#7771): a positive decimal number of milliseconds, measured from this
|
|
58
|
+
* process's start; at most once, anywhere in the argument list. Removed here so the
|
|
59
|
+
* approval grammar below stays exactly what it was.
|
|
60
|
+
*/
|
|
61
|
+
function takeStopDeadline(argv: string[]): { argv: string[]; deadlineMs: number | null } | null {
|
|
62
|
+
const at = argv.indexOf("--deadline-ms");
|
|
63
|
+
if (at < 0) return { argv, deadlineMs: null };
|
|
64
|
+
if (argv.indexOf("--deadline-ms", at + 1) >= 0) return null;
|
|
65
|
+
const raw = argv[at + 1];
|
|
66
|
+
if (raw === undefined || !/^\d+$/.test(raw)) return null;
|
|
67
|
+
const value = Number(raw);
|
|
68
|
+
if (!Number.isSafeInteger(value) || value <= 0) return null;
|
|
69
|
+
return { argv: [...argv.slice(0, at), ...argv.slice(at + 2)], deadlineMs: value };
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export function parseStopApproval(input: string[]): StopApprovalParse {
|
|
73
|
+
const taken = takeStopDeadline(input);
|
|
74
|
+
if (!taken) return { ok: false };
|
|
75
|
+
const { argv, deadlineMs } = taken;
|
|
76
|
+
if (argv.length === 0) return { ok: true, json: false, approval: null, deadlineMs };
|
|
77
|
+
if (argv.every(arg => arg === "--json")) return { ok: true, json: true, approval: null, deadlineMs };
|
|
48
78
|
const names = ["--expect-pid", "--expect-port", "--expect-hostname",
|
|
49
79
|
"--expect-config-home", "--expect-cli-version", "--expect-compatibility-token"];
|
|
50
80
|
if (argv.filter(arg => arg === "--json").length !== 1) return { ok: false };
|
|
@@ -68,7 +98,7 @@ export function parseStopApproval(argv: string[]): StopApprovalParse {
|
|
|
68
98
|
const cliVersion = values.get("--expect-cli-version") ?? "";
|
|
69
99
|
if (pid === null || port === null || !/^[a-f0-9]{64}$/.test(compatibilityToken)
|
|
70
100
|
|| !configHome || !cliVersion) return { ok: false };
|
|
71
|
-
return { ok: true, json: true, approval: {
|
|
101
|
+
return { ok: true, json: true, deadlineMs, approval: {
|
|
72
102
|
pid, port, hostname: values.get("--expect-hostname") ?? "",
|
|
73
103
|
configHome, cliVersion, compatibilityToken,
|
|
74
104
|
} };
|
|
@@ -104,23 +134,25 @@ export function stopApprovalMismatch(expected: StopApproval, now: ResolveJson):
|
|
|
104
134
|
return null;
|
|
105
135
|
}
|
|
106
136
|
|
|
107
|
-
export function approvalChanged(detail?: string): StopOutcome {
|
|
137
|
+
export function approvalChanged(detail?: string, serviceStopReason?: StopServiceReason): StopOutcome {
|
|
108
138
|
return { ok: false, summary: {
|
|
109
139
|
schema: STOP_SUMMARY_SCHEMA, ok: false, outcome: "approval-changed", exitCode: 1,
|
|
110
140
|
runtimeDown: false, service: "absent", proxy: "unknown", sharedTeardown: "skipped",
|
|
111
141
|
...(detail ? { detail } : {}),
|
|
142
|
+
...stopReasonFields({ serviceStopReason }),
|
|
112
143
|
message: `The approved runtime or managing CLI changed${detail ? `: ${detail}` : ""}; no stop was attempted.`,
|
|
113
144
|
} };
|
|
114
145
|
}
|
|
115
146
|
|
|
116
147
|
export function managerStillActive(
|
|
117
148
|
service: StopServiceOutcome,
|
|
118
|
-
record?: Pick<StopRunRecord, "proxy" | "sharedTeardown">,
|
|
149
|
+
record?: Pick<StopRunRecord, "proxy" | "sharedTeardown" | "serviceStopReason" | "portHeldByForeign">,
|
|
119
150
|
): StopOutcome {
|
|
120
151
|
return { ok: false, summary: {
|
|
121
152
|
schema: STOP_SUMMARY_SCHEMA, ok: false, outcome: "manager-still-active", exitCode: 1,
|
|
122
153
|
runtimeDown: false, service,
|
|
123
154
|
proxy: record?.proxy ?? "unknown", sharedTeardown: record?.sharedTeardown ?? "skipped",
|
|
155
|
+
...stopReasonFields(record ?? {}),
|
|
124
156
|
message: "The approved runtime and service manager could not both be confirmed stopped.",
|
|
125
157
|
} };
|
|
126
158
|
}
|
|
@@ -129,14 +161,14 @@ export async function runApprovedStop(
|
|
|
129
161
|
expected: StopApproval,
|
|
130
162
|
read: () => Promise<ResolveJson | null>,
|
|
131
163
|
tracked: () => TrackedRuntimeCheck,
|
|
132
|
-
managerTarget: () => GuardedManagerTarget
|
|
164
|
+
managerTarget: () => MaybePromise<GuardedManagerTarget>,
|
|
133
165
|
stop: (snapshot: GuardedStopSnapshot) => Promise<StopOutcome>,
|
|
134
166
|
): Promise<StopOutcome> {
|
|
135
167
|
let snapshot: GuardedStopSnapshot | null = null;
|
|
136
168
|
try {
|
|
137
169
|
const now = await read();
|
|
138
170
|
const target = tracked();
|
|
139
|
-
const manager = managerTarget();
|
|
171
|
+
const manager = await managerTarget();
|
|
140
172
|
if (now === null) return approvalChanged("the runtime could not be re-resolved");
|
|
141
173
|
const mismatch = stopApprovalMismatch(expected, now);
|
|
142
174
|
if (mismatch !== null) return approvalChanged(mismatch);
|
|
@@ -149,9 +181,9 @@ export async function runApprovedStop(
|
|
|
149
181
|
return approvalChanged("the tracked runtime record changed");
|
|
150
182
|
}
|
|
151
183
|
if (manager.kind === "unknown") {
|
|
152
|
-
return approvalChanged(`the service manager could not be re-verified (${manager.reason})
|
|
184
|
+
return approvalChanged(`the service manager could not be re-verified (${manager.reason})`, manager.stopReason);
|
|
153
185
|
}
|
|
154
|
-
if (manager.kind === "bound" && manager.pid !== expected.pid) {
|
|
186
|
+
if ((manager.kind === "bound" || manager.kind === "bound-stray") && manager.pid !== expected.pid) {
|
|
155
187
|
return approvalChanged("a different manager owns the approved runtime");
|
|
156
188
|
}
|
|
157
189
|
snapshot = { approval: expected, manager };
|
|
@@ -188,30 +220,40 @@ export async function settleApprovedTarget(
|
|
|
188
220
|
export async function runGuardedManagerStep(
|
|
189
221
|
snapshot: GuardedStopSnapshot,
|
|
190
222
|
io: {
|
|
191
|
-
revalidateManager: () => GuardedManagerTarget
|
|
192
|
-
|
|
223
|
+
revalidateManager: () => MaybePromise<GuardedManagerTarget>;
|
|
224
|
+
/** Async on every platform; on Windows it is Part A of the checked stop (#7771). */
|
|
225
|
+
stopManager: () => MaybePromise<StopServiceOutcome>;
|
|
193
226
|
signalApproved: () => Promise<boolean>;
|
|
194
227
|
settle: () => Promise<boolean>;
|
|
228
|
+
/**
|
|
229
|
+
* Windows Part B after settle (#7771): the approved endpoint stays free for the hold
|
|
230
|
+
* and no wrapper of this home came back. Runs only where stopManager ran.
|
|
231
|
+
*/
|
|
232
|
+
confirmFreed?: () => Promise<boolean>;
|
|
195
233
|
managerState: () => Promise<"inactive" | "active" | "unknown">;
|
|
196
234
|
},
|
|
197
235
|
): Promise<{ service: StopServiceOutcome; effect: "stopped" | "approval-changed" | "manager-still-active" | "failed";
|
|
198
|
-
proxy: "stopped" | "unknown"; handledByProxy: boolean; detail?: string }> {
|
|
236
|
+
proxy: "stopped" | "unknown"; handledByProxy: boolean; detail?: string; stopReason?: StopServiceReason }> {
|
|
199
237
|
try {
|
|
200
|
-
const current = io.revalidateManager();
|
|
238
|
+
const current = await io.revalidateManager();
|
|
201
239
|
if (!sameGuardedManager(snapshot.manager, current)) {
|
|
202
240
|
// An unprovable manager is not a proven change: name the observation failure,
|
|
203
241
|
// not a swap, or the stop log loses why the revalidation could not answer.
|
|
204
242
|
const detail = current.kind === "unknown"
|
|
205
243
|
? `the service manager could not be re-verified (${current.reason})`
|
|
206
244
|
: "the service manager changed between approval and stop";
|
|
207
|
-
return { service: "absent", effect: "approval-changed", proxy: "unknown", handledByProxy: false, detail
|
|
245
|
+
return { service: "absent", effect: "approval-changed", proxy: "unknown", handledByProxy: false, detail,
|
|
246
|
+
...(current.kind === "unknown" && current.stopReason ? { stopReason: current.stopReason } : {}) };
|
|
208
247
|
}
|
|
209
248
|
} catch {
|
|
210
249
|
return { service: "absent", effect: "approval-changed", proxy: "unknown", handledByProxy: false,
|
|
211
250
|
detail: "the service manager could not be re-validated" };
|
|
212
251
|
}
|
|
213
|
-
|
|
214
|
-
|
|
252
|
+
// The order is the #7771 contract: the manager and its wrappers end first (nothing can
|
|
253
|
+
// relaunch the child), then the approved PID gets its graceful signal and receipt.
|
|
254
|
+
const managed = snapshot.manager.kind !== "absent";
|
|
255
|
+
const service = managed ? await io.stopManager() : "absent";
|
|
256
|
+
if (managed
|
|
215
257
|
&& service !== "stopped" && service !== "stopped-respawnable") {
|
|
216
258
|
return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy: false };
|
|
217
259
|
}
|
|
@@ -231,6 +273,11 @@ export async function runGuardedManagerStep(
|
|
|
231
273
|
if (!await io.settle()) {
|
|
232
274
|
return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy };
|
|
233
275
|
}
|
|
276
|
+
if (managed && io.confirmFreed) {
|
|
277
|
+
try {
|
|
278
|
+
if (!await io.confirmFreed()) return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy };
|
|
279
|
+
} catch { return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy }; }
|
|
280
|
+
}
|
|
234
281
|
try {
|
|
235
282
|
if (await io.managerState() !== "inactive") {
|
|
236
283
|
return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy };
|
package/src/cli/stop-report.ts
CHANGED
|
@@ -41,6 +41,12 @@ export type StopSharedTeardownOutcome =
|
|
|
41
41
|
| "failed"
|
|
42
42
|
| "skipped";
|
|
43
43
|
|
|
44
|
+
/**
|
|
45
|
+
* Why the checked Windows service stop did not succeed (#7771). Additive on ocx-stop/1:
|
|
46
|
+
* absent when the CLI has no reason to name, so older documents read unchanged.
|
|
47
|
+
*/
|
|
48
|
+
export type StopServiceReason = "access-denied" | "evidence-unreadable" | "unbound-wrapper" | "unverified-budget";
|
|
49
|
+
|
|
44
50
|
/** Facts recorded where the stop path already decides them. */
|
|
45
51
|
export interface StopRunRecord {
|
|
46
52
|
/** What stopServiceIfInstalledDetailed returned, or "error" when it threw. */
|
|
@@ -53,6 +59,10 @@ export interface StopRunRecord {
|
|
|
53
59
|
inheritedTeardownBlocks: boolean;
|
|
54
60
|
/** A discharged receipt could not be removed from disk. */
|
|
55
61
|
receiptClearFailed: boolean;
|
|
62
|
+
/** Windows checked stop: the reason a Part A or Part B result was not a success. */
|
|
63
|
+
serviceStopReason?: StopServiceReason;
|
|
64
|
+
/** Windows checked stop: Part B found another program on the port after ours were gone. */
|
|
65
|
+
portHeldByForeign?: boolean;
|
|
56
66
|
}
|
|
57
67
|
|
|
58
68
|
/** The internal booleans that already pick the process exit code. */
|
|
@@ -81,6 +91,10 @@ export interface StopSummaryJson {
|
|
|
81
91
|
* run can name one. Additive on `ocx-stop/1`; absent on every other outcome.
|
|
82
92
|
*/
|
|
83
93
|
detail?: string;
|
|
94
|
+
/** Additive (#7771): see StopRunRecord.serviceStopReason. Omitted when there is none. */
|
|
95
|
+
serviceStopReason?: StopServiceReason;
|
|
96
|
+
/** Additive (#7771): true or false once Part B ran, omitted otherwise; never null. */
|
|
97
|
+
portHeldByForeign?: boolean;
|
|
84
98
|
}
|
|
85
99
|
|
|
86
100
|
/** What handleStop returns: the pre-existing boolean plus the structured twin. */
|
|
@@ -126,6 +140,14 @@ function stopMessage(record: StopRunRecord, signals: StopRunSignals, outcome: St
|
|
|
126
140
|
return "The stop failed.";
|
|
127
141
|
}
|
|
128
142
|
|
|
143
|
+
/** The additive #7771 fields of a record, omitted when unset (never null). */
|
|
144
|
+
export function stopReasonFields(record: Partial<Pick<StopRunRecord, "serviceStopReason" | "portHeldByForeign">>): Pick<StopSummaryJson, "serviceStopReason" | "portHeldByForeign"> {
|
|
145
|
+
return {
|
|
146
|
+
...(record.serviceStopReason ? { serviceStopReason: record.serviceStopReason } : {}),
|
|
147
|
+
...(typeof record.portHeldByForeign === "boolean" ? { portHeldByForeign: record.portHeldByForeign } : {}),
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
|
|
129
151
|
/** Pure mapper from the recorded run to the wire document. */
|
|
130
152
|
export function summarizeStopRun(record: StopRunRecord, signals: StopRunSignals): StopSummaryJson {
|
|
131
153
|
const outcome = stopOutcome(record, signals);
|
|
@@ -139,6 +161,7 @@ export function summarizeStopRun(record: StopRunRecord, signals: StopRunSignals)
|
|
|
139
161
|
proxy: record.proxy,
|
|
140
162
|
sharedTeardown: record.sharedTeardown,
|
|
141
163
|
message: stopMessage(record, signals, outcome),
|
|
164
|
+
...stopReasonFields(record),
|
|
142
165
|
};
|
|
143
166
|
}
|
|
144
167
|
|