@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
|
@@ -13,6 +13,15 @@ let mockRecentContacts: ContactWithChannels[] = [];
|
|
|
13
13
|
let mockFindContactByAddressThrows = false;
|
|
14
14
|
let mockListContactsThrows = false;
|
|
15
15
|
|
|
16
|
+
// Guardian deliveries returned by the mocked gateway reader. resolveGuardianName
|
|
17
|
+
// is mocked to echo mockGuardianName, so the displayName here is captured below.
|
|
18
|
+
let mockGuardianDelivery: Array<{
|
|
19
|
+
channelType: string;
|
|
20
|
+
status: string;
|
|
21
|
+
displayName: string | null;
|
|
22
|
+
}> | null = null;
|
|
23
|
+
let lastGuardianDisplayNameSeen: string | null | undefined;
|
|
24
|
+
|
|
16
25
|
const logWarnFn = mock(() => {});
|
|
17
26
|
|
|
18
27
|
// ---------------------------------------------------------------------------
|
|
@@ -25,7 +34,10 @@ mock.module("../daemon/identity-helpers.js", () => ({
|
|
|
25
34
|
|
|
26
35
|
mock.module("../prompts/user-reference.js", () => ({
|
|
27
36
|
DEFAULT_USER_REFERENCE: "my human",
|
|
28
|
-
resolveGuardianName: () =>
|
|
37
|
+
resolveGuardianName: (displayName?: string | null) => {
|
|
38
|
+
lastGuardianDisplayNameSeen = displayName;
|
|
39
|
+
return mockGuardianName;
|
|
40
|
+
},
|
|
29
41
|
}));
|
|
30
42
|
|
|
31
43
|
mock.module("../contacts/contact-store.js", () => ({
|
|
@@ -35,8 +47,6 @@ mock.module("../contacts/contact-store.js", () => ({
|
|
|
35
47
|
}
|
|
36
48
|
return mockTargetContact;
|
|
37
49
|
},
|
|
38
|
-
findGuardianForChannel: () => null,
|
|
39
|
-
listGuardianChannels: () => null,
|
|
40
50
|
listContacts: (_limit?: number) => {
|
|
41
51
|
if (mockListContactsThrows) {
|
|
42
52
|
throw new Error("DB error: listContacts");
|
|
@@ -45,6 +55,15 @@ mock.module("../contacts/contact-store.js", () => ({
|
|
|
45
55
|
},
|
|
46
56
|
}));
|
|
47
57
|
|
|
58
|
+
mock.module("../contacts/guardian-delivery-reader.js", () => ({
|
|
59
|
+
getGuardianDelivery: async () => mockGuardianDelivery,
|
|
60
|
+
guardianForChannel: (
|
|
61
|
+
list: Array<{ channelType: string; status: string }>,
|
|
62
|
+
channelType: string,
|
|
63
|
+
) => list.find((g) => g.channelType === channelType && g.status === "active"),
|
|
64
|
+
anyGuardian: (list: unknown[]) => list[0],
|
|
65
|
+
}));
|
|
66
|
+
|
|
48
67
|
// Bun's mock.module for "../util/logger.js" doesn't intercept the transitive
|
|
49
68
|
// import in stt-hints.ts due to a Bun limitation. Mocking pino at the package
|
|
50
69
|
// level works because getLogger uses a Proxy that lazily creates a pino child
|
|
@@ -299,13 +318,12 @@ function makeContact(displayName: string): ContactWithChannels {
|
|
|
299
318
|
id: `contact-${displayName.toLowerCase()}`,
|
|
300
319
|
displayName,
|
|
301
320
|
notes: null,
|
|
321
|
+
role: "contact",
|
|
302
322
|
lastInteraction: null,
|
|
303
323
|
interactionCount: 0,
|
|
304
324
|
createdAt: now,
|
|
305
325
|
updatedAt: now,
|
|
306
|
-
role: "contact",
|
|
307
326
|
contactType: "human",
|
|
308
|
-
principalId: null,
|
|
309
327
|
userFile: null,
|
|
310
328
|
channels: [],
|
|
311
329
|
};
|
|
@@ -319,10 +337,26 @@ describe("resolveCallHints", () => {
|
|
|
319
337
|
mockRecentContacts = [];
|
|
320
338
|
mockFindContactByAddressThrows = false;
|
|
321
339
|
mockListContactsThrows = false;
|
|
340
|
+
mockGuardianDelivery = null;
|
|
341
|
+
lastGuardianDisplayNameSeen = undefined;
|
|
322
342
|
logWarnFn.mockClear();
|
|
323
343
|
});
|
|
324
344
|
|
|
325
|
-
test("
|
|
345
|
+
test("guardian displayName for hints comes from the gateway binding", async () => {
|
|
346
|
+
mockGuardianDelivery = [
|
|
347
|
+
{
|
|
348
|
+
channelType: "phone",
|
|
349
|
+
status: "active",
|
|
350
|
+
displayName: "GatewayGuardian",
|
|
351
|
+
},
|
|
352
|
+
];
|
|
353
|
+
|
|
354
|
+
await resolveCallHints(null, []);
|
|
355
|
+
|
|
356
|
+
expect(lastGuardianDisplayNameSeen).toBe("GatewayGuardian");
|
|
357
|
+
});
|
|
358
|
+
|
|
359
|
+
test("happy path wires all sources correctly", async () => {
|
|
326
360
|
mockTargetContact = makeContact("Alice");
|
|
327
361
|
mockRecentContacts = [makeContact("Bob"), makeContact("Charlie")];
|
|
328
362
|
|
|
@@ -335,7 +369,7 @@ describe("resolveCallHints", () => {
|
|
|
335
369
|
inviteGuardianName: "Eve",
|
|
336
370
|
};
|
|
337
371
|
|
|
338
|
-
const result = resolveCallHints(session, ["StaticHint"]);
|
|
372
|
+
const result = await resolveCallHints(session, ["StaticHint"]);
|
|
339
373
|
const parts = result.split(",");
|
|
340
374
|
|
|
341
375
|
expect(parts).toContain("StaticHint");
|
|
@@ -351,7 +385,7 @@ describe("resolveCallHints", () => {
|
|
|
351
385
|
expect(logWarnFn).not.toHaveBeenCalled();
|
|
352
386
|
});
|
|
353
387
|
|
|
354
|
-
test("findContactByAddress failure is caught and logged without throwing", () => {
|
|
388
|
+
test("findContactByAddress failure is caught and logged without throwing", async () => {
|
|
355
389
|
mockFindContactByAddressThrows = true;
|
|
356
390
|
mockRecentContacts = [makeContact("Bob")];
|
|
357
391
|
|
|
@@ -365,7 +399,7 @@ describe("resolveCallHints", () => {
|
|
|
365
399
|
};
|
|
366
400
|
|
|
367
401
|
// Should not throw
|
|
368
|
-
const result = resolveCallHints(session, []);
|
|
402
|
+
const result = await resolveCallHints(session, []);
|
|
369
403
|
const parts = result.split(",");
|
|
370
404
|
|
|
371
405
|
// Target contact should be absent (lookup failed)
|
|
@@ -376,7 +410,7 @@ describe("resolveCallHints", () => {
|
|
|
376
410
|
expect(logWarnFn).toHaveBeenCalled();
|
|
377
411
|
});
|
|
378
412
|
|
|
379
|
-
test("listContacts failure is caught and logged without throwing", () => {
|
|
413
|
+
test("listContacts failure is caught and logged without throwing", async () => {
|
|
380
414
|
mockListContactsThrows = true;
|
|
381
415
|
mockTargetContact = makeContact("Alice");
|
|
382
416
|
|
|
@@ -390,7 +424,7 @@ describe("resolveCallHints", () => {
|
|
|
390
424
|
};
|
|
391
425
|
|
|
392
426
|
// Should not throw
|
|
393
|
-
const result = resolveCallHints(session, []);
|
|
427
|
+
const result = await resolveCallHints(session, []);
|
|
394
428
|
const parts = result.split(",");
|
|
395
429
|
|
|
396
430
|
// Recent contacts should be absent (listing failed)
|
|
@@ -401,7 +435,7 @@ describe("resolveCallHints", () => {
|
|
|
401
435
|
expect(logWarnFn).toHaveBeenCalled();
|
|
402
436
|
});
|
|
403
437
|
|
|
404
|
-
test("inbound call resolves caller contact from fromNumber", () => {
|
|
438
|
+
test("inbound call resolves caller contact from fromNumber", async () => {
|
|
405
439
|
mockTargetContact = makeContact("Alice");
|
|
406
440
|
mockRecentContacts = [makeContact("Bob")];
|
|
407
441
|
|
|
@@ -414,7 +448,7 @@ describe("resolveCallHints", () => {
|
|
|
414
448
|
inviteGuardianName: null,
|
|
415
449
|
};
|
|
416
450
|
|
|
417
|
-
const result = resolveCallHints(session, []);
|
|
451
|
+
const result = await resolveCallHints(session, []);
|
|
418
452
|
const parts = result.split(",");
|
|
419
453
|
|
|
420
454
|
// For inbound, the contact found via fromNumber should appear as caller, not target
|
|
@@ -425,10 +459,10 @@ describe("resolveCallHints", () => {
|
|
|
425
459
|
expect(logWarnFn).not.toHaveBeenCalled();
|
|
426
460
|
});
|
|
427
461
|
|
|
428
|
-
test("null session produces hints from assistant name, guardian name, and recent contacts", () => {
|
|
462
|
+
test("null session produces hints from assistant name, guardian name, and recent contacts", async () => {
|
|
429
463
|
mockRecentContacts = [makeContact("RecentOne"), makeContact("RecentTwo")];
|
|
430
464
|
|
|
431
|
-
const result = resolveCallHints(null, ["Static"]);
|
|
465
|
+
const result = await resolveCallHints(null, ["Static"]);
|
|
432
466
|
const parts = result.split(",");
|
|
433
467
|
|
|
434
468
|
expect(parts).toContain("Static");
|
|
@@ -130,6 +130,33 @@ describe("parseSubagentMessages", () => {
|
|
|
130
130
|
expect(result.objective).toBe("Research vampire lore");
|
|
131
131
|
});
|
|
132
132
|
|
|
133
|
+
test("emits toolUseId and raw input on tool_use, toolUseId on tool_result", () => {
|
|
134
|
+
const messages = [
|
|
135
|
+
msg("user", [{ type: "text", text: "Do something" }]),
|
|
136
|
+
msg("assistant", [
|
|
137
|
+
{
|
|
138
|
+
type: "tool_use",
|
|
139
|
+
id: "t-abc",
|
|
140
|
+
name: "bash",
|
|
141
|
+
input: { command: "ls -la" },
|
|
142
|
+
},
|
|
143
|
+
]),
|
|
144
|
+
msg("user", [
|
|
145
|
+
{ type: "tool_result", tool_use_id: "t-abc", content: "total 0" },
|
|
146
|
+
]),
|
|
147
|
+
];
|
|
148
|
+
|
|
149
|
+
const result = parseSubagentMessages("sub-1", messages);
|
|
150
|
+
const toolUse = result.events.find((e) => e.type === "tool_use");
|
|
151
|
+
expect(toolUse).toBeDefined();
|
|
152
|
+
expect(toolUse!.toolUseId).toBe("t-abc");
|
|
153
|
+
expect(toolUse!.input).toEqual({ command: "ls -la" });
|
|
154
|
+
|
|
155
|
+
const toolResult = result.events.find((e) => e.type === "tool_result");
|
|
156
|
+
expect(toolResult).toBeDefined();
|
|
157
|
+
expect(toolResult!.toolUseId).toBe("t-abc");
|
|
158
|
+
});
|
|
159
|
+
|
|
133
160
|
test("includes messageId on text events from assistant messages", () => {
|
|
134
161
|
const messages = [
|
|
135
162
|
msg("user", [{ type: "text", text: "Do something" }]),
|
|
@@ -326,3 +326,68 @@ describe("SubagentManager terminal disposal", () => {
|
|
|
326
326
|
asInternals(manager).stopSweep();
|
|
327
327
|
});
|
|
328
328
|
});
|
|
329
|
+
|
|
330
|
+
describe("SubagentManager.abort usage", () => {
|
|
331
|
+
test("emits the conversation's latest usage on abort, not zeros", () => {
|
|
332
|
+
const manager = new SubagentManager();
|
|
333
|
+
const sent: ServerMessage[] = [];
|
|
334
|
+
const sender = (msg: ServerMessage) => sent.push(msg);
|
|
335
|
+
|
|
336
|
+
const subagentId = "sa-abort-usage";
|
|
337
|
+
// state.usage starts at {0,0,0}; the live (fake) conversation has accrued
|
|
338
|
+
// usage (makeFakeConversation → {100, 50, 0.005}). Wire `sender` as the
|
|
339
|
+
// stored parent sender so `setStatus` routes the terminal event through it.
|
|
340
|
+
injectFakeSubagent(manager, subagentId, makeState(subagentId), sender);
|
|
341
|
+
|
|
342
|
+
const aborted = manager.abort(subagentId, sender, undefined, {
|
|
343
|
+
suppressNotification: true,
|
|
344
|
+
});
|
|
345
|
+
expect(aborted).toBe(true);
|
|
346
|
+
|
|
347
|
+
const statusMsg = sent.find(
|
|
348
|
+
(m): m is Extract<ServerMessage, { type: "subagent_status_changed" }> =>
|
|
349
|
+
m.type === "subagent_status_changed",
|
|
350
|
+
);
|
|
351
|
+
expect(statusMsg).toBeDefined();
|
|
352
|
+
expect(statusMsg!.status).toBe("aborted");
|
|
353
|
+
// The emitted usage is the conversation's accrued total — NOT the {0,0,0}
|
|
354
|
+
// init — so the client doesn't flush the token panel to zero on stop.
|
|
355
|
+
expect(statusMsg!.usage).toEqual({
|
|
356
|
+
inputTokens: 100,
|
|
357
|
+
outputTokens: 50,
|
|
358
|
+
estimatedCost: 0.005,
|
|
359
|
+
});
|
|
360
|
+
|
|
361
|
+
asInternals(manager).stopSweep();
|
|
362
|
+
});
|
|
363
|
+
|
|
364
|
+
test("keeps the last-known state.usage when the conversation was already released", () => {
|
|
365
|
+
const manager = new SubagentManager();
|
|
366
|
+
const sent: ServerMessage[] = [];
|
|
367
|
+
const sender = (msg: ServerMessage) => sent.push(msg);
|
|
368
|
+
|
|
369
|
+
const subagentId = "sa-abort-no-conv";
|
|
370
|
+
// No live conversation (released), but state carries a last-known usage —
|
|
371
|
+
// the abort must surface that, not overwrite it.
|
|
372
|
+
const state = makeState(subagentId, {
|
|
373
|
+
usage: { inputTokens: 320, outputTokens: 80, estimatedCost: 0.004 },
|
|
374
|
+
});
|
|
375
|
+
injectFakeSubagent(manager, subagentId, state, sender, null);
|
|
376
|
+
|
|
377
|
+
manager.abort(subagentId, sender, undefined, {
|
|
378
|
+
suppressNotification: true,
|
|
379
|
+
});
|
|
380
|
+
|
|
381
|
+
const statusMsg = sent.find(
|
|
382
|
+
(m): m is Extract<ServerMessage, { type: "subagent_status_changed" }> =>
|
|
383
|
+
m.type === "subagent_status_changed",
|
|
384
|
+
);
|
|
385
|
+
expect(statusMsg!.usage).toEqual({
|
|
386
|
+
inputTokens: 320,
|
|
387
|
+
outputTokens: 80,
|
|
388
|
+
estimatedCost: 0.004,
|
|
389
|
+
});
|
|
390
|
+
|
|
391
|
+
asInternals(manager).stopSweep();
|
|
392
|
+
});
|
|
393
|
+
});
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for decoupling message-inheritance from prompt source and role on
|
|
3
|
+
* context-inheriting subagents (forks).
|
|
4
|
+
*
|
|
5
|
+
* A fork normally pins the parent's system prompt verbatim and keeps the
|
|
6
|
+
* `general` role so its KV cache stays aligned with the parent. These tests
|
|
7
|
+
* verify the opt-out paths: a fork may supply its own `systemPromptOverride`
|
|
8
|
+
* (which is used as-is and does NOT set `hasSystemPromptOverride`), and a fork
|
|
9
|
+
* may carry an explicit read-only role (whose tool allowlist is applied). A
|
|
10
|
+
* plain fork (no override, no role) must still behave exactly as before.
|
|
11
|
+
*
|
|
12
|
+
* The harness stubs `Conversation` and the spawn() dependencies so we can call
|
|
13
|
+
* `SubagentManager.spawn()` directly and capture the constructed conversation's
|
|
14
|
+
* system prompt, `hasSystemPromptOverride` flag, and allowed-tools set.
|
|
15
|
+
*/
|
|
16
|
+
import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
|
|
17
|
+
|
|
18
|
+
import type { ServerMessage } from "../daemon/message-protocol.js";
|
|
19
|
+
|
|
20
|
+
// ── Captured constructor state ──────────────────────────────────────────────
|
|
21
|
+
|
|
22
|
+
interface CapturedConversationState {
|
|
23
|
+
systemPrompt: string;
|
|
24
|
+
hasSystemPromptOverride: boolean;
|
|
25
|
+
allowedTools: Set<string> | undefined;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const capturedConversations: CapturedConversationState[] = [];
|
|
29
|
+
|
|
30
|
+
// Stub Conversation so spawn() never runs an agent loop — we only inspect how
|
|
31
|
+
// it was constructed and configured.
|
|
32
|
+
class FakeConversation {
|
|
33
|
+
private readonly captured: CapturedConversationState;
|
|
34
|
+
|
|
35
|
+
constructor(
|
|
36
|
+
_id: string,
|
|
37
|
+
_provider: unknown,
|
|
38
|
+
systemPrompt: string,
|
|
39
|
+
_sendToClient: (msg: ServerMessage) => void,
|
|
40
|
+
_workingDir: string,
|
|
41
|
+
_options?: unknown,
|
|
42
|
+
) {
|
|
43
|
+
this.captured = {
|
|
44
|
+
systemPrompt,
|
|
45
|
+
hasSystemPromptOverride: false,
|
|
46
|
+
allowedTools: undefined,
|
|
47
|
+
};
|
|
48
|
+
capturedConversations.push(this.captured);
|
|
49
|
+
}
|
|
50
|
+
set hasSystemPromptOverride(value: boolean) {
|
|
51
|
+
this.captured.hasSystemPromptOverride = value;
|
|
52
|
+
}
|
|
53
|
+
get hasSystemPromptOverride(): boolean {
|
|
54
|
+
return this.captured.hasSystemPromptOverride;
|
|
55
|
+
}
|
|
56
|
+
conversationType = "background";
|
|
57
|
+
updateClient() {}
|
|
58
|
+
setIsSubagent() {}
|
|
59
|
+
setTrustContext() {}
|
|
60
|
+
setAuthContext() {}
|
|
61
|
+
getAuthContext() {
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
setAssistantId() {}
|
|
65
|
+
setSubagentAllowedTools(tools: Set<string>) {
|
|
66
|
+
this.captured.allowedTools = tools;
|
|
67
|
+
}
|
|
68
|
+
setPreactivatedSkillIds() {}
|
|
69
|
+
injectInheritedContext() {}
|
|
70
|
+
abort() {}
|
|
71
|
+
dispose() {}
|
|
72
|
+
messages = [];
|
|
73
|
+
usageStats = { inputTokens: 0, outputTokens: 0, estimatedCost: 0 };
|
|
74
|
+
sendToClient() {}
|
|
75
|
+
persistUserMessage() {
|
|
76
|
+
return { id: "msg-id", deduplicated: false };
|
|
77
|
+
}
|
|
78
|
+
runAgentLoop() {
|
|
79
|
+
return Promise.resolve();
|
|
80
|
+
}
|
|
81
|
+
getCurrentSystemPrompt() {
|
|
82
|
+
return "resolved-parent-prompt";
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
mock.module("../daemon/conversation.js", () => ({
|
|
87
|
+
Conversation: FakeConversation,
|
|
88
|
+
}));
|
|
89
|
+
|
|
90
|
+
mock.module("../memory/conversation-bootstrap.js", () => ({
|
|
91
|
+
bootstrapConversation: () => ({ id: "conv-id" }),
|
|
92
|
+
}));
|
|
93
|
+
|
|
94
|
+
// Resolve a stub provider without touching connections/DB.
|
|
95
|
+
const providerStub = { name: "anthropic", sendMessage: async () => ({}) };
|
|
96
|
+
|
|
97
|
+
mock.module("../providers/connection-resolution.js", () => ({
|
|
98
|
+
resolveDefaultProvider: async () => providerStub,
|
|
99
|
+
}));
|
|
100
|
+
|
|
101
|
+
mock.module("../providers/call-site-routing.js", () => ({
|
|
102
|
+
wrapWithCallSiteRouting: (p: unknown) => p,
|
|
103
|
+
}));
|
|
104
|
+
|
|
105
|
+
mock.module("../config/loader.js", () => ({
|
|
106
|
+
getConfig: () => ({
|
|
107
|
+
llm: { default: { provider: "anthropic", model: "claude-opus-4-7" } },
|
|
108
|
+
rateLimit: { maxRequestsPerMinute: 0 },
|
|
109
|
+
}),
|
|
110
|
+
}));
|
|
111
|
+
|
|
112
|
+
mock.module("../config/llm-resolver.js", () => ({
|
|
113
|
+
resolveCallSiteConfig: () => ({ provider: "anthropic", maxTokens: 8192 }),
|
|
114
|
+
}));
|
|
115
|
+
|
|
116
|
+
mock.module("../util/logger.js", () => ({
|
|
117
|
+
getLogger: () =>
|
|
118
|
+
new Proxy({} as Record<string, unknown>, { get: () => () => {} }),
|
|
119
|
+
}));
|
|
120
|
+
|
|
121
|
+
// ── Imports (after mocks) ───────────────────────────────────────────────────
|
|
122
|
+
|
|
123
|
+
import { clearConversations } from "../daemon/conversation-registry.js";
|
|
124
|
+
import { SubagentManager } from "../subagent/manager.js";
|
|
125
|
+
import type { SubagentConfig } from "../subagent/types.js";
|
|
126
|
+
|
|
127
|
+
const PARENT_PROMPT = "You are the parent's system prompt.";
|
|
128
|
+
|
|
129
|
+
type SpawnConfig = Omit<SubagentConfig, "id">;
|
|
130
|
+
|
|
131
|
+
function makeForkSpawnConfig(
|
|
132
|
+
overrides: Partial<SpawnConfig> = {},
|
|
133
|
+
): SpawnConfig {
|
|
134
|
+
return {
|
|
135
|
+
parentConversationId: `parent-${Math.random().toString(36).slice(2)}`,
|
|
136
|
+
label: "test fork",
|
|
137
|
+
objective: "do something",
|
|
138
|
+
fork: true,
|
|
139
|
+
parentSystemPrompt: PARENT_PROMPT,
|
|
140
|
+
...overrides,
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
describe("SubagentManager fork — prompt source and role decoupling", () => {
|
|
145
|
+
let manager: SubagentManager;
|
|
146
|
+
|
|
147
|
+
beforeEach(() => {
|
|
148
|
+
clearConversations();
|
|
149
|
+
capturedConversations.length = 0;
|
|
150
|
+
manager = new SubagentManager();
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
afterEach(() => {
|
|
154
|
+
(manager as unknown as { stopSweep: () => void }).stopSweep();
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
/** Spawn a fork and return the single conversation that spawn() constructed. */
|
|
158
|
+
async function spawnFork(
|
|
159
|
+
overrides: Partial<SpawnConfig> = {},
|
|
160
|
+
): Promise<CapturedConversationState> {
|
|
161
|
+
await manager.spawn(makeForkSpawnConfig(overrides), () => {});
|
|
162
|
+
const created = capturedConversations[0];
|
|
163
|
+
if (!created) throw new Error("Expected a subagent conversation");
|
|
164
|
+
return created;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
test("fork with systemPromptOverride uses that prompt and does not set hasSystemPromptOverride", async () => {
|
|
168
|
+
const overridePrompt = "You are an advisor. Frame the context as advice.";
|
|
169
|
+
const created = await spawnFork({ systemPromptOverride: overridePrompt });
|
|
170
|
+
|
|
171
|
+
expect(created.systemPrompt).toBe(overridePrompt);
|
|
172
|
+
expect(created.hasSystemPromptOverride).toBe(false);
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
test("fork with explicit read-only role applies the role allowlist via setSubagentAllowedTools", async () => {
|
|
176
|
+
const created = await spawnFork({ role: "researcher" });
|
|
177
|
+
|
|
178
|
+
// The researcher role is read-only; its allowlist must be applied even for
|
|
179
|
+
// a fork.
|
|
180
|
+
expect(created.allowedTools).toBeInstanceOf(Set);
|
|
181
|
+
expect(created.allowedTools?.has("web_search")).toBe(true);
|
|
182
|
+
expect(created.allowedTools?.has("file_read")).toBe(true);
|
|
183
|
+
expect(created.allowedTools?.has("bash")).toBe(false);
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
test("plain fork (no override, no role) keeps parent prompt verbatim, general tools, and sets hasSystemPromptOverride", async () => {
|
|
187
|
+
const created = await spawnFork();
|
|
188
|
+
|
|
189
|
+
// Parent prompt verbatim, no tool filter (general role has no allowlist),
|
|
190
|
+
// and the prompt is pinned for KV-cache alignment.
|
|
191
|
+
expect(created.systemPrompt).toBe(PARENT_PROMPT);
|
|
192
|
+
expect(created.allowedTools).toBeUndefined();
|
|
193
|
+
expect(created.hasSystemPromptOverride).toBe(true);
|
|
194
|
+
});
|
|
195
|
+
});
|
|
@@ -273,7 +273,7 @@ describe("SubagentManager fork spawn", () => {
|
|
|
273
273
|
expect(memoryPolicy.includeDefaultFallback).toBe(true);
|
|
274
274
|
});
|
|
275
275
|
|
|
276
|
-
test("fork
|
|
276
|
+
test("fork defaults to general role (which has no tool allowlist)", async () => {
|
|
277
277
|
const manager = new SubagentManager();
|
|
278
278
|
const subagentId = "sub-fork-role";
|
|
279
279
|
|
|
@@ -286,14 +286,16 @@ describe("SubagentManager fork spawn", () => {
|
|
|
286
286
|
fakeConversation.injectInheritedContext = () => {};
|
|
287
287
|
fakeConversation.setSubagentAllowedTools = () => {};
|
|
288
288
|
|
|
289
|
-
//
|
|
290
|
-
//
|
|
289
|
+
// A fork that does not request a role defaults to "general", which has
|
|
290
|
+
// `allowedTools: undefined` — so no tool filter is applied. (An explicit
|
|
291
|
+
// non-general role on a fork IS honored; that path is covered in
|
|
292
|
+
// subagent-fork-prompt-role.test.ts.)
|
|
291
293
|
const state = makeState(
|
|
292
294
|
subagentId,
|
|
293
295
|
{ isFork: true },
|
|
294
296
|
{
|
|
295
297
|
fork: true,
|
|
296
|
-
role: "general",
|
|
298
|
+
role: "general",
|
|
297
299
|
parentMessages: FAKE_PARENT_MESSAGES,
|
|
298
300
|
parentSystemPrompt: "Parent system prompt.",
|
|
299
301
|
},
|
|
@@ -303,9 +305,6 @@ describe("SubagentManager fork spawn", () => {
|
|
|
303
305
|
|
|
304
306
|
await asInternals(manager).runSubagent(subagentId, "Do something");
|
|
305
307
|
|
|
306
|
-
// Tool filtering is only applied in spawn(), not runSubagent(), so we
|
|
307
|
-
// verify the logic directly: forks skip setSubagentAllowedTools.
|
|
308
|
-
// For this test, we verify the fork's role is general (which has no allowedTools).
|
|
309
308
|
expect(state.config.role).toBe("general");
|
|
310
309
|
|
|
311
310
|
asInternals(manager).stopSweep();
|
|
@@ -4,6 +4,8 @@ import { describe, expect, mock, test } from "bun:test";
|
|
|
4
4
|
|
|
5
5
|
// Mock conversation-crud before importing tool executors that depend on it.
|
|
6
6
|
mock.module("../memory/conversation-crud.js", () => ({
|
|
7
|
+
setConversationProcessingStartedAt: () => {},
|
|
8
|
+
isConversationProcessing: () => false,
|
|
7
9
|
setConversationOriginChannelIfUnset: () => {},
|
|
8
10
|
updateConversationContextWindow: () => {},
|
|
9
11
|
deleteMessageById: () => {},
|
|
@@ -13,6 +13,7 @@ const ALL_ROLES: SubagentRole[] = [
|
|
|
13
13
|
"coder",
|
|
14
14
|
"planner",
|
|
15
15
|
"investigator",
|
|
16
|
+
"advisor",
|
|
16
17
|
];
|
|
17
18
|
|
|
18
19
|
describe("SUBAGENT_ROLE_REGISTRY", () => {
|
|
@@ -32,18 +33,30 @@ describe("SUBAGENT_ROLE_REGISTRY", () => {
|
|
|
32
33
|
expect(SUBAGENT_ROLE_REGISTRY.general.allowedTools).toBeUndefined();
|
|
33
34
|
});
|
|
34
35
|
|
|
35
|
-
test("all
|
|
36
|
+
test("all scoped tool-using roles have allowedTools as a non-empty array", () => {
|
|
36
37
|
for (const role of ALL_ROLES) {
|
|
37
|
-
|
|
38
|
+
// 'general' has no filter (undefined); 'advisor' is tool-less (empty).
|
|
39
|
+
if (role === "general" || role === "advisor") continue;
|
|
38
40
|
const config = SUBAGENT_ROLE_REGISTRY[role];
|
|
39
41
|
expect(Array.isArray(config.allowedTools)).toBe(true);
|
|
40
42
|
expect(config.allowedTools!.length).toBeGreaterThan(0);
|
|
41
43
|
}
|
|
42
44
|
});
|
|
43
45
|
|
|
44
|
-
test(
|
|
46
|
+
test("advisor is tool-less with an empty allowedTools array", () => {
|
|
47
|
+
const config = SUBAGENT_ROLE_REGISTRY.advisor;
|
|
48
|
+
expect(config.allowedTools).toEqual([]);
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
test("SubagentRole type includes advisor", () => {
|
|
52
|
+
const advisor: SubagentRole = "advisor";
|
|
53
|
+
expect(SUBAGENT_ROLE_REGISTRY[advisor]).toBeDefined();
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
test('every role with a non-empty allowlist includes "notify_parent"', () => {
|
|
45
57
|
for (const [_role, config] of Object.entries(SUBAGENT_ROLE_REGISTRY)) {
|
|
46
|
-
|
|
58
|
+
// 'advisor' is tool-less (empty allowlist) and intentionally has none.
|
|
59
|
+
if (config.allowedTools !== undefined && config.allowedTools.length > 0) {
|
|
47
60
|
expect(config.allowedTools).toContain("notify_parent");
|
|
48
61
|
}
|
|
49
62
|
}
|
|
@@ -70,8 +83,11 @@ describe("SUBAGENT_ROLE_REGISTRY", () => {
|
|
|
70
83
|
expect(SUBAGENT_ROLE_REGISTRY.planner.allowedTools!).toContain("recall");
|
|
71
84
|
});
|
|
72
85
|
|
|
73
|
-
test(
|
|
74
|
-
|
|
86
|
+
test("investigator is shell-free and uses code_search for code/log investigation", () => {
|
|
87
|
+
const tools = SUBAGENT_ROLE_REGISTRY.investigator.allowedTools!;
|
|
88
|
+
expect(tools).not.toContain("bash");
|
|
89
|
+
expect(tools).not.toContain("host_bash");
|
|
90
|
+
expect(tools).toContain("code_search");
|
|
75
91
|
});
|
|
76
92
|
|
|
77
93
|
test("investigator excludes file write tools (read-only investigation)", () => {
|
|
@@ -85,6 +101,8 @@ describe("SUBAGENT_ROLE_REGISTRY", () => {
|
|
|
85
101
|
expect(preamble).toContain("Root cause");
|
|
86
102
|
expect(preamble).toContain("Evidence");
|
|
87
103
|
expect(preamble).toContain("notify_parent");
|
|
104
|
+
expect(preamble).not.toContain("shell access");
|
|
105
|
+
expect(preamble).toContain("code_search");
|
|
88
106
|
});
|
|
89
107
|
|
|
90
108
|
test("no role references the old memory_recall tool name", () => {
|