@vellumai/assistant 0.4.44 → 0.4.45
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/.prettierignore +4 -0
- package/ARCHITECTURE.md +34 -31
- package/README.md +4 -4
- package/bun.lock +10 -35
- package/docs/architecture/integrations.md +102 -197
- package/docs/architecture/keychain-broker.md +1 -1
- package/docs/architecture/memory.md +2 -2
- package/docs/architecture/scheduling.md +1 -1
- package/docs/architecture/security.md +11 -11
- package/docs/error-handling.md +1 -1
- package/docs/trusted-contact-access.md +3 -3
- package/drizzle/meta/0000_snapshot.json +34 -100
- package/drizzle/meta/_journal.json +1 -1
- package/drizzle.config.ts +4 -4
- package/package.json +3 -2
- package/scripts/capture-x-graphql.ts +237 -141
- package/scripts/generate-bundled-tool-registry.ts +223 -0
- package/src/__tests__/access-request-decision.test.ts +0 -1
- package/src/__tests__/actor-token-service.test.ts +23 -24
- package/src/__tests__/agent-loop.test.ts +0 -131
- package/src/__tests__/always-loaded-tools-guard.test.ts +71 -0
- package/src/__tests__/amazon-cdp-integration.test.ts +11 -9
- package/src/__tests__/approval-primitive.test.ts +0 -1
- package/src/__tests__/approval-routes-http.test.ts +11 -1
- package/src/__tests__/asset-materialize-tool.test.ts +0 -1
- package/src/__tests__/asset-search-tool.test.ts +0 -1
- package/src/__tests__/assistant-attachment-directive.test.ts +1 -1
- package/src/__tests__/assistant-events-sse-hardening.test.ts +0 -1
- package/src/__tests__/assistant-feature-flag-guardrails.test.ts +0 -2
- package/src/__tests__/assistant-feature-flags-integration.test.ts +70 -18
- package/src/__tests__/assistant-id-boundary-guard.test.ts +6 -6
- package/src/__tests__/attachments-store.test.ts +0 -1
- package/src/__tests__/avatar-e2e.test.ts +74 -115
- package/src/__tests__/avatar-router.test.ts +25 -62
- package/src/__tests__/browser-manager.test.ts +24 -0
- package/src/__tests__/browser-skill-baseline-tool-payload.test.ts +4 -3
- package/src/__tests__/browser-skill-endstate.test.ts +8 -11
- package/src/__tests__/btw-routes.test.ts +326 -0
- package/src/__tests__/bundled-skill-retrieval-guard.test.ts +23 -9
- package/src/__tests__/call-controller.test.ts +0 -1
- package/src/__tests__/call-conversation-messages.test.ts +0 -1
- package/src/__tests__/call-domain.test.ts +0 -1
- package/src/__tests__/call-pointer-messages.test.ts +0 -1
- package/src/__tests__/call-recovery.test.ts +0 -1
- package/src/__tests__/call-routes-http.test.ts +0 -1
- package/src/__tests__/call-store.test.ts +0 -1
- package/src/__tests__/canonical-guardian-store.test.ts +0 -1
- package/src/__tests__/channel-approval-routes.test.ts +1 -1
- package/src/__tests__/channel-approvals.test.ts +1 -1
- package/src/__tests__/channel-delivery-store.test.ts +0 -1
- package/src/__tests__/channel-guardian.test.ts +5 -7
- package/src/__tests__/channel-retry-sweep.test.ts +0 -1
- package/src/__tests__/checker.test.ts +4 -11
- package/src/__tests__/compaction.benchmark.test.ts +16 -14
- package/src/__tests__/computer-use-session-lifecycle.test.ts +10 -11
- package/src/__tests__/computer-use-session-working-dir.test.ts +2 -6
- package/src/__tests__/computer-use-skill-lifecycle-cleanup.test.ts +2 -5
- package/src/__tests__/computer-use-tools.test.ts +35 -31
- package/src/__tests__/config-schema.test.ts +11 -15
- package/src/__tests__/config-watcher.test.ts +0 -1
- package/src/__tests__/confirmation-request-guardian-bridge.test.ts +0 -1
- package/src/__tests__/conflict-store.test.ts +0 -1
- package/src/__tests__/connection-policy.test.ts +4 -7
- package/src/__tests__/contacts-tools.test.ts +0 -1
- package/src/__tests__/context-memory-e2e.test.ts +2 -4
- package/src/__tests__/context-overflow-reducer.test.ts +2 -4
- package/src/__tests__/context-window-manager.test.ts +147 -60
- package/src/__tests__/contradiction-checker.test.ts +0 -1
- package/src/__tests__/conversation-attention-store.test.ts +0 -1
- package/src/__tests__/conversation-attention-telegram.test.ts +1 -1
- package/src/__tests__/conversation-pairing.test.ts +2 -2
- package/src/__tests__/conversation-routes-guardian-reply.test.ts +25 -1
- package/src/__tests__/conversation-routes-slash-commands.test.ts +381 -0
- package/src/__tests__/conversation-store.test.ts +0 -1
- package/src/__tests__/conversation-unread-route.test.ts +1 -2
- package/src/__tests__/credential-security-invariants.test.ts +7 -8
- package/src/__tests__/cross-provider-web-search.test.ts +353 -0
- package/src/__tests__/daemon-assistant-events.test.ts +6 -7
- package/src/__tests__/db-schedule-syntax-migration.test.ts +15 -3
- package/src/__tests__/delete-managed-skill-tool.test.ts +5 -9
- package/src/__tests__/deterministic-verification-control-plane.test.ts +0 -1
- package/src/__tests__/diagnostics-export.test.ts +189 -0
- package/src/__tests__/dynamic-skill-workflow-prompt.test.ts +0 -1
- package/src/__tests__/emit-signal-routing-intent.test.ts +3 -3
- package/src/__tests__/entity-extractor.test.ts +0 -1
- package/src/__tests__/entity-search.test.ts +0 -1
- package/src/__tests__/ephemeral-permissions.test.ts +2 -4
- package/src/__tests__/file-read-tool.test.ts +86 -0
- package/src/__tests__/followup-tools.test.ts +0 -1
- package/src/__tests__/frontmatter.test.ts +77 -34
- package/src/__tests__/gateway-only-enforcement.test.ts +0 -1
- package/src/__tests__/gateway-only-guard.test.ts +1 -1
- package/src/__tests__/guardian-action-conversation-turn.test.ts +0 -1
- package/src/__tests__/guardian-action-followup-executor.test.ts +0 -1
- package/src/__tests__/guardian-action-followup-store.test.ts +0 -1
- package/src/__tests__/guardian-action-grant-mint-consume.test.ts +0 -1
- package/src/__tests__/guardian-action-late-reply.test.ts +0 -1
- package/src/__tests__/guardian-action-store.test.ts +0 -1
- package/src/__tests__/guardian-action-sweep.test.ts +0 -1
- package/src/__tests__/guardian-decision-primitive-canonical.test.ts +0 -1
- package/src/__tests__/guardian-dispatch.test.ts +1 -2
- package/src/__tests__/guardian-grant-minting.test.ts +1 -1
- package/src/__tests__/guardian-outbound-http.test.ts +0 -1
- package/src/__tests__/guardian-principal-id-roundtrip.test.ts +0 -1
- package/src/__tests__/guardian-routing-invariants.test.ts +1 -1
- package/src/__tests__/guardian-routing-state.test.ts +0 -1
- package/src/__tests__/guardian-verification-voice-binding.test.ts +0 -1
- package/src/__tests__/guardian-verify-setup-skill-regression.test.ts +3 -5
- package/src/__tests__/handlers-user-message-approval-consumption.test.ts +28 -426
- package/src/__tests__/host-bash-proxy.test.ts +335 -0
- package/src/__tests__/host-file-proxy.test.ts +374 -0
- package/src/__tests__/host-shell-tool.test.ts +147 -1
- package/src/__tests__/http-user-message-parity.test.ts +361 -0
- package/src/__tests__/inbound-invite-redemption.test.ts +0 -1
- package/src/__tests__/integration-status.test.ts +3 -8
- package/src/__tests__/intent-routing.test.ts +7 -46
- package/src/__tests__/invite-redemption-service.test.ts +0 -1
- package/src/__tests__/invite-routes-http.test.ts +0 -1
- package/src/__tests__/llm-usage-store.test.ts +0 -1
- package/src/__tests__/managed-avatar-client.test.ts +101 -55
- package/src/__tests__/managed-skill-lifecycle.test.ts +9 -18
- package/src/__tests__/managed-store.test.ts +94 -21
- package/src/__tests__/media-reuse-story.e2e.test.ts +0 -1
- package/src/__tests__/memory-context-benchmark.benchmark.test.ts +2 -4
- package/src/__tests__/memory-lifecycle-e2e.test.ts +0 -1
- package/src/__tests__/memory-recall-quality.test.ts +0 -1
- package/src/__tests__/memory-regressions.experimental.test.ts +0 -1
- package/src/__tests__/memory-regressions.test.ts +0 -1
- package/src/__tests__/memory-retrieval.benchmark.test.ts +0 -1
- package/src/__tests__/memory-upsert-concurrency.test.ts +0 -1
- package/src/__tests__/messaging-send-tool.test.ts +35 -0
- package/src/__tests__/messaging-skill-split.test.ts +138 -0
- package/src/__tests__/migration-cross-version-compatibility.test.ts +0 -1
- package/src/__tests__/migration-export-http.test.ts +2 -3
- package/src/__tests__/migration-import-commit-http.test.ts +1 -2
- package/src/__tests__/migration-import-preflight-http.test.ts +1 -2
- package/src/__tests__/migration-validate-http.test.ts +1 -2
- package/src/__tests__/native-web-search.test.ts +475 -0
- package/src/__tests__/navigate-settings-tab.test.ts +84 -0
- package/src/__tests__/non-member-access-request.test.ts +0 -1
- package/src/__tests__/notification-broadcaster.test.ts +15 -15
- package/src/__tests__/notification-decision-strategy.test.ts +6 -6
- package/src/__tests__/notification-deep-link.test.ts +7 -7
- package/src/__tests__/notification-guardian-path.test.ts +2 -3
- package/src/__tests__/notification-telegram-adapter.test.ts +1 -1
- package/src/__tests__/notification-thread-candidates.test.ts +4 -4
- package/src/__tests__/onboarding-starter-tasks.test.ts +0 -1
- package/src/__tests__/playbook-execution.test.ts +0 -1
- package/src/__tests__/playbook-tools.test.ts +0 -1
- package/src/__tests__/profile-compiler.test.ts +0 -1
- package/src/__tests__/provider-managed-proxy-integration.test.ts +25 -0
- package/src/__tests__/qdrant-collection-migration.test.ts +223 -0
- package/src/__tests__/recording-handler.test.ts +30 -94
- package/src/__tests__/registry.test.ts +28 -35
- package/src/__tests__/relay-server.test.ts +0 -1
- package/src/__tests__/ride-shotgun-handler.test.ts +4 -20
- package/src/__tests__/runtime-attachment-metadata.test.ts +0 -1
- package/src/__tests__/runtime-events-sse-parity.test.ts +3 -4
- package/src/__tests__/runtime-events-sse.test.ts +0 -1
- package/src/__tests__/sandbox-diagnostics.test.ts +0 -1
- package/src/__tests__/scaffold-managed-skill-tool.test.ts +30 -28
- package/src/__tests__/schedule-store.test.ts +441 -1
- package/src/__tests__/schedule-tools.test.ts +468 -7
- package/src/__tests__/scheduler-recurrence.test.ts +196 -23
- package/src/__tests__/scoped-approval-grants.test.ts +0 -1
- package/src/__tests__/scoped-grant-security-matrix.test.ts +0 -1
- package/src/__tests__/secret-prompt-log-hygiene.test.ts +6 -3
- package/src/__tests__/secret-response-routing.test.ts +4 -1
- package/src/__tests__/send-endpoint-busy.test.ts +14 -2
- package/src/__tests__/send-notification-tool.test.ts +0 -7
- package/src/__tests__/sequence-store.test.ts +0 -1
- package/src/__tests__/server-history-render.test.ts +1 -2
- package/src/__tests__/session-abort-tool-results.test.ts +0 -1
- package/src/__tests__/session-agent-loop.test.ts +46 -6
- package/src/__tests__/session-confirmation-signals.test.ts +0 -1
- package/src/__tests__/session-conflict-gate.test.ts +2 -6
- package/src/__tests__/session-error.test.ts +5 -14
- package/src/__tests__/session-init.benchmark.test.ts +3 -5
- package/src/__tests__/session-load-history-repair.test.ts +0 -1
- package/src/__tests__/session-media-retry.test.ts +12 -74
- package/src/__tests__/session-pre-run-repair.test.ts +0 -1
- package/src/__tests__/session-profile-injection.test.ts +2 -6
- package/src/__tests__/session-provider-retry-repair.test.ts +2 -6
- package/src/__tests__/session-queue.test.ts +94 -139
- package/src/__tests__/session-skill-tools.test.ts +115 -115
- package/src/__tests__/session-slash-known.test.ts +0 -1
- package/src/__tests__/session-slash-queue.test.ts +0 -1
- package/src/__tests__/session-slash-unknown.test.ts +0 -1
- package/src/__tests__/session-surfaces-task-progress.test.ts +34 -0
- package/src/__tests__/session-usage.test.ts +0 -1
- package/src/__tests__/session-workspace-cache-state.test.ts +2 -6
- package/src/__tests__/session-workspace-injection.test.ts +2 -6
- package/src/__tests__/session-workspace-tool-tracking.test.ts +2 -6
- package/src/__tests__/skill-feature-flags-integration.test.ts +180 -184
- package/src/__tests__/skill-feature-flags.test.ts +125 -18
- package/src/__tests__/skill-load-feature-flag.test.ts +1 -2
- package/src/__tests__/skill-load-tool.test.ts +194 -2
- package/src/__tests__/skill-projection-feature-flag.test.ts +27 -16
- package/src/__tests__/skill-projection.benchmark.test.ts +15 -14
- package/src/__tests__/skills.test.ts +14 -53
- package/src/__tests__/slack-channel-config.test.ts +0 -1
- package/src/__tests__/slack-inbound-verification.test.ts +0 -1
- package/src/__tests__/slack-skill.test.ts +1 -1
- package/src/__tests__/subagent-tools.test.ts +2 -2
- package/src/__tests__/system-prompt.test.ts +4 -3
- package/src/__tests__/task-compiler.test.ts +0 -1
- package/src/__tests__/task-management-tools.test.ts +0 -1
- package/src/__tests__/task-memory-cleanup.test.ts +0 -1
- package/src/__tests__/task-runner.test.ts +0 -1
- package/src/__tests__/task-scheduler.test.ts +0 -1
- package/src/__tests__/terminal-tools.test.ts +0 -1
- package/src/__tests__/test-support/computer-use-skill-harness.ts +2 -4
- package/src/__tests__/thread-seed-composer.test.ts +5 -5
- package/src/__tests__/tool-approval-handler.test.ts +0 -1
- package/src/__tests__/tool-execution-abort-cleanup.test.ts +0 -1
- package/src/__tests__/tool-execution-pipeline.benchmark.test.ts +0 -1
- package/src/__tests__/tool-executor.test.ts +8 -86
- package/src/__tests__/tool-grant-request-escalation.test.ts +0 -1
- package/src/__tests__/tool-notification-listener.test.ts +1 -1
- package/src/__tests__/tool-preview-lifecycle.test.ts +416 -0
- package/src/__tests__/trust-store.test.ts +80 -4
- package/src/__tests__/trusted-contact-approval-notifier.test.ts +0 -1
- package/src/__tests__/trusted-contact-inline-approval-integration.test.ts +0 -1
- package/src/__tests__/trusted-contact-lifecycle-notifications.test.ts +0 -1
- package/src/__tests__/trusted-contact-multichannel.test.ts +0 -1
- package/src/__tests__/trusted-contact-verification.test.ts +0 -1
- package/src/__tests__/twilio-provider.test.ts +0 -1
- package/src/__tests__/twilio-routes.test.ts +0 -1
- package/src/__tests__/{request-file-tool.test.ts → ui-file-upload-surface.test.ts} +11 -72
- package/src/__tests__/update-bulletin.test.ts +0 -1
- package/src/__tests__/usage-cache-backfill-migration.test.ts +0 -1
- package/src/__tests__/usage-routes.test.ts +0 -1
- package/src/__tests__/verification-control-plane-policy.test.ts +4 -4
- package/src/__tests__/voice-invite-redemption.test.ts +0 -1
- package/src/__tests__/voice-scoped-grant-consumer.test.ts +0 -1
- package/src/__tests__/voice-session-bridge.test.ts +9 -1
- package/src/__tests__/web-fetch.test.ts +57 -0
- package/src/__tests__/workspace-git-service.test.ts +5 -14
- package/src/__tests__/workspace-policy.test.ts +0 -1
- package/src/agent/loop.ts +22 -34
- package/src/bundler/bundle-signer.ts +4 -4
- package/src/calls/call-controller.ts +1 -1
- package/src/calls/relay-server.ts +1 -1
- package/src/calls/twilio-rest.ts +1 -1
- package/src/calls/voice-session-bridge.ts +3 -1
- package/src/cli/__tests__/notifications.test.ts +3 -4
- package/src/cli/commands/map.ts +2 -6
- package/src/cli/commands/mcp.ts +73 -15
- package/src/cli/commands/notifications.ts +4 -4
- package/src/cli/commands/sessions.ts +9 -1
- package/src/cli/commands/skills.ts +6 -10
- package/src/cli/http-client.ts +2 -3
- package/src/cli/main-screen.tsx +10 -10
- package/src/cli/program.ts +0 -4
- package/src/cli/reference.ts +0 -2
- package/src/cli.ts +15 -9
- package/src/config/__tests__/bundled-tool-registry-guard.test.ts +120 -0
- package/src/config/bundled-skills/_shared/CLI_RETRIEVAL_PATTERN.md +11 -0
- package/src/config/bundled-skills/app-builder/SKILL.md +6 -1
- package/src/config/bundled-skills/browser/SKILL.md +6 -1
- package/src/config/bundled-skills/chatgpt-import/SKILL.md +5 -1
- package/src/config/bundled-skills/claude-code/SKILL.md +5 -1
- package/src/config/bundled-skills/computer-use/SKILL.md +6 -1
- package/src/config/bundled-skills/computer-use/TOOLS.json +6 -69
- package/src/config/bundled-skills/computer-use/tools/computer-use-click.ts +10 -1
- package/src/config/bundled-skills/contacts/SKILL.md +10 -1
- package/src/config/bundled-skills/contacts/TOOLS.json +35 -0
- package/src/config/bundled-skills/{messaging → contacts}/tools/google-contacts.ts +9 -2
- package/src/config/bundled-skills/document/SKILL.md +4 -1
- package/src/config/bundled-skills/doordash/SKILL.md +8 -1
- package/src/config/bundled-skills/doordash/lib/shared/platform.ts +4 -1
- package/src/config/bundled-skills/followups/SKILL.md +4 -1
- package/src/config/bundled-skills/gmail/SKILL.md +180 -0
- package/src/config/bundled-skills/gmail/TOOLS.json +506 -0
- package/src/config/bundled-skills/gmail/tools/gmail-archive.ts +149 -0
- package/src/config/bundled-skills/gmail/tools/gmail-attachments.ts +110 -0
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-draft.ts +1 -1
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-filters.ts +1 -1
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-follow-up.ts +1 -1
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-forward.ts +1 -1
- package/src/config/bundled-skills/gmail/tools/gmail-label.ts +50 -0
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-outreach-scan.ts +8 -90
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-send-draft.ts +1 -1
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-sender-digest.ts +2 -2
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-trash.ts +1 -1
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-unsubscribe.ts +1 -1
- package/src/config/bundled-skills/{messaging → gmail}/tools/gmail-vacation.ts +1 -1
- package/src/config/bundled-skills/gmail/tools/shared.ts +47 -0
- package/src/config/bundled-skills/google-calendar/SKILL.md +5 -1
- package/src/config/bundled-skills/image-studio/SKILL.md +5 -1
- package/src/config/bundled-skills/knowledge-graph/SKILL.md +4 -1
- package/src/config/bundled-skills/media-processing/SKILL.md +7 -13
- package/src/config/bundled-skills/media-processing/TOOLS.json +0 -22
- package/src/config/bundled-skills/media-processing/tools/generate-clip.ts +12 -1
- package/src/config/bundled-skills/messaging/SKILL.md +23 -139
- package/src/config/bundled-skills/messaging/TOOLS.json +33 -1215
- package/src/config/bundled-skills/messaging/tools/gmail-mime-helpers.ts +42 -0
- package/src/config/bundled-skills/messaging/tools/messaging-send.ts +165 -2
- package/src/config/bundled-skills/messaging/tools/messaging-sender-digest.ts +1 -13
- package/src/config/bundled-skills/messaging/tools/shared.ts +81 -34
- package/src/config/bundled-skills/notifications/SKILL.md +5 -1
- package/src/config/bundled-skills/orchestration/SKILL.md +30 -0
- package/src/config/bundled-skills/orchestration/TOOLS.json +35 -0
- package/src/config/bundled-skills/{reminder/tools/reminder-create.ts → orchestration/tools/swarm-delegate.ts} +3 -3
- package/src/config/bundled-skills/phone-calls/SKILL.md +9 -1
- package/src/config/bundled-skills/playbooks/SKILL.md +4 -1
- package/src/config/bundled-skills/schedule/SKILL.md +70 -9
- package/src/config/bundled-skills/schedule/TOOLS.json +38 -6
- package/src/config/bundled-skills/screen-watch/SKILL.md +28 -0
- package/src/config/bundled-skills/screen-watch/TOOLS.json +35 -0
- package/src/config/bundled-skills/{reminder/tools/reminder-cancel.ts → screen-watch/tools/start-screen-watch.ts} +3 -3
- package/src/config/bundled-skills/sequences/SKILL.md +47 -0
- package/src/config/bundled-skills/sequences/TOOLS.json +340 -0
- package/src/config/bundled-skills/sequences/tools/sequence-update.ts +128 -0
- package/src/config/bundled-skills/sequences/tools/shared.ts +9 -0
- package/src/config/bundled-skills/settings/SKILL.md +12 -0
- package/src/config/bundled-skills/settings/TOOLS.json +112 -0
- package/src/config/bundled-skills/settings/tools/navigate-settings-tab.ts +43 -0
- package/src/config/bundled-skills/settings/tools/open-system-settings.ts +52 -0
- package/src/config/bundled-skills/{computer-use/tools/computer-use-right-click.ts → settings/tools/set-avatar.ts} +2 -6
- package/src/{tools/system/voice-config.ts → config/bundled-skills/settings/tools/voice-config-update.ts} +59 -96
- package/src/config/bundled-skills/skill-management/SKILL.md +18 -0
- package/src/config/bundled-skills/skill-management/TOOLS.json +90 -0
- package/src/config/bundled-skills/{computer-use/tools/computer-use-double-click.ts → skill-management/tools/delete-managed.ts} +2 -6
- package/src/config/bundled-skills/skill-management/tools/scaffold-managed.ts +12 -0
- package/src/config/bundled-skills/slack/SKILL.md +5 -1
- package/src/config/bundled-skills/subagent/SKILL.md +4 -1
- package/src/config/bundled-skills/tasks/SKILL.md +5 -2
- package/src/config/bundled-skills/transcribe/SKILL.md +4 -1
- package/src/config/bundled-skills/watcher/SKILL.md +4 -1
- package/src/config/bundled-tool-registry.ts +118 -107
- package/src/config/env.ts +5 -2
- package/src/config/feature-flag-registry.json +25 -9
- package/src/config/loader.ts +10 -2
- package/src/config/schema.ts +19 -16
- package/src/config/schemas/inference.ts +12 -22
- package/src/config/schemas/memory-storage.ts +19 -1
- package/src/config/schemas/platform.ts +0 -16
- package/src/config/skill-state.ts +11 -8
- package/src/config/skills.ts +83 -32
- package/src/context/token-estimator.ts +11 -0
- package/src/context/window-manager.ts +180 -151
- package/src/daemon/computer-use-session.ts +11 -43
- package/src/daemon/daemon-control.ts +4 -1
- package/src/daemon/handlers/config-channels.ts +5 -9
- package/src/daemon/handlers/config-ingress.ts +0 -4
- package/src/daemon/handlers/config-model.ts +7 -13
- package/src/daemon/handlers/config-telegram.ts +4 -8
- package/src/daemon/handlers/config-voice.ts +2 -5
- package/src/daemon/handlers/dictation.ts +2 -12
- package/src/daemon/handlers/identity.ts +0 -105
- package/src/daemon/handlers/recording.ts +3 -23
- package/src/daemon/handlers/session-history.ts +1 -1
- package/src/daemon/handlers/sessions.ts +53 -72
- package/src/daemon/handlers/shared.ts +7 -28
- package/src/daemon/handlers/skills.ts +31 -27
- package/src/daemon/host-bash-proxy.ts +148 -0
- package/src/daemon/host-file-proxy.ts +135 -0
- package/src/daemon/lifecycle.ts +49 -24
- package/src/daemon/mcp-reload-service.ts +123 -0
- package/src/daemon/message-protocol.ts +6 -0
- package/src/daemon/message-types/browser.ts +1 -1
- package/src/daemon/message-types/computer-use.ts +1 -4
- package/src/daemon/message-types/guardian-actions.ts +1 -1
- package/src/daemon/message-types/host-bash.ts +18 -0
- package/src/daemon/message-types/host-file.ts +44 -0
- package/src/daemon/message-types/integrations.ts +1 -67
- package/src/daemon/message-types/messages.ts +15 -0
- package/src/daemon/message-types/schedules.ts +11 -27
- package/src/daemon/message-types/sessions.ts +2 -1
- package/src/daemon/message-types/settings.ts +1 -1
- package/src/daemon/message-types/shared.ts +1 -1
- package/src/daemon/ride-shotgun-handler.ts +2 -42
- package/src/daemon/server.ts +43 -10
- package/src/daemon/session-agent-loop-handlers.ts +48 -7
- package/src/daemon/session-agent-loop.ts +97 -66
- package/src/daemon/session-attachments.ts +1 -1
- package/src/daemon/session-error.ts +17 -16
- package/src/daemon/session-lifecycle.ts +20 -1
- package/src/daemon/session-media-retry.ts +1 -15
- package/src/daemon/session-messaging.ts +14 -6
- package/src/daemon/session-process.ts +36 -7
- package/src/daemon/session-queue-manager.ts +62 -103
- package/src/daemon/session-runtime-assembly.ts +27 -0
- package/src/daemon/session-skill-tools.ts +12 -11
- package/src/daemon/session-slash.ts +7 -0
- package/src/daemon/session-surfaces.ts +19 -97
- package/src/daemon/session-tool-setup.ts +146 -6
- package/src/daemon/session.ts +77 -13
- package/src/errors.ts +0 -2
- package/src/export/formatter.ts +6 -0
- package/src/mcp/mcp-oauth-provider.ts +1 -3
- package/src/media/avatar-router.ts +20 -28
- package/src/media/avatar-types.ts +7 -14
- package/src/media/managed-avatar-client.ts +70 -34
- package/src/memory/conversation-title-service.ts +1 -2
- package/src/memory/db-init.ts +16 -0
- package/src/memory/embedding-backend.ts +129 -27
- package/src/memory/embedding-gemini.test.ts +256 -0
- package/src/memory/embedding-gemini.ts +47 -13
- package/src/memory/embedding-local.ts +14 -2
- package/src/memory/embedding-ollama.ts +15 -2
- package/src/memory/embedding-openai.ts +15 -2
- package/src/memory/embedding-types.test.ts +116 -0
- package/src/memory/embedding-types.ts +61 -0
- package/src/memory/fingerprint.ts +1 -1
- package/src/memory/indexer.ts +25 -1
- package/src/memory/job-handlers/embedding.test.ts +258 -0
- package/src/memory/job-handlers/embedding.ts +81 -1
- package/src/memory/job-handlers/index-maintenance.ts +35 -1
- package/src/memory/job-handlers/media-processing.ts +11 -1
- package/src/memory/job-utils.ts +21 -6
- package/src/memory/jobs-store.ts +5 -1
- package/src/memory/jobs-worker.ts +8 -0
- package/src/memory/message-content.ts +66 -0
- package/src/memory/migrations/100-core-tables.ts +1 -31
- package/src/memory/migrations/104-core-indexes.ts +0 -11
- package/src/memory/migrations/145-drop-accounts-table.ts +19 -0
- package/src/memory/migrations/146-schedule-oneshot-routing.ts +94 -0
- package/src/memory/migrations/147-migrate-reminders-to-schedules.ts +129 -0
- package/src/memory/migrations/148-drop-reminders-table.ts +18 -0
- package/src/memory/migrations/index.ts +4 -0
- package/src/memory/migrations/registry.ts +19 -0
- package/src/memory/qdrant-client.ts +158 -43
- package/src/memory/retriever.test.ts +0 -1
- package/src/memory/retriever.ts +12 -2
- package/src/memory/schema/infrastructure.ts +5 -29
- package/src/memory/search/formatting.ts +34 -9
- package/src/memory/search/semantic.ts +57 -2
- package/src/memory/search/types.ts +2 -1
- package/src/notifications/AGENTS.md +2 -2
- package/src/notifications/README.md +59 -58
- package/src/notifications/adapters/macos.ts +1 -1
- package/src/notifications/broadcaster.ts +5 -5
- package/src/notifications/copy-composer.ts +1 -1
- package/src/notifications/decision-engine.ts +2 -2
- package/src/notifications/destination-resolver.ts +2 -2
- package/src/notifications/emit-signal.ts +8 -8
- package/src/notifications/signal.ts +1 -1
- package/src/notifications/thread-seed-composer.ts +1 -1
- package/src/oauth/connect-orchestrator.ts +1 -1
- package/src/oauth/token-persistence.ts +1 -1
- package/src/permissions/checker.ts +12 -1
- package/src/permissions/defaults.ts +10 -14
- package/src/permissions/trust-store.ts +37 -0
- package/src/permissions/workspace-policy.ts +0 -1
- package/src/prompts/__tests__/build-cli-reference-section.test.ts +11 -0
- package/src/prompts/computer-use-prompt.ts +1 -1
- package/src/prompts/system-prompt.ts +29 -30
- package/src/prompts/templates/SOUL.md +1 -2
- package/src/prompts/templates/UPDATES.md +16 -7
- package/src/providers/anthropic/client.ts +87 -33
- package/src/providers/gemini/client.ts +6 -0
- package/src/providers/managed-proxy/constants.ts +5 -0
- package/src/providers/openai/client.ts +15 -0
- package/src/providers/registry.ts +2 -2
- package/src/providers/types.ts +24 -2
- package/src/runtime/AGENTS.md +18 -0
- package/src/runtime/assistant-event-hub.ts +2 -3
- package/src/runtime/assistant-event.ts +4 -4
- package/src/runtime/auth/__tests__/context.test.ts +5 -5
- package/src/runtime/auth/__tests__/credential-service.test.ts +0 -1
- package/src/runtime/auth/__tests__/guard-tests.test.ts +2 -2
- package/src/runtime/auth/__tests__/{ipc-auth-context.test.ts → local-auth-context.test.ts} +21 -21
- package/src/runtime/auth/__tests__/route-policy.test.ts +2 -2
- package/src/runtime/auth/__tests__/scopes.test.ts +7 -7
- package/src/runtime/auth/__tests__/subject.test.ts +8 -8
- package/src/runtime/auth/__tests__/token-service.test.ts +0 -1
- package/src/runtime/auth/route-policy.ts +8 -4
- package/src/runtime/auth/scopes.ts +1 -1
- package/src/runtime/auth/subject.ts +4 -4
- package/src/runtime/auth/token-service.ts +0 -23
- package/src/runtime/auth/types.ts +3 -3
- package/src/runtime/guardian-action-followup-executor.ts +1 -1
- package/src/runtime/guardian-action-grant-minter.ts +1 -1
- package/src/runtime/guardian-action-service.ts +3 -3
- package/src/runtime/http-server.ts +15 -2
- package/src/runtime/invite-service.ts +3 -3
- package/src/runtime/local-actor-identity.ts +17 -22
- package/src/runtime/pending-interactions.ts +21 -9
- package/src/runtime/routes/app-management-routes.ts +2 -3
- package/src/runtime/routes/approval-routes.ts +1 -3
- package/src/runtime/routes/btw-routes.ts +155 -0
- package/src/runtime/routes/computer-use-routes.ts +77 -31
- package/src/runtime/routes/conversation-routes.ts +230 -46
- package/src/runtime/routes/diagnostics-routes.ts +63 -29
- package/src/runtime/routes/documents-routes.ts +2 -2
- package/src/runtime/routes/global-search-routes.ts +1 -1
- package/src/runtime/routes/host-bash-routes.ts +83 -0
- package/src/runtime/routes/host-file-routes.ts +79 -0
- package/src/runtime/routes/integrations/slack/share.ts +1 -1
- package/src/runtime/routes/log-export-routes.ts +120 -0
- package/src/runtime/routes/mcp-routes.ts +20 -0
- package/src/runtime/routes/migration-routes.ts +3 -3
- package/src/runtime/routes/pairing-routes.ts +1 -1
- package/src/runtime/routes/recording-routes.ts +6 -4
- package/src/runtime/routes/schedule-routes.ts +31 -5
- package/src/runtime/routes/session-management-routes.ts +2 -6
- package/src/runtime/routes/session-query-routes.ts +18 -15
- package/src/runtime/routes/settings-routes.ts +7 -261
- package/src/runtime/routes/skills-routes.ts +7 -6
- package/src/runtime/routes/subagents-routes.ts +4 -10
- package/src/runtime/routes/surface-action-routes.ts +3 -14
- package/src/runtime/routes/surface-content-routes.ts +22 -5
- package/src/runtime/routes/work-items-routes.ts +21 -25
- package/src/runtime/routes/workspace-routes.test.ts +3 -3
- package/src/runtime/routes/workspace-utils.ts +1 -1
- package/src/runtime/telegram-streaming-delivery.ts +3 -0
- package/src/runtime/verification-outbound-actions.ts +2 -2
- package/src/schedule/integration-status.ts +0 -6
- package/src/schedule/schedule-store.ts +234 -43
- package/src/schedule/scheduler.ts +73 -74
- package/src/security/oauth2.ts +1 -1
- package/src/sequence/store.ts +12 -2
- package/src/skills/frontmatter.ts +19 -77
- package/src/skills/managed-store.ts +11 -2
- package/src/subagent/manager.ts +5 -3
- package/src/tasks/ephemeral-permissions.ts +3 -5
- package/src/tools/AGENTS.md +0 -1
- package/src/tools/browser/browser-manager.ts +17 -11
- package/src/tools/browser/jit-auth.ts +4 -1
- package/src/tools/claude-code/claude-code.ts +1 -1
- package/src/tools/computer-use/definitions.ts +48 -60
- package/src/tools/document/document-tool.ts +6 -6
- package/src/tools/filesystem/edit.ts +2 -1
- package/src/tools/filesystem/read.ts +20 -2
- package/src/tools/filesystem/write.ts +2 -1
- package/src/tools/host-filesystem/edit.ts +17 -1
- package/src/tools/host-filesystem/read.ts +16 -1
- package/src/tools/host-filesystem/write.ts +15 -1
- package/src/tools/host-terminal/host-shell.ts +24 -0
- package/src/tools/memory/definitions.ts +45 -81
- package/src/tools/memory/handlers.test.ts +0 -1
- package/src/tools/memory/handlers.ts +1 -1
- package/src/tools/memory/register.ts +26 -60
- package/src/tools/network/script-proxy/session-manager.ts +6 -8
- package/src/tools/network/web-fetch.ts +7 -1
- package/src/tools/network/web-search.ts +2 -1
- package/src/tools/registry.ts +23 -0
- package/src/tools/schedule/create.ts +113 -5
- package/src/tools/schedule/list.ts +57 -15
- package/src/tools/schedule/update.ts +73 -3
- package/src/tools/shared/filesystem/image-read.ts +192 -0
- package/src/tools/side-effects.ts +1 -7
- package/src/tools/skills/delete-managed.ts +27 -64
- package/src/tools/skills/execute.ts +54 -0
- package/src/tools/skills/load.ts +127 -5
- package/src/tools/skills/scaffold-managed.ts +93 -172
- package/src/tools/subagent/message.ts +0 -7
- package/src/tools/subagent/spawn.ts +1 -1
- package/src/tools/swarm/delegate.ts +0 -3
- package/src/tools/system/avatar-generator.ts +13 -19
- package/src/tools/system/request-permission.ts +2 -1
- package/src/tools/terminal/safe-env.ts +1 -0
- package/src/tools/tool-manifest.ts +41 -47
- package/src/tools/types.ts +6 -2
- package/src/tools/ui-surface/definitions.ts +0 -55
- package/src/util/errors.ts +0 -10
- package/src/workspace/git-service.ts +0 -2
- package/src/__tests__/account-registry.test.ts +0 -258
- package/src/__tests__/email-classifier.test.ts +0 -25
- package/src/__tests__/gmail-integration.test.ts +0 -97
- package/src/__tests__/handle-user-message-secret-resume.test.ts +0 -172
- package/src/__tests__/managed-twitter-guardrails.test.ts +0 -357
- package/src/__tests__/recording-intent-fallback.test.ts +0 -199
- package/src/__tests__/recording-intent.test.ts +0 -985
- package/src/__tests__/recording-state-machine.test.ts +0 -1574
- package/src/__tests__/reminder-store.test.ts +0 -350
- package/src/__tests__/reminder.test.ts +0 -337
- package/src/__tests__/scan-result-store.test.ts +0 -121
- package/src/__tests__/twitter-platform-proxy-client.test.ts +0 -475
- package/src/__tests__/view-image-tool.test.ts +0 -241
- package/src/cli/commands/amazon/cart.ts +0 -513
- package/src/cli/commands/amazon/checkout.ts +0 -394
- package/src/cli/commands/amazon/client.ts +0 -513
- package/src/cli/commands/amazon/index.ts +0 -885
- package/src/cli/commands/amazon/product-details.ts +0 -145
- package/src/cli/commands/amazon/request-extractor.ts +0 -187
- package/src/cli/commands/amazon/search.ts +0 -76
- package/src/cli/commands/amazon/session.ts +0 -108
- package/src/cli/commands/twitter/__tests__/cli-read-routing.test.ts +0 -345
- package/src/cli/commands/twitter/__tests__/cli-routing.test.ts +0 -252
- package/src/cli/commands/twitter/__tests__/oauth-client.test.ts +0 -151
- package/src/cli/commands/twitter/index.ts +0 -420
- package/src/cli/commands/twitter/oauth-client.ts +0 -60
- package/src/cli/commands/twitter/router.ts +0 -351
- package/src/cli/commands/twitter/types.ts +0 -30
- package/src/config/bundled-skills/agentmail/SKILL.md +0 -132
- package/src/config/bundled-skills/agentmail/icon.svg +0 -21
- package/src/config/bundled-skills/amazon/SKILL.md +0 -136
- package/src/config/bundled-skills/amazon/icon.svg +0 -13
- package/src/config/bundled-skills/api-mapping/SKILL.md +0 -78
- package/src/config/bundled-skills/api-mapping/icon.svg +0 -18
- package/src/config/bundled-skills/cli-discover/SKILL.md +0 -68
- package/src/config/bundled-skills/deploy-fullstack-vercel/SKILL.md +0 -179
- package/src/config/bundled-skills/document-writer/SKILL.md +0 -195
- package/src/config/bundled-skills/elevenlabs-voice/SKILL.md +0 -140
- package/src/config/bundled-skills/email-setup/SKILL.md +0 -68
- package/src/config/bundled-skills/frontend-design/SKILL.md +0 -44
- package/src/config/bundled-skills/frontend-design/icon.svg +0 -16
- package/src/config/bundled-skills/google-oauth-setup/SKILL.md +0 -452
- package/src/config/bundled-skills/guardian-verify-setup/SKILL.md +0 -203
- package/src/config/bundled-skills/influencer/SKILL.md +0 -144
- package/src/config/bundled-skills/influencer/scripts/client.ts +0 -1269
- package/src/config/bundled-skills/influencer/scripts/influencer.ts +0 -267
- package/src/config/bundled-skills/macos-automation/SKILL.md +0 -65
- package/src/config/bundled-skills/macos-automation/icon.svg +0 -12
- package/src/config/bundled-skills/mcp-setup/SKILL.md +0 -75
- package/src/config/bundled-skills/media-processing/tools/media-diagnostics.ts +0 -184
- package/src/config/bundled-skills/messaging/tools/gmail-archive-by-query.ts +0 -80
- package/src/config/bundled-skills/messaging/tools/gmail-archive.ts +0 -29
- package/src/config/bundled-skills/messaging/tools/gmail-batch-archive.ts +0 -56
- package/src/config/bundled-skills/messaging/tools/gmail-batch-label.ts +0 -34
- package/src/config/bundled-skills/messaging/tools/gmail-download-attachment.ts +0 -47
- package/src/config/bundled-skills/messaging/tools/gmail-label.ts +0 -31
- package/src/config/bundled-skills/messaging/tools/gmail-list-attachments.ts +0 -67
- package/src/config/bundled-skills/messaging/tools/gmail-send-with-attachments.ts +0 -97
- package/src/config/bundled-skills/messaging/tools/gmail-summarize-thread.ts +0 -87
- package/src/config/bundled-skills/messaging/tools/gmail-triage.ts +0 -135
- package/src/config/bundled-skills/messaging/tools/messaging-analyze-activity.ts +0 -24
- package/src/config/bundled-skills/messaging/tools/messaging-reply.ts +0 -201
- package/src/config/bundled-skills/messaging/tools/send-notification.ts +0 -1
- package/src/config/bundled-skills/messaging/tools/sequence-cancel.ts +0 -27
- package/src/config/bundled-skills/messaging/tools/sequence-pause.ts +0 -48
- package/src/config/bundled-skills/messaging/tools/sequence-resume.ts +0 -27
- package/src/config/bundled-skills/messaging/tools/sequence-update.ts +0 -56
- package/src/config/bundled-skills/notion/SKILL.md +0 -240
- package/src/config/bundled-skills/notion-oauth-setup/SKILL.md +0 -126
- package/src/config/bundled-skills/oauth-setup/SKILL.md +0 -143
- package/src/config/bundled-skills/public-ingress/SKILL.md +0 -258
- package/src/config/bundled-skills/reminder/SKILL.md +0 -79
- package/src/config/bundled-skills/reminder/TOOLS.json +0 -89
- package/src/config/bundled-skills/reminder/tools/reminder-list.ts +0 -12
- package/src/config/bundled-skills/restaurant-reservation/SKILL.md +0 -141
- package/src/config/bundled-skills/screen-recording/SKILL.md +0 -148
- package/src/config/bundled-skills/self-upgrade/SKILL.md +0 -69
- package/src/config/bundled-skills/skills-catalog/SKILL.md +0 -78
- package/src/config/bundled-skills/slack-app-setup/SKILL.md +0 -178
- package/src/config/bundled-skills/slack-digest-setup/SKILL.md +0 -163
- package/src/config/bundled-skills/slack-oauth-setup/SKILL.md +0 -157
- package/src/config/bundled-skills/start-the-day/SKILL.md +0 -70
- package/src/config/bundled-skills/start-the-day/icon.svg +0 -13
- package/src/config/bundled-skills/telegram-setup/SKILL.md +0 -105
- package/src/config/bundled-skills/time-based-actions/SKILL.md +0 -142
- package/src/config/bundled-skills/twilio-setup/SKILL.md +0 -232
- package/src/config/bundled-skills/twitter/SKILL.md +0 -206
- package/src/config/bundled-skills/twitter/icon.svg +0 -14
- package/src/config/bundled-skills/typescript-eval/SKILL.md +0 -60
- package/src/config/bundled-skills/vercel-token-setup/SKILL.md +0 -214
- package/src/config/bundled-skills/voice-setup/SKILL.md +0 -131
- package/src/config/bundled-skills/voice-setup/icon.svg +0 -20
- package/src/daemon/handlers/pairing.ts +0 -119
- package/src/daemon/handlers/session-user-message.ts +0 -961
- package/src/daemon/recording-executor.ts +0 -180
- package/src/daemon/recording-intent-fallback.ts +0 -162
- package/src/daemon/recording-intent.ts +0 -493
- package/src/memory/account-store.ts +0 -117
- package/src/messaging/activity-analyzer.ts +0 -76
- package/src/messaging/email-classifier.ts +0 -208
- package/src/messaging/index.ts +0 -2
- package/src/messaging/outreach-classifier.ts +0 -185
- package/src/messaging/thread-summarizer.ts +0 -346
- package/src/messaging/types.ts +0 -17
- package/src/tools/browser/x-auto-navigate.ts +0 -254
- package/src/tools/credentials/account-registry.ts +0 -144
- package/src/tools/filesystem/view-image.ts +0 -244
- package/src/tools/reminder/reminder-store.ts +0 -194
- package/src/tools/reminder/reminder.ts +0 -158
- package/src/tools/system/navigate-settings.ts +0 -74
- package/src/tools/system/open-system-settings.ts +0 -85
- package/src/tools/system/version.ts +0 -54
- package/src/twitter/platform-proxy-client.ts +0 -408
- /package/src/config/bundled-skills/{messaging → gmail}/tools/scan-result-store.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-analytics.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-create.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-delete.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-enroll.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-enrollment-list.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-get.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-import.ts +0 -0
- /package/src/config/bundled-skills/{messaging → sequences}/tools/sequence-list.ts +0 -0
package/src/memory/indexer.ts
CHANGED
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
import { createHash } from "crypto";
|
|
2
2
|
import { desc, eq } from "drizzle-orm";
|
|
3
3
|
|
|
4
|
+
import { getConfig } from "../config/loader.js";
|
|
4
5
|
import type { MemoryConfig } from "../config/types.js";
|
|
5
6
|
import type { TrustClass } from "../runtime/actor-trust-resolver.js";
|
|
6
7
|
import { getLogger } from "../util/logger.js";
|
|
7
8
|
import { getMemoryCheckpoint, setMemoryCheckpoint } from "./checkpoints.js";
|
|
8
9
|
import { getDb } from "./db.js";
|
|
10
|
+
import { selectedBackendSupportsMultimodal } from "./embedding-backend.js";
|
|
9
11
|
import {
|
|
10
12
|
enqueueMemoryJob,
|
|
11
13
|
enqueueResolvePendingConflictsForMessageJob,
|
|
12
14
|
} from "./jobs-store.js";
|
|
13
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
extractMediaBlocks,
|
|
17
|
+
extractTextFromStoredMessageContent,
|
|
18
|
+
} from "./message-content.js";
|
|
14
19
|
import { bumpMemoryVersion } from "./recall-cache.js";
|
|
15
20
|
import { memorySegments } from "./schema.js";
|
|
16
21
|
import { segmentText } from "./segmenter.js";
|
|
@@ -73,6 +78,13 @@ export function indexMessageNow(
|
|
|
73
78
|
const shouldResolveConflicts =
|
|
74
79
|
input.role === "user" && config.conflicts.enabled;
|
|
75
80
|
|
|
81
|
+
// Check if the resolved embedding backend supports multimodal input.
|
|
82
|
+
// Only enqueue embed_attachment jobs when it does (currently Gemini only).
|
|
83
|
+
const supportsMultimodal = selectedBackendSupportsMultimodal(getConfig());
|
|
84
|
+
const mediaBlocks = supportsMultimodal
|
|
85
|
+
? extractMediaBlocks(input.content).filter((b) => b.type === "image")
|
|
86
|
+
: [];
|
|
87
|
+
|
|
76
88
|
// Wrap all segment inserts and job enqueues in a single transaction so they
|
|
77
89
|
// either all succeed or all roll back, preventing partial/orphaned state.
|
|
78
90
|
let skippedEmbedJobs = 0;
|
|
@@ -121,6 +133,17 @@ export function indexMessageNow(
|
|
|
121
133
|
}
|
|
122
134
|
}
|
|
123
135
|
|
|
136
|
+
// Enqueue embed_attachment jobs for image content blocks when the
|
|
137
|
+
// embedding provider supports multimodal (Gemini only).
|
|
138
|
+
for (const block of mediaBlocks) {
|
|
139
|
+
enqueueMemoryJob(
|
|
140
|
+
"embed_attachment",
|
|
141
|
+
{ messageId: input.messageId, blockIndex: block.index },
|
|
142
|
+
Date.now(),
|
|
143
|
+
tx,
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
|
|
124
147
|
if (shouldExtract && isTrustedActor) {
|
|
125
148
|
enqueueMemoryJob(
|
|
126
149
|
"extract_items",
|
|
@@ -168,6 +191,7 @@ export function indexMessageNow(
|
|
|
168
191
|
const enqueuedJobs =
|
|
169
192
|
segments.length -
|
|
170
193
|
skippedEmbedJobs +
|
|
194
|
+
mediaBlocks.length +
|
|
171
195
|
(shouldExtract && !extractionGated ? 2 : 1) +
|
|
172
196
|
(shouldResolveConflicts && !extractionGated ? 1 : 0);
|
|
173
197
|
return {
|
|
@@ -0,0 +1,258 @@
|
|
|
1
|
+
import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import {
|
|
5
|
+
afterAll,
|
|
6
|
+
beforeAll,
|
|
7
|
+
beforeEach,
|
|
8
|
+
describe,
|
|
9
|
+
expect,
|
|
10
|
+
mock,
|
|
11
|
+
test,
|
|
12
|
+
} from "bun:test";
|
|
13
|
+
|
|
14
|
+
const testDir = mkdtempSync(join(tmpdir(), "embed-media-test-"));
|
|
15
|
+
|
|
16
|
+
mock.module("../../util/platform.js", () => ({
|
|
17
|
+
getDataDir: () => testDir,
|
|
18
|
+
isMacOS: () => process.platform === "darwin",
|
|
19
|
+
isLinux: () => process.platform === "linux",
|
|
20
|
+
isWindows: () => process.platform === "win32",
|
|
21
|
+
getPidPath: () => join(testDir, "test.pid"),
|
|
22
|
+
getDbPath: () => join(testDir, "test.db"),
|
|
23
|
+
getLogPath: () => join(testDir, "test.log"),
|
|
24
|
+
ensureDataDir: () => {},
|
|
25
|
+
}));
|
|
26
|
+
|
|
27
|
+
mock.module("../../util/logger.js", () => ({
|
|
28
|
+
getLogger: () =>
|
|
29
|
+
new Proxy({} as Record<string, unknown>, {
|
|
30
|
+
get: () => () => {},
|
|
31
|
+
}),
|
|
32
|
+
}));
|
|
33
|
+
|
|
34
|
+
// Track calls to embedAndUpsert
|
|
35
|
+
const embedAndUpsertCalls: Array<{
|
|
36
|
+
config: unknown;
|
|
37
|
+
targetType: string;
|
|
38
|
+
targetId: string;
|
|
39
|
+
input: unknown;
|
|
40
|
+
extraPayload: unknown;
|
|
41
|
+
}> = [];
|
|
42
|
+
|
|
43
|
+
mock.module("../job-utils.js", () => ({
|
|
44
|
+
asString: (value: unknown) =>
|
|
45
|
+
typeof value === "string" && value.length > 0 ? value : null,
|
|
46
|
+
embedAndUpsert: async (
|
|
47
|
+
config: unknown,
|
|
48
|
+
targetType: string,
|
|
49
|
+
targetId: string,
|
|
50
|
+
input: unknown,
|
|
51
|
+
extraPayload: unknown,
|
|
52
|
+
) => {
|
|
53
|
+
embedAndUpsertCalls.push({
|
|
54
|
+
config,
|
|
55
|
+
targetType,
|
|
56
|
+
targetId,
|
|
57
|
+
input,
|
|
58
|
+
extraPayload,
|
|
59
|
+
});
|
|
60
|
+
},
|
|
61
|
+
}));
|
|
62
|
+
|
|
63
|
+
import { DEFAULT_CONFIG } from "../../config/defaults.js";
|
|
64
|
+
import type { AssistantConfig } from "../../config/types.js";
|
|
65
|
+
import { getDb, initializeDb, resetDb } from "../db.js";
|
|
66
|
+
import type { MemoryJob } from "../jobs-store.js";
|
|
67
|
+
import { mediaAssets } from "../schema.js";
|
|
68
|
+
import { embedMediaJob } from "./embedding.js";
|
|
69
|
+
|
|
70
|
+
const TEST_CONFIG: AssistantConfig = {
|
|
71
|
+
...DEFAULT_CONFIG,
|
|
72
|
+
memory: {
|
|
73
|
+
...DEFAULT_CONFIG.memory,
|
|
74
|
+
extraction: {
|
|
75
|
+
...DEFAULT_CONFIG.memory.extraction,
|
|
76
|
+
useLLM: false,
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
describe("embedMediaJob", () => {
|
|
82
|
+
beforeAll(() => {
|
|
83
|
+
initializeDb();
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
beforeEach(() => {
|
|
87
|
+
embedAndUpsertCalls.length = 0;
|
|
88
|
+
resetDb();
|
|
89
|
+
initializeDb();
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
afterAll(() => {
|
|
93
|
+
rmSync(testDir, { recursive: true, force: true });
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
function makeJob(payload: Record<string, unknown>): MemoryJob {
|
|
97
|
+
return {
|
|
98
|
+
id: "job-1",
|
|
99
|
+
type: "embed_media",
|
|
100
|
+
payload,
|
|
101
|
+
status: "running",
|
|
102
|
+
attempts: 0,
|
|
103
|
+
deferrals: 0,
|
|
104
|
+
runAfter: 0,
|
|
105
|
+
lastError: null,
|
|
106
|
+
startedAt: Date.now(),
|
|
107
|
+
createdAt: Date.now(),
|
|
108
|
+
updatedAt: Date.now(),
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
test("skips when assetId is missing", async () => {
|
|
113
|
+
await embedMediaJob(makeJob({}), TEST_CONFIG);
|
|
114
|
+
expect(embedAndUpsertCalls).toHaveLength(0);
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
test("skips when asset is not found", async () => {
|
|
118
|
+
await embedMediaJob(makeJob({ assetId: "nonexistent" }), TEST_CONFIG);
|
|
119
|
+
expect(embedAndUpsertCalls).toHaveLength(0);
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
test("skips when asset status is not indexed", async () => {
|
|
123
|
+
const db = getDb();
|
|
124
|
+
const now = Date.now();
|
|
125
|
+
// Create a temp file
|
|
126
|
+
const filePath = join(testDir, "test-registered.png");
|
|
127
|
+
writeFileSync(filePath, Buffer.from("fake image data"));
|
|
128
|
+
|
|
129
|
+
db.insert(mediaAssets)
|
|
130
|
+
.values({
|
|
131
|
+
id: "asset-registered",
|
|
132
|
+
title: "Test Image",
|
|
133
|
+
filePath,
|
|
134
|
+
mimeType: "image/png",
|
|
135
|
+
durationSeconds: null,
|
|
136
|
+
fileHash: "hash-registered",
|
|
137
|
+
status: "registered",
|
|
138
|
+
mediaType: "image",
|
|
139
|
+
metadata: null,
|
|
140
|
+
createdAt: now,
|
|
141
|
+
updatedAt: now,
|
|
142
|
+
})
|
|
143
|
+
.run();
|
|
144
|
+
|
|
145
|
+
await embedMediaJob(
|
|
146
|
+
makeJob({ assetId: "asset-registered" }),
|
|
147
|
+
TEST_CONFIG,
|
|
148
|
+
);
|
|
149
|
+
expect(embedAndUpsertCalls).toHaveLength(0);
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
test("embeds indexed image asset with correct input type and target", async () => {
|
|
153
|
+
const db = getDb();
|
|
154
|
+
const now = Date.now();
|
|
155
|
+
const filePath = join(testDir, "test-image.png");
|
|
156
|
+
const imageData = Buffer.from("fake png data");
|
|
157
|
+
writeFileSync(filePath, imageData);
|
|
158
|
+
|
|
159
|
+
db.insert(mediaAssets)
|
|
160
|
+
.values({
|
|
161
|
+
id: "asset-image",
|
|
162
|
+
title: "My Screenshot",
|
|
163
|
+
filePath,
|
|
164
|
+
mimeType: "image/png",
|
|
165
|
+
durationSeconds: null,
|
|
166
|
+
fileHash: "hash-image",
|
|
167
|
+
status: "indexed",
|
|
168
|
+
mediaType: "image",
|
|
169
|
+
metadata: null,
|
|
170
|
+
createdAt: now,
|
|
171
|
+
updatedAt: now,
|
|
172
|
+
})
|
|
173
|
+
.run();
|
|
174
|
+
|
|
175
|
+
await embedMediaJob(makeJob({ assetId: "asset-image" }), TEST_CONFIG);
|
|
176
|
+
|
|
177
|
+
expect(embedAndUpsertCalls).toHaveLength(1);
|
|
178
|
+
const call = embedAndUpsertCalls[0];
|
|
179
|
+
expect(call.targetType).toBe("media");
|
|
180
|
+
expect(call.targetId).toBe("asset-image");
|
|
181
|
+
expect(call.input).toEqual({
|
|
182
|
+
type: "image",
|
|
183
|
+
data: imageData,
|
|
184
|
+
mimeType: "image/png",
|
|
185
|
+
});
|
|
186
|
+
expect(call.extraPayload).toEqual({
|
|
187
|
+
created_at: now,
|
|
188
|
+
kind: "image",
|
|
189
|
+
subject: "My Screenshot",
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
test("embeds indexed audio asset with correct modality", async () => {
|
|
194
|
+
const db = getDb();
|
|
195
|
+
const now = Date.now();
|
|
196
|
+
const filePath = join(testDir, "test-audio.mp3");
|
|
197
|
+
const audioData = Buffer.from("fake mp3 data");
|
|
198
|
+
writeFileSync(filePath, audioData);
|
|
199
|
+
|
|
200
|
+
db.insert(mediaAssets)
|
|
201
|
+
.values({
|
|
202
|
+
id: "asset-audio",
|
|
203
|
+
title: "Podcast Episode",
|
|
204
|
+
filePath,
|
|
205
|
+
mimeType: "audio/mp3",
|
|
206
|
+
durationSeconds: 120,
|
|
207
|
+
fileHash: "hash-audio",
|
|
208
|
+
status: "indexed",
|
|
209
|
+
mediaType: "audio",
|
|
210
|
+
metadata: null,
|
|
211
|
+
createdAt: now,
|
|
212
|
+
updatedAt: now,
|
|
213
|
+
})
|
|
214
|
+
.run();
|
|
215
|
+
|
|
216
|
+
await embedMediaJob(makeJob({ assetId: "asset-audio" }), TEST_CONFIG);
|
|
217
|
+
|
|
218
|
+
expect(embedAndUpsertCalls).toHaveLength(1);
|
|
219
|
+
const call = embedAndUpsertCalls[0];
|
|
220
|
+
expect(call.targetType).toBe("media");
|
|
221
|
+
expect(call.targetId).toBe("asset-audio");
|
|
222
|
+
expect((call.input as { type: string }).type).toBe("audio");
|
|
223
|
+
expect((call.input as { mimeType: string }).mimeType).toBe("audio/mp3");
|
|
224
|
+
});
|
|
225
|
+
|
|
226
|
+
test("embeds indexed video asset with correct modality", async () => {
|
|
227
|
+
const db = getDb();
|
|
228
|
+
const now = Date.now();
|
|
229
|
+
const filePath = join(testDir, "test-video.mp4");
|
|
230
|
+
const videoData = Buffer.from("fake mp4 data");
|
|
231
|
+
writeFileSync(filePath, videoData);
|
|
232
|
+
|
|
233
|
+
db.insert(mediaAssets)
|
|
234
|
+
.values({
|
|
235
|
+
id: "asset-video",
|
|
236
|
+
title: "Tutorial Video",
|
|
237
|
+
filePath,
|
|
238
|
+
mimeType: "video/mp4",
|
|
239
|
+
durationSeconds: 300,
|
|
240
|
+
fileHash: "hash-video",
|
|
241
|
+
status: "indexed",
|
|
242
|
+
mediaType: "video",
|
|
243
|
+
metadata: null,
|
|
244
|
+
createdAt: now,
|
|
245
|
+
updatedAt: now,
|
|
246
|
+
})
|
|
247
|
+
.run();
|
|
248
|
+
|
|
249
|
+
await embedMediaJob(makeJob({ assetId: "asset-video" }), TEST_CONFIG);
|
|
250
|
+
|
|
251
|
+
expect(embedAndUpsertCalls).toHaveLength(1);
|
|
252
|
+
const call = embedAndUpsertCalls[0];
|
|
253
|
+
expect(call.targetType).toBe("media");
|
|
254
|
+
expect(call.targetId).toBe("asset-video");
|
|
255
|
+
expect((call.input as { type: string }).type).toBe("video");
|
|
256
|
+
expect((call.input as { mimeType: string }).mimeType).toBe("video/mp4");
|
|
257
|
+
});
|
|
258
|
+
});
|
|
@@ -1,10 +1,21 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
|
|
1
3
|
import { eq } from "drizzle-orm";
|
|
2
4
|
|
|
3
5
|
import type { AssistantConfig } from "../../config/types.js";
|
|
6
|
+
import { getConversationMemoryScopeId } from "../conversation-crud.js";
|
|
4
7
|
import { getDb } from "../db.js";
|
|
8
|
+
import type { EmbeddingInput } from "../embedding-types.js";
|
|
5
9
|
import { asString, embedAndUpsert } from "../job-utils.js";
|
|
6
10
|
import type { MemoryJob } from "../jobs-store.js";
|
|
7
|
-
import {
|
|
11
|
+
import { extractMediaBlocks } from "../message-content.js";
|
|
12
|
+
import {
|
|
13
|
+
mediaAssets,
|
|
14
|
+
memoryItems,
|
|
15
|
+
memorySegments,
|
|
16
|
+
memorySummaries,
|
|
17
|
+
messages,
|
|
18
|
+
} from "../schema.js";
|
|
8
19
|
|
|
9
20
|
export async function embedSegmentJob(
|
|
10
21
|
job: MemoryJob,
|
|
@@ -75,3 +86,72 @@ export async function embedSummaryJob(
|
|
|
75
86
|
},
|
|
76
87
|
);
|
|
77
88
|
}
|
|
89
|
+
|
|
90
|
+
export async function embedMediaJob(
|
|
91
|
+
job: MemoryJob,
|
|
92
|
+
config: AssistantConfig,
|
|
93
|
+
): Promise<void> {
|
|
94
|
+
const assetId = asString(job.payload.assetId);
|
|
95
|
+
if (!assetId) return;
|
|
96
|
+
|
|
97
|
+
const db = getDb();
|
|
98
|
+
const asset = db
|
|
99
|
+
.select()
|
|
100
|
+
.from(mediaAssets)
|
|
101
|
+
.where(eq(mediaAssets.id, assetId))
|
|
102
|
+
.get();
|
|
103
|
+
if (!asset || asset.status !== "indexed") return;
|
|
104
|
+
|
|
105
|
+
// Read the media file from disk
|
|
106
|
+
const fileData = await readFile(asset.filePath);
|
|
107
|
+
|
|
108
|
+
// Determine modality from mediaType
|
|
109
|
+
const input: EmbeddingInput = {
|
|
110
|
+
type: asset.mediaType as "image" | "audio" | "video",
|
|
111
|
+
data: fileData,
|
|
112
|
+
mimeType: asset.mimeType,
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
await embedAndUpsert(config, "media", asset.id, input, {
|
|
116
|
+
created_at: asset.createdAt,
|
|
117
|
+
kind: asset.mediaType,
|
|
118
|
+
subject: asset.title,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
export async function embedAttachmentJob(
|
|
123
|
+
job: MemoryJob,
|
|
124
|
+
config: AssistantConfig,
|
|
125
|
+
): Promise<void> {
|
|
126
|
+
const messageId = asString(job.payload.messageId);
|
|
127
|
+
const blockIndex = job.payload.blockIndex as number;
|
|
128
|
+
if (!messageId || typeof blockIndex !== "number") return;
|
|
129
|
+
|
|
130
|
+
const db = getDb();
|
|
131
|
+
const message = db
|
|
132
|
+
.select()
|
|
133
|
+
.from(messages)
|
|
134
|
+
.where(eq(messages.id, messageId))
|
|
135
|
+
.get();
|
|
136
|
+
if (!message) return;
|
|
137
|
+
|
|
138
|
+
const mediaBlocks = extractMediaBlocks(message.content);
|
|
139
|
+
const block = mediaBlocks.find((b) => b.index === blockIndex);
|
|
140
|
+
if (!block) return;
|
|
141
|
+
|
|
142
|
+
const input: EmbeddingInput = {
|
|
143
|
+
type: block.type,
|
|
144
|
+
data: block.data,
|
|
145
|
+
mimeType: block.mimeType,
|
|
146
|
+
};
|
|
147
|
+
|
|
148
|
+
// Use messageId + blockIndex as targetId for uniqueness
|
|
149
|
+
const targetId = `${messageId}:${blockIndex}`;
|
|
150
|
+
const memoryScopeId = getConversationMemoryScopeId(message.conversationId);
|
|
151
|
+
await embedAndUpsert(config, "media", targetId, input, {
|
|
152
|
+
created_at: message.createdAt,
|
|
153
|
+
message_id: messageId,
|
|
154
|
+
conversation_id: message.conversationId,
|
|
155
|
+
memory_scope_id: memoryScopeId,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
@@ -1,16 +1,21 @@
|
|
|
1
|
-
import { eq } from "drizzle-orm";
|
|
1
|
+
import { eq, like } from "drizzle-orm";
|
|
2
2
|
|
|
3
|
+
import { getConfig } from "../../config/loader.js";
|
|
3
4
|
import { getLogger } from "../../util/logger.js";
|
|
4
5
|
import { getDb, rawExec } from "../db.js";
|
|
6
|
+
import { selectedBackendSupportsMultimodal } from "../embedding-backend.js";
|
|
5
7
|
import { asString, BackendUnavailableError } from "../job-utils.js";
|
|
6
8
|
import { enqueueMemoryJob, type MemoryJob } from "../jobs-store.js";
|
|
9
|
+
import { extractMediaBlockMeta } from "../message-content.js";
|
|
7
10
|
import { withQdrantBreaker } from "../qdrant-circuit-breaker.js";
|
|
8
11
|
import { getQdrantClient } from "../qdrant-client.js";
|
|
9
12
|
import {
|
|
13
|
+
mediaAssets,
|
|
10
14
|
memoryEmbeddings,
|
|
11
15
|
memoryItems,
|
|
12
16
|
memorySegments,
|
|
13
17
|
memorySummaries,
|
|
18
|
+
messages,
|
|
14
19
|
} from "../schema.js";
|
|
15
20
|
|
|
16
21
|
const log = getLogger("memory-jobs-worker");
|
|
@@ -48,6 +53,35 @@ export function rebuildIndexJob(): void {
|
|
|
48
53
|
for (const segment of segments) {
|
|
49
54
|
enqueueMemoryJob("embed_segment", { segmentId: segment.id });
|
|
50
55
|
}
|
|
56
|
+
|
|
57
|
+
// Re-enqueue multimodal embedding jobs only when the resolved embedding
|
|
58
|
+
// backend supports multimodal inputs. Without this gate, embed_media and
|
|
59
|
+
// embed_attachment jobs would all fail for text-only backends.
|
|
60
|
+
if (selectedBackendSupportsMultimodal(getConfig())) {
|
|
61
|
+
const assets = db
|
|
62
|
+
.select({ id: mediaAssets.id })
|
|
63
|
+
.from(mediaAssets)
|
|
64
|
+
.where(eq(mediaAssets.status, "indexed"))
|
|
65
|
+
.all();
|
|
66
|
+
for (const asset of assets) {
|
|
67
|
+
enqueueMemoryJob("embed_media", { assetId: asset.id });
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const imageMessages = db
|
|
71
|
+
.select({ id: messages.id, content: messages.content })
|
|
72
|
+
.from(messages)
|
|
73
|
+
.where(like(messages.content, '%"type":"image"%'))
|
|
74
|
+
.all();
|
|
75
|
+
for (const msg of imageMessages) {
|
|
76
|
+
const blocks = extractMediaBlockMeta(msg.content);
|
|
77
|
+
for (const block of blocks) {
|
|
78
|
+
enqueueMemoryJob("embed_attachment", {
|
|
79
|
+
messageId: msg.id,
|
|
80
|
+
blockIndex: block.index,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
51
85
|
}
|
|
52
86
|
|
|
53
87
|
export async function deleteQdrantVectorsJob(job: MemoryJob): Promise<void> {
|
|
@@ -6,9 +6,11 @@ import {
|
|
|
6
6
|
import { mapSegmentsForAsset } from "../../config/bundled-skills/media-processing/tools/analyze-keyframes.js";
|
|
7
7
|
import { preprocessForAsset } from "../../config/bundled-skills/media-processing/tools/extract-keyframes.js";
|
|
8
8
|
import { reduceForAsset } from "../../config/bundled-skills/media-processing/tools/query-media-events.js";
|
|
9
|
+
import { getConfig } from "../../config/loader.js";
|
|
9
10
|
import { getLogger } from "../../util/logger.js";
|
|
11
|
+
import { selectedBackendSupportsMultimodal } from "../embedding-backend.js";
|
|
10
12
|
import { asString } from "../job-utils.js";
|
|
11
|
-
import type
|
|
13
|
+
import { enqueueMemoryJob, type MemoryJob } from "../jobs-store.js";
|
|
12
14
|
import { getMediaAssetById, updateMediaAssetStatus } from "../media-store.js";
|
|
13
15
|
|
|
14
16
|
const log = getLogger("media-processing-job");
|
|
@@ -32,6 +34,9 @@ export async function mediaProcessingJob(job: MemoryJob): Promise<void> {
|
|
|
32
34
|
"Skipping media processing pipeline — only video assets are supported",
|
|
33
35
|
);
|
|
34
36
|
updateMediaAssetStatus(mediaAssetId, "indexed");
|
|
37
|
+
if (selectedBackendSupportsMultimodal(getConfig())) {
|
|
38
|
+
enqueueMemoryJob("embed_media", { assetId: mediaAssetId });
|
|
39
|
+
}
|
|
35
40
|
return;
|
|
36
41
|
}
|
|
37
42
|
|
|
@@ -107,4 +112,9 @@ export async function mediaProcessingJob(job: MemoryJob): Promise<void> {
|
|
|
107
112
|
if (result.cancelled) {
|
|
108
113
|
throw new Error(`Media processing cancelled for asset ${mediaAssetId}`);
|
|
109
114
|
}
|
|
115
|
+
|
|
116
|
+
updateMediaAssetStatus(mediaAssetId, "indexed");
|
|
117
|
+
if (selectedBackendSupportsMultimodal(getConfig())) {
|
|
118
|
+
enqueueMemoryJob("embed_media", { assetId: mediaAssetId });
|
|
119
|
+
}
|
|
110
120
|
}
|
package/src/memory/job-utils.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
2
|
|
|
3
3
|
import { and, eq } from "drizzle-orm";
|
|
4
4
|
|
|
@@ -10,6 +10,11 @@ import {
|
|
|
10
10
|
embedWithBackend,
|
|
11
11
|
getMemoryBackendStatus,
|
|
12
12
|
} from "./embedding-backend.js";
|
|
13
|
+
import type { EmbeddingInput } from "./embedding-types.js";
|
|
14
|
+
import {
|
|
15
|
+
embeddingInputContentHash,
|
|
16
|
+
normalizeEmbeddingInput,
|
|
17
|
+
} from "./embedding-types.js";
|
|
13
18
|
import { withQdrantBreaker } from "./qdrant-circuit-breaker.js";
|
|
14
19
|
import { getQdrantClient } from "./qdrant-client.js";
|
|
15
20
|
import { memoryEmbeddings } from "./schema.js";
|
|
@@ -136,9 +141,9 @@ export function truncate(text: string, max: number): string {
|
|
|
136
141
|
|
|
137
142
|
export async function embedAndUpsert(
|
|
138
143
|
config: AssistantConfig,
|
|
139
|
-
targetType: "segment" | "item" | "summary",
|
|
144
|
+
targetType: "segment" | "item" | "summary" | "media",
|
|
140
145
|
targetId: string,
|
|
141
|
-
|
|
146
|
+
input: EmbeddingInput,
|
|
142
147
|
extraPayload?: Record<string, unknown>,
|
|
143
148
|
): Promise<void> {
|
|
144
149
|
const status = getMemoryBackendStatus(config);
|
|
@@ -148,7 +153,7 @@ export async function embedAndUpsert(
|
|
|
148
153
|
);
|
|
149
154
|
}
|
|
150
155
|
|
|
151
|
-
const contentHash =
|
|
156
|
+
const contentHash = embeddingInputContentHash(input);
|
|
152
157
|
let provider = status.provider;
|
|
153
158
|
let model = status.model!;
|
|
154
159
|
let vector: number[];
|
|
@@ -181,13 +186,21 @@ export async function embedAndUpsert(
|
|
|
181
186
|
vector = JSON.parse(cachedRow.vectorJson!);
|
|
182
187
|
}
|
|
183
188
|
} else {
|
|
184
|
-
const embedded = await embedWithBackend(config, [
|
|
189
|
+
const embedded = await embedWithBackend(config, [input]);
|
|
185
190
|
vector = embedded.vectors[0];
|
|
186
191
|
if (!vector) return;
|
|
187
192
|
provider = embedded.provider;
|
|
188
193
|
model = embedded.model;
|
|
189
194
|
}
|
|
190
195
|
|
|
196
|
+
// Extract text for Qdrant payload: use the raw text for text inputs,
|
|
197
|
+
// or a description string for non-text (image/audio/video) inputs.
|
|
198
|
+
const normalized = normalizeEmbeddingInput(input);
|
|
199
|
+
const payloadText =
|
|
200
|
+
normalized.type === "text"
|
|
201
|
+
? normalized.text
|
|
202
|
+
: `[${normalized.type}:${normalized.mimeType}]`;
|
|
203
|
+
|
|
191
204
|
// Persist embedding in SQLite for cross-restart cache
|
|
192
205
|
const now = Date.now();
|
|
193
206
|
try {
|
|
@@ -234,9 +247,11 @@ export async function embedAndUpsert(
|
|
|
234
247
|
}
|
|
235
248
|
|
|
236
249
|
try {
|
|
250
|
+
const modality = normalized.type;
|
|
237
251
|
await withQdrantBreaker(() =>
|
|
238
252
|
qdrant.upsert(targetType, targetId, vector, {
|
|
239
|
-
text,
|
|
253
|
+
text: payloadText,
|
|
254
|
+
modality,
|
|
240
255
|
created_at: (extraPayload?.created_at as number) ?? now,
|
|
241
256
|
...(extraPayload as Record<string, unknown> | undefined),
|
|
242
257
|
}),
|
package/src/memory/jobs-store.ts
CHANGED
|
@@ -27,12 +27,16 @@ export type MemoryJobType =
|
|
|
27
27
|
| "rebuild_index"
|
|
28
28
|
| "reconcile_fts"
|
|
29
29
|
| "delete_qdrant_vectors"
|
|
30
|
-
| "media_processing"
|
|
30
|
+
| "media_processing"
|
|
31
|
+
| "embed_media"
|
|
32
|
+
| "embed_attachment";
|
|
31
33
|
|
|
32
34
|
const EMBED_JOB_TYPES: MemoryJobType[] = [
|
|
33
35
|
"embed_segment",
|
|
34
36
|
"embed_item",
|
|
35
37
|
"embed_summary",
|
|
38
|
+
"embed_media",
|
|
39
|
+
"embed_attachment",
|
|
36
40
|
];
|
|
37
41
|
|
|
38
42
|
export interface MemoryJob<T = Record<string, unknown>> {
|
|
@@ -18,7 +18,9 @@ import {
|
|
|
18
18
|
} from "./job-handlers/conflict.js";
|
|
19
19
|
// ── Per-job-type handlers ──────────────────────────────────────────
|
|
20
20
|
import {
|
|
21
|
+
embedAttachmentJob,
|
|
21
22
|
embedItemJob,
|
|
23
|
+
embedMediaJob,
|
|
22
24
|
embedSegmentJob,
|
|
23
25
|
embedSummaryJob,
|
|
24
26
|
} from "./job-handlers/embedding.js";
|
|
@@ -334,6 +336,12 @@ async function processJob(
|
|
|
334
336
|
case "media_processing":
|
|
335
337
|
await mediaProcessingJob(job);
|
|
336
338
|
return;
|
|
339
|
+
case "embed_media":
|
|
340
|
+
await embedMediaJob(job, config);
|
|
341
|
+
return;
|
|
342
|
+
case "embed_attachment":
|
|
343
|
+
await embedAttachmentJob(job, config);
|
|
344
|
+
return;
|
|
337
345
|
default:
|
|
338
346
|
throw new Error(
|
|
339
347
|
`Unknown memory job type: ${(job as { type: string }).type}`,
|