@vellumai/assistant 0.12.1 → 0.12.2-dev.202609162214.308bda0
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/.env.example +2 -0
- package/AGENTS.md +5 -1
- package/ARCHITECTURE.md +20 -21
- package/Dockerfile +7 -7
- package/docs/architecture/integrations.md +7 -0
- package/docs/architecture/memory.md +11 -2
- package/docs/architecture/turn-actor.md +15 -8
- package/docs/credential-execution-service.md +1 -1
- package/docs/desktop-browser-cli.md +35 -0
- package/docs/guardian-request-flow.md +16 -0
- package/node_modules/@vellumai/environments/src/shell.test.ts +21 -0
- package/node_modules/@vellumai/environments/src/shell.ts +24 -0
- package/node_modules/@vellumai/gateway-client/src/inbound-contract.ts +8 -2
- package/node_modules/@vellumai/slack-text/src/index.ts +13 -8
- package/node_modules/@vellumai/slack-text/src/label-resolution-entities.test.ts +95 -0
- package/openapi.yaml +564 -111
- package/package.json +7 -4
- package/scripts/bundled-plugin-packages.ts +154 -0
- package/scripts/generate-bundled-plugin-packages.ts +29 -0
- package/scripts/postinstall.ts +33 -0
- package/scripts/smoke-desktop-browser-cli.ts +280 -0
- package/scripts/smoke-desktop-window-theme.ts +186 -0
- package/scripts/sync-llm-catalog.ts +3 -0
- package/scripts/test.ts +15 -13
- package/scripts/voice-ttft-spike.ts +2 -2
- package/src/__tests__/agent-loop.test.ts +124 -0
- package/src/__tests__/always-loaded-tools-guard.test.ts +18 -10
- package/src/__tests__/anthropic-provider.test.ts +0 -63
- package/src/__tests__/app-compiler.test.ts +6 -0
- package/src/__tests__/app-control-tool-schemas.test.ts +5 -2
- package/src/__tests__/app-dir-path-guard.test.ts +1 -3
- package/src/__tests__/approval-interception-trust-gates.test.ts +40 -0
- package/src/__tests__/assistant-event-hub-machine-name.test.ts +6 -7
- package/src/__tests__/assistant-event-hub.test.ts +44 -0
- package/src/__tests__/attachments-store.test.ts +22 -3
- package/src/__tests__/channel-approval.test.ts +9 -14
- package/src/__tests__/channel-reply-delivery.test.ts +56 -0
- package/src/__tests__/computer-use-screenshot-attachments.test.ts +411 -0
- package/src/__tests__/computer-use-screenshot-selection.test.ts +50 -0
- package/src/__tests__/computer-use-skill-manifest-regression.test.ts +1 -1
- package/src/__tests__/computer-use-skill-proxy-bridge.test.ts +5 -2
- package/src/__tests__/computer-use-tools.test.ts +19 -7
- package/src/__tests__/config-schema-cmd.test.ts +2 -2
- package/src/__tests__/config-schema.test.ts +29 -30
- package/src/__tests__/config-sounds-sync.test.ts +23 -0
- package/src/__tests__/config-watcher.test.ts +23 -8
- package/src/__tests__/connection-model-compat.test.ts +2 -2
- package/src/__tests__/conversation-agent-loop-inference-profile.test.ts +2 -0
- package/src/__tests__/conversation-agent-loop-overflow.test.ts +2 -0
- package/src/__tests__/conversation-agent-loop.test.ts +257 -6
- package/src/__tests__/conversation-attachments.test.ts +106 -0
- package/src/__tests__/conversation-error.test.ts +4 -1
- package/src/__tests__/conversation-fork-crud.test.ts +191 -0
- package/src/__tests__/conversation-key-store-disk-view.test.ts +1 -1
- package/src/__tests__/conversation-pairing.test.ts +26 -0
- package/src/__tests__/conversation-process-app-control-preactivation.test.ts +4 -10
- package/src/__tests__/conversation-queue.test.ts +48 -207
- package/src/__tests__/conversation-retry-discard.test.ts +54 -1
- package/src/__tests__/conversation-runtime-assembly.test.ts +33 -3
- package/src/__tests__/conversation-skill-tools.test.ts +27 -0
- package/src/__tests__/conversation-surfaces-app-control.test.ts +8 -3
- package/src/__tests__/conversation-surfaces-point-at-budget.test.ts +1 -0
- package/src/__tests__/conversation-surfaces-point-at-capability.test.ts +1 -0
- package/src/__tests__/conversation-surfaces-task-progress.test.ts +67 -0
- package/src/__tests__/conversation-title-service.test.ts +14 -10
- package/src/__tests__/conversation-tool-setup-app-refresh.test.ts +3 -5
- package/src/__tests__/conversation-tool-setup-attribution.test.ts +51 -0
- package/src/__tests__/credential-execution-client.test.ts +70 -53
- package/src/__tests__/credential-record-retire.test.ts +171 -1
- package/src/__tests__/credential-routes.test.ts +250 -3
- package/src/__tests__/credential-security-invariants.test.ts +5 -3
- package/src/__tests__/cu-unified-flow.test.ts +14 -4
- package/src/__tests__/db-conversation-tool-surface.test.ts +144 -0
- package/src/__tests__/document-sync-tags.test.ts +25 -0
- package/src/__tests__/drain-kick-guard.test.ts +0 -2
- package/src/__tests__/drain-requeue-on-contention.test.ts +0 -6
- package/src/__tests__/events-tail-route.test.ts +33 -0
- package/src/__tests__/evict-conversations-for-reload.test.ts +1 -1
- package/src/__tests__/external-plugin-loader.test.ts +52 -0
- package/src/__tests__/git-porcelain.test.ts +47 -0
- package/src/__tests__/headless-browser-mode.test.ts +48 -0
- package/src/__tests__/heartbeat-service.test.ts +56 -40
- package/src/__tests__/helpers/set-workspace-mcp.ts +11 -0
- package/src/__tests__/host-bash-proxy.test.ts +26 -45
- package/src/__tests__/host-browser-proxy.test.ts +6 -17
- package/src/__tests__/host-cu-proxy.test.ts +712 -18
- package/src/__tests__/host-file-proxy-targeted.test.ts +23 -0
- package/src/__tests__/host-file-proxy.test.ts +11 -23
- package/src/__tests__/host-transfer-proxy-targeted.test.ts +30 -9
- package/src/__tests__/inference-profile-session-handler.test.ts +26 -0
- package/src/__tests__/list-all-apps.test.ts +40 -8
- package/src/__tests__/list-messages-camera-frame.test.ts +121 -0
- package/src/__tests__/list-messages-tool-merge.test.ts +85 -1
- package/src/__tests__/llm-catalog-parity.test.ts +51 -3
- package/src/__tests__/managed-store.test.ts +121 -0
- package/src/__tests__/mcp-auth-routes.test.ts +104 -8
- package/src/__tests__/mcp-client-auth.test.ts +54 -0
- package/src/__tests__/mcp-config-secret-boundary.test.ts +78 -136
- package/src/__tests__/mcp-health-check.test.ts +40 -43
- package/src/__tests__/mcp-list-plugin-servers.test.ts +85 -42
- package/src/__tests__/mcp-tool-annotations-risk.test.ts +4 -2
- package/src/__tests__/message-deleted-hook-dispatch.test.ts +119 -0
- package/src/__tests__/messages-after-tiebreaker.test.ts +91 -0
- package/src/__tests__/messages-read-boundary-guard.test.ts +1 -1
- package/src/__tests__/messaging-send-tool.test.ts +355 -548
- package/src/__tests__/model-intents.test.ts +3 -0
- package/src/__tests__/notification-vellum-adapter.test.ts +85 -2
- package/src/__tests__/oauth-apps-routes.test.ts +1 -0
- package/src/__tests__/oauth-commands-routes.test.ts +282 -101
- package/src/__tests__/oauth-connect-orchestrator.test.ts +2 -0
- package/src/__tests__/oauth-provider-profiles.test.ts +18 -0
- package/src/__tests__/oauth-provider-serializer.test.ts +23 -0
- package/src/__tests__/oauth-providers-routes.test.ts +3 -0
- package/src/__tests__/openai-provider.test.ts +1 -0
- package/src/__tests__/outlook-messaging-provider.test.ts +6 -6
- package/src/__tests__/persist-media-references.test.ts +50 -0
- package/src/__tests__/platform-callback-registration.test.ts +8 -16
- package/src/__tests__/platform-client-verify-credential.test.ts +2 -0
- package/src/__tests__/plugin-import-boundary-guard.test.ts +13 -0
- package/src/__tests__/qdrant-manager.test.ts +132 -0
- package/src/__tests__/resolve-app.test.ts +135 -0
- package/src/__tests__/run-conversation-turn-persistence.test.ts +138 -1
- package/src/__tests__/scaffold-managed-skill-tool.test.ts +317 -6
- package/src/__tests__/schedule-routes.test.ts +20 -0
- package/src/__tests__/scheduler-result-notification.test.ts +23 -4
- package/src/__tests__/script-proxy-certs.test.ts +35 -0
- package/src/__tests__/secret-routes-acp-guard.test.ts +59 -1
- package/src/__tests__/secret-routes-platform-proxy.test.ts +86 -31
- package/src/__tests__/secret-routes-scrub.test.ts +22 -27
- package/src/__tests__/secure-keys-managed-failover.test.ts +8 -0
- package/src/__tests__/secure-keys.test.ts +7 -3
- package/src/__tests__/service-account-token.test.ts +247 -0
- package/src/__tests__/skill-feature-flags-integration.test.ts +1 -1
- package/src/__tests__/skill-feature-flags.test.ts +2 -2
- package/src/__tests__/skills.test.ts +20 -4
- package/src/__tests__/source-fingerprint.test.ts +184 -0
- package/src/__tests__/subagent-tool-gate-mode.test.ts +239 -3
- package/src/__tests__/subagent-tools.test.ts +3 -2
- package/src/__tests__/telephony-tts-guard.test.ts +38 -3
- package/src/__tests__/terminal-tools.test.ts +8 -0
- package/src/__tests__/test-support/computer-use-skill-harness.ts +3 -2
- package/src/__tests__/tool-result-metadata-plumbing.test.ts +63 -0
- package/src/__tests__/ui-channel-variants.test.ts +1 -56
- package/src/__tests__/unicode.test.ts +49 -0
- package/src/__tests__/user-plugin-loader.test.ts +21 -0
- package/src/__tests__/vellum-self-knowledge-inline-command.test.ts +4 -0
- package/src/__tests__/watch-retro-tool-availability.test.ts +8 -17
- package/src/__tests__/workspace-git-service.test.ts +26 -0
- package/src/__tests__/workspace-migration-154-repair-retired-codex-gpt-5-4-model-ids.test.ts +336 -0
- package/src/acp/__tests__/acp-claude-oauth.test.ts +257 -6
- package/src/acp/__tests__/acp-credentials.test.ts +13 -0
- package/src/acp/__tests__/agent-process.test.ts +258 -4
- package/src/acp/__tests__/auth-required.test.ts +96 -0
- package/src/acp/__tests__/claude-token-refresh.test.ts +257 -0
- package/src/acp/__tests__/client-handler.test.ts +90 -2
- package/src/acp/__tests__/helpers/acp-model-option.ts +51 -0
- package/src/acp/__tests__/prepare-agent-env.test.ts +60 -1
- package/src/acp/__tests__/session-manager-persistence.test.ts +5 -1
- package/src/acp/__tests__/session-manager-resume.test.ts +270 -6
- package/src/acp/__tests__/session-manager-usage.test.ts +4 -2
- package/src/acp/__tests__/session-manager.test.ts +895 -4
- package/src/acp/acp-claude-oauth.ts +328 -14
- package/src/acp/acp-credentials.ts +19 -0
- package/src/acp/agent-process.test.ts +4 -1
- package/src/acp/agent-process.ts +96 -10
- package/src/acp/auth-required.ts +50 -1
- package/src/acp/auto-install.test.ts +9 -7
- package/src/acp/claude-token-refresh.ts +150 -0
- package/src/acp/client-handler.ts +16 -3
- package/src/acp/model-config.test.ts +166 -0
- package/src/acp/model-config.ts +138 -0
- package/src/acp/prepare-agent-env.ts +21 -6
- package/src/acp/resolve-agent.test.ts +220 -6
- package/src/acp/resolve-agent.ts +88 -23
- package/src/acp/session-manager.test.ts +196 -3
- package/src/acp/session-manager.ts +441 -18
- package/src/acp/session-snapshot.ts +260 -0
- package/src/acp/types.ts +50 -5
- package/src/agent/loop.ts +20 -0
- package/src/api/attachment-provenance.test.ts +68 -0
- package/src/api/computer-use-tool.test.ts +55 -0
- package/src/api/computer-use-tool.ts +27 -0
- package/src/api/events/acp-session-model-update.test.ts +88 -0
- package/src/api/events/acp-session-model-update.ts +46 -0
- package/src/api/events/app-files-changed.ts +4 -3
- package/src/api/events/assistant-outbound-attachment.ts +3 -0
- package/src/api/events/desktop-activity-changed.ts +10 -0
- package/src/api/events/notification-intent.ts +2 -0
- package/src/api/events/user-message-echo.ts +7 -1
- package/src/api/index.ts +17 -0
- package/src/api/responses/conversation-message.ts +8 -0
- package/src/approvals/approval-primitive.ts +5 -2
- package/src/approvals/scoped-approval-grants.ts +6 -2
- package/src/apps/app-store.ts +7 -6
- package/src/apps/resolve-app.ts +81 -0
- package/src/apps/source-fingerprint.ts +266 -0
- package/src/avatar/identity-avatar.ts +7 -2
- package/src/browser/operations.ts +2 -1
- package/src/browser/types.ts +7 -0
- package/src/browser/virtual-desktop-target.ts +34 -0
- package/src/bundler/app-compiler.ts +15 -0
- package/src/calls/__tests__/barge-in-guard.test.ts +81 -0
- package/src/{__tests__ → calls/__tests__}/call-controller.test.ts +503 -82
- package/src/{__tests__ → calls/__tests__}/media-stream-audio-transcode.test.ts +1 -1
- package/src/{__tests__ → calls/__tests__}/media-stream-output.test.ts +37 -8
- package/src/{__tests__ → calls/__tests__}/media-stream-parser.test.ts +1 -1
- package/src/{__tests__ → calls/__tests__}/media-stream-server-integration.test.ts +150 -57
- package/src/{__tests__ → calls/__tests__}/media-stream-stt-session.test.ts +5 -5
- package/src/{__tests__ → calls/__tests__}/media-turn-detector.test.ts +1 -1
- package/src/{live-voice → calls}/__tests__/progress-narration.test.ts +27 -4
- package/src/{live-voice → calls}/__tests__/progress-phrases.test.ts +1 -1
- package/src/calls/__tests__/voice-control-protocol.test.ts +151 -27
- package/src/calls/__tests__/voice-leg-coordinator.test.ts +229 -0
- package/src/calls/__tests__/voice-progress-cadence.test.ts +274 -0
- package/src/{__tests__/voice-session-bridge.test.ts → calls/__tests__/voice-session-bridge-turn-flow.test.ts} +20 -12
- package/src/calls/__tests__/voice-session-bridge.test.ts +140 -3
- package/src/calls/__tests__/voice-triage-escalate.test.ts +105 -0
- package/src/calls/barge-in-guard.ts +118 -0
- package/src/calls/call-constants.ts +24 -4
- package/src/calls/call-controller.ts +499 -199
- package/src/calls/call-transport.ts +16 -0
- package/src/calls/media-stream-output.ts +32 -0
- package/src/calls/media-stream-server.ts +82 -30
- package/src/calls/media-stream-stt-session.ts +15 -0
- package/src/{live-voice → calls}/progress-narration.ts +17 -4
- package/src/calls/resolve-call-tts-provider.ts +33 -2
- package/src/calls/tts-call-strategy.ts +9 -5
- package/src/calls/types.ts +2 -0
- package/src/calls/voice-control-protocol.ts +194 -21
- package/src/calls/voice-leg-coordinator.ts +189 -0
- package/src/calls/voice-progress-cadence.ts +423 -0
- package/src/calls/voice-session-bridge.ts +140 -76
- package/src/calls/voice-triage-escalate.ts +178 -59
- package/src/cli/commands/__tests__/apps.test.ts +245 -0
- package/src/cli/commands/__tests__/bash.test.ts +53 -0
- package/src/cli/commands/__tests__/browser.test.ts +84 -3
- package/src/cli/commands/__tests__/cli-test-harness.ts +21 -3
- package/src/cli/commands/__tests__/plugins.test.ts +85 -0
- package/src/cli/commands/__tests__/roadmap.help.test.ts +19 -0
- package/src/cli/commands/__tests__/schedules.test.ts +14 -0
- package/src/cli/commands/apps.help.ts +67 -13
- package/src/cli/commands/apps.ts +183 -0
- package/src/cli/commands/bash.help.ts +9 -13
- package/src/cli/commands/bash.ts +7 -25
- package/src/cli/commands/browser.help.ts +43 -0
- package/src/cli/commands/browser.ts +52 -8
- package/src/cli/commands/channels/__tests__/send.test.ts +218 -0
- package/src/cli/commands/channels/index.help.ts +70 -2
- package/src/cli/commands/channels/index.ts +16 -3
- package/src/cli/commands/channels/send.ts +128 -0
- package/src/cli/commands/credentials.help.ts +9 -5
- package/src/cli/commands/credentials.ts +2 -2
- package/src/cli/commands/mcp.help.ts +8 -8
- package/src/cli/commands/mcp.ts +1 -1
- package/src/cli/commands/oauth/index.help.ts +10 -0
- package/src/cli/commands/oauth/providers.ts +12 -0
- package/src/cli/commands/oauth/request.test.ts +179 -2
- package/src/cli/commands/oauth/request.ts +41 -10
- package/src/cli/commands/oauth/status.ts +5 -0
- package/src/cli/commands/plugins.ts +73 -23
- package/src/cli/commands/roadmap.help.ts +5 -1
- package/src/cli/commands/roadmap.ts +1 -1
- package/src/cli/commands/schedules.ts +2 -0
- package/src/cli/lib/__tests__/inspect-plugin.test.ts +54 -0
- package/src/cli/lib/__tests__/install-from-github.test.ts +219 -0
- package/src/cli/lib/__tests__/install-from-platform.test.ts +77 -2
- package/src/cli/lib/__tests__/list-installed-plugins.test.ts +45 -3
- package/src/cli/lib/__tests__/local-plugin-upgrade.test.ts +251 -0
- package/src/cli/lib/__tests__/plugin-catalog-cache.test.ts +65 -2
- package/src/cli/lib/__tests__/plugin-catalog-platform.test.ts +14 -0
- package/src/cli/lib/__tests__/plugin-catalog-resolve.test.ts +27 -1
- package/src/cli/lib/__tests__/plugin-details.test.ts +35 -2
- package/src/cli/lib/__tests__/plugin-marketplace.test.ts +20 -0
- package/src/cli/lib/__tests__/plugins-install-offline.test.ts +43 -0
- package/src/cli/lib/__tests__/search-plugins.test.ts +31 -0
- package/src/cli/lib/__tests__/uninstall-plugin.test.ts +122 -5
- package/src/cli/lib/bundled-marketplace.json +962 -81
- package/src/cli/lib/bundled-plugin-packages.json +786 -0
- package/src/cli/lib/bundled-plugin-packages.ts +87 -0
- package/src/cli/lib/diff-plugin.ts +1 -1
- package/src/cli/lib/inspect-plugin.ts +87 -12
- package/src/cli/lib/install-from-github.ts +150 -94
- package/src/cli/lib/install-from-platform.ts +14 -9
- package/src/cli/lib/list-installed-plugins.ts +21 -35
- package/src/cli/lib/plugin-catalog-cache.ts +22 -3
- package/src/cli/lib/plugin-catalog-local.ts +13 -3
- package/src/cli/lib/plugin-catalog-platform.ts +6 -1
- package/src/cli/lib/plugin-catalog-resolve.ts +20 -0
- package/src/cli/lib/plugin-details.ts +33 -8
- package/src/cli/lib/plugin-marketplace.ts +121 -21
- package/src/cli/lib/plugin-pin-history.ts +5 -2
- package/src/cli/lib/search-plugins.ts +58 -16
- package/src/cli/lib/uninstall-plugin.ts +59 -1
- package/src/cli/lib/upgrade-plugin.ts +61 -8
- package/src/cli/output.ts +18 -4
- package/src/config/__tests__/default-profile-catalog.test.ts +22 -0
- package/src/config/__tests__/default-provider.test.ts +4 -0
- package/src/config/__tests__/memory-retrospective-schema.test.ts +15 -1
- package/src/config/__tests__/platform-identity.test.ts +255 -0
- package/src/config/__tests__/platform-rehydration.test.ts +99 -9
- package/src/config/__tests__/plugin-resident-skill-discovery.test.ts +21 -0
- package/src/config/acp-agent-write.ts +43 -0
- package/src/config/acp-defaults.test.ts +13 -3
- package/src/config/acp-defaults.ts +23 -6
- package/src/config/acp-schema.test.ts +81 -0
- package/src/config/acp-schema.ts +30 -2
- package/src/config/bundled-skills/acp/SKILL.md +23 -15
- package/src/config/bundled-skills/acp/TOOLS.json +7 -3
- package/src/config/bundled-skills/app-builder/SKILL.md +12 -9
- package/src/config/bundled-skills/app-builder/references/CUSTOM_ROUTES.md +1 -1
- package/src/config/bundled-skills/computer-use/SKILL.md +59 -2
- package/src/config/bundled-skills/computer-use/TOOLS.json +101 -2
- package/src/config/bundled-skills/computer-use/tools/computer-use-sequence.ts +12 -0
- package/src/config/bundled-skills/media-processing/services/preprocess.ts +2 -1
- package/src/config/bundled-skills/media-processing/services/processing-pipeline.ts +2 -1
- package/src/config/bundled-skills/media-processing/tools/generate-clip.ts +2 -1
- package/src/config/bundled-skills/messaging/SKILL.md +3 -3
- package/src/config/bundled-skills/messaging/TOOLS.json +3 -3
- package/src/config/bundled-skills/messaging/tools/messaging-send.ts +67 -139
- package/src/config/bundled-skills/phone-calls/references/TRANSCRIPTS.md +1 -1
- package/src/config/bundled-skills/playbooks/tools/playbook-create.ts +2 -1
- package/src/config/bundled-skills/playbooks/tools/playbook-update.ts +2 -1
- package/src/config/bundled-skills/schedule/SKILL.md +7 -8
- package/src/config/bundled-skills/screen-annotation/SKILL.md +10 -3
- package/src/config/bundled-skills/screen-annotation/tools/screen-annotation.test.ts +4 -1
- package/src/config/bundled-skills/skill-management/SKILL.md +1 -1
- package/src/config/bundled-skills/skill-management/TOOLS.json +13 -9
- package/src/config/bundled-skills/transcribe/tools/transcribe-media.ts +5 -2
- package/src/config/default-profile-catalog.ts +1 -1
- package/src/config/env.ts +2 -2
- package/src/config/feature-flag-registry.json +33 -13
- package/src/config/loader.ts +11 -17
- package/src/config/memory-v3-gate.test.ts +31 -0
- package/src/config/memory-v3-gate.ts +20 -16
- package/src/config/platform-identity.ts +201 -0
- package/src/config/platform-rehydration.ts +11 -27
- package/src/config/profile-text-generation.test.ts +51 -0
- package/src/config/profile-text-generation.ts +51 -0
- package/src/config/schema.ts +2 -2
- package/src/config/schemas/__tests__/live-voice.test.ts +8 -158
- package/src/config/schemas/__tests__/voice.test.ts +148 -0
- package/src/config/schemas/calls.ts +1 -28
- package/src/config/schemas/live-voice.ts +1 -173
- package/src/config/schemas/llm.ts +7 -2
- package/src/config/schemas/mcp.ts +15 -9
- package/src/config/schemas/memory-retrospective.ts +10 -0
- package/src/config/schemas/monitoring.ts +9 -0
- package/src/config/schemas/services.ts +18 -0
- package/src/config/schemas/skills.ts +0 -14
- package/src/config/schemas/voice.ts +150 -0
- package/src/config/skills.ts +13 -21
- package/src/credential-execution/ces-runtime.ts +2 -2
- package/src/credential-execution/executable-discovery.ts +36 -134
- package/src/credential-execution/process-manager.test.ts +37 -42
- package/src/credential-execution/process-manager.ts +24 -19
- package/src/credential-health/credential-health-service.ts +11 -17
- package/src/daemon/__tests__/conversation-tool-setup-exclude.test.ts +47 -0
- package/src/daemon/__tests__/conversation-tool-setup.test.ts +109 -121
- package/src/daemon/__tests__/plugin-mcp-reconcile.test.ts +5 -1
- package/src/daemon/__tests__/skill-memory-refresh-mtime.test.ts +133 -0
- package/src/daemon/__tests__/turn-tail-deleted-conversation.test.ts +36 -0
- package/src/daemon/app-change-notify.ts +45 -0
- package/src/daemon/assistant-attachments.ts +20 -12
- package/src/daemon/config-watcher.ts +13 -194
- package/src/daemon/conversation-agent-loop-handlers.ts +74 -3
- package/src/daemon/conversation-agent-loop.ts +12 -0
- package/src/daemon/conversation-attachments.ts +93 -12
- package/src/daemon/conversation-client-surface.ts +26 -0
- package/src/daemon/conversation-error.ts +3 -2
- package/src/daemon/conversation-media-retry.ts +2 -1
- package/src/daemon/conversation-process.ts +35 -64
- package/src/daemon/conversation-runtime-assembly.ts +21 -8
- package/src/daemon/conversation-skill-tools.ts +13 -31
- package/src/daemon/conversation-store.ts +1 -1
- package/src/daemon/conversation-surfaces.ts +21 -10
- package/src/daemon/conversation-tool-setup.ts +135 -109
- package/src/daemon/conversation-turn-finalize.ts +26 -13
- package/src/daemon/conversation.ts +17 -3
- package/src/daemon/daemon-control.ts +3 -7
- package/src/daemon/dictation-profile-store.ts +2 -1
- package/src/daemon/handlers/shared.ts +2 -1
- package/src/daemon/handlers/skills.ts +6 -3
- package/src/daemon/host-bash-proxy.ts +8 -12
- package/src/daemon/host-browser-proxy.ts +15 -1
- package/src/daemon/host-cu-proxy.ts +275 -45
- package/src/daemon/host-file-proxy.ts +8 -10
- package/src/daemon/host-proxy-preactivation.ts +4 -1
- package/src/daemon/host-transfer-proxy.ts +14 -18
- package/src/daemon/lifecycle.ts +4 -9
- package/src/daemon/mcp-reload-service.ts +13 -6
- package/src/daemon/message-types/shared.ts +1 -0
- package/src/daemon/message-types/sync.ts +2 -0
- package/src/daemon/orphan-reaper.ts +4 -3
- package/src/daemon/persist-media-references.ts +20 -3
- package/src/daemon/providers-setup.ts +5 -1
- package/src/daemon/reaction-history-render.ts +2 -1
- package/src/daemon/shutdown-handlers.ts +1 -9
- package/src/daemon/skill-memory-refresh.ts +64 -0
- package/src/daemon/tool-setup-types.ts +6 -0
- package/src/daemon/tool-side-effects.ts +7 -18
- package/src/daemon/wake-conversation-ops.ts +38 -15
- package/src/desktop/__tests__/fake-desktop.ts +123 -0
- package/src/desktop/desktop-automation-lease.test.ts +351 -0
- package/src/desktop/desktop-automation-lease.ts +306 -0
- package/src/desktop/desktop-browser-client.test.ts +413 -0
- package/src/desktop/desktop-browser-client.ts +430 -0
- package/src/desktop/desktop-browser-cursor.ts +40 -0
- package/src/desktop/desktop-browser-endpoint.test.ts +78 -0
- package/src/desktop/desktop-browser-endpoint.ts +145 -0
- package/src/desktop/desktop-browser-operations.ts +130 -0
- package/src/desktop/desktop-chrome-policy.test.ts +79 -0
- package/src/desktop/desktop-chrome-policy.ts +47 -0
- package/src/desktop/desktop-chrome-session.test.ts +48 -0
- package/src/desktop/desktop-chrome-session.ts +87 -0
- package/src/desktop/desktop-dependencies.test.ts +131 -0
- package/src/desktop/desktop-dependencies.ts +329 -0
- package/src/desktop/desktop-display.ts +9 -0
- package/src/desktop/desktop-panel-config.test.ts +135 -0
- package/src/desktop/desktop-panel-config.ts +162 -0
- package/src/desktop/desktop-session-manager.test.ts +813 -0
- package/src/desktop/desktop-session-manager.ts +970 -0
- package/src/desktop/desktop-stream-bridge.test.ts +395 -0
- package/src/desktop/desktop-stream-bridge.ts +214 -0
- package/src/desktop/desktop-wallpaper.test.ts +191 -0
- package/src/desktop/desktop-wallpaper.ts +113 -0
- package/src/desktop/desktop-window-drag.ts +177 -0
- package/src/desktop/desktop-window-manager-config.test.ts +230 -0
- package/src/desktop/desktop-window-manager-config.ts +238 -0
- package/src/desktop/desktop-window-theme.ts +170 -0
- package/src/desktop/virtual-desktop-feature.ts +18 -0
- package/src/desktop/virtual-desktop-platform.test.ts +61 -0
- package/src/heartbeat/heartbeat-service.ts +21 -3
- package/src/home/__tests__/feed-writer.test.ts +22 -0
- package/src/home/feed-writer.ts +11 -2
- package/src/hooks/types.ts +33 -0
- package/src/i18n/AGENTS.md +22 -0
- package/src/i18n/__tests__/i18n.test.ts +112 -0
- package/src/i18n/index.ts +16 -0
- package/src/i18n/locales.ts +93 -0
- package/src/i18n/messages.ts +70 -0
- package/src/i18n/title.ts +25 -0
- package/src/inbound/platform-callback-registration.ts +4 -5
- package/src/ipc/__tests__/browser-ipc.test.ts +230 -2
- package/src/ipc/__tests__/cancel-on-disconnect.test.ts +54 -0
- package/src/ipc/assistant-server.ts +15 -1
- package/src/ipc/cli-client.ts +13 -5
- package/src/live-voice/__tests__/live-voice-agent-turn.test.ts +143 -0
- package/src/live-voice/__tests__/live-voice-events.test.ts +9 -7
- package/src/live-voice/__tests__/live-voice-look-follow-up.test.ts +374 -0
- package/src/live-voice/__tests__/live-voice-metrics.test.ts +0 -3
- package/src/live-voice/__tests__/live-voice-progress.test.ts +94 -15
- package/src/live-voice/__tests__/live-voice-session-telemetry.test.ts +19 -0
- package/src/live-voice/__tests__/live-voice-sight-frame-echo.test.ts +238 -0
- package/src/live-voice/__tests__/live-voice-vad.test.ts +660 -5
- package/src/live-voice/__tests__/protocol.test.ts +95 -0
- package/src/live-voice/__tests__/runtime-websocket-shell.test.ts +13 -69
- package/src/live-voice/__tests__/session-controls.test.ts +156 -0
- package/src/live-voice/live-voice-metrics.ts +9 -0
- package/src/live-voice/live-voice-photo.ts +25 -6
- package/src/live-voice/live-voice-session.ts +1081 -760
- package/src/live-voice/protocol.ts +89 -2
- package/src/live-voice/session-controls.ts +197 -0
- package/src/mcp/__tests__/credential-target.test.ts +59 -0
- package/src/mcp/__tests__/effective-config.test.ts +13 -2
- package/src/mcp/__tests__/manager-state.test.ts +128 -0
- package/src/mcp/__tests__/manager-tool-caps.test.ts +111 -0
- package/src/mcp/__tests__/mcp-auth-orchestrator.test.ts +20 -6
- package/src/mcp/__tests__/mcp-auth-state-target.test.ts +49 -0
- package/src/mcp/__tests__/plugin-mcp-oauth-cleanup.test.ts +107 -0
- package/src/mcp/__tests__/plugin-mcp-oauth-provider-isolation.test.ts +89 -0
- package/src/mcp/__tests__/plugin-server-credential-isolation.test.ts +63 -11
- package/src/mcp/__tests__/reload-signal-emission.test.ts +39 -2
- package/src/mcp/__tests__/startup.test.ts +30 -7
- package/src/mcp/__tests__/tool-caps.test.ts +107 -0
- package/src/mcp/__tests__/workspace-mcp-config.test.ts +135 -0
- package/src/mcp/client.ts +64 -16
- package/src/mcp/credential-target.ts +105 -0
- package/src/mcp/effective-config.ts +45 -18
- package/src/mcp/manager.ts +201 -81
- package/src/mcp/mcp-auth-orchestrator.ts +17 -4
- package/src/mcp/mcp-auth-state.ts +38 -6
- package/src/mcp/mcp-header-store.ts +29 -45
- package/src/mcp/mcp-oauth-provider.ts +101 -33
- package/src/mcp/spec-schema.ts +111 -0
- package/src/mcp/startup.ts +41 -17
- package/src/mcp/tool-caps.ts +176 -0
- package/src/mcp/workspace-mcp-config.ts +188 -0
- package/src/messaging/provider-message-metadata.ts +3 -3
- package/src/messaging/provider.ts +10 -3
- package/src/messaging/providers/__tests__/proactive-address.test.ts +95 -0
- package/src/messaging/providers/callback-routing.ts +18 -0
- package/src/messaging/providers/channel-transport.ts +56 -0
- package/src/messaging/providers/discord/transport.ts +17 -0
- package/src/messaging/providers/slack/__tests__/adapter-token-routing.test.ts +6 -17
- package/src/messaging/providers/slack/adapter.ts +7 -44
- package/src/messaging/providers/slack/transport.ts +16 -0
- package/src/messaging/providers/telegram-bot/adapter.ts +1 -48
- package/src/messaging/providers/telegram-bot/client.ts +0 -26
- package/src/messaging/providers/telegram-bot/transport.ts +20 -0
- package/src/messaging/providers/whatsapp/adapter.ts +1 -48
- package/src/messaging/providers/whatsapp/transport.ts +18 -0
- package/src/monitoring/__tests__/mount-watch.test.ts +236 -0
- package/src/monitoring/__tests__/workspace-git-heartbeat.test.ts +8 -0
- package/src/monitoring/mount-watch.ts +348 -0
- package/src/monitoring/plugin-auto-update.ts +6 -0
- package/src/monitoring/worker.ts +9 -0
- package/src/notifications/__tests__/assistant-reply-producer.test.ts +55 -0
- package/src/notifications/__tests__/copy-composer.test.ts +70 -0
- package/src/notifications/__tests__/decision-engine.test.ts +175 -0
- package/src/notifications/__tests__/guardian-feed-projection.test.ts +158 -2
- package/src/notifications/__tests__/home-feed-side-effect.test.ts +153 -3
- package/src/notifications/__tests__/schedule-result-producer.test.ts +99 -3
- package/src/notifications/adapters/macos.ts +3 -0
- package/src/notifications/assistant-reply-producer.ts +8 -3
- package/src/notifications/conversation-pairing.ts +36 -16
- package/src/notifications/copy-composer.ts +11 -3
- package/src/notifications/decision-engine.ts +43 -8
- package/src/notifications/delivered-post-record.ts +11 -1
- package/src/notifications/guardian-feed-projection.ts +125 -5
- package/src/notifications/home-feed-side-effect.ts +55 -7
- package/src/notifications/schedule-result-producer.ts +64 -22
- package/src/oauth/AGENTS.md +4 -0
- package/src/oauth/__tests__/identity-verifier.test.ts +36 -1
- package/src/oauth/__tests__/seed-providers-managed.test.ts +149 -0
- package/src/oauth/byo-connection.test.ts +105 -0
- package/src/oauth/byo-connection.ts +36 -6
- package/src/oauth/connection-resolver.test.ts +100 -0
- package/src/oauth/connection-resolver.ts +120 -3
- package/src/oauth/identity-verifier.ts +24 -0
- package/src/oauth/oauth-store.ts +11 -1
- package/src/oauth/provider-serializer.ts +10 -0
- package/src/oauth/scope-utils.ts +24 -0
- package/src/oauth/seed-providers.ts +367 -27
- package/src/onboarding/checkin-event.ts +2 -1
- package/src/outbound-proxy/certs.ts +3 -5
- package/src/permissions/checker.test.ts +11 -6
- package/src/permissions/confirmation-guardian-request.test.ts +16 -0
- package/src/permissions/confirmation-guardian-request.ts +2 -3
- package/src/persistence/attachments-store.ts +84 -44
- package/src/persistence/compaction-log-store-clickhouse.ts +3 -3
- package/src/persistence/conversation-crud.ts +182 -83
- package/src/persistence/conversation-lineage.ts +12 -4
- package/src/persistence/conversation-plugin-facade.ts +13 -0
- package/src/persistence/conversation-queries.ts +2 -2
- package/src/persistence/conversation-title-placeholders.ts +23 -0
- package/src/persistence/conversation-title-service.ts +9 -26
- package/src/persistence/conversation-tool-surface.ts +86 -0
- package/src/persistence/conversation-types.test.ts +32 -0
- package/src/persistence/conversation-types.ts +26 -4
- package/src/persistence/embeddings/qdrant-manager.ts +163 -18
- package/src/persistence/llm-request-log-sink-clickhouse.ts +3 -3
- package/src/persistence/llm-request-log-source-clickhouse.ts +3 -3
- package/src/persistence/message-cursor.ts +78 -0
- package/src/persistence/message-reads.ts +30 -0
- package/src/persistence/migrations/157-invite-contact-id.ts +18 -6
- package/src/persistence/migrations/378-create-conversation-tool-surfaces.test.ts +78 -0
- package/src/persistence/migrations/378-create-conversation-tool-surfaces.ts +29 -0
- package/src/persistence/migrations/379-oauth-providers-response-ok-field.test.ts +92 -0
- package/src/persistence/migrations/379-oauth-providers-response-ok-field.ts +32 -0
- package/src/persistence/migrations/__tests__/157-invite-contact-id.test.ts +149 -0
- package/src/persistence/schema/conversation-tool-surfaces.ts +22 -0
- package/src/persistence/schema/index.ts +1 -0
- package/src/persistence/schema/memory-core.ts +5 -0
- package/src/persistence/schema/oauth.ts +1 -0
- package/src/persistence/steps.ts +15 -3
- package/src/platform/client.test.ts +4 -2
- package/src/platform/client.ts +2 -10
- package/src/plugin-api/constants.ts +2 -0
- package/src/plugin-api/conversation-turn.ts +31 -7
- package/src/plugin-api/index.ts +10 -1
- package/src/plugin-api/plugin-channel-turn-trust.test.ts +133 -0
- package/src/plugin-api/plugin-channel-turn-trust.ts +71 -0
- package/src/plugin-api/types.ts +2 -0
- package/src/plugins/__tests__/installed-plugin-dirs.test.ts +14 -1
- package/src/plugins/__tests__/mcp-servers.test.ts +38 -8
- package/src/plugins/defaults/index.ts +2 -0
- package/src/plugins/defaults/memory/AGENTS.md +14 -2
- package/src/plugins/defaults/memory/__tests__/buffer-file.test.ts +365 -0
- package/src/plugins/defaults/memory/__tests__/buffer-format.test.ts +43 -0
- package/src/plugins/defaults/memory/__tests__/fixtures/buffer-appender.ts +17 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-accounting.test.ts +46 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-cursor-backfill.test.ts +118 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-cursor-preserve.test.ts +83 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-enqueue.test.ts +9 -5
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-job.test.ts +66 -10
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-prompt.test.ts +20 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-state.test.ts +219 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-sweep.test.ts +31 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-trigger-check.test.ts +63 -0
- package/src/plugins/defaults/memory/__tests__/memory-run-evidence.test.ts +161 -0
- package/src/plugins/defaults/memory/__tests__/shutdown-hook.test.ts +4 -0
- package/src/plugins/defaults/memory/buffer-file.ts +354 -0
- package/src/plugins/defaults/memory/buffer-format.ts +40 -0
- package/src/plugins/defaults/memory/context-search/agent-runner.ts +3 -3
- package/src/plugins/defaults/memory/context-search/format.ts +4 -2
- package/src/plugins/defaults/memory/context-search/sources/memory-v2.ts +7 -3
- package/src/plugins/defaults/memory/context-search/sources/workspace.ts +4 -2
- package/src/plugins/defaults/memory/graph/capability-seed.ts +6 -8
- package/src/plugins/defaults/memory/graph/tool-handlers.ts +1 -42
- package/src/plugins/defaults/memory/hooks/init.ts +10 -0
- package/src/plugins/defaults/memory/hooks/message-deleted.ts +21 -0
- package/src/plugins/defaults/memory/hooks/shutdown.ts +2 -0
- package/src/plugins/defaults/memory/injectors.ts +4 -3
- package/src/plugins/defaults/memory/jobs-worker.ts +13 -0
- package/src/plugins/defaults/memory/memory-retrospective-accounting.ts +34 -60
- package/src/plugins/defaults/memory/memory-retrospective-cursor-backfill.ts +126 -0
- package/src/plugins/defaults/memory/memory-retrospective-cursor-preserve.ts +79 -0
- package/src/plugins/defaults/memory/memory-retrospective-cursor.ts +28 -0
- package/src/plugins/defaults/memory/memory-retrospective-enqueue.ts +3 -5
- package/src/plugins/defaults/memory/memory-retrospective-job.ts +67 -184
- package/src/plugins/defaults/memory/memory-retrospective-prompt.ts +1 -1
- package/src/plugins/defaults/memory/memory-retrospective-state.ts +312 -71
- package/src/plugins/defaults/memory/memory-retrospective-sweep.ts +2 -1
- package/src/plugins/defaults/memory/memory-retrospective-trigger-check.ts +5 -3
- package/src/plugins/defaults/memory/memory-run-evidence.ts +213 -0
- package/src/plugins/defaults/memory/skill-md-mtime-poll.ts +9 -0
- package/src/plugins/defaults/memory/src/memory-item-routes.test.ts +1 -1
- package/src/plugins/defaults/memory/startup.ts +28 -2
- package/src/plugins/defaults/memory/substrate/__tests__/consolidation-job.test.ts +407 -99
- package/src/plugins/defaults/memory/substrate/__tests__/consolidation-prompt-flag-gating-guard.test.ts +10 -0
- package/src/plugins/defaults/memory/substrate/__tests__/prompts-consolidation.test.ts +107 -7
- package/src/plugins/defaults/memory/substrate/__tests__/skill-content.test.ts +7 -9
- package/src/plugins/defaults/memory/substrate/consolidation-job.ts +307 -86
- package/src/plugins/defaults/memory/substrate/consolidation-tool-surface.ts +34 -0
- package/src/plugins/defaults/memory/substrate/page-index.ts +7 -1
- package/src/plugins/defaults/memory/substrate/prompts/consolidation.ts +89 -49
- package/src/plugins/defaults/memory/substrate/skill-content.ts +2 -2
- package/src/plugins/defaults/memory/substrate/sweep-job.ts +1 -1
- package/src/plugins/defaults/memory/tools.ts +1 -1
- package/src/plugins/defaults/memory/v1/graph/consolidation.ts +4 -2
- package/src/plugins/defaults/memory/v1/graph/extraction.ts +4 -1
- package/src/plugins/defaults/memory/v1/graph/retriever.ts +4 -1
- package/src/plugins/defaults/memory/v2/__tests__/migration.test.ts +5 -0
- package/src/plugins/defaults/memory/v2/__tests__/reranker.test.ts +5 -2
- package/src/plugins/defaults/memory/v2/reranker.ts +7 -1
- package/src/plugins/defaults/memory/v3/__tests__/card.test.ts +24 -0
- package/src/plugins/defaults/memory/v3/__tests__/injection.test.ts +81 -1
- package/src/plugins/defaults/memory/v3/__tests__/orchestrate.test.ts +87 -0
- package/src/plugins/defaults/memory/v3/__tests__/pool-select.test.ts +125 -0
- package/src/plugins/defaults/memory/v3/__tests__/sections.test.ts +26 -0
- package/src/plugins/defaults/memory/v3/__tests__/shadow-plugin.test.ts +51 -0
- package/src/plugins/defaults/memory/v3/card.ts +4 -2
- package/src/plugins/defaults/memory/v3/injector.ts +212 -178
- package/src/plugins/defaults/memory/v3/orchestrate.ts +86 -22
- package/src/plugins/defaults/memory/v3/pool-select.ts +13 -8
- package/src/plugins/defaults/memory/v3/sections.ts +10 -3
- package/src/plugins/defaults/memory/v3/shadow-plugin.ts +13 -1
- package/src/plugins/defaults/memory/worker.ts +6 -0
- package/src/plugins/defaults/tool-result-truncate/terminal.ts +1 -46
- package/src/plugins/external-plugin-loader.ts +49 -86
- package/src/plugins/installed-plugin-dirs.ts +6 -4
- package/src/plugins/mcp-servers.ts +24 -90
- package/src/plugins/mtime-cache.ts +2 -1
- package/src/plugins/user-loader.ts +2 -1
- package/src/providers/__tests__/connection-model-compat.test.ts +3 -3
- package/src/providers/__tests__/retry-callsite.test.ts +41 -0
- package/src/providers/__tests__/retry-outbound-sanitize.test.ts +176 -0
- package/src/providers/anthropic/client.ts +0 -47
- package/src/providers/gemini/client.ts +9 -23
- package/src/providers/gemini-thought-signature.test.ts +63 -0
- package/src/providers/gemini-thought-signature.ts +44 -0
- package/src/providers/inference/__tests__/endpoint-probe.test.ts +87 -3
- package/src/providers/inference/adapter-factory.ts +6 -0
- package/src/providers/inference/auth.ts +2 -3
- package/src/providers/inference/connection-availability.ts +27 -8
- package/src/providers/inference/endpoint-probe.ts +36 -12
- package/src/providers/inference/resolve-auth.ts +22 -4
- package/src/providers/inference/service-account-token.ts +248 -0
- package/src/providers/jev/client.test.ts +260 -0
- package/src/providers/jev/client.ts +518 -0
- package/src/providers/model-catalog.ts +92 -3
- package/src/providers/model-intents.ts +10 -5
- package/src/providers/openai/__tests__/chat-completions-output-token-limit.test.ts +141 -0
- package/src/providers/openai/__tests__/chat-completions-provider-reasoning.test.ts +146 -18
- package/src/providers/openai/__tests__/chat-completions-provider-thought-signature.test.ts +613 -0
- package/src/providers/openai/__tests__/google-thought-signature.test.ts +235 -0
- package/src/providers/openai/__tests__/tool-choice-mapping.test.ts +83 -1
- package/src/providers/openai/chat-completions-provider.ts +212 -79
- package/src/providers/openai/codex-models.ts +0 -4
- package/src/providers/openai/google-thought-signature.ts +320 -0
- package/src/providers/openai/responses-provider.ts +9 -2
- package/src/providers/opencode/client.test.ts +240 -4
- package/src/providers/opencode/client.ts +129 -3
- package/src/providers/openrouter/client.ts +20 -0
- package/src/providers/outbound-request-sanitize.ts +96 -0
- package/src/providers/retry.ts +30 -19
- package/src/providers/unparseable-tool-args.ts +5 -1
- package/src/runtime/AGENTS.md +9 -3
- package/src/runtime/__tests__/agent-wake.test.ts +86 -1
- package/src/runtime/__tests__/channel-send.test.ts +443 -0
- package/src/runtime/__tests__/desktop-stream-upgrade.test.ts +132 -0
- package/src/runtime/__tests__/host-observe.test.ts +40 -1
- package/src/runtime/__tests__/live-voice-upgrade.test.ts +58 -0
- package/src/runtime/__tests__/runtime-ws-test-utils.ts +72 -0
- package/src/runtime/__tests__/watch-stream-upgrade.test.ts +59 -0
- package/src/runtime/agent-wake.ts +22 -5
- package/src/runtime/assistant-event-hub.ts +21 -3
- package/src/runtime/auth/same-actor.ts +38 -3
- package/src/runtime/channel-send.ts +316 -0
- package/src/runtime/guardian-action-service.ts +2 -17
- package/src/runtime/guardian-reply-router.ts +1 -8
- package/src/runtime/host-observe.ts +11 -1
- package/src/runtime/http-server.ts +160 -151
- package/src/runtime/migrations/__tests__/vbundle-import-policy.test.ts +89 -0
- package/src/runtime/migrations/vbundle-import-policy.ts +33 -11
- package/src/runtime/routes/__tests__/acp-claude-auth-routes.test.ts +16 -5
- package/src/runtime/routes/__tests__/acp-routes.test.ts +178 -4
- package/src/runtime/routes/__tests__/apps-refresh-route.test.ts +275 -0
- package/src/runtime/routes/__tests__/channel-send-routes.test.ts +127 -0
- package/src/runtime/routes/__tests__/conversation-query-routes.test.ts +108 -1
- package/src/runtime/routes/__tests__/default-provider-routes.test.ts +2 -2
- package/src/runtime/routes/__tests__/dictation-cleanup-guard.test.ts +107 -0
- package/src/runtime/routes/__tests__/inference-profiles-routes.test.ts +24 -2
- package/src/runtime/routes/__tests__/mcp-add-default-risk.test.ts +16 -12
- package/src/runtime/routes/__tests__/plugins-routes.test.ts +127 -3
- package/src/runtime/routes/acp-claude-auth-routes.ts +11 -3
- package/src/runtime/routes/acp-routes.test.ts +15 -0
- package/src/runtime/routes/acp-routes.ts +84 -165
- package/src/runtime/routes/app-management-routes.ts +90 -2
- package/src/runtime/routes/app-routes.ts +1 -1
- package/src/runtime/routes/browser-context.ts +39 -0
- package/src/runtime/routes/browser-routes.ts +16 -47
- package/src/runtime/routes/browser-tabs-routes.ts +72 -29
- package/src/runtime/routes/channel-route-shared.ts +1 -9
- package/src/runtime/routes/channel-send-routes.ts +85 -0
- package/src/runtime/routes/conversation-list-routes.ts +14 -3
- package/src/runtime/routes/conversation-query-routes.ts +40 -0
- package/src/runtime/routes/conversation-routes.ts +45 -7
- package/src/runtime/routes/credential-routes.ts +20 -14
- package/src/runtime/routes/desktop-setup-routes.test.ts +89 -0
- package/src/runtime/routes/desktop-setup-routes.ts +41 -0
- package/src/runtime/routes/diagnostics-routes.ts +61 -4
- package/src/runtime/routes/events-routes.ts +4 -0
- package/src/runtime/routes/guardian-approval-interception.ts +24 -0
- package/src/runtime/routes/host-cu-routes.ts +6 -0
- package/src/runtime/routes/inbound-message-handler.ts +2 -3
- package/src/runtime/routes/inbound-stages/background-dispatch.test.ts +1 -1
- package/src/runtime/routes/inbound-stages/background-dispatch.ts +7 -4
- package/src/runtime/routes/index.ts +4 -2
- package/src/runtime/routes/inference-profile-session-handler.ts +11 -1
- package/src/runtime/routes/inference-profiles-routes.ts +9 -0
- package/src/runtime/routes/log-export-routes.ts +2 -0
- package/src/runtime/routes/mcp-auth-routes.ts +141 -137
- package/src/runtime/routes/migration-routes.ts +6 -20
- package/src/runtime/routes/oauth-commands-routes.ts +98 -45
- package/src/runtime/routes/oauth-providers.ts +11 -0
- package/src/runtime/routes/oauth-request-hints.test.ts +246 -0
- package/src/runtime/routes/oauth-request-hints.ts +149 -0
- package/src/runtime/routes/platform-routes.ts +18 -15
- package/src/runtime/routes/plugins-routes.ts +83 -50
- package/src/runtime/routes/schedule-routes.ts +2 -0
- package/src/runtime/routes/secret-routes.ts +99 -119
- package/src/runtime/routes/workspace-routes.test.ts +55 -26
- package/src/runtime/routes/workspace-routes.ts +46 -63
- package/src/runtime/routes/workspace-tree-walk.test.ts +244 -0
- package/src/runtime/routes/workspace-tree-walk.ts +240 -0
- package/src/runtime/routes/workspace-utils.ts +17 -0
- package/src/runtime/services/__tests__/conversation-serializer.test.ts +28 -0
- package/src/runtime/services/conversation-serializer.ts +16 -3
- package/src/runtime/sync/resource-sync-events.ts +6 -1
- package/src/schedule/__tests__/worker-mcp-bootstrap.test.ts +107 -0
- package/src/schedule/__tests__/worker-mcp-readiness.test.ts +173 -0
- package/src/schedule/__tests__/worker-mcp-tools.test.ts +13 -47
- package/src/schedule/run-script.ts +4 -3
- package/src/schedule/schedule-store.ts +9 -2
- package/src/schedule/scheduler.ts +47 -11
- package/src/schedule/tool-surface-readiness.ts +65 -0
- package/src/schedule/worker-mcp.ts +85 -0
- package/src/schedule/worker.ts +9 -31
- package/src/security/__tests__/ces-http-record-backend.test.ts +137 -0
- package/src/security/ces-http-record-backend.ts +120 -0
- package/src/security/ces-rpc-record-backend.ts +7 -0
- package/src/security/secure-keys.ts +60 -48
- package/src/security/untrusted-content.ts +3 -1
- package/src/skills/__tests__/workspace-skill-md-signature.test.ts +60 -0
- package/src/skills/managed-store.ts +153 -31
- package/src/skills/workspace-skill-md-signature.ts +50 -0
- package/src/subagent/consult-context.ts +12 -25
- package/src/tools/__tests__/side-effect-abort-guard.test.ts +1 -0
- package/src/tools/acp/list-agents.test.ts +3 -1
- package/src/tools/acp/spawn.test.ts +146 -11
- package/src/tools/acp/spawn.ts +21 -3
- package/src/tools/acp/status.test.ts +349 -0
- package/src/tools/acp/status.ts +112 -9
- package/src/tools/app-control/skill-proxy-bridge.ts +2 -1
- package/src/tools/browser/browser-execution.ts +45 -14
- package/src/tools/browser/cdp-client/__tests__/factory.test.ts +69 -0
- package/src/tools/browser/cdp-client/accessibility-snapshot.ts +9 -3
- package/src/tools/browser/cdp-client/cdp-inspect/__tests__/ws-transport.test.ts +1 -0
- package/src/tools/browser/cdp-client/cdp-inspect/discovery.ts +2 -1
- package/src/tools/browser/cdp-client/cdp-inspect/ws-transport.ts +5 -0
- package/src/tools/browser/cdp-client/extension-cdp-client.ts +3 -2
- package/src/tools/browser/network-recorder.ts +2 -1
- package/src/tools/capability-offer.test.ts +22 -2
- package/src/tools/capability-offer.ts +16 -1
- package/src/tools/computer-use/definitions.ts +123 -5
- package/src/tools/computer-use/skill-proxy-bridge.ts +2 -1
- package/src/tools/credentials/metadata-store.ts +100 -0
- package/src/tools/filesystem/search.ts +2 -1
- package/src/tools/host-filesystem/edit.test.ts +2 -1
- package/src/tools/host-filesystem/edit.ts +2 -2
- package/src/tools/host-filesystem/read.test.ts +2 -1
- package/src/tools/host-filesystem/read.ts +2 -2
- package/src/tools/host-filesystem/transfer.test.ts +2 -1
- package/src/tools/host-filesystem/transfer.ts +2 -2
- package/src/tools/host-filesystem/write.test.ts +2 -1
- package/src/tools/host-filesystem/write.ts +2 -2
- package/src/tools/host-terminal/host-shell.test.ts +16 -0
- package/src/tools/host-terminal/host-shell.ts +16 -26
- package/src/tools/network/web-search.ts +6 -1
- package/src/tools/policy-context.ts +6 -7
- package/src/tools/shared/filesystem/file-ops-service.ts +1 -31
- package/src/tools/shared/shell-output.test.ts +10 -0
- package/src/tools/shared/shell-output.ts +14 -2
- package/src/tools/skills/find-similar-skills.test.ts +214 -2
- package/src/tools/skills/find-similar-skills.ts +62 -9
- package/src/tools/skills/resolve-execute-invocation.ts +24 -0
- package/src/tools/skills/sandbox-runner.ts +13 -2
- package/src/tools/skills/scaffold-managed.ts +78 -16
- package/src/tools/subagent/spawn.ts +5 -8
- package/src/tools/terminal/__tests__/safe-env.test.ts +33 -4
- package/src/tools/terminal/__tests__/sanitized-bash.test.ts +43 -0
- package/src/tools/terminal/safe-env.ts +35 -24
- package/src/tools/terminal/sanitized-bash.ts +118 -0
- package/src/tools/terminal/shell-launch.test.ts +162 -0
- package/src/tools/terminal/shell.test.ts +29 -0
- package/src/tools/terminal/shell.ts +13 -7
- package/src/tools/ui-surface/channel-variants.ts +10 -59
- package/src/tools/watch/watch-retro-report.ts +0 -8
- package/src/types/host-capabilities.ts +5 -3
- package/src/util/__tests__/language-subtag.test.ts +23 -1
- package/src/util/abort-reasons.ts +12 -1
- package/src/util/ca-bundle.ts +13 -0
- package/src/util/host-process.test.ts +17 -1
- package/src/util/host-process.ts +24 -0
- package/src/util/language-subtag.ts +16 -0
- package/src/util/platform.ts +8 -0
- package/src/util/plugin-manifest.ts +203 -0
- package/src/util/unicode.ts +44 -1
- package/src/watch/watch-retro.ts +6 -8
- package/src/watch/watch-timeline.ts +2 -2
- package/src/workflows/run-manager.ts +2 -1
- package/src/workspace/git-porcelain.ts +66 -0
- package/src/workspace/git-service.ts +6 -55
- package/src/workspace/migrations/154-repair-retired-codex-gpt-5-4-model-ids.ts +258 -0
- package/src/workspace/migrations/155-move-front-model-config-to-voice.ts +78 -0
- package/src/workspace/migrations/156-extract-workspace-mcp-json.ts +214 -0
- package/src/workspace/migrations/__tests__/155-move-front-model-config-to-voice.test.ts +102 -0
- package/src/workspace/migrations/__tests__/156-extract-workspace-mcp-json.test.ts +199 -0
- package/src/workspace/migrations/registry.ts +6 -0
- package/src/__tests__/app-source-watcher.test.ts +0 -218
- package/src/__tests__/config-watcher-skill-reseed.test.ts +0 -359
- package/src/__tests__/speaker-identification.test.ts +0 -56
- package/src/calls/speaker-identification.ts +0 -233
- package/src/daemon/app-source-watcher.ts +0 -218
- package/src/messaging/providers/whatsapp/client.ts +0 -29
- package/src/runtime/routes/debug-bash-routes.ts +0 -173
- package/src/util/fs-watcher-error.ts +0 -36
- /package/src/{live-voice → calls}/progress-phrases.ts +0 -0
package/src/mcp/manager.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
type ResolvedMcpConfig,
|
|
5
|
-
type ResolvedMcpServerConfig,
|
|
1
|
+
import type {
|
|
2
|
+
ResolvedMcpConfig,
|
|
3
|
+
ResolvedMcpServerConfig,
|
|
6
4
|
} from "../config/schemas/mcp.js";
|
|
7
5
|
import { getLogger } from "../util/logger.js";
|
|
8
6
|
import { McpClient, type McpToolInfo } from "./client.js";
|
|
7
|
+
import {
|
|
8
|
+
applyMcpToolCaps,
|
|
9
|
+
truncatedServerIdsFromCaps,
|
|
10
|
+
} from "./tool-caps.js";
|
|
9
11
|
|
|
10
12
|
const log = getLogger("mcp-manager");
|
|
11
13
|
|
|
@@ -15,97 +17,207 @@ export interface McpServerToolInfo {
|
|
|
15
17
|
tools: McpToolInfo[];
|
|
16
18
|
}
|
|
17
19
|
|
|
20
|
+
export interface McpStartResult {
|
|
21
|
+
servers: McpServerToolInfo[];
|
|
22
|
+
configuredServerCount: number;
|
|
23
|
+
connectedServerCount: number;
|
|
24
|
+
errorServerCount: number;
|
|
25
|
+
needsAuthServerCount: number;
|
|
26
|
+
discoveredToolCount: number;
|
|
27
|
+
keptToolCount: number;
|
|
28
|
+
droppedToolCount: number;
|
|
29
|
+
truncatedServerIds: string[];
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export type McpConnectionState =
|
|
33
|
+
| "connecting"
|
|
34
|
+
| "connected"
|
|
35
|
+
| "needs-auth"
|
|
36
|
+
| "error";
|
|
37
|
+
|
|
38
|
+
export type McpUnexpectedCloseHandler = () => void;
|
|
39
|
+
|
|
18
40
|
export class McpServerManager {
|
|
19
41
|
private clients = new Map<string, McpClient>();
|
|
20
|
-
private
|
|
42
|
+
private connectionStates = new Map<
|
|
43
|
+
string,
|
|
44
|
+
{ source: ResolvedMcpServerConfig["source"]; state: McpConnectionState }
|
|
45
|
+
>();
|
|
46
|
+
|
|
47
|
+
constructor(private onUnexpectedClose?: McpUnexpectedCloseHandler) {}
|
|
21
48
|
|
|
22
|
-
|
|
23
|
-
|
|
49
|
+
setUnexpectedCloseHandler(handler: McpUnexpectedCloseHandler): void {
|
|
50
|
+
this.onUnexpectedClose = handler;
|
|
51
|
+
}
|
|
24
52
|
|
|
25
|
-
|
|
26
|
-
|
|
53
|
+
async start(config: ResolvedMcpConfig): Promise<McpStartResult> {
|
|
54
|
+
const entries = Object.entries(config.servers);
|
|
55
|
+
log.info(
|
|
56
|
+
{ configuredServerCount: entries.length },
|
|
57
|
+
"Starting configured MCP servers",
|
|
27
58
|
);
|
|
28
|
-
|
|
29
|
-
try {
|
|
30
|
-
console.log(
|
|
31
|
-
`[MCP] Starting server "${serverId}" (transport: ${serverConfig.transport.type})`,
|
|
32
|
-
);
|
|
33
|
-
if (
|
|
34
|
-
serverConfig.transport.type === "sse" ||
|
|
35
|
-
serverConfig.transport.type === "streamable-http"
|
|
36
|
-
) {
|
|
37
|
-
log.debug(
|
|
38
|
-
{ serverId },
|
|
39
|
-
"HTTP transport: OAuth provider will be available if server requires authentication",
|
|
40
|
-
);
|
|
41
|
-
}
|
|
42
|
-
// The server's own origin decides whether it may resolve
|
|
43
|
-
// `mcp:<serverId>:*` from the credential store.
|
|
44
|
-
const client = new McpClient(serverId, serverConfig.source);
|
|
45
|
-
await client.connect(serverConfig.transport);
|
|
46
|
-
|
|
47
|
-
if (!client.isConnected) {
|
|
48
|
-
// Server requires authentication — connect() logged guidance
|
|
49
|
-
continue;
|
|
50
|
-
}
|
|
59
|
+
console.log(`[MCP] Starting ${entries.length} server(s)...`);
|
|
51
60
|
|
|
52
|
-
|
|
53
|
-
|
|
61
|
+
const started = await Promise.all(
|
|
62
|
+
entries.map(([serverId, serverConfig]) =>
|
|
63
|
+
this.startOne(serverId, serverConfig),
|
|
64
|
+
),
|
|
65
|
+
);
|
|
66
|
+
const connected = started.filter(
|
|
67
|
+
(result): result is McpServerToolInfo => result != null,
|
|
68
|
+
);
|
|
69
|
+
const errorServerCount = [...this.connectionStates.values()].filter(
|
|
70
|
+
(entry) => entry.state === "error",
|
|
71
|
+
).length;
|
|
72
|
+
const needsAuthServerCount = [...this.connectionStates.values()].filter(
|
|
73
|
+
(entry) => entry.state === "needs-auth",
|
|
74
|
+
).length;
|
|
54
75
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
76
|
+
const capped = applyMcpToolCaps(
|
|
77
|
+
connected.map((result) => ({
|
|
78
|
+
serverId: result.serverId,
|
|
79
|
+
tools: result.tools,
|
|
80
|
+
})),
|
|
81
|
+
);
|
|
82
|
+
const keptByServer = new Map(
|
|
83
|
+
capped.servers.map((server) => [server.serverId, server.tools]),
|
|
84
|
+
);
|
|
85
|
+
const results = connected.map((result) => ({
|
|
86
|
+
...result,
|
|
87
|
+
tools: keptByServer.get(result.serverId) ?? [],
|
|
88
|
+
}));
|
|
89
|
+
const truncatedServerIds = truncatedServerIdsFromCaps(capped.decisions);
|
|
60
90
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
91
|
+
if (capped.droppedToolCount > 0) {
|
|
92
|
+
log.warn(
|
|
93
|
+
{
|
|
94
|
+
configuredServerCount: entries.length,
|
|
95
|
+
connectedServerCount: connected.length,
|
|
96
|
+
errorServerCount,
|
|
97
|
+
needsAuthServerCount,
|
|
98
|
+
discoveredToolCount: capped.discoveredToolCount,
|
|
99
|
+
keptToolCount: capped.keptToolCount,
|
|
100
|
+
droppedToolCount: capped.droppedToolCount,
|
|
101
|
+
globalCap: capped.globalCap,
|
|
102
|
+
perServerCap: capped.perServerCap,
|
|
103
|
+
truncatedServerIds,
|
|
104
|
+
decisions: capped.decisions.filter(
|
|
105
|
+
(decision) =>
|
|
106
|
+
decision.droppedByPerServerCap > 0 ||
|
|
107
|
+
decision.droppedByGlobalCap > 0,
|
|
108
|
+
),
|
|
109
|
+
},
|
|
110
|
+
"MCP tool caps dropped tools using fair per-server selection",
|
|
111
|
+
);
|
|
112
|
+
} else {
|
|
113
|
+
log.info(
|
|
114
|
+
{
|
|
115
|
+
configuredServerCount: entries.length,
|
|
116
|
+
connectedServerCount: connected.length,
|
|
117
|
+
errorServerCount,
|
|
118
|
+
needsAuthServerCount,
|
|
119
|
+
discoveredToolCount: capped.discoveredToolCount,
|
|
120
|
+
keptToolCount: capped.keptToolCount,
|
|
121
|
+
globalCap: capped.globalCap,
|
|
122
|
+
perServerCap: capped.perServerCap,
|
|
123
|
+
},
|
|
124
|
+
"MCP servers connected",
|
|
125
|
+
);
|
|
126
|
+
}
|
|
72
127
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
128
|
+
return {
|
|
129
|
+
servers: results,
|
|
130
|
+
configuredServerCount: entries.length,
|
|
131
|
+
connectedServerCount: connected.length,
|
|
132
|
+
errorServerCount,
|
|
133
|
+
needsAuthServerCount,
|
|
134
|
+
discoveredToolCount: capped.discoveredToolCount,
|
|
135
|
+
keptToolCount: capped.keptToolCount,
|
|
136
|
+
droppedToolCount: capped.droppedToolCount,
|
|
137
|
+
truncatedServerIds,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
private async startOne(
|
|
142
|
+
serverId: string,
|
|
143
|
+
serverConfig: ResolvedMcpServerConfig,
|
|
144
|
+
): Promise<McpServerToolInfo | null> {
|
|
145
|
+
this.connectionStates.set(serverId, {
|
|
146
|
+
source: serverConfig.source,
|
|
147
|
+
state: "connecting",
|
|
148
|
+
});
|
|
149
|
+
try {
|
|
150
|
+
console.log(
|
|
151
|
+
`[MCP] Starting server "${serverId}" (transport: ${serverConfig.transport.type})`,
|
|
152
|
+
);
|
|
153
|
+
if (
|
|
154
|
+
serverConfig.transport.type === "sse" ||
|
|
155
|
+
serverConfig.transport.type === "streamable-http"
|
|
156
|
+
) {
|
|
157
|
+
log.debug(
|
|
158
|
+
{ serverId },
|
|
159
|
+
"HTTP transport: OAuth provider will be available if server requires authentication",
|
|
160
|
+
);
|
|
161
|
+
}
|
|
162
|
+
const client = new McpClient(serverId, serverConfig, () => {
|
|
163
|
+
if (this.clients.get(serverId) !== client) {
|
|
164
|
+
return;
|
|
87
165
|
}
|
|
166
|
+
this.connectionStates.set(serverId, {
|
|
167
|
+
source: serverConfig.source,
|
|
168
|
+
state: "error",
|
|
169
|
+
});
|
|
170
|
+
this.onUnexpectedClose?.();
|
|
171
|
+
});
|
|
172
|
+
await client.connect(serverConfig.transport);
|
|
173
|
+
|
|
174
|
+
if (!client.isConnected) {
|
|
175
|
+
this.connectionStates.set(serverId, {
|
|
176
|
+
source: serverConfig.source,
|
|
177
|
+
state: client.lastError ? "error" : "needs-auth",
|
|
178
|
+
});
|
|
179
|
+
return null;
|
|
88
180
|
}
|
|
89
|
-
}
|
|
90
181
|
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
182
|
+
this.clients.set(serverId, client);
|
|
183
|
+
|
|
184
|
+
const tools = await client.listTools();
|
|
185
|
+
if (!client.isConnected || this.clients.get(serverId) !== client) {
|
|
186
|
+
this.clients.delete(serverId);
|
|
187
|
+
this.connectionStates.set(serverId, {
|
|
188
|
+
source: serverConfig.source,
|
|
189
|
+
state: "error",
|
|
190
|
+
});
|
|
191
|
+
return null;
|
|
192
|
+
}
|
|
193
|
+
log.info(
|
|
194
|
+
{ serverId, toolCount: tools.length },
|
|
195
|
+
"MCP server tools discovered",
|
|
96
196
|
);
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
197
|
+
|
|
198
|
+
this.connectionStates.set(serverId, {
|
|
199
|
+
source: serverConfig.source,
|
|
200
|
+
state: "connected",
|
|
201
|
+
});
|
|
202
|
+
return { serverId, serverConfig, tools };
|
|
203
|
+
} catch (err) {
|
|
204
|
+
this.connectionStates.set(serverId, {
|
|
205
|
+
source: serverConfig.source,
|
|
206
|
+
state: "error",
|
|
207
|
+
});
|
|
208
|
+
console.error(`[MCP] Failed to connect to server "${serverId}":`, err);
|
|
209
|
+
log.error({ err, serverId }, "Failed to connect to MCP server");
|
|
210
|
+
const staleClient = this.clients.get(serverId);
|
|
211
|
+
if (staleClient) {
|
|
212
|
+
try {
|
|
213
|
+
await staleClient.disconnect();
|
|
214
|
+
} catch {
|
|
215
|
+
/* ignore */
|
|
103
216
|
}
|
|
104
|
-
|
|
217
|
+
this.clients.delete(serverId);
|
|
105
218
|
}
|
|
219
|
+
return null;
|
|
106
220
|
}
|
|
107
|
-
|
|
108
|
-
return results;
|
|
109
221
|
}
|
|
110
222
|
|
|
111
223
|
async stop(): Promise<void> {
|
|
@@ -119,7 +231,7 @@ export class McpServerManager {
|
|
|
119
231
|
);
|
|
120
232
|
await Promise.all(disconnects);
|
|
121
233
|
this.clients.clear();
|
|
122
|
-
this.
|
|
234
|
+
this.connectionStates.clear();
|
|
123
235
|
log.info("All MCP servers disconnected");
|
|
124
236
|
}
|
|
125
237
|
|
|
@@ -139,6 +251,14 @@ export class McpServerManager {
|
|
|
139
251
|
getClient(serverId: string): McpClient | undefined {
|
|
140
252
|
return this.clients.get(serverId);
|
|
141
253
|
}
|
|
254
|
+
|
|
255
|
+
getServerState(
|
|
256
|
+
serverId: string,
|
|
257
|
+
source: ResolvedMcpServerConfig["source"],
|
|
258
|
+
): McpConnectionState | undefined {
|
|
259
|
+
const entry = this.connectionStates.get(serverId);
|
|
260
|
+
return entry?.source === source ? entry.state : undefined;
|
|
261
|
+
}
|
|
142
262
|
}
|
|
143
263
|
|
|
144
264
|
// Singleton instance
|
|
@@ -15,6 +15,11 @@ import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/
|
|
|
15
15
|
|
|
16
16
|
import { reloadMcpServers } from "../daemon/mcp-reload-service.js";
|
|
17
17
|
import { getLogger } from "../util/logger.js";
|
|
18
|
+
import {
|
|
19
|
+
mcpOAuthCredentialKey,
|
|
20
|
+
type McpOAuthCredentialTarget,
|
|
21
|
+
workspaceMcpOAuthCredentialTarget,
|
|
22
|
+
} from "./credential-target.js";
|
|
18
23
|
import {
|
|
19
24
|
setMcpAuthComplete,
|
|
20
25
|
setMcpAuthError,
|
|
@@ -46,8 +51,12 @@ export interface OrchestrateMcpOAuthConnectResult {
|
|
|
46
51
|
export async function orchestrateMcpOAuthConnect(args: {
|
|
47
52
|
serverId: string;
|
|
48
53
|
transport: McpAuthTransportConfig;
|
|
54
|
+
credentialTarget?: McpOAuthCredentialTarget;
|
|
49
55
|
}): Promise<OrchestrateMcpOAuthConnectResult> {
|
|
50
56
|
const { serverId, transport } = args;
|
|
57
|
+
const credentialTarget =
|
|
58
|
+
args.credentialTarget ?? workspaceMcpOAuthCredentialTarget(serverId);
|
|
59
|
+
const targetKey = mcpOAuthCredentialKey(credentialTarget, "tokens");
|
|
51
60
|
|
|
52
61
|
let capturedAuthUrl: string | undefined;
|
|
53
62
|
const provider = new McpOAuthProvider(
|
|
@@ -55,6 +64,7 @@ export async function orchestrateMcpOAuthConnect(args: {
|
|
|
55
64
|
transport.url,
|
|
56
65
|
/* interactive */ false,
|
|
57
66
|
{
|
|
67
|
+
credentialTarget,
|
|
58
68
|
onAuthorizationUrl: (url) => {
|
|
59
69
|
capturedAuthUrl = url;
|
|
60
70
|
},
|
|
@@ -72,7 +82,10 @@ export async function orchestrateMcpOAuthConnect(args: {
|
|
|
72
82
|
const { codePromise } = await provider.startCallbackServer();
|
|
73
83
|
|
|
74
84
|
// Resolve effective headers: credential store takes precedence, then config
|
|
75
|
-
const storedHeaders =
|
|
85
|
+
const storedHeaders =
|
|
86
|
+
credentialTarget.source === "workspace"
|
|
87
|
+
? await getMcpHeaders(serverId)
|
|
88
|
+
: null;
|
|
76
89
|
const effectiveHeaders = storedHeaders ?? transport.headers;
|
|
77
90
|
|
|
78
91
|
// Build the MCP transport and client
|
|
@@ -126,7 +139,7 @@ export async function orchestrateMcpOAuthConnect(args: {
|
|
|
126
139
|
// finishes cannot have its slot overwritten by stale completion writes
|
|
127
140
|
// from the older attempt.
|
|
128
141
|
const attemptId = crypto.randomUUID();
|
|
129
|
-
setMcpAuthPending(serverId, capturedAuthUrl, attemptId);
|
|
142
|
+
setMcpAuthPending(serverId, capturedAuthUrl, attemptId, targetKey);
|
|
130
143
|
|
|
131
144
|
// Fire-and-forget background tail — completes the token exchange once
|
|
132
145
|
// the user approves in the browser.
|
|
@@ -153,7 +166,7 @@ export async function orchestrateMcpOAuthConnect(args: {
|
|
|
153
166
|
}),
|
|
154
167
|
]);
|
|
155
168
|
await mcpTransport.finishAuth(code);
|
|
156
|
-
const applied = setMcpAuthComplete(serverId, attemptId);
|
|
169
|
+
const applied = setMcpAuthComplete(serverId, attemptId, targetKey);
|
|
157
170
|
if (!applied) {
|
|
158
171
|
log.info(
|
|
159
172
|
{ serverId, attemptId },
|
|
@@ -182,7 +195,7 @@ export async function orchestrateMcpOAuthConnect(args: {
|
|
|
182
195
|
}
|
|
183
196
|
} catch (err) {
|
|
184
197
|
const message = err instanceof Error ? err.message : String(err);
|
|
185
|
-
const applied = setMcpAuthError(serverId, message, attemptId);
|
|
198
|
+
const applied = setMcpAuthError(serverId, message, attemptId, targetKey);
|
|
186
199
|
if (!applied) {
|
|
187
200
|
log.info(
|
|
188
201
|
{ serverId, attemptId, error: message },
|
|
@@ -15,14 +15,27 @@
|
|
|
15
15
|
* connection.
|
|
16
16
|
*/
|
|
17
17
|
type McpAuthState =
|
|
18
|
-
| {
|
|
18
|
+
| {
|
|
19
|
+
status: "pending";
|
|
20
|
+
authUrl: string;
|
|
21
|
+
attemptId: string;
|
|
22
|
+
targetKey: string;
|
|
23
|
+
expiresAt: number;
|
|
24
|
+
}
|
|
19
25
|
| {
|
|
20
26
|
status: "complete";
|
|
21
27
|
serverId: string;
|
|
22
28
|
attemptId: string;
|
|
29
|
+
targetKey: string;
|
|
23
30
|
completedAt: number;
|
|
24
31
|
}
|
|
25
|
-
| {
|
|
32
|
+
| {
|
|
33
|
+
status: "error";
|
|
34
|
+
error: string;
|
|
35
|
+
attemptId: string;
|
|
36
|
+
targetKey: string;
|
|
37
|
+
failedAt: number;
|
|
38
|
+
};
|
|
26
39
|
|
|
27
40
|
const activeMcpAuthFlows = new Map<string, McpAuthState>();
|
|
28
41
|
|
|
@@ -41,11 +54,13 @@ export function setMcpAuthPending(
|
|
|
41
54
|
serverId: string,
|
|
42
55
|
authUrl: string,
|
|
43
56
|
attemptId: string,
|
|
57
|
+
targetKey = serverId,
|
|
44
58
|
): void {
|
|
45
59
|
activeMcpAuthFlows.set(serverId, {
|
|
46
60
|
status: "pending",
|
|
47
61
|
authUrl,
|
|
48
62
|
attemptId,
|
|
63
|
+
targetKey,
|
|
49
64
|
expiresAt: Date.now() + PENDING_TTL_MS,
|
|
50
65
|
});
|
|
51
66
|
}
|
|
@@ -59,15 +74,20 @@ export function setMcpAuthPending(
|
|
|
59
74
|
export function setMcpAuthComplete(
|
|
60
75
|
serverId: string,
|
|
61
76
|
attemptId: string,
|
|
77
|
+
targetKey = serverId,
|
|
62
78
|
): boolean {
|
|
63
79
|
const current = activeMcpAuthFlows.get(serverId);
|
|
64
|
-
if (
|
|
80
|
+
if (
|
|
81
|
+
current &&
|
|
82
|
+
(current.attemptId !== attemptId || current.targetKey !== targetKey)
|
|
83
|
+
) {
|
|
65
84
|
return false; // superseded
|
|
66
85
|
}
|
|
67
86
|
activeMcpAuthFlows.set(serverId, {
|
|
68
87
|
status: "complete",
|
|
69
88
|
serverId,
|
|
70
89
|
attemptId,
|
|
90
|
+
targetKey,
|
|
71
91
|
completedAt: Date.now(),
|
|
72
92
|
});
|
|
73
93
|
return true;
|
|
@@ -81,15 +101,20 @@ export function setMcpAuthError(
|
|
|
81
101
|
serverId: string,
|
|
82
102
|
error: string,
|
|
83
103
|
attemptId: string,
|
|
104
|
+
targetKey = serverId,
|
|
84
105
|
): boolean {
|
|
85
106
|
const current = activeMcpAuthFlows.get(serverId);
|
|
86
|
-
if (
|
|
107
|
+
if (
|
|
108
|
+
current &&
|
|
109
|
+
(current.attemptId !== attemptId || current.targetKey !== targetKey)
|
|
110
|
+
) {
|
|
87
111
|
return false; // superseded
|
|
88
112
|
}
|
|
89
113
|
activeMcpAuthFlows.set(serverId, {
|
|
90
114
|
status: "error",
|
|
91
115
|
error,
|
|
92
116
|
attemptId,
|
|
117
|
+
targetKey,
|
|
93
118
|
failedAt: Date.now(),
|
|
94
119
|
});
|
|
95
120
|
return true;
|
|
@@ -100,7 +125,10 @@ export function setMcpAuthError(
|
|
|
100
125
|
* expired entries on every read so a long-polling CLI can never observe
|
|
101
126
|
* a stale flow past its TTL.
|
|
102
127
|
*/
|
|
103
|
-
export function getMcpAuthState(
|
|
128
|
+
export function getMcpAuthState(
|
|
129
|
+
serverId: string,
|
|
130
|
+
targetKey?: string,
|
|
131
|
+
): McpAuthState | null {
|
|
104
132
|
const now = Date.now();
|
|
105
133
|
for (const [id, state] of activeMcpAuthFlows) {
|
|
106
134
|
if (state.status === "pending" && now > state.expiresAt) {
|
|
@@ -117,5 +145,9 @@ export function getMcpAuthState(serverId: string): McpAuthState | null {
|
|
|
117
145
|
activeMcpAuthFlows.delete(id);
|
|
118
146
|
}
|
|
119
147
|
}
|
|
120
|
-
|
|
148
|
+
const state = activeMcpAuthFlows.get(serverId) ?? null;
|
|
149
|
+
if (state && targetKey !== undefined && state.targetKey !== targetKey) {
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
152
|
+
return state;
|
|
121
153
|
}
|
|
@@ -3,18 +3,21 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Follows the same pattern as mcp-oauth-provider.ts: headers are stored in
|
|
5
5
|
* the secure credential store (CES or encrypted file fallback) rather than
|
|
6
|
-
* in plaintext
|
|
6
|
+
* in plaintext mcp.json, keeping secrets out of workspace config files.
|
|
7
7
|
*
|
|
8
8
|
* Key format: mcp:{serverId}:headers — stores JSON-serialized Record<string, string>.
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
|
-
import { loadRawConfig, saveRawConfig } from "../config/loader.js";
|
|
12
11
|
import {
|
|
13
12
|
deleteSecureKeyAsync,
|
|
14
13
|
getSecureKeyAsync,
|
|
15
14
|
setSecureKeyAsync,
|
|
16
15
|
} from "../security/secure-keys.js";
|
|
17
16
|
import { getLogger } from "../util/logger.js";
|
|
17
|
+
import {
|
|
18
|
+
loadWorkspaceMcpConfig,
|
|
19
|
+
saveWorkspaceMcpConfig,
|
|
20
|
+
} from "./workspace-mcp-config.js";
|
|
18
21
|
|
|
19
22
|
const log = getLogger("mcp-header-store");
|
|
20
23
|
|
|
@@ -73,64 +76,45 @@ export async function deleteMcpHeaders(serverId: string): Promise<boolean> {
|
|
|
73
76
|
}
|
|
74
77
|
|
|
75
78
|
/**
|
|
76
|
-
*
|
|
77
|
-
*
|
|
78
|
-
* Safe to call on every MCP reload — no-ops when no legacy headers remain.
|
|
79
|
+
* Move leftover plaintext headers from mcp.json into the credential store
|
|
80
|
+
* and rewrite the file without them. Safe to call on every MCP reload.
|
|
79
81
|
*/
|
|
80
82
|
export async function migrateLegacyMcpHeaders(): Promise<void> {
|
|
81
|
-
const
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
| undefined;
|
|
85
|
-
const servers = mcpConfig?.servers;
|
|
86
|
-
if (!servers) {
|
|
87
|
-
return;
|
|
88
|
-
}
|
|
83
|
+
const config = loadWorkspaceMcpConfig();
|
|
84
|
+
const servers = config.servers;
|
|
85
|
+
let dirty = false;
|
|
89
86
|
|
|
90
|
-
let configDirty = false;
|
|
91
87
|
for (const [id, server] of Object.entries(servers)) {
|
|
92
|
-
const transport = server
|
|
93
|
-
if (
|
|
94
|
-
!transport ||
|
|
95
|
-
(transport.type !== "sse" && transport.type !== "streamable-http")
|
|
96
|
-
) {
|
|
88
|
+
const transport = server.transport;
|
|
89
|
+
if (transport.type !== "sse" && transport.type !== "streamable-http") {
|
|
97
90
|
continue;
|
|
98
91
|
}
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
| undefined;
|
|
102
|
-
if (!legacyHeaders || Object.keys(legacyHeaders).length === 0) {
|
|
92
|
+
const leftoverHeaders = transport.headers;
|
|
93
|
+
if (!leftoverHeaders || Object.keys(leftoverHeaders).length === 0) {
|
|
103
94
|
continue;
|
|
104
95
|
}
|
|
105
96
|
|
|
106
|
-
// Only migrate if credential store doesn't already have headers for
|
|
107
|
-
// this server (idempotent — safe to re-run after partial failure).
|
|
108
97
|
const existing = await getMcpHeaders(id);
|
|
109
|
-
if (existing) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
delete transport.headers;
|
|
119
|
-
configDirty = true;
|
|
98
|
+
if (!existing) {
|
|
99
|
+
const ok = await setMcpHeaders(id, leftoverHeaders);
|
|
100
|
+
if (!ok) {
|
|
101
|
+
log.warn(
|
|
102
|
+
{ serverId: id },
|
|
103
|
+
"Skipping leftover header migration: credential store write failed; will retry on next reload",
|
|
104
|
+
);
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
120
107
|
log.info(
|
|
121
108
|
{ serverId: id },
|
|
122
|
-
"
|
|
123
|
-
);
|
|
124
|
-
} else {
|
|
125
|
-
log.warn(
|
|
126
|
-
{ serverId: id },
|
|
127
|
-
"Skipping legacy header migration — credential store write failed; will retry on next reload",
|
|
109
|
+
"Moved leftover MCP headers to credential store",
|
|
128
110
|
);
|
|
129
111
|
}
|
|
112
|
+
delete transport.headers;
|
|
113
|
+
dirty = true;
|
|
130
114
|
}
|
|
131
115
|
|
|
132
|
-
if (
|
|
133
|
-
|
|
134
|
-
log.info("
|
|
116
|
+
if (dirty) {
|
|
117
|
+
saveWorkspaceMcpConfig(config);
|
|
118
|
+
log.info("mcp.json updated: leftover MCP headers removed after migration");
|
|
135
119
|
}
|
|
136
120
|
}
|