@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
|
@@ -6,6 +6,12 @@ import { mirrorDesiredEnabledOntoSnapshot } from "./claude-desktop-config-writer
|
|
|
6
6
|
import { ensureManagementClaudeIntercept, interceptStartRefusal } from "./claude-intercept-routes";
|
|
7
7
|
import { persistCommittedDesktopGateway } from "../../claude/desktop-gateway-state";
|
|
8
8
|
import { commitClaudeCodeBlock } from "../../claude/claude-code-block";
|
|
9
|
+
import { HomeAsideIntentDerivationError, initializeHomeRouteIntentDefaults } from "../../routing/home-route-intent";
|
|
10
|
+
import { homeHasLinks } from "../../routing/home-route-capture";
|
|
11
|
+
import { recordHomeNativeDecision, RouteIntentStateUnreadableError } from "../../routing/route-intent-state";
|
|
12
|
+
import { withDurableRouteNativeSettings } from "../../routing/route-to-live-settings";
|
|
13
|
+
import { withLinkApply, LinkApplyBusyError } from "../../client/link-home";
|
|
14
|
+
import { ConfigMutationLockError, withConfigMutationLockSync } from "../../config/mutation-lock";
|
|
9
15
|
/**
|
|
10
16
|
* Toggle routes for the integrations that are NOT file-merged clients.
|
|
11
17
|
*
|
|
@@ -62,6 +68,8 @@ import { managementInferencePort, type ManagementContext } from "./context";
|
|
|
62
68
|
|
|
63
69
|
export type NativeIntegrationClientId = "claude" | "grok" | "codex" | "claude-desktop";
|
|
64
70
|
|
|
71
|
+
type NativeDecisionContext = ManagementContext & { decisionProgress?: { desiredEnabled?: boolean } };
|
|
72
|
+
|
|
65
73
|
/** Every reason this module can decline, in one place (audit r3 #6). */
|
|
66
74
|
export type NativeRefusalReason =
|
|
67
75
|
| "not_installed"
|
|
@@ -115,7 +123,12 @@ export interface NativeRefusalEnvelope {
|
|
|
115
123
|
/** Present on every post-commit refusal; absent only for pre-commit refusals. */
|
|
116
124
|
desiredEnabled?: boolean;
|
|
117
125
|
residualPaths?: string[];
|
|
118
|
-
diagnostic?: InterceptSecretDiagnostic;
|
|
126
|
+
diagnostic?: InterceptSecretDiagnostic | NativeConfigDiagnostic;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
interface NativeConfigDiagnostic {
|
|
130
|
+
stage: "config";
|
|
131
|
+
cause: "SQLITE_NOTADB" | "SQLITE_CORRUPT" | "SQLITE_CANTOPEN" | "SQLITE_IOERR" | "EACCES" | "EPERM" | "ENOENT" | "EIO" | "unknown";
|
|
119
132
|
}
|
|
120
133
|
|
|
121
134
|
export type NativePostCommitRefusalEnvelope = Omit<NativeRefusalEnvelope, "desiredEnabled"> & {
|
|
@@ -127,7 +140,7 @@ function refusal(
|
|
|
127
140
|
clientId: NativeIntegrationClientId,
|
|
128
141
|
reason: NativeRefusalReason,
|
|
129
142
|
message: string,
|
|
130
|
-
extra: Pick<NativeRefusalEnvelope, "desiredEnabled" | "residualPaths"> = {},
|
|
143
|
+
extra: Pick<NativeRefusalEnvelope, "desiredEnabled" | "residualPaths" | "diagnostic"> = {},
|
|
131
144
|
): Response {
|
|
132
145
|
return jsonResponse({
|
|
133
146
|
error: status >= 500 ? "native integration change failed" : "native integration change refused",
|
|
@@ -274,12 +287,66 @@ function grokStatus(config: ManagementContext["config"]): NativeStatus {
|
|
|
274
287
|
* whole class to a retryable 409 would tell the user to retry a lock file they
|
|
275
288
|
* cannot open, which fails identically forever (audit r8 #2).
|
|
276
289
|
*/
|
|
277
|
-
function
|
|
290
|
+
function isConfigMutationContention(error: unknown): boolean {
|
|
278
291
|
if (!error || typeof error !== "object") return false;
|
|
279
292
|
const cause = (error as { cause?: { code?: unknown } }).cause;
|
|
280
293
|
return cause?.code === "SQLITE_BUSY";
|
|
281
294
|
}
|
|
282
295
|
|
|
296
|
+
function configFailureDiagnostic(error: unknown): NativeConfigDiagnostic {
|
|
297
|
+
const cause = error instanceof ConfigMutationLockError || error instanceof ConfigWritePublishedError ? error.cause : error;
|
|
298
|
+
const code = cause && typeof cause === "object" && "code" in cause ? cause.code : undefined;
|
|
299
|
+
const allowed: readonly NativeConfigDiagnostic["cause"][] = ["SQLITE_NOTADB", "SQLITE_CORRUPT", "SQLITE_CANTOPEN", "SQLITE_IOERR", "EACCES", "EPERM", "ENOENT", "EIO"];
|
|
300
|
+
return { stage: "config", cause: allowed.find(value => value === code) ?? "unknown" };
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
/** ACL admission and Home apply exclusion precede this synchronous C section. */
|
|
304
|
+
async function commitNativeDecision(
|
|
305
|
+
ctx: NativeDecisionContext, clientId: NativeIntegrationClientId, enabled: boolean,
|
|
306
|
+
persist: () => boolean | Response,
|
|
307
|
+
): Promise<Response | null> {
|
|
308
|
+
let published = false;
|
|
309
|
+
try {
|
|
310
|
+
return await settleConfigRoot(configRoot(), () => withConfigMutationLockSync(() => {
|
|
311
|
+
// Capture the Children's defaults from the durable switches before this one changes, under
|
|
312
|
+
// the rule every Home-only switch writer follows: only once the Home has a link. Another
|
|
313
|
+
// process may have changed the switches since this server loaded its snapshot. A Home with
|
|
314
|
+
// no link has no Child to protect, so the toggle changes only the switch.
|
|
315
|
+
const linked = homeHasLinks();
|
|
316
|
+
if (linked) initializeHomeRouteIntentDefaults(withDurableRouteNativeSettings(ctx.config), ctx.version);
|
|
317
|
+
const result = persist();
|
|
318
|
+
if (result instanceof Response) return result;
|
|
319
|
+
published = result;
|
|
320
|
+
if (published && ctx.decisionProgress) ctx.decisionProgress.desiredEnabled = enabled;
|
|
321
|
+
// The switch just written is the Home's decision; route intent keeps no Home entry for it.
|
|
322
|
+
if (linked) recordHomeNativeDecision(clientId);
|
|
323
|
+
if (ctx.decisionProgress) ctx.decisionProgress.desiredEnabled = enabled;
|
|
324
|
+
return null;
|
|
325
|
+
}));
|
|
326
|
+
} catch (error) {
|
|
327
|
+
if (error instanceof WindowsSecretAclSettleTimeoutError && !published) {
|
|
328
|
+
const firstParty = clientId === "claude-desktop" && resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party";
|
|
329
|
+
return refusal(500, clientId, "write_failed", "Config ACL settlement timed out. Nothing was written; retry after it settles.",
|
|
330
|
+
firstParty ? { diagnostic: { stage: "ca", cause: "ETIMEDOUT" } } : {});
|
|
331
|
+
}
|
|
332
|
+
if (error instanceof HomeAsideIntentDerivationError) return refusal(409, clientId, "metadata_unreadable",
|
|
333
|
+
"Existing Aside ownership could not be resolved. Repair the Aside accounts.json manifest and stable userId selection, or choose an explicit Home Aside intent with ocx route to aside on or ocx route to aside off, then retry. Existing policy was preserved.");
|
|
334
|
+
if (error instanceof RouteIntentStateUnreadableError && !published) return refusal(500, clientId, "metadata_unreadable", error.message);
|
|
335
|
+
if (published || error instanceof ConfigWritePublishedError) {
|
|
336
|
+
if (clientId === "claude-desktop" && error instanceof ConfigWritePublishedError) mirrorDesiredEnabledOntoSnapshot(ctx.config, clientId, enabled);
|
|
337
|
+
const busy = isConfigLockError(error) && isConfigMutationContention(error);
|
|
338
|
+
return postCommitRefusal(busy ? 409 : 500, clientId, busy ? "config_busy" : "write_failed",
|
|
339
|
+
"The native switch was saved, but Home route intent or configuration bookkeeping did not complete. Repair configuration storage if needed, then retry the same switch to reconcile Home intent and apply it.",
|
|
340
|
+
{ desiredEnabled: enabled, diagnostic: configFailureDiagnostic(error) });
|
|
341
|
+
}
|
|
342
|
+
const busy = isConfigLockError(error) && isConfigMutationContention(error);
|
|
343
|
+
return refusal(busy ? 409 : 500, clientId, busy ? "config_busy" : "write_failed",
|
|
344
|
+
busy ? "Another process is saving the configuration right now. Nothing was written; retry in a moment."
|
|
345
|
+
: "The native decision could not be saved. Inspect and repair configuration storage, then retry.",
|
|
346
|
+
busy ? {} : { diagnostic: configFailureDiagnostic(error) });
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
|
|
283
350
|
function isConfigLockError(error: unknown): boolean {
|
|
284
351
|
return !!error && typeof error === "object"
|
|
285
352
|
&& (error as { code?: unknown }).code === "CONFIG_MUTATION_LOCK_UNAVAILABLE";
|
|
@@ -334,7 +401,7 @@ let codexToggleFlight: Promise<Response> | null = null;
|
|
|
334
401
|
* reads the persisted intent and converges — whereas converging first and dying
|
|
335
402
|
* would leave artifacts the next start silently undoes.
|
|
336
403
|
*/
|
|
337
|
-
async function handleCodexToggle(ctx:
|
|
404
|
+
async function handleCodexToggle(ctx: NativeDecisionContext): Promise<Response> {
|
|
338
405
|
const { req } = ctx;
|
|
339
406
|
if (codexToggleFlight) {
|
|
340
407
|
return refusal(409, "codex", "config_busy",
|
|
@@ -354,21 +421,27 @@ async function handleCodexToggle(ctx: ManagementContext): Promise<Response> {
|
|
|
354
421
|
const enabled = body.enabled;
|
|
355
422
|
|
|
356
423
|
const { setCodexIntegrationEnabled } = await import("../../codex/desired-state");
|
|
357
|
-
|
|
424
|
+
let decisionResult!: ReturnType<typeof setCodexIntegrationEnabled>;
|
|
358
425
|
/*
|
|
359
426
|
* `missing` does not block the switch — see the Grok route for the reasoning.
|
|
360
427
|
* A user with no config file yet still gets the artifact change; what they
|
|
361
428
|
* lose is durability across a restart, and the envelope says so rather than
|
|
362
429
|
* implying the switch failed.
|
|
363
430
|
*/
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
431
|
+
const decisionRefusal = await commitNativeDecision(ctx, "codex", enabled, () => {
|
|
432
|
+
decisionResult = setCodexIntegrationEnabled(enabled);
|
|
433
|
+
if (!decisionResult.ok && decisionResult.reason !== "missing") {
|
|
434
|
+
return refusal(
|
|
435
|
+
decisionResult.retryable ? 409 : 500,
|
|
436
|
+
"codex",
|
|
437
|
+
decisionResult.retryable ? "config_busy" : "write_failed",
|
|
438
|
+
decisionResult.message,
|
|
439
|
+
);
|
|
440
|
+
}
|
|
441
|
+
return decisionResult.ok;
|
|
442
|
+
});
|
|
443
|
+
if (decisionRefusal) return decisionRefusal;
|
|
444
|
+
const persisted = decisionResult;
|
|
372
445
|
const durable = persisted.ok;
|
|
373
446
|
|
|
374
447
|
if (enabled) {
|
|
@@ -435,7 +508,7 @@ async function handleCodexToggle(ctx: ManagementContext): Promise<Response> {
|
|
|
435
508
|
}
|
|
436
509
|
}
|
|
437
510
|
|
|
438
|
-
async function handleGrokToggle(ctx:
|
|
511
|
+
async function handleGrokToggle(ctx: NativeDecisionContext): Promise<Response> {
|
|
439
512
|
const { req, config, deps } = ctx;
|
|
440
513
|
/*
|
|
441
514
|
* The guard stands BEFORE the first await, or two concurrent PUTs could both
|
|
@@ -482,7 +555,7 @@ async function handleGrokToggle(ctx: ManagementContext): Promise<Response> {
|
|
|
482
555
|
* on, where the other order leaves artifacts the next start undoes.
|
|
483
556
|
*/
|
|
484
557
|
const { setGrokIntegrationEnabled } = await import("../../codex/desired-state");
|
|
485
|
-
|
|
558
|
+
let decisionResult!: ReturnType<typeof setGrokIntegrationEnabled>;
|
|
486
559
|
/*
|
|
487
560
|
* `missing` does NOT block the toggle here.
|
|
488
561
|
*
|
|
@@ -494,14 +567,20 @@ async function handleGrokToggle(ctx: ManagementContext): Promise<Response> {
|
|
|
494
567
|
* on the envelope says. `conflict` and `invalid` are different: another
|
|
495
568
|
* writer won, or the file is malformed and must not be overwritten.
|
|
496
569
|
*/
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
570
|
+
const decisionRefusal = await commitNativeDecision(ctx, "grok", enabled, () => {
|
|
571
|
+
decisionResult = setGrokIntegrationEnabled(enabled);
|
|
572
|
+
if (!decisionResult.ok && decisionResult.reason !== "missing") {
|
|
573
|
+
return refusal(
|
|
574
|
+
decisionResult.retryable ? 409 : 500,
|
|
575
|
+
"grok",
|
|
576
|
+
decisionResult.retryable ? "config_busy" : "write_failed",
|
|
577
|
+
decisionResult.message,
|
|
578
|
+
);
|
|
579
|
+
}
|
|
580
|
+
return decisionResult.ok;
|
|
581
|
+
});
|
|
582
|
+
if (decisionRefusal) return decisionRefusal;
|
|
583
|
+
const persisted = decisionResult;
|
|
505
584
|
const durable = persisted.ok;
|
|
506
585
|
const desiredEnabled = durable ? loadConfig().clientIntegrations?.grok !== false : enabled;
|
|
507
586
|
|
|
@@ -701,7 +780,7 @@ async function persistDesktopModeMarker(config: ManagementContext["config"], des
|
|
|
701
780
|
|
|
702
781
|
let claudeDesktopToggleFlight: Promise<Response> | null = null;
|
|
703
782
|
|
|
704
|
-
async function handleClaudeDesktopToggle(ctx:
|
|
783
|
+
async function handleClaudeDesktopToggle(ctx: NativeDecisionContext): Promise<Response> {
|
|
705
784
|
if (claudeDesktopToggleFlight) {
|
|
706
785
|
return refusal(409, "claude-desktop", "config_busy",
|
|
707
786
|
"Another Claude Desktop change is already in flight. Nothing was written — try again in a moment.");
|
|
@@ -719,17 +798,15 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
|
|
|
719
798
|
|
|
720
799
|
const { setIntegrationEnabled } = await import("../../codex/desired-state");
|
|
721
800
|
const enabled = body.enabled;
|
|
722
|
-
const
|
|
801
|
+
const decisionRefusal = await commitNativeDecision(ctx, "claude-desktop", enabled, () => {
|
|
723
802
|
const result = setIntegrationEnabled("claude-desktop", enabled);
|
|
724
803
|
if (result.ok) {
|
|
725
804
|
committedDesiredEnabled = enabled;
|
|
726
805
|
mirrorDesiredEnabledOntoSnapshot(ctx.config, "claude-desktop", enabled);
|
|
727
806
|
}
|
|
728
|
-
return result;
|
|
807
|
+
return result.ok ? true : refusal(result.retryable ? 409 : 500, "claude-desktop", result.retryable ? "config_busy" : "write_failed", result.message);
|
|
729
808
|
});
|
|
730
|
-
if (
|
|
731
|
-
return refusal(persisted.retryable ? 409 : 500, "claude-desktop", persisted.retryable ? "config_busy" : "write_failed", persisted.message);
|
|
732
|
-
}
|
|
809
|
+
if (decisionRefusal) return decisionRefusal;
|
|
733
810
|
const desiredEnabled = loadConfig().clientIntegrations?.["claude-desktop"] !== false;
|
|
734
811
|
committedDesiredEnabled = desiredEnabled;
|
|
735
812
|
const current = loadConfig();
|
|
@@ -922,7 +999,7 @@ function persistedIntentConfig(snapshot: ManagementContext["config"]): Managemen
|
|
|
922
999
|
}
|
|
923
1000
|
}
|
|
924
1001
|
|
|
925
|
-
|
|
1002
|
+
async function handleNativeIntegrationRoutesUnlocked(ctx: NativeDecisionContext): Promise<Response | null> {
|
|
926
1003
|
const { req, url, config, deps } = ctx;
|
|
927
1004
|
|
|
928
1005
|
if (url.pathname === "/api/native-integrations" && req.method === "GET") {
|
|
@@ -949,53 +1026,51 @@ export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Pro
|
|
|
949
1026
|
}
|
|
950
1027
|
|
|
951
1028
|
const enabled = body.enabled;
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
1029
|
+
let changed = false;
|
|
1030
|
+
const decisionRefusal = await commitNativeDecision(ctx, "claude", enabled, () => {
|
|
1031
|
+
changed = claudeCodeEnabled(config) !== enabled;
|
|
1032
|
+
if (!changed) return true;
|
|
1033
|
+
|
|
1034
|
+
/*
|
|
1035
|
+
* Same block writer as PUT /api/claude-code: it stamps the migration sentinel.
|
|
1036
|
+
* Toggling Claude ON is one of the two ways a block gets CREATED, so without the
|
|
1037
|
+
* sentinel the next startServer would silently convert a user's Auto auth mode into
|
|
1038
|
+
* a sticky manual subscription — a failure that surfaces nowhere near this route.
|
|
1039
|
+
*/
|
|
1040
|
+
// Kept so a failed save leaves the shared in-memory config matching disk: otherwise a
|
|
1041
|
+
// retry on the same object would read the unsaved value, take the repeated-OFF branch
|
|
1042
|
+
// and prune agents while the persisted integration is still on.
|
|
1043
|
+
const previousBlock = config.claudeCode === undefined ? undefined : structuredClone(config.claudeCode);
|
|
1044
|
+
commitClaudeCodeBlock(config, { ...(config.claudeCode ?? {}), enabled });
|
|
1045
|
+
|
|
1046
|
+
/*
|
|
1047
|
+
* `deps.` first: ManagementApiDeps carries this seam so route tests with an
|
|
1048
|
+
* in-memory fixture cannot overwrite the developer's real OPENCODEX_HOME.
|
|
1049
|
+
*/
|
|
1050
|
+
const persist = deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode;
|
|
1051
|
+
try {
|
|
1052
|
+
persist(config);
|
|
1053
|
+
} catch (error) {
|
|
1054
|
+
// A published write already put the new value on disk; only an unpublished one rolls back.
|
|
1055
|
+
if (!(error instanceof ConfigWritePublishedError)) {
|
|
1056
|
+
if (previousBlock === undefined) delete config.claudeCode;
|
|
1057
|
+
else config.claudeCode = previousBlock;
|
|
1058
|
+
}
|
|
1059
|
+
throw error;
|
|
1060
|
+
}
|
|
1061
|
+
return true;
|
|
1062
|
+
});
|
|
1063
|
+
if (decisionRefusal) return decisionRefusal;
|
|
1064
|
+
if (!changed) {
|
|
1065
|
+
// Repeated OFF also prunes definitions left by older versions.
|
|
955
1066
|
if (!enabled) await ctx.syncClaudeAgentDefsBestEffort?.();
|
|
956
1067
|
return jsonResponse({
|
|
957
1068
|
ok: true, clientId: "claude", changed: false,
|
|
958
|
-
state: enabled ? "current" : "absent",
|
|
959
|
-
desiredEnabled: enabled,
|
|
1069
|
+
state: enabled ? "current" : "absent", desiredEnabled: enabled,
|
|
960
1070
|
message: enabled ? "Claude inbound is already on" : "Claude inbound is already off",
|
|
961
1071
|
} satisfies NativeToggleEnvelope);
|
|
962
1072
|
}
|
|
963
1073
|
|
|
964
|
-
/*
|
|
965
|
-
* Same block writer as PUT /api/claude-code: it stamps the migration sentinel.
|
|
966
|
-
* Toggling Claude ON is one of the two ways a block gets CREATED, so without the
|
|
967
|
-
* sentinel the next startServer would silently convert a user's Auto auth mode into
|
|
968
|
-
* a sticky manual subscription — a failure that surfaces nowhere near this route.
|
|
969
|
-
*/
|
|
970
|
-
// Kept so a failed save leaves the shared in-memory config matching disk: otherwise a
|
|
971
|
-
// retry on the same object would read the unsaved value, take the repeated-OFF branch
|
|
972
|
-
// and prune agents while the persisted integration is still on.
|
|
973
|
-
const previousBlock = config.claudeCode === undefined ? undefined : structuredClone(config.claudeCode);
|
|
974
|
-
commitClaudeCodeBlock(config, { ...(config.claudeCode ?? {}), enabled });
|
|
975
|
-
|
|
976
|
-
/*
|
|
977
|
-
* `deps.` first: ManagementApiDeps carries this seam so route tests with an
|
|
978
|
-
* in-memory fixture cannot overwrite the developer's real OPENCODEX_HOME.
|
|
979
|
-
*/
|
|
980
|
-
const persist = deps.saveConfigPreservingClaudeCode ?? saveConfigPreservingClaudeCode;
|
|
981
|
-
try {
|
|
982
|
-
persist(config);
|
|
983
|
-
} catch (error) {
|
|
984
|
-
// A published write already put the new value on disk; only an unpublished one rolls back.
|
|
985
|
-
if (!(error instanceof ConfigWritePublishedError)) {
|
|
986
|
-
if (previousBlock === undefined) delete config.claudeCode;
|
|
987
|
-
else config.claudeCode = previousBlock;
|
|
988
|
-
}
|
|
989
|
-
if (isConfigLockError(error)) {
|
|
990
|
-
return isLockContention(error)
|
|
991
|
-
? refusal(409, "claude", "config_busy",
|
|
992
|
-
"Another process is saving the configuration right now. Try again in a moment.")
|
|
993
|
-
: refusal(500, "claude", "write_failed",
|
|
994
|
-
`The configuration lock could not be acquired: ${error instanceof Error ? error.message : String(error)}`);
|
|
995
|
-
}
|
|
996
|
-
throw error;
|
|
997
|
-
}
|
|
998
|
-
|
|
999
1074
|
/*
|
|
1000
1075
|
* The generated ~/.claude/agents/ocx-*.md definitions route through this proxy; a
|
|
1001
1076
|
* native Claude Code session that still loads them after OFF follows their
|
|
@@ -1034,3 +1109,34 @@ export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Pro
|
|
|
1034
1109
|
|
|
1035
1110
|
return null;
|
|
1036
1111
|
}
|
|
1112
|
+
|
|
1113
|
+
export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
1114
|
+
if (ctx.req.method !== "PUT" || !/^\/api\/native-integrations\/(claude|claude-desktop|codex|grok)$/.test(ctx.url.pathname)) {
|
|
1115
|
+
return handleNativeIntegrationRoutesUnlocked(ctx);
|
|
1116
|
+
}
|
|
1117
|
+
if (ctx.config.runtimeRole === "client") return jsonResponse({ error: "Route decisions are owned by the Home", code: "link_child_read_only" }, 403);
|
|
1118
|
+
const decisionProgress: { desiredEnabled?: boolean } = {};
|
|
1119
|
+
try { return await settleConfigRoot(configRoot(), () => withLinkApply(() => handleNativeIntegrationRoutesUnlocked({ ...ctx, decisionProgress }))); }
|
|
1120
|
+
catch (error) {
|
|
1121
|
+
const clientId = ctx.url.pathname.split("/").at(-1) as NativeIntegrationClientId;
|
|
1122
|
+
if (decisionProgress.desiredEnabled !== undefined) {
|
|
1123
|
+
const busy = error instanceof LinkApplyBusyError || (isConfigLockError(error) && isConfigMutationContention(error));
|
|
1124
|
+
const firstPartyTimeout = error instanceof WindowsSecretAclSettleTimeoutError && clientId === "claude-desktop"
|
|
1125
|
+
&& resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party";
|
|
1126
|
+
return postCommitRefusal(busy ? 409 : 500, clientId, busy ? "config_busy" : "write_failed",
|
|
1127
|
+
"The native decision was saved, but applying it did not complete. Repair configuration storage if needed, then retry the same switch to reconcile and apply it.",
|
|
1128
|
+
{ desiredEnabled: decisionProgress.desiredEnabled,
|
|
1129
|
+
diagnostic: firstPartyTimeout ? { stage: "ca", cause: "ETIMEDOUT" } : configFailureDiagnostic(error) });
|
|
1130
|
+
}
|
|
1131
|
+
if (error instanceof LinkApplyBusyError || (isConfigLockError(error) && isConfigMutationContention(error))) return refusal(409, clientId, "config_busy", "Another Home apply or config mutation is running. Nothing was written; retry in a moment.");
|
|
1132
|
+
if (isConfigLockError(error)) return refusal(500, clientId, "write_failed",
|
|
1133
|
+
"Configuration storage is unavailable. Inspect and repair it before retrying.", { diagnostic: configFailureDiagnostic(error) });
|
|
1134
|
+
if (error instanceof WindowsSecretAclSettleTimeoutError) {
|
|
1135
|
+
const clientId = ctx.url.pathname.split("/").at(-1) as NativeIntegrationClientId;
|
|
1136
|
+
const firstParty = clientId === "claude-desktop" && resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party";
|
|
1137
|
+
return refusal(500, clientId, "write_failed", "Config ACL settlement timed out. Nothing was written; retry after it settles.",
|
|
1138
|
+
firstParty ? { diagnostic: { stage: "ca", cause: "ETIMEDOUT" } } : {});
|
|
1139
|
+
}
|
|
1140
|
+
throw error;
|
|
1141
|
+
}
|
|
1142
|
+
}
|
|
@@ -34,6 +34,7 @@ import {
|
|
|
34
34
|
submitLoginCode,
|
|
35
35
|
submitManualLoginCode,
|
|
36
36
|
supportsCodeLoginMode,
|
|
37
|
+
supportsDeviceLoginMode,
|
|
37
38
|
waitForLoginSettled,
|
|
38
39
|
} from "../../oauth";
|
|
39
40
|
import { OAuthMutationBusyError, removeCredential } from "../../oauth/store";
|
|
@@ -180,11 +181,15 @@ function validateKeyName(
|
|
|
180
181
|
export type IssuedApiKey = Pick<OcxApiKeyEntry, "id" | "name" | "key" | "createdAt">;
|
|
181
182
|
|
|
182
183
|
/** Shared one-time data-key issuance used by the dashboard and link transactions. */
|
|
183
|
-
export function issueApiKeyInProcess(config: OcxConfig, name: string): IssuedApiKey {
|
|
184
|
+
export function issueApiKeyInProcess(config: OcxConfig, name: string, reservedId?: string): IssuedApiKey {
|
|
184
185
|
const checked = validateKeyName(name, { required: true });
|
|
185
186
|
if ("error" in checked) throw new Error(checked.error);
|
|
187
|
+
// An operation journal reserves the id before it issues the key, so a crash can be matched to it later.
|
|
188
|
+
if (reservedId !== undefined && (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(reservedId) || (config.apiKeys ?? []).some(key => key.id === reservedId))) {
|
|
189
|
+
throw new Error("The reserved key id is invalid or already in use.");
|
|
190
|
+
}
|
|
186
191
|
const entry: IssuedApiKey = {
|
|
187
|
-
id: randomUUID(),
|
|
192
|
+
id: reservedId ?? randomUUID(),
|
|
188
193
|
name: checked.value,
|
|
189
194
|
key: `ocx_data_${randomBytes(20).toString("hex")}`,
|
|
190
195
|
createdAt: new Date().toISOString(),
|
|
@@ -260,7 +265,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
260
265
|
// the provider's loopback callback server (inside this process) captures the redirect in the
|
|
261
266
|
// background, then the credential is persisted. The GUI opens the URL and polls /api/oauth/status.
|
|
262
267
|
if (url.pathname === "/api/oauth/login" && req.method === "POST") {
|
|
263
|
-
const body = await readManagementJsonBodyOr(req, {}) as { provider?: string; addAccount?: boolean; accountId?: string; reauth?: boolean; openBrowser?: unknown; method?: unknown; mode?: unknown; startUrl?: unknown; region?: unknown; flowId?: unknown; profileArn?: unknown };
|
|
268
|
+
const body = await readManagementJsonBodyOr(req, {}) as { provider?: string; addAccount?: boolean; accountId?: string; reauth?: boolean; openBrowser?: unknown; method?: unknown; mode?: unknown; device?: unknown; startUrl?: unknown; region?: unknown; flowId?: unknown; profileArn?: unknown };
|
|
264
269
|
const provider = (body.provider ?? "").trim().toLowerCase();
|
|
265
270
|
if (!isPublicOAuthProvider(provider)) return jsonResponse({ error: "unknown oauth provider" }, 400);
|
|
266
271
|
// Omitted mode is the localhost-callback flow this route has always run.
|
|
@@ -271,6 +276,12 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
271
276
|
if (codeMode && !supportsCodeLoginMode(provider)) {
|
|
272
277
|
return jsonResponse({ error: "code_mode_unsupported" }, 400);
|
|
273
278
|
}
|
|
279
|
+
// `device: true` picks the provider's device grant over its browser callback (xAI).
|
|
280
|
+
if (body.device !== undefined && body.device !== true) return jsonResponse({ error: "device must be true" }, 400);
|
|
281
|
+
const device = body.device === true;
|
|
282
|
+
if (device && (codeMode || !supportsDeviceLoginMode(provider))) {
|
|
283
|
+
return jsonResponse({ error: "device_login_unsupported" }, 400);
|
|
284
|
+
}
|
|
274
285
|
// Muse may import a local Keychain credential or start a device grant; add-account
|
|
275
286
|
// and reauth skip the import. All management login paths require the dashboard
|
|
276
287
|
// principal before credential acquisition. A raw token proves administration,
|
|
@@ -322,13 +333,13 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
322
333
|
// request may already have mutated live config and yielded before its save.
|
|
323
334
|
const persistedBaseline = readConfigDiagnostics().config;
|
|
324
335
|
// addAccount / reauth forces a fresh browser identity (skips local-CLI token import).
|
|
325
|
-
//
|
|
326
|
-
|
|
327
|
-
const flowId = codeMode ? randomUUID() : undefined;
|
|
336
|
+
// The xAI device caller also needs its own flow identity for polling.
|
|
337
|
+
const flowId = codeMode || (provider === "xai" && device) ? randomUUID() : undefined;
|
|
328
338
|
const { url: authUrl, instructions, deviceCode, expiresAt } = await startLoginFlow(provider, {
|
|
329
339
|
forceLogin: body.addAccount === true || reauth,
|
|
330
340
|
...(accountId ? { reauthAccountId: accountId } : {}),
|
|
331
341
|
...(codeMode ? { codeMode: true } : {}),
|
|
342
|
+
...(device ? { flow: "device" as const } : {}),
|
|
332
343
|
}, {
|
|
333
344
|
...(flowId ? { flowId } : {}),
|
|
334
345
|
// startLoginFlow returns the authorization URL before background persistence completes.
|
|
@@ -362,7 +373,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
362
373
|
instructions,
|
|
363
374
|
deviceCode,
|
|
364
375
|
browserLaunch,
|
|
365
|
-
...(codeMode ? { mode: "code", flowId, expiresAt } : {}),
|
|
376
|
+
...(codeMode ? { mode: "code", flowId, expiresAt } : flowId ? { flowId } : {}),
|
|
366
377
|
});
|
|
367
378
|
} catch (err) {
|
|
368
379
|
if (err instanceof OAuthMutationBusyError) throw err;
|
|
@@ -387,6 +398,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
387
398
|
const result = cancelKiroDeviceLogin(body.flowId, principal ?? "admin-token");
|
|
388
399
|
return result ? jsonResponse(result) : jsonResponse({ error: "unknown login flow" }, 404);
|
|
389
400
|
}
|
|
401
|
+
if (provider === "xai" && body.flowId !== undefined && (typeof body.flowId !== "string" || body.flowId.length > 128)) return jsonResponse({ error: "unknown login flow" }, 404);
|
|
390
402
|
const { cancelLoginFlow } = await import("../../oauth");
|
|
391
403
|
// Without a flow id this cancels the provider's newest in-flight login, which is what the
|
|
392
404
|
// single-user GUI has always meant by "Cancel". A host running concurrent code logins for
|
|
@@ -471,7 +483,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
471
483
|
// Resolved here, at the request boundary that already holds the config, and passed down.
|
|
472
484
|
// getLoginStatus stays free of config I/O. This route does not re-mask afterwards: it
|
|
473
485
|
// consumes the already-projected status rather than redacting a second time.
|
|
474
|
-
const status = getLoginStatus(provider, emailMaskingEnabled(config));
|
|
486
|
+
const status = getLoginStatus(provider, emailMaskingEnabled(config), provider === "xai" ? url.searchParams.get("flowId") ?? undefined : undefined);
|
|
475
487
|
return jsonResponse(status);
|
|
476
488
|
}
|
|
477
489
|
|
|
@@ -564,7 +576,8 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
564
576
|
...(provider === "anthropic2" ? { provider } : {}), activeAccountId: projected.activeAccountId,
|
|
565
577
|
accounts: projected.accounts.map(account => {
|
|
566
578
|
const row = byId.get(account.id);
|
|
567
|
-
|
|
579
|
+
// #8397: a passive provider with no observation for this account yet says so.
|
|
580
|
+
if (!row) return passiveQuota ? { ...account, quotaUnknownReason: "passive_not_observed" } : account;
|
|
568
581
|
if (config.providers[provider] !== quotaProvider || row.isCurrent?.() === false) {
|
|
569
582
|
return { ...account, quota: null, quotaUnavailable: true };
|
|
570
583
|
}
|
|
@@ -644,6 +657,12 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
644
657
|
if (body.retryAffinityReset !== undefined && typeof body.retryAffinityReset !== "boolean") {
|
|
645
658
|
return jsonResponse({ error: "retryAffinityReset must be a boolean" }, 400);
|
|
646
659
|
}
|
|
660
|
+
if (body.ifHealthy !== undefined && typeof body.ifHealthy !== "boolean") {
|
|
661
|
+
return jsonResponse({ error: "ifHealthy must be a boolean" }, 400);
|
|
662
|
+
}
|
|
663
|
+
if (body.ifHealthy === true && body.paused !== false) {
|
|
664
|
+
return jsonResponse({ error: "ifHealthy applies only to a resume (paused: false)" }, 400);
|
|
665
|
+
}
|
|
647
666
|
|
|
648
667
|
const { isGenericFailoverProvider } = await import("../../oauth/generic-account-failover");
|
|
649
668
|
const effectiveProvider = genericOAuthProviderConfig(provider, config);
|
|
@@ -653,8 +672,31 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
653
672
|
}
|
|
654
673
|
|
|
655
674
|
const { setAccountPaused } = await import("../../oauth/store");
|
|
656
|
-
|
|
675
|
+
let resumeGuard: { generation: string; pauseRevision: string | undefined } | undefined;
|
|
676
|
+
if (body.ifHealthy === true) {
|
|
677
|
+
// Explicit resume gated on an account-bound health read (#8398); an unpaused account needs none.
|
|
678
|
+
const { checkOAuthResumeHealth } = await import("../../oauth/account-resume-health");
|
|
679
|
+
const verdict = await checkOAuthResumeHealth(provider, body.accountId);
|
|
680
|
+
if (verdict && !verdict.ok) {
|
|
681
|
+
return jsonResponse({ error: `account was not resumed: ${verdict.reason}`, code: "resume_refused", reason: verdict.reason,
|
|
682
|
+
provider, accountId: body.accountId }, 409);
|
|
683
|
+
}
|
|
684
|
+
if (!verdict) {
|
|
685
|
+
// Not paused when checked: write nothing, so a pause that lands meanwhile is never cleared unchecked.
|
|
686
|
+
const { getAccountSet } = await import("../../oauth/store");
|
|
687
|
+
const set = getAccountSet(provider);
|
|
688
|
+
if (!set?.accounts.some(account => account.id === body.accountId)) return jsonResponse({ error: "account not found" }, 404);
|
|
689
|
+
return jsonResponse({ ok: true, provider, accountId: body.accountId, paused: false, unchanged: true,
|
|
690
|
+
activeAccountId: set.activeAccountId, activeAccountChanged: false });
|
|
691
|
+
}
|
|
692
|
+
resumeGuard = { generation: verdict.generation, pauseRevision: verdict.pauseRevision };
|
|
693
|
+
}
|
|
694
|
+
const result = await setAccountPaused(provider, body.accountId, body.paused, undefined, resumeGuard);
|
|
657
695
|
if (result.status === "not-found") return jsonResponse({ error: "account not found" }, 404);
|
|
696
|
+
if (result.status === "changed") {
|
|
697
|
+
return jsonResponse({ error: "account was not resumed: account_changed", code: "resume_refused", reason: "account_changed",
|
|
698
|
+
provider, accountId: body.accountId }, 409);
|
|
699
|
+
}
|
|
658
700
|
|
|
659
701
|
const anthropicRouting = isAnthropicOAuthInstance(provider)
|
|
660
702
|
? (await import("../../oauth/anthropic-routing")).anthropicRoutingFor(provider) : undefined;
|
|
@@ -1123,7 +1165,9 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
1123
1165
|
const listed = listProviderApiKeys(config, name);
|
|
1124
1166
|
const provider = config.providers[name];
|
|
1125
1167
|
const quotaMode = provider ? providerApiKeyQuotaMode(name, provider) : "unsupported";
|
|
1126
|
-
|
|
1168
|
+
// #8397: say why a balance is unknown; a destination without a reader has no balance source.
|
|
1169
|
+
return { ...listed, keys: listed.keys.map(key => ({ ...key, quotaMode,
|
|
1170
|
+
...(quotaMode === "unsupported" ? { quotaUnknownReason: "no_balance_source" as const } : {}) })) };
|
|
1127
1171
|
};
|
|
1128
1172
|
const initial = projectKeys();
|
|
1129
1173
|
if (url.searchParams.get("quota") !== "1" || !initial.keys.some(key => key.quotaMode === "probe")) {
|
|
@@ -1136,10 +1180,17 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
1136
1180
|
activeId: current.activeId,
|
|
1137
1181
|
keys: current.keys.map(key => {
|
|
1138
1182
|
const row = byId.get(key.id);
|
|
1139
|
-
if (
|
|
1140
|
-
|
|
1183
|
+
if (key.quotaMode !== "probe") return key;
|
|
1184
|
+
// A key added while the read was in flight was never read.
|
|
1185
|
+
if (!row) return { ...key, quotaUnknownReason: "not_read" };
|
|
1186
|
+
if (!row.isCurrent()) return { ...key, quota: null, quotaUnavailable: true, quotaUnknownReason: "not_read" };
|
|
1187
|
+
const readAt = row.readAt === undefined ? {} : { quotaReadAt: row.readAt };
|
|
1188
|
+
// A successful read with no meterable balance (authoritative empty) still names why it is unknown.
|
|
1189
|
+
const reason = row.unavailable ? (row.readAt === undefined ? "not_read" : "read_failed")
|
|
1190
|
+
: row.quota === null && row.readAt !== undefined ? "not_reported" : undefined;
|
|
1141
1191
|
// Internal identity/epoch checks never enter the JSON DTO.
|
|
1142
|
-
return { ...key, quota: row.quota, quotaUnavailable: row.unavailable === true
|
|
1192
|
+
return { ...key, quota: row.quota, quotaUnavailable: row.unavailable === true, ...readAt,
|
|
1193
|
+
...(reason ? { quotaUnknownReason: reason } : {}) };
|
|
1143
1194
|
}),
|
|
1144
1195
|
});
|
|
1145
1196
|
}
|
|
@@ -1187,6 +1238,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
1187
1238
|
? storeProviderKeyInKeychain(config, name)
|
|
1188
1239
|
: restoreProviderKeyFromKeychain(config, name);
|
|
1189
1240
|
if (!result.ok) return jsonResponse({ error: result.error }, result.status);
|
|
1241
|
+
(await import("../../providers/passive-key-observation")).clearPassiveKeyLimits(name);
|
|
1190
1242
|
const { clearProviderQuotaCache } = await import("../../providers/quota");
|
|
1191
1243
|
clearProviderQuotaCache();
|
|
1192
1244
|
return jsonResponse({ ...result, name, store: providerKeyStoreKind(config.providers[name]) });
|
|
@@ -1196,9 +1248,9 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
1196
1248
|
if (!isPlainRecord(body)) return jsonResponse({ error: "body must be an object" }, 400);
|
|
1197
1249
|
if (typeof body.name !== "string" || typeof body.id !== "string" || typeof body.paused !== "boolean") return jsonResponse({ error: "name, id and paused required" }, 400);
|
|
1198
1250
|
if (!isValidProviderName(body.name) || !hasOwnProvider(config.providers, body.name)) return jsonResponse({ error: "unknown provider" }, 404);
|
|
1199
|
-
const {
|
|
1200
|
-
|
|
1201
|
-
|
|
1251
|
+
const { setProviderApiKeyPausedWithResult } = await import("../../providers/api-key-pause");
|
|
1252
|
+
const result = setProviderApiKeyPausedWithResult(config, body.name, body.id, body.paused);
|
|
1253
|
+
return result.ok ? jsonResponse(result) : jsonResponse({ error: "key not found" }, 404);
|
|
1202
1254
|
}
|
|
1203
1255
|
if (url.pathname === "/api/providers/keys/active" && req.method === "PUT") {
|
|
1204
1256
|
const body = await readManagementJsonBodyOr(req, {}) as { name?: string; id?: string };
|
|
@@ -22,6 +22,7 @@ import { protocolPolicyRevision, resolveApiSurfaceSettings, resolveProtocolSetti
|
|
|
22
22
|
import type { OcxConfig } from "../../types";
|
|
23
23
|
import type { ManagementContext } from "./context";
|
|
24
24
|
import { readManagementJsonBodyOr } from "./body";
|
|
25
|
+
import { captureHomeRouteDefaultsBeforeHomeSwitch } from "../../routing/home-route-capture";
|
|
25
26
|
import {
|
|
26
27
|
applyProtocolSettingsPatch,
|
|
27
28
|
parseProtocolSettingsPatch,
|
|
@@ -115,6 +116,12 @@ async function patchProtocolSettings(ctx: ManagementContext): Promise<Response>
|
|
|
115
116
|
// `deps.` first: route tests with an in-memory fixture must never write the real config.
|
|
116
117
|
const persist = ctx.deps.saveConfigPreservingClaudeCode
|
|
117
118
|
?? (await import("../../config")).saveConfigPreservingClaudeCode;
|
|
119
|
+
// Closing Messages turns Claude Code off on this Home alone: freeze what Children inherit first.
|
|
120
|
+
const captureRefused = applied.claudeCodeChanged ? captureHomeRouteDefaultsBeforeHomeSwitch() : null;
|
|
121
|
+
if (captureRefused) {
|
|
122
|
+
restoreProtocolSettings(config, snapshot);
|
|
123
|
+
return jsonResponse({ error: { code: "route_intent_unavailable", message: captureRefused.message } }, captureRefused.retryable ? 409 : 500, req, config);
|
|
124
|
+
}
|
|
118
125
|
try {
|
|
119
126
|
persist(config);
|
|
120
127
|
} catch (error) {
|
|
@@ -72,13 +72,13 @@ function transportExclusion(row: OcxProviderConfig): Extract<ProviderCompletionT
|
|
|
72
72
|
if (typeof (row as { fetch?: unknown }).fetch === "function" && "proxy" in row) return "custom_executor_egress";
|
|
73
73
|
return undefined;
|
|
74
74
|
}
|
|
75
|
-
function nativeModel(config: OcxConfig, row: OcxProviderConfig, model: string): string {
|
|
75
|
+
function nativeModel(config: OcxConfig, name: string, row: OcxProviderConfig, model: string): string {
|
|
76
76
|
const known = new Set([...(row.models ?? []), ...Object.keys(row.modelAliases ?? {})]);
|
|
77
|
-
return known.has(model) ? model : resolveModelAlias(config, row, known, model) ?? model;
|
|
77
|
+
return known.has(model) ? model : resolveModelAlias(config, row, known, model, name) ?? model;
|
|
78
78
|
}
|
|
79
79
|
function derive(config: OcxConfig, name: string, row: OcxProviderConfig, model: string) {
|
|
80
80
|
const resolved = routedProviderConfig(name, row);
|
|
81
|
-
const native = nativeModel(config, resolved, model);
|
|
81
|
+
const native = nativeModel(config, name, resolved, model);
|
|
82
82
|
const routed = resolveWireProtocolOverride(name, native, resolved);
|
|
83
83
|
const wire = routed.adapter;
|
|
84
84
|
if (wire !== "openai-chat" && wire !== "openai-responses") throw new Error("unsupported adapter");
|
|
@@ -134,7 +134,7 @@ export async function runProviderCompletionTest(
|
|
|
134
134
|
let snapshot: OcxProviderConfig = metadata;
|
|
135
135
|
let destinationRefused = false;
|
|
136
136
|
try { snapshot = routedProviderConfig(name, metadata); } catch { destinationRefused = true; }
|
|
137
|
-
const native = nativeModel(config, snapshot, model);
|
|
137
|
+
const native = nativeModel(config, name, snapshot, model);
|
|
138
138
|
const wire = resolveWireProtocolOverride(name, native, snapshot).adapter;
|
|
139
139
|
if (wire !== "openai-chat" && wire !== "openai-responses") return { applicable: false, reason: "unsupported_adapter", adapter: wire };
|
|
140
140
|
const now = deps.now ?? (() => performance.now());
|