@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
|
@@ -17,8 +17,6 @@ import { IpcCallError } from "@vellumai/gateway-client/ipc-client";
|
|
|
17
17
|
import { z } from "zod";
|
|
18
18
|
|
|
19
19
|
import {
|
|
20
|
-
getAssistantContactMetadata,
|
|
21
|
-
getContact,
|
|
22
20
|
listContacts,
|
|
23
21
|
mergeContacts,
|
|
24
22
|
searchContacts,
|
|
@@ -80,15 +78,24 @@ function withChannelCompat<T extends { channels: { address: string }[] }>(
|
|
|
80
78
|
};
|
|
81
79
|
}
|
|
82
80
|
|
|
83
|
-
/** Compose both response transforms (guardian display name + channel compat).
|
|
81
|
+
/** Compose both response transforms (guardian display name + channel compat).
|
|
82
|
+
* Also coerces nullable gateway-sourced fields to their DB defaults so the
|
|
83
|
+
* response satisfies the strict enum schema even in degraded mode (assistant
|
|
84
|
+
* DB unreachable → gateway soft-fail join produces nulls).
|
|
85
|
+
*/
|
|
84
86
|
function prepareContactResponse<
|
|
85
87
|
T extends {
|
|
86
88
|
role: string;
|
|
87
89
|
displayName: string;
|
|
90
|
+
contactType?: string | null;
|
|
88
91
|
channels: { address: string }[];
|
|
89
92
|
},
|
|
90
93
|
>(contact: T): T {
|
|
91
|
-
|
|
94
|
+
const coerced =
|
|
95
|
+
contact.contactType == null
|
|
96
|
+
? { ...contact, contactType: "human" as T["contactType"] }
|
|
97
|
+
: contact;
|
|
98
|
+
return withChannelCompat(withGuardianNameOverride(coerced));
|
|
92
99
|
}
|
|
93
100
|
|
|
94
101
|
const VALID_CONTACT_TYPES: readonly ContactType[] = ["human", "assistant"];
|
|
@@ -101,6 +108,13 @@ function isContactType(value: string): value is ContactType {
|
|
|
101
108
|
// Response schemas (drive OpenAPI spec → codegen → typed SDK)
|
|
102
109
|
// ---------------------------------------------------------------------------
|
|
103
110
|
|
|
111
|
+
// Channel ACL fields (status/policy/verifiedAt/verifiedVia/revokedReason/
|
|
112
|
+
// blockedReason) are gateway-owned and present ONLY on gateway-relayed reads
|
|
113
|
+
// (`contacts_list_rich`/`contacts_get_rich`). Daemon-native filtered reads
|
|
114
|
+
// (search / contactType) omit them, so they are `.optional()`. Contact-level
|
|
115
|
+
// `role` is stored locally (NOT NULL, default "contact") and returned on all
|
|
116
|
+
// paths. INFO telemetry (lastSeenAt/interactionCount/lastInteraction) is
|
|
117
|
+
// locally hydrated on every read path and stays required.
|
|
104
118
|
const contactChannelSchema = z.object({
|
|
105
119
|
id: z.string(),
|
|
106
120
|
contactId: z.string(),
|
|
@@ -109,23 +123,23 @@ const contactChannelSchema = z.object({
|
|
|
109
123
|
isPrimary: z.boolean(),
|
|
110
124
|
/** @deprecated Echoes `address` for backwards compatibility with older macOS clients. */
|
|
111
125
|
externalUserId: z.string().nullable(),
|
|
112
|
-
status: z.string(),
|
|
113
|
-
policy: z.string(),
|
|
114
|
-
verifiedAt: z.number().nullable(),
|
|
115
|
-
verifiedVia: z.string().nullable(),
|
|
126
|
+
status: z.string().optional(),
|
|
127
|
+
policy: z.string().optional(),
|
|
128
|
+
verifiedAt: z.number().nullable().optional(),
|
|
129
|
+
verifiedVia: z.string().nullable().optional(),
|
|
116
130
|
lastSeenAt: z.number().nullable(),
|
|
117
131
|
interactionCount: z.number(),
|
|
118
132
|
lastInteraction: z.number().nullable(),
|
|
119
|
-
revokedReason: z.string().nullable(),
|
|
120
|
-
blockedReason: z.string().nullable(),
|
|
133
|
+
revokedReason: z.string().nullable().optional(),
|
|
134
|
+
blockedReason: z.string().nullable().optional(),
|
|
121
135
|
});
|
|
122
136
|
|
|
123
137
|
const contactSchema = z.object({
|
|
124
138
|
id: z.string(),
|
|
125
139
|
displayName: z.string(),
|
|
126
|
-
role: z.
|
|
140
|
+
role: z.enum(["guardian", "contact"]),
|
|
127
141
|
notes: z.string().nullable().optional(),
|
|
128
|
-
contactType: z.
|
|
142
|
+
contactType: z.enum(["human", "assistant"]),
|
|
129
143
|
lastInteraction: z.number().nullable().optional(),
|
|
130
144
|
interactionCount: z.number(),
|
|
131
145
|
createdAt: z.number(),
|
|
@@ -139,14 +153,12 @@ const contactSchema = z.object({
|
|
|
139
153
|
|
|
140
154
|
/**
|
|
141
155
|
* Relay a non-search contact list read to the gateway (source of truth for ACL
|
|
142
|
-
* fields)
|
|
143
|
-
*
|
|
144
|
-
*
|
|
156
|
+
* fields). Shared by the GET `contacts` list and the `search_contacts`
|
|
157
|
+
* no-filter case so both serve gateway-sourced data consistently. Fail-closed:
|
|
158
|
+
* a relay failure surfaces as an error rather than reading ACL from the
|
|
159
|
+
* assistant DB.
|
|
145
160
|
*/
|
|
146
|
-
async function relayListContacts(
|
|
147
|
-
limit: number,
|
|
148
|
-
role: ContactRole | undefined,
|
|
149
|
-
) {
|
|
161
|
+
async function relayListContacts(limit: number, role: ContactRole | undefined) {
|
|
150
162
|
try {
|
|
151
163
|
const result = await ipcCallPersistent("contacts_list_rich", {
|
|
152
164
|
limit,
|
|
@@ -158,15 +170,7 @@ async function relayListContacts(
|
|
|
158
170
|
contacts: contacts.map(prepareContactResponse),
|
|
159
171
|
};
|
|
160
172
|
} catch (err) {
|
|
161
|
-
|
|
162
|
-
{ err },
|
|
163
|
-
"relayListContacts: gateway relay failed; falling back to assistant DB",
|
|
164
|
-
);
|
|
165
|
-
const contacts = listContacts(limit, role);
|
|
166
|
-
return {
|
|
167
|
-
ok: true,
|
|
168
|
-
contacts: contacts.map(prepareContactResponse),
|
|
169
|
-
};
|
|
173
|
+
rethrowGatewayError(err);
|
|
170
174
|
}
|
|
171
175
|
}
|
|
172
176
|
|
|
@@ -197,7 +201,6 @@ export async function handleListContacts(queryParams: Record<string, string>) {
|
|
|
197
201
|
query,
|
|
198
202
|
channelAddress,
|
|
199
203
|
channelType,
|
|
200
|
-
role,
|
|
201
204
|
contactType,
|
|
202
205
|
limit,
|
|
203
206
|
});
|
|
@@ -215,7 +218,7 @@ export async function handleListContacts(queryParams: Record<string, string>) {
|
|
|
215
218
|
log.debug(
|
|
216
219
|
"handleListContacts: contactType-filtered read served daemon-native (gateway-native contactType filtering is design-blocked, pending ACL classification)",
|
|
217
220
|
);
|
|
218
|
-
const contacts = listContacts(limit,
|
|
221
|
+
const contacts = listContacts(limit, contactType);
|
|
219
222
|
return {
|
|
220
223
|
ok: true,
|
|
221
224
|
contacts: contacts.map(prepareContactResponse),
|
|
@@ -240,25 +243,10 @@ export async function handleGetContact(contactId: string) {
|
|
|
240
243
|
assistantMetadata: assistantMetadata ?? undefined,
|
|
241
244
|
};
|
|
242
245
|
} catch (err) {
|
|
243
|
-
// A clean not-found is a real 404
|
|
246
|
+
// A clean not-found is a real 404. Any other relay failure fails closed
|
|
247
|
+
// rather than reading ACL from the assistant DB.
|
|
244
248
|
if (err instanceof NotFoundError) throw err;
|
|
245
|
-
|
|
246
|
-
{ err, contactId },
|
|
247
|
-
"handleGetContact: gateway relay failed; falling back to assistant DB",
|
|
248
|
-
);
|
|
249
|
-
const contact = getContact(contactId);
|
|
250
|
-
if (!contact) {
|
|
251
|
-
throw new NotFoundError(`Contact "${contactId}" not found`);
|
|
252
|
-
}
|
|
253
|
-
const assistantMeta =
|
|
254
|
-
contact.contactType === "assistant"
|
|
255
|
-
? getAssistantContactMetadata(contact.id)
|
|
256
|
-
: undefined;
|
|
257
|
-
return {
|
|
258
|
-
ok: true,
|
|
259
|
-
contact: prepareContactResponse(contact),
|
|
260
|
-
assistantMetadata: assistantMeta ?? undefined,
|
|
261
|
-
};
|
|
249
|
+
rethrowGatewayError(err);
|
|
262
250
|
}
|
|
263
251
|
}
|
|
264
252
|
|
|
@@ -278,7 +266,9 @@ export async function handleGetContact(contactId: string) {
|
|
|
278
266
|
// ~5s fallback plus IPC overhead on both nested hops. (List/revoke keep the default.)
|
|
279
267
|
const INVITE_CREATE_RELAY_TIMEOUT_MS = 30_000;
|
|
280
268
|
|
|
281
|
-
export async function handleListInvites({
|
|
269
|
+
export async function handleListInvites({
|
|
270
|
+
queryParams = {},
|
|
271
|
+
}: RouteHandlerArgs) {
|
|
282
272
|
try {
|
|
283
273
|
const result = (await ipcCallPersistent("invites_list", {
|
|
284
274
|
...(queryParams.sourceChannel
|
|
@@ -318,7 +308,9 @@ export async function handleCreateInvite({ body = {} }: RouteHandlerArgs) {
|
|
|
318
308
|
}
|
|
319
309
|
}
|
|
320
310
|
|
|
321
|
-
export async function handleRevokeInvite({
|
|
311
|
+
export async function handleRevokeInvite({
|
|
312
|
+
pathParams = {},
|
|
313
|
+
}: RouteHandlerArgs) {
|
|
322
314
|
try {
|
|
323
315
|
const result = (await ipcCallPersistent("invites_revoke", {
|
|
324
316
|
id: pathParams.id,
|
|
@@ -336,9 +328,7 @@ export async function handleRevokeInvite({ pathParams = {} }: RouteHandlerArgs)
|
|
|
336
328
|
* `invites_redeem_voice` method. Wraps the identity-bound
|
|
337
329
|
* `redeemVoiceInviteCode` path.
|
|
338
330
|
*/
|
|
339
|
-
export async function handleRedeemVoiceInvite({
|
|
340
|
-
body = {},
|
|
341
|
-
}: RouteHandlerArgs) {
|
|
331
|
+
export async function handleRedeemVoiceInvite({ body = {} }: RouteHandlerArgs) {
|
|
342
332
|
const callerExternalUserId = body.callerExternalUserId as string | undefined;
|
|
343
333
|
const code = body.code as string | undefined;
|
|
344
334
|
|
|
@@ -372,9 +362,7 @@ export async function handleRedeemVoiceInvite({
|
|
|
372
362
|
* `invites_redeem_token` method. Wraps the generic `redeemIngressInvite`
|
|
373
363
|
* token path.
|
|
374
364
|
*/
|
|
375
|
-
export async function handleRedeemTokenInvite({
|
|
376
|
-
body = {},
|
|
377
|
-
}: RouteHandlerArgs) {
|
|
365
|
+
export async function handleRedeemTokenInvite({ body = {} }: RouteHandlerArgs) {
|
|
378
366
|
const result = await redeemIngressInvite({
|
|
379
367
|
token: body.token as string | undefined,
|
|
380
368
|
externalUserId: body.externalUserId as string | undefined,
|
|
@@ -665,7 +653,10 @@ export const ROUTES: RouteDefinition[] = [
|
|
|
665
653
|
// No-filter "search" is a list read — relay to the gateway so it returns
|
|
666
654
|
// the same source-of-truth data as `contacts list`.
|
|
667
655
|
if (!hasFilter) {
|
|
668
|
-
const { contacts } = await relayListContacts(
|
|
656
|
+
const { contacts } = await relayListContacts(
|
|
657
|
+
parsed.limit ?? 50,
|
|
658
|
+
undefined,
|
|
659
|
+
);
|
|
669
660
|
return contacts;
|
|
670
661
|
}
|
|
671
662
|
|
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
import { v4 as uuid } from "uuid";
|
|
10
10
|
import { z } from "zod";
|
|
11
11
|
|
|
12
|
-
import { findConversation } from "../../daemon/conversation-registry.js";
|
|
13
12
|
import { clearAllConversations as clearAllActive } from "../../daemon/handlers/conversations.js";
|
|
14
13
|
import { formatJson, formatMarkdown } from "../../export/formatter.js";
|
|
15
14
|
import { ipcCall as ipcCallGateway } from "../../ipc/gateway-client.js";
|
|
15
|
+
import { isConversationProcessing } from "../../memory/conversation-crud.js";
|
|
16
16
|
import {
|
|
17
17
|
addMessage,
|
|
18
18
|
createConversation,
|
|
@@ -53,10 +53,9 @@ function handleListCli({ body = {} }: RouteHandlerArgs) {
|
|
|
53
53
|
id: c.id,
|
|
54
54
|
title: c.title,
|
|
55
55
|
updatedAt: c.updatedAt,
|
|
56
|
-
//
|
|
57
|
-
//
|
|
58
|
-
|
|
59
|
-
isProcessing: findConversation(c.id)?.isProcessing() ?? false,
|
|
56
|
+
// Checks in-memory flag first (hot path), falls back to the
|
|
57
|
+
// persisted `processing_started_at` column for cold conversations.
|
|
58
|
+
isProcessing: isConversationProcessing(c.id),
|
|
60
59
|
})),
|
|
61
60
|
};
|
|
62
61
|
}
|
|
@@ -10,7 +10,6 @@
|
|
|
10
10
|
|
|
11
11
|
import { z } from "zod";
|
|
12
12
|
|
|
13
|
-
import { findConversation } from "../../daemon/conversation-registry.js";
|
|
14
13
|
import {
|
|
15
14
|
type Confidence,
|
|
16
15
|
getAttentionStateByConversationIds,
|
|
@@ -18,6 +17,7 @@ import {
|
|
|
18
17
|
recordConversationSeenSignal,
|
|
19
18
|
type SignalType,
|
|
20
19
|
} from "../../memory/conversation-attention-store.js";
|
|
20
|
+
import { isConversationProcessing } from "../../memory/conversation-crud.js";
|
|
21
21
|
import {
|
|
22
22
|
type ConversationRow,
|
|
23
23
|
getDisplayMetaForConversations,
|
|
@@ -270,12 +270,9 @@ function handleListConversations({ queryParams = {} }: RouteHandlerArgs) {
|
|
|
270
270
|
attentionState: attentionStates.get(conversation.id),
|
|
271
271
|
displayMeta: displayMeta.get(conversation.id),
|
|
272
272
|
parentCache,
|
|
273
|
-
//
|
|
274
|
-
//
|
|
275
|
-
|
|
276
|
-
// mid-turn since the agent loop only runs on resident convs.
|
|
277
|
-
isProcessing:
|
|
278
|
-
findConversation(conversation.id)?.isProcessing() ?? false,
|
|
273
|
+
// Checks in-memory flag first (hot path), falls back to the
|
|
274
|
+
// persisted `processing_started_at` column for cold conversations.
|
|
275
|
+
isProcessing: isConversationProcessing(conversation.id),
|
|
279
276
|
}),
|
|
280
277
|
),
|
|
281
278
|
nextOffset,
|
|
@@ -486,6 +486,74 @@ function readPlainObject(value: unknown): Record<string, unknown> | undefined {
|
|
|
486
486
|
return value as Record<string, unknown>;
|
|
487
487
|
}
|
|
488
488
|
|
|
489
|
+
function stripTransportHeadersRecursively(value: unknown): void {
|
|
490
|
+
if (Array.isArray(value)) {
|
|
491
|
+
for (const item of value) {
|
|
492
|
+
stripTransportHeadersRecursively(item);
|
|
493
|
+
}
|
|
494
|
+
return;
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
const object = readPlainObject(value);
|
|
498
|
+
if (!object) return;
|
|
499
|
+
const transport = readPlainObject(object.transport);
|
|
500
|
+
if (transport) delete transport.headers;
|
|
501
|
+
for (const child of Object.values(object)) {
|
|
502
|
+
stripTransportHeadersRecursively(child);
|
|
503
|
+
}
|
|
504
|
+
}
|
|
505
|
+
|
|
506
|
+
function containsTransportHeadersRecursively(value: unknown): boolean {
|
|
507
|
+
if (Array.isArray(value)) {
|
|
508
|
+
return value.some((item) => containsTransportHeadersRecursively(item));
|
|
509
|
+
}
|
|
510
|
+
|
|
511
|
+
const object = readPlainObject(value);
|
|
512
|
+
if (!object) return false;
|
|
513
|
+
const transport = readPlainObject(object.transport);
|
|
514
|
+
if (transport && Object.hasOwn(transport, "headers")) return true;
|
|
515
|
+
return Object.values(object).some((child) =>
|
|
516
|
+
containsTransportHeadersRecursively(child),
|
|
517
|
+
);
|
|
518
|
+
}
|
|
519
|
+
|
|
520
|
+
function sanitizeMcpTransportHeadersForSettingsRead(config: unknown): void {
|
|
521
|
+
const root = readPlainObject(config);
|
|
522
|
+
if (!root) return;
|
|
523
|
+
const mcp = readPlainObject(root.mcp);
|
|
524
|
+
if (!mcp || !Object.hasOwn(mcp, "servers")) return;
|
|
525
|
+
if (Array.isArray(mcp.servers)) {
|
|
526
|
+
stripTransportHeadersRecursively(mcp.servers);
|
|
527
|
+
return;
|
|
528
|
+
}
|
|
529
|
+
const servers = readPlainObject(mcp.servers);
|
|
530
|
+
if (!servers) return;
|
|
531
|
+
for (const server of Object.values(servers)) {
|
|
532
|
+
stripTransportHeadersRecursively(server);
|
|
533
|
+
}
|
|
534
|
+
}
|
|
535
|
+
|
|
536
|
+
function patchContainsMcpTransportHeaders(patch: unknown): boolean {
|
|
537
|
+
const root = readPlainObject(patch);
|
|
538
|
+
const mcp = readPlainObject(root?.mcp);
|
|
539
|
+
if (!mcp || !Object.hasOwn(mcp, "servers")) return false;
|
|
540
|
+
if (Array.isArray(mcp.servers)) {
|
|
541
|
+
return containsTransportHeadersRecursively(mcp.servers);
|
|
542
|
+
}
|
|
543
|
+
const servers = readPlainObject(mcp.servers);
|
|
544
|
+
if (!servers) return false;
|
|
545
|
+
return Object.values(servers).some((server) =>
|
|
546
|
+
containsTransportHeadersRecursively(server),
|
|
547
|
+
);
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
function rejectMcpTransportHeaderWrite(patch: unknown): void {
|
|
551
|
+
if (!patchContainsMcpTransportHeaders(patch)) return;
|
|
552
|
+
throw new BadRequestError(
|
|
553
|
+
"MCP authentication headers must be managed through MCP server add/update APIs, not generic config writes.",
|
|
554
|
+
);
|
|
555
|
+
}
|
|
556
|
+
|
|
489
557
|
const WireProfileEntry = ProfileEntry.extend({
|
|
490
558
|
supportsVision: z.boolean().optional(),
|
|
491
559
|
})
|
|
@@ -688,6 +756,7 @@ const ConfigPatchRequestSchema = z
|
|
|
688
756
|
function handleGetConfig() {
|
|
689
757
|
try {
|
|
690
758
|
const config = applyContextDefaultsToRawConfig(loadRawConfig());
|
|
759
|
+
sanitizeMcpTransportHeadersForSettingsRead(config);
|
|
691
760
|
enrichProfilesWithVisionFlag(config);
|
|
692
761
|
return config;
|
|
693
762
|
} catch (err) {
|
|
@@ -840,6 +909,7 @@ async function handlePatchConfig({ body }: RouteHandlerArgs) {
|
|
|
840
909
|
throw new BadRequestError("Body must be a non-empty JSON object");
|
|
841
910
|
}
|
|
842
911
|
rejectManagedProfileDeletion(body as Record<string, unknown>);
|
|
912
|
+
rejectMcpTransportHeaderWrite(body);
|
|
843
913
|
|
|
844
914
|
const raw = loadRawConfig();
|
|
845
915
|
const patch = body as Record<string, unknown>;
|
|
@@ -848,6 +918,7 @@ async function handlePatchConfig({ body }: RouteHandlerArgs) {
|
|
|
848
918
|
await commitConfigWrite(raw, "patch");
|
|
849
919
|
|
|
850
920
|
const merged = applyContextDefaultsToRawConfig(loadRawConfig());
|
|
921
|
+
sanitizeMcpTransportHeadersForSettingsRead(merged);
|
|
851
922
|
enrichProfilesWithVisionFlag(merged);
|
|
852
923
|
return merged;
|
|
853
924
|
}
|
|
@@ -892,6 +963,7 @@ async function handleSetConfig({ body }: RouteHandlerArgs) {
|
|
|
892
963
|
const patchShape: Record<string, unknown> = {};
|
|
893
964
|
setNestedValue(patchShape, path, value);
|
|
894
965
|
rejectManagedProfileDeletion(patchShape);
|
|
966
|
+
rejectMcpTransportHeaderWrite(patchShape);
|
|
895
967
|
|
|
896
968
|
const raw = loadRawConfig();
|
|
897
969
|
setNestedValue(raw, path, value);
|
|
@@ -50,6 +50,7 @@ import {
|
|
|
50
50
|
getCannedFirstGreeting,
|
|
51
51
|
isWakeUpGreeting,
|
|
52
52
|
} from "../../daemon/first-greeting.js";
|
|
53
|
+
import { supersedePendingInteractionsOnEnqueue } from "../../daemon/handlers/conversations.js";
|
|
53
54
|
import {
|
|
54
55
|
collectAttachmentRefs,
|
|
55
56
|
type HistoryAttachmentRef,
|
|
@@ -67,6 +68,7 @@ import type {
|
|
|
67
68
|
HostProxyTransportMetadata,
|
|
68
69
|
NonHostProxyTransportMetadata,
|
|
69
70
|
} from "../../daemon/message-types/conversations.js";
|
|
71
|
+
import type { TrustContext } from "../../daemon/trust-context.js";
|
|
70
72
|
import { HeartbeatService } from "../../heartbeat/heartbeat-service.js";
|
|
71
73
|
import {
|
|
72
74
|
writeOnboardingSidecar,
|
|
@@ -120,30 +122,30 @@ import {
|
|
|
120
122
|
} from "../../util/platform.js";
|
|
121
123
|
import { silentlyWithLog } from "../../util/silently.js";
|
|
122
124
|
import { assistantEventHub, broadcastMessage } from "../assistant-event-hub.js";
|
|
123
|
-
import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
|
|
124
125
|
import { getPersistedSeq } from "../assistant-stream-state.js";
|
|
125
126
|
import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
|
|
126
127
|
import {
|
|
127
128
|
type GuardianPendingScope,
|
|
128
129
|
routeGuardianReply,
|
|
129
130
|
} from "../guardian-reply-router.js";
|
|
130
|
-
import {
|
|
131
|
+
import { reResolveTrustOnResetDrift } from "../guardian-vellum-migration.js";
|
|
131
132
|
import type {
|
|
132
133
|
ApprovalConversationGenerator,
|
|
133
134
|
RuntimeAttachmentMetadata,
|
|
134
135
|
RuntimeMessagePayload,
|
|
135
136
|
SendMessageDeps,
|
|
136
137
|
} from "../http-types.js";
|
|
137
|
-
import {
|
|
138
|
+
import {
|
|
139
|
+
findLocalGuardianPrincipalId,
|
|
140
|
+
resolveActorPrincipalIdForLocalGuardian,
|
|
141
|
+
} from "../local-actor-identity.js";
|
|
142
|
+
import { resolveLocalPrincipalTrustContext } from "../local-principal-trust.js";
|
|
138
143
|
import * as pendingInteractions from "../pending-interactions.js";
|
|
139
144
|
import {
|
|
140
145
|
publishConversationListAndMetadataChanged,
|
|
141
146
|
publishConversationMessagesChanged,
|
|
142
147
|
} from "../sync/resource-sync-events.js";
|
|
143
|
-
import {
|
|
144
|
-
resolveTrustContext,
|
|
145
|
-
withSourceChannel,
|
|
146
|
-
} from "../trust-context-resolver.js";
|
|
148
|
+
import { withSourceChannel } from "../trust-context-resolver.js";
|
|
147
149
|
import {
|
|
148
150
|
BadRequestError,
|
|
149
151
|
InternalError,
|
|
@@ -946,25 +948,28 @@ export function handleListMessages({
|
|
|
946
948
|
.filter((block) => block.type !== "text" || block.text.length > 0);
|
|
947
949
|
}
|
|
948
950
|
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
|
|
951
|
+
// Ensure every hydrated attachment has a corresponding content block.
|
|
952
|
+
// renderHistoryContent inlines attachment blocks only when it has
|
|
953
|
+
// file-block refs with matching DB rows; directives (assistant-authored
|
|
954
|
+
// <vellum-attachment/> tags) don't leave a file block after stripping,
|
|
955
|
+
// so their attachments end up in the flat `attachments` array but not in
|
|
956
|
+
// `contentBlocks`. Append any that are missing so the canonical
|
|
957
|
+
// projection is complete.
|
|
958
|
+
const existingAttachmentIds = new Set(
|
|
959
|
+
contentBlocks
|
|
960
|
+
.filter(
|
|
961
|
+
(b): b is Extract<ConversationContentBlock, { type: "attachment" }> =>
|
|
962
|
+
b.type === "attachment",
|
|
963
|
+
)
|
|
964
|
+
.map((b) => b.attachment.id),
|
|
965
|
+
);
|
|
966
|
+
for (const att of msgAttachments) {
|
|
967
|
+
if (!existingAttachmentIds.has(att.id)) {
|
|
968
|
+
contentBlocks.push({ type: "attachment", attachment: att });
|
|
969
|
+
}
|
|
964
970
|
}
|
|
965
|
-
}
|
|
966
971
|
|
|
967
|
-
|
|
972
|
+
const alignedContentOrder = aligned.rewriteContentOrder(contentOrder);
|
|
968
973
|
|
|
969
974
|
// Use sentAt (actual event time) for the display timestamp when available,
|
|
970
975
|
// falling back to createdAt (persistence time). Clients use this display
|
|
@@ -1440,56 +1445,65 @@ export async function handleSendMessage(
|
|
|
1440
1445
|
conversation.setOnboardingContext(body.onboarding!);
|
|
1441
1446
|
}
|
|
1442
1447
|
|
|
1443
|
-
// Resolve guardian context from the AuthContext's actorPrincipalId
|
|
1444
|
-
//
|
|
1445
|
-
// the same trust resolution pipeline that channel ingress uses.
|
|
1448
|
+
// Resolve guardian context from the AuthContext's actorPrincipalId via the
|
|
1449
|
+
// gateway guardian binding: a vellum principal is the guardian or nobody.
|
|
1446
1450
|
if (actorPrincipalId) {
|
|
1447
1451
|
// Dev bypass (HTTP auth disabled): the synthetic "dev-bypass" principal
|
|
1448
|
-
// won't match any guardian binding. Resolve
|
|
1449
|
-
//
|
|
1452
|
+
// won't match any guardian binding. Resolve the real guardian principal and
|
|
1453
|
+
// map that through, failing closed to unknown on an empty gateway.
|
|
1450
1454
|
if (isHttpAuthDisabled() && actorPrincipalId === "dev-bypass") {
|
|
1451
|
-
|
|
1455
|
+
const guardianPrincipalId = await findLocalGuardianPrincipalId();
|
|
1456
|
+
let trustCtx: TrustContext = guardianPrincipalId
|
|
1457
|
+
? withSourceChannel(
|
|
1458
|
+
sourceChannel,
|
|
1459
|
+
await resolveLocalPrincipalTrustContext({
|
|
1460
|
+
actorPrincipalId: guardianPrincipalId,
|
|
1461
|
+
sourceChannel: "vellum",
|
|
1462
|
+
conversationExternalId: "local",
|
|
1463
|
+
}),
|
|
1464
|
+
)
|
|
1465
|
+
: { trustClass: "unknown", sourceChannel };
|
|
1466
|
+
if (guardianPrincipalId && trustCtx.trustClass === "unknown") {
|
|
1467
|
+
const healed = await reResolveTrustOnResetDrift(
|
|
1468
|
+
guardianPrincipalId,
|
|
1469
|
+
sourceChannel,
|
|
1470
|
+
);
|
|
1471
|
+
if (healed) trustCtx = healed;
|
|
1472
|
+
}
|
|
1473
|
+
conversation.setTrustContext(trustCtx);
|
|
1452
1474
|
} else {
|
|
1453
|
-
|
|
1454
|
-
|
|
1455
|
-
|
|
1456
|
-
|
|
1457
|
-
|
|
1458
|
-
|
|
1459
|
-
|
|
1475
|
+
let trustCtx = withSourceChannel(
|
|
1476
|
+
sourceChannel,
|
|
1477
|
+
await resolveLocalPrincipalTrustContext({
|
|
1478
|
+
actorPrincipalId,
|
|
1479
|
+
sourceChannel: "vellum",
|
|
1480
|
+
conversationExternalId: "local",
|
|
1481
|
+
}),
|
|
1482
|
+
);
|
|
1460
1483
|
if (trustCtx.trustClass === "unknown") {
|
|
1461
|
-
|
|
1462
|
-
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
trustCtx = resolveTrustContext({
|
|
1468
|
-
assistantId,
|
|
1469
|
-
sourceChannel: "vellum",
|
|
1470
|
-
conversationExternalId: "local",
|
|
1471
|
-
actorExternalId: actorPrincipalId,
|
|
1472
|
-
});
|
|
1484
|
+
const healed = await reResolveTrustOnResetDrift(
|
|
1485
|
+
actorPrincipalId,
|
|
1486
|
+
sourceChannel,
|
|
1487
|
+
);
|
|
1488
|
+
if (healed && healed.trustClass !== "unknown") {
|
|
1489
|
+
trustCtx = healed;
|
|
1473
1490
|
log.info(
|
|
1474
|
-
{
|
|
1475
|
-
|
|
1476
|
-
trustClass: trustCtx.trustClass,
|
|
1477
|
-
},
|
|
1478
|
-
"Trust re-resolved after guardian binding drift heal",
|
|
1491
|
+
{ actorPrincipalId, trustClass: trustCtx.trustClass },
|
|
1492
|
+
"Trust re-resolved from local mirror after gateway returned unknown",
|
|
1479
1493
|
);
|
|
1480
1494
|
} else {
|
|
1481
1495
|
log.warn(
|
|
1482
1496
|
{
|
|
1483
|
-
actorPrincipalId
|
|
1497
|
+
actorPrincipalId,
|
|
1484
1498
|
sourceChannel,
|
|
1485
|
-
trustClass:
|
|
1486
|
-
principalType
|
|
1499
|
+
trustClass: "unknown",
|
|
1500
|
+
principalType,
|
|
1487
1501
|
},
|
|
1488
1502
|
"JWT-verified actor resolved to unknown trust class — possible guardian binding drift (e.g. DB reset without re-bootstrap)",
|
|
1489
1503
|
);
|
|
1490
1504
|
}
|
|
1491
1505
|
}
|
|
1492
|
-
conversation.setTrustContext(
|
|
1506
|
+
conversation.setTrustContext(trustCtx);
|
|
1493
1507
|
}
|
|
1494
1508
|
} else {
|
|
1495
1509
|
// Service principals (svc_gateway) or tokens without an actor ID
|
|
@@ -1498,10 +1512,13 @@ export async function handleSendMessage(
|
|
|
1498
1512
|
}
|
|
1499
1513
|
|
|
1500
1514
|
const isInteractive = isInteractiveInterface(sourceInterface);
|
|
1501
|
-
//
|
|
1502
|
-
//
|
|
1503
|
-
//
|
|
1504
|
-
|
|
1515
|
+
// Translate the dev-bypass actor principal to the real guardian principal
|
|
1516
|
+
// before the same-actor host-proxy gate so web/iOS turns match the macOS
|
|
1517
|
+
// client's SSE-registered principal. No-op for real JWT principals in
|
|
1518
|
+
// non-dev-bypass deployments.
|
|
1519
|
+
const sourceActorPrincipalId = await resolveActorPrincipalIdForLocalGuardian(
|
|
1520
|
+
actorPrincipalId ?? undefined,
|
|
1521
|
+
);
|
|
1505
1522
|
// Bash/File/Transfer singletons are globally available via isAvailable() —
|
|
1506
1523
|
// no per-conversation gating needed. CU is per-conversation (owns step
|
|
1507
1524
|
// count, AX tree history, loop detection).
|
|
@@ -1814,29 +1831,11 @@ export async function handleSendMessage(
|
|
|
1814
1831
|
// the client showing "Failed to send" for a message the daemon will
|
|
1815
1832
|
// process from the queue.
|
|
1816
1833
|
try {
|
|
1817
|
-
|
|
1818
|
-
|
|
1819
|
-
|
|
1820
|
-
|
|
1821
|
-
|
|
1822
|
-
)) {
|
|
1823
|
-
if (interaction.kind === "confirmation") {
|
|
1824
|
-
conversation.emitConfirmationStateChanged({
|
|
1825
|
-
conversationId: mapping.conversationId,
|
|
1826
|
-
requestId: interaction.requestId,
|
|
1827
|
-
state: "denied" as const,
|
|
1828
|
-
source: "auto_deny" as const,
|
|
1829
|
-
});
|
|
1830
|
-
// Sync canonical guardian request status so stale "pending" DB
|
|
1831
|
-
// records don't get matched by later guardian reply routing.
|
|
1832
|
-
resolveCanonicalGuardianRequest(interaction.requestId, "pending", {
|
|
1833
|
-
status: "denied",
|
|
1834
|
-
});
|
|
1835
|
-
}
|
|
1836
|
-
}
|
|
1837
|
-
conversation.denyAllPendingConfirmations();
|
|
1838
|
-
pendingInteractions.removeByConversation(mapping.conversationId);
|
|
1839
|
-
}
|
|
1834
|
+
// Supersede interactions left pending by the in-flight turn: auto-deny
|
|
1835
|
+
// confirmations (with canonical/client sync) and steer to the enqueued
|
|
1836
|
+
// message if an ask_question is parked. Centralized so the CLI signal
|
|
1837
|
+
// path (signals/user-message.ts) gets identical handling.
|
|
1838
|
+
supersedePendingInteractionsOnEnqueue(mapping.conversationId, requestId);
|
|
1840
1839
|
|
|
1841
1840
|
// Expire any orphaned canonical requests that survived without a
|
|
1842
1841
|
// matching in-memory pending interaction (e.g. prompter timeouts).
|
|
@@ -43,7 +43,7 @@ import type { ReplaySubscriber } from "../assistant-stream-state.js";
|
|
|
43
43
|
import { getReplayWindow } from "../assistant-stream-state.js";
|
|
44
44
|
import { ACTOR_PRINCIPALS, GATEWAY_PRINCIPALS } from "../auth/route-policy.js";
|
|
45
45
|
import { DEFAULT_HEARTBEAT_INTERVAL_MS } from "../client-health.js";
|
|
46
|
-
import {
|
|
46
|
+
import { resolveActorPrincipalIdForLocalGuardianSync } from "../local-actor-identity.js";
|
|
47
47
|
import {
|
|
48
48
|
BadRequestError,
|
|
49
49
|
NotFoundError,
|
|
@@ -311,7 +311,7 @@ export function handleSubscribeAssistantEvents(
|
|
|
311
311
|
// bearer token's AuthContext. May be absent for legacy / service-token
|
|
312
312
|
// connections that have no principal. See `resolveActorPrincipalId` for the
|
|
313
313
|
// dev-bypass translation rationale.
|
|
314
|
-
const actorPrincipalId =
|
|
314
|
+
const actorPrincipalId = resolveActorPrincipalIdForLocalGuardianSync(
|
|
315
315
|
rawActorPrincipalId?.trim() || undefined,
|
|
316
316
|
);
|
|
317
317
|
|
|
@@ -263,7 +263,9 @@ async function handleGlobalSearch({
|
|
|
263
263
|
id: c.id,
|
|
264
264
|
displayName: c.displayName,
|
|
265
265
|
notes: c.notes,
|
|
266
|
-
|
|
266
|
+
// Daemon-native search has no gateway-relayed read; recency orders on
|
|
267
|
+
// contacts.updatedAt, not the channel-derived lastInteraction column.
|
|
268
|
+
lastInteraction: c.updatedAt,
|
|
267
269
|
}));
|
|
268
270
|
}
|
|
269
271
|
|