@vellumai/assistant 0.10.2 → 0.10.3-dev.202606252046.9075fd5
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/bun.lock +20 -0
- package/docs/workspace-tools.md +42 -33
- package/eslint-rules/cli-no-daemon-internals.js +6 -0
- package/node_modules/@vellumai/gateway-client/src/__tests__/guardian-delivery-contract.test.ts +91 -0
- package/node_modules/@vellumai/gateway-client/src/__tests__/trust-verdict-contract.test.ts +31 -0
- package/node_modules/@vellumai/gateway-client/src/gateway-ipc-contracts.ts +44 -0
- package/node_modules/@vellumai/gateway-client/src/guardian-delivery-contract.ts +48 -0
- package/node_modules/@vellumai/gateway-client/src/index.ts +14 -0
- package/node_modules/@vellumai/gateway-client/src/trust-verdict-contract.ts +17 -0
- package/node_modules/@vellumai/service-contracts/package.json +1 -0
- package/node_modules/@vellumai/service-contracts/src/__tests__/channels.test.ts +28 -0
- package/node_modules/@vellumai/service-contracts/src/channels.ts +41 -0
- package/node_modules/@vellumai/service-contracts/src/index.ts +1 -0
- package/openapi.yaml +196 -56
- package/package.json +4 -1
- package/scripts/test.sh +36 -15
- package/src/__tests__/actor-token-service.test.ts +36 -14
- package/src/__tests__/actor-trust-resolver-address-fallback.test.ts +83 -31
- package/src/__tests__/agent-loop-override-profile.test.ts +1 -0
- package/src/__tests__/agent-wake-disk-pressure-callsite.test.ts +2 -0
- package/src/__tests__/agent-wake-override-profile.test.ts +2 -0
- package/src/__tests__/annotate-activity-metadata.test.ts +2 -0
- package/src/__tests__/annotate-risk-options.test.ts +2 -0
- package/src/__tests__/approval-cascade.test.ts +2 -0
- package/src/__tests__/assistant-attachments.test.ts +42 -0
- package/src/__tests__/background-workers-disk-pressure.test.ts +2 -0
- package/src/__tests__/btw-routes.test.ts +2 -0
- package/src/__tests__/build-persisted-content.test.ts +2 -0
- package/src/__tests__/call-controller.test.ts +19 -0
- package/src/__tests__/channel-approval-routes.test.ts +21 -26
- package/src/__tests__/channel-delivery-store.test.ts +28 -0
- package/src/__tests__/channel-guardian.test.ts +164 -78
- package/src/__tests__/channel-inbound-disk-pressure.test.ts +11 -19
- package/src/__tests__/channel-reply-delivery.test.ts +2 -0
- package/src/__tests__/code-search-tool.test.ts +585 -0
- package/src/__tests__/compaction-events.test.ts +2 -0
- package/src/__tests__/compaction-ledger-store.test.ts +128 -0
- package/src/__tests__/compaction.benchmark.test.ts +2 -0
- package/src/__tests__/compactor-call-site-logging.test.ts +2 -0
- package/src/__tests__/compactor-low-watermark-cut.test.ts +2 -0
- package/src/__tests__/compactor-preserved-tail-count.test.ts +2 -0
- package/src/__tests__/compactor-summary-call-truncation.test.ts +2 -0
- package/src/__tests__/compactor-web-search-strip.test.ts +2 -0
- package/src/__tests__/config-loader-backfill.test.ts +123 -10
- package/src/__tests__/config-schema.test.ts +1 -0
- package/src/__tests__/confirmation-request-guardian-bridge.test.ts +31 -29
- package/src/__tests__/consult-deadline.test.ts +60 -0
- package/src/__tests__/contact-store-interaction-info.test.ts +156 -0
- package/src/__tests__/contact-store-user-file.test.ts +7 -10
- package/src/__tests__/contacts-relay-reads.test.ts +19 -24
- package/src/__tests__/contacts-write.test.ts +0 -2
- package/src/__tests__/conversation-abort-tool-results.test.ts +2 -0
- package/src/__tests__/conversation-agent-loop-disk-pressure.test.ts +2 -0
- 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 +134 -0
- package/src/__tests__/conversation-analysis-routes.test.ts +2 -0
- package/src/__tests__/conversation-app-control-lifecycle.test.ts +2 -0
- package/src/__tests__/conversation-attention-telegram.test.ts +9 -11
- package/src/__tests__/conversation-confirmation-signals.test.ts +2 -0
- package/src/__tests__/conversation-fork-crud.test.ts +354 -24
- package/src/__tests__/conversation-history-web-search.test.ts +2 -0
- package/src/__tests__/conversation-load-history-repair.test.ts +2 -0
- package/src/__tests__/conversation-load-history-stripped.test.ts +2 -0
- package/src/__tests__/conversation-pairing.test.ts +2 -0
- package/src/__tests__/conversation-process-app-control-preactivation.test.ts +2 -0
- package/src/__tests__/conversation-process-callsite.test.ts +2 -0
- package/src/__tests__/conversation-provider-retry-repair.test.ts +2 -0
- package/src/__tests__/conversation-queue.test.ts +91 -0
- package/src/__tests__/conversation-routes-guardian-reply.test.ts +14 -0
- package/src/__tests__/conversation-routes-slash-commands.test.ts +14 -0
- package/src/__tests__/conversation-slash-queue.test.ts +2 -0
- package/src/__tests__/conversation-slash-unknown.test.ts +2 -0
- package/src/__tests__/conversation-speed-override.test.ts +2 -0
- package/src/__tests__/conversation-surfaces-task-progress.test.ts +29 -0
- package/src/__tests__/conversation-title-service.test.ts +2 -0
- package/src/__tests__/conversation-tool-setup-attribution.test.ts +47 -0
- package/src/__tests__/conversation-usage.test.ts +2 -0
- package/src/__tests__/conversation-workspace-cache-state.test.ts +2 -0
- package/src/__tests__/conversation-workspace-injection.test.ts +2 -0
- package/src/__tests__/conversation-workspace-tool-tracking.test.ts +2 -0
- package/src/__tests__/credential-security-invariants.test.ts +1 -1
- package/src/__tests__/db-compaction-events-migration.test.ts +129 -0
- package/src/__tests__/db-migration-rollback.test.ts +205 -171
- package/src/__tests__/db-test-helpers.ts +5 -4
- package/src/__tests__/delete-propagation.test.ts +5 -3
- package/src/__tests__/deterministic-verification-control-plane.test.ts +4 -2
- package/src/__tests__/disk-pressure-guard.test.ts +41 -0
- package/src/__tests__/dm-backfill.test.ts +6 -4
- package/src/__tests__/dm-persistence.test.ts +2 -0
- package/src/__tests__/emit-signal-routing-intent.test.ts +7 -6
- package/src/__tests__/events-dev-bypass-actor.test.ts +7 -1
- package/src/__tests__/exploration-drift-hook.test.ts +3 -2
- package/src/__tests__/filing-service.test.ts +2 -0
- package/src/__tests__/guardian-binding-drift-heal.test.ts +104 -19
- package/src/__tests__/guardian-dispatch.test.ts +140 -1
- package/src/__tests__/guardian-expiry-notifier.test.ts +282 -0
- package/src/__tests__/guardian-outbound-http.test.ts +13 -0
- package/src/__tests__/guardian-routing-state.test.ts +6 -10
- package/src/__tests__/heartbeat-disk-pressure.test.ts +2 -0
- package/src/__tests__/heartbeat-service.test.ts +2 -0
- package/src/__tests__/helpers/channel-test-adapter.ts +46 -19
- package/src/__tests__/helpers/create-guardian-binding.ts +15 -23
- package/src/__tests__/helpers/mock-logger.ts +1 -0
- package/src/__tests__/helpers/seed-contact-channel.ts +96 -0
- package/src/__tests__/host-app-control-routes.test.ts +24 -30
- package/src/__tests__/host-bash-routes.test.ts +31 -41
- package/src/__tests__/host-browser-routes.test.ts +26 -32
- package/src/__tests__/host-cu-routes-targeted.test.ts +25 -33
- package/src/__tests__/host-file-routes-targeted.test.ts +40 -52
- package/src/__tests__/host-transfer-routes-targeted.test.ts +31 -43
- package/src/__tests__/http-user-message-parity.test.ts +290 -8
- package/src/__tests__/inbound-invite-redemption.test.ts +115 -10
- package/src/__tests__/inbound-slack-persistence.test.ts +2 -0
- package/src/__tests__/invite-redemption-service.test.ts +471 -53
- package/src/__tests__/invite-routes-http.test.ts +34 -0
- package/src/__tests__/invite-service-ipc.test.ts +65 -2
- package/src/__tests__/llm-context-normalization.test.ts +105 -0
- package/src/__tests__/llm-request-log-error-payload.test.ts +71 -9
- package/src/__tests__/llm-usage-store.test.ts +25 -0
- package/src/__tests__/mcp-config-secret-boundary.test.ts +392 -0
- package/src/__tests__/mcp-health-check.test.ts +2 -1
- package/src/__tests__/media-stream-server-integration.test.ts +127 -0
- package/src/__tests__/memory-retrieval-hook.test.ts +2 -0
- package/src/__tests__/messaging-send-tool.test.ts +2 -0
- package/src/__tests__/migration-import-from-url.test.ts +2 -2
- package/src/__tests__/mtime-cache.test.ts +275 -5
- package/src/__tests__/native-web-search.test.ts +2 -0
- package/src/__tests__/non-member-access-request.test.ts +191 -17
- package/src/__tests__/notification-broadcaster.test.ts +4 -0
- package/src/__tests__/notification-decision-recipient-context.test.ts +33 -32
- package/src/__tests__/notification-deep-link.test.ts +6 -0
- package/src/__tests__/notification-guardian-path.test.ts +19 -0
- package/src/__tests__/onboarding-persona-write.test.ts +52 -22
- package/src/__tests__/openai-provider.test.ts +22 -12
- package/src/__tests__/openai-responses-provider.test.ts +12 -2
- package/src/__tests__/outbound-slack-persistence.test.ts +2 -0
- package/src/__tests__/pending-interactions-resolved-event.test.ts +7 -4
- package/src/__tests__/persist-onboarding-artifacts.test.ts +1 -0
- package/src/__tests__/persistence-secret-redaction.test.ts +2 -0
- package/src/__tests__/persona-resolver.test.ts +75 -45
- package/src/__tests__/plugin-bootstrap.test.ts +21 -83
- package/src/__tests__/plugin-disabled-state.test.ts +190 -0
- package/src/__tests__/plugin-pipeline.test.ts +96 -0
- package/src/__tests__/plugin-route-contribution.test.ts +6 -19
- package/src/__tests__/plugin-tool-contribution.test.ts +5 -20
- package/src/__tests__/plugin-types.test.ts +2 -4
- package/src/__tests__/process-message-background-slack.test.ts +2 -0
- package/src/__tests__/process-message-display-content.test.ts +2 -0
- package/src/__tests__/provider-error-scenarios.test.ts +5 -4
- package/src/__tests__/provider-usage-tracking.test.ts +39 -0
- package/src/__tests__/reaction-intercept-cold-cache-warm.test.ts +135 -0
- package/src/__tests__/reaction-intercept-member-verdict-warm.test.ts +158 -0
- package/src/__tests__/reaction-persistence.test.ts +51 -4
- package/src/__tests__/regenerate-fire-and-forget-trace.test.ts +2 -0
- package/src/__tests__/registry.test.ts +4 -1
- package/src/__tests__/relay-server.test.ts +758 -32
- package/src/__tests__/runtime-attachment-metadata.test.ts +9 -12
- package/src/__tests__/secret-ingress-http.test.ts +14 -0
- package/src/__tests__/send-endpoint-busy.test.ts +30 -8
- package/src/__tests__/settings-routes.test.ts +32 -0
- package/src/__tests__/skills.test.ts +44 -0
- package/src/__tests__/slack-inbound-verification.test.ts +47 -2
- package/src/__tests__/sse-actor-principal-guardian-source.test.ts +79 -0
- package/src/__tests__/steer-on-enqueue-question.test.ts +181 -0
- package/src/__tests__/stt-hints.test.ts +49 -15
- package/src/__tests__/subagent-detail.test.ts +27 -0
- package/src/__tests__/subagent-disposal.test.ts +65 -0
- package/src/__tests__/subagent-fork-prompt-role.test.ts +195 -0
- package/src/__tests__/subagent-fork-spawn.test.ts +6 -7
- package/src/__tests__/subagent-notify-parent.test.ts +2 -0
- package/src/__tests__/subagent-role-registry.test.ts +24 -6
- package/src/__tests__/subagent-spawn-and-await.test.ts +546 -0
- package/src/__tests__/subagent-spawn-tool-fork.test.ts +2 -0
- package/src/__tests__/subagent-tools.test.ts +398 -1
- package/src/__tests__/suggestion-routes.test.ts +2 -0
- package/src/__tests__/thread-backfill.test.ts +3 -3
- package/src/__tests__/title-generate-hook.test.ts +2 -0
- package/src/__tests__/tool-executor-lifecycle-events.test.ts +2 -0
- package/src/__tests__/tool-executor.test.ts +16 -11
- package/src/__tests__/tool-preview-lifecycle.test.ts +2 -0
- package/src/__tests__/tool-result-metadata-plumbing.test.ts +2 -0
- package/src/__tests__/tool-start-timestamp.test.ts +2 -0
- package/src/__tests__/trusted-contact-approval-notifier.test.ts +37 -51
- package/src/__tests__/trusted-contact-inline-approval-integration.test.ts +12 -12
- package/src/__tests__/trusted-contact-lifecycle-notifications.test.ts +9 -7
- package/src/__tests__/trusted-contact-multichannel.test.ts +16 -7
- package/src/__tests__/trusted-contact-verification.test.ts +79 -54
- package/src/__tests__/twilio-routes.test.ts +96 -0
- package/src/__tests__/ui-file-upload-surface.test.ts +86 -0
- package/src/__tests__/verification-control-plane-policy.test.ts +2 -0
- package/src/__tests__/voice-guardian-cold-cache-warm.test.ts +137 -0
- package/src/__tests__/voice-invite-redemption.test.ts +216 -20
- package/src/__tests__/web-search-backend-failure.test.ts +2 -0
- package/src/__tests__/workspace-migration-102-preserve-heartbeat-enabled-for-existing-workspaces.test.ts +3 -3
- package/src/__tests__/workspace-migration-111-prune-seeded-callsite-defaults.test.ts +208 -0
- package/src/__tests__/workspace-migration-112-remove-advisor-callsite-override.test.ts +170 -0
- package/src/__tests__/workspace-migration-drop-user-md.test.ts +196 -238
- package/src/__tests__/workspace-migration-remove-hooks.test.ts +14 -35
- package/src/__tests__/workspace-tool-loader.test.ts +195 -2
- package/src/a2a/__tests__/e2e-a2a-channel.test.ts +35 -47
- package/src/agent/loop-exclusive-tool.test.ts +154 -0
- package/src/agent/loop-native-web-search.test.ts +200 -0
- package/src/agent/loop.ts +164 -1
- package/src/api/constants/sse-replay.ts +41 -0
- package/src/api/events/conversation-notice.ts +26 -0
- package/src/api/index.ts +19 -1
- package/src/api/responses/llm-request-log-entry.ts +29 -0
- package/src/api/responses/subagent-detail.ts +17 -0
- package/src/api/surfaces.ts +39 -3
- package/src/approvals/guardian-channel-delivery.ts +30 -0
- package/src/approvals/guardian-expiry-notifier.ts +148 -0
- package/src/approvals/guardian-request-resolvers.ts +17 -15
- package/src/calls/__tests__/relay-setup-router.test.ts +267 -17
- package/src/calls/call-domain.ts +3 -3
- package/src/calls/guardian-dispatch.ts +14 -9
- package/src/calls/inbound-trust-reader.ts +24 -2
- package/src/calls/media-stream-server.ts +21 -0
- package/src/calls/relay-access-wait.ts +6 -6
- package/src/calls/relay-server.ts +188 -51
- package/src/calls/relay-setup-router.ts +47 -17
- package/src/calls/relay-verification.ts +4 -4
- package/src/calls/stt-hints.ts +9 -12
- package/src/calls/twilio-routes.ts +14 -4
- package/src/channels/types.ts +10 -20
- package/src/cli/commands/__tests__/cache.test.ts +8 -1
- package/src/cli/commands/__tests__/conversations-slack.test.ts +1 -0
- package/src/cli/commands/cache.ts +194 -181
- package/src/cli/commands/contacts.ts +10 -7
- package/src/cli/commands/db/__tests__/repair.test.ts +6 -5
- package/src/cli/commands/db/status.ts +37 -1
- package/src/cli/commands/mcp.ts +252 -218
- package/src/cli/commands/memory/__tests__/worker.test.ts +432 -0
- package/src/cli/commands/memory/index.ts +2 -0
- package/src/cli/commands/memory/worker.ts +242 -0
- package/src/cli/commands/plugins.ts +125 -13
- package/src/cli/lib/__tests__/install-from-github.test.ts +102 -0
- package/src/cli/lib/__tests__/list-installed-plugins.test.ts +160 -1
- package/src/cli/lib/__tests__/publish-plugin.test.ts +404 -0
- package/src/cli/lib/list-installed-plugins.ts +179 -1
- package/src/cli/lib/publish-plugin.ts +633 -0
- package/src/config/__tests__/loader-callsite-strip-fallback.test.ts +143 -0
- package/src/config/__tests__/sync-gated-profiles.test.ts +16 -10
- package/src/config/bundled-skills/contacts/tools/contact-merge.ts +27 -17
- package/src/config/bundled-skills/contacts/tools/contact-search.ts +13 -3
- package/src/config/bundled-skills/subagent/SKILL.md +17 -2
- package/src/config/bundled-skills/subagent/TOOLS.json +5 -4
- package/src/config/call-site-defaults.ts +0 -6
- package/src/config/feature-flag-registry.json +5 -13
- package/src/config/llm-resolver.ts +0 -3
- package/src/config/loader.ts +38 -5
- package/src/config/prune-seeded-callsite-defaults.ts +110 -0
- package/src/config/schemas/__tests__/memory-v3.test.ts +1 -0
- package/src/config/schemas/call-site-catalog.ts +0 -7
- package/src/config/schemas/heartbeat.ts +2 -5
- package/src/config/schemas/llm.ts +3 -12
- package/src/config/schemas/memory-lifecycle.ts +12 -0
- package/src/config/schemas/memory-v3.ts +7 -0
- package/src/config/schemas/memory.ts +4 -0
- package/src/config/schemas/timeouts.ts +8 -0
- package/src/config/seed-inference-profiles.ts +30 -34
- package/src/config/skills.ts +27 -5
- package/src/config/sync-gated-profiles.ts +12 -16
- package/src/contacts/__tests__/contacts-write-revoke-relay.test.ts +128 -0
- package/src/contacts/__tests__/guardian-delivery-reader.test.ts +312 -0
- package/src/contacts/__tests__/member-write-relay.test.ts +226 -0
- package/src/contacts/contact-store.ts +27 -237
- package/src/contacts/contacts-write.ts +18 -55
- package/src/contacts/gateway-channel-read.ts +51 -0
- package/src/contacts/guardian-delivery-reader.ts +223 -0
- package/src/contacts/member-write-relay.ts +183 -0
- package/src/contacts/types.ts +3 -15
- package/src/daemon/__tests__/conversation-tool-setup-exclude.test.ts +35 -0
- package/src/daemon/__tests__/conversation-tool-setup.test.ts +0 -44
- package/src/daemon/assistant-attachments.ts +27 -4
- package/src/daemon/conversation-agent-loop.ts +28 -0
- package/src/daemon/conversation-notices.ts +60 -0
- package/src/daemon/conversation-process.ts +35 -16
- package/src/daemon/conversation-surfaces.ts +111 -38
- package/src/daemon/conversation-tool-setup.ts +71 -30
- package/src/daemon/conversation.ts +23 -1
- package/src/daemon/disk-pressure-guard.ts +12 -2
- package/src/daemon/event-loop-watchdog.ts +28 -1
- package/src/daemon/external-plugins-bootstrap.ts +17 -41
- package/src/daemon/handlers/__tests__/config-a2a-accept.test.ts +0 -1
- package/src/daemon/handlers/__tests__/config-a2a-complete.test.ts +0 -2
- package/src/daemon/handlers/__tests__/config-a2a-redeem.test.ts +25 -2
- package/src/daemon/handlers/__tests__/config-channels.test.ts +220 -0
- package/src/daemon/handlers/config-a2a.ts +6 -14
- package/src/daemon/handlers/config-channels.ts +67 -26
- package/src/daemon/handlers/conversations.ts +77 -0
- package/src/daemon/lifecycle.ts +16 -0
- package/src/daemon/mcp-reload-service.ts +10 -0
- package/src/daemon/memory-v2-startup.test.ts +72 -0
- package/src/daemon/memory-v2-startup.ts +87 -19
- package/src/daemon/message-types/conversations.ts +2 -0
- package/src/daemon/message-types/surfaces.ts +12 -12
- package/src/daemon/server.ts +0 -4
- package/src/daemon/shutdown-handlers.ts +20 -0
- package/src/daemon/tool-setup-types.ts +9 -0
- package/src/heartbeat/heartbeat-service.ts +5 -0
- package/src/home/relationship-state-writer.ts +5 -0
- package/src/hooks/hook-loader.ts +341 -0
- package/src/ipc/__tests__/clients-list-ipc.test.ts +1 -1
- package/src/ipc/assistant-server.ts +2 -2
- package/src/mcp/__tests__/mcp-auth-orchestrator.test.ts +1 -0
- package/src/mcp/client.ts +15 -1
- package/src/mcp/mcp-auth-orchestrator.ts +6 -1
- package/src/mcp/mcp-header-store.ts +134 -0
- package/src/mcp/mcp-oauth-provider.ts +19 -8
- package/src/memory/__tests__/301-create-watchdog-events.test.ts +110 -0
- package/src/memory/__tests__/memory-retrospective-job.test.ts +8 -0
- package/src/memory/__tests__/prompt-override.test.ts +192 -0
- package/src/memory/__tests__/watchdog-events-store.test.ts +161 -0
- package/src/memory/compaction-ledger-store.ts +107 -0
- package/src/memory/conversation-crud.ts +129 -61
- package/src/memory/db-connection.ts +22 -3
- package/src/memory/db-init.ts +37 -503
- package/src/memory/db-singleton.ts +6 -4
- package/src/memory/jobs-worker.ts +104 -0
- package/src/memory/llm-request-log-store.ts +26 -1
- package/src/memory/llm-usage-store.ts +48 -20
- package/src/memory/memory-retrospective-job.ts +14 -8
- package/src/memory/migrations/209-strip-thinking-from-consolidated.ts +152 -56
- package/src/memory/migrations/300-add-processing-started-at.ts +30 -0
- package/src/memory/migrations/301-create-watchdog-events.ts +45 -0
- package/src/memory/migrations/302-create-compaction-events.ts +107 -0
- package/src/memory/migrations/__tests__/209-strip-thinking-from-consolidated.test.ts +297 -0
- package/src/memory/migrations/__tests__/run-migrations.test.ts +2 -2
- package/src/memory/migrations/run-migrations.ts +106 -10
- package/src/memory/migrations/validate-migration-state.ts +105 -67
- package/src/memory/prompt-override.ts +129 -0
- package/src/memory/schema/contacts.ts +6 -2
- package/src/memory/schema/conversations.ts +37 -0
- package/src/memory/schema/infrastructure.ts +20 -0
- package/src/memory/steps.ts +1294 -0
- package/src/memory/v2/__tests__/cli-command-store.test.ts +25 -0
- package/src/memory/v2/__tests__/skill-store.test.ts +80 -0
- package/src/memory/v2/cli-command-store.ts +75 -38
- package/src/memory/v2/prompts/consolidation.ts +13 -82
- package/src/memory/v2/prompts/router.ts +21 -93
- package/src/memory/v2/skill-store.ts +68 -31
- package/src/memory/watchdog-events-store.ts +87 -0
- package/src/memory/worker-control.ts +204 -0
- package/src/memory/worker-process.ts +89 -0
- package/src/messaging/channel-binding-metadata.ts +31 -0
- package/src/messaging/provider-types.ts +8 -0
- package/src/messaging/providers/slack/binding-metadata.ts +60 -0
- package/src/notifications/__tests__/broadcaster.test.ts +8 -8
- package/src/notifications/__tests__/connected-channels.test.ts +86 -0
- package/src/notifications/__tests__/decision-engine.test.ts +78 -9
- package/src/notifications/__tests__/destination-resolver.test.ts +151 -0
- package/src/notifications/broadcaster.ts +8 -1
- package/src/notifications/decision-engine.ts +15 -7
- package/src/notifications/destination-resolver.ts +53 -25
- package/src/notifications/emit-signal.ts +34 -15
- package/src/onboarding/checkin-event.test.ts +222 -0
- package/src/onboarding/checkin-event.ts +321 -0
- package/src/onboarding/schedule-checkin.ts +190 -0
- package/src/permissions/question-prompter.test.ts +1 -1
- package/src/permissions/question-prompter.ts +7 -4
- package/src/plugin-api/index.ts +12 -12
- package/src/plugin-api/types.ts +12 -14
- package/src/plugin-api/vision-support.test.ts +28 -4
- package/src/plugin-api/vision-support.ts +66 -31
- package/src/plugins/defaults/empty-response/hooks/post-model-call.ts +2 -2
- package/src/plugins/defaults/empty-response/hooks/stop.ts +2 -2
- package/src/plugins/defaults/exploration-drift/hooks/post-tool-use.ts +4 -3
- package/src/plugins/defaults/history-repair/hooks/post-model-call.ts +2 -2
- package/src/plugins/defaults/history-repair/hooks/stop.ts +2 -2
- package/src/plugins/defaults/history-repair/hooks/user-prompt-submit.ts +2 -2
- package/src/plugins/defaults/image-fallback/__tests__/image-fallback.test.ts +47 -7
- package/src/plugins/defaults/image-fallback/hooks/post-tool-use.ts +12 -13
- package/src/plugins/defaults/image-fallback/hooks/user-prompt-submit.ts +14 -22
- package/src/plugins/defaults/image-fallback/src/caption-blocks.ts +42 -11
- package/src/plugins/defaults/image-recovery/hooks/post-model-call.ts +2 -2
- package/src/plugins/defaults/image-recovery/hooks/stop.ts +2 -2
- package/src/plugins/defaults/index.ts +0 -35
- package/src/plugins/defaults/max-tokens-continue/hooks/post-model-call.ts +2 -2
- package/src/plugins/defaults/max-tokens-continue/hooks/stop.ts +2 -2
- package/src/plugins/defaults/memory-retrieval/hooks/post-compact.ts +2 -2
- package/src/plugins/defaults/memory-retrieval/hooks/user-prompt-submit.ts +2 -2
- package/src/plugins/defaults/memory-v3-shadow/__tests__/injection.test.ts +33 -3
- package/src/plugins/defaults/memory-v3-shadow/__tests__/pool-select.test.ts +48 -4
- package/src/plugins/defaults/memory-v3-shadow/__tests__/shadow-plugin.test.ts +4 -8
- package/src/plugins/defaults/memory-v3-shadow/hooks/post-compact.ts +2 -2
- package/src/plugins/defaults/memory-v3-shadow/hooks/user-prompt-submit.ts +2 -2
- package/src/plugins/defaults/memory-v3-shadow/injector.ts +43 -15
- package/src/plugins/defaults/memory-v3-shadow/orchestrate.ts +11 -2
- package/src/plugins/defaults/memory-v3-shadow/pool-select.test.ts +146 -0
- package/src/plugins/defaults/memory-v3-shadow/pool-select.ts +77 -13
- package/src/plugins/defaults/memory-v3-shadow/shadow-plugin.ts +12 -11
- package/src/plugins/defaults/surface-completion-nudge/hooks/post-model-call.ts +2 -2
- package/src/plugins/defaults/surface-completion-nudge/hooks/stop.ts +2 -2
- package/src/plugins/defaults/task-progress-nudge/hooks/post-tool-use.ts +2 -2
- package/src/plugins/defaults/title-generate/hooks/stop.ts +2 -2
- package/src/plugins/defaults/title-generate/hooks/user-prompt-submit.ts +2 -2
- package/src/plugins/defaults/tool-error/hooks/post-tool-use.ts +2 -2
- package/src/plugins/defaults/tool-result-truncate/hooks/post-tool-use.ts +2 -2
- package/src/plugins/disabled-state.ts +31 -0
- package/src/plugins/external-plugin-loader.ts +2 -2
- package/src/plugins/mtime-cache.ts +186 -330
- package/src/plugins/pipeline.ts +111 -13
- package/src/plugins/registry.ts +59 -16
- package/src/plugins/surface-import.ts +121 -0
- package/src/plugins/types.ts +7 -9
- package/src/prompts/persona-resolver.ts +43 -11
- package/src/providers/anthropic/client.ts +5 -0
- package/src/providers/call-site-routing.ts +45 -0
- package/src/providers/model-catalog.ts +16 -0
- package/src/providers/openai/__tests__/api-error-normalization.test.ts +321 -0
- package/src/providers/openai/api-error-normalization.ts +270 -0
- package/src/providers/openai/chat-completions-provider.ts +37 -83
- package/src/providers/openai/responses-provider.ts +50 -46
- package/src/providers/openrouter/client.ts +5 -0
- package/src/providers/provider-send-message.ts +10 -0
- package/src/providers/ratelimit.ts +10 -0
- package/src/providers/registry.ts +1 -1
- package/src/providers/retry.ts +10 -0
- package/src/providers/types.ts +22 -0
- package/src/providers/usage-tracking.ts +10 -0
- package/src/runtime/__tests__/channel-verification-service.test.ts +133 -0
- package/src/runtime/__tests__/guardian-vellum-migration.test.ts +184 -0
- package/src/runtime/__tests__/is-guardian-bound-for-channel.test.ts +66 -0
- package/src/runtime/__tests__/local-principal-trust.test.ts +162 -0
- package/src/runtime/__tests__/member-verdict-cache.test.ts +119 -0
- package/src/runtime/__tests__/trust-verdict-consumer.test.ts +402 -123
- package/src/runtime/access-request-helper.ts +18 -39
- package/src/runtime/actor-trust-resolver.ts +46 -19
- package/src/runtime/anchored-guardian.test.ts +109 -0
- package/src/runtime/anchored-guardian.ts +86 -0
- package/src/runtime/assistant-event-hub.ts +1 -1
- package/src/runtime/assistant-stream-state.ts +9 -2
- package/src/runtime/auth/__tests__/require-bound-guardian.test.ts +99 -0
- package/src/runtime/auth/require-bound-guardian.ts +21 -11
- package/src/runtime/channel-verification-service.ts +56 -31
- package/src/runtime/confirmation-request-guardian-bridge.ts +3 -3
- package/src/runtime/guardian-vellum-migration.ts +69 -8
- package/src/runtime/invite-redemption-service.ts +213 -187
- package/src/runtime/local-actor-identity.test.ts +108 -0
- package/src/runtime/local-actor-identity.ts +85 -13
- package/src/runtime/local-principal-trust.ts +52 -0
- package/src/runtime/member-verdict-cache.ts +0 -0
- package/src/runtime/pending-interactions.ts +11 -1
- package/src/runtime/routes/__tests__/channel-verification-revoke.test.ts +56 -5
- package/src/runtime/routes/__tests__/channel-verification-routes.test.ts +1 -1
- package/src/runtime/routes/__tests__/contact-routes.test.ts +305 -0
- package/src/runtime/routes/__tests__/global-search-routes.test.ts +92 -0
- package/src/runtime/routes/__tests__/http-adapter-actor-header.test.ts +129 -0
- package/src/runtime/routes/__tests__/surface-action-routes.test.ts +188 -0
- package/src/runtime/routes/browser-routes.ts +1 -1
- package/src/runtime/routes/canonical-guardian-expiry-sweep.ts +13 -5
- package/src/runtime/routes/channel-verification-routes.ts +3 -3
- package/src/runtime/routes/contact-routes.ts +48 -57
- package/src/runtime/routes/conversation-cli-routes.ts +4 -5
- package/src/runtime/routes/conversation-list-routes.ts +4 -7
- package/src/runtime/routes/conversation-query-routes.ts +72 -0
- package/src/runtime/routes/conversation-routes.ts +84 -85
- package/src/runtime/routes/events-routes.ts +2 -2
- package/src/runtime/routes/global-search-routes.ts +3 -1
- package/src/runtime/routes/guardian-action-routes.ts +4 -5
- package/src/runtime/routes/host-app-control-routes.ts +5 -4
- package/src/runtime/routes/host-bash-routes.ts +5 -4
- package/src/runtime/routes/host-browser-routes.ts +9 -11
- package/src/runtime/routes/host-cu-routes.ts +5 -4
- package/src/runtime/routes/host-file-routes.ts +5 -4
- package/src/runtime/routes/host-transfer-routes.ts +6 -6
- package/src/runtime/routes/http-adapter.ts +16 -1
- package/src/runtime/routes/identity-routes.ts +3 -2
- package/src/runtime/routes/inbound-message-handler.ts +5 -5
- package/src/runtime/routes/inbound-stages/acl-enforcement.test.ts +97 -5
- package/src/runtime/routes/inbound-stages/acl-enforcement.ts +61 -59
- package/src/runtime/routes/inbound-stages/background-dispatch.ts +13 -5
- package/src/runtime/routes/inbound-stages/escalation-intercept.ts +7 -7
- package/src/runtime/routes/inbound-stages/guardian-activation-intercept.test.ts +21 -8
- package/src/runtime/routes/inbound-stages/guardian-activation-intercept.ts +14 -3
- package/src/runtime/routes/inbound-stages/reaction-intercept.ts +19 -0
- package/src/runtime/routes/index.ts +2 -0
- package/src/runtime/routes/llm-context-normalization.ts +83 -0
- package/src/runtime/routes/mcp-auth-routes.ts +171 -19
- package/src/runtime/routes/migration-rollback-routes.ts +4 -3
- package/src/runtime/routes/migration-routes.ts +4 -1
- package/src/runtime/routes/onboarding-checkin-routes.ts +86 -0
- package/src/runtime/routes/settings-routes.ts +8 -3
- package/src/runtime/routes/subagents-routes.ts +5 -0
- package/src/runtime/routes/surface-action-routes.ts +42 -56
- package/src/runtime/services/__tests__/conversation-serializer.test.ts +1 -0
- package/src/runtime/services/conversation-serializer.ts +13 -58
- package/src/runtime/tool-grant-request-helper.ts +3 -3
- package/src/runtime/trust-verdict-consumer.ts +111 -40
- package/src/runtime/verification-outbound-actions.ts +18 -18
- package/src/signals/user-message.ts +16 -0
- package/src/subagent/__tests__/consult-prompt.test.ts +35 -0
- package/src/{plugins/defaults/advisor/__tests__/transcript.test.ts → subagent/__tests__/consult-transcript.test.ts} +47 -10
- package/src/{plugins/defaults/advisor/steering.ts → subagent/consult-prompt.ts} +22 -32
- package/src/{plugins/defaults/advisor/transcript.ts → subagent/consult-transcript.ts} +18 -8
- package/src/subagent/index.ts +1 -1
- package/src/subagent/manager.ts +254 -33
- package/src/subagent/types.ts +11 -4
- package/src/telemetry/types.ts +34 -1
- package/src/telemetry/usage-telemetry-reporter.test.ts +3 -2
- package/src/telemetry/usage-telemetry-reporter.ts +87 -3
- package/src/tools/ask-question/ask-question-tool.test.ts +29 -0
- package/src/tools/ask-question/ask-question-tool.ts +13 -0
- package/src/tools/executor.ts +4 -4
- package/src/tools/filesystem/search.ts +543 -0
- package/src/tools/registry.ts +38 -0
- package/src/tools/shared/filesystem/path-policy.ts +12 -5
- package/src/tools/subagent/consult-deadline.ts +49 -0
- package/src/tools/subagent/spawn.ts +234 -5
- package/src/tools/tool-approval-handler.ts +1 -1
- package/src/tools/tool-defaults.ts +9 -2
- package/src/tools/tool-manifest.ts +3 -0
- package/src/tools/types.ts +131 -25
- package/src/tools/workspace-tools/loader.ts +348 -244
- package/src/util/errors.ts +26 -1
- package/src/util/logger.ts +9 -0
- package/src/util/platform.ts +19 -0
- package/src/util/telemetry-db-path.ts +24 -0
- package/src/workflows/library.test.ts +140 -0
- package/src/workflows/library.ts +82 -28
- package/src/workspace/migrations/017-seed-persona-dirs.ts +3 -34
- package/src/workspace/migrations/019-scope-journal-to-guardian.ts +3 -24
- package/src/workspace/migrations/031-drop-user-md.ts +232 -148
- package/src/workspace/migrations/048-remove-workspace-hooks.ts +14 -66
- package/src/workspace/migrations/111-prune-seeded-callsite-defaults.ts +134 -0
- package/src/workspace/migrations/112-remove-advisor-callsite-override.ts +64 -0
- package/src/workspace/migrations/registry.ts +4 -0
- package/src/__tests__/workspace-tools-watcher-flag.test.ts +0 -70
- package/src/daemon/workspace-tools-watcher.ts +0 -328
- package/src/memory/migrations/registry.ts +0 -573
- package/src/plugins/defaults/advisor/__tests__/advisor-gate.test.ts +0 -56
- package/src/plugins/defaults/advisor/__tests__/advisor-state-store.test.ts +0 -43
- package/src/plugins/defaults/advisor/__tests__/agent-loop-integration.test.ts +0 -137
- package/src/plugins/defaults/advisor/__tests__/consult.test.ts +0 -153
- package/src/plugins/defaults/advisor/__tests__/hooks.test.ts +0 -138
- package/src/plugins/defaults/advisor/advisor-gate.ts +0 -29
- package/src/plugins/defaults/advisor/advisor-state-store.ts +0 -94
- package/src/plugins/defaults/advisor/config.ts +0 -21
- package/src/plugins/defaults/advisor/consult.ts +0 -93
- package/src/plugins/defaults/advisor/hooks/post-model-call.ts +0 -34
- package/src/plugins/defaults/advisor/hooks/pre-model-call.ts +0 -30
- package/src/plugins/defaults/advisor/hooks/user-prompt-submit.ts +0 -19
- package/src/plugins/defaults/advisor/package.json +0 -14
- package/src/plugins/defaults/advisor/tools/advisor.ts +0 -65
- package/src/providers/openai/__tests__/api-error-detail.test.ts +0 -120
|
@@ -21,10 +21,18 @@ import { reloadMcpServers } from "../../daemon/mcp-reload-service.js";
|
|
|
21
21
|
import { McpClient } from "../../mcp/client.js";
|
|
22
22
|
import { orchestrateMcpOAuthConnect } from "../../mcp/mcp-auth-orchestrator.js";
|
|
23
23
|
import { getMcpAuthState } from "../../mcp/mcp-auth-state.js";
|
|
24
|
-
import {
|
|
24
|
+
import {
|
|
25
|
+
deleteMcpHeaders,
|
|
26
|
+
getMcpHeaders,
|
|
27
|
+
setMcpHeaders,
|
|
28
|
+
} from "../../mcp/mcp-header-store.js";
|
|
29
|
+
import {
|
|
30
|
+
deleteMcpOAuthCredentials,
|
|
31
|
+
hasMcpOAuthTokens,
|
|
32
|
+
} from "../../mcp/mcp-oauth-provider.js";
|
|
25
33
|
import { getMcpToolsByServer } from "../../tools/registry.js";
|
|
26
34
|
import { getLogger } from "../../util/logger.js";
|
|
27
|
-
import { ACTOR_PRINCIPALS
|
|
35
|
+
import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
|
|
28
36
|
import { BadRequestError, InternalError, NotFoundError } from "./errors.js";
|
|
29
37
|
import type { RouteDefinition } from "./types.js";
|
|
30
38
|
|
|
@@ -170,13 +178,23 @@ async function checkMachineReadableHealth(
|
|
|
170
178
|
interface McpServerEntry {
|
|
171
179
|
id: string;
|
|
172
180
|
status: string;
|
|
173
|
-
transport: McpServerConfig["transport"];
|
|
181
|
+
transport: Omit<McpServerConfig["transport"], "headers"> & { type: string };
|
|
174
182
|
enabled: boolean;
|
|
175
183
|
defaultRiskLevel: string;
|
|
184
|
+
hasOAuth: boolean;
|
|
185
|
+
hasStaticAuth: boolean;
|
|
186
|
+
authType: "none" | "bearer" | "api-key";
|
|
187
|
+
authHeaderName?: string;
|
|
176
188
|
allowedTools?: string[];
|
|
177
189
|
blockedTools?: string[];
|
|
178
190
|
}
|
|
179
191
|
|
|
192
|
+
function detectAuthType(headers: Record<string, string>): "bearer" | "api-key" {
|
|
193
|
+
const authValue = headers["Authorization"] ?? headers["authorization"];
|
|
194
|
+
if (authValue?.startsWith("Bearer ")) return "bearer";
|
|
195
|
+
return "api-key";
|
|
196
|
+
}
|
|
197
|
+
|
|
180
198
|
async function handleMcpList(_args: {
|
|
181
199
|
body?: Record<string, unknown>;
|
|
182
200
|
}): Promise<{ servers: McpServerEntry[] }> {
|
|
@@ -196,12 +214,45 @@ async function handleMcpList(_args: {
|
|
|
196
214
|
} else {
|
|
197
215
|
status = await checkMachineReadableHealth(id, config);
|
|
198
216
|
}
|
|
217
|
+
const hasOAuth =
|
|
218
|
+
config.transport.type !== "stdio"
|
|
219
|
+
? await hasMcpOAuthTokens(id)
|
|
220
|
+
: false;
|
|
221
|
+
|
|
222
|
+
// Check credential store for stored static auth headers
|
|
223
|
+
const storedHeaders = await getMcpHeaders(id);
|
|
224
|
+
// Also check legacy config-level headers
|
|
225
|
+
const configHeaders =
|
|
226
|
+
config.transport.type !== "stdio"
|
|
227
|
+
? config.transport.headers
|
|
228
|
+
: undefined;
|
|
229
|
+
const effectiveHeaders = storedHeaders ?? configHeaders;
|
|
230
|
+
const hasStaticAuth =
|
|
231
|
+
!!effectiveHeaders && Object.keys(effectiveHeaders).length > 0;
|
|
232
|
+
const authType: "none" | "bearer" | "api-key" = hasStaticAuth
|
|
233
|
+
? detectAuthType(effectiveHeaders!)
|
|
234
|
+
: "none";
|
|
235
|
+
const authHeaderName =
|
|
236
|
+
authType === "api-key" && effectiveHeaders
|
|
237
|
+
? Object.keys(effectiveHeaders).find(
|
|
238
|
+
(k) => k.toLowerCase() !== "authorization",
|
|
239
|
+
)
|
|
240
|
+
: undefined;
|
|
241
|
+
|
|
242
|
+
// Strip headers from transport — never return secrets
|
|
243
|
+
const { headers: _stripped, ...safeTransport } =
|
|
244
|
+
config.transport as Record<string, unknown>;
|
|
245
|
+
|
|
199
246
|
return {
|
|
200
247
|
id,
|
|
201
248
|
status,
|
|
202
|
-
transport:
|
|
249
|
+
transport: safeTransport as McpServerEntry["transport"],
|
|
203
250
|
enabled,
|
|
204
251
|
defaultRiskLevel: config.defaultRiskLevel ?? "high",
|
|
252
|
+
hasOAuth,
|
|
253
|
+
hasStaticAuth,
|
|
254
|
+
authType,
|
|
255
|
+
...(authHeaderName && { authHeaderName }),
|
|
205
256
|
...(config.allowedTools && { allowedTools: config.allowedTools }),
|
|
206
257
|
...(config.blockedTools && { blockedTools: config.blockedTools }),
|
|
207
258
|
};
|
|
@@ -281,6 +332,7 @@ async function handleMcpUpdate({
|
|
|
281
332
|
maxTools,
|
|
282
333
|
allowedTools,
|
|
283
334
|
blockedTools,
|
|
335
|
+
headers,
|
|
284
336
|
} = body as {
|
|
285
337
|
name: string;
|
|
286
338
|
enabled?: boolean;
|
|
@@ -288,6 +340,7 @@ async function handleMcpUpdate({
|
|
|
288
340
|
maxTools?: number;
|
|
289
341
|
allowedTools?: string[] | null;
|
|
290
342
|
blockedTools?: string[] | null;
|
|
343
|
+
headers?: Record<string, string> | null;
|
|
291
344
|
};
|
|
292
345
|
|
|
293
346
|
const raw = loadRawConfig();
|
|
@@ -326,6 +379,33 @@ async function handleMcpUpdate({
|
|
|
326
379
|
server.blockedTools = blockedTools;
|
|
327
380
|
}
|
|
328
381
|
}
|
|
382
|
+
if (headers !== undefined) {
|
|
383
|
+
const transport = server.transport as Record<string, unknown> | undefined;
|
|
384
|
+
if (
|
|
385
|
+
transport &&
|
|
386
|
+
(transport.type === "sse" || transport.type === "streamable-http")
|
|
387
|
+
) {
|
|
388
|
+
// Migrate any legacy config-level headers away
|
|
389
|
+
delete transport.headers;
|
|
390
|
+
|
|
391
|
+
// Store in credential store (or delete if clearing)
|
|
392
|
+
if (headers === null || Object.keys(headers).length === 0) {
|
|
393
|
+
const ok = await deleteMcpHeaders(name);
|
|
394
|
+
if (!ok) {
|
|
395
|
+
throw new InternalError(
|
|
396
|
+
"Failed to clear auth headers from credential store",
|
|
397
|
+
);
|
|
398
|
+
}
|
|
399
|
+
} else {
|
|
400
|
+
const ok = await setMcpHeaders(name, headers);
|
|
401
|
+
if (!ok) {
|
|
402
|
+
throw new InternalError(
|
|
403
|
+
"Failed to persist auth headers to credential store",
|
|
404
|
+
);
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
}
|
|
329
409
|
|
|
330
410
|
saveRawConfig(raw);
|
|
331
411
|
triggerReload("internal_mcp_update");
|
|
@@ -342,15 +422,17 @@ async function handleMcpAdd({
|
|
|
342
422
|
}: {
|
|
343
423
|
body?: Record<string, unknown>;
|
|
344
424
|
}): Promise<{ added: true }> {
|
|
345
|
-
const { name, transportType, url, command, args, risk, disabled } =
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
425
|
+
const { name, transportType, url, command, args, risk, disabled, headers } =
|
|
426
|
+
body as {
|
|
427
|
+
name: string;
|
|
428
|
+
transportType: string;
|
|
429
|
+
url?: string;
|
|
430
|
+
command?: string;
|
|
431
|
+
args?: string[];
|
|
432
|
+
risk?: string;
|
|
433
|
+
disabled?: boolean;
|
|
434
|
+
headers?: Record<string, string>;
|
|
435
|
+
};
|
|
354
436
|
|
|
355
437
|
const riskLevel = risk ?? "high";
|
|
356
438
|
if (!["low", "medium", "high"].includes(riskLevel)) {
|
|
@@ -400,12 +482,60 @@ async function handleMcpAdd({
|
|
|
400
482
|
defaultRiskLevel: riskLevel,
|
|
401
483
|
};
|
|
402
484
|
|
|
485
|
+
// Store auth headers in credential store, not config
|
|
486
|
+
if (headers && Object.keys(headers).length > 0) {
|
|
487
|
+
const ok = await setMcpHeaders(name, headers);
|
|
488
|
+
if (!ok) {
|
|
489
|
+
throw new InternalError(
|
|
490
|
+
"Failed to persist auth headers to credential store",
|
|
491
|
+
);
|
|
492
|
+
}
|
|
493
|
+
}
|
|
494
|
+
|
|
403
495
|
saveRawConfig(raw);
|
|
404
496
|
triggerReload("internal_mcp_add");
|
|
405
497
|
|
|
406
498
|
return { added: true };
|
|
407
499
|
}
|
|
408
500
|
|
|
501
|
+
// ---------------------------------------------------------------------------
|
|
502
|
+
// Revoke OAuth
|
|
503
|
+
// ---------------------------------------------------------------------------
|
|
504
|
+
|
|
505
|
+
async function handleMcpAuthRevoke({
|
|
506
|
+
body,
|
|
507
|
+
}: {
|
|
508
|
+
body?: Record<string, unknown>;
|
|
509
|
+
}): Promise<{ revoked: true }> {
|
|
510
|
+
const { serverId } = body as { serverId: string };
|
|
511
|
+
|
|
512
|
+
const raw = loadRawConfig();
|
|
513
|
+
const servers = (raw.mcp as Partial<McpConfig> | undefined)?.servers ?? {};
|
|
514
|
+
const serverConfig = servers[serverId];
|
|
515
|
+
|
|
516
|
+
if (!serverConfig) {
|
|
517
|
+
throw new NotFoundError(`MCP server "${serverId}" not found`);
|
|
518
|
+
}
|
|
519
|
+
|
|
520
|
+
let result: { ok: boolean; failedKeys: string[] };
|
|
521
|
+
try {
|
|
522
|
+
result = await deleteMcpOAuthCredentials(serverId);
|
|
523
|
+
} catch (err) {
|
|
524
|
+
throw new InternalError(
|
|
525
|
+
`Failed to revoke OAuth credentials: ${err instanceof Error ? err.message : String(err)}`,
|
|
526
|
+
);
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
if (!result.ok) {
|
|
530
|
+
throw new InternalError(
|
|
531
|
+
`Failed to delete OAuth credentials for keys: ${result.failedKeys.join(", ")}`,
|
|
532
|
+
);
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
triggerReload("internal_mcp_auth_revoke");
|
|
536
|
+
return { revoked: true };
|
|
537
|
+
}
|
|
538
|
+
|
|
409
539
|
// ---------------------------------------------------------------------------
|
|
410
540
|
// Remove
|
|
411
541
|
// ---------------------------------------------------------------------------
|
|
@@ -425,14 +555,17 @@ async function handleMcpRemove({
|
|
|
425
555
|
throw new NotFoundError(`MCP server "${name}" not found.`);
|
|
426
556
|
}
|
|
427
557
|
|
|
428
|
-
// Best-effort cleanup of
|
|
558
|
+
// Best-effort cleanup of credentials stored for this server
|
|
429
559
|
const serverConfig = serverMap[name] as Record<string, unknown>;
|
|
430
560
|
const transport = serverConfig?.transport as
|
|
431
561
|
| Record<string, unknown>
|
|
432
562
|
| undefined;
|
|
433
563
|
if (transport?.type === "sse" || transport?.type === "streamable-http") {
|
|
434
564
|
try {
|
|
435
|
-
await
|
|
565
|
+
await Promise.all([
|
|
566
|
+
deleteMcpOAuthCredentials(name),
|
|
567
|
+
deleteMcpHeaders(name),
|
|
568
|
+
]);
|
|
436
569
|
} catch {
|
|
437
570
|
// Ignore — credentials may not exist
|
|
438
571
|
}
|
|
@@ -455,8 +588,8 @@ export const ROUTES: RouteDefinition[] = [
|
|
|
455
588
|
endpoint: "internal/mcp/auth/start",
|
|
456
589
|
method: "POST",
|
|
457
590
|
policy: {
|
|
458
|
-
requiredScopes: ["
|
|
459
|
-
allowedPrincipalTypes:
|
|
591
|
+
requiredScopes: ["settings.write"],
|
|
592
|
+
allowedPrincipalTypes: ACTOR_PRINCIPALS,
|
|
460
593
|
},
|
|
461
594
|
summary: "Start MCP OAuth flow",
|
|
462
595
|
description:
|
|
@@ -470,8 +603,8 @@ export const ROUTES: RouteDefinition[] = [
|
|
|
470
603
|
endpoint: "internal/mcp/auth/status/:serverId",
|
|
471
604
|
method: "GET",
|
|
472
605
|
policy: {
|
|
473
|
-
requiredScopes: ["
|
|
474
|
-
allowedPrincipalTypes:
|
|
606
|
+
requiredScopes: ["settings.read"],
|
|
607
|
+
allowedPrincipalTypes: ACTOR_PRINCIPALS,
|
|
475
608
|
},
|
|
476
609
|
summary: "Poll MCP OAuth flow status",
|
|
477
610
|
description:
|
|
@@ -521,6 +654,7 @@ export const ROUTES: RouteDefinition[] = [
|
|
|
521
654
|
.passthrough(),
|
|
522
655
|
enabled: z.boolean(),
|
|
523
656
|
defaultRiskLevel: z.string(),
|
|
657
|
+
hasOAuth: z.boolean(),
|
|
524
658
|
allowedTools: z.array(z.string()).optional(),
|
|
525
659
|
blockedTools: z.array(z.string()).optional(),
|
|
526
660
|
}),
|
|
@@ -579,6 +713,7 @@ export const ROUTES: RouteDefinition[] = [
|
|
|
579
713
|
maxTools: z.number().optional(),
|
|
580
714
|
allowedTools: z.array(z.string()).nullable().optional(),
|
|
581
715
|
blockedTools: z.array(z.string()).nullable().optional(),
|
|
716
|
+
headers: z.record(z.string(), z.string()).nullable().optional(),
|
|
582
717
|
}),
|
|
583
718
|
handler: handleMcpUpdate,
|
|
584
719
|
},
|
|
@@ -602,9 +737,26 @@ export const ROUTES: RouteDefinition[] = [
|
|
|
602
737
|
args: z.array(z.string()).optional(),
|
|
603
738
|
risk: z.string().optional(),
|
|
604
739
|
disabled: z.boolean().optional(),
|
|
740
|
+
headers: z.record(z.string(), z.string()).optional(),
|
|
605
741
|
}),
|
|
606
742
|
handler: handleMcpAdd,
|
|
607
743
|
},
|
|
744
|
+
{
|
|
745
|
+
operationId: "internal_mcp_auth_revoke",
|
|
746
|
+
endpoint: "internal/mcp/auth/revoke",
|
|
747
|
+
method: "POST",
|
|
748
|
+
policy: {
|
|
749
|
+
requiredScopes: ["settings.write"],
|
|
750
|
+
allowedPrincipalTypes: ACTOR_PRINCIPALS,
|
|
751
|
+
},
|
|
752
|
+
summary: "Revoke MCP OAuth credentials",
|
|
753
|
+
description:
|
|
754
|
+
"Deletes stored OAuth tokens for an MCP server and triggers a reload.",
|
|
755
|
+
tags: ["internal"],
|
|
756
|
+
requestBody: z.object({ serverId: z.string() }),
|
|
757
|
+
responseBody: z.object({ revoked: z.boolean() }),
|
|
758
|
+
handler: handleMcpAuthRevoke,
|
|
759
|
+
},
|
|
608
760
|
{
|
|
609
761
|
operationId: "internal_mcp_remove",
|
|
610
762
|
endpoint: "internal/mcp/remove",
|
|
@@ -10,8 +10,9 @@
|
|
|
10
10
|
import { z } from "zod";
|
|
11
11
|
|
|
12
12
|
import { getDb } from "../../memory/db-connection.js";
|
|
13
|
-
import {
|
|
13
|
+
import { getMaxRollbackVersion } from "../../memory/migrations/run-migrations.js";
|
|
14
14
|
import { rollbackMemoryMigration } from "../../memory/migrations/validate-migration-state.js";
|
|
15
|
+
import { migrationSteps } from "../../memory/steps.js";
|
|
15
16
|
import { getWorkspaceDir } from "../../util/platform.js";
|
|
16
17
|
import { WORKSPACE_MIGRATIONS } from "../../workspace/migrations/registry.js";
|
|
17
18
|
import {
|
|
@@ -43,7 +44,7 @@ async function handleRollbackMigrations({ body = {} }: RouteHandlerArgs) {
|
|
|
43
44
|
|
|
44
45
|
if (rollbackToRegistryCeiling === true) {
|
|
45
46
|
if (effectiveDbVersion === undefined)
|
|
46
|
-
effectiveDbVersion =
|
|
47
|
+
effectiveDbVersion = getMaxRollbackVersion(migrationSteps);
|
|
47
48
|
if (effectiveWorkspaceMigrationId === undefined)
|
|
48
49
|
effectiveWorkspaceMigrationId =
|
|
49
50
|
getLastWorkspaceMigrationId(WORKSPACE_MIGRATIONS) ?? undefined;
|
|
@@ -104,7 +105,7 @@ async function handleRollbackMigrations({ body = {} }: RouteHandlerArgs) {
|
|
|
104
105
|
// Roll back DB migrations if requested.
|
|
105
106
|
if (effectiveDbVersion !== undefined) {
|
|
106
107
|
try {
|
|
107
|
-
rolledBack.db = rollbackMemoryMigration(getDb(), effectiveDbVersion);
|
|
108
|
+
rolledBack.db = rollbackMemoryMigration(getDb(), effectiveDbVersion, migrationSteps);
|
|
108
109
|
} catch (err) {
|
|
109
110
|
const detail = err instanceof Error ? err.message : "Unknown error";
|
|
110
111
|
throw new InternalError(`DB migration rollback failed: ${detail}`);
|
|
@@ -28,9 +28,11 @@ import {
|
|
|
28
28
|
getDb,
|
|
29
29
|
getLogsSqlite,
|
|
30
30
|
getMemorySqlite,
|
|
31
|
+
getTelemetrySqlite,
|
|
31
32
|
resetDb,
|
|
32
33
|
} from "../../memory/db-connection.js";
|
|
33
34
|
import { validateMigrationState } from "../../memory/migrations/validate-migration-state.js";
|
|
35
|
+
import { migrationSteps } from "../../memory/steps.js";
|
|
34
36
|
import { credentialKey } from "../../security/credential-key.js";
|
|
35
37
|
import {
|
|
36
38
|
bulkSetSecureKeysAsync,
|
|
@@ -180,6 +182,7 @@ async function checkpointDbsForExport(): Promise<void> {
|
|
|
180
182
|
for (const [label, sqlite] of [
|
|
181
183
|
["logs", getLogsSqlite()],
|
|
182
184
|
["memory", getMemorySqlite()],
|
|
185
|
+
["telemetry", getTelemetrySqlite()],
|
|
183
186
|
] as const) {
|
|
184
187
|
if (!sqlite) {
|
|
185
188
|
log.warn(
|
|
@@ -1712,7 +1715,7 @@ function appendNewerMigrationWarningsIfAny(report: ImportCommitReport): void {
|
|
|
1712
1715
|
return;
|
|
1713
1716
|
}
|
|
1714
1717
|
try {
|
|
1715
|
-
const migrationValidation = validateMigrationState(getDb());
|
|
1718
|
+
const migrationValidation = validateMigrationState(getDb(), migrationSteps);
|
|
1716
1719
|
if (migrationValidation.unknownCheckpoints.length > 0) {
|
|
1717
1720
|
report.warnings.push(
|
|
1718
1721
|
`Imported data contains ${migrationValidation.unknownCheckpoints.length} migration(s) from a newer version. Some data may not be fully compatible.`,
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Route for programmatically scheduling the onboarding "Day 2 Check-in".
|
|
3
|
+
*
|
|
4
|
+
* POST /v1/onboarding/checkin — resolve the user's Google Calendar, find the
|
|
5
|
+
* first open 15-minute slot tomorrow afternoon, and book the check-in event.
|
|
6
|
+
*
|
|
7
|
+
* Called by the web `/onboarding/research` flow the moment Google Calendar
|
|
8
|
+
* OAuth lands. Best-effort by contract: a missing/insufficient calendar
|
|
9
|
+
* connection returns `{ scheduled: false }` rather than an error.
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
import { z } from "zod";
|
|
13
|
+
|
|
14
|
+
import { scheduleOnboardingCheckin } from "../../onboarding/schedule-checkin.js";
|
|
15
|
+
import { getLogger } from "../../util/logger.js";
|
|
16
|
+
import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
|
|
17
|
+
import { BadRequestError } from "./errors.js";
|
|
18
|
+
import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
|
|
19
|
+
|
|
20
|
+
const log = getLogger("onboarding-checkin-routes");
|
|
21
|
+
|
|
22
|
+
function asOptionalString(value: unknown, field: string): string | undefined {
|
|
23
|
+
if (value === undefined || value === null) return undefined;
|
|
24
|
+
if (typeof value !== "string") {
|
|
25
|
+
throw new BadRequestError(`${field} must be a string`);
|
|
26
|
+
}
|
|
27
|
+
const trimmed = value.trim();
|
|
28
|
+
return trimmed.length > 0 ? trimmed : undefined;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
async function handleScheduleOnboardingCheckin({
|
|
32
|
+
body = {},
|
|
33
|
+
}: RouteHandlerArgs) {
|
|
34
|
+
// The shared route adapter does not runtime-validate the body against the
|
|
35
|
+
// Zod requestBody (codegen-only), so guard types before use.
|
|
36
|
+
const userName = asOptionalString(body.userName, "userName");
|
|
37
|
+
const assistantName = asOptionalString(body.assistantName, "assistantName");
|
|
38
|
+
const timeZone = asOptionalString(body.timezone, "timezone");
|
|
39
|
+
|
|
40
|
+
const result = await scheduleOnboardingCheckin({
|
|
41
|
+
userName,
|
|
42
|
+
assistantName,
|
|
43
|
+
timeZone,
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
if (!result.scheduled) {
|
|
47
|
+
log.info({ reason: result.reason }, "Onboarding check-in not scheduled");
|
|
48
|
+
}
|
|
49
|
+
return result;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const RESPONSE_SCHEMA = z.object({
|
|
53
|
+
scheduled: z.boolean(),
|
|
54
|
+
reason: z.string().optional(),
|
|
55
|
+
eventId: z.string().optional(),
|
|
56
|
+
htmlLink: z.string().nullable().optional(),
|
|
57
|
+
start: z.string().optional(),
|
|
58
|
+
end: z.string().optional(),
|
|
59
|
+
timeZone: z.string().optional(),
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
export const ROUTES: RouteDefinition[] = [
|
|
63
|
+
{
|
|
64
|
+
operationId: "scheduleOnboardingCheckin",
|
|
65
|
+
endpoint: "onboarding/checkin",
|
|
66
|
+
method: "POST",
|
|
67
|
+
policy: {
|
|
68
|
+
requiredScopes: ["chat.write"],
|
|
69
|
+
allowedPrincipalTypes: ACTOR_PRINCIPALS,
|
|
70
|
+
},
|
|
71
|
+
summary: "Schedule the onboarding Day 2 check-in",
|
|
72
|
+
description:
|
|
73
|
+
"Find the first open 15-minute slot between 12pm and 5pm tomorrow " +
|
|
74
|
+
"(widening to 8am–8pm if booked) on the user's Google Calendar and " +
|
|
75
|
+
"create the Day 2 Check-in event. Best-effort: returns scheduled=false " +
|
|
76
|
+
"when no calendar is connected or the calendar scope wasn't granted.",
|
|
77
|
+
tags: ["onboarding"],
|
|
78
|
+
requestBody: z.object({
|
|
79
|
+
userName: z.string().optional(),
|
|
80
|
+
assistantName: z.string().optional(),
|
|
81
|
+
timezone: z.string().optional(),
|
|
82
|
+
}),
|
|
83
|
+
responseBody: RESPONSE_SCHEMA,
|
|
84
|
+
handler: handleScheduleOnboardingCheckin,
|
|
85
|
+
},
|
|
86
|
+
];
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
} from "../../config/env.js";
|
|
16
16
|
import { loadRawConfig, saveRawConfig } from "../../config/loader.js";
|
|
17
17
|
import { loadSkillCatalog } from "../../config/skills.js";
|
|
18
|
+
import { getGuardianDelivery } from "../../contacts/guardian-delivery-reader.js";
|
|
18
19
|
import { findConversation } from "../../daemon/conversation-registry.js";
|
|
19
20
|
import {
|
|
20
21
|
computeGatewayTarget,
|
|
@@ -303,8 +304,12 @@ async function handleOAuthConnectStart({ body = {} }: RouteHandlerArgs) {
|
|
|
303
304
|
// Workspace files (list/read)
|
|
304
305
|
// ---------------------------------------------------------------------------
|
|
305
306
|
|
|
306
|
-
function getWorkspaceFiles(): string[] {
|
|
307
|
+
async function getWorkspaceFiles(): Promise<string[]> {
|
|
307
308
|
const files = ["IDENTITY.md", "SOUL.md", "skills/"];
|
|
309
|
+
// Warm the vellum guardian-delivery cache so the sync persona resolution
|
|
310
|
+
// below hits a fresh key instead of falling back to default.md on a cold or
|
|
311
|
+
// TTL-expired cache.
|
|
312
|
+
await getGuardianDelivery({ channelTypes: ["vellum"] });
|
|
308
313
|
const guardianPath = resolveGuardianPersonaPath();
|
|
309
314
|
if (guardianPath) {
|
|
310
315
|
files.push(`users/${basename(guardianPath)}`);
|
|
@@ -312,9 +317,9 @@ function getWorkspaceFiles(): string[] {
|
|
|
312
317
|
return files;
|
|
313
318
|
}
|
|
314
319
|
|
|
315
|
-
function handleWorkspaceFilesList() {
|
|
320
|
+
async function handleWorkspaceFilesList() {
|
|
316
321
|
const base = getWorkspaceDir();
|
|
317
|
-
const files = getWorkspaceFiles().map((name) => ({
|
|
322
|
+
const files = (await getWorkspaceFiles()).map((name) => ({
|
|
318
323
|
path: name,
|
|
319
324
|
name,
|
|
320
325
|
exists: pathExists(join(base, name)),
|
|
@@ -39,6 +39,8 @@ export interface SubagentDetailResult {
|
|
|
39
39
|
toolName?: string;
|
|
40
40
|
isError?: boolean;
|
|
41
41
|
messageId?: string;
|
|
42
|
+
toolUseId?: string;
|
|
43
|
+
input?: Record<string, unknown>;
|
|
42
44
|
}>;
|
|
43
45
|
}
|
|
44
46
|
|
|
@@ -112,6 +114,8 @@ export function parseSubagentMessages(
|
|
|
112
114
|
type: "tool_use",
|
|
113
115
|
content: JSON.stringify(input),
|
|
114
116
|
toolName: name,
|
|
117
|
+
toolUseId: id || undefined,
|
|
118
|
+
input,
|
|
115
119
|
});
|
|
116
120
|
if (id) pendingTools.set(id, name);
|
|
117
121
|
} else if (
|
|
@@ -147,6 +151,7 @@ export function parseSubagentMessages(
|
|
|
147
151
|
content: resultContent,
|
|
148
152
|
toolName: toolName ?? "unknown",
|
|
149
153
|
isError,
|
|
154
|
+
toolUseId: toolUseId || undefined,
|
|
150
155
|
});
|
|
151
156
|
}
|
|
152
157
|
}
|
|
@@ -9,23 +9,17 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import { z } from "zod";
|
|
11
11
|
|
|
12
|
-
import type { ChannelId } from "../../channels/types.js";
|
|
13
12
|
import { isHttpAuthDisabled } from "../../config/env.js";
|
|
14
|
-
import {
|
|
13
|
+
import type { TrustContext } from "../../daemon/trust-context.js";
|
|
15
14
|
import { getLogger } from "../../util/logger.js";
|
|
16
|
-
import type { TrustClass } from "../actor-trust-resolver.js";
|
|
17
|
-
import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
|
|
18
15
|
import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
|
|
19
16
|
import { processGuardianDecision } from "../guardian-action-service.js";
|
|
20
|
-
import {
|
|
17
|
+
import { reResolveTrustOnResetDrift } from "../guardian-vellum-migration.js";
|
|
21
18
|
import {
|
|
19
|
+
findLocalGuardianPrincipalId,
|
|
22
20
|
resolveActorPrincipalIdForLocalGuardian,
|
|
23
|
-
resolveLocalTrustContext,
|
|
24
21
|
} from "../local-actor-identity.js";
|
|
25
|
-
import {
|
|
26
|
-
resolveTrustContext,
|
|
27
|
-
withSourceChannel,
|
|
28
|
-
} from "../trust-context-resolver.js";
|
|
22
|
+
import { resolveLocalPrincipalTrustContext } from "../local-principal-trust.js";
|
|
29
23
|
import { parseCallbackData } from "./channel-route-shared.js";
|
|
30
24
|
import {
|
|
31
25
|
BadRequestError,
|
|
@@ -43,58 +37,51 @@ const log = getLogger("surface-action-routes");
|
|
|
43
37
|
// ---------------------------------------------------------------------------
|
|
44
38
|
|
|
45
39
|
/**
|
|
46
|
-
* Resolve trust context
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
* rather than defaulting to unknown.
|
|
40
|
+
* Resolve trust context for the actor principal from the gateway guardian
|
|
41
|
+
* binding and set it on the conversation. A vellum principal is the guardian or
|
|
42
|
+
* nobody, so the mapper yields guardian or unknown.
|
|
50
43
|
*/
|
|
51
|
-
function applyTrustContext(
|
|
44
|
+
async function applyTrustContext(
|
|
52
45
|
conversation: {
|
|
53
|
-
setTrustContext?(ctx:
|
|
54
|
-
trustClass: TrustClass;
|
|
55
|
-
sourceChannel: ChannelId;
|
|
56
|
-
}): void;
|
|
46
|
+
setTrustContext?(ctx: TrustContext): void;
|
|
57
47
|
},
|
|
58
48
|
actorPrincipalId: string | undefined,
|
|
59
|
-
): void {
|
|
49
|
+
): Promise<void> {
|
|
60
50
|
if (!conversation.setTrustContext) return;
|
|
61
51
|
|
|
62
52
|
const sourceChannel = "vellum";
|
|
63
53
|
|
|
64
|
-
if (actorPrincipalId) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
54
|
+
if (!actorPrincipalId) {
|
|
55
|
+
conversation.setTrustContext({ trustClass: "guardian", sourceChannel });
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// Dev-bypass injects a synthetic principal that won't match the real
|
|
60
|
+
// guardian binding, so resolve the actual guardian principalId (gateway
|
|
61
|
+
// first, local store fallback) before mapping trust.
|
|
62
|
+
let principalId = actorPrincipalId;
|
|
63
|
+
if (isHttpAuthDisabled() && actorPrincipalId === "dev-bypass") {
|
|
64
|
+
principalId = (await findLocalGuardianPrincipalId()) ?? actorPrincipalId;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
let trustCtx = await resolveLocalPrincipalTrustContext({
|
|
68
|
+
actorPrincipalId: principalId,
|
|
69
|
+
sourceChannel,
|
|
70
|
+
conversationExternalId: "local",
|
|
71
|
+
});
|
|
72
|
+
if (trustCtx.trustClass === "unknown") {
|
|
73
|
+
const healed = await reResolveTrustOnResetDrift(principalId, sourceChannel);
|
|
74
|
+
if (healed) {
|
|
75
|
+
trustCtx = healed;
|
|
76
|
+
if (healed.trustClass !== "unknown") {
|
|
77
|
+
log.info(
|
|
78
|
+
{ actorPrincipalId: principalId, trustClass: trustCtx.trustClass },
|
|
79
|
+
"Trust re-resolved from local mirror after gateway reset drift (surface action)",
|
|
80
|
+
);
|
|
92
81
|
}
|
|
93
|
-
conversation.setTrustContext(withSourceChannel(sourceChannel, trustCtx));
|
|
94
82
|
}
|
|
95
|
-
} else {
|
|
96
|
-
conversation.setTrustContext({ trustClass: "guardian", sourceChannel });
|
|
97
83
|
}
|
|
84
|
+
conversation.setTrustContext(trustCtx);
|
|
98
85
|
}
|
|
99
86
|
|
|
100
87
|
// ---------------------------------------------------------------------------
|
|
@@ -132,16 +119,15 @@ async function handleSurfaceAction({
|
|
|
132
119
|
const aprDecision = parseCallbackData(actionId, "vellum");
|
|
133
120
|
if (aprDecision) {
|
|
134
121
|
// Resolve the actor's guardian principal ID. In dev mode the synthetic
|
|
135
|
-
// "dev-bypass" principal won't match the real guardian binding, so
|
|
136
|
-
//
|
|
122
|
+
// "dev-bypass" principal won't match the real guardian binding, so resolve
|
|
123
|
+
// the local guardian principal — mirrors guardian-action-routes.ts.
|
|
137
124
|
let guardianPrincipalId: string | undefined =
|
|
138
125
|
headers?.["x-vellum-actor-principal-id"] ?? undefined;
|
|
139
126
|
if (
|
|
140
127
|
isHttpAuthDisabled() &&
|
|
141
128
|
headers?.["x-vellum-actor-principal-id"] === "dev-bypass"
|
|
142
129
|
) {
|
|
143
|
-
|
|
144
|
-
guardianPrincipalId = binding?.contact.principalId ?? undefined;
|
|
130
|
+
guardianPrincipalId = (await findLocalGuardianPrincipalId()) ?? undefined;
|
|
145
131
|
}
|
|
146
132
|
|
|
147
133
|
const result = await processGuardianDecision({
|
|
@@ -189,7 +175,7 @@ async function handleSurfaceAction({
|
|
|
189
175
|
}
|
|
190
176
|
|
|
191
177
|
const actorPrincipalId = headers?.["x-vellum-actor-principal-id"];
|
|
192
|
-
applyTrustContext(conversation, actorPrincipalId);
|
|
178
|
+
await applyTrustContext(conversation, actorPrincipalId);
|
|
193
179
|
|
|
194
180
|
// Translate dev-bypass → real guardian so the surface turn's principal matches
|
|
195
181
|
// the SSE host-proxy client's registered principal; otherwise CU/app-control
|