@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/bridge/sse.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UNDECLARED_TOOL_CALL_MESSAGE, isProxyError, rememberProxyIncomplete, carryProxyIncompleteContext } from "../lib/client-error-body";
|
|
1
|
+
import { UNDECLARED_TOOL_CALL_MESSAGE, isProxyError, rememberProxyIncomplete, rememberPausedTurn, carryProxyIncompleteContext } from "../lib/client-error-body";
|
|
2
2
|
import { anthropicProgressItems } from "../responses/anthropic-progress";
|
|
3
3
|
import type {
|
|
4
4
|
AdapterEvent,
|
|
@@ -39,8 +39,12 @@ import {
|
|
|
39
39
|
import { resolveStallTimeoutSec } from "../stall-timeout";
|
|
40
40
|
import {
|
|
41
41
|
createCitationMarkerFilter,
|
|
42
|
+
createMemoryCitationEscaper,
|
|
43
|
+
escapeMemoryCitationMentions,
|
|
44
|
+
passthroughMemoryCitationEscaper,
|
|
42
45
|
stripCitationMarkers,
|
|
43
46
|
type CitationMarkerFilter,
|
|
47
|
+
type MemoryCitationEscaper,
|
|
44
48
|
} from "../responses/citation-markers";
|
|
45
49
|
import { declaresCodeModeExec, normalizeDeclaredToolName } from "../types";
|
|
46
50
|
import { appendSafeWebSearchSource, safeWebSearchSources } from "../web-search/sources";
|
|
@@ -132,6 +136,12 @@ export function bridgeToResponsesSSE(
|
|
|
132
136
|
* would reach the client under the invented name instead of the normalized one.
|
|
133
137
|
*/
|
|
134
138
|
enforceDeclaredToolNames?: boolean;
|
|
139
|
+
/**
|
|
140
|
+
* Escape a quoted `<oai-mem-citation>` tag in visible text (default true). The Codex client
|
|
141
|
+
* parses the tag and hides the rest of the answer; Chat Completions and Messages deliveries,
|
|
142
|
+
* whose clients never parse it, pass false so their text stays byte-for-byte.
|
|
143
|
+
*/
|
|
144
|
+
escapeMemoryCitationTags?: boolean;
|
|
135
145
|
/**
|
|
136
146
|
* Deliver a non-retryable upstream refusal as `response.failed` with a terminal-refusal code
|
|
137
147
|
* instead of `response.incomplete` (see `./terminal-refusal`). Set only for the Responses
|
|
@@ -167,6 +177,8 @@ export function bridgeToResponsesSSE(
|
|
|
167
177
|
};
|
|
168
178
|
},
|
|
169
179
|
): ReadableStream<Uint8Array> {
|
|
180
|
+
const escapeTags = options?.escapeMemoryCitationTags !== false;
|
|
181
|
+
const escapeVisibleTags = (text: string): string => escapeTags ? escapeMemoryCitationMentions(text) : text;
|
|
170
182
|
const proxyIncompleteContext = options?.proxyErrorContext ?? {};
|
|
171
183
|
const replayCacheScope = options?.replayCacheScope;
|
|
172
184
|
const maxOutputCompletion = createMaxOutputCompletion(options);
|
|
@@ -381,6 +393,9 @@ export function bridgeToResponsesSSE(
|
|
|
381
393
|
outputIndex: number;
|
|
382
394
|
text: StringChunks;
|
|
383
395
|
citationFilter: CitationMarkerFilter;
|
|
396
|
+
memoryCitationEscaper: MemoryCitationEscaper;
|
|
397
|
+
/** Bytes the escaper currently holds, charged to the translator budget. */
|
|
398
|
+
heldBytes: number;
|
|
384
399
|
phase?: OcxMessagePhase;
|
|
385
400
|
} | null = null;
|
|
386
401
|
let currentReasoning: { itemId: string; outputIndex: number; text: StringChunks } | null = null;
|
|
@@ -570,13 +585,20 @@ export function bridgeToResponsesSSE(
|
|
|
570
585
|
// accumulated text: closeCurrentMessage re-sends it in output_text.done and
|
|
571
586
|
// output_item.done, so filtering only the deltas would leave the markers in both.
|
|
572
587
|
const trailing = currentMsg.citationFilter.flush();
|
|
573
|
-
|
|
588
|
+
const escapedTrailing = trailing ? currentMsg.memoryCitationEscaper.push(trailing) : "";
|
|
589
|
+
// A held tail is a partial tag whose whole-message context is now known: resolve it once
|
|
590
|
+
// against the accumulated text so a real block's trailing close tag survives.
|
|
591
|
+
const heldTail = currentMsg.memoryCitationEscaper.pending();
|
|
592
|
+
const resolvedTail = heldTail ? escapeVisibleTags(heldTail) : "";
|
|
593
|
+
currentMsg.heldBytes = replaceRetainedString(currentMsg.heldBytes, "", "live_transient");
|
|
594
|
+
const finalDelta = escapedTrailing + resolvedTail;
|
|
595
|
+
if (finalDelta) {
|
|
574
596
|
emit("response.output_text.delta", {
|
|
575
597
|
item_id: currentMsg.itemId, output_index: currentMsg.outputIndex,
|
|
576
|
-
content_index: 0, delta:
|
|
598
|
+
content_index: 0, delta: finalDelta,
|
|
577
599
|
});
|
|
578
600
|
}
|
|
579
|
-
const messageText = stripCitationMarkers(joinChunks(currentMsg.text));
|
|
601
|
+
const messageText = escapeVisibleTags(stripCitationMarkers(joinChunks(currentMsg.text)));
|
|
580
602
|
// Chat Completions has no message-phase field. Keep its live item provisional, then
|
|
581
603
|
// classify it only when the next adapter event proves whether this text led into more
|
|
582
604
|
// work or completed the turn. Explicit adapter phases always outrank this inference.
|
|
@@ -982,13 +1004,15 @@ export function bridgeToResponsesSSE(
|
|
|
982
1004
|
flushHiddenRawReasoning();
|
|
983
1005
|
flushHiddenReasoningEnvelope();
|
|
984
1006
|
if (currentToolCall) closeCurrentToolCall();
|
|
985
|
-
for (const item of anthropicProgressItems(event.text, event.anthropicThinkingSignature, budget)) {
|
|
1007
|
+
for (const item of anthropicProgressItems(event.text, event.anthropicThinkingSignature, budget, escapeTags)) {
|
|
986
1008
|
emit("response.output_item.added", { output_index: outputIndex, item: { ...item, ...(item.type === "message" ? { status: "in_progress", content: [] } : {}) } });
|
|
987
1009
|
if (item.type === "message") {
|
|
988
1010
|
const part = item.content![0];
|
|
989
1011
|
emit("response.content_part.added", { item_id: item.id, output_index: outputIndex, content_index: 0, part: { ...part, text: "" } });
|
|
990
|
-
|
|
991
|
-
|
|
1012
|
+
// The visible copy is escaped; the carrier envelope above keeps the raw text.
|
|
1013
|
+
const visibleText = escapeVisibleTags(event.text);
|
|
1014
|
+
emit("response.output_text.delta", { item_id: item.id, output_index: outputIndex, content_index: 0, delta: visibleText });
|
|
1015
|
+
emit("response.output_text.done", { item_id: item.id, output_index: outputIndex, content_index: 0, text: visibleText });
|
|
992
1016
|
emit("response.content_part.done", { item_id: item.id, output_index: outputIndex, content_index: 0, part });
|
|
993
1017
|
}
|
|
994
1018
|
emit("response.output_item.done", { output_index: outputIndex, item });
|
|
@@ -1026,6 +1050,8 @@ export function bridgeToResponsesSSE(
|
|
|
1026
1050
|
currentMsg = {
|
|
1027
1051
|
itemId, outputIndex, text: emptyChunks(),
|
|
1028
1052
|
citationFilter: createCitationMarkerFilter(),
|
|
1053
|
+
memoryCitationEscaper: escapeTags ? createMemoryCitationEscaper() : passthroughMemoryCitationEscaper,
|
|
1054
|
+
heldBytes: 0,
|
|
1029
1055
|
...(event.phase ? { phase: event.phase } : {}),
|
|
1030
1056
|
};
|
|
1031
1057
|
}
|
|
@@ -1038,10 +1064,19 @@ export function bridgeToResponsesSSE(
|
|
|
1038
1064
|
// unterminated tail and releases it at close (#3150). The accumulator above
|
|
1039
1065
|
// keeps the raw text; it is stripped once in closeCurrentMessage.
|
|
1040
1066
|
const visible = currentMsg.citationFilter.push(event.text);
|
|
1041
|
-
|
|
1067
|
+
// Escape a literal memory-citation tag: the Codex client hides everything from an
|
|
1068
|
+
// opening tag to the first closing one (or to the end when none follows), so one
|
|
1069
|
+
// quoted mention in prose swallows the rest of the answer and reads as a truncated
|
|
1070
|
+
// turn. This runs per
|
|
1071
|
+
// delta, so it uses the streaming escaper: a tag arrives split across deltas, and a
|
|
1072
|
+
// whole-string match inside a single delta would miss it.
|
|
1073
|
+
const emitted = visible ? currentMsg.memoryCitationEscaper.push(visible) : "";
|
|
1074
|
+
currentMsg.heldBytes = replaceRetainedString(
|
|
1075
|
+
currentMsg.heldBytes, currentMsg.memoryCitationEscaper.pending(), "live_transient");
|
|
1076
|
+
if (emitted) {
|
|
1042
1077
|
emit("response.output_text.delta", {
|
|
1043
1078
|
item_id: currentMsg.itemId, output_index: currentMsg.outputIndex,
|
|
1044
|
-
content_index: 0, delta:
|
|
1079
|
+
content_index: 0, delta: emitted,
|
|
1045
1080
|
});
|
|
1046
1081
|
}
|
|
1047
1082
|
break;
|
|
@@ -1386,6 +1421,10 @@ export function bridgeToResponsesSSE(
|
|
|
1386
1421
|
if (truncationReasonFor(event.stopReason) && !maxOutputCompletion.completed) {
|
|
1387
1422
|
// Upstream stopped before a normal completion. Surface as incomplete so the
|
|
1388
1423
|
// client can distinguish a truncated/filtered turn from a finished one.
|
|
1424
|
+
// `pause_turn` also maps to max_output_tokens for the client, but the turn is
|
|
1425
|
+
// paused and expected to continue: record the request-scoped fact so combo
|
|
1426
|
+
// preflight does not read it as an exhausted output budget and replay it.
|
|
1427
|
+
if (event.stopReason?.trim().toLowerCase() === "pause_turn") rememberPausedTurn(proxyIncompleteContext);
|
|
1389
1428
|
// #1926 gap 2: bound the window in which a handed-out thought signature is
|
|
1390
1429
|
// not yet durable before the turn becomes externally terminal.
|
|
1391
1430
|
await awaitThoughtSignatureDurability();
|
|
@@ -1418,6 +1457,9 @@ export function bridgeToResponsesSSE(
|
|
|
1418
1457
|
}
|
|
1419
1458
|
case "incomplete": {
|
|
1420
1459
|
if (isProxyError(event) && event.reason === "adapter_eof") rememberProxyIncomplete(proxyIncompleteContext, "adapter_eof");
|
|
1460
|
+
// Same request-scoped distinction as the `done` case below: the client still sees
|
|
1461
|
+
// max_output_tokens, while combo preflight can tell a paused turn from a real limit.
|
|
1462
|
+
if (event.reason?.trim().toLowerCase() === "pause_turn") rememberPausedTurn(proxyIncompleteContext);
|
|
1421
1463
|
if (currentMsg) closeCurrentMessage();
|
|
1422
1464
|
if (currentReasoning) closeCurrentReasoning();
|
|
1423
1465
|
if (currentRawReasoning) closeCurrentRawReasoning();
|
|
@@ -13,8 +13,7 @@
|
|
|
13
13
|
import { existsSync, readFileSync } from "node:fs";
|
|
14
14
|
import { homedir } from "node:os";
|
|
15
15
|
import { join } from "node:path";
|
|
16
|
-
import {
|
|
17
|
-
import { CLAUDE_KEYCHAIN_SERVICE, claudeKeychainReader, isSyncTimeout, type ClaudeKeychainReader } from "../oauth/claude-keychain-read";
|
|
16
|
+
import { claudeKeychainReader } from "../oauth/claude-keychain-read";
|
|
18
17
|
|
|
19
18
|
export type AuthPresence = "present" | "absent" | "unknown";
|
|
20
19
|
|
|
@@ -35,31 +34,23 @@ export type AuthSourceId =
|
|
|
35
34
|
*/
|
|
36
35
|
export const PROXY_MARKER = "opencodex-proxy";
|
|
37
36
|
|
|
38
|
-
const KEYCHAIN_SERVICE = CLAUDE_KEYCHAIN_SERVICE;
|
|
39
|
-
/** `security` exit code for "the item does not exist" — a real absent, not a failure. */
|
|
40
|
-
const KEYCHAIN_ITEM_NOT_FOUND = 44;
|
|
41
|
-
const KEYCHAIN_TIMEOUT_MS = 1_500;
|
|
42
|
-
|
|
43
37
|
/**
|
|
44
|
-
* The
|
|
45
|
-
*
|
|
46
|
-
*
|
|
38
|
+
* The macOS Keychain source, resolved once at an asynchronous boundary and handed to
|
|
39
|
+
* {@link defaultAuthDetectDeps}. Detection itself stays synchronous, but the lookup behind it must
|
|
40
|
+
* not: a synchronous `security` child can only be bounded by killing it, and killing one that is
|
|
41
|
+
* waiting on an unlock prompt crashes `securityd` and re-locks the keychain (#8161). The shared
|
|
42
|
+
* reader runs it without ever signalling the child, under the same single slot and backoff as the
|
|
43
|
+
* credential read, and answers `absent` on a non-darwin host.
|
|
44
|
+
*
|
|
45
|
+
* A manual `claudeCode.authMode` ("proxy" or "subscription") never consults detection, so the
|
|
46
|
+
* probe is skipped there: a pinned user pays no wait and sees no unlock prompt for a discarded
|
|
47
|
+
* answer. The keychain source then reads `unknown`, which is never `absent`.
|
|
47
48
|
*/
|
|
48
|
-
export function
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
run: () => { status: number | null; signal: string | null; error?: Error },
|
|
52
|
-
): AuthPresence {
|
|
53
|
-
if (platform !== "darwin") return "absent";
|
|
54
|
-
if (reader.syncReadBlocked()) return "unknown";
|
|
55
|
-
const result = run();
|
|
56
|
-
if (result.error || result.signal !== null) {
|
|
57
|
-
if (isSyncTimeout(result.error ?? { signal: result.signal })) reader.noteSyncTimeout();
|
|
58
|
-
return "unknown";
|
|
49
|
+
export function resolveClaudeKeychainPresence(authMode?: string): Promise<AuthPresence> {
|
|
50
|
+
if (authMode === "proxy" || authMode === "subscription") {
|
|
51
|
+
return Promise.resolve(process.platform === "darwin" ? "unknown" : "absent");
|
|
59
52
|
}
|
|
60
|
-
|
|
61
|
-
if (result.status === KEYCHAIN_ITEM_NOT_FOUND) return "absent";
|
|
62
|
-
return "unknown";
|
|
53
|
+
return claudeKeychainReader.probe();
|
|
63
54
|
}
|
|
64
55
|
|
|
65
56
|
export interface AuthSourceResult {
|
|
@@ -74,7 +65,7 @@ export interface AuthDetectDeps {
|
|
|
74
65
|
readClaudeJson(): Record<string, unknown> | undefined;
|
|
75
66
|
/** Whether <config-dir>/.credentials.json exists; throws on read error. */
|
|
76
67
|
credentialsFileExists(): boolean;
|
|
77
|
-
/** present/absent/unknown for the macOS keychain
|
|
68
|
+
/** present/absent/unknown for the macOS keychain, already resolved; absent on non-Darwin. */
|
|
78
69
|
keychainProbe(): AuthPresence;
|
|
79
70
|
/**
|
|
80
71
|
* The environment to inspect for S5. Callers pass the SAME base env the launch will
|
|
@@ -205,12 +196,14 @@ export function detectClaudeAuth(deps: AuthDetectDeps): AuthDetectResult {
|
|
|
205
196
|
}
|
|
206
197
|
|
|
207
198
|
/**
|
|
208
|
-
* Real IO. The
|
|
209
|
-
*
|
|
199
|
+
* Real IO. The Keychain source is the caller's pre-resolved {@link resolveClaudeKeychainPresence}
|
|
200
|
+
* result. A caller that did not resolve one gets `unknown` on macOS, which the resolver maps to
|
|
201
|
+
* subscription; it is never read as `absent`.
|
|
210
202
|
*/
|
|
211
203
|
export function defaultAuthDetectDeps(
|
|
212
204
|
env: NodeJS.ProcessEnv = process.env,
|
|
213
205
|
ownTokens: readonly string[] = [],
|
|
206
|
+
keychainPresence: AuthPresence = process.platform === "darwin" ? "unknown" : "absent",
|
|
214
207
|
): AuthDetectDeps {
|
|
215
208
|
const configDir = claudeConfigDir(env);
|
|
216
209
|
return {
|
|
@@ -226,12 +219,7 @@ export function defaultAuthDetectDeps(
|
|
|
226
219
|
credentialsFileExists() {
|
|
227
220
|
return existsSync(join(configDir, ".credentials.json"));
|
|
228
221
|
},
|
|
229
|
-
keychainProbe()
|
|
230
|
-
return probeClaudeKeychain(process.platform, claudeKeychainReader, () => spawnSync("security", ["find-generic-password", "-s", KEYCHAIN_SERVICE], {
|
|
231
|
-
timeout: KEYCHAIN_TIMEOUT_MS,
|
|
232
|
-
stdio: ["ignore", "ignore", "ignore"],
|
|
233
|
-
}));
|
|
234
|
-
},
|
|
222
|
+
keychainProbe: () => keychainPresence,
|
|
235
223
|
env: () => env,
|
|
236
224
|
ownTokens,
|
|
237
225
|
};
|
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
import type { ProviderAdapter } from "../adapters/base";
|
|
2
|
+
import { isAllowedToolChoice, type AdapterEvent, type OcxAssistantContentPart, type OcxContentPart, type OcxMessage, type OcxParsedRequest, type OcxTool } from "../types";
|
|
3
|
+
import { isRec, type Rec } from "./inbound-records";
|
|
4
|
+
import { readClientToolDiscovery } from "./inbound-tool-loading";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Chat-wire counterpart of the Responses `additional_tools` projection (#7452/#7453).
|
|
8
|
+
*
|
|
9
|
+
* A Chat Completions upstream renders the tool catalog ahead of every message, so a definition
|
|
10
|
+
* that ToolSearch loads mid-conversation rewrites the prompt prefix and the provider re-reads
|
|
11
|
+
* the whole history. The Chat wire has no chronological tool carrier, so on opted-in Chat routes
|
|
12
|
+
* the catalog instead carries one stable dispatcher from the first request on. A loaded deferred
|
|
13
|
+
* tool's definition is appended as text to the ToolSearch result that loaded it (the transcript
|
|
14
|
+
* tail at the time), the model calls it through the dispatcher, and the response is rewritten
|
|
15
|
+
* back to the client tool before the client sees it. History is re-encoded the same way on every
|
|
16
|
+
* request, so earlier bytes never change.
|
|
17
|
+
*/
|
|
18
|
+
export const CHAT_TOOL_DISPATCH_NAME = "use_loaded_tool";
|
|
19
|
+
|
|
20
|
+
const DISPATCH_TOOL: OcxTool = {
|
|
21
|
+
name: CHAT_TOOL_DISPATCH_NAME,
|
|
22
|
+
description: "Call a tool that was loaded during this conversation with ToolSearch. Loaded tools and their "
|
|
23
|
+
+ "parameters are listed in the ToolSearch result that loaded them. Pass the loaded tool's exact name and "
|
|
24
|
+
+ "an arguments object that matches its parameters.",
|
|
25
|
+
parameters: {
|
|
26
|
+
type: "object",
|
|
27
|
+
properties: {
|
|
28
|
+
name: { type: "string", description: "Exact name of a tool loaded with ToolSearch." },
|
|
29
|
+
arguments: { type: "object", description: "Arguments for that tool, matching its parameters.", additionalProperties: true },
|
|
30
|
+
},
|
|
31
|
+
required: ["name", "arguments"],
|
|
32
|
+
additionalProperties: false,
|
|
33
|
+
},
|
|
34
|
+
strict: false,
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
export interface ChatToolDispatchProjection {
|
|
38
|
+
parsed: OcxParsedRequest;
|
|
39
|
+
/** Client tools the dispatcher currently stands in for. */
|
|
40
|
+
loaded: ReadonlySet<string>;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** Loaded definitions as transcript text; deterministic so the same history re-encodes identically. */
|
|
44
|
+
function loadedToolsText(tools: readonly OcxTool[]): string {
|
|
45
|
+
const blocks = tools.map(tool => `<tool name=${JSON.stringify(tool.name)}>\n`
|
|
46
|
+
+ `Description: ${tool.description}\n`
|
|
47
|
+
+ `Parameters (JSON Schema): ${JSON.stringify(tool.parameters)}\n</tool>`);
|
|
48
|
+
return `\n[These tools are now loaded. Call them through \`${CHAT_TOOL_DISPATCH_NAME}\` with `
|
|
49
|
+
+ `{"name": "<tool name>", "arguments": {...}}.]\n${blocks.join("\n")}\n`;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function appendText(content: string | OcxContentPart[], text: string): string | OcxContentPart[] {
|
|
53
|
+
if (typeof content === "string") return content + text;
|
|
54
|
+
return [...content, { type: "text", text }];
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Project an opted-in Chat request onto a stable catalog, or return null to send it unchanged.
|
|
59
|
+
* Same discovery evidence as appendLoadedToolDefinitions: a successful structured ToolSearch
|
|
60
|
+
* result naming a deferred tool that this request still declares.
|
|
61
|
+
*/
|
|
62
|
+
export function projectChatToolDispatch(parsed: OcxParsedRequest, raw: Rec): ChatToolDispatchProjection | null {
|
|
63
|
+
const tools = parsed.context.tools;
|
|
64
|
+
if (!Array.isArray(tools)) return null;
|
|
65
|
+
|
|
66
|
+
const declared = new Map<string, OcxTool>();
|
|
67
|
+
for (const tool of tools) {
|
|
68
|
+
if (declared.has(tool.name)) return null;
|
|
69
|
+
declared.set(tool.name, tool);
|
|
70
|
+
}
|
|
71
|
+
// A client tool that already uses the dispatcher name would make the mapping ambiguous.
|
|
72
|
+
if (declared.has(CHAT_TOOL_DISPATCH_NAME)) return null;
|
|
73
|
+
const discovery = readClientToolDiscovery(raw, name => declared.has(name));
|
|
74
|
+
if (!discovery) return null;
|
|
75
|
+
const { deferred, used, loadAt } = discovery;
|
|
76
|
+
// The dispatcher exists only where discovery exists, and from that session's first request.
|
|
77
|
+
if (!declared.has("ToolSearch") || deferred.has("ToolSearch")) return null;
|
|
78
|
+
|
|
79
|
+
// Deferred tools stay out of the catalog unless they were already called without a discovery
|
|
80
|
+
// result (eager history, or a load the client compacted away): those keep their own slot.
|
|
81
|
+
const nativeUsed = new Set([...used].filter(name => !loadAt.has(name)));
|
|
82
|
+
const hidden = new Set([...deferred].filter(name => declared.has(name) && !nativeUsed.has(name)));
|
|
83
|
+
// Explicit forced-tool intent on a hidden tool cannot be expressed through the dispatcher.
|
|
84
|
+
const choice = parsed.options.toolChoice;
|
|
85
|
+
if (isRec(choice) && typeof (choice as Rec).name === "string" && hidden.has((choice as Rec).name as string)) return null;
|
|
86
|
+
// An allowed-tools restriction names tools the projection renames or hides; keep it exact.
|
|
87
|
+
if (isAllowedToolChoice(choice)) return null;
|
|
88
|
+
|
|
89
|
+
const additions = new Map<string, OcxTool[]>();
|
|
90
|
+
for (const [name, id] of loadAt) {
|
|
91
|
+
const list = additions.get(id) ?? [];
|
|
92
|
+
list.push(declared.get(name)!);
|
|
93
|
+
additions.set(id, list);
|
|
94
|
+
}
|
|
95
|
+
// Every discovery result must be present exactly once to carry its definitions.
|
|
96
|
+
const resultCounts = new Map<string, number>();
|
|
97
|
+
for (const message of parsed.context.messages) {
|
|
98
|
+
if (message.role === "toolResult") resultCounts.set(message.toolCallId, (resultCounts.get(message.toolCallId) ?? 0) + 1);
|
|
99
|
+
}
|
|
100
|
+
for (const id of additions.keys()) if (resultCounts.get(id) !== 1) return null;
|
|
101
|
+
|
|
102
|
+
const loaded = new Set(loadAt.keys());
|
|
103
|
+
const dispatchedCalls = new Set<string>();
|
|
104
|
+
const messages: OcxMessage[] = parsed.context.messages.map(message => {
|
|
105
|
+
if (message.role === "assistant") {
|
|
106
|
+
let changed = false;
|
|
107
|
+
const content = message.content.map((part): OcxAssistantContentPart => {
|
|
108
|
+
if (part.type !== "toolCall" || !loaded.has(part.name)) return part;
|
|
109
|
+
changed = true;
|
|
110
|
+
dispatchedCalls.add(part.id);
|
|
111
|
+
return { ...part, name: CHAT_TOOL_DISPATCH_NAME, arguments: { name: part.name, arguments: part.arguments } };
|
|
112
|
+
});
|
|
113
|
+
return changed ? { ...message, content } : message;
|
|
114
|
+
}
|
|
115
|
+
if (message.role === "toolResult") {
|
|
116
|
+
const added = additions.get(message.toolCallId);
|
|
117
|
+
const renamed = dispatchedCalls.has(message.toolCallId);
|
|
118
|
+
if (!added && !renamed) return message;
|
|
119
|
+
return {
|
|
120
|
+
...message,
|
|
121
|
+
...(renamed ? { toolName: CHAT_TOOL_DISPATCH_NAME } : {}),
|
|
122
|
+
...(added ? { content: appendText(message.content, loadedToolsText(added)) } : {}),
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
return message;
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
const visible = tools.filter(tool => !hidden.has(tool.name));
|
|
129
|
+
return {
|
|
130
|
+
parsed: { ...parsed, context: { ...parsed.context, messages, tools: [...visible, DISPATCH_TOOL] } },
|
|
131
|
+
loaded,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Read a dispatcher call's arguments as exactly `{name, arguments?}`. `arguments` may be an object
|
|
137
|
+
* or a JSON string holding one (a common double-encoding). Anything else, including extra
|
|
138
|
+
* top-level keys that would otherwise be dropped silently, an empty name, or the dispatcher's own
|
|
139
|
+
* name, is not a dispatch.
|
|
140
|
+
*/
|
|
141
|
+
function dispatchTarget(text: string): { name: string; args: string } | null {
|
|
142
|
+
let value: unknown;
|
|
143
|
+
try { value = JSON.parse(text); } catch { return null; }
|
|
144
|
+
if (!isRec(value) || typeof value.name !== "string" || value.name === "" || value.name === CHAT_TOOL_DISPATCH_NAME) return null;
|
|
145
|
+
if (Object.keys(value).some(key => key !== "name" && key !== "arguments")) return null;
|
|
146
|
+
let args: unknown = value.arguments ?? {};
|
|
147
|
+
if (typeof args === "string") {
|
|
148
|
+
try { args = JSON.parse(args); } catch { return null; }
|
|
149
|
+
}
|
|
150
|
+
return isRec(args) ? { name: value.name, args: JSON.stringify(args) } : null;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* Rewrites dispatcher calls back to the client tool they name, one adapter event at a time.
|
|
155
|
+
* Every well-formed dispatch becomes a call to the tool it names, whether or not that tool was
|
|
156
|
+
* loaded: the client then runs a declared tool exactly as a direct call, or reports an unknown
|
|
157
|
+
* tool by its real name. Claude inbound never enforces declared tool names, so this grants
|
|
158
|
+
* nothing a direct call could not reach. A malformed, extra-key or incomplete call passes through
|
|
159
|
+
* unchanged instead of the proxy guessing.
|
|
160
|
+
*/
|
|
161
|
+
function chatToolDispatchRewriter() {
|
|
162
|
+
let pending: { start: Extract<AdapterEvent, { type: "tool_call_start" }>; args: string } | null = null;
|
|
163
|
+
const release = (): AdapterEvent[] => {
|
|
164
|
+
if (!pending) return [];
|
|
165
|
+
const out: AdapterEvent[] = [pending.start];
|
|
166
|
+
if (pending.args.length > 0) out.push({ type: "tool_call_delta", arguments: pending.args });
|
|
167
|
+
pending = null;
|
|
168
|
+
return out;
|
|
169
|
+
};
|
|
170
|
+
const push = (event: AdapterEvent): AdapterEvent[] => {
|
|
171
|
+
if (pending) {
|
|
172
|
+
if (event.type === "tool_call_delta") { pending.args += event.arguments; return []; }
|
|
173
|
+
if (event.type === "tool_call_end") {
|
|
174
|
+
const target = event.incomplete ? null : dispatchTarget(pending.args);
|
|
175
|
+
if (!target) return [...release(), event];
|
|
176
|
+
const start = { ...pending.start, name: target.name };
|
|
177
|
+
pending = null;
|
|
178
|
+
return [start, { type: "tool_call_delta", arguments: target.args }, event];
|
|
179
|
+
}
|
|
180
|
+
// Any other event closes buffering without a terminal; surface what was buffered.
|
|
181
|
+
const out = release();
|
|
182
|
+
return [...out, ...push(event)];
|
|
183
|
+
}
|
|
184
|
+
if (event.type === "tool_call_start" && event.name === CHAT_TOOL_DISPATCH_NAME) {
|
|
185
|
+
pending = { start: event, args: "" };
|
|
186
|
+
return [];
|
|
187
|
+
}
|
|
188
|
+
return [event];
|
|
189
|
+
};
|
|
190
|
+
return { push, flush: release };
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
/** Streaming form: rewrite dispatcher calls in an adapter stream (see chatToolDispatchRewriter). */
|
|
194
|
+
export async function* rewriteChatToolDispatchEvents(
|
|
195
|
+
events: AsyncIterable<AdapterEvent>,
|
|
196
|
+
): AsyncGenerator<AdapterEvent> {
|
|
197
|
+
const rewriter = chatToolDispatchRewriter();
|
|
198
|
+
for await (const event of events) yield* rewriter.push(event);
|
|
199
|
+
yield* rewriter.flush();
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
/** Non-streaming form of rewriteChatToolDispatchEvents for adapter `parseResponse` results. */
|
|
203
|
+
export function rewriteChatToolDispatchEventList(events: readonly AdapterEvent[]): AdapterEvent[] {
|
|
204
|
+
const rewriter = chatToolDispatchRewriter();
|
|
205
|
+
return [...events.flatMap(event => rewriter.push(event)), ...rewriter.flush()];
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
/**
|
|
209
|
+
* Wrap one physical openai-chat adapter: project each built request and un-project both parse
|
|
210
|
+
* paths. Each build decides afresh, so a request that bails out (forced hidden tool, allowed-tools
|
|
211
|
+
* restriction, duplicate call id) is sent unchanged and its response is not rewritten.
|
|
212
|
+
*/
|
|
213
|
+
export function applyChatToolDispatch(adapter: ProviderAdapter, discovery: Rec): void {
|
|
214
|
+
const build = adapter.buildRequest.bind(adapter);
|
|
215
|
+
const parseStream = adapter.parseStream.bind(adapter);
|
|
216
|
+
const parseResponse = adapter.parseResponse?.bind(adapter);
|
|
217
|
+
let projected = false;
|
|
218
|
+
adapter.buildRequest = (parsed, incoming) => {
|
|
219
|
+
const projection = projectChatToolDispatch(parsed, discovery);
|
|
220
|
+
projected = projection !== null;
|
|
221
|
+
return build(projection ? projection.parsed : parsed, incoming);
|
|
222
|
+
};
|
|
223
|
+
adapter.parseStream = (...args) => {
|
|
224
|
+
const events = parseStream(...args);
|
|
225
|
+
return projected ? rewriteChatToolDispatchEvents(events) : events;
|
|
226
|
+
};
|
|
227
|
+
if (parseResponse) {
|
|
228
|
+
adapter.parseResponse = async (...args) => {
|
|
229
|
+
const events = await parseResponse(...args);
|
|
230
|
+
return projected ? rewriteChatToolDispatchEventList(events) : events;
|
|
231
|
+
};
|
|
232
|
+
}
|
|
233
|
+
}
|
package/src/claude/desktop-3p.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { readClientConnectionState } from "../client/state";
|
|
2
2
|
import { readServiceApiTokenState, readTokenBackupState } from "../lib/service-secrets";
|
|
3
|
-
import { withClientLifecycleSync, type ClientLifecycleLockDeps } from "../client/lifecycle-lock";
|
|
3
|
+
import { assertClientLifecycleHeld, withClientLifecycleSync, type ClientLifecycleHeld, type ClientLifecycleLockDeps } from "../client/lifecycle-lock";
|
|
4
4
|
import { applyRemoteDesktopStore, inspectRemoteDesktopCleanup, restoreRemoteDesktopStore } from "./desktop-remote-store";
|
|
5
5
|
import { canonicalDirectory } from "./desktop-remote-store-io";
|
|
6
6
|
import {
|
|
@@ -571,6 +571,7 @@ export function removeDesktop3pStandardPivot(
|
|
|
571
571
|
options: Desktop3pConfigLibraryOptions & {
|
|
572
572
|
appliedFingerprint?: string | null; unlink?: (path: string) => void;
|
|
573
573
|
lifecycleLockDeps?: ClientLifecycleLockDeps;
|
|
574
|
+
lifecycleHeld?: ClientLifecycleHeld;
|
|
574
575
|
/**
|
|
575
576
|
* The desired-state guard below exists for OFF flows racing a concurrent enable. A
|
|
576
577
|
* mode switch (gateway → first-party) removes the profile while the integration stays
|
|
@@ -581,7 +582,7 @@ export function removeDesktop3pStandardPivot(
|
|
|
581
582
|
): Desktop3pRemovalResult {
|
|
582
583
|
const libraryPath = resolveDesktop3pConfigLibraryPath(options);
|
|
583
584
|
try {
|
|
584
|
-
|
|
585
|
+
const remove = (held: ClientLifecycleHeld): Desktop3pRemovalResult => withConfigMutationLockSync(() => {
|
|
585
586
|
const connection = readClientConnectionState();
|
|
586
587
|
if (connection.kind === "invalid" || connection.kind === "mismatched") {
|
|
587
588
|
return { ok: false, changed: false, kind: "unsafe", libraryPath, reason: `desktop_client_state_${connection.kind}` };
|
|
@@ -621,7 +622,9 @@ export function removeDesktop3pStandardPivot(
|
|
|
621
622
|
return result.ok
|
|
622
623
|
? { ok: true, changed: result.changed, kind: result.changed ? "removed" : "noop", libraryPath }
|
|
623
624
|
: { ok: false, changed: result.changed, kind: result.reason === "cleanup_pending" ? "cleanup_incomplete" : "unsafe", reason: result.reason, libraryPath };
|
|
624
|
-
})
|
|
625
|
+
});
|
|
626
|
+
if (options.lifecycleHeld) { assertClientLifecycleHeld(options.lifecycleHeld); return remove(options.lifecycleHeld); }
|
|
627
|
+
return withClientLifecycleSync(remove, options.lifecycleLockDeps);
|
|
625
628
|
} catch (error) {
|
|
626
629
|
return { ok: false, changed: false, kind: "write_failed", libraryPath, reason: desktopMutationFailureReason(error) };
|
|
627
630
|
}
|
|
@@ -724,9 +727,10 @@ export function writeDesktop3pConfig(
|
|
|
724
727
|
nativeContextCap?: NativeContextLimitsInput,
|
|
725
728
|
lifecycleLockDeps?: ClientLifecycleLockDeps,
|
|
726
729
|
refreshOnly?: { appliedFingerprint: string; admit: () => boolean },
|
|
730
|
+
lifecycleHeld?: ClientLifecycleHeld,
|
|
727
731
|
): { written: boolean; path: string; reason?: string; fingerprint?: string } {
|
|
728
732
|
try {
|
|
729
|
-
|
|
733
|
+
const write = () => withConfigMutationLockSync(() => {
|
|
730
734
|
const connection = readClientConnectionState();
|
|
731
735
|
if (connection.kind === "invalid" || connection.kind === "mismatched") {
|
|
732
736
|
return { written: false, path: resolveDesktop3pConfigLibraryPath(), reason: `desktop_client_state_${connection.kind}` };
|
|
@@ -785,7 +789,9 @@ export function writeDesktop3pConfig(
|
|
|
785
789
|
generateDesktop3pConfig(destination.origin, nativeSlugs, routedModels, gatewayKey, mode, profile, nativeContextCap,
|
|
786
790
|
desktop3pModelOptions(latest.config.claudeCode))
|
|
787
791
|
), requiredId && refreshOnly ? { requiredId, expectedFingerprint: refreshOnly.appliedFingerprint, admit: refreshOnly.admit } : undefined);
|
|
788
|
-
})
|
|
792
|
+
});
|
|
793
|
+
if (lifecycleHeld) { assertClientLifecycleHeld(lifecycleHeld); return write(); }
|
|
794
|
+
return withClientLifecycleSync(write, lifecycleLockDeps);
|
|
789
795
|
} catch { return { written: false, path: resolveDesktop3pConfigLibraryPath(), reason: "desktop_lifecycle_busy_or_unsafe" }; }
|
|
790
796
|
}
|
|
791
797
|
|
|
@@ -25,10 +25,12 @@ export function persistCommittedDesktopGateway(
|
|
|
25
25
|
snapshot: OcxConfig,
|
|
26
26
|
profile: DesktopProfile | undefined,
|
|
27
27
|
fingerprint: string | undefined,
|
|
28
|
+
admit?: (current: OcxConfig) => boolean,
|
|
28
29
|
): { ok: true } | { ok: false; reason: "missing" | "invalid" | "conflict" | "unavailable" } {
|
|
29
30
|
const appliedAt = new Date().toISOString();
|
|
30
31
|
try {
|
|
31
32
|
const outcome = mutatePersistedConfig(current => {
|
|
33
|
+
if (admit && !admit(current)) return { changed: false, value: null };
|
|
32
34
|
if (JSON.stringify(current.claudeCode?.desktopProfile) !== JSON.stringify(profile)) {
|
|
33
35
|
return { changed: false, value: null };
|
|
34
36
|
}
|
|
@@ -5,7 +5,7 @@ import { readServiceApiTokenState, readTokenBackupState, serviceApiTokenFingerpr
|
|
|
5
5
|
import { profilePath, type Desktop3pMetadata } from "./desktop-3p-library";
|
|
6
6
|
import { StoreIO, metadata, storePaths, MAX_DESKTOP_METADATA_ENTRIES, type JsonFile } from "./desktop-remote-store-io";
|
|
7
7
|
import {
|
|
8
|
-
DesktopStoreError, digest, origin, parseBaseline, parseDisconnect, parseOwner, parseState, projection, projectionHash, mergeProjection,
|
|
8
|
+
DesktopStoreError, canonical, digest, origin, parseBaseline, parseDisconnect, parseOwner, parseState, projection, projectionHash, mergeProjection,
|
|
9
9
|
sameOwner, type ArtifactPending, type Baseline, type DesktopRemoteOwner, type Projection, type StoreState,
|
|
10
10
|
} from "./desktop-remote-store-state";
|
|
11
11
|
|
|
@@ -125,7 +125,7 @@ export function establish(io: StoreIO, owner: DesktopRemoteOwner, known: readonl
|
|
|
125
125
|
return bundle;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
export function artifact(io: StoreIO, bundle: Bundle, next: Projection, kind: ArtifactPending["kind"], tokenFingerprint: string, desiredSelection?: string | null): void {
|
|
128
|
+
export function artifact(io: StoreIO, bundle: Bundle, next: Projection, kind: ArtifactPending["kind"], tokenFingerprint: string, desiredSelection?: string | null, overwriteConflict = false): void {
|
|
129
129
|
const state = bundle.state!;
|
|
130
130
|
const targetPath = profilePath(bundle.paths.library, state.targetId);
|
|
131
131
|
let current = io.read(targetPath);
|
|
@@ -143,7 +143,18 @@ export function artifact(io: StoreIO, bundle: Bundle, next: Projection, kind: Ar
|
|
|
143
143
|
if (pending.kind !== kind || pending.after !== after || pending.tokenFingerprint !== tokenFingerprint
|
|
144
144
|
|| (before !== pending.before && before !== pending.after)) throw new DesktopStoreError("conflict");
|
|
145
145
|
if (kind === "apply" && selection !== pending.beforeSelection && selection !== pending.afterSelection) throw new DesktopStoreError("conflict");
|
|
146
|
-
} else if (before !== state.lastProjectionHash)
|
|
146
|
+
} else if (before !== state.lastProjectionHash) {
|
|
147
|
+
// Consent covers only edited fields of the selected, settled, already-owned row.
|
|
148
|
+
// Owner, path, metadata, token and pending-transaction checks remain mandatory.
|
|
149
|
+
if (!overwriteConflict || kind !== "apply" || state.phase !== "active" || !current
|
|
150
|
+
|| !existing || selection !== state.targetId) throw new DesktopStoreError("conflict");
|
|
151
|
+
const snapshotPath = join(bundle.paths.root, "overwrites", `${current.hash}.json`);
|
|
152
|
+
const snapshot = io.read(snapshotPath, 1024 * 1024, true);
|
|
153
|
+
if (snapshot && canonical(snapshot.value) !== canonical(current.value)) throw new DesktopStoreError("conflict");
|
|
154
|
+
if (!snapshot) io.write(snapshotPath, current.value, null);
|
|
155
|
+
// artifact's ordinary pending record now journals this exact edited preimage.
|
|
156
|
+
io.compare(targetPath, current);
|
|
157
|
+
}
|
|
147
158
|
const afterSelection = desiredSelection === undefined ? selection : desiredSelection;
|
|
148
159
|
const settledPhase = kind === "restore" ? "restored" : "active";
|
|
149
160
|
if (!pending && existing && before === after && afterSelection === selection
|