@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
import { parseStrictSemver } from "../lib/strict-semver";
|
|
3
|
+
import type { ChildObservation, ChildOperationSummary } from "./child-observations";
|
|
4
|
+
import { CHILD_JOB_SCHEMA, type ChildJob, type ChildJobItem, type ChildOp, type ChildOpsEnv, type ChildRestart,
|
|
5
|
+
type ChildTrigger, type ItemOutcome, type ItemRunner } from "./child-ops-types";
|
|
6
|
+
import { runObserveItem, runRestartCodexItem, runSyncItem, runUpdateItem } from "./child-ops-runners";
|
|
7
|
+
import type { LinkRecord } from "./store";
|
|
8
|
+
|
|
9
|
+
export { CHILD_JOB_SCHEMA } from "./child-ops-types";
|
|
10
|
+
export const CHILD_OPS_CONCURRENCY = 3;
|
|
11
|
+
/** Update items run one at a time across the engine; each also takes one of the CHILD_OPS_CONCURRENCY places. */
|
|
12
|
+
export const CHILD_OPS_UPDATE_CONCURRENCY = 1;
|
|
13
|
+
export const CHILD_JOB_RETENTION_MS = 60 * 60 * 1000;
|
|
14
|
+
export const CHILD_JOB_RETENTION_COUNT = 32;
|
|
15
|
+
/** The CLI's job validator keeps strings up to this length; a longer hint would make the whole document unreadable. */
|
|
16
|
+
const HINT_MAX = 256;
|
|
17
|
+
|
|
18
|
+
/** ignoreActivity (D8) is honoured only on a manual request; the route accepts it only with one link and a restart. */
|
|
19
|
+
export interface ChildOpRequest { op: ChildOp; linkIds: readonly string[] | "all"; restart: ChildRestart; trigger: ChildTrigger; ignoreActivity?: true }
|
|
20
|
+
export type SubmitRefusal = "link_not_found" | "link_not_home_initiated" | "link_operation_in_progress" | "no_eligible_links";
|
|
21
|
+
export type SubmitResult = { ok: true; job: ChildJob } | { ok: false; code: SubmitRefusal; linkId: string | null };
|
|
22
|
+
export interface ChildJobHold { jobId: string; op: ChildOp; state: "queued" | "running" }
|
|
23
|
+
|
|
24
|
+
export interface ChildOpsEngine {
|
|
25
|
+
/** Synchronous admission: locks are taken before it returns, so a DELETE racing it sees them. */
|
|
26
|
+
submit(request: ChildOpRequest, env: ChildOpsEnv): SubmitResult;
|
|
27
|
+
/** A structuredClone snapshot. */
|
|
28
|
+
job(jobId: string): ChildJob | undefined;
|
|
29
|
+
activeJob(linkId: string): ChildJobHold | null;
|
|
30
|
+
/**
|
|
31
|
+
* Take the link's admission lock for a non-job holder (link removal). Returns null when a job holds the link;
|
|
32
|
+
* otherwise a release function. While reserved, a single-link submit answers link_operation_in_progress and a
|
|
33
|
+
* multi-link item for the link ends busy, exactly as for a link a job holds. Synchronous, like submit.
|
|
34
|
+
*/
|
|
35
|
+
reserve(linkId: string): (() => void) | null;
|
|
36
|
+
/** Resolves with a clone of the finished job, or null when the id is unknown or already pruned (wp5 scheduler). */
|
|
37
|
+
whenDone(jobId: string): Promise<ChildJob | null>;
|
|
38
|
+
/** Resolves once no job of this engine is queued or running. Tests and shutdown only. */
|
|
39
|
+
settled(): Promise<void>;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
export interface ChildOpsEngineOptions {
|
|
43
|
+
runners?: Partial<Record<ChildOp, ItemRunner>>;
|
|
44
|
+
jobId?: () => string;
|
|
45
|
+
/** Default and maximum CHILD_OPS_CONCURRENCY. */
|
|
46
|
+
concurrency?: number;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
const DONE: ReadonlySet<string> = new Set(["succeeded", "up-to-date", "busy", "offline", "refused", "owner-action", "unsupported", "failed", "uncertain"]);
|
|
50
|
+
const errorName = (error: unknown): string => error instanceof Error ? error.name : "unknown";
|
|
51
|
+
const iso = (env: ChildOpsEnv): string => new Date(env.now()).toISOString();
|
|
52
|
+
const strictVersion = (value: string | undefined): value is string => typeof value === "string" && value.length <= 128 && parseStrictSemver(value) !== null;
|
|
53
|
+
|
|
54
|
+
/** 010's persisted slice; called after finishedAt is set. A version the cache would refuse ("unknown") is left out. */
|
|
55
|
+
export function summarize(job: ChildJob, item: ChildJobItem): ChildOperationSummary {
|
|
56
|
+
return { op: job.op, jobId: job.jobId, state: item.state, reason: item.reason, finishedAt: item.finishedAt!,
|
|
57
|
+
...(strictVersion(item.fromVersion) ? { fromVersion: item.fromVersion } : {}),
|
|
58
|
+
...(strictVersion(item.toVersion) ? { toVersion: item.toVersion } : {}) };
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* The D11 job model: one in-memory registry, one lock per link per Home process, at most three items running across
|
|
63
|
+
* every job and at most one of them an update, finished jobs kept one hour and at most 32. A Home restart loses the
|
|
64
|
+
* jobs only; the observation cache keeps each Child's last result. Items carry closed tokens, never remote text.
|
|
65
|
+
* No timers: retention is applied on each submit and read, on each job's own env clock.
|
|
66
|
+
*/
|
|
67
|
+
export function createChildOpsEngine(options: ChildOpsEngineOptions = {}): ChildOpsEngine {
|
|
68
|
+
const runners: Record<ChildOp, ItemRunner> = { observe: runObserveItem, sync: runSyncItem, "restart-codex": runRestartCodexItem,
|
|
69
|
+
update: runUpdateItem, ...options.runners };
|
|
70
|
+
const newJobId = options.jobId ?? (() => `ljob_${randomBytes(8).toString("hex")}`);
|
|
71
|
+
const concurrency = Math.max(1, Math.min(options.concurrency ?? CHILD_OPS_CONCURRENCY, CHILD_OPS_CONCURRENCY));
|
|
72
|
+
const jobs = new Map<string, { job: ChildJob; env: ChildOpsEnv }>();
|
|
73
|
+
const locks = new Map<string, string>(); // linkId -> jobId
|
|
74
|
+
const idle = new Set<() => void>();
|
|
75
|
+
// A running job is never pruned (prune drops done jobs only), so every waiter is resolved by finishJob.
|
|
76
|
+
const waiters = new Map<string, Array<(job: ChildJob) => void>>();
|
|
77
|
+
// One engine-wide FIFO: the bound is on SSH sessions from this Home, not per job.
|
|
78
|
+
const pending: Array<{ job: ChildJob; item: ChildJobItem; env: ChildOpsEnv }> = [];
|
|
79
|
+
let active = 0;
|
|
80
|
+
let activeUpdates = 0;
|
|
81
|
+
let reservations = 0;
|
|
82
|
+
|
|
83
|
+
const write = (env: ChildOpsEnv, linkId: string, patch: Partial<ChildObservation>): void => {
|
|
84
|
+
try { env.writeObservation(linkId, patch); } catch (error) {
|
|
85
|
+
// The env contract is "never throws"; this guards an env that breaks it. The job document carries the result.
|
|
86
|
+
console.warn(`[link] child observation write failed linkId=${linkId} error=${errorName(error)}`);
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
const running = (): boolean => [...jobs.values()].some(({ job }) => job.state !== "done");
|
|
90
|
+
const prune = (): void => {
|
|
91
|
+
const finished = [...jobs.values()].filter(({ job }) => job.state === "done");
|
|
92
|
+
for (const { job, env } of finished) if (Date.parse(job.finishedAt!) < env.now() - CHILD_JOB_RETENTION_MS) jobs.delete(job.jobId);
|
|
93
|
+
const kept = finished.filter(({ job }) => jobs.has(job.jobId)).sort((a, b) => Date.parse(a.job.finishedAt!) - Date.parse(b.job.finishedAt!));
|
|
94
|
+
for (const { job } of kept.slice(0, Math.max(0, kept.length - CHILD_JOB_RETENTION_COUNT))) jobs.delete(job.jobId);
|
|
95
|
+
};
|
|
96
|
+
/** ran = false: the item never touched its link (busy, child-initiated), so it writes no lastOperation. */
|
|
97
|
+
const finishItem = (job: ChildJob, item: ChildJobItem, env: ChildOpsEnv, outcome: ItemOutcome, ran = true): void => {
|
|
98
|
+
Object.assign(item, outcome);
|
|
99
|
+
if (item.hint !== undefined && item.hint.length > HINT_MAX) item.hint = item.hint.slice(0, HINT_MAX);
|
|
100
|
+
item.finishedAt = iso(env);
|
|
101
|
+
if (!ran) return;
|
|
102
|
+
if (locks.get(item.linkId) === job.jobId) locks.delete(item.linkId);
|
|
103
|
+
write(env, item.linkId, { lastOperation: summarize(job, item) });
|
|
104
|
+
};
|
|
105
|
+
const finishJob = (job: ChildJob, env: ChildOpsEnv): void => {
|
|
106
|
+
if (job.state === "done" || job.items.some(item => item.state === "queued" || item.state === "running")) return;
|
|
107
|
+
job.state = "done";
|
|
108
|
+
job.finishedAt = iso(env);
|
|
109
|
+
const resolvers = waiters.get(job.jobId);
|
|
110
|
+
if (resolvers) { waiters.delete(job.jobId); for (const resolve of resolvers) resolve(structuredClone(job)); }
|
|
111
|
+
if (!running()) { for (const resolve of idle) resolve(); idle.clear(); }
|
|
112
|
+
};
|
|
113
|
+
const runItem = async (job: ChildJob, item: ChildJobItem, env: ChildOpsEnv): Promise<void> => {
|
|
114
|
+
item.state = "running";
|
|
115
|
+
item.startedAt = iso(env);
|
|
116
|
+
if (job.state === "queued") job.state = "running";
|
|
117
|
+
let record: LinkRecord | undefined;
|
|
118
|
+
try { record = env.readStore().links.find(link => link.id === item.linkId); } catch { record = undefined; }
|
|
119
|
+
if (!record) { finishItem(job, item, env, { state: "refused", reason: "link-removed" }); return; }
|
|
120
|
+
let outcome: ItemOutcome;
|
|
121
|
+
try { outcome = await runners[job.op](record, job, env); } catch (error) {
|
|
122
|
+
console.warn(`[link] child ${job.op} failed linkId=${item.linkId} error=${errorName(error)}`);
|
|
123
|
+
outcome = { state: "failed", reason: "internal-error" };
|
|
124
|
+
}
|
|
125
|
+
finishItem(job, item, env, DONE.has(outcome.state) ? outcome : { state: "failed", reason: "internal-error" });
|
|
126
|
+
};
|
|
127
|
+
const pump = (): void => {
|
|
128
|
+
// FIFO across jobs; an update waiting for the update place does not hold up the items behind it.
|
|
129
|
+
for (let index = 0; index < pending.length && active < concurrency;) {
|
|
130
|
+
const entry = pending[index]!;
|
|
131
|
+
const update = entry.job.op === "update";
|
|
132
|
+
if (update && activeUpdates >= CHILD_OPS_UPDATE_CONCURRENCY) { index += 1; continue; }
|
|
133
|
+
pending.splice(index, 1);
|
|
134
|
+
active += 1;
|
|
135
|
+
if (update) activeUpdates += 1;
|
|
136
|
+
void runItem(entry.job, entry.item, entry.env).finally(() => {
|
|
137
|
+
active -= 1;
|
|
138
|
+
if (update) activeUpdates -= 1;
|
|
139
|
+
finishJob(entry.job, entry.env);
|
|
140
|
+
pump();
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
};
|
|
144
|
+
|
|
145
|
+
return {
|
|
146
|
+
submit(request, env) {
|
|
147
|
+
prune();
|
|
148
|
+
const store = env.readStore();
|
|
149
|
+
let records: LinkRecord[];
|
|
150
|
+
if (request.linkIds === "all") {
|
|
151
|
+
records = store.links;
|
|
152
|
+
if (records.length === 0) return { ok: false, code: "no_eligible_links", linkId: null };
|
|
153
|
+
} else {
|
|
154
|
+
records = [];
|
|
155
|
+
for (const linkId of request.linkIds) {
|
|
156
|
+
const record = store.links.find(link => link.id === linkId);
|
|
157
|
+
if (!record) return { ok: false, code: "link_not_found", linkId };
|
|
158
|
+
records.push(record);
|
|
159
|
+
}
|
|
160
|
+
const only = records.length === 1 ? records[0]! : null;
|
|
161
|
+
// observe answers a client-initiated link itself without SSH (020); the other ops need the Home's SSH trust.
|
|
162
|
+
if (only && request.op !== "observe" && only.direction === "client-initiated") return { ok: false, code: "link_not_home_initiated", linkId: only.id };
|
|
163
|
+
if (only && locks.has(only.id)) return { ok: false, code: "link_operation_in_progress", linkId: only.id };
|
|
164
|
+
}
|
|
165
|
+
const job: ChildJob = { schema: CHILD_JOB_SCHEMA, jobId: newJobId(), op: request.op, trigger: request.trigger,
|
|
166
|
+
restart: request.restart, ...(request.ignoreActivity === true && request.trigger === "manual" ? { ignoreActivity: true as const } : {}),
|
|
167
|
+
state: "queued", createdAt: iso(env), finishedAt: null,
|
|
168
|
+
items: records.map(record => ({ linkId: record.id, alias: record.alias, state: "queued" as const, reason: null,
|
|
169
|
+
startedAt: null, finishedAt: null })) };
|
|
170
|
+
jobs.set(job.jobId, { job, env });
|
|
171
|
+
job.items.forEach((item, index) => {
|
|
172
|
+
if (locks.has(item.linkId)) finishItem(job, item, env, { state: "busy", reason: "link-operation-in-progress" }, false);
|
|
173
|
+
else if (request.op !== "observe" && records[index]!.direction === "client-initiated") {
|
|
174
|
+
finishItem(job, item, env, { state: "unsupported", reason: "child-initiated" }, false);
|
|
175
|
+
} else { locks.set(item.linkId, job.jobId); pending.push({ job, item, env }); }
|
|
176
|
+
});
|
|
177
|
+
pump();
|
|
178
|
+
finishJob(job, env);
|
|
179
|
+
return { ok: true, job: structuredClone(job) };
|
|
180
|
+
},
|
|
181
|
+
job(jobId) {
|
|
182
|
+
prune();
|
|
183
|
+
const entry = jobs.get(jobId);
|
|
184
|
+
return entry ? structuredClone(entry.job) : undefined;
|
|
185
|
+
},
|
|
186
|
+
activeJob(linkId) {
|
|
187
|
+
const jobId = locks.get(linkId);
|
|
188
|
+
const job = jobId ? jobs.get(jobId)?.job : undefined;
|
|
189
|
+
if (!job || job.state === "done") return null;
|
|
190
|
+
return { jobId: job.jobId, op: job.op, state: job.state };
|
|
191
|
+
},
|
|
192
|
+
reserve(linkId) {
|
|
193
|
+
if (locks.has(linkId)) return null;
|
|
194
|
+
// Never a job id (those start ljob_), so activeJob reads null and no job finish releases it.
|
|
195
|
+
const token = `reservation:${++reservations}`;
|
|
196
|
+
locks.set(linkId, token);
|
|
197
|
+
let released = false;
|
|
198
|
+
return () => {
|
|
199
|
+
if (released) return;
|
|
200
|
+
released = true;
|
|
201
|
+
if (locks.get(linkId) === token) locks.delete(linkId);
|
|
202
|
+
};
|
|
203
|
+
},
|
|
204
|
+
whenDone(jobId) {
|
|
205
|
+
const entry = jobs.get(jobId);
|
|
206
|
+
if (!entry) return Promise.resolve(null);
|
|
207
|
+
if (entry.job.state === "done") return Promise.resolve(structuredClone(entry.job));
|
|
208
|
+
return new Promise<ChildJob | null>(resolve => {
|
|
209
|
+
const list = waiters.get(jobId) ?? [];
|
|
210
|
+
list.push(resolve);
|
|
211
|
+
waiters.set(jobId, list);
|
|
212
|
+
});
|
|
213
|
+
},
|
|
214
|
+
settled() {
|
|
215
|
+
if (!running()) return Promise.resolve();
|
|
216
|
+
return new Promise<void>(resolve => { idle.add(resolve); });
|
|
217
|
+
},
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
let shared: ChildOpsEngine | null = null;
|
|
222
|
+
/** One engine per Home process, shared by the routes (wp3) and the scheduler (wp5, wp7). */
|
|
223
|
+
export function sharedChildOpsEngine(): ChildOpsEngine {
|
|
224
|
+
return shared ??= createChildOpsEngine();
|
|
225
|
+
}
|
|
226
|
+
/** Tests that reach the routes through handleManagementAPI cannot set LinkRouteState.childOps; they await
|
|
227
|
+
* sharedChildOpsEngine().settled() and call this in afterEach. Precedent: resetQuotaResetActivationForTests. */
|
|
228
|
+
export function resetSharedChildOpsEngineForTests(): void {
|
|
229
|
+
shared = null;
|
|
230
|
+
}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { readLinkStore } from "./store";
|
|
2
|
+
import { childObservationsPath, linkKnownHostsPath, linkStorePath } from "./paths";
|
|
3
|
+
import { createSshRunner, type SshRunner } from "./ssh-runner";
|
|
4
|
+
import { projectLinkStatus } from "./status-projection";
|
|
5
|
+
import type { LinkTunnelStatus } from "./supervisor";
|
|
6
|
+
import { sharedChildOpsEngine } from "./child-ops-engine";
|
|
7
|
+
import type { ChildOpsEnv } from "./child-ops-types";
|
|
8
|
+
import { createChildOpsScheduler, type ChildOpsScheduler } from "./child-ops-scheduler";
|
|
9
|
+
import { readChildPolicy } from "./child-policy";
|
|
10
|
+
import type { CatalogRevisionMonitor } from "./child-catalog-freshness";
|
|
11
|
+
import { isLinkIdle, type LinkActivitySnapshot } from "./child-activity";
|
|
12
|
+
import { observeChild, type ObserveDeps } from "./child-observe";
|
|
13
|
+
import { inspectRemoteChildRuntime } from "./remote-plant";
|
|
14
|
+
import { requireRemotePlatform } from "./remote-platform";
|
|
15
|
+
import { patchChildObservation, readChildObservations, updateChildObservations } from "./child-observations";
|
|
16
|
+
import { homeLinkChildParity, type LinkChildParity } from "./child-parity";
|
|
17
|
+
import { codexSettingsDigest, projectHomeCodexSettings } from "./codex-settings";
|
|
18
|
+
import { packageVersion } from "../lib/package-version";
|
|
19
|
+
import { setCatalogAutoRefreshLinkFanout } from "../codex/catalog-auto-refresh";
|
|
20
|
+
import type { OcxConfig } from "../types";
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* The running Home's Child-ops host (050): builds the engine env and the catalog fan-out scheduler. Loaded only by a
|
|
24
|
+
* dynamic import from optional-listeners.ts once the link listener owns its socket (INV-LINK-CHILD-OPS-01).
|
|
25
|
+
*/
|
|
26
|
+
export interface ChildOpsHostBinding {
|
|
27
|
+
config: () => OcxConfig;
|
|
28
|
+
supervisorStatus: () => readonly LinkTunnelStatus[];
|
|
29
|
+
listenerStatus: () => { state: "off" | "listening" | "failed"; port: number | null };
|
|
30
|
+
/** 020's listener linkActivity; null when the listener has no activity book (never idle). */
|
|
31
|
+
activity: (linkId: string, now: number) => LinkActivitySnapshot | null;
|
|
32
|
+
/** 020's catalogRevisionForRoutes() singleton, handed over by optional-listeners (src/link cannot import it). */
|
|
33
|
+
catalogRevision: () => CatalogRevisionMonitor;
|
|
34
|
+
/** 020's listener peerObservation. */
|
|
35
|
+
peer: ObserveDeps["peer"];
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** The scheduler's revision view over 020's monitor: recompute() is true when the etag moved since it last looked. */
|
|
39
|
+
export function schedulerRevision(monitor: CatalogRevisionMonitor) {
|
|
40
|
+
let seen: string | null | undefined;
|
|
41
|
+
return {
|
|
42
|
+
current: (): { etag: string | null; changedAt: number | null } => {
|
|
43
|
+
const revision = monitor.current();
|
|
44
|
+
return revision ? { etag: revision.etag, changedAt: revision.changedAt } : { etag: null, changedAt: null };
|
|
45
|
+
},
|
|
46
|
+
async recompute(): Promise<boolean> {
|
|
47
|
+
const etag = monitor.current()?.etag ?? null;
|
|
48
|
+
const changed = seen !== undefined && etag !== seen;
|
|
49
|
+
seen = etag;
|
|
50
|
+
return changed;
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** Revision 4 (4529521968): the etag a Home-run sync last delivered; a GET of /v1/catalog never sets it. */
|
|
56
|
+
export function syncedEtagFor(linkId: string): string | null {
|
|
57
|
+
return readChildObservations(childObservationsPath()).children[linkId]?.catalogSyncedEtag ?? null;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* The Child's applied settings digest, only while its runtime started at or after that apply (#8557 review). A sync on a
|
|
62
|
+
* Child whose runtime predates its last apply restarts that runtime even when the settings did not change
|
|
63
|
+
* (restartRuntimeAfterApply), which would cut a busy Child's relayed streams. Both times are the Child's own clock.
|
|
64
|
+
*/
|
|
65
|
+
export function runtimeCurrentDigest(parity: LinkChildParity): string | null {
|
|
66
|
+
const { appliedCodexSettingsDigest: digest, lastApplyAt, runtimeStartedAt } = parity;
|
|
67
|
+
return digest !== null && lastApplyAt !== null && runtimeStartedAt !== null && runtimeStartedAt >= lastApplyAt ? digest : null;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const errorName = (error: unknown): string => error instanceof Error ? error.name : "unknown";
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* One env shape for the routes (030 childOpsEnvFor) and this host; idleAfterMs is the policy value. Revision 4
|
|
74
|
+
* (4529522063): with digests, autoSyncAllowed is the scheduler's own rule (idle, or settings already equal), asked
|
|
75
|
+
* again by runSyncItem when each automatic item starts.
|
|
76
|
+
*/
|
|
77
|
+
export function hostChildOpsEnv(binding: ChildOpsHostBinding, runner: Pick<SshRunner, "run">,
|
|
78
|
+
digests?: { home: () => string | null; child: (linkId: string) => string | null }): ChildOpsEnv {
|
|
79
|
+
const store = () => readLinkStore(linkStorePath());
|
|
80
|
+
const hosts = linkKnownHostsPath();
|
|
81
|
+
const version = packageVersion("0.0.0");
|
|
82
|
+
// Read on every check, not captured: the scheduler reuses one env across sync groups, and a policy change between
|
|
83
|
+
// them must apply to the next idle decision (#8557 review).
|
|
84
|
+
const idleAfterMs = (): number => readChildPolicy().policy.idleAfterMs;
|
|
85
|
+
const env: ChildOpsEnv = {
|
|
86
|
+
readStore: store, runner, knownHostsFile: hosts, homeVersion: version, now: Date.now, sleep: ms => Bun.sleep(ms),
|
|
87
|
+
// projectLinkStatus's default compensation read; the route state's in-memory compensationFailures are not visible
|
|
88
|
+
// here, and such a link is mid-removal: its item fails or reports offline, which the backoff absorbs.
|
|
89
|
+
wireState: linkId => projectLinkStatus(store(), binding.supervisorStatus(), binding.listenerStatus(), binding.config())
|
|
90
|
+
.links.find(link => link.id === linkId)?.state ?? null,
|
|
91
|
+
activity: linkId => {
|
|
92
|
+
const now = Date.now();
|
|
93
|
+
const snapshot = binding.activity(linkId, now);
|
|
94
|
+
return snapshot ? { inFlight: snapshot.inFlight, idle: isLinkIdle(snapshot, now, idleAfterMs()) } : null;
|
|
95
|
+
},
|
|
96
|
+
observe: record => observeChild(record, { runner, knownHostsFile: hosts, homeVersion: version, peer: binding.peer,
|
|
97
|
+
platformOf: link => requireRemotePlatform(runner, link.alias, link.explicitRoute ?? null, hosts), inspect: inspectRemoteChildRuntime,
|
|
98
|
+
now: () => new Date() }),
|
|
99
|
+
readObservation: linkId => readChildObservations(childObservationsPath()).children[linkId] ?? null,
|
|
100
|
+
// ChildOpsEnv contract: never throws (child-ops-types.ts); same shape as childOpsEnvFor.
|
|
101
|
+
writeObservation: (linkId, patch) => {
|
|
102
|
+
try { updateChildObservations(file => patchChildObservation(file, linkId, patch, new Date())); }
|
|
103
|
+
catch (error) { console.warn(`[link] child observation write failed linkId=${linkId} error=${errorName(error)}`); }
|
|
104
|
+
},
|
|
105
|
+
catalogEtag: () => { try { return binding.catalogRevision().current()?.etag ?? null; } catch { return null; } },
|
|
106
|
+
};
|
|
107
|
+
if (digests) env.autoSyncAllowed = linkId => {
|
|
108
|
+
if (env.activity(linkId)?.idle === true) return true;
|
|
109
|
+
const home = digests.home();
|
|
110
|
+
return home !== null && digests.child(linkId) === home;
|
|
111
|
+
};
|
|
112
|
+
return env;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
/** Starts the scheduler and returns its stop. wp5 sets no afterPoll: no update job starts here (070 adds the sweep). */
|
|
116
|
+
export function startChildOpsHost(binding: ChildOpsHostBinding): () => void {
|
|
117
|
+
const runner = createSshRunner();
|
|
118
|
+
const version = packageVersion("0.0.0");
|
|
119
|
+
const unref = <T>(handle: T): T => { (handle as { unref?: () => void }).unref?.(); return handle; };
|
|
120
|
+
const homeDigest = (): string | null => {
|
|
121
|
+
try { return codexSettingsDigest(projectHomeCodexSettings(binding.config(), version).settings); } catch { return null; }
|
|
122
|
+
};
|
|
123
|
+
const childDigest = (linkId: string): string | null => runtimeCurrentDigest(homeLinkChildParity.get(linkId));
|
|
124
|
+
const scheduler: ChildOpsScheduler = createChildOpsScheduler({
|
|
125
|
+
engine: sharedChildOpsEngine(), env: () => hostChildOpsEnv(binding, runner, { home: homeDigest, child: childDigest }),
|
|
126
|
+
readPolicy: () => readChildPolicy(),
|
|
127
|
+
revision: schedulerRevision(binding.catalogRevision()),
|
|
128
|
+
syncedEtag: syncedEtagFor,
|
|
129
|
+
homeDigest, childDigest,
|
|
130
|
+
peerVersion: linkId => binding.peer(linkId).observed?.version ?? null,
|
|
131
|
+
isClientRuntime: () => binding.config().runtimeRole === "client",
|
|
132
|
+
setCatalogChangedSlot: setCatalogAutoRefreshLinkFanout,
|
|
133
|
+
setTimeout: (fn, ms) => unref(setTimeout(fn, ms)), clearTimeout: handle => clearTimeout(handle as ReturnType<typeof setTimeout>),
|
|
134
|
+
setInterval: (fn, ms) => unref(setInterval(fn, ms)), clearInterval: handle => clearInterval(handle as ReturnType<typeof setInterval>),
|
|
135
|
+
});
|
|
136
|
+
scheduler.start();
|
|
137
|
+
return () => scheduler.stop();
|
|
138
|
+
}
|