@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
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* Design of record: devlog/_fin/260802_client_toggle_api/040_wp4_management_api.md.
|
|
10
10
|
*/
|
|
11
11
|
import { readFileSync } from "node:fs";
|
|
12
|
+
import { LinkApplyBusyError, withLinkApply } from "../../client/link-home";
|
|
12
13
|
import { saveConfigPreservingClaudeCode } from "../../config";
|
|
13
14
|
import { listAsideProfileStates, type AsideProfilesInput } from "../../integrations/aside-profiles";
|
|
14
15
|
import {
|
|
@@ -48,6 +49,8 @@ import {
|
|
|
48
49
|
setIntegrationMutationFlightTestHook,
|
|
49
50
|
} from "../../integrations/mutation-flight";
|
|
50
51
|
import { jsonResponse } from "../auth-cors";
|
|
52
|
+
import { isRouteClientId, type RouteClientIntent } from "../../link/route-intent";
|
|
53
|
+
import { prepareHomeIntegrationDecision, recordHomeIntegrationDecision } from "./home-integration-decision";
|
|
51
54
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
52
55
|
import { managementInferencePort, type ManagementContext } from "./context";
|
|
53
56
|
import { exportSnapshotIdentity, loadExportModels, previewExportSnapshot } from "./model-rows";
|
|
@@ -150,6 +153,8 @@ let integrationMutationTestHooks: {
|
|
|
150
153
|
*/
|
|
151
154
|
store?: IntegrationStateStore;
|
|
152
155
|
run?: (operation: () => Promise<unknown>) => Promise<unknown>;
|
|
156
|
+
afterWriterStart?: () => void;
|
|
157
|
+
afterBoundSnapshot?: () => Promise<void>;
|
|
153
158
|
} | null = null;
|
|
154
159
|
|
|
155
160
|
/**
|
|
@@ -240,6 +245,8 @@ export function setIntegrationMutationFlightTestHooks(
|
|
|
240
245
|
/** Binds the WHOLE request — reads, writes and journal — to one store. */
|
|
241
246
|
store?: IntegrationStateStore;
|
|
242
247
|
run?: (operation: () => Promise<unknown>) => Promise<unknown>;
|
|
248
|
+
afterWriterStart?: () => void;
|
|
249
|
+
afterBoundSnapshot?: () => Promise<void>;
|
|
243
250
|
} | null,
|
|
244
251
|
): void {
|
|
245
252
|
integrationMutationTestHooks = hooks;
|
|
@@ -281,6 +288,33 @@ function asideOptions(ctx: ManagementContext): AsideProfileRouteOptions {
|
|
|
281
288
|
};
|
|
282
289
|
}
|
|
283
290
|
|
|
291
|
+
/**
|
|
292
|
+
* Which Aside requests are a Home decision, and the profiles each may enable: a toggle of one
|
|
293
|
+
* profile or all of them, or a profile restore. Undefined for reads, previews, journal and sync.
|
|
294
|
+
*/
|
|
295
|
+
async function asideDecisionScope(ctx: ManagementContext, known: unknown): Promise<readonly number[] | "all" | undefined> {
|
|
296
|
+
// The paths handleAsideProfileRoutes owns: the whole set, the profile collection, one profile,
|
|
297
|
+
// and one profile's restore.
|
|
298
|
+
const match = /^\/api\/client-integrations\/aside(?:\/profiles(?:\/(0|[1-9][0-9]*)(\/restore)?)?)?$/.exec(ctx.url.pathname);
|
|
299
|
+
if (!match) return undefined;
|
|
300
|
+
const restore = match[2] !== undefined && ctx.req.method === "POST";
|
|
301
|
+
const toggle = match[2] === undefined && ctx.req.method === "PUT";
|
|
302
|
+
if (!toggle && !restore) return undefined;
|
|
303
|
+
const raw = match[1] ?? ctx.url.searchParams.get("profile");
|
|
304
|
+
const id = raw !== null && /^(0|[1-9][0-9]*)$/.test(raw) && Number.isSafeInteger(Number(raw)) ? Number(raw) : undefined;
|
|
305
|
+
if (restore) return id === undefined ? [] : [id];
|
|
306
|
+
const body = known !== undefined ? known : await readJsonBody({ ...ctx, req: ctx.req.clone() });
|
|
307
|
+
if (!isPlainRecord(body) || body.enabled !== true) return [];
|
|
308
|
+
return id === undefined ? "all" : [id];
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
/** A file client's Home decision as its ownership record stands after a restore. */
|
|
312
|
+
function ownedIntent(store: IntegrationStateStore, clientId: IntegrationClientId): RouteClientIntent {
|
|
313
|
+
const owner = store.readRecords()[clientId];
|
|
314
|
+
return { enabled: Boolean(owner),
|
|
315
|
+
...(owner?.modelNames && (clientId === "hermes" || clientId === "commandcode") ? { modelNames: owner.modelNames } : {}) };
|
|
316
|
+
}
|
|
317
|
+
|
|
284
318
|
async function buildIntegrationWriteInput(
|
|
285
319
|
clientId: IntegrationClientId,
|
|
286
320
|
ctx: ManagementContext,
|
|
@@ -309,13 +343,13 @@ async function buildIntegrationWriteInput(
|
|
|
309
343
|
* that persists configuration. Everything else is shared, so a preview and the commit that follows
|
|
310
344
|
* it cannot disagree for any reason except the state genuinely moving.
|
|
311
345
|
*/
|
|
312
|
-
|
|
346
|
+
function buildIntegrationPreviewInput(
|
|
313
347
|
clientId: IntegrationClientId,
|
|
314
348
|
ctx: ManagementContext,
|
|
315
349
|
store: IntegrationStateStore,
|
|
316
350
|
droidReasoningDefaults?: Record<string, string>,
|
|
317
351
|
modelNames?: ExportModelNames,
|
|
318
|
-
):
|
|
352
|
+
): { input: IntegrationWriteInput; identity: string } | null {
|
|
319
353
|
const snapshot = previewExportSnapshot(ctx.config);
|
|
320
354
|
// No cached roster means no honest snapshot to plan against. Gathering one here would make a
|
|
321
355
|
// read refresh credentials and write the provider cache, which is the thing preview must not do.
|
|
@@ -530,6 +564,34 @@ async function readJsonBody(ctx: ManagementContext): Promise<unknown | Response>
|
|
|
530
564
|
}
|
|
531
565
|
}
|
|
532
566
|
|
|
567
|
+
/**
|
|
568
|
+
* `ocx sync` refreshes an already-connected Pi file through this route instead of rebuilding it
|
|
569
|
+
* in the CLI process. Pi may carry raw nested selectors, and a raw selector is only safe when the
|
|
570
|
+
* proxy that will serve it proves it routes to the same model (#8172). Proving it against the
|
|
571
|
+
* CLI's own saved configuration and router cache could write a selector this proxy routes
|
|
572
|
+
* elsewhere, so the refresh runs here, against this process's config, router and roster.
|
|
573
|
+
*/
|
|
574
|
+
export const PI_SYNC_PATH = "/api/client-integrations/pi/sync";
|
|
575
|
+
|
|
576
|
+
async function piSyncResponse(ctx: ManagementContext): Promise<Response> {
|
|
577
|
+
const body = await readJsonBody(ctx);
|
|
578
|
+
if (body instanceof Response) return body;
|
|
579
|
+
if (!isPlainRecord(body) || Object.keys(body).length !== 0) {
|
|
580
|
+
return jsonResponse({ error: "Pi sync expects an empty object", code: "invalid_pi_sync_body" }, 400, ctx.req, ctx.config);
|
|
581
|
+
}
|
|
582
|
+
const { refreshOwnedCatalogIntegrations } = await import("../../integrations/catalog-refresh");
|
|
583
|
+
const results = await refreshOwnedCatalogIntegrations({
|
|
584
|
+
config: ctx.config,
|
|
585
|
+
port: managementInferencePort(ctx),
|
|
586
|
+
models: () => loadExportModels(ctx.config),
|
|
587
|
+
store: integrationStore(),
|
|
588
|
+
...pathOverrides(),
|
|
589
|
+
...(integrationMutationTestHooks?.io ? { io: integrationMutationTestHooks.io } : {}),
|
|
590
|
+
}, ["pi"]);
|
|
591
|
+
const ok = results.every(result => result.ok);
|
|
592
|
+
return jsonResponse({ ok, clientId: "pi", results }, ok ? 200 : 207, ctx.req, ctx.config);
|
|
593
|
+
}
|
|
594
|
+
|
|
533
595
|
function writerFailureResponse(
|
|
534
596
|
clientId: IntegrationClientId,
|
|
535
597
|
/*
|
|
@@ -686,10 +748,12 @@ async function handleJournalDelete(ctx: ManagementContext): Promise<Response> {
|
|
|
686
748
|
export async function handleIntegrationRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
687
749
|
// Aside delegates before the ordinary client handler. Reject unsupported intent before that
|
|
688
750
|
// delegation can enumerate profiles, load catalogs, or write a different preference.
|
|
751
|
+
let asideBody: unknown;
|
|
689
752
|
if (/^\/api\/client-integrations\/aside\/profiles(?:\/|$)/.test(ctx.url.pathname)
|
|
690
753
|
&& (ctx.req.method === "PUT" || ctx.req.method === "POST")) {
|
|
691
754
|
const body = await readJsonBody({ ...ctx, req: ctx.req.clone() });
|
|
692
755
|
if (body instanceof Response) return body;
|
|
756
|
+
asideBody = body;
|
|
693
757
|
if (isPlainRecord(body)) {
|
|
694
758
|
const naming = readModelNames(ctx, body, "aside", "apply");
|
|
695
759
|
if (naming instanceof Response) return naming;
|
|
@@ -708,8 +772,22 @@ export async function handleIntegrationRoutes(ctx: ManagementContext): Promise<R
|
|
|
708
772
|
if (hermesScoped) ctx = hermesScoped;
|
|
709
773
|
const { req, url } = ctx;
|
|
710
774
|
const profileOptions = asideOptions(ctx);
|
|
711
|
-
|
|
775
|
+
// An Aside profile change is the Home's decision (home-integration-decision.ts).
|
|
776
|
+
const asideDecision = ctx.config.runtimeRole === "client" ? undefined : await asideDecisionScope(ctx, asideBody);
|
|
777
|
+
let aside: Response | null;
|
|
778
|
+
try {
|
|
779
|
+
aside = asideDecision === undefined ? await handleAsideProfileRoutes(ctx, profileOptions) : await withLinkApply(async () => {
|
|
780
|
+
const refused = prepareHomeIntegrationDecision(ctx, "aside", asideDecision);
|
|
781
|
+
if (refused) return refused;
|
|
782
|
+
const response = await handleAsideProfileRoutes(ctx, profileOptions);
|
|
783
|
+
return response && response.status >= 200 && response.status < 300 ? recordHomeIntegrationDecision(ctx, "aside", response) : response;
|
|
784
|
+
});
|
|
785
|
+
} catch (error) {
|
|
786
|
+
if (error instanceof LinkApplyBusyError) return jsonResponse({ error: "integration mutation busy", code: "integration_mutation_busy", clientId: "aside" }, 409, req, ctx.config);
|
|
787
|
+
throw error;
|
|
788
|
+
}
|
|
712
789
|
if (aside) return aside;
|
|
790
|
+
if (url.pathname === PI_SYNC_PATH && req.method === "POST") return piSyncResponse(ctx);
|
|
713
791
|
if (url.searchParams.has("profile")
|
|
714
792
|
&& (url.pathname === INTEGRATION_COLLECTION_PATH || url.pathname.startsWith(INTEGRATION_ROUTE_PREFIX))
|
|
715
793
|
&& !INTEGRATION_HISTORY_PATHS.includes(url.pathname)) {
|
|
@@ -966,12 +1044,27 @@ export async function handleIntegrationRoutes(ctx: ManagementContext): Promise<R
|
|
|
966
1044
|
// The binding travels with the request. Dropping it here routed a bound Aside restore into
|
|
967
1045
|
// the unbound path, which executed the mutation while its confirmation went unexamined.
|
|
968
1046
|
// A Hermes-scoped restore never delegates: its operation lives in the selected Hermes store.
|
|
969
|
-
|
|
1047
|
+
// A restore on the Home is its decision (home-integration-decision.ts); a Hermes profile's is not.
|
|
1048
|
+
const restoreDecides = ctx.config.runtimeRole !== "client" && !hermesRequestScope(req)?.resolvedPaths;
|
|
1049
|
+
const restoreAside = () => asideRestoreResponse(ctx, {
|
|
970
1050
|
opId,
|
|
971
1051
|
confirmDrift,
|
|
972
1052
|
...(parsed.operation === undefined ? {} : { operation: parsed.operation }),
|
|
973
1053
|
...(parsed.planFingerprint === undefined ? {} : { planFingerprint: parsed.planFingerprint }),
|
|
974
1054
|
}, profileOptions);
|
|
1055
|
+
let asideRestore: Response | null;
|
|
1056
|
+
try {
|
|
1057
|
+
const rootEntry = integrationStore(ctx).findOperation(opId);
|
|
1058
|
+
asideRestore = hermesRequestScope(req) ? null : rootEntry && rootEntry.clientId !== "aside" ? await restoreAside() : restoreDecides ? await withLinkApply(async () => {
|
|
1059
|
+
const refused = prepareHomeIntegrationDecision(ctx, undefined);
|
|
1060
|
+
if (refused) return refused;
|
|
1061
|
+
const response = await restoreAside();
|
|
1062
|
+
return response && response.status >= 200 && response.status < 300 ? recordHomeIntegrationDecision(ctx, "aside", response) : response;
|
|
1063
|
+
}) : await restoreAside();
|
|
1064
|
+
} catch (error) {
|
|
1065
|
+
if (error instanceof LinkApplyBusyError) return jsonResponse({ error: "integration mutation busy", code: "integration_mutation_busy" }, 409, req, ctx.config);
|
|
1066
|
+
return internalErrorResponse(error, ctx);
|
|
1067
|
+
}
|
|
975
1068
|
if (asideRestore) return asideRestore;
|
|
976
1069
|
let restoreClientId: IntegrationClientId | undefined;
|
|
977
1070
|
try {
|
|
@@ -994,53 +1087,63 @@ export async function handleIntegrationRoutes(ctx: ManagementContext): Promise<R
|
|
|
994
1087
|
}, 410, req, ctx.config);
|
|
995
1088
|
}
|
|
996
1089
|
|
|
1090
|
+
// Every caller must hold a current passive roster before it can join a flight.
|
|
997
1091
|
const boundRestore = restoreBinding === "none"
|
|
998
1092
|
? null
|
|
999
1093
|
: await buildIntegrationPreviewInput(operation.clientId, ctx, store);
|
|
1000
1094
|
if (restoreBinding !== "none" && boundRestore === null) return previewUnavailableResponse(ctx);
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1004
|
-
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
);
|
|
1012
|
-
const restoreInput: IntegrationRestoreInput = {
|
|
1013
|
-
...writeInput,
|
|
1014
|
-
opId,
|
|
1015
|
-
confirmDrift,
|
|
1016
|
-
};
|
|
1017
|
-
const result = await runIntegrationMutationFlight(
|
|
1095
|
+
if (boundRestore && integrationMutationTestHooks?.afterBoundSnapshot) await integrationMutationTestHooks.afterBoundSnapshot();
|
|
1096
|
+
if (boundRestore && exportSnapshotIdentity(ctx.config) !== boundRestore.identity) {
|
|
1097
|
+
const current = buildIntegrationPreviewInput(operation.clientId, ctx, store);
|
|
1098
|
+
return current === null ? previewUnavailableResponse(ctx) : jsonResponse({
|
|
1099
|
+
error: "integration preview is stale", code: "integration_preview_stale",
|
|
1100
|
+
plan: previewIntegration(current.input, { operation: "restore", opId, confirmDrift }),
|
|
1101
|
+
}, 409, req, ctx.config);
|
|
1102
|
+
}
|
|
1103
|
+
|
|
1104
|
+
const response = await runIntegrationMutationFlight(
|
|
1018
1105
|
operation.clientId,
|
|
1019
|
-
scopedFlightKey(ctx, `restore:${opId}:${confirmDrift}`),
|
|
1020
|
-
|
|
1021
|
-
() =>
|
|
1022
|
-
|
|
1023
|
-
|
|
1024
|
-
|
|
1025
|
-
|
|
1106
|
+
scopedFlightKey(ctx, `restore:${opId}:${confirmDrift}:${restoreBinding === "none" ? "unbound" : JSON.stringify([restoreBinding.fingerprint, boundRestore?.identity])}`),
|
|
1107
|
+
integrationMutationTestHooks?.io?.now ?? Date.now,
|
|
1108
|
+
async () => {
|
|
1109
|
+
const apply = async () => {
|
|
1110
|
+
if (restoreDecides) {
|
|
1111
|
+
const refused = prepareHomeIntegrationDecision(ctx, operation.clientId);
|
|
1112
|
+
if (refused) return refused;
|
|
1113
|
+
}
|
|
1114
|
+
const writeInput = boundRestore
|
|
1115
|
+
? boundRestore.input
|
|
1116
|
+
: await buildIntegrationWriteInput(operation.clientId, ctx, store);
|
|
1117
|
+
const restoreGuard = restoreBinding === "none" ? null : stalePlanGuard(
|
|
1118
|
+
operation.clientId,
|
|
1119
|
+
ctx,
|
|
1120
|
+
store,
|
|
1121
|
+
{ operation: "restore", opId, confirmDrift },
|
|
1122
|
+
restoreBinding.fingerprint,
|
|
1123
|
+
boundRestore === null ? null : boundRestore.identity,
|
|
1124
|
+
);
|
|
1125
|
+
const restoreInput: IntegrationRestoreInput = {
|
|
1126
|
+
...writeInput,
|
|
1127
|
+
opId,
|
|
1128
|
+
confirmDrift,
|
|
1129
|
+
};
|
|
1130
|
+
const result = await restoreIntegrationCoordinated(restoreInput, {
|
|
1131
|
+
lockSeams: integrationMutationTestHooks?.lockSeams,
|
|
1132
|
+
...(restoreGuard ? { revalidate: restoreGuard.revalidate } : {}),
|
|
1133
|
+
restoreGuard: () => hermesBoundaryRefusal(ctx),
|
|
1134
|
+
});
|
|
1135
|
+
const stale = restoreGuard?.response();
|
|
1136
|
+
if (stale) return stale;
|
|
1137
|
+
if (!result.ok) return writerFailureResponse(operation.clientId, result, ctx);
|
|
1138
|
+
const restored = jsonResponse(result satisfies IntegrationRestoreEnvelope, 200, req, ctx.config);
|
|
1139
|
+
return restoreDecides ? recordHomeIntegrationDecision(ctx, operation.clientId, restored, () => ownedIntent(store, operation.clientId)) : restored;
|
|
1140
|
+
};
|
|
1141
|
+
return restoreDecides ? withLinkApply(apply) : apply();
|
|
1142
|
+
},
|
|
1026
1143
|
);
|
|
1027
|
-
|
|
1028
|
-
if (restoreStale) return restoreStale;
|
|
1029
|
-
if (!result.ok) {
|
|
1030
|
-
/*
|
|
1031
|
-
* Drift is NOT special-cased here.
|
|
1032
|
-
*
|
|
1033
|
-
* It used to be, and the hand-written branch dropped the writer's
|
|
1034
|
-
* `message` — which is the only thing that tells the user WHICH file
|
|
1035
|
-
* drifted and where its backup went. Every refusal leaves through the
|
|
1036
|
-
* one serializer, so a refusal cannot lose its recovery fields by
|
|
1037
|
-
* being routed through a shorter path.
|
|
1038
|
-
*/
|
|
1039
|
-
return writerFailureResponse(operation.clientId, result, ctx);
|
|
1040
|
-
}
|
|
1041
|
-
return jsonResponse(result satisfies IntegrationRestoreEnvelope, 200, req, ctx.config);
|
|
1144
|
+
return jsonResponse(await response.clone().json(), response.status, req, ctx.config);
|
|
1042
1145
|
} catch (error) {
|
|
1043
|
-
if (error instanceof IntegrationMutationBusyError || error instanceof IntegrationWriterLockBusyError) {
|
|
1146
|
+
if (error instanceof IntegrationMutationBusyError || error instanceof IntegrationWriterLockBusyError || error instanceof LinkApplyBusyError) {
|
|
1044
1147
|
return jsonResponse({
|
|
1045
1148
|
error: "integration mutation busy",
|
|
1046
1149
|
code: "integration_mutation_busy",
|
|
@@ -1131,55 +1234,79 @@ export async function handleIntegrationRoutes(ctx: ManagementContext): Promise<R
|
|
|
1131
1234
|
}
|
|
1132
1235
|
|
|
1133
1236
|
try {
|
|
1237
|
+
// The toggle is the Home's decision (home-integration-decision.ts): Children's defaults are
|
|
1238
|
+
// saved first, an unreadable route-intent.json refuses while nothing has changed, and the
|
|
1239
|
+
// result is recorded below. A selected Hermes profile is not the Home's client.
|
|
1240
|
+
const recordsDecision = ctx.config.runtimeRole !== "client" && isRouteClientId(requestedClient) && !hermesRequestScope(req)?.resolvedPaths;
|
|
1241
|
+
const boundToggle = binding === "none"
|
|
1242
|
+
? null
|
|
1243
|
+
: await buildIntegrationPreviewInput(requestedClient, ctx, integrationStore(ctx), droidDefaults, modelNames);
|
|
1244
|
+
if (binding !== "none" && boundToggle === null) return previewUnavailableResponse(ctx);
|
|
1245
|
+
if (boundToggle && integrationMutationTestHooks?.afterBoundSnapshot) await integrationMutationTestHooks.afterBoundSnapshot();
|
|
1134
1246
|
/*
|
|
1135
1247
|
* A bound request is built from the same passive roster the guard re-plans against, and an
|
|
1136
1248
|
* unbound one keeps its existing refreshing path. Building the refreshing input first would
|
|
1137
1249
|
* have had the mutation and its own confirmation check disagree about the roster by
|
|
1138
1250
|
* construction, which is the disagreement this binding exists to detect.
|
|
1139
1251
|
*/
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
: await buildIntegrationWriteInput(requestedClient, ctx, integrationStore(ctx), droidDefaults, modelNames);
|
|
1147
|
-
if (droidDefaults !== undefined) {
|
|
1148
|
-
const invalid = validateDroidReasoningDefaults(input.models, droidDefaults);
|
|
1149
|
-
if (invalid) return invalidDroidDefaultsResponse(ctx, invalid);
|
|
1252
|
+
if (boundToggle && exportSnapshotIdentity(ctx.config) !== boundToggle.identity) {
|
|
1253
|
+
const current = buildIntegrationPreviewInput(requestedClient, ctx, integrationStore(ctx), droidDefaults, modelNames);
|
|
1254
|
+
return current === null ? previewUnavailableResponse(ctx) : jsonResponse({
|
|
1255
|
+
error: "integration preview is stale", code: "integration_preview_stale",
|
|
1256
|
+
plan: previewIntegration(current.input, { operation: requestedOperation }),
|
|
1257
|
+
}, 409, req, ctx.config);
|
|
1150
1258
|
}
|
|
1151
|
-
const
|
|
1152
|
-
requestedClient,
|
|
1153
|
-
ctx,
|
|
1154
|
-
integrationStore(ctx),
|
|
1155
|
-
{ operation: binding.operation },
|
|
1156
|
-
binding.fingerprint,
|
|
1157
|
-
boundToggle === null ? null : boundToggle.identity,
|
|
1158
|
-
droidDefaults,
|
|
1159
|
-
modelNames,
|
|
1160
|
-
);
|
|
1161
|
-
const result = await runIntegrationMutationFlight(
|
|
1259
|
+
const response = await runIntegrationMutationFlight(
|
|
1162
1260
|
requestedClient,
|
|
1163
|
-
scopedFlightKey(ctx, `${requestedOperation}:modelNames:${modelNames ?? "omitted"}`),
|
|
1164
|
-
|
|
1165
|
-
() => {
|
|
1166
|
-
const
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
1261
|
+
scopedFlightKey(ctx, `${requestedOperation}:modelNames:${modelNames ?? "omitted"}:binding:${binding === "none" ? "unbound" : JSON.stringify([binding.fingerprint, boundToggle?.identity])}:defaults:${JSON.stringify(droidDefaults ?? null)}`),
|
|
1262
|
+
integrationMutationTestHooks?.io?.now ?? Date.now,
|
|
1263
|
+
async () => {
|
|
1264
|
+
const apply = async () => {
|
|
1265
|
+
if (recordsDecision) {
|
|
1266
|
+
const refused = prepareHomeIntegrationDecision(ctx, requestedClient);
|
|
1267
|
+
if (refused) return refused;
|
|
1268
|
+
}
|
|
1269
|
+
const input = boundToggle
|
|
1270
|
+
? boundToggle.input
|
|
1271
|
+
: await buildIntegrationWriteInput(requestedClient, ctx, integrationStore(ctx), droidDefaults, modelNames);
|
|
1272
|
+
if (droidDefaults !== undefined) {
|
|
1273
|
+
const invalid = validateDroidReasoningDefaults(input.models, droidDefaults);
|
|
1274
|
+
if (invalid) return invalidDroidDefaultsResponse(ctx, invalid);
|
|
1275
|
+
}
|
|
1276
|
+
const guard = binding === "none" ? null : stalePlanGuard(
|
|
1277
|
+
requestedClient,
|
|
1278
|
+
ctx,
|
|
1279
|
+
integrationStore(ctx),
|
|
1280
|
+
{ operation: binding.operation },
|
|
1281
|
+
binding.fingerprint,
|
|
1282
|
+
boundToggle === null ? null : boundToggle.identity,
|
|
1283
|
+
droidDefaults,
|
|
1284
|
+
modelNames,
|
|
1285
|
+
);
|
|
1286
|
+
const options = {
|
|
1287
|
+
lockSeams: integrationMutationTestHooks?.lockSeams,
|
|
1288
|
+
...(guard ? { revalidate: guard.revalidate } : {}),
|
|
1289
|
+
guard: () => hermesBoundaryRefusal(ctx),
|
|
1290
|
+
};
|
|
1291
|
+
const pending = !parsed.enabled ? disableIntegrationCoordinated(input, options)
|
|
1292
|
+
: parsed.overwriteConflict === true ? overwriteIntegrationCoordinated(input, options)
|
|
1293
|
+
: applyIntegrationCoordinated(input, options);
|
|
1294
|
+
// Coordinators freeze their input synchronously before returning the promise.
|
|
1295
|
+
integrationMutationTestHooks?.afterWriterStart?.();
|
|
1296
|
+
const result = await pending;
|
|
1297
|
+
const stale = guard?.response();
|
|
1298
|
+
if (stale) return stale;
|
|
1299
|
+
if (!result.ok) return writerFailureResponse(requestedClient, result, ctx);
|
|
1300
|
+
const toggled = jsonResponse(result satisfies IntegrationToggleEnvelope, 200, req, ctx.config);
|
|
1301
|
+
return recordsDecision ? recordHomeIntegrationDecision(ctx, requestedClient, toggled, () => ({ enabled: parsed.enabled === true,
|
|
1302
|
+
...(modelNames !== undefined && (requestedClient === "hermes" || requestedClient === "commandcode") ? { modelNames } : {}) })) : toggled;
|
|
1170
1303
|
};
|
|
1171
|
-
|
|
1172
|
-
return parsed.overwriteConflict === true
|
|
1173
|
-
? overwriteIntegrationCoordinated(input, options)
|
|
1174
|
-
: applyIntegrationCoordinated(input, options);
|
|
1304
|
+
return recordsDecision ? withLinkApply(apply) : apply();
|
|
1175
1305
|
},
|
|
1176
1306
|
);
|
|
1177
|
-
|
|
1178
|
-
if (stale) return stale;
|
|
1179
|
-
if (!result.ok) return writerFailureResponse(requestedClient, result, ctx);
|
|
1180
|
-
return jsonResponse(result satisfies IntegrationToggleEnvelope, 200, req, ctx.config);
|
|
1307
|
+
return jsonResponse(await response.clone().json(), response.status, req, ctx.config);
|
|
1181
1308
|
} catch (error) {
|
|
1182
|
-
if (error instanceof IntegrationMutationBusyError || error instanceof IntegrationWriterLockBusyError) {
|
|
1309
|
+
if (error instanceof IntegrationMutationBusyError || error instanceof IntegrationWriterLockBusyError || error instanceof LinkApplyBusyError) {
|
|
1183
1310
|
return jsonResponse({
|
|
1184
1311
|
error: "integration mutation busy",
|
|
1185
1312
|
code: "integration_mutation_busy",
|