@vellumai/assistant 0.4.33 → 0.4.34

package/src/contacts/contacts-write.ts

@@ -8,7 +8,6 @@
 
 import type { ChannelId } from "../channels/types.js";
 import type { GuardianBinding } from "../memory/channel-guardian-store.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
 import { canonicalizeInboundIdentity } from "../util/canonicalize-identity.js";
 import { getLogger } from "../util/logger.js";
 import { emitContactChange } from "./contact-events.js";
@@ -58,7 +57,6 @@ function parseDisplayNameFromMetadata(
  * (so callers expecting binding.id still work).
  */
 export function createGuardianBinding(params: {
-  assistantId: string;
   channel: string;
   guardianExternalUserId: string;
   guardianDeliveryChatId: string;
@@ -81,7 +79,6 @@ export function createGuardianBinding(params: {
     role: "guardian",
     notes: "guardian",
     principalId: params.guardianPrincipalId,
-    assistantId: params.assistantId,
     channels: [
       {
         type: params.channel,
@@ -98,7 +95,7 @@ export function createGuardianBinding(params: {
   const now = Date.now();
   const result: GuardianBinding = {
     id: `contact-binding-${params.channel}`,
-    assistantId: params.assistantId,
+    assistantId: "self",
     channel: params.channel,
     guardianExternalUserId: params.guardianExternalUserId,
     guardianDeliveryChatId: params.guardianDeliveryChatId,
@@ -118,11 +115,8 @@ export function createGuardianBinding(params: {
  * Revoke a guardian binding by updating the contacts table.
  * Returns true when a guardian channel was found and revoked, false otherwise.
  */
-export function revokeGuardianBinding(
-  assistantId: string,
-  channel: string,
-): boolean {
-  const guardian = findGuardianForChannel(channel, assistantId);
+export function revokeGuardianBinding(channel: string): boolean {
+  const guardian = findGuardianForChannel(channel);
   if (!guardian) return false;
 
   updateChannelStatus(guardian.channel.id, {
@@ -150,7 +144,6 @@ export function upsertMember(params: {
   status?: string;
   inviteId?: string;
   createdBySessionId?: string;
-  assistantId?: string;
 }): ContactWriteResult | null {
   let address: string;
 
@@ -179,7 +172,6 @@ export function upsertMember(params: {
 
   upsertContact({
     displayName,
-    assistantId: params.assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID,
     channels: [
       {
         type: params.sourceChannel,

package/src/contacts/types.ts

@@ -44,7 +44,6 @@ export interface Contact {
    * identified by channel address instead.
    */
   principalId: string | null;
-  assistantId: string | null;
 }
 
 export type ChannelStatus =

package/src/daemon/handlers/config-channels.ts

@@ -2,7 +2,10 @@ import * as net from "node:net";
 
 import type { ChannelId } from "../../channels/types.js";
 import { resolveGuardianName } from "../../config/user-reference.js";
-import { findContactChannel } from "../../contacts/contact-store.js";
+import {
+  findContactChannel,
+  findGuardianForChannel,
+} from "../../contacts/contact-store.js";
 import { revokeMember } from "../../contacts/contacts-write.js";
 import type { ChannelStatus } from "../../contacts/types.js";
 import * as externalConversationStore from "../../memory/external-conversation-store.js";
@@ -88,11 +91,7 @@ export function createGuardianChallenge(
     };
   }
 
-  const result = createVerificationChallenge(
-    resolvedAssistantId,
-    resolvedChannel,
-    sessionId,
-  );
+  const result = createVerificationChallenge(resolvedChannel, sessionId);
 
   return {
     success: true,
@@ -110,36 +109,15 @@ export function getGuardianStatus(
 
   const binding = getGuardianBinding(resolvedAssistantId, resolvedChannel);
 
-  // Resolve guardianUsername and displayName from binding metadata or
-  // external conversation store. The displayName is passed to
-  // resolveGuardianName() as a fallback for when USER.md is missing/empty
-  // (e.g. pre-onboarding).
-  let guardianUsername: string | undefined;
-  let bindingDisplayName: string | undefined;
-  if (binding?.metadataJson) {
-    try {
-      const parsed = JSON.parse(binding.metadataJson) as Record<
-        string,
-        unknown
-      >;
-      if (
-        typeof parsed.username === "string" &&
-        parsed.username.trim().length > 0
-      ) {
-        guardianUsername = parsed.username.trim();
-      }
-      if (
-        typeof parsed.displayName === "string" &&
-        parsed.displayName.trim().length > 0
-      ) {
-        bindingDisplayName = parsed.displayName.trim();
-      }
-    } catch {
-      // ignore malformed metadata
-    }
-  }
+  // Read the contact directly to get displayName — getGuardianBinding is a
+  // compatibility shim that doesn't carry metadataJson.
+  const guardianResult = findGuardianForChannel(resolvedChannel);
+  const bindingDisplayName = guardianResult?.contact.displayName;
   const guardianDisplayName = resolveGuardianName(bindingDisplayName);
-  if (binding?.guardianDeliveryChatId && !guardianUsername) {
+
+  // Resolve username from external conversation store.
+  let guardianUsername: string | undefined;
+  if (binding?.guardianDeliveryChatId) {
     const ext = externalConversationStore.getBindingByChannelChat(
       resolvedChannel,
       binding.guardianDeliveryChatId,
@@ -148,15 +126,11 @@ export function getGuardianStatus(
       guardianUsername = ext.username;
     }
   }
-  const hasPendingChallenge =
-    getPendingChallenge(resolvedAssistantId, resolvedChannel) != null;
+  const hasPendingChallenge = getPendingChallenge(resolvedChannel) != null;
 
   // Include active outbound session state so the UI can resume
   // after app restart and detect bootstrap completion.
-  const activeOutboundSession = findActiveSession(
-    resolvedAssistantId,
-    resolvedChannel,
-  );
+  const activeOutboundSession = findActiveSession(resolvedChannel);
   const outboundFields: Record<string, unknown> = {};
   if (activeOutboundSession) {
     outboundFields.verificationSessionId = activeOutboundSession.id;
@@ -195,7 +169,7 @@ export function revokeGuardianForChannel(
   // Always revoke pending challenges first — the macOS app uses
   // action: "revoke" to cancel an in-flight challenge even before
   // a binding exists (e.g. during verification setup).
-  revokePendingChallenges(assistantId, resolvedChannel);
+  revokePendingChallenges(resolvedChannel);
 
   // Capture binding before revoking so we can revoke the guardian's
   // contact record — without this, the guardian would still pass

package/src/daemon/handlers/config-inbox.ts

@@ -12,6 +12,7 @@ import {
 } from "../../memory/channel-guardian-store.js";
 import { addMessage, getMessages } from "../../memory/conversation-store.js";
 import { getBindingByConversation } from "../../memory/external-conversation-store.js";
+import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import { mintDaemonDeliveryToken } from "../../runtime/auth/token-service.js";
 import { deliverChannelReply } from "../../runtime/gateway-client.js";
 import {
@@ -153,7 +154,6 @@ export function handleInboxEscalation(
     switch (msg.action) {
       case "list": {
         const escalations = listPendingApprovalRequests({
-          assistantId: msg.assistantId,
           status: (msg.status as ApprovalRequestStatus) ?? undefined,
         });
         ctx.send(socket, {
@@ -279,7 +279,7 @@ async function executeApprove(
   approval: GuardianApprovalRequest,
   ctx: HandlerContext,
 ): Promise<void> {
-  const { conversationId, assistantId, channel } = approval;
+  const { conversationId, channel } = approval;
 
   // Recover the original message content from the stored payload
   const payload = getLatestStoredPayload(conversationId);
@@ -316,7 +316,7 @@ async function executeApprove(
       });
     }
   }
-  session.setAssistantId(assistantId);
+  session.setAssistantId(DAEMON_INTERNAL_ASSISTANT_ID);
   // The guardian already approved this escalation via the inbox, so we
   // directly set guardian trust. Going through resolveLocalIpcTrustContext
   // would look up the vellum binding's guardian ID and compare it against
@@ -368,7 +368,7 @@ async function executeApprove(
             {
               chatId: externalChatId,
               text: rendered.text,
-              assistantId,
+              assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
             },
             bearerToken,
           );
@@ -388,7 +388,7 @@ async function executeDeny(
   approval: GuardianApprovalRequest,
   reason: string | undefined,
 ): Promise<void> {
-  const { conversationId, assistantId, channel } = approval;
+  const { conversationId, channel } = approval;
 
   const binding = getBindingByConversation(conversationId);
   if (!binding) {
@@ -423,7 +423,7 @@ async function executeDeny(
     {
       chatId: binding.externalChatId,
       text: denialText,
-      assistantId,
+      assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
     },
     bearerToken,
   );

package/src/daemon/handlers/contacts.ts

@@ -7,7 +7,6 @@ import {
   updateChannelStatus,
 } from "../../contacts/contact-store.js";
 import type { ContactWithChannels } from "../../contacts/types.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import type {
   ContactChannelPayload,
   ContactPayload,
@@ -58,11 +57,7 @@ export function handleContacts(
   try {
     switch (msg.action) {
       case "list": {
-        const results = listContacts(
-          DAEMON_INTERNAL_ASSISTANT_ID,
-          msg.limit ?? 50,
-          msg.role,
-        );
+        const results = listContacts(msg.limit ?? 50, msg.role);
         ctx.send(socket, {
           type: "contacts_response",
           success: true,
@@ -80,7 +75,7 @@ export function handleContacts(
           });
           return;
         }
-        const contact = getContact(msg.contactId, DAEMON_INTERNAL_ASSISTANT_ID);
+        const contact = getContact(msg.contactId);
         if (!contact) {
           ctx.send(socket, {
             type: "contacts_response",
@@ -131,10 +126,7 @@ export function handleContacts(
           return;
         }
         // Return the parent contact with all channels so the client has the full picture
-        const parentContact = getContact(
-          updated.contactId,
-          DAEMON_INTERNAL_ASSISTANT_ID,
-        );
+        const parentContact = getContact(updated.contactId);
         ctx.send(socket, {
           type: "contacts_response",
           success: true,

package/src/daemon/handlers/index.ts

@@ -6,7 +6,6 @@ import {
   type SignalType,
 } from "../../memory/conversation-attention-store.js";
 import { updateDeliveryClientOutcome } from "../../notifications/deliveries-store.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import type { ClientMessage } from "../ipc-protocol.js";
 import {
   handleRideShotgunStart,
@@ -120,7 +119,6 @@ const inlineHandlers = defineHandlers({
     try {
       recordConversationSeenSignal({
         conversationId: msg.conversationId,
-        assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
         sourceChannel: msg.sourceChannel,
         signalType: msg.signalType as SignalType,
         confidence: msg.confidence as Confidence,

package/src/daemon/session-process.ts

@@ -434,13 +434,11 @@ export async function drainQueue(
   // Fire-and-forget: detect notification preferences in the queued message
   // and persist any that are found, mirroring the logic in processMessage.
   if (session.assistantId) {
-    const aid = session.assistantId;
     extractPreferences(resolvedContent)
       .then((result) => {
         if (!result.detected) return;
         for (const pref of result.preferences) {
           createPreference({
-            assistantId: aid,
             preferenceText: pref.preferenceText,
             appliesWhen: pref.appliesWhen,
             priority: pref.priority,
@@ -735,13 +733,11 @@ export async function processMessage(
   // and persist any that are found. Runs in the background so it doesn't
   // block the main conversation flow.
   if (session.assistantId) {
-    const aid = session.assistantId;
     extractPreferences(resolvedContent)
       .then((result) => {
         if (!result.detected) return;
         for (const pref of result.preferences) {
           createPreference({
-            assistantId: aid,
             preferenceText: pref.preferenceText,
             appliesWhen: pref.appliesWhen,
             priority: pref.priority,

package/src/memory/conversation-attention-store.ts

@@ -32,7 +32,6 @@ export type Confidence = "explicit" | "inferred";
 export interface AttentionEvent {
   id: string;
   conversationId: string;
-  assistantId: string;
   sourceChannel: string;
   signalType: SignalType;
   confidence: Confidence;
@@ -45,7 +44,6 @@ export interface AttentionEvent {
 
 export interface AttentionState {
   conversationId: string;
-  assistantId: string;
   latestAssistantMessageId: string | null;
   latestAssistantMessageAt: number | null;
   lastSeenAssistantMessageId: string | null;
@@ -68,7 +66,6 @@ function rowToEvent(
   return {
     id: row.id,
     conversationId: row.conversationId,
-    assistantId: row.assistantId,
     sourceChannel: row.sourceChannel,
     signalType: row.signalType as SignalType,
     confidence: row.confidence as Confidence,
@@ -85,7 +82,6 @@ function rowToState(
 ): AttentionState {
   return {
     conversationId: row.conversationId,
-    assistantId: row.assistantId,
     latestAssistantMessageId: row.latestAssistantMessageId,
     latestAssistantMessageAt: row.latestAssistantMessageAt,
     lastSeenAssistantMessageId: row.lastSeenAssistantMessageId,
@@ -109,11 +105,10 @@ function rowToState(
  */
 export function projectAssistantMessage(params: {
   conversationId: string;
-  assistantId: string;
   messageId: string;
   messageAt: number;
 }): void {
-  const { conversationId, assistantId, messageId, messageAt } = params;
+  const { conversationId, messageId, messageAt } = params;
   const db = getDb();
   const now = Date.now();
 
@@ -129,7 +124,6 @@ export function projectAssistantMessage(params: {
     db.insert(conversationAssistantAttentionState)
       .values({
         conversationId,
-        assistantId,
         latestAssistantMessageId: messageId,
         latestAssistantMessageAt: messageAt,
         lastSeenAssistantMessageId: null,
@@ -175,7 +169,6 @@ export function projectAssistantMessage(params: {
  */
 export function recordConversationSeenSignal(params: {
   conversationId: string;
-  assistantId: string;
   sourceChannel: string;
   signalType: SignalType;
   confidence: Confidence;
@@ -186,7 +179,6 @@ export function recordConversationSeenSignal(params: {
 }): AttentionEvent {
   const {
     conversationId,
-    assistantId,
     sourceChannel,
     signalType,
     confidence,
@@ -205,7 +197,6 @@ export function recordConversationSeenSignal(params: {
   const event: typeof conversationAttentionEvents.$inferInsert = {
     id: eventId,
     conversationId,
-    assistantId,
     sourceChannel,
     signalType,
     confidence,
@@ -252,7 +243,6 @@ export function recordConversationSeenSignal(params: {
       tx.insert(conversationAssistantAttentionState)
         .values({
           conversationId,
-          assistantId,
           latestAssistantMessageId: latestMsgId,
           latestAssistantMessageAt: latestMsgAt,
           lastSeenAssistantMessageId: latestMsgId,
@@ -348,7 +338,6 @@ export function getAttentionStateByConversationIds(
 export type AttentionFilterState = "seen" | "unseen" | "all";
 
 export interface ListConversationAttentionParams {
-  assistantId: string;
   state?: AttentionFilterState;
   sourceChannel?: string;
   source?: string;
@@ -364,7 +353,6 @@ export function listConversationAttention(
   params: ListConversationAttentionParams,
 ): AttentionState[] {
   const {
-    assistantId,
     state: filterState = "all",
     sourceChannel,
     source,
@@ -373,9 +361,8 @@ export function listConversationAttention(
   } = params;
 
   const db = getDb();
-  const conditions = [
-    eq(conversationAssistantAttentionState.assistantId, assistantId),
-  ];
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const conditions: any[] = [];
 
   if (sourceChannel) {
     conditions.push(eq(conversations.originChannel, sourceChannel));
@@ -415,7 +402,6 @@ export function listConversationAttention(
   let query = db
     .select({
       conversationId: conversationAssistantAttentionState.conversationId,
-      assistantId: conversationAssistantAttentionState.assistantId,
       latestAssistantMessageId:
         conversationAssistantAttentionState.latestAssistantMessageId,
       latestAssistantMessageAt:
@@ -448,8 +434,7 @@ export function listConversationAttention(
     );
   }
 
-  const rows = query
-    .where(and(...conditions))
+  const rows = (conditions.length > 0 ? query.where(and(...conditions)) : query)
     .orderBy(desc(conversationAssistantAttentionState.latestAssistantMessageAt))
     .limit(limit)
     .all();

package/src/memory/conversation-crud.ts

@@ -7,7 +7,6 @@ import { parseChannelId, parseInterfaceId } from "../channels/types.js";
 import { CHANNEL_IDS, INTERFACE_IDS, isChannelId } from "../channels/types.js";
 import { getConfig } from "../config/loader.js";
 import type { TrustContext } from "../daemon/session-runtime-assembly.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
 import { getLogger } from "../util/logger.js";
 import { createRowMapper } from "../util/row-mapper.js";
 import { deleteOrphanAttachments } from "./attachments-store.js";
@@ -394,7 +393,6 @@ export async function addMessage(
     try {
       projectAssistantMessage({
         conversationId,
-        assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
         messageId: message.id,
         messageAt: message.createdAt,
       });

package/src/memory/db-init.ts

@@ -36,6 +36,7 @@ import {
   migrateBackfillContactInteractionStats,
   migrateBackfillGuardianPrincipalId,
   migrateCallSessionMode,
+  migrateDropAssistantIdColumns,
   migrateCanonicalGuardianDeliveriesDestinationIndex,
   migrateCanonicalGuardianRequesterChatId,
   migrateChannelInboundDeliveredSegments,
@@ -289,6 +290,9 @@ export function initializeDb(): void {
   // 39. Backfill contact interaction stats from channel lastSeenAt
   migrateBackfillContactInteractionStats(database);
 
+  // 40. Drop assistant_id columns from all 16 daemon tables
+  migrateDropAssistantIdColumns(database);
+
   validateMigrationState(database);
 
   if (process.env.BUN_TEST === "1") {

package/src/memory/guardian-action-store.ts

@@ -10,7 +10,6 @@
 import { and, desc, eq, inArray, lt } from "drizzle-orm";
 import { v4 as uuid } from "uuid";
 
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
 import { getLogger } from "../util/logger.js";
 import { getDb, rawChanges } from "./db.js";
 import { guardianActionDeliveries, guardianActionRequests } from "./schema.js";
@@ -49,7 +48,6 @@ export type FollowupAction = "call_back" | "message_back" | "decline";
 
 export interface GuardianActionRequest {
   id: string;
-  assistantId: string;
   kind: string;
   sourceChannel: string;
   sourceConversationId: string;
@@ -101,7 +99,6 @@ function rowToRequest(
 ): GuardianActionRequest {
   return {
     id: row.id,
-    assistantId: row.assistantId,
     kind: row.kind,
     sourceChannel: row.sourceChannel,
     sourceConversationId: row.sourceConversationId,
@@ -165,7 +162,6 @@ function generateRequestCode(): string {
  * legacy guardian action rows continue to compile.
  */
 export function createGuardianActionRequest(params: {
-  assistantId?: string;
   kind: string;
   sourceChannel: string;
   sourceConversationId: string;
@@ -182,7 +178,6 @@ export function createGuardianActionRequest(params: {
 
   const row = {
     id,
-    assistantId: params.assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID,
     kind: params.kind,
     sourceChannel: params.sourceChannel,
     sourceConversationId: params.sourceConversationId,
@@ -693,14 +688,12 @@ export function createGuardianActionDelivery(params: {
  * Used by inbound message routing to match incoming answers to deliveries.
  */
 export function getPendingDeliveriesByDestination(
-  assistantId: string,
   channel: string,
   chatId: string,
 ): GuardianActionDelivery[] {
   try {
     const db = getDb();
 
-    // Join deliveries with requests to filter by assistantId
     const rows = db
       .select({
         delivery: guardianActionDeliveries,
@@ -712,7 +705,6 @@ export function getPendingDeliveriesByDestination(
       )
       .where(
         and(
-          eq(guardianActionRequests.assistantId, assistantId),
           eq(guardianActionRequests.status, "pending"),
           eq(guardianActionDeliveries.destinationChannel, channel),
           eq(guardianActionDeliveries.destinationChatId, chatId),
@@ -784,7 +776,6 @@ export function getPendingDeliveriesByConversation(
  * Used by inbound message routing to match late guardian answers to expired requests.
  */
 export function getExpiredDeliveriesByDestination(
-  assistantId: string,
   channel: string,
   chatId: string,
 ): GuardianActionDelivery[] {
@@ -802,7 +793,6 @@ export function getExpiredDeliveriesByDestination(
       )
       .where(
         and(
-          eq(guardianActionRequests.assistantId, assistantId),
           eq(guardianActionRequests.status, "expired"),
           eq(guardianActionRequests.followupState, "none"),
           eq(guardianActionDeliveries.destinationChannel, channel),
@@ -877,7 +867,6 @@ export function getExpiredDeliveriesByConversation(
  * on channel paths (Telegram, SMS).
  */
 export function getFollowupDeliveriesByDestination(
-  assistantId: string,
   channel: string,
   chatId: string,
 ): GuardianActionDelivery[] {
@@ -895,7 +884,6 @@ export function getFollowupDeliveriesByDestination(
       )
       .where(
         and(
-          eq(guardianActionRequests.assistantId, assistantId),
           eq(guardianActionRequests.status, "expired"),
           eq(guardianActionRequests.followupState, "awaiting_guardian_choice"),
           eq(guardianActionDeliveries.destinationChannel, channel),