@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
package/src/responses/state.ts
CHANGED
|
@@ -20,8 +20,9 @@ import {
|
|
|
20
20
|
} from "./spill-store";
|
|
21
21
|
import { collectReferencedSpillFileNames, snapshotReferencedSpillFileNames } from "./state/spill-inspect";
|
|
22
22
|
import { selectSnapshotEntries, snapshotPayload } from "./state/snapshot-select";
|
|
23
|
-
import {
|
|
24
|
-
import {
|
|
23
|
+
import { expandStoredResponseInput } from "./state/replay-input";
|
|
24
|
+
import { normalizedClientThreadId, replayScopeMatches, validReplayOwnerKey } from "./state/replay-owner";
|
|
25
|
+
import { hasPendingClientToolCall } from "./state/unforced-store-false";
|
|
25
26
|
import { computeResponseStateMetrics, type ResponseStateMetrics } from "./state/metrics";
|
|
26
27
|
export type { ResponseStateMetrics } from "./state/metrics";
|
|
27
28
|
export type { ResponseStateTempRecoveryResult, ResponseStateTempRecoveryOptions } from "./state/temp-recovery";
|
|
@@ -117,6 +118,7 @@ export interface ResidentResponseState {
|
|
|
117
118
|
kind: "resident";
|
|
118
119
|
createdAt: number;
|
|
119
120
|
clientThreadId?: string;
|
|
121
|
+
replayOwnerKey?: string;
|
|
120
122
|
items: unknown[];
|
|
121
123
|
/** Index in `items` where provider output begins; see clientCarriedPrefixLength. */
|
|
122
124
|
providerOutputStart?: number;
|
|
@@ -129,6 +131,7 @@ export interface SpilledResponseState {
|
|
|
129
131
|
kind: "spill";
|
|
130
132
|
createdAt: number;
|
|
131
133
|
clientThreadId?: string;
|
|
134
|
+
replayOwnerKey?: string;
|
|
132
135
|
/** Mirrors the spilled payload boundary so a spilled entry keeps its anchor. */
|
|
133
136
|
providerOutputStart?: number;
|
|
134
137
|
providers?: OcxProviderContinuationState;
|
|
@@ -317,6 +320,7 @@ function measureResidentEntry(id: string, entry: ResidentInput): ResidentRespons
|
|
|
317
320
|
responseId: id,
|
|
318
321
|
createdAt: entry.createdAt,
|
|
319
322
|
...(entry.clientThreadId ? { clientThreadId: entry.clientThreadId } : {}),
|
|
323
|
+
...(entry.replayOwnerKey ? { replayOwnerKey: entry.replayOwnerKey } : {}),
|
|
320
324
|
items: entry.items,
|
|
321
325
|
...(entry.providerOutputStart !== undefined ? { providerOutputStart: entry.providerOutputStart } : {}),
|
|
322
326
|
...(entry.providers ? { providers: entry.providers } : {}),
|
|
@@ -423,6 +427,7 @@ function swapResidentForSpill(id: string, expected: ResidentResponseState, ref:
|
|
|
423
427
|
kind: "spill",
|
|
424
428
|
createdAt: expected.createdAt,
|
|
425
429
|
...(expected.clientThreadId ? { clientThreadId: expected.clientThreadId } : {}),
|
|
430
|
+
...(expected.replayOwnerKey ? { replayOwnerKey: expected.replayOwnerKey } : {}),
|
|
426
431
|
...(expected.providerOutputStart !== undefined ? { providerOutputStart: expected.providerOutputStart } : {}),
|
|
427
432
|
...(expected.providers ? { providers: expected.providers } : {}),
|
|
428
433
|
...(expected.unforcedStoreFalse ? { unforcedStoreFalse: expected.unforcedStoreFalse } : {}),
|
|
@@ -446,6 +451,7 @@ function replaceSpillEntryAtomically(
|
|
|
446
451
|
const ref = writeResponseSpillDurably(id, {
|
|
447
452
|
createdAt: candidate.createdAt,
|
|
448
453
|
...(candidate.clientThreadId ? { clientThreadId: candidate.clientThreadId } : {}),
|
|
454
|
+
...(candidate.replayOwnerKey ? { replayOwnerKey: candidate.replayOwnerKey } : {}),
|
|
449
455
|
items: candidate.items,
|
|
450
456
|
...(candidate.providerOutputStart !== undefined ? { providerOutputStart: candidate.providerOutputStart } : {}),
|
|
451
457
|
...(candidate.providers ? { providers: candidate.providers } : {}),
|
|
@@ -455,6 +461,7 @@ function replaceSpillEntryAtomically(
|
|
|
455
461
|
kind: "spill",
|
|
456
462
|
createdAt: candidate.createdAt,
|
|
457
463
|
...(candidate.clientThreadId ? { clientThreadId: candidate.clientThreadId } : {}),
|
|
464
|
+
...(candidate.replayOwnerKey ? { replayOwnerKey: candidate.replayOwnerKey } : {}),
|
|
458
465
|
...(candidate.providerOutputStart !== undefined ? { providerOutputStart: candidate.providerOutputStart } : {}),
|
|
459
466
|
...(candidate.providers ? { providers: candidate.providers } : {}),
|
|
460
467
|
...(candidate.unforcedStoreFalse ? { unforcedStoreFalse: candidate.unforcedStoreFalse } : {}),
|
|
@@ -540,6 +547,7 @@ function admitOversizedCandidate(
|
|
|
540
547
|
const ref = writeResponseSpillDurably(id, {
|
|
541
548
|
createdAt: candidate.createdAt,
|
|
542
549
|
...(candidate.clientThreadId ? { clientThreadId: candidate.clientThreadId } : {}),
|
|
550
|
+
...(candidate.replayOwnerKey ? { replayOwnerKey: candidate.replayOwnerKey } : {}),
|
|
543
551
|
items: candidate.items,
|
|
544
552
|
...(candidate.providerOutputStart !== undefined ? { providerOutputStart: candidate.providerOutputStart } : {}),
|
|
545
553
|
...(candidate.providers ? { providers: candidate.providers } : {}),
|
|
@@ -558,6 +566,7 @@ function admitOversizedCandidate(
|
|
|
558
566
|
kind: "spill",
|
|
559
567
|
createdAt: candidate.createdAt,
|
|
560
568
|
...(candidate.clientThreadId ? { clientThreadId: candidate.clientThreadId } : {}),
|
|
569
|
+
...(candidate.replayOwnerKey ? { replayOwnerKey: candidate.replayOwnerKey } : {}),
|
|
561
570
|
...(candidate.providerOutputStart !== undefined ? { providerOutputStart: candidate.providerOutputStart } : {}),
|
|
562
571
|
...(candidate.providers ? { providers: candidate.providers } : {}),
|
|
563
572
|
...(candidate.unforcedStoreFalse ? { unforcedStoreFalse: candidate.unforcedStoreFalse } : {}),
|
|
@@ -609,6 +618,7 @@ bindSpillQueueStore({
|
|
|
609
618
|
// once. It records the boundary whether the proxy prepended the history or the client already
|
|
610
619
|
// carried it — the boundary is the same either way, and only its provenance differs.
|
|
611
620
|
const replayedInputPrefixLengths = new WeakMap<object, number>();
|
|
621
|
+
const clientCarriedReplays = new WeakSet<object>(); // overlap skip: the client resent the window itself
|
|
612
622
|
const replayFailures = new WeakMap<object, PreviousResponseReplayFailure>();
|
|
613
623
|
let loaded = false;
|
|
614
624
|
let persistTimer: ReturnType<typeof setTimeout> | null = null;
|
|
@@ -959,6 +969,7 @@ function pruneResponses(at = now()): void {
|
|
|
959
969
|
const ref = writeResponseSpillDurably(oldestId, {
|
|
960
970
|
createdAt: entry.createdAt,
|
|
961
971
|
...(entry.clientThreadId ? { clientThreadId: entry.clientThreadId } : {}),
|
|
972
|
+
...(entry.replayOwnerKey ? { replayOwnerKey: entry.replayOwnerKey } : {}),
|
|
962
973
|
items: entry.items,
|
|
963
974
|
...(entry.providerOutputStart !== undefined ? { providerOutputStart: entry.providerOutputStart } : {}),
|
|
964
975
|
...(entry.providers ? { providers: entry.providers } : {}),
|
|
@@ -1019,6 +1030,7 @@ export function evictOldestResponseContinuationForBudget(): number {
|
|
|
1019
1030
|
const ref = writeResponseSpillDurably(id, {
|
|
1020
1031
|
createdAt: entry.createdAt,
|
|
1021
1032
|
...(entry.clientThreadId ? { clientThreadId: entry.clientThreadId } : {}),
|
|
1033
|
+
...(entry.replayOwnerKey ? { replayOwnerKey: entry.replayOwnerKey } : {}),
|
|
1022
1034
|
items: entry.items,
|
|
1023
1035
|
...(entry.providerOutputStart !== undefined ? { providerOutputStart: entry.providerOutputStart } : {}),
|
|
1024
1036
|
...(entry.providers ? { providers: entry.providers } : {}),
|
|
@@ -1059,6 +1071,9 @@ function materializeEntry(
|
|
|
1059
1071
|
schedulePersist();
|
|
1060
1072
|
return { ok: false, failure };
|
|
1061
1073
|
}
|
|
1074
|
+
if (entry.replayOwnerKey !== result.payload.replayOwnerKey || entry.clientThreadId !== result.payload.clientThreadId) {
|
|
1075
|
+
return { ok: false, failure: { code: "previous_response_not_found", reason: "spill_corrupt" } };
|
|
1076
|
+
}
|
|
1062
1077
|
// A restricted snapshot stub must agree with the validated spill's provenance.
|
|
1063
1078
|
if (entry.unforcedStoreFalse && (result.payload.unforcedStoreFalse !== true
|
|
1064
1079
|
|| entry.providerOutputStart === undefined || entry.providerOutputStart > result.payload.items.length
|
|
@@ -1071,6 +1086,7 @@ function materializeEntry(
|
|
|
1071
1086
|
const state = measureResidentEntry(id, {
|
|
1072
1087
|
createdAt: result.payload.createdAt,
|
|
1073
1088
|
...(result.payload.clientThreadId ? { clientThreadId: result.payload.clientThreadId } : {}),
|
|
1089
|
+
...(result.payload.replayOwnerKey ? { replayOwnerKey: result.payload.replayOwnerKey } : {}),
|
|
1074
1090
|
items: result.payload.items,
|
|
1075
1091
|
...(result.payload.providerOutputStart !== undefined
|
|
1076
1092
|
? { providerOutputStart: result.payload.providerOutputStart }
|
|
@@ -1087,11 +1103,7 @@ function materializeEntry(
|
|
|
1087
1103
|
return { ok: true, state };
|
|
1088
1104
|
}
|
|
1089
1105
|
|
|
1090
|
-
function
|
|
1091
|
-
return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
|
|
1092
|
-
}
|
|
1093
|
-
|
|
1094
|
-
export function expandPreviousResponseInput(body: unknown, clientThreadId?: string): unknown {
|
|
1106
|
+
export function expandPreviousResponseInput(body: unknown, clientThreadId?: string, replayOwnerKey?: string | null): unknown {
|
|
1095
1107
|
if (!body || typeof body !== "object" || Array.isArray(body)) return body;
|
|
1096
1108
|
const request = body as Record<string, unknown>;
|
|
1097
1109
|
const previousId = typeof request.previous_response_id === "string" ? request.previous_response_id : undefined;
|
|
@@ -1100,65 +1112,24 @@ export function expandPreviousResponseInput(body: unknown, clientThreadId?: stri
|
|
|
1100
1112
|
pruneResponses();
|
|
1101
1113
|
const previous = states.get(previousId);
|
|
1102
1114
|
if (!previous) return body;
|
|
1103
|
-
|
|
1104
|
-
if (!
|
|
1105
|
-
replayFailures.set(request, materialized.failure);
|
|
1106
|
-
return body;
|
|
1107
|
-
}
|
|
1108
|
-
const requestThreadId = normalizedClientThreadId(clientThreadId);
|
|
1109
|
-
const storedThreadId = normalizedClientThreadId(materialized.state.clientThreadId);
|
|
1110
|
-
// A Codex task must never inherit another task's continuation, nor a legacy unscoped entry.
|
|
1111
|
-
// Unscoped callers retain backward-compatible replay only with other unscoped entries.
|
|
1112
|
-
if (requestThreadId !== storedThreadId) {
|
|
1115
|
+
// Authorize metadata BEFORE opening a spill or exposing provider continuation state.
|
|
1116
|
+
if (previous.kind !== "spill-failed" && !replayScopeMatches(previous, clientThreadId, replayOwnerKey)) {
|
|
1113
1117
|
replayFailures.set(request, { code: "previous_response_not_found", reason: "scope_mismatch" });
|
|
1114
1118
|
replayScopeMismatchDrops += 1;
|
|
1115
1119
|
return body;
|
|
1116
1120
|
}
|
|
1117
|
-
const
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
-
if (
|
|
1121
|
-
materialized.state.unforcedStoreFalse
|
|
1122
|
-
&& !allowsUnforcedStoreFalseReplay(stored, materialized.state.providerOutputStart, clientInput, carried)
|
|
1123
|
-
) {
|
|
1121
|
+
const materialized = materializeEntry(previousId, previous);
|
|
1122
|
+
if (!materialized.ok) {
|
|
1123
|
+
replayFailures.set(request, materialized.failure);
|
|
1124
1124
|
return body;
|
|
1125
1125
|
}
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
// Three conditions, all required. The run must cover the whole stored entry; it must reach
|
|
1131
|
-
// the provider-output region; and some matched item in that region must carry a
|
|
1132
|
-
// provider-issued id. The last one is the load-bearing part: content equality alone proves
|
|
1133
|
-
// two items look alike, not that they are the same occurrence, so a client that merely
|
|
1134
|
-
// repeats its own message would otherwise authorize a skip that deletes real history.
|
|
1135
|
-
// There is no invariant that provider output always carries ids, so an entry whose output
|
|
1136
|
-
// has none simply never skips.
|
|
1137
|
-
{
|
|
1138
|
-
const anchor = materialized.state.providerOutputStart;
|
|
1139
|
-
if (
|
|
1140
|
-
carried === stored.length
|
|
1141
|
-
&& anchor !== undefined
|
|
1142
|
-
&& carried > anchor
|
|
1143
|
-
&& stored.slice(anchor, carried).some(item => providerIssuedIdentity(item) !== null)
|
|
1144
|
-
) {
|
|
1145
|
-
replayOverlapSkips += 1;
|
|
1146
|
-
// Keep previous_response_id: Kiro and Cursor recover their conversation ids from it
|
|
1147
|
-
// (kiro-wire.ts, cursor/request-builder.ts). Only the concatenation is skipped.
|
|
1148
|
-
const unchanged = { ...request };
|
|
1149
|
-
// Same provenance boundary a real expansion would record, so the replayed prefix does
|
|
1150
|
-
// not re-acknowledge historical compaction markers (parser.ts) and stays visible to
|
|
1151
|
-
// guidance de-duplication (collaboration.ts).
|
|
1152
|
-
replayedInputPrefixLengths.set(unchanged, carried);
|
|
1153
|
-
return unchanged;
|
|
1154
|
-
}
|
|
1126
|
+
const expanded = expandStoredResponseInput(request, inputItems(request.input), materialized.state);
|
|
1127
|
+
if (expanded.overlap) {
|
|
1128
|
+
replayOverlapSkips += 1;
|
|
1129
|
+
clientCarriedReplays.add(expanded.body);
|
|
1155
1130
|
}
|
|
1156
|
-
|
|
1157
|
-
|
|
1158
|
-
input: [...stored, ...clientInput],
|
|
1159
|
-
};
|
|
1160
|
-
replayedInputPrefixLengths.set(expanded, stored.length);
|
|
1161
|
-
return expanded;
|
|
1131
|
+
if (expanded.body !== request) replayedInputPrefixLengths.set(expanded.body, expanded.prefixLength);
|
|
1132
|
+
return expanded.body;
|
|
1162
1133
|
}
|
|
1163
1134
|
|
|
1164
1135
|
export function previousResponseReplayFailure(body: unknown): PreviousResponseReplayFailure | undefined {
|
|
@@ -1172,6 +1143,11 @@ export function previousResponseReplayPrefixLength(body: unknown): number {
|
|
|
1172
1143
|
return replayedInputPrefixLengths.get(body) ?? 0;
|
|
1173
1144
|
}
|
|
1174
1145
|
|
|
1146
|
+
/** Leading items the PROXY prepended; 0 when the client resent the stored window itself (overlap skip). */
|
|
1147
|
+
export function previousResponseRestoredPrefixLength(body: unknown): number {
|
|
1148
|
+
return body && typeof body === "object" && clientCarriedReplays.has(body) ? 0 : previousResponseReplayPrefixLength(body);
|
|
1149
|
+
}
|
|
1150
|
+
|
|
1175
1151
|
/** Copy proxy-private replay provenance to an internal clone with the same materialized input. */
|
|
1176
1152
|
export function copyPreviousResponseReplayProvenance(source: unknown, target: unknown): void {
|
|
1177
1153
|
if (!source || typeof source !== "object" || Array.isArray(source)) return;
|
|
@@ -1181,6 +1157,7 @@ export function copyPreviousResponseReplayProvenance(source: unknown, target: un
|
|
|
1181
1157
|
const input = (target as { input?: unknown }).input;
|
|
1182
1158
|
if (!Array.isArray(input) || prefixLength > input.length) return;
|
|
1183
1159
|
replayedInputPrefixLengths.set(target, prefixLength);
|
|
1160
|
+
if (clientCarriedReplays.has(source)) clientCarriedReplays.add(target);
|
|
1184
1161
|
}
|
|
1185
1162
|
|
|
1186
1163
|
/** True when this exact request could not replay because its task scope did not match. */
|
|
@@ -1252,7 +1229,7 @@ export function rememberResponseState(
|
|
|
1252
1229
|
requestBody: unknown,
|
|
1253
1230
|
response: { id?: unknown; output?: unknown; status?: unknown; incomplete_details?: unknown },
|
|
1254
1231
|
providerState?: OcxProviderContinuationState | string,
|
|
1255
|
-
opts?: { force?: boolean; clientThreadId?: string; retainForToolContinuation?: boolean },
|
|
1232
|
+
opts?: { force?: boolean; clientThreadId?: string; retainForToolContinuation?: boolean; replayOwnerKey?: string | null; compiledPlaintext?: boolean },
|
|
1256
1233
|
): void {
|
|
1257
1234
|
if (!requestBody || typeof requestBody !== "object" || Array.isArray(requestBody)) return;
|
|
1258
1235
|
const request = requestBody as Record<string, unknown>;
|
|
@@ -1271,7 +1248,11 @@ export function rememberResponseState(
|
|
|
1271
1248
|
if (!details || typeof details !== "object" || Array.isArray(details)
|
|
1272
1249
|
|| (details as { reason?: unknown }).reason !== "max_output_tokens") return;
|
|
1273
1250
|
} else if (response.status !== undefined && response.status !== "completed") return;
|
|
1251
|
+
if ((opts?.compiledPlaintext && !validReplayOwnerKey(opts.replayOwnerKey)) || opts?.replayOwnerKey === null || (opts?.replayOwnerKey !== undefined && !validReplayOwnerKey(opts.replayOwnerKey))) return;
|
|
1274
1252
|
ensureLoaded();
|
|
1253
|
+
const existing = states.get(response.id);
|
|
1254
|
+
// Never let a colliding upstream id replace a different caller's retained response.
|
|
1255
|
+
if (existing && existing.kind !== "spill-failed" && !replayScopeMatches(existing, opts?.clientThreadId, opts?.replayOwnerKey)) return;
|
|
1275
1256
|
const normalizedProviderState: OcxProviderContinuationState = typeof providerState === "string"
|
|
1276
1257
|
? { cursor: { conversationId: providerState } }
|
|
1277
1258
|
: structuredClone(providerState ?? {});
|
|
@@ -1287,6 +1268,7 @@ export function rememberResponseState(
|
|
|
1287
1268
|
setResidentEntry(response.id, {
|
|
1288
1269
|
createdAt: now(),
|
|
1289
1270
|
...(clientThreadId ? { clientThreadId } : {}),
|
|
1271
|
+
...(opts?.replayOwnerKey ? { replayOwnerKey: opts.replayOwnerKey } : {}),
|
|
1290
1272
|
items: [...requestItems, ...response.output],
|
|
1291
1273
|
// Where response.output begins. A replay skip requires a matched item at or past this
|
|
1292
1274
|
// index that also carries a provider-issued id — position alone proves only that an item
|
package/src/router.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
import type { NormalizedComboConfig } from "./combos/types";
|
|
15
15
|
import { hasOwnProvider } from "./config/provider-name";
|
|
16
16
|
import { anthropicInstanceRowShapeMatches } from "./providers/anthropic-instance-id";
|
|
17
|
+
import { isProviderApiKeyPaused } from "./providers/api-key-pause";
|
|
17
18
|
import { reconcileRouterWarningMemos, routedProviderConfig } from "./providers/routed-config";
|
|
18
19
|
import { assertProviderDestinationAllowed } from "./lib/destination-policy";
|
|
19
20
|
import {
|
|
@@ -317,6 +318,7 @@ function crossProviderRedirectTarget(config: OcxConfig, providerName: string, va
|
|
|
317
318
|
);
|
|
318
319
|
return usable ? value : undefined;
|
|
319
320
|
}
|
|
321
|
+
if (isProviderApiKeyPaused(effective)) return undefined;
|
|
320
322
|
return authMode === "local" || effective.keyOptional === true || Boolean(effective.apiKey?.trim())
|
|
321
323
|
|| (authMode === "key" && effective.adapter === "google" && effective.googleMode === "vertex")
|
|
322
324
|
? value : undefined;
|
|
@@ -598,7 +600,7 @@ function routeModelInternal(
|
|
|
598
600
|
const decoded = decodeRoutedModelIdOrThrow(requestedModel, known);
|
|
599
601
|
const nativeModel = known.includes(decoded)
|
|
600
602
|
? decoded
|
|
601
|
-
: resolveModelAlias(config, prov, known, requestedModel)
|
|
603
|
+
: resolveModelAlias(config, prov, known, requestedModel, provName)
|
|
602
604
|
// Last resort for direct requests while the live roster is cold: display-name keys are
|
|
603
605
|
// operator-declared native ids, consulted only here so they never claim aliases or shadow
|
|
604
606
|
// known or retained ids. Concrete policy/combo/redirect targets (bypassCombos) keep the
|
|
@@ -670,7 +672,7 @@ function routeModelInternal(
|
|
|
670
672
|
const aliasMatches: Array<{ provider: string; model: string; qualified: string }> = [];
|
|
671
673
|
for (const [provName, prov] of activeProviderEntries(config)) {
|
|
672
674
|
const known = knownModelIdsForProvider(provName, prov, config);
|
|
673
|
-
const native = resolveModelAlias(config, prov, known, modelId);
|
|
675
|
+
const native = resolveModelAlias(config, prov, known, modelId, provName);
|
|
674
676
|
if (native) aliasMatches.push({
|
|
675
677
|
provider: provName,
|
|
676
678
|
model: native,
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Children inherit the Home's native switches as they stood when route intent began, never as they
|
|
3
|
+
* are now: ocx restore, Messages off, Claude Desktop apply and the Claude toggle are Home-only.
|
|
4
|
+
*
|
|
5
|
+
* One idempotent capture freezes the four native defaults into route-intent.json. It runs before
|
|
6
|
+
* a Home default write and at Child enrollment, and, only once the Home has a link, when its link
|
|
7
|
+
* listener binds (a failure there is retried, see link-listener.ts) and before any Home-only
|
|
8
|
+
* decision changes a switch. On a Home with no link Home-only decisions leave route-intent.json
|
|
9
|
+
* alone, so a Child enrolled later inherits the switches as they stand at enrollment unless a Home
|
|
10
|
+
* default write already saved them. Reads never capture. Once a default is saved it is never
|
|
11
|
+
* captured again; only a Home default write changes it.
|
|
12
|
+
*/
|
|
13
|
+
import { readConfigDiagnostics } from "../config";
|
|
14
|
+
import { withConfigMutationLockSync } from "../config/mutation-lock";
|
|
15
|
+
import { setIntegrationEnabled, type CodexDesiredStateResult, type DurableIntentClientId } from "../codex/desired-state";
|
|
16
|
+
import { linkStorePath } from "../link/paths";
|
|
17
|
+
import { readLinkStore } from "../link/store";
|
|
18
|
+
import { HOME_NATIVE_ROUTE_CLIENTS, homeNativeRouteDefaults, type HomeNativeRouteClientId, type RouteClientIntent } from "../link/route-intent";
|
|
19
|
+
import type { OcxConfig } from "../types";
|
|
20
|
+
import { readRouteIntentState, routeIntentStatePath, updateRouteIntentState, type RouteIntentState } from "./route-intent-state";
|
|
21
|
+
|
|
22
|
+
function captured(state: RouteIntentState): boolean {
|
|
23
|
+
return HOME_NATIVE_ROUTE_CLIENTS.every(client => state.defaults[client] !== undefined);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Whether a linked Child inherits these defaults. An ephemeral `ocx-child` never reads route intent,
|
|
28
|
+
* so a Home whose only links are ephemeral has nothing to protect. Unreadable trust metadata counts
|
|
29
|
+
* as linked: a Child may still depend on these defaults.
|
|
30
|
+
*/
|
|
31
|
+
export function homeHasLinks(): boolean {
|
|
32
|
+
try { return readLinkStore(linkStorePath()).links.some(link => link.childKind !== "ephemeral"); } catch { return true; }
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export interface CaptureHomeRouteDefaultsOptions {
|
|
36
|
+
/**
|
|
37
|
+
* Every Home-only switch writer passes this: a Home without any link has no Child to protect
|
|
38
|
+
* yet, so route-intent.json is neither read nor written for it.
|
|
39
|
+
*/
|
|
40
|
+
whenLinked?: boolean;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** The native defaults the Home's durable switches give (`fallback` only when the file is unreadable); null on a Child. */
|
|
44
|
+
export function durableHomeNativeRouteDefaults(fallback?: OcxConfig): Record<HomeNativeRouteClientId, RouteClientIntent> | null {
|
|
45
|
+
const latest = readConfigDiagnostics();
|
|
46
|
+
const durable = latest.source === "file" && !latest.error ? latest.config : fallback;
|
|
47
|
+
return !durable || durable.runtimeRole === "client" ? null : homeNativeRouteDefaults(durable);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Fills only the missing native defaults; a saved one is never captured again. */
|
|
51
|
+
export function fillHomeNativeRouteDefaults(state: RouteIntentState, defaults: Record<HomeNativeRouteClientId, RouteClientIntent>): boolean {
|
|
52
|
+
let filled = false;
|
|
53
|
+
for (const client of HOME_NATIVE_ROUTE_CLIENTS) {
|
|
54
|
+
if (state.defaults[client] !== undefined) continue;
|
|
55
|
+
state.defaults[client] = defaults[client];
|
|
56
|
+
filled = true;
|
|
57
|
+
}
|
|
58
|
+
return filled;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Saves the missing native defaults from the durable switches (`fallback` only when the config
|
|
63
|
+
* file is unreadable). A Child never captures. Returns whether anything was saved.
|
|
64
|
+
*/
|
|
65
|
+
export function captureHomeRouteDefaults(fallback?: OcxConfig, options: CaptureHomeRouteDefaultsOptions = {}): boolean {
|
|
66
|
+
if (fallback?.runtimeRole === "client") return false;
|
|
67
|
+
if (options.whenLinked && !homeHasLinks()) return false;
|
|
68
|
+
if (captured(readRouteIntentState())) return false;
|
|
69
|
+
return withConfigMutationLockSync(() => {
|
|
70
|
+
const defaults = durableHomeNativeRouteDefaults(fallback);
|
|
71
|
+
if (!defaults) return false;
|
|
72
|
+
let saved = false;
|
|
73
|
+
updateRouteIntentState(state => { saved = fillHomeNativeRouteDefaults(state, defaults); return state; });
|
|
74
|
+
return saved;
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* A Home-only switch write refused because the Children's defaults could not be saved first.
|
|
80
|
+
* Writing the switch anyway would change what Children inherit once the file is repaired.
|
|
81
|
+
*/
|
|
82
|
+
export interface HomeRouteCaptureRefusal {
|
|
83
|
+
readonly ok: false;
|
|
84
|
+
readonly reason: "unavailable";
|
|
85
|
+
readonly retryable: boolean;
|
|
86
|
+
readonly message: string;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
export type HomeIntegrationResult = CodexDesiredStateResult | HomeRouteCaptureRefusal;
|
|
90
|
+
|
|
91
|
+
/** Only SQLITE_BUSY is contention worth retrying; any other lock failure repeats forever. */
|
|
92
|
+
function lockContention(error: unknown): boolean {
|
|
93
|
+
if (!error || typeof error !== "object") return false;
|
|
94
|
+
return (error as { code?: unknown }).code === "CONFIG_MUTATION_LOCK_UNAVAILABLE"
|
|
95
|
+
&& (error as { cause?: { code?: unknown } }).cause?.code === "SQLITE_BUSY";
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
export function captureRefusal(error: unknown): HomeRouteCaptureRefusal {
|
|
99
|
+
const path = routeIntentStatePath();
|
|
100
|
+
if (lockContention(error)) return { ok: false, reason: "unavailable", retryable: true,
|
|
101
|
+
message: `Another process is saving the configuration, so the Children's route defaults in ${path} could not be saved first; nothing was changed. Retry in a moment.` };
|
|
102
|
+
return { ok: false, reason: "unavailable", retryable: false,
|
|
103
|
+
message: `The Children's route defaults in ${path} could not be read or saved; nothing was changed. Inspect it, fix or remove it, then retry.` };
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/** `captureHomeRouteDefaults` for the Home-only switch writers: a failure is a typed refusal, never a throw. */
|
|
107
|
+
export function captureHomeRouteDefaultsBeforeHomeSwitch(): HomeRouteCaptureRefusal | null {
|
|
108
|
+
try {
|
|
109
|
+
captureHomeRouteDefaults(undefined, { whenLinked: true });
|
|
110
|
+
return null;
|
|
111
|
+
} catch (error) {
|
|
112
|
+
return captureRefusal(error);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* The Home-only switch writers (ocx restore, ocx restore back, Claude Desktop apply from the CLI
|
|
118
|
+
* and the dashboard) go through here. desired-state.ts itself stays free of link state: it is on
|
|
119
|
+
* the always-on request path (tests/lab/core-link-boundary.test.ts).
|
|
120
|
+
*/
|
|
121
|
+
export function setHomeIntegrationEnabled(client: DurableIntentClientId, enabled: boolean): HomeIntegrationResult {
|
|
122
|
+
return captureHomeRouteDefaultsBeforeHomeSwitch() ?? setIntegrationEnabled(client, enabled);
|
|
123
|
+
}
|
|
@@ -0,0 +1,200 @@
|
|
|
1
|
+
/** Upgrade bridge: existing journaled integrations are Home intent, never unowned file guesses. */
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { join, resolve } from "node:path";
|
|
4
|
+
import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
|
|
5
|
+
import { createIntegrationStateStore, type IntegrationStateStore } from "../integrations/store";
|
|
6
|
+
import { listAsideProfileStores } from "../integrations/aside-profile-context";
|
|
7
|
+
import { asideHomeDir } from "../clients/config-export";
|
|
8
|
+
import { parseRouteClientIntent, projectHomeRouteIntent, ROUTE_CLIENT_IDS, type HomeRouteIntentDocument, type RouteClientId, type RouteClientIntent, type RouteIntentState } from "../link/route-intent";
|
|
9
|
+
import { dropHomeNativeOverrides, homeRouteIntentInUse, readRouteIntentState, setRouteClientIntent, updateRouteIntentState } from "./route-intent-state";
|
|
10
|
+
import { captureHomeRouteDefaults, durableHomeNativeRouteDefaults, fillHomeNativeRouteDefaults, homeHasLinks, type CaptureHomeRouteDefaultsOptions } from "./home-route-capture";
|
|
11
|
+
import { withConfigMutationLockSync } from "../config/mutation-lock";
|
|
12
|
+
import { readConfigDiagnostics } from "../config";
|
|
13
|
+
import { packageVersion } from "../lib/package-version";
|
|
14
|
+
import type { OcxConfig } from "../types";
|
|
15
|
+
|
|
16
|
+
/** Existing Aside ownership must be resolved explicitly, never projected as off. */
|
|
17
|
+
export class HomeAsideIntentDerivationError extends Error {
|
|
18
|
+
constructor(cause: unknown) {
|
|
19
|
+
super("Existing Aside ownership needs an explicit Home route intent", { cause });
|
|
20
|
+
this.name = "HomeAsideIntentDerivationError";
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export function readHomeRouteIntentState(config: OcxConfig, options: { store?: IntegrationStateStore; home?: string; state?: RouteIntentState } = {}): RouteIntentState {
|
|
25
|
+
const state = structuredClone(options.state ?? readRouteIntentState());
|
|
26
|
+
const store = options.store ?? createIntegrationStateStore();
|
|
27
|
+
const records = store.readRecordsStrict();
|
|
28
|
+
for (const [client, owner] of Object.entries(records)) {
|
|
29
|
+
if (state.defaults[client as keyof typeof state.defaults] !== undefined || !owner || client === "aside") continue;
|
|
30
|
+
const intent = parseRouteClientIntent({ enabled: true, ...(owner.modelNames ? { modelNames: owner.modelNames } : {}) });
|
|
31
|
+
if (intent) state.defaults[client as keyof typeof state.defaults] = intent;
|
|
32
|
+
}
|
|
33
|
+
// A Home override does not resolve the default inherited by Children.
|
|
34
|
+
if (state.defaults.aside !== undefined) return state;
|
|
35
|
+
// The Home decision may already have changed or removed its ownership records. They no longer
|
|
36
|
+
// prove what Children inherited before that decision, even when there are no records left.
|
|
37
|
+
if (state.devices.home?.aside !== undefined) throw new HomeAsideIntentDerivationError(undefined);
|
|
38
|
+
const aside = deriveHomeAsideIntent(config, { store, home: options.home });
|
|
39
|
+
if (aside) state.defaults.aside = aside;
|
|
40
|
+
return state;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* For status reads and the Home's own sync: existing Aside ownership that cannot be named by stable
|
|
45
|
+
* userIds leaves the Children's Aside default unresolved. The returned state then carries a
|
|
46
|
+
* placeholder off default only so a document can be projected; a device without its own Aside entry
|
|
47
|
+
* must be reported as unresolved (`routeToAsideUnresolved`), never as off.
|
|
48
|
+
*/
|
|
49
|
+
export function readHomeRouteIntentStateAsideTolerant(config: OcxConfig, options: { state?: RouteIntentState } = {}): { state: RouteIntentState; asideUnresolved: boolean } {
|
|
50
|
+
try { return { state: readHomeRouteIntentState(config, options), asideUnresolved: false }; }
|
|
51
|
+
catch (error) {
|
|
52
|
+
if (!(error instanceof HomeAsideIntentDerivationError)) throw error;
|
|
53
|
+
const pinned = structuredClone(options.state ?? readRouteIntentState());
|
|
54
|
+
pinned.defaults.aside = { enabled: false };
|
|
55
|
+
return { state: readHomeRouteIntentState(config, { state: pinned }), asideUnresolved: true };
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* The Aside intent the Home's current Aside ownership amounts to: the stable userIds of every owned
|
|
61
|
+
* profile, all profiles under the all-profiles policy, or undefined when nothing is owned.
|
|
62
|
+
* `extraProfileIds` adds profiles about to be enabled, so a caller can refuse before writing
|
|
63
|
+
* anything when one of them has no stable userId. Throws HomeAsideIntentDerivationError.
|
|
64
|
+
*/
|
|
65
|
+
export function deriveHomeAsideIntent(config: OcxConfig, options: { store?: IntegrationStateStore; home?: string; extraProfileIds?: readonly number[] | "all" } = {}): RouteClientIntent | undefined {
|
|
66
|
+
const store = options.store ?? createIntegrationStateStore();
|
|
67
|
+
const records = store.readRecordsStrict();
|
|
68
|
+
const scopes = listAsideProfileStores(store).filter(scope => scope.store.readRecordsStrict().aside);
|
|
69
|
+
const extra = options.extraProfileIds ?? [];
|
|
70
|
+
if (!records.aside && scopes.length === 0 && extra.length === 0 && config.asideProfileSync?.allProfiles !== true) return undefined;
|
|
71
|
+
if (config.asideProfileSync?.allProfiles === true) return { enabled: true, accounts: "all" };
|
|
72
|
+
try {
|
|
73
|
+
const raw: unknown = JSON.parse(readBoundedRegularFileSync(join(asideHomeDir(process.env, options.home ?? homedir()), "accounts.json"), 4 * 1024 * 1024).toString("utf8"));
|
|
74
|
+
if (!raw || typeof raw !== "object" || !("accounts" in raw) || !Array.isArray(raw.accounts)) throw new Error("existing Aside selection needs explicit route intent");
|
|
75
|
+
const every = extra === "all" ? raw.accounts.flatMap((row: unknown) => row && typeof row === "object" && "id" in row && typeof row.id === "number" ? [row.id] : []) : extra;
|
|
76
|
+
const slots = new Set([...scopes.map(scope => scope.profileId), ...every]);
|
|
77
|
+
if (records.aside) {
|
|
78
|
+
const root = asideHomeDir(process.env, options.home ?? homedir());
|
|
79
|
+
const owned = resolve(records.aside.configPath);
|
|
80
|
+
const matches = raw.accounts.filter((row: unknown) => row && typeof row === "object" && "id" in row
|
|
81
|
+
&& typeof row.id === "number" && Number.isSafeInteger(row.id) && row.id >= 0
|
|
82
|
+
&& resolve(join(root, "u", String(row.id), "models.json")) === owned);
|
|
83
|
+
if (matches.length !== 1) throw new Error("existing Aside owner needs explicit route intent");
|
|
84
|
+
slots.add(matches[0].id);
|
|
85
|
+
}
|
|
86
|
+
const userIds: string[] = [];
|
|
87
|
+
for (const slot of slots) {
|
|
88
|
+
const row = raw.accounts.find((value: unknown) => value && typeof value === "object" && "id" in value && value.id === slot);
|
|
89
|
+
if (!row || typeof row !== "object" || !("userId" in row) || typeof row.userId !== "string") throw new Error("existing Aside selection needs explicit stable userIds");
|
|
90
|
+
userIds.push(row.userId);
|
|
91
|
+
}
|
|
92
|
+
const intent = parseRouteClientIntent({ enabled: true, accounts: [...new Set(userIds)] }, "aside");
|
|
93
|
+
if (!intent) throw new Error("existing Aside selection needs explicit stable userIds");
|
|
94
|
+
return intent;
|
|
95
|
+
} catch (cause) {
|
|
96
|
+
throw new HomeAsideIntentDerivationError(cause);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* Records a Home Aside profile change (the dashboard, `ocx integration client enable --client aside
|
|
102
|
+
* --profile N`, an Aside restore) as the Home's `devices.home.aside` decision, naming the stable
|
|
103
|
+
* userIds of every profile it owns afterwards, so ocx sync keeps it. Only once the Home uses route
|
|
104
|
+
* intent; returns whether a decision was recorded. Throws HomeAsideIntentDerivationError.
|
|
105
|
+
*/
|
|
106
|
+
export function recordHomeAsideDecision(config: OcxConfig): boolean {
|
|
107
|
+
return withConfigMutationLockSync(() => {
|
|
108
|
+
if (!homeRouteIntentInUse(readRouteIntentState())) return false;
|
|
109
|
+
setRouteClientIntent("aside", deriveHomeAsideIntent(config) ?? { enabled: false }, "home");
|
|
110
|
+
return true;
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/**
|
|
115
|
+
* Capture defaults before a local materializer changes native switches or owners. The native
|
|
116
|
+
* defaults come from the shared one-time capture; every other client from ownership or builtin.
|
|
117
|
+
* A Home-only decision passes `whenLinked`, the rule every Home-only switch writer follows: a Home
|
|
118
|
+
* without links has no Child to protect, so nothing reads or writes route-intent.json for it. Saving
|
|
119
|
+
* ownership defaults there would pin clients the dashboard later turns on (ocx sync applies saved
|
|
120
|
+
* defaults), and a damaged file would block a toggle that never needed it.
|
|
121
|
+
*/
|
|
122
|
+
export function initializeHomeRouteIntentDefaults(config: OcxConfig, version: string, decidingDefault?: RouteClientId,
|
|
123
|
+
options: CaptureHomeRouteDefaultsOptions = {}): void {
|
|
124
|
+
if (options.whenLinked && !homeHasLinks()) return;
|
|
125
|
+
withConfigMutationLockSync(() => {
|
|
126
|
+
// Every default is derived before anything is written: an Aside refusal leaves the file as it was.
|
|
127
|
+
const native = durableHomeNativeRouteDefaults(config);
|
|
128
|
+
const prior = readRouteIntentState();
|
|
129
|
+
if (native) fillHomeNativeRouteDefaults(prior, native);
|
|
130
|
+
if (decidingDefault) prior.defaults[decidingDefault] = { enabled: false };
|
|
131
|
+
const inherited = projectHomeRouteIntent(config, version, undefined, readHomeRouteIntentState(config, { state: prior }));
|
|
132
|
+
updateRouteIntentState(state => {
|
|
133
|
+
if (native) fillHomeNativeRouteDefaults(state, native);
|
|
134
|
+
for (const [client, intent] of Object.entries(inherited.clients)) state.defaults[client as keyof typeof state.defaults] ??= intent;
|
|
135
|
+
// A `devices.home` native entry from an earlier version no longer decides anything.
|
|
136
|
+
dropHomeNativeOverrides(state);
|
|
137
|
+
return state;
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* The link listener's capture of every default a Child inherits, from the Home's durable config:
|
|
144
|
+
* the native switches and the file clients' ownership, frozen in one write. An upgraded Home that
|
|
145
|
+
* saved only the native defaults gets the rest here, so a later dashboard toggle cannot move a
|
|
146
|
+
* Child's default. When existing Aside ownership cannot be resolved nothing else is saved; the
|
|
147
|
+
* native defaults are then captured on their own and the error is raised so the listener retries.
|
|
148
|
+
*/
|
|
149
|
+
export function captureChildRouteDefaults(): void {
|
|
150
|
+
const latest = readConfigDiagnostics();
|
|
151
|
+
if (latest.error) throw new Error("the configuration could not be read");
|
|
152
|
+
if (latest.config.runtimeRole === "client") return;
|
|
153
|
+
try {
|
|
154
|
+
initializeHomeRouteIntentDefaults(latest.config, packageVersion("0.0.0"), undefined, { whenLinked: true });
|
|
155
|
+
} catch (error) {
|
|
156
|
+
if (error instanceof HomeAsideIntentDerivationError) captureHomeRouteDefaults(undefined, { whenLinked: true });
|
|
157
|
+
throw error;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* What a Child inherits. Never reads the Home's live native switches; see home-route-capture.
|
|
163
|
+
* A pure read: enrollment and the link listener's start have already captured the native defaults.
|
|
164
|
+
*/
|
|
165
|
+
export function projectChildRouteIntent(config: OcxConfig, version: string, deviceId: string): HomeRouteIntentDocument {
|
|
166
|
+
const { state, asideUnresolved } = readHomeRouteIntentStateAsideTolerant(config);
|
|
167
|
+
if (asideUnresolved && state.devices[deviceId]?.aside === undefined) throw new HomeAsideIntentDerivationError(undefined);
|
|
168
|
+
return projectHomeRouteIntent(config, version, deviceId, state);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/** Provisioning runs under Home authority, before the read-only Child starts. */
|
|
172
|
+
export function seedRouteDeviceClients(config: OcxConfig, version: string, deviceId: string, selected?: readonly RouteClientId[], activeDeviceIds?: readonly string[]): void {
|
|
173
|
+
withConfigMutationLockSync(() => {
|
|
174
|
+
if (activeDeviceIds) reconcileHomeRouteDevices(activeDeviceIds);
|
|
175
|
+
initializeHomeRouteIntentDefaults(config, version);
|
|
176
|
+
// Absence means inherit, not an implicit device selection that masks Home changes.
|
|
177
|
+
if (selected === undefined) return;
|
|
178
|
+
updateRouteIntentState(state => {
|
|
179
|
+
const overrides = (state.devices[deviceId] ??= {});
|
|
180
|
+
const revisions = ((state.revisions ??= {})[deviceId] ??= {});
|
|
181
|
+
for (const client of ROUTE_CLIENT_IDS) {
|
|
182
|
+
if (client !== "codex" && client !== "claude" && !selected.includes(client)) continue;
|
|
183
|
+
overrides[client] = { ...(overrides[client] ?? {}), enabled: selected.includes(client) };
|
|
184
|
+
revisions[client] = (revisions[client] ?? 0) + 1;
|
|
185
|
+
}
|
|
186
|
+
return state;
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
/** Trust retirement also retires policy/revisions; Home and live peers retain their state. */
|
|
192
|
+
export function reconcileHomeRouteDevices(activeDeviceIds: readonly string[]): void {
|
|
193
|
+
const live = new Set(["home", ...activeDeviceIds]);
|
|
194
|
+
updateRouteIntentState(state => {
|
|
195
|
+
for (const map of [state.devices, state.revisions]) {
|
|
196
|
+
for (const id of Object.keys(map ?? {})) if (!live.has(id)) delete map![id];
|
|
197
|
+
}
|
|
198
|
+
return state;
|
|
199
|
+
});
|
|
200
|
+
}
|