@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,64 @@
|
|
|
1
|
+
import { getConfigDir } from "../config/paths";
|
|
2
|
+
import { linkDir } from "../link/paths";
|
|
3
|
+
import {
|
|
4
|
+
readSshCaptureStatus, SSH_CAPTURE_DEFAULT_MINUTES, SSH_CAPTURE_MAX_MINUTES, startSshCapture, stopSshCapture,
|
|
5
|
+
type SshCaptureStatus,
|
|
6
|
+
} from "../link/ssh-capture";
|
|
7
|
+
import { CliUsageError, printData, rejectArgs, takeIntegerOption, takeJsonFlag } from "./runtime-api";
|
|
8
|
+
|
|
9
|
+
export const LINK_CAPTURE_USAGE = [
|
|
10
|
+
"ocx link capture start [--minutes <1-" + SSH_CAPTURE_MAX_MINUTES + ">] [--json]",
|
|
11
|
+
"ocx link capture stop [--json]",
|
|
12
|
+
"ocx link capture status [--json]",
|
|
13
|
+
];
|
|
14
|
+
|
|
15
|
+
export interface LinkCaptureDeps {
|
|
16
|
+
/** Test seam: the link directory whose ssh-capture/ the command manages. */
|
|
17
|
+
captureLinkDir?: string;
|
|
18
|
+
/** Test seam: the clock the capture window and retention read. */
|
|
19
|
+
captureNow?: () => number;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
function statusLines(status: SshCaptureStatus, verb: "start" | "stop" | "status"): string[] {
|
|
23
|
+
const lines = [status.enabled
|
|
24
|
+
? "SSH capture: on until " + status.expiresAt + " (the next tunnel attempt runs ssh with LogLevel=DEBUG1)"
|
|
25
|
+
: "SSH capture: off (the next tunnel attempt runs ssh with LogLevel=ERROR)"];
|
|
26
|
+
if (verb === "start") {
|
|
27
|
+
lines.push("A tunnel that is already connected keeps its log level until it reconnects. On the Home,",
|
|
28
|
+
"ocx link reconnect --link-id <id> starts a new attempt now.");
|
|
29
|
+
}
|
|
30
|
+
lines.push("Directory: " + status.directory);
|
|
31
|
+
if (status.removed > 0) lines.push("Deleted " + status.removed + " capture file(s) past retention or beyond the file limit.");
|
|
32
|
+
if (status.files.length === 0) lines.push("No capture files.");
|
|
33
|
+
else {
|
|
34
|
+
lines.push("Capture files (deleted " + status.retentionHours + " h after their last write):");
|
|
35
|
+
for (const file of status.files) {
|
|
36
|
+
lines.push(" " + file.name + " " + file.bytes + " bytes last write " + file.lastWriteAt + " deleted after " + file.deleteAfter);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return lines;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** ocx link capture: a local file operation on this machine; it needs no running proxy and no token. */
|
|
43
|
+
export async function runLinkCapture(args: string[], deps: LinkCaptureDeps, usage: string): Promise<void> {
|
|
44
|
+
const verb = args.shift();
|
|
45
|
+
const json = takeJsonFlag(args);
|
|
46
|
+
const directory = deps.captureLinkDir ?? linkDir(getConfigDir());
|
|
47
|
+
const now = (deps.captureNow ?? Date.now)();
|
|
48
|
+
let status: SshCaptureStatus;
|
|
49
|
+
if (verb === "start") {
|
|
50
|
+
const minutes = takeIntegerOption(args, "--minutes", { min: 1, max: SSH_CAPTURE_MAX_MINUTES }) ?? SSH_CAPTURE_DEFAULT_MINUTES;
|
|
51
|
+
rejectArgs(args, usage);
|
|
52
|
+
status = startSshCapture({ linkDirectory: directory, now, minutes });
|
|
53
|
+
} else if (verb === "stop") {
|
|
54
|
+
rejectArgs(args, usage);
|
|
55
|
+
status = stopSshCapture(directory, now);
|
|
56
|
+
} else if (verb === "status") {
|
|
57
|
+
rejectArgs(args, usage);
|
|
58
|
+
status = readSshCaptureStatus(directory, now);
|
|
59
|
+
} else {
|
|
60
|
+
throw new CliUsageError("link capture requires one of: start, stop, status", usage);
|
|
61
|
+
}
|
|
62
|
+
printData(status, json, statusLines(status, verb));
|
|
63
|
+
}
|
|
64
|
+
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { ChildItemState, ChildJob, ChildJobItem } from "../link/child-ops-
|
|
2
|
-
import {
|
|
1
|
+
import type { ChildItemState, ChildJob, ChildJobItem, ChildOp } from "../link/child-ops-types";
|
|
2
|
+
import { CATALOG_FANOUT, CHILD_CODEX_RESTART, CHILD_UPDATES, type ChildPolicyRead } from "../link/child-policy";
|
|
3
|
+
import { CliUsageError, RuntimeApiError, printData, rejectArgs, takeFlag, takeIntegerOption, takeJsonFlag, takeOption } from "./runtime-api";
|
|
3
4
|
import type { LinkCliDeps } from "./link";
|
|
4
5
|
|
|
5
6
|
type LinkRequest = <T>(path: string, init: RequestInit, deps: LinkCliDeps) => Promise<T>;
|
|
@@ -12,19 +13,46 @@ export interface LinkCheckDeps extends LinkCliDeps {
|
|
|
12
13
|
|
|
13
14
|
export const LINK_CHECK_POLL_MS = 2_000;
|
|
14
15
|
export const OLD_HOME_MESSAGE = "This Home does not support Child operations; update the Home.";
|
|
15
|
-
export const NO_ELIGIBLE_LINKS_MESSAGE = "This Home has no
|
|
16
|
+
export const NO_ELIGIBLE_LINKS_MESSAGE = "This Home has no links.";
|
|
16
17
|
export const RUNTIME_ROLE_CLIENT_MESSAGE = "This machine is a Child; run Child operations on its Home.";
|
|
18
|
+
export const LINK_NOT_HOME_INITIATED_MESSAGE = "This link was started from the Child, so the Home cannot run operations on it.";
|
|
19
|
+
export const LINK_OPERATION_IN_PROGRESS_MESSAGE = "Another operation is running on this link; wait for it to finish, then try again.";
|
|
20
|
+
export const LOOPBACK_REQUIRED_MESSAGE = "Child operations from the CLI need a Home bound to loopback; on this Home they are not available, and the dashboard has no controls for them.";
|
|
17
21
|
const CONFLICT_MESSAGES: Readonly<Record<string, string>> = {
|
|
18
22
|
no_eligible_links: NO_ELIGIBLE_LINKS_MESSAGE,
|
|
19
23
|
runtime_role_client: RUNTIME_ROLE_CLIENT_MESSAGE,
|
|
24
|
+
link_not_home_initiated: LINK_NOT_HOME_INITIATED_MESSAGE,
|
|
25
|
+
link_operation_in_progress: LINK_OPERATION_IN_PROGRESS_MESSAGE,
|
|
20
26
|
};
|
|
21
27
|
|
|
28
|
+
/** How long one item may run once it has started: the sum of its runner's own SSH bounds plus a margin. */
|
|
29
|
+
export const CHILD_ITEM_WAIT_MS: Readonly<Record<ChildOp, number>> = {
|
|
30
|
+
observe: 120_000, // wp2's value: one 60 s plan probe, one read-only inspection
|
|
31
|
+
sync: 420_000, // platform probe 30 s + two pinned syncs of 180 s
|
|
32
|
+
"restart-codex": 420_000,
|
|
33
|
+
update: 2_100_000, // probe 30 s + identity sync 180 s + plan 60 s + apply 900 s + 120 s grace
|
|
34
|
+
// + post-update sync with retry 2 × 360 s + 30 s
|
|
35
|
+
};
|
|
36
|
+
/** Never poll longer than this from submission, queued or not; the Home keeps a finished job one hour. */
|
|
37
|
+
export const CHILD_JOB_WAIT_CAP_MS = 10_800_000;
|
|
38
|
+
|
|
39
|
+
export type LinkChildVerb = "update" | "sync" | "restart-codex";
|
|
40
|
+
export const LINK_CHILD_OPS_USAGE = [
|
|
41
|
+
" ocx link update (--link-id <id> | --all) --yes [--no-wait] [--json]",
|
|
42
|
+
" ocx link sync (--link-id <id> | --all) [--no-wait] [--json]",
|
|
43
|
+
" ocx link sync --link-id <id> (--restart-app-server-only | --restart-codex --yes) [--ignore-activity] [--no-wait] [--json]",
|
|
44
|
+
" ocx link restart-codex --link-id <id> [--scope app-server|codex] --yes [--ignore-activity] [--no-wait] [--json]",
|
|
45
|
+
" ocx link policy [--updates off|notify|auto-when-idle] [--catalog-fanout auto|manual] [--child-codex-restart never|app-server-when-idle] [--idle-after-minutes <1-60>] [--json]",
|
|
46
|
+
" ocx link activity clear --link-id <id> [--json]",
|
|
47
|
+
] as const;
|
|
48
|
+
|
|
22
49
|
const LINK_ID = /^lnk_[0-9a-f]{16}$/;
|
|
23
50
|
const JOB_ID = /^ljob_[0-9a-f]{16}$/;
|
|
24
51
|
const SUCCESS: ReadonlySet<string> = new Set<ChildItemState>(["succeeded", "up-to-date"]);
|
|
25
52
|
const PARTIAL: ReadonlySet<string> = new Set<ChildItemState>(["busy", "offline", "refused", "owner-action", "unsupported"]);
|
|
26
53
|
|
|
27
54
|
const isRecord = (value: unknown): value is Record<string, unknown> => value !== null && typeof value === "object" && !Array.isArray(value);
|
|
55
|
+
const errorCode = (error: RuntimeApiError): unknown => (error.body as { error?: { code?: unknown } } | null)?.error?.code;
|
|
28
56
|
|
|
29
57
|
/**
|
|
30
58
|
* Read an `ocx.link.child-job/1` document. Tolerant from its first release (G1, audit H5): known keys are type-checked,
|
|
@@ -55,7 +83,10 @@ export function validateChildJob(value: unknown): ChildJob {
|
|
|
55
83
|
const nested = raw[key];
|
|
56
84
|
if (!isRecord(nested)) return fail(`item ${index} ${key}`);
|
|
57
85
|
const field = key === "sync" ? "state" : "outcome";
|
|
58
|
-
|
|
86
|
+
// Open enum strings are kept for display, so the nested shape is only checked for strings here.
|
|
87
|
+
(item as Record<string, unknown>)[key] = { [field]: text(nested[field], `item ${index} ${key}.${field}`),
|
|
88
|
+
// A wp3 Home always sends restart.requested; an older document may not.
|
|
89
|
+
...(key === "restart" && nested.requested !== undefined ? { requested: text(nested.requested, `item ${index} restart.requested`) } : {}),
|
|
59
90
|
...(nested.reason === undefined ? {} : { reason: nullableText(nested.reason, `item ${index} ${key}.reason`) }) };
|
|
60
91
|
}
|
|
61
92
|
return item;
|
|
@@ -63,15 +94,23 @@ export function validateChildJob(value: unknown): ChildJob {
|
|
|
63
94
|
return {
|
|
64
95
|
schema: "ocx.link.child-job/1", jobId, op: text(value.op, "op") as ChildJob["op"], trigger: text(value.trigger, "trigger") as ChildJob["trigger"],
|
|
65
96
|
restart: text(value.restart, "restart") as ChildJob["restart"], state: text(value.state, "state") as ChildJob["state"],
|
|
97
|
+
...(value.ignoreActivity === undefined ? {} : { ignoreActivity: value.ignoreActivity === true ? true as const : fail("ignoreActivity") }),
|
|
66
98
|
createdAt: text(value.createdAt, "createdAt"), finishedAt: nullableText(value.finishedAt, "finishedAt"), items,
|
|
67
99
|
};
|
|
68
100
|
}
|
|
69
101
|
|
|
70
|
-
/**
|
|
102
|
+
/**
|
|
103
|
+
* D15: 0 every item succeeded or up-to-date with nothing withheld; 6 any item needs the operator; 1 any failure or an
|
|
104
|
+
* unknown state. A success that carries a reason (restart-skipped:link-active, post-update-sync-failed,
|
|
105
|
+
* restart-result-unknown) or whose requested restart did not go out is partial.
|
|
106
|
+
*/
|
|
71
107
|
export function linkCheckExitCode(job: ChildJob): number {
|
|
72
108
|
let code = 0;
|
|
73
109
|
for (const item of job.items) {
|
|
74
|
-
if (SUCCESS.has(item.state))
|
|
110
|
+
if (SUCCESS.has(item.state)) {
|
|
111
|
+
if (item.reason !== null || (item.restart !== undefined && item.restart.outcome !== "requested")) code = Math.max(code, 6);
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
75
114
|
if (PARTIAL.has(item.state)) code = Math.max(code, 6);
|
|
76
115
|
else return 1;
|
|
77
116
|
}
|
|
@@ -83,6 +122,66 @@ function readJob(response: unknown): ChildJob {
|
|
|
83
122
|
return validateChildJob(response.job);
|
|
84
123
|
}
|
|
85
124
|
|
|
125
|
+
async function waitForChildJob(job: ChildJob, deps: LinkCheckDeps, request: LinkRequest): Promise<{ job: ChildJob; done: boolean }> {
|
|
126
|
+
const sleep = deps.sleep ?? ((ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms)));
|
|
127
|
+
const now = deps.now ?? Date.now;
|
|
128
|
+
const cap = now() + CHILD_JOB_WAIT_CAP_MS;
|
|
129
|
+
const perItem = Object.hasOwn(CHILD_ITEM_WAIT_MS, job.op) ? CHILD_ITEM_WAIT_MS[job.op] : CHILD_ITEM_WAIT_MS.update;
|
|
130
|
+
const lanes = job.op === "update" ? 1 : 3;
|
|
131
|
+
const budget = (current: ChildJob): number =>
|
|
132
|
+
Math.ceil(current.items.filter(item => item.finishedAt === null).length / lanes) * perItem + 30_000;
|
|
133
|
+
let deadline = now() + budget(job);
|
|
134
|
+
while (job.state !== "done") {
|
|
135
|
+
// A queued item has not started its SSH work: while one waits behind another job, the deadline moves with it.
|
|
136
|
+
if (job.items.some(item => item.state === "queued")) deadline = Math.max(deadline, now() + budget(job));
|
|
137
|
+
if (now() >= Math.min(deadline, cap)) return { job, done: false };
|
|
138
|
+
await sleep(LINK_CHECK_POLL_MS);
|
|
139
|
+
job = readJob(await request<unknown>(`/api/link/children/jobs/${encodeURIComponent(job.jobId)}`, {}, deps));
|
|
140
|
+
}
|
|
141
|
+
return { job, done: true };
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
/** The Child-operation routes' refusals as operator messages; a request that is not a Child operation passes nothing in op. */
|
|
145
|
+
function childOpsRefusal(error: unknown, op: ChildOp | null): never {
|
|
146
|
+
if (error instanceof RuntimeApiError) {
|
|
147
|
+
// A new Home answers link_not_found for a mistyped id; an older Home has no such route at all.
|
|
148
|
+
if (error.status === 404 && errorCode(error) !== "link_not_found") throw new RuntimeApiError(OLD_HOME_MESSAGE, 404, error.body);
|
|
149
|
+
// Revision 6 F3: a Home with observe only (wp2) refuses every other op as invalid_body; this CLI always sends a valid body.
|
|
150
|
+
if (error.status === 400 && op !== null && op !== "observe" && errorCode(error) === "invalid_body") throw new RuntimeApiError(OLD_HOME_MESSAGE, 404, error.body);
|
|
151
|
+
// Every 409 still exits 5; the conflicts that are not "another operation holds the link" say what happened.
|
|
152
|
+
if (error.status === 409) {
|
|
153
|
+
const code = errorCode(error);
|
|
154
|
+
const message = typeof code === "string" && Object.hasOwn(CONFLICT_MESSAGES, code) ? CONFLICT_MESSAGES[code] : undefined;
|
|
155
|
+
if (message) throw new RuntimeApiError(message, 409, error.body);
|
|
156
|
+
}
|
|
157
|
+
// Revision 4 (4529521950): a Home not bound to loopback refuses the admin token on its TCP listener.
|
|
158
|
+
if (error.status === 403) throw new RuntimeApiError(LOOPBACK_REQUIRED_MESSAGE, 403, error.body);
|
|
159
|
+
}
|
|
160
|
+
throw error;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
/** POST one operation, then wait for it unless told not to; prints the job document and returns the verdict exit. */
|
|
164
|
+
async function submitChildJob(body: { op: ChildOp; linkIds: string[] | "all"; restart?: "app-server" | "codex"; ignoreActivity?: true }, wait: boolean,
|
|
165
|
+
deps: LinkCheckDeps, request: LinkRequest): Promise<number> {
|
|
166
|
+
let job: ChildJob;
|
|
167
|
+
try {
|
|
168
|
+
job = readJob(await request<unknown>("/api/link/children/operations", {
|
|
169
|
+
method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(body),
|
|
170
|
+
}, deps));
|
|
171
|
+
} catch (error) { childOpsRefusal(error, body.op); }
|
|
172
|
+
if (!wait) {
|
|
173
|
+
console.log(JSON.stringify(job));
|
|
174
|
+
return job.state === "done" ? linkCheckExitCode(job) : 0;
|
|
175
|
+
}
|
|
176
|
+
const waited = await waitForChildJob(job, deps, request);
|
|
177
|
+
console.log(JSON.stringify(waited.job));
|
|
178
|
+
if (!waited.done) {
|
|
179
|
+
console.error(`Error: job_still_running: ${waited.job.jobId} has not finished; read it again with GET /api/link/children/jobs/${waited.job.jobId}.`);
|
|
180
|
+
return 1;
|
|
181
|
+
}
|
|
182
|
+
return linkCheckExitCode(waited.job);
|
|
183
|
+
}
|
|
184
|
+
|
|
86
185
|
/** `ocx link check (--link-id <id> | --all) [--no-wait] [--json]`: run the observe operation and return the exit code. */
|
|
87
186
|
export async function runLinkCheck(args: string[], deps: LinkCheckDeps, request: LinkRequest, usage: string): Promise<number> {
|
|
88
187
|
takeJsonFlag(args);
|
|
@@ -96,41 +195,120 @@ export async function runLinkCheck(args: string[], deps: LinkCheckDeps, request:
|
|
|
96
195
|
rejectArgs(args, usage);
|
|
97
196
|
if (all === (linkIds.length > 0)) throw new CliUsageError("check requires --link-id <id> or --all, not both", usage);
|
|
98
197
|
if (linkIds.length > 64) throw new CliUsageError("check accepts at most 64 --link-id values", usage);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
throw error;
|
|
198
|
+
return submitChildJob({ op: "observe", linkIds: all ? "all" : linkIds }, !noWait, deps, request);
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
export function parseChildOpArgs(verb: LinkChildVerb, args: string[], usage: string):
|
|
202
|
+
{ body: { op: LinkChildVerb; linkIds: string[] | "all"; restart?: "app-server" | "codex"; ignoreActivity?: true }; wait: boolean } {
|
|
203
|
+
takeJsonFlag(args);
|
|
204
|
+
const noWait = takeFlag(args, "--no-wait");
|
|
205
|
+
const all = takeFlag(args, "--all");
|
|
206
|
+
const yes = takeFlag(args, "--yes");
|
|
207
|
+
// D8: the operator's explicit restart past activity; it ends running work on that Child.
|
|
208
|
+
const ignoreActivity = takeFlag(args, "--ignore-activity");
|
|
209
|
+
// Repeatable like ocx link check; a restart needs exactly one.
|
|
210
|
+
const linkIds: string[] = [];
|
|
211
|
+
for (let id = takeOption(args, "--link-id"); id !== undefined; id = takeOption(args, "--link-id")) {
|
|
212
|
+
if (!LINK_ID.test(id)) throw new CliUsageError(`${verb} requires valid --link-id values`, usage);
|
|
213
|
+
if (!linkIds.includes(id)) linkIds.push(id);
|
|
117
214
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
215
|
+
let restart: "app-server" | "codex" | undefined;
|
|
216
|
+
if (verb === "sync") {
|
|
217
|
+
const narrow = takeFlag(args, "--restart-app-server-only");
|
|
218
|
+
const full = takeFlag(args, "--restart-codex");
|
|
219
|
+
if (narrow && full) throw new CliUsageError("choose one of --restart-app-server-only and --restart-codex", usage);
|
|
220
|
+
restart = narrow ? "app-server" : full ? "codex" : undefined;
|
|
121
221
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
console.log(JSON.stringify(job));
|
|
128
|
-
console.error(`Error: job_still_running: ${job.jobId} has not finished; read it again with GET /api/link/children/jobs/${job.jobId}.`);
|
|
129
|
-
return 1;
|
|
130
|
-
}
|
|
131
|
-
await sleep(LINK_CHECK_POLL_MS);
|
|
132
|
-
job = readJob(await request<unknown>(`/api/link/children/jobs/${encodeURIComponent(job.jobId)}`, {}, deps));
|
|
222
|
+
if (verb === "restart-codex") {
|
|
223
|
+
const scope = takeOption(args, "--scope") ?? "app-server";
|
|
224
|
+
if (scope !== "app-server" && scope !== "codex") throw new CliUsageError("--scope must be app-server or codex", usage);
|
|
225
|
+
if (!yes) throw new CliUsageError("restart-codex ends running Codex turns on the Child; pass --yes", usage);
|
|
226
|
+
restart = scope;
|
|
133
227
|
}
|
|
134
|
-
|
|
135
|
-
|
|
228
|
+
rejectArgs(args, usage);
|
|
229
|
+
if (all === (linkIds.length > 0)) throw new CliUsageError(`${verb} requires --link-id <id> or --all, not both`, usage);
|
|
230
|
+
if (linkIds.length > 64) throw new CliUsageError(`${verb} accepts at most 64 --link-id values`, usage);
|
|
231
|
+
// Revision 6 F5: an update stops the Child's runtime and ends the turns relayed for it, so it is confirmed like a restart.
|
|
232
|
+
if (verb === "update" && !yes) throw new CliUsageError("update restarts OpenCodex on each Child and ends its running turns; pass --yes", usage);
|
|
233
|
+
// A2 / M8: a restart names one link, and the codex scope (quit and relaunch the desktop app) needs --yes on every verb.
|
|
234
|
+
if (restart !== undefined && (all || linkIds.length !== 1)) throw new CliUsageError(`${verb} with a restart needs exactly one --link-id; --all is refused`, usage);
|
|
235
|
+
if (restart === "codex" && !yes) throw new CliUsageError("--restart-codex quits the Child's Codex app and ends its turns; pass --yes", usage);
|
|
236
|
+
if (yes && restart === undefined && verb !== "update") throw new CliUsageError("--yes only confirms a restart or an update", usage);
|
|
237
|
+
if (ignoreActivity && restart === undefined) throw new CliUsageError("--ignore-activity applies only to a restart of one --link-id", usage);
|
|
238
|
+
return { body: { op: verb, linkIds: all ? "all" : linkIds, ...(restart ? { restart } : {}), ...(ignoreActivity ? { ignoreActivity: true as const } : {}) }, wait: !noWait };
|
|
136
239
|
}
|
|
240
|
+
|
|
241
|
+
/** `ocx link update|sync|restart-codex`: one job over the link's pinned SSH trust; prints it and returns the verdict exit. */
|
|
242
|
+
export async function runLinkChildOp(verb: LinkChildVerb, args: string[], deps: LinkCheckDeps, request: LinkRequest, usage: string): Promise<number> {
|
|
243
|
+
const parsed = parseChildOpArgs(verb, args, usage);
|
|
244
|
+
return submitChildJob(parsed.body, parsed.wait, deps, request);
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
/** Exactly {policy: {four knobs}, warning}; anything else is an invalid response (strict, like the policy file). */
|
|
248
|
+
export function validatePolicyRead(value: unknown): ChildPolicyRead {
|
|
249
|
+
const fail = (): never => { throw new Error("invalid link API response: child policy"); };
|
|
250
|
+
if (!isRecord(value) || Object.keys(value).length !== 2 || !isRecord(value.policy)) return fail();
|
|
251
|
+
const { policy, warning } = value;
|
|
252
|
+
if (warning !== null && warning !== "policy-file-invalid") return fail();
|
|
253
|
+
const keys = Object.keys(policy);
|
|
254
|
+
if (keys.length !== 4 || !(CATALOG_FANOUT as readonly unknown[]).includes(policy.catalogFanout)
|
|
255
|
+
|| !(CHILD_CODEX_RESTART as readonly unknown[]).includes(policy.childCodexRestart) || !(CHILD_UPDATES as readonly unknown[]).includes(policy.updates)
|
|
256
|
+
|| typeof policy.idleAfterMs !== "number" || !Number.isSafeInteger(policy.idleAfterMs) || policy.idleAfterMs <= 0) return fail();
|
|
257
|
+
return { policy: { catalogFanout: policy.catalogFanout, childCodexRestart: policy.childCodexRestart, updates: policy.updates,
|
|
258
|
+
idleAfterMs: policy.idleAfterMs } as ChildPolicyRead["policy"], warning: warning as ChildPolicyRead["warning"] };
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
/** `ocx link policy`: read the Home's Child policy, or change the knobs named by flags (one PUT of only those keys). */
|
|
262
|
+
export async function runLinkPolicy(args: string[], deps: LinkCliDeps, request: LinkRequest, usage: string): Promise<void> {
|
|
263
|
+
const json = takeJsonFlag(args);
|
|
264
|
+
const patch: Record<string, string | number> = {};
|
|
265
|
+
const pick = (flag: string, key: string, allowed: readonly string[]): void => {
|
|
266
|
+
const value = takeOption(args, flag);
|
|
267
|
+
if (value === undefined) return;
|
|
268
|
+
if (!allowed.includes(value)) throw new CliUsageError(`${flag} must be one of ${allowed.join(", ")}`, usage);
|
|
269
|
+
patch[key] = value;
|
|
270
|
+
};
|
|
271
|
+
pick("--updates", "updates", CHILD_UPDATES);
|
|
272
|
+
pick("--catalog-fanout", "catalogFanout", CATALOG_FANOUT);
|
|
273
|
+
pick("--child-codex-restart", "childCodexRestart", CHILD_CODEX_RESTART);
|
|
274
|
+
const minutes = takeIntegerOption(args, "--idle-after-minutes", { min: 1, max: 60 });
|
|
275
|
+
if (minutes !== undefined) patch.idleAfterMs = minutes * 60_000;
|
|
276
|
+
rejectArgs(args, usage);
|
|
277
|
+
let read: ChildPolicyRead;
|
|
278
|
+
try {
|
|
279
|
+
read = validatePolicyRead(Object.keys(patch).length === 0
|
|
280
|
+
? await request<unknown>("/api/link/children/policy", {}, deps)
|
|
281
|
+
: await request<unknown>("/api/link/children/policy", { method: "PUT", headers: { "content-type": "application/json" }, body: JSON.stringify(patch) }, deps));
|
|
282
|
+
} catch (error) { childOpsRefusal(error, null); }
|
|
283
|
+
printData(read, json, [
|
|
284
|
+
`catalog fan-out: ${read.policy.catalogFanout}`, `Child Codex restart: ${read.policy.childCodexRestart}`,
|
|
285
|
+
`updates: ${read.policy.updates}`, `idle after: ${read.policy.idleAfterMs / 60_000} min`,
|
|
286
|
+
...(read.warning ? ["The policy file is invalid; automatic catalog fan-out and updates are off. To turn them back on, pass --catalog-fanout auto and an --updates mode; a setting you do not name stays off."] : []),
|
|
287
|
+
]);
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
|
|
291
|
+
/**
|
|
292
|
+
* `ocx link activity clear --link-id <id>` (D8): the operator forgets one link's WebSocket activity holds, including an
|
|
293
|
+
* unknown state left by a Home crash, so automatic and activity-gated Child restarts may run again. Never automatic.
|
|
294
|
+
*/
|
|
295
|
+
export async function runLinkActivity(args: string[], deps: LinkCliDeps, request: LinkRequest, usage: string): Promise<void> {
|
|
296
|
+
const verb = args.shift();
|
|
297
|
+
if (verb !== "clear") throw new CliUsageError("link activity requires: clear --link-id <id>", usage);
|
|
298
|
+
const json = takeJsonFlag(args);
|
|
299
|
+
const linkId = takeOption(args, "--link-id");
|
|
300
|
+
if (!linkId || !LINK_ID.test(linkId)) throw new CliUsageError("link activity clear requires a valid --link-id", usage);
|
|
301
|
+
rejectArgs(args, usage);
|
|
302
|
+
let response: unknown;
|
|
303
|
+
try {
|
|
304
|
+
response = await request<unknown>("/api/link/children/activity/clear", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ linkId }) }, deps);
|
|
305
|
+
} catch (error) { childOpsRefusal(error, null); }
|
|
306
|
+
if (!isRecord(response) || response.linkId !== linkId || (response.cleared !== null && !isRecord(response.cleared))) throw new Error("invalid link API response: activity clear");
|
|
307
|
+
const cleared = response.cleared as { holds?: unknown; unknown?: unknown } | null;
|
|
308
|
+
const holds = cleared && Array.isArray(cleared.holds) ? cleared.holds.length : 0;
|
|
309
|
+
const unknown = cleared && typeof cleared.unknown === "string" ? cleared.unknown : null;
|
|
310
|
+
printData({ linkId, cleared }, json, [cleared === null
|
|
311
|
+
? `Nothing held ${linkId}.`
|
|
312
|
+
: `Cleared ${holds} activity hold${holds === 1 ? "" : "s"}${unknown ? ` and the unknown state (${unknown})` : ""} on ${linkId}; automatic and activity-gated restarts of this Child may run again.`]);
|
|
313
|
+
}
|
|
314
|
+
|
package/src/cli/link-cleanup.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/** Read-only platform and disconnect guidance for recorded Remote Link Children. */
|
|
2
2
|
import { linkKnownHostsPath, linkStorePath } from "../link/paths";
|
|
3
3
|
import { requireRemotePlatform, type RemotePlatform } from "../link/remote-platform";
|
|
4
|
+
import type { ExplicitRoute } from "../link/explicit-route";
|
|
4
5
|
import { createSshRunner, sshRunnerErrorHint, type SshRunner } from "../link/ssh-runner";
|
|
5
6
|
import { readLinkStore, type LinkStore } from "../link/store";
|
|
6
7
|
import { CliUsageError, printData, rejectArgs, takeJsonFlag, takeOption } from "./runtime-api";
|
|
@@ -24,15 +25,17 @@ export interface LinkCleanupEntry {
|
|
|
24
25
|
|
|
25
26
|
export function windowsChildRecovery(linkId: string, alias: string): string[] {
|
|
26
27
|
return [
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
// The bound disconnect (#8662) acts only while the machine is connected to this link; an older ocx refuses the flag before it
|
|
29
|
+
// acts on the link, and then the check comes first. The revoke runs as printed: --yes belongs to --force, which skips cleanup.
|
|
30
|
+
`On ${alias}, run 'ocx disconnect --expect-link ${linkId}' and, if it disconnected, 'ocx restart': it disconnects only while the machine is connected to this link. An OpenCodex older than that flag refuses it as a usage error before it acts on the link; then run 'ocx disconnect' and 'ocx restart' only if 'ocx connect status --json' shows this link's id, right after that check. If it shows another link, a hub or another Home, or its state cannot be read, leave it.`,
|
|
31
|
+
`On this Home, run 'ocx link revoke --link-id ${linkId}' to disconnect it through the recorded SSH trust; it disconnects only while the machine is connected to this link.`,
|
|
29
32
|
`Retry Remote Link enrollment after updating Home if the remote shell or old installation cannot run the disconnect command.`,
|
|
30
33
|
];
|
|
31
34
|
}
|
|
32
35
|
|
|
33
|
-
async function checkPlatform(runner: SshRunner, alias: string, knownHostsFile: string): Promise<{ platform: RemotePlatform; reason: string | null }> {
|
|
36
|
+
async function checkPlatform(runner: SshRunner, alias: string, route: ExplicitRoute | null, knownHostsFile: string): Promise<{ platform: RemotePlatform; reason: string | null }> {
|
|
34
37
|
try {
|
|
35
|
-
const platform = await requireRemotePlatform(runner, alias, knownHostsFile);
|
|
38
|
+
const platform = await requireRemotePlatform(runner, alias, route, knownHostsFile);
|
|
36
39
|
return { platform, reason: null };
|
|
37
40
|
} catch (error) {
|
|
38
41
|
return { platform: "unknown", reason: sshRunnerErrorHint(error) ?? "ssh could not run" };
|
|
@@ -69,7 +72,7 @@ export async function runLinkCleanup(args: string[], deps: LinkCleanupDeps, usag
|
|
|
69
72
|
// One at a time: each check is a bounded SSH command, and order keeps the report stable.
|
|
70
73
|
for (const record of records) {
|
|
71
74
|
const checked = record.direction === "hub-initiated"
|
|
72
|
-
? await checkPlatform(runner, record.alias, knownHostsFile)
|
|
75
|
+
? await checkPlatform(runner, record.alias, record.explicitRoute ?? null, knownHostsFile)
|
|
73
76
|
: { platform: "not_checked" as const, reason: null };
|
|
74
77
|
entries.push({
|
|
75
78
|
linkId: record.id, alias: record.alias, direction: record.direction, ...checked,
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import {
|
|
2
|
+
LINK_DIAGNOSTICS_DEFAULT_LIMIT, LINK_DIAGNOSTICS_MAX_LIMIT, LINK_DIAGNOSTICS_SCHEMA, linkDiagnosticsPath, readLinkDiagnostics,
|
|
3
|
+
type LinkDiagnosticEntry, type LinkDiagnosticsReadResult,
|
|
4
|
+
} from "../link/diagnostics-read";
|
|
5
|
+
import { CliUsageError, printData, rejectArgs, takeIntegerOption, takeJsonFlag, takeOption } from "./runtime-api";
|
|
6
|
+
|
|
7
|
+
export const LINK_DIAGNOSTICS_USAGE = "ocx link diagnostics [--limit <n>] [--since <iso-time|epoch-ms>] [--json]";
|
|
8
|
+
|
|
9
|
+
/** What --json prints: the reader's sanitized result plus the schema and the local path. */
|
|
10
|
+
export type LinkDiagnosticsDocument = { schema: typeof LINK_DIAGNOSTICS_SCHEMA; path: string } & LinkDiagnosticsReadResult;
|
|
11
|
+
|
|
12
|
+
function parseSince(raw: string | undefined, usage: string): number | undefined {
|
|
13
|
+
if (raw === undefined) return undefined;
|
|
14
|
+
const value = /^\d+$/.test(raw) ? Number(raw) : /^\d{4}-\d{2}-\d{2}/.test(raw) ? Date.parse(raw) : Number.NaN;
|
|
15
|
+
if (!Number.isSafeInteger(value) || value < 0) throw new CliUsageError("--since must be an ISO time or epoch milliseconds", usage);
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const HEADER = ["TIME", "EVENT", "OUTCOME", "STATE", "ATTEMPT", "PORT"] as const;
|
|
20
|
+
|
|
21
|
+
function row(record: LinkDiagnosticEntry): string[] {
|
|
22
|
+
const state = record.previousState && record.state ? record.previousState + " -> " + record.state : record.state ?? "-";
|
|
23
|
+
return [
|
|
24
|
+
record.timestamp !== undefined ? new Date(record.timestamp).toISOString() : "-",
|
|
25
|
+
record.event,
|
|
26
|
+
record.suppressed ? record.outcome + " (+" + record.suppressed + " suppressed)" : record.outcome,
|
|
27
|
+
state,
|
|
28
|
+
record.attempt !== undefined ? String(record.attempt) : "-",
|
|
29
|
+
record.tunnelPort !== undefined ? String(record.tunnelPort) : "-",
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function table(records: readonly LinkDiagnosticEntry[]): string[] {
|
|
34
|
+
const cells = [[...HEADER], ...records.map(row)];
|
|
35
|
+
const widths = HEADER.map((_, column) => Math.max(...cells.map(cellsOfRow => cellsOfRow[column]!.length)));
|
|
36
|
+
return cells.map(cellsOfRow => cellsOfRow.map((cell, column) => cell.padEnd(widths[column]!)).join(" ").trimEnd());
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
function humanLines(document: LinkDiagnosticsDocument): string[] {
|
|
40
|
+
const { files, records, matched, skipped, path } = document;
|
|
41
|
+
const lines: string[] = [];
|
|
42
|
+
if (files.every(file => file.state === "absent")) return ["No Remote Link diagnostics recorded yet: " + path];
|
|
43
|
+
if (records.length === 0) lines.push("No matching Remote Link diagnostics in " + path);
|
|
44
|
+
else lines.push(...table(records), "", "Showing " + records.length + " of " + matched + " records from " + path);
|
|
45
|
+
for (const file of files) {
|
|
46
|
+
if (file.state === "refused") lines.push(file.name + " was not read: it is not a regular file in a regular link directory.");
|
|
47
|
+
else if (file.state === "unreadable") lines.push(file.name + " could not be read.");
|
|
48
|
+
else if (file.truncated) lines.push(file.name + " is larger than 256 KiB; only its newest 256 KiB were read.");
|
|
49
|
+
}
|
|
50
|
+
if (skipped > 0) lines.push(skipped + " unreadable or unrecognized line" + (skipped === 1 ? " was" : "s were") + " skipped.");
|
|
51
|
+
return lines;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* `ocx link diagnostics`: read this computer's bounded link diagnostics file directly. It never
|
|
56
|
+
* contacts the proxy, loads the config, creates or hardens a directory, or writes anything.
|
|
57
|
+
*/
|
|
58
|
+
export async function runLinkDiagnostics(args: string[], deps: { linkConfigDir?: string }, usage: string): Promise<void> {
|
|
59
|
+
const wantsJson = takeJsonFlag(args);
|
|
60
|
+
const limit = takeIntegerOption(args, "--limit", { min: 1, max: LINK_DIAGNOSTICS_MAX_LIMIT }) ?? LINK_DIAGNOSTICS_DEFAULT_LIMIT;
|
|
61
|
+
const since = parseSince(takeOption(args, "--since"), usage);
|
|
62
|
+
rejectArgs(args, usage);
|
|
63
|
+
const result = await readLinkDiagnostics({ configDir: deps.linkConfigDir, limit, since });
|
|
64
|
+
const document: LinkDiagnosticsDocument = { schema: LINK_DIAGNOSTICS_SCHEMA, path: linkDiagnosticsPath(deps.linkConfigDir), ...result };
|
|
65
|
+
// The human lines are built only when shown, so nothing in them can fail a --json read.
|
|
66
|
+
printData(document, wantsJson, wantsJson ? [] : humanLines(document));
|
|
67
|
+
}
|