@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { isIP } from "node:net";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* `dashboardTrustedProxy` (#8338): the one reverse proxy a standalone dashboard may sit behind
|
|
6
|
+
* and still remember devices. Pure parsing shared by the load schema, the live-write check and
|
|
7
|
+
* the request path, so every reader applies the same rules. Nothing here trusts a header.
|
|
8
|
+
*/
|
|
9
|
+
export const DASHBOARD_TRUSTED_PROXY_HEADERS = ["x-forwarded-host", "x-forwarded-proto"] as const;
|
|
10
|
+
export type DashboardTrustedProxyHeader = typeof DASHBOARD_TRUSTED_PROXY_HEADERS[number];
|
|
11
|
+
export const MAX_DASHBOARD_PROXY_ADDRESSES = 16;
|
|
12
|
+
|
|
13
|
+
export interface DashboardTrustedProxySettings {
|
|
14
|
+
/** Canonical `https://host[:port]` origin the browser uses. */
|
|
15
|
+
origin: string;
|
|
16
|
+
/** The origin's host as `URL.host` spells it (lowercase, default port removed). */
|
|
17
|
+
host: string;
|
|
18
|
+
/** Normalized peer addresses of the proxy hop. */
|
|
19
|
+
addresses: ReadonlySet<string>;
|
|
20
|
+
trust: ReadonlySet<DashboardTrustedProxyHeader>;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** One IP literal in the form `requestIP()` reports, or null. IPv4-mapped IPv6 reads as IPv4. */
|
|
24
|
+
export function normalizeProxyAddress(value: string): string | null {
|
|
25
|
+
const raw = value.trim();
|
|
26
|
+
const version = isIP(raw);
|
|
27
|
+
if (version === 4) return raw;
|
|
28
|
+
if (version !== 6) return null;
|
|
29
|
+
let host: string;
|
|
30
|
+
try { host = new URL(`http://[${raw}]/`).hostname.slice(1, -1); } catch { return null; }
|
|
31
|
+
const mapped = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(host);
|
|
32
|
+
if (mapped) {
|
|
33
|
+
const high = Number.parseInt(mapped[1]!, 16);
|
|
34
|
+
const low = Number.parseInt(mapped[2]!, 16);
|
|
35
|
+
return [high >> 8, high & 255, low >> 8, low & 255].join(".");
|
|
36
|
+
}
|
|
37
|
+
return host;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** A parsed setting, or the reason it is unusable. Unknown fields are refused. */
|
|
41
|
+
export function parseDashboardTrustedProxy(value: unknown): DashboardTrustedProxySettings | string {
|
|
42
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return "must be an object";
|
|
43
|
+
const record = value as Record<string, unknown>;
|
|
44
|
+
const unknown = Object.keys(record).find(key => key !== "origin" && key !== "proxyAddresses" && key !== "trustHeaders");
|
|
45
|
+
if (unknown !== undefined) return `contains an unsupported field: ${unknown}`;
|
|
46
|
+
const { origin, proxyAddresses, trustHeaders } = record;
|
|
47
|
+
if (typeof origin !== "string" || origin.includes("*")) return "origin must be one exact https origin (no wildcards)";
|
|
48
|
+
let parsed: URL;
|
|
49
|
+
try { parsed = new URL(origin); } catch { return "origin must be one exact https origin (no wildcards)"; }
|
|
50
|
+
// The URL parser decodes %2A, so the raw-string check alone would let an encoded wildcard through.
|
|
51
|
+
if (parsed.hostname.includes("*")) return "origin must be one exact https origin (no wildcards)";
|
|
52
|
+
if (parsed.protocol !== "https:") return "origin must use https";
|
|
53
|
+
if (parsed.username || parsed.password || parsed.pathname !== "/" || parsed.search || parsed.hash || !parsed.hostname) {
|
|
54
|
+
return "origin must be an origin without credentials, path, query, or fragment";
|
|
55
|
+
}
|
|
56
|
+
if (!Array.isArray(proxyAddresses) || proxyAddresses.length === 0 || proxyAddresses.length > MAX_DASHBOARD_PROXY_ADDRESSES) {
|
|
57
|
+
return `proxyAddresses must list 1 to ${MAX_DASHBOARD_PROXY_ADDRESSES} proxy IP addresses`;
|
|
58
|
+
}
|
|
59
|
+
const addresses = new Set<string>();
|
|
60
|
+
for (const entry of proxyAddresses) {
|
|
61
|
+
const address = typeof entry === "string" ? normalizeProxyAddress(entry) : null;
|
|
62
|
+
if (!address) return "proxyAddresses must be exact IP addresses (no ranges, wildcards, or host names)";
|
|
63
|
+
addresses.add(address);
|
|
64
|
+
}
|
|
65
|
+
const trust = new Set<DashboardTrustedProxyHeader>();
|
|
66
|
+
if (trustHeaders !== undefined) {
|
|
67
|
+
if (!Array.isArray(trustHeaders)) return "trustHeaders must be a list";
|
|
68
|
+
for (const header of trustHeaders) {
|
|
69
|
+
const name = typeof header === "string" ? header.toLowerCase() : "";
|
|
70
|
+
if (!(DASHBOARD_TRUSTED_PROXY_HEADERS as readonly string[]).includes(name)) {
|
|
71
|
+
return "trustHeaders may contain only x-forwarded-host and x-forwarded-proto";
|
|
72
|
+
}
|
|
73
|
+
trust.add(name as DashboardTrustedProxyHeader);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return { origin: parsed.origin, host: parsed.host, addresses, trust };
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** Load schema: keeps the operator's spelling and refuses anything the parser refuses. */
|
|
80
|
+
export const dashboardTrustedProxySchema = z.unknown().superRefine((value, ctx) => {
|
|
81
|
+
const parsed = parseDashboardTrustedProxy(value);
|
|
82
|
+
if (typeof parsed === "string") ctx.addIssue({ code: "custom", message: parsed });
|
|
83
|
+
}) as unknown as z.ZodType<{ origin: string; proxyAddresses: string[]; trustHeaders?: DashboardTrustedProxyHeader[] }>;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { aliasTemplateError } from "../providers/alias-template";
|
|
2
|
+
import { parseDashboardTrustedProxy } from "./dashboard-trusted-proxy";
|
|
1
3
|
import { readExistingSpendSalt, spendPoolAliasesError, validatePoolAliasOwners } from "../lib/spend-pool-alias-validation";
|
|
2
4
|
import { isSubagentModelEntry, rawSubagentModelForce } from "./subagent-models";
|
|
3
5
|
import { validRemainingQuotaAccountIds } from "../codex/account-use-remaining";
|
|
@@ -626,6 +628,30 @@ export function loopbackCompanionBindError(
|
|
|
626
628
|
+ "loopback bind already admits local callers without a credential.";
|
|
627
629
|
}
|
|
628
630
|
|
|
631
|
+
/** #8338: the persisted schema drops a malformed trusted-proxy block; a live write gets the reason. */
|
|
632
|
+
function dashboardTrustedProxyConfigError(value: unknown): string | null {
|
|
633
|
+
const raw = rawConfigRecord(value);
|
|
634
|
+
if (!raw || !Object.hasOwn(raw, "dashboardTrustedProxy") || raw.dashboardTrustedProxy === undefined) return null;
|
|
635
|
+
const parsed = parseDashboardTrustedProxy(raw.dashboardTrustedProxy);
|
|
636
|
+
return typeof parsed === "string" ? `schema_invalid: dashboardTrustedProxy: ${parsed}` : null;
|
|
637
|
+
}
|
|
638
|
+
|
|
639
|
+
/**
|
|
640
|
+
* #7705: load drops a hand-edited template that does not validate; a live write that carries one
|
|
641
|
+
* (a provider-wide save, `ocx config set`) gets the same reason the alias-template route gives.
|
|
642
|
+
*/
|
|
643
|
+
function providerAliasTemplateConfigError(value: unknown): string | null {
|
|
644
|
+
const providers = rawConfigRecord(rawConfigRecord(value)?.providers);
|
|
645
|
+
if (!providers) return null;
|
|
646
|
+
for (const [name, provider] of Object.entries(providers)) {
|
|
647
|
+
const template = rawConfigRecord(provider)?.aliasTemplate;
|
|
648
|
+
if (template === undefined) continue;
|
|
649
|
+
const problem = typeof template === "string" ? aliasTemplateError(template) : "template must be a string";
|
|
650
|
+
if (problem) return `schema_invalid: providers.${name}.aliasTemplate: ${problem}`;
|
|
651
|
+
}
|
|
652
|
+
return null;
|
|
653
|
+
}
|
|
654
|
+
|
|
629
655
|
/**
|
|
630
656
|
* Validate the hub management ingress at the live-write boundary.
|
|
631
657
|
*
|
|
@@ -785,6 +811,8 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
785
811
|
?? clientRolePairError(value)
|
|
786
812
|
?? loopbackListenerPortError(value)
|
|
787
813
|
?? managementIngressConfigError(value)
|
|
814
|
+
?? providerAliasTemplateConfigError(value)
|
|
815
|
+
?? dashboardTrustedProxyConfigError(value)
|
|
788
816
|
?? metricsExportConfigError(value)
|
|
789
817
|
?? serviceHealthRecoveryConfigError(value)
|
|
790
818
|
?? telemetryConfigError(value)
|
|
@@ -4,6 +4,15 @@ export function websocketsEnabled(config: Pick<OcxConfig, "websockets">): boolea
|
|
|
4
4
|
return config.websockets === true;
|
|
5
5
|
}
|
|
6
6
|
|
|
7
|
+
/**
|
|
8
|
+
* The Responses WebSocket over a Remote Link, Home side. It needs the Home's own WebSocket switch
|
|
9
|
+
* as well as its own: websockets is the owner's consent to the WebSocket pipeline, and this one adds
|
|
10
|
+
* linked Children to it. Both are read with === true, so an absent or malformed key means off.
|
|
11
|
+
*/
|
|
12
|
+
export function linkResponsesWebsocketEnabled(config: Pick<OcxConfig, "websockets" | "linkResponsesWebsocket">): boolean {
|
|
13
|
+
return config.websockets === true && config.linkResponsesWebsocket === true;
|
|
14
|
+
}
|
|
15
|
+
|
|
7
16
|
/**
|
|
8
17
|
* Opt-in Ultra Fast, read with the house `=== true` idiom so an absent key and a
|
|
9
18
|
* malformed one both mean off.
|
|
@@ -99,7 +99,8 @@ function applyModelCostRowReplacement(config: OcxConfig): void {
|
|
|
99
99
|
*/
|
|
100
100
|
export function adoptPersistedModelDiscovery(
|
|
101
101
|
config: OcxConfig,
|
|
102
|
-
persisted: Pick<OcxConfig, "modelDiscovery" | "disabledModels"
|
|
102
|
+
persisted: Pick<OcxConfig, "modelDiscovery" | "disabledModels">
|
|
103
|
+
& { selectedModels?: Record<string, string[] | undefined> },
|
|
103
104
|
): void {
|
|
104
105
|
config.modelDiscovery = structuredClone(persisted.modelDiscovery);
|
|
105
106
|
config.disabledModels = structuredClone(persisted.disabledModels);
|
|
@@ -108,6 +109,14 @@ export function adoptPersistedModelDiscovery(
|
|
|
108
109
|
baseline.modelDiscovery = structuredClone(persisted.modelDiscovery);
|
|
109
110
|
baseline.disabledModels = structuredClone(persisted.disabledModels);
|
|
110
111
|
}
|
|
112
|
+
// `admit` (#8236) widens a provider's committed selection. Move live and baseline together so
|
|
113
|
+
// the running catalog shows the arrival and a later save does not read the old list as an edit.
|
|
114
|
+
for (const [name, selected] of Object.entries(persisted.selectedModels ?? {})) {
|
|
115
|
+
const live = config.providers[name];
|
|
116
|
+
if (live) live.selectedModels = structuredClone(selected);
|
|
117
|
+
const base = baseline?.providers[name];
|
|
118
|
+
if (base) base.selectedModels = structuredClone(selected);
|
|
119
|
+
}
|
|
111
120
|
}
|
|
112
121
|
|
|
113
122
|
/** Adopt the committed Advisor subtree without advancing unrelated pending live intent. */
|
|
@@ -27,6 +27,7 @@ import { isPassiveRead } from "../lib/passive-read";
|
|
|
27
27
|
import { redactSecretString } from "../lib/redact";
|
|
28
28
|
import { isValidProviderName } from "./provider-name";
|
|
29
29
|
import { MODEL_ALIAS_PATTERN } from "../providers/default-aliases";
|
|
30
|
+
import { aliasTemplateError } from "../providers/alias-template";
|
|
30
31
|
import { MODEL_DISCOVERY_MAX_MODELS } from "../providers/model-discovery-limits";
|
|
31
32
|
import { getProviderRegistryEntry, providerMatchesRegistryTransport, registryModelServiceTierCapabilityApplies } from "../providers/registry";
|
|
32
33
|
import { providerFastSwitchOff } from "../providers/fast-opt-in";
|
|
@@ -244,6 +245,10 @@ export function sanitizeRetryOn429ForLoad(parsed: unknown, warn: (message: strin
|
|
|
244
245
|
const safeProviderName = JSON.stringify(redactSecretString(name));
|
|
245
246
|
if (!provider || typeof provider !== "object" || Array.isArray(provider)) continue;
|
|
246
247
|
const p = provider as Record<string, unknown>;
|
|
248
|
+
if (p.cacheAffinity !== undefined && !["auto", "session", "turn", "off"].includes(p.cacheAffinity as string)) {
|
|
249
|
+
delete p.cacheAffinity;
|
|
250
|
+
warn(`⚠️ config.json providers.${safeProviderName}.cacheAffinity is invalid — ignoring the field`);
|
|
251
|
+
}
|
|
247
252
|
const policy = p.retryOn429;
|
|
248
253
|
if (policy === undefined) continue;
|
|
249
254
|
if (!policy || typeof policy !== "object" || Array.isArray(policy)) {
|
|
@@ -1032,7 +1037,13 @@ export function sanitizeAliasesForLoad(raw: unknown, warn: (message: string) =>
|
|
|
1032
1037
|
const comboAliases = new Set(Object.values((root.combos as Record<string, { alias?: unknown }> | undefined) ?? {})
|
|
1033
1038
|
.map(combo => typeof combo?.alias === "string" ? combo.alias.toLowerCase() : "").filter(Boolean));
|
|
1034
1039
|
const accountNamespaces = new Set(Object.keys((root.codexAccountNamespaces as Record<string, unknown> | undefined) ?? {}).map(name => name.toLowerCase()));
|
|
1035
|
-
for (const provider of Object.
|
|
1040
|
+
for (const [providerName, provider] of Object.entries(providers)) {
|
|
1041
|
+
// #7705: a hand-edited template that would not validate loses only itself, not the config.
|
|
1042
|
+
if (provider.aliasTemplate !== undefined
|
|
1043
|
+
&& (typeof provider.aliasTemplate !== "string" || aliasTemplateError(provider.aliasTemplate) !== null)) {
|
|
1044
|
+
warn(`Ignoring invalid alias template for provider ${providerName} in config.json`);
|
|
1045
|
+
delete provider.aliasTemplate;
|
|
1046
|
+
}
|
|
1036
1047
|
const alias = provider.alias;
|
|
1037
1048
|
if (typeof alias !== "string" || !isValidProviderName(alias)
|
|
1038
1049
|
|| providerNames.has(alias.toLowerCase()) || claimedProviders.has(alias.toLowerCase())
|
|
@@ -18,7 +18,22 @@ export const SUBAGENT_SURFACE_GUIDE_URL = "https://opencodex.me/guides/subagent-
|
|
|
18
18
|
* What changed in this release is the written default, not this resolution.
|
|
19
19
|
*/
|
|
20
20
|
export function resolveMultiAgentMode(config: Pick<OcxConfig, "multiAgentMode">): MultiAgentMode {
|
|
21
|
-
return config.multiAgentMode === "v1" || config.multiAgentMode === "v2"
|
|
21
|
+
return config.multiAgentMode === "v1" || config.multiAgentMode === "v2" || config.multiAgentMode === "v2-plaintext"
|
|
22
|
+
? config.multiAgentMode
|
|
23
|
+
: "default";
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Whether v2 collaboration messages are compiled to plaintext on the canonical
|
|
28
|
+
* ChatGPT forward route. Two independent opt-ins activate it: the standalone
|
|
29
|
+
* experimental `plaintextV2AgentMessages` flag, and mode `"v2-plaintext"`, which is
|
|
30
|
+
* itself the operator's explicit consent. Mode transitions never rewrite the flag,
|
|
31
|
+
* and the flag alone never changes the resolved mode.
|
|
32
|
+
*/
|
|
33
|
+
export function isPlaintextV2AgentMessagesEnabled(
|
|
34
|
+
config: Pick<OcxConfig, "multiAgentMode" | "plaintextV2AgentMessages">,
|
|
35
|
+
): boolean {
|
|
36
|
+
return config.plaintextV2AgentMessages === true || resolveMultiAgentMode(config) === "v2-plaintext";
|
|
22
37
|
}
|
|
23
38
|
|
|
24
39
|
type AdvisoryConfig = Pick<OcxConfig, "multiAgentMode" | "multiAgentSurfaceAdvisoryVersion">;
|
|
@@ -27,12 +42,20 @@ type AdvisoryConfig = Pick<OcxConfig, "multiAgentMode" | "multiAgentSurfaceAdvis
|
|
|
27
42
|
* True when this install should be told once that v1 is now the default surface.
|
|
28
43
|
*
|
|
29
44
|
* A v1 install is silent because it has nothing to decide. A fresh install is silent
|
|
30
|
-
* because `getDefaultConfig()` writes the current version alongside the v1 default.
|
|
31
|
-
*
|
|
32
|
-
*
|
|
45
|
+
* because `getDefaultConfig()` writes the current version alongside the v1 default.
|
|
46
|
+
*
|
|
47
|
+
* A "v2-plaintext" install is silent too: the mode explicitly opts into a different
|
|
48
|
+
* native-to-routed delivery mechanism, and entering it required the
|
|
49
|
+
* dedicated plaintext acknowledgement, so re-raising the generic "v1 recommended" notice
|
|
50
|
+
* would repeat a decision the operator just made. The stored advisory version is left
|
|
51
|
+
* alone, so leaving the mode for base or v2 still raises an unanswered advisory.
|
|
52
|
+
*
|
|
53
|
+
* What is left is the case this exists for: an install that predates the change and is
|
|
54
|
+
* running base or v2, where a ChatGPT-native parent cannot hand a task to a routed child.
|
|
33
55
|
*/
|
|
34
56
|
export function multiAgentSurfaceAdvisoryRequired(config: AdvisoryConfig): boolean {
|
|
35
|
-
|
|
57
|
+
const mode = resolveMultiAgentMode(config);
|
|
58
|
+
if (mode === "v1" || mode === "v2-plaintext") return false;
|
|
36
59
|
return (config.multiAgentSurfaceAdvisoryVersion ?? 0) < MULTI_AGENT_SURFACE_ADVISORY_VERSION;
|
|
37
60
|
}
|
|
38
61
|
|
|
@@ -63,6 +63,20 @@ export type PendingTeardownReceipt = {
|
|
|
63
63
|
* replacement ever comes up, the next `ocx stop` finishes it like any abandoned receipt.
|
|
64
64
|
*/
|
|
65
65
|
handover?: "update-restart";
|
|
66
|
+
/**
|
|
67
|
+
* Windows checked stop (#7771): what the owner's Part A did before it sent the stop.
|
|
68
|
+
* /api/stop skips its own Part A only for a receipt carrying this record whose manager
|
|
69
|
+
* is still the registered one; a receipt without it (an older CLI, or one written
|
|
70
|
+
* before Part A) gets the route's own capped Part A. Readers that predate it ignore it.
|
|
71
|
+
*/
|
|
72
|
+
partA?: PendingTeardownPartA;
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
/** The Part A record of a teardown receipt: the outcome, the manager, the ended wrappers. */
|
|
76
|
+
export type PendingTeardownPartA = {
|
|
77
|
+
partA: "stopped" | "absent";
|
|
78
|
+
manager: { scheduler: boolean; winsw: boolean };
|
|
79
|
+
wrappers: { pid: number; startTime: number }[];
|
|
66
80
|
};
|
|
67
81
|
|
|
68
82
|
/**
|
|
@@ -130,6 +144,7 @@ export function claimPendingTeardown(
|
|
|
130
144
|
endpointSource: "exact" | "guessed",
|
|
131
145
|
ownerPid: number = process.pid,
|
|
132
146
|
handover?: "update-restart",
|
|
147
|
+
partA?: PendingTeardownPartA | null,
|
|
133
148
|
): PendingTeardownReceipt {
|
|
134
149
|
const dir = getConfigDir();
|
|
135
150
|
assertNotRealHomeUnderTest(dir);
|
|
@@ -137,11 +152,44 @@ export function claimPendingTeardown(
|
|
|
137
152
|
const receipt: PendingTeardownReceipt = {
|
|
138
153
|
ownerPid, nonce, createdAt: new Date().toISOString(), endpoint, endpointSource,
|
|
139
154
|
...(handover ? { handover } : {}),
|
|
155
|
+
...(partA ? { partA } : {}),
|
|
140
156
|
};
|
|
141
157
|
atomicWriteFile(pendingTeardownPathFor(nonce), JSON.stringify(receipt, null, 2) + "\n");
|
|
142
158
|
return receipt;
|
|
143
159
|
}
|
|
144
160
|
|
|
161
|
+
/**
|
|
162
|
+
* Add the Part A record to a receipt this process claimed before Part A ran (the guarded
|
|
163
|
+
* stop and an update handover claim first). Only the owner's own valid receipt is
|
|
164
|
+
* rewritten; anything else is left alone and reported as false.
|
|
165
|
+
*/
|
|
166
|
+
export function recordPendingTeardownPartA(nonce: string, partA: PendingTeardownPartA, ownerPid: number = process.pid): boolean {
|
|
167
|
+
const read = readPendingTeardown(nonce);
|
|
168
|
+
if (read.state !== "valid" || read.receipt.ownerPid !== ownerPid) return false;
|
|
169
|
+
assertNotRealHomeUnderTest(getConfigDir());
|
|
170
|
+
atomicWriteFile(pendingTeardownPathFor(nonce), JSON.stringify({ ...read.receipt, partA }, null, 2) + "\n");
|
|
171
|
+
return true;
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
/** The Part A record of the receipt a request names, when it is present and well formed. */
|
|
175
|
+
export function pendingTeardownPartA(nonce: string | null): PendingTeardownPartA | null {
|
|
176
|
+
if (!nonce || !NONCE_RE.test(nonce)) return null;
|
|
177
|
+
const read = readPendingTeardown(nonce);
|
|
178
|
+
if (read.state !== "valid") return null;
|
|
179
|
+
const record = read.receipt.partA as unknown;
|
|
180
|
+
if (!record || typeof record !== "object") return null;
|
|
181
|
+
const value = record as Record<string, unknown>;
|
|
182
|
+
const manager = value.manager as Record<string, unknown> | undefined;
|
|
183
|
+
const ok = (value.partA === "stopped" || value.partA === "absent")
|
|
184
|
+
&& !!manager && typeof manager === "object"
|
|
185
|
+
&& typeof manager.scheduler === "boolean" && typeof manager.winsw === "boolean"
|
|
186
|
+
&& Array.isArray(value.wrappers)
|
|
187
|
+
&& value.wrappers.every(entry => !!entry && typeof entry === "object"
|
|
188
|
+
&& Number.isSafeInteger((entry as { pid?: unknown }).pid)
|
|
189
|
+
&& Number.isFinite((entry as { startTime?: unknown }).startTime));
|
|
190
|
+
return ok ? read.receipt.partA! : null;
|
|
191
|
+
}
|
|
192
|
+
|
|
145
193
|
export function readPendingTeardown(nonce: string): PendingTeardownRead {
|
|
146
194
|
if (!NONCE_RE.test(nonce)) return { state: "missing" };
|
|
147
195
|
let raw: string;
|
|
@@ -332,10 +380,19 @@ export function isPendingTeardownAbandoned(
|
|
|
332
380
|
return !isAlive(read.receipt.ownerPid);
|
|
333
381
|
}
|
|
334
382
|
|
|
335
|
-
/**
|
|
336
|
-
|
|
383
|
+
/**
|
|
384
|
+
* Does this request name an obligation that exists, is readable, and is about this proxy?
|
|
385
|
+
*
|
|
386
|
+
* A receipt records the endpoint its stop was sent to. With `servedPort`, only a receipt naming
|
|
387
|
+
* that port defers this proxy's teardown, so a nonce claimed for one proxy cannot be spent on
|
|
388
|
+
* another listening elsewhere: that stop would defer an obligation the receipt does not describe,
|
|
389
|
+
* and the receipt's owner could release it without knowing (#8416).
|
|
390
|
+
*/
|
|
391
|
+
export function deferralMatchesReceipt(nonce: string | null, servedPort?: number | null): boolean {
|
|
337
392
|
if (!nonce || !NONCE_RE.test(nonce)) return false;
|
|
338
|
-
|
|
393
|
+
const read = readPendingTeardown(nonce);
|
|
394
|
+
if (read.state !== "valid") return false;
|
|
395
|
+
return servedPort === undefined || (servedPort !== null && read.receipt.endpoint.port === servedPort);
|
|
339
396
|
}
|
|
340
397
|
|
|
341
398
|
/** Does this request name a valid obligation that an update handed to its replacement (#7423)? */
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { execFileSync } from "node:child_process";
|
|
2
|
-
import {
|
|
2
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
3
|
+
import { existsSync, mkdirSync, readFileSync, readlinkSync, unlinkSync } from "node:fs";
|
|
4
|
+
import { hostname } from "node:os";
|
|
3
5
|
import { join } from "node:path";
|
|
4
6
|
import { isLocalAttestationSecret } from "../lib/local-management-attestation";
|
|
5
7
|
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
@@ -8,6 +10,7 @@ import {
|
|
|
8
10
|
resolveTrustedWindowsSystemDirectory,
|
|
9
11
|
} from "../lib/windows-elevation";
|
|
10
12
|
import { atomicWriteFile } from "./atomic-write";
|
|
13
|
+
import { readWindowsProcessCommandLineNative } from "./windows-process-command-line";
|
|
11
14
|
import { getConfigDir, hardenConfigDir } from "./paths";
|
|
12
15
|
import { registerOwnHome, unregisterOwnerRegistryHome } from "./owner-registry";
|
|
13
16
|
|
|
@@ -26,8 +29,122 @@ function ensureProcessStateDir(): void {
|
|
|
26
29
|
else hardenConfigDir();
|
|
27
30
|
}
|
|
28
31
|
|
|
32
|
+
/**
|
|
33
|
+
* Whether this process has written `ocx.pid` or `runtime-port.json` in its own lifetime (#8552).
|
|
34
|
+
*
|
|
35
|
+
* Set before the write, deliberately even when the write then throws, and never cleared: a record
|
|
36
|
+
* this process wrote (or may have written) and later removed still means its PID once named a live
|
|
37
|
+
* owner of this home, so it can never be told apart from an earlier lifetime of the same PID number.
|
|
38
|
+
* Moving the assignment after the write would let a failed write fail open.
|
|
39
|
+
*/
|
|
40
|
+
let publishedOwnershipRecords = false;
|
|
41
|
+
|
|
42
|
+
export function hasPublishedOwnershipRecords(): boolean {
|
|
43
|
+
return publishedOwnershipRecords;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Where the owner of a runtime record ran, as digests that store none of their inputs (#8552).
|
|
48
|
+
*
|
|
49
|
+
* Every container runs the proxy as PID 1, so a PID alone cannot say whether a record came from
|
|
50
|
+
* this container's previous run or from another container serving the same state volume. The
|
|
51
|
+
* `host` name must match, and on Linux at least one of two stronger facts as well
|
|
52
|
+
* ({@link sameRuntimeOwnerScope}):
|
|
53
|
+
*
|
|
54
|
+
* - `network` with `boot`, the network namespace within one boot: a container restarted inside
|
|
55
|
+
* its Kubernetes pod keeps it, because the pod sandbox owns it. Namespace inode numbers repeat
|
|
56
|
+
* across machines and boots, so the boot id has to match too;
|
|
57
|
+
* - `container`, the writable layer of the overlay mounted at `/` (its `upperdir`), counted only
|
|
58
|
+
* when its path carries a random 64-hex layer id (Docker's `overlay2` driver, containers/storage
|
|
59
|
+
* for Podman and CRI-O): a container started again keeps it, across a host reboot as well, and
|
|
60
|
+
* no other container ever mounts it, not even one sharing its network (`--network container:`)
|
|
61
|
+
* or its pod. A layer named by a sequence number (containerd's overlayfs snapshotter, which
|
|
62
|
+
* nodes built alike hand out identically) or a host whose own root is an overlay proves nothing
|
|
63
|
+
* beyond one machine, so it is not used; nor is a container id, which a container joined to
|
|
64
|
+
* another's network sees in mountinfo.
|
|
65
|
+
*
|
|
66
|
+
* A replacement pod, a second container with a fixed `hostname`, or another node matches neither.
|
|
67
|
+
* Processes that share one network namespace (host networking, pod sidecars, WSL distros, which
|
|
68
|
+
* share one VM) can match on `network`; for them the loopback probe still finds a listening owner.
|
|
69
|
+
* Elsewhere the PID space is the whole machine and the host name suffices. Linux evidence that
|
|
70
|
+
* cannot be read yields a per-process value that matches no other lifetime, so the self-record
|
|
71
|
+
* proof fails closed.
|
|
72
|
+
*/
|
|
73
|
+
export interface RuntimeOwnerScope {
|
|
74
|
+
host: string;
|
|
75
|
+
boot?: string;
|
|
76
|
+
network?: string;
|
|
77
|
+
container?: string;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
let cachedRuntimeOwnerScope: RuntimeOwnerScope | undefined;
|
|
81
|
+
|
|
82
|
+
export function runtimeOwnerScope(): RuntimeOwnerScope {
|
|
83
|
+
cachedRuntimeOwnerScope ??= computeRuntimeOwnerScope();
|
|
84
|
+
return cachedRuntimeOwnerScope;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function scopeDigest(...parts: string[]): string {
|
|
88
|
+
return createHash("sha256").update(parts.join("\0")).digest("hex").slice(0, 32);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* The `upperdir` of the overlay mounted at `/` when it names a randomly identified writable layer
|
|
93
|
+
* (a `/<64 hex>/` path segment): a container's own layer, unique across machines. The last root
|
|
94
|
+
* mount wins, as it is the one visible. Any other root filesystem (bare host, btrfs/zfs/vfs drivers,
|
|
95
|
+
* fuse-overlayfs, an overlay host root, containerd's sequence-numbered snapshots) yields nothing.
|
|
96
|
+
*/
|
|
97
|
+
export function rootOverlayUpperdirFromMountinfo(mountinfo: string): string | undefined {
|
|
98
|
+
let upperdir: string | undefined;
|
|
99
|
+
for (const line of mountinfo.split("\n")) {
|
|
100
|
+
const separator = line.indexOf(" - ");
|
|
101
|
+
if (separator < 0) continue;
|
|
102
|
+
const fields = line.slice(0, separator).split(" ");
|
|
103
|
+
if (fields[4] !== "/") continue;
|
|
104
|
+
const [fstype, , superOptions = ""] = line.slice(separator + 3).split(" ");
|
|
105
|
+
const match = fstype === "overlay" ? /(?:^|,)upperdir=([^,]+)/.exec(superOptions) : null;
|
|
106
|
+
upperdir = match && /\/[0-9a-f]{64}\//.test(match[1]) ? match[1] : undefined;
|
|
107
|
+
}
|
|
108
|
+
return upperdir;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
function readOptional(read: () => string): string | undefined {
|
|
112
|
+
try { return read(); } catch { return undefined; }
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
function computeRuntimeOwnerScope(): RuntimeOwnerScope {
|
|
116
|
+
if (process.platform !== "linux") return { host: scopeDigest(process.platform, hostname()) };
|
|
117
|
+
const boot = readOptional(() => readFileSync("/proc/sys/kernel/random/boot_id", "utf8").trim());
|
|
118
|
+
const network = readOptional(() => readlinkSync("/proc/self/ns/net"));
|
|
119
|
+
const container = readOptional(() => rootOverlayUpperdirFromMountinfo(readFileSync("/proc/self/mountinfo", "utf8")) ?? "");
|
|
120
|
+
const scope: RuntimeOwnerScope = { host: scopeDigest("linux", hostname()) };
|
|
121
|
+
if (boot && /^[0-9a-f-]{36}$/.test(boot) && network && /^net:\[\d+\]$/.test(network)) {
|
|
122
|
+
scope.boot = scopeDigest("boot", boot);
|
|
123
|
+
scope.network = scopeDigest("net", network);
|
|
124
|
+
}
|
|
125
|
+
if (container) scope.container = scopeDigest("container", container);
|
|
126
|
+
if (!scope.network && !scope.container) return { host: scopeDigest("unverifiable", randomUUID()) };
|
|
127
|
+
return scope;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* Whether a recorded owner scope proves the record was written where this process runs. Only an
|
|
132
|
+
* exact, well-formed match counts; anything else (absent, malformed, partial) is "no".
|
|
133
|
+
*/
|
|
134
|
+
export function sameRuntimeOwnerScope(recorded: unknown, own: RuntimeOwnerScope): boolean {
|
|
135
|
+
if (!recorded || typeof recorded !== "object" || Array.isArray(recorded)) return false;
|
|
136
|
+
const record = recorded as Record<string, unknown>;
|
|
137
|
+
if (typeof record.host !== "string" || record.host !== own.host) return false;
|
|
138
|
+
if (own.network === undefined && own.container === undefined) {
|
|
139
|
+
return record.boot === undefined && record.network === undefined && record.container === undefined;
|
|
140
|
+
}
|
|
141
|
+
return (own.network !== undefined && record.network === own.network && own.boot !== undefined && record.boot === own.boot)
|
|
142
|
+
|| (own.container !== undefined && record.container === own.container);
|
|
143
|
+
}
|
|
144
|
+
|
|
29
145
|
export function writePid(pid: number): void {
|
|
30
146
|
ensureProcessStateDir();
|
|
147
|
+
publishedOwnershipRecords = true;
|
|
31
148
|
atomicWriteFile(getPidPath(), String(pid));
|
|
32
149
|
}
|
|
33
150
|
|
|
@@ -41,12 +158,32 @@ export type RuntimePortState = {
|
|
|
41
158
|
attestationSecret?: string;
|
|
42
159
|
/** A Link runtime is draining; new and in-flight sync commits must stand down. */
|
|
43
160
|
clientStopping?: true;
|
|
161
|
+
/**
|
|
162
|
+
* Fresh for every publication of a client runtime, including the rollback of a failed restart.
|
|
163
|
+
* A sync compares the whole record before each commit, so one captured before a restart cannot
|
|
164
|
+
* commit into the runtime that serves again afterwards (src/client/sync-runtime.ts).
|
|
165
|
+
*/
|
|
166
|
+
servingGeneration?: string;
|
|
167
|
+
/**
|
|
168
|
+
* The owner a client runtime classified from positive evidence (src/client/runtime-restart.ts
|
|
169
|
+
* restartOwnerEvidence: desktop, service-manager or none). Absent for a bare OCX_SERVICE=1 and for
|
|
170
|
+
* runtimes older than this field; `ocx disconnect` restarts only a runtime whose record states a
|
|
171
|
+
* value it recognises. Any string is accepted here so a later value never invalidates the record.
|
|
172
|
+
*/
|
|
173
|
+
restartOwner?: string;
|
|
44
174
|
/**
|
|
45
175
|
* The live proxy's port when this runtime is a sibling instance started beside it
|
|
46
176
|
* (`src/codex/sibling-start.ts`). `ocx stop` reads it to leave shared client routing alone.
|
|
47
|
-
* Absent for every other runtime
|
|
177
|
+
* Absent for every other runtime.
|
|
48
178
|
*/
|
|
49
179
|
siblingOfPort?: number;
|
|
180
|
+
/**
|
|
181
|
+
* {@link runtimeOwnerScope} of the owner, stamped by {@link writeRuntimePort} when this process
|
|
182
|
+
* writes its own record. Not validated here: a malformed value must not hide a live owner from
|
|
183
|
+
* status, stop or liveness, and the one reader that uses it (`observeProxyLiveness`) accepts
|
|
184
|
+
* only an exact match ({@link sameRuntimeOwnerScope}).
|
|
185
|
+
*/
|
|
186
|
+
ownerScope?: RuntimeOwnerScope;
|
|
50
187
|
};
|
|
51
188
|
|
|
52
189
|
export function isValidRuntimePortState(value: unknown): value is RuntimePortState {
|
|
@@ -64,12 +201,19 @@ export function isValidRuntimePortState(value: unknown): value is RuntimePortSta
|
|
|
64
201
|
&& hostnameOk
|
|
65
202
|
&& attestationOk
|
|
66
203
|
&& (state.clientStopping === undefined || state.clientStopping === true)
|
|
204
|
+
&& (state.servingGeneration === undefined || (typeof state.servingGeneration === "string" && state.servingGeneration.length <= 64))
|
|
205
|
+
&& (state.restartOwner === undefined || (typeof state.restartOwner === "string" && state.restartOwner.length <= 64))
|
|
67
206
|
&& siblingOk;
|
|
68
207
|
}
|
|
69
208
|
|
|
70
209
|
export function writeRuntimePort(state: RuntimePortState): void {
|
|
71
210
|
ensureProcessStateDir();
|
|
72
|
-
|
|
211
|
+
publishedOwnershipRecords = true;
|
|
212
|
+
// Only the owner can say where it runs; a record written on another process's behalf keeps
|
|
213
|
+
// whatever identity it already carried.
|
|
214
|
+
const ownerScope = state.pid === process.pid ? runtimeOwnerScope() : state.ownerScope;
|
|
215
|
+
const record = { ...state, ...(ownerScope === undefined ? {} : { ownerScope }) };
|
|
216
|
+
atomicWriteFile(getRuntimePortPath(), JSON.stringify(record, null, 2) + "\n");
|
|
73
217
|
// The record proves this home's owner only to a reader that knows where it lives.
|
|
74
218
|
// One pointer in the shared registry makes the record findable from every home;
|
|
75
219
|
// it is best-effort because ownership never depends on the registry write landing.
|
|
@@ -328,6 +472,28 @@ export function setProcessCommandLinePlatformForTests(next: NodeJS.Platform | nu
|
|
|
328
472
|
processCommandLinePlatformForTests = next;
|
|
329
473
|
}
|
|
330
474
|
|
|
475
|
+
type ProcessCommandLineNative = (pid: number) => string | undefined;
|
|
476
|
+
let processCommandLineNativeForTests: ProcessCommandLineNative | null = null;
|
|
477
|
+
|
|
478
|
+
/** Replace the in-process Windows command-line read; null restores the real one. */
|
|
479
|
+
export function setProcessCommandLineNativeForTests(next: ProcessCommandLineNative | null): void {
|
|
480
|
+
processCommandLineNativeForTests = next;
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
/** The in-process Windows read, or undefined so the spawned probes take their turn. */
|
|
484
|
+
function readNativeWindowsCommandLine(pid: number): string | undefined {
|
|
485
|
+
try {
|
|
486
|
+
if (processCommandLineNativeForTests) return processCommandLineNativeForTests(pid);
|
|
487
|
+
// A platform override means a test drives the spawned probes with fakes; the real native
|
|
488
|
+
// read would answer about this machine's process instead and bypass them.
|
|
489
|
+
if (processCommandLinePlatformForTests !== null) return undefined;
|
|
490
|
+
return readWindowsProcessCommandLineNative(pid);
|
|
491
|
+
} catch {
|
|
492
|
+
// A failed native read must leave the spawned probes their turn, not end the lookup.
|
|
493
|
+
return undefined;
|
|
494
|
+
}
|
|
495
|
+
}
|
|
496
|
+
|
|
331
497
|
export function readProcessCommandLine(pid: number): string | undefined {
|
|
332
498
|
if (!Number.isSafeInteger(pid) || pid <= 0) return undefined;
|
|
333
499
|
const platform = processCommandLinePlatformForTests ?? process.platform;
|
|
@@ -342,7 +508,12 @@ export function readProcessCommandLine(pid: number): string | undefined {
|
|
|
342
508
|
}
|
|
343
509
|
}
|
|
344
510
|
if (platform === "win32") {
|
|
345
|
-
//
|
|
511
|
+
// The in-process read answers in milliseconds. Get-CimInstance Win32_Process has been
|
|
512
|
+
// measured at 3.6-5.3 s on a busy machine, past the 3 s bound below, so without it a
|
|
513
|
+
// live runtime reads as unverified wherever WMIC is gone.
|
|
514
|
+
const native = readNativeWindowsCommandLine(pid);
|
|
515
|
+
if (native) return native;
|
|
516
|
+
// WMIC is the next path. Newer Windows images may omit it, so fall back to
|
|
346
517
|
// the trusted fixed PowerShell binary without consulting PATH or env roots.
|
|
347
518
|
const wmic = join(resolveTrustedWindowsSystemDirectory(), "wbem", "WMIC.exe");
|
|
348
519
|
try {
|
|
@@ -507,7 +507,7 @@ export function modelCapabilitiesConfigError(value: unknown, allowTombstones = f
|
|
|
507
507
|
if (allowTombstones && row === null) continue;
|
|
508
508
|
if (!capabilityRecord(row)) return "modelCapabilities rows must be plain objects";
|
|
509
509
|
for (const [axis, declaration] of Object.entries(row)) {
|
|
510
|
-
if (!["inputModalities", "contextTier", "video", "deepseekImageFiles", "mistralMaxImages", "supportsReasoning", "supportsThinkingToggle", "supportsReasoningEffort", "defaultThinkingEnabled"].includes(axis)) return "modelCapabilities contains an unknown axis";
|
|
510
|
+
if (!["inputModalities", "contextTier", "video", "deepseekImageFiles", "mistralMaxImages", "responsesCustomTools", "supportsReasoning", "supportsThinkingToggle", "supportsReasoningEffort", "defaultThinkingEnabled"].includes(axis)) return "modelCapabilities contains an unknown axis";
|
|
511
511
|
if (allowTombstones && declaration === null) continue;
|
|
512
512
|
if (axis === "inputModalities") {
|
|
513
513
|
if (!Array.isArray(declaration) || declaration.length === 0
|
|
@@ -520,7 +520,7 @@ export function modelCapabilitiesConfigError(value: unknown, allowTombstones = f
|
|
|
520
520
|
if (typeof declaration !== "number" || !Number.isSafeInteger(declaration) || declaration < 1 || declaration > 1000) {
|
|
521
521
|
return "modelCapabilities mistralMaxImages must be an integer from 1 to 1000";
|
|
522
522
|
}
|
|
523
|
-
} else if (["deepseekImageFiles", "supportsReasoning", "supportsThinkingToggle", "supportsReasoningEffort", "defaultThinkingEnabled"].includes(axis)) {
|
|
523
|
+
} else if (["deepseekImageFiles", "responsesCustomTools", "supportsReasoning", "supportsThinkingToggle", "supportsReasoningEffort", "defaultThinkingEnabled"].includes(axis)) {
|
|
524
524
|
if (typeof declaration !== "boolean") return `modelCapabilities ${axis} must be a boolean`;
|
|
525
525
|
} else {
|
|
526
526
|
if (!capabilityRecord(declaration) || Object.keys(declaration).some(key => key !== "processing")) {
|
|
@@ -557,7 +557,7 @@ export function mergeModelCapabilities(
|
|
|
557
557
|
} else if (axis === "mistralMaxImages") {
|
|
558
558
|
if (value === null) delete row.mistralMaxImages;
|
|
559
559
|
else row.mistralMaxImages = value as number;
|
|
560
|
-
} else if (axis === "supportsReasoning" || axis === "supportsThinkingToggle" || axis === "supportsReasoningEffort" || axis === "defaultThinkingEnabled") {
|
|
560
|
+
} else if (axis === "responsesCustomTools" || axis === "supportsReasoning" || axis === "supportsThinkingToggle" || axis === "supportsReasoningEffort" || axis === "defaultThinkingEnabled") {
|
|
561
561
|
if (value === null) delete row[axis];
|
|
562
562
|
else row[axis] = value as boolean;
|
|
563
563
|
} else if (axis === "video") {
|
|
@@ -587,7 +587,7 @@ export function sanitizeModelCapabilitiesForLoad(value: unknown): Record<string,
|
|
|
587
587
|
for (const [id, raw] of Object.entries(value).slice(0, MODEL_DISCOVERY_MAX_MODELS)) {
|
|
588
588
|
if (!capabilityRecord(raw) || !isValidModelDiscoveryModelId(id) || ["__proto__", "prototype", "constructor"].includes(id)) continue;
|
|
589
589
|
const row: Record<string, unknown> = {};
|
|
590
|
-
for (const axis of ["inputModalities", "contextTier", "video", "deepseekImageFiles", "mistralMaxImages", "supportsReasoning", "supportsThinkingToggle", "supportsReasoningEffort", "defaultThinkingEnabled"] as const) {
|
|
590
|
+
for (const axis of ["inputModalities", "contextTier", "video", "deepseekImageFiles", "mistralMaxImages", "responsesCustomTools", "supportsReasoning", "supportsThinkingToggle", "supportsReasoningEffort", "defaultThinkingEnabled"] as const) {
|
|
591
591
|
if (!Object.hasOwn(raw, axis)) continue;
|
|
592
592
|
const declaration = raw[axis];
|
|
593
593
|
if (modelCapabilitiesConfigError({ [id]: { [axis]: declaration } }) === null) row[axis] = declaration;
|
package/src/config/salvage.ts
CHANGED
|
@@ -33,6 +33,7 @@ const SALVAGEABLE_OPTIONAL_FIELDS: ReadonlyArray<readonly [string, string]> = [
|
|
|
33
33
|
["claudeCode", "desktopProfile"],
|
|
34
34
|
["claudeCode", "desktopModelVisibility"],
|
|
35
35
|
["claudeCode", "appendOnlyToolLoadingModels"],
|
|
36
|
+
["claudeCode", "chatToolDispatchModels"],
|
|
36
37
|
];
|
|
37
38
|
|
|
38
39
|
function isSalvageableConfigPath(section: string, id: string): boolean {
|