@vellumai/assistant 0.4.33 → 0.4.35

package/src/memory/migrations/136-drop-assistant-id-columns.ts

@@ -0,0 +1,263 @@
+import { getLogger } from "../../util/logger.js";
+import { type DrizzleDb, getSqliteFrom } from "../db-connection.js";
+import { withCrashRecovery } from "./validate-migration-state.js";
+
+const log = getLogger("migration-136");
+
+/**
+ * Drop `assistant_id` columns from all 16 daemon tables that carried the
+ * per-assistant scoping column. After wave-1 PRs normalised every value to
+ * 'self' (the implicit single-tenant identity), the column is dead weight.
+ *
+ * Steps:
+ *  1. Safety assertion: verify all rows are 'self' or NULL.
+ *  2. Drop composite indexes that include `assistant_id`.
+ *  3. `ALTER TABLE ... DROP COLUMN assistant_id` for each table.
+ *  4. Recreate indexes without the `assistant_id` column.
+ */
+export function migrateDropAssistantIdColumns(database: DrizzleDb): void {
+  withCrashRecovery(database, "migration_drop_assistant_id_columns_v1", () => {
+    const raw = getSqliteFrom(database);
+
+    // The 16 tables that carry assistant_id.
+    const tables = [
+      "contacts",
+      "assistant_ingress_invites",
+      "assistant_inbox_thread_state",
+      "call_sessions",
+      "channel_guardian_verification_challenges",
+      "channel_guardian_approval_requests",
+      "channel_guardian_rate_limits",
+      "guardian_action_requests",
+      "scoped_approval_grants",
+      "notification_events",
+      "notification_preferences",
+      "notification_deliveries",
+      "conversation_attention_events",
+      "conversation_assistant_attention_state",
+      "actor_token_records",
+      "actor_refresh_token_records",
+    ];
+
+    // --- Safety assertion ---
+    // Verify all existing assistant_id values are 'self' or NULL before dropping.
+    for (const table of tables) {
+      const cols = new Set(
+        (
+          raw.query(`PRAGMA table_info(${table})`).all() as Array<{
+            name: string;
+          }>
+        ).map((c) => c.name),
+      );
+
+      if (!cols.has("assistant_id")) {
+        log.info(
+          { table },
+          "Table does not have assistant_id column — skipping",
+        );
+        continue;
+      }
+
+      const unexpected = raw
+        .query(
+          `SELECT DISTINCT assistant_id FROM ${table} WHERE assistant_id IS NOT NULL AND assistant_id != 'self'`,
+        )
+        .all() as Array<{ assistant_id: string }>;
+
+      if (unexpected.length > 0) {
+        log.warn(
+          { table, values: unexpected.map((r) => r.assistant_id) },
+          "Unexpected assistant_id values found — skipping table",
+        );
+        continue;
+      }
+    }
+
+    // --- Drop ALL indexes that include assistant_id ---
+    // Every index below references the assistant_id column. SQLite will error
+    // on ALTER TABLE ... DROP COLUMN if any index still references the column.
+
+    // channel_guardian_verification_challenges indexes (migrations 110, 026, 027a)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_channel_guardian_challenges_lookup`,
+    );
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_guardian_sessions_active`);
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_guardian_sessions_identity`);
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_guardian_sessions_destination`);
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_guardian_sessions_bootstrap`);
+
+    // channel_guardian_rate_limits indexes (migration 110)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_channel_guardian_rate_limits_actor`,
+    );
+
+    // assistant_ingress_invites indexes (migration 112)
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_ingress_invites_channel_status`);
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_ingress_invites_channel_created`,
+    );
+
+    // assistant_inbox_thread_state indexes (migration 112)
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_inbox_thread_state_channel`);
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_inbox_thread_state_last_msg`);
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_inbox_thread_state_escalation`);
+
+    // notification_preferences indexes (migration 114)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_notification_preferences_assistant_id`,
+    );
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_notification_preferences_assistant_priority`,
+    );
+
+    // notification_events indexes (migration 114)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_notification_events_assistant_event_created`,
+    );
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_notification_events_dedupe`);
+
+    // notification_deliveries indexes (migration 114)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_notification_deliveries_assistant_status`,
+    );
+
+    // conversation_attention_events indexes (migration 117)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_conv_attn_events_assistant_observed`,
+    );
+
+    // conversation_assistant_attention_state indexes (migration 117)
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_conv_attn_state_assistant_latest_msg`,
+    );
+    raw.exec(
+      /*sql*/ `DROP INDEX IF EXISTS idx_conv_attn_state_assistant_last_seen`,
+    );
+
+    // actor_token_records indexes (migration 038)
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_actor_tokens_active_device`);
+
+    // actor_refresh_token_records indexes (migration 039)
+    raw.exec(/*sql*/ `DROP INDEX IF EXISTS idx_refresh_tokens_active_device`);
+
+    // --- Drop assistant_id column from each table ---
+    for (const table of tables) {
+      const cols = new Set(
+        (
+          raw.query(`PRAGMA table_info(${table})`).all() as Array<{
+            name: string;
+          }>
+        ).map((c) => c.name),
+      );
+
+      if (!cols.has("assistant_id")) continue;
+
+      // Re-verify safety before each drop
+      const unexpected = raw
+        .query(
+          `SELECT DISTINCT assistant_id FROM ${table} WHERE assistant_id IS NOT NULL AND assistant_id != 'self'`,
+        )
+        .all() as Array<{ assistant_id: string }>;
+
+      if (unexpected.length > 0) {
+        log.warn(
+          { table, values: unexpected.map((r) => r.assistant_id) },
+          "Unexpected assistant_id values — skipping column drop",
+        );
+        continue;
+      }
+
+      raw.exec(/*sql*/ `ALTER TABLE ${table} DROP COLUMN assistant_id`);
+      log.info({ table }, "Dropped assistant_id column");
+    }
+
+    // --- Recreate indexes without assistant_id ---
+    // Each index below is the equivalent of the dropped index but with the
+    // assistant_id column removed. Index names are updated to avoid
+    // collisions with the old names.
+
+    // channel_guardian_verification_challenges
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_channel_guardian_challenges_lookup ON channel_guardian_verification_challenges(channel, challenge_hash, status)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_guardian_sessions_active ON channel_guardian_verification_challenges(channel, status)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_guardian_sessions_identity ON channel_guardian_verification_challenges(channel, expected_external_user_id, expected_chat_id, status)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_guardian_sessions_destination ON channel_guardian_verification_challenges(channel, destination_address)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_guardian_sessions_bootstrap ON channel_guardian_verification_challenges(channel, bootstrap_token_hash, status)`,
+    );
+
+    // channel_guardian_rate_limits
+    raw.exec(
+      /*sql*/ `CREATE UNIQUE INDEX IF NOT EXISTS idx_channel_guardian_rate_limits_actor ON channel_guardian_rate_limits(channel, actor_external_user_id, actor_chat_id)`,
+    );
+
+    // assistant_ingress_invites
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_ingress_invites_channel_status ON assistant_ingress_invites(source_channel, status, expires_at)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_ingress_invites_channel_created ON assistant_ingress_invites(source_channel, created_at)`,
+    );
+
+    // assistant_inbox_thread_state
+    raw.exec(
+      /*sql*/ `CREATE UNIQUE INDEX IF NOT EXISTS idx_inbox_thread_state_channel ON assistant_inbox_thread_state(source_channel, external_chat_id)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_inbox_thread_state_last_msg ON assistant_inbox_thread_state(last_message_at)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_inbox_thread_state_escalation ON assistant_inbox_thread_state(has_pending_escalation, last_message_at)`,
+    );
+
+    // notification_preferences
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_notification_preferences_priority ON notification_preferences(priority DESC)`,
+    );
+
+    // notification_events
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_notification_events_event_created ON notification_events(source_event_name, created_at)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE UNIQUE INDEX IF NOT EXISTS idx_notification_events_dedupe ON notification_events(dedupe_key) WHERE dedupe_key IS NOT NULL`,
+    );
+
+    // notification_deliveries
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_notification_deliveries_status ON notification_deliveries(status)`,
+    );
+
+    // conversation_attention_events
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_conv_attn_events_observed ON conversation_attention_events(observed_at)`,
+    );
+
+    // conversation_assistant_attention_state
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_conv_attn_state_latest_msg ON conversation_assistant_attention_state(latest_assistant_message_at)`,
+    );
+    raw.exec(
+      /*sql*/ `CREATE INDEX IF NOT EXISTS idx_conv_attn_state_last_seen ON conversation_assistant_attention_state(last_seen_assistant_message_at)`,
+    );
+
+    // actor_token_records
+    raw.exec(
+      /*sql*/ `CREATE UNIQUE INDEX IF NOT EXISTS idx_actor_tokens_active_device ON actor_token_records(guardian_principal_id, hashed_device_id) WHERE status = 'active'`,
+    );
+
+    // actor_refresh_token_records
+    raw.exec(
+      /*sql*/ `CREATE UNIQUE INDEX IF NOT EXISTS idx_refresh_tokens_active_device ON actor_refresh_token_records(guardian_principal_id, hashed_device_id) WHERE status = 'active'`,
+    );
+
+    log.info("Completed dropping assistant_id columns from all tables");
+  });
+}

package/src/memory/migrations/index.ts

@@ -78,6 +78,7 @@ export { migrateContactsAssistantId } from "./132-contacts-assistant-id.js";
 export { migrateAssistantContactMetadata } from "./133-assistant-contact-metadata.js";
 export { migrateContactsNotesColumn } from "./134-contacts-notes-column.js";
 export { migrateBackfillContactInteractionStats } from "./135-backfill-contact-interaction-stats.js";
+export { migrateDropAssistantIdColumns } from "./136-drop-assistant-id-columns.js";
 export {
   MIGRATION_REGISTRY,
   type MigrationRegistryEntry,

package/src/memory/migrations/registry.ts

@@ -123,11 +123,24 @@ export const MIGRATION_REGISTRY: MigrationRegistryEntry[] = [
       "Enforce NOT NULL on channel_guardian_bindings.guardian_principal_id after backfill",
   },
   {
-    key: "backfill_contact_interaction_stats",
+    key: "migration_contacts_notes_column_v1",
     version: 17,
+    description:
+      "Consolidate relationship/importance/response_expectation/preferred_tone into a single notes TEXT column, then drop the legacy columns",
+  },
+  {
+    key: "backfill_contact_interaction_stats",
+    version: 18,
     description:
       "Backfill contacts.last_interaction from the max lastSeenAt across each contact's channels",
   },
+  {
+    key: "migration_drop_assistant_id_columns_v1",
+    version: 19,
+    dependsOn: ["migration_normalize_assistant_id_to_self_v1"],
+    description:
+      "Drop assistant_id columns from all 16 daemon tables after normalization to single-tenant identity",
+  },
 ];
 
 export interface MigrationValidationResult {

package/src/memory/migrations/schema-introspection.ts

@@ -0,0 +1,18 @@
+import { type DrizzleDb, getSqliteFrom } from "../db-connection.js";
+
+/**
+ * Startup still replays the historical table/index bootstrap helpers on every
+ * process launch, so migrations need a cheap way to branch on the live schema.
+ */
+export function tableHasColumn(
+  database: DrizzleDb,
+  tableName: string,
+  columnName: string,
+): boolean {
+  const raw = getSqliteFrom(database);
+  const columns = raw.query(`PRAGMA table_info(${tableName})`).all() as Array<{
+    name: string;
+  }>;
+
+  return columns.some((column) => column.name === columnName);
+}

package/src/memory/schema/calls.ts

@@ -6,7 +6,6 @@ import {
   text,
 } from "drizzle-orm/sqlite-core";
 
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import { conversations } from "./conversations.js";
 
 export const callSessions = sqliteTable(
@@ -26,7 +25,6 @@ export const callSessions = sqliteTable(
     guardianVerificationSessionId: text("guardian_verification_session_id"),
     callerIdentityMode: text("caller_identity_mode"),
     callerIdentitySource: text("caller_identity_source"),
-    assistantId: text("assistant_id"),
     initiatedFromConversationId: text("initiated_from_conversation_id"),
     startedAt: integer("started_at"),
     endedAt: integer("ended_at"),
@@ -91,7 +89,6 @@ export const channelGuardianVerificationChallenges = sqliteTable(
   "channel_guardian_verification_challenges",
   {
     id: text("id").primaryKey(),
-    assistantId: text("assistant_id").notNull(),
     channel: text("channel").notNull(),
     challengeHash: text("challenge_hash").notNull(),
     expiresAt: integer("expires_at").notNull(),
@@ -128,9 +125,6 @@ export const channelGuardianApprovalRequests = sqliteTable(
     runId: text("run_id").notNull(),
     requestId: text("request_id"),
     conversationId: text("conversation_id").notNull(),
-    assistantId: text("assistant_id")
-      .notNull()
-      .default(DAEMON_INTERNAL_ASSISTANT_ID),
     channel: text("channel").notNull(),
     requesterExternalUserId: text("requester_external_user_id").notNull(),
     requesterChatId: text("requester_chat_id").notNull(),
@@ -151,7 +145,6 @@ export const channelGuardianRateLimits = sqliteTable(
   "channel_guardian_rate_limits",
   {
     id: text("id").primaryKey(),
-    assistantId: text("assistant_id").notNull(),
     channel: text("channel").notNull(),
     actorExternalUserId: text("actor_external_user_id").notNull(),
     actorChatId: text("actor_chat_id").notNull(),

package/src/memory/schema/contacts.ts

@@ -1,6 +1,5 @@
 import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import { conversations } from "./conversations.js";
 
 export const contacts = sqliteTable("contacts", {
@@ -13,7 +12,6 @@ export const contacts = sqliteTable("contacts", {
   updatedAt: integer("updated_at").notNull(),
   role: text("role").notNull().default("contact"), // 'guardian' | 'contact'
   principalId: text("principal_id"), // internal auth principal (nullable)
-  assistantId: text("assistant_id"), // which assistant this guardian is for (nullable, daemon default is DAEMON_INTERNAL_ASSISTANT_ID)
   contactType: text("contact_type").notNull().default("human"), // 'human' | 'assistant'
 });
 
@@ -69,9 +67,6 @@ export const assistantIngressInvites = sqliteTable(
   "assistant_ingress_invites",
   {
     id: text("id").primaryKey(),
-    assistantId: text("assistant_id")
-      .notNull()
-      .default(DAEMON_INTERNAL_ASSISTANT_ID),
     sourceChannel: text("source_channel").notNull(),
     tokenHash: text("token_hash").notNull(),
     createdBySessionId: text("created_by_session_id"),
@@ -103,9 +98,6 @@ export const assistantInboxThreadState = sqliteTable(
     conversationId: text("conversation_id")
       .primaryKey()
       .references(() => conversations.id, { onDelete: "cascade" }),
-    assistantId: text("assistant_id")
-      .notNull()
-      .default(DAEMON_INTERNAL_ASSISTANT_ID),
     sourceChannel: text("source_channel").notNull(),
     externalChatId: text("external_chat_id").notNull(),
     externalUserId: text("external_user_id"),

package/src/memory/schema/guardian.ts

@@ -1,15 +1,11 @@
 import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import { callPendingQuestions, callSessions } from "./calls.js";
 
 export const guardianActionRequests = sqliteTable(
   "guardian_action_requests",
   {
     id: text("id").primaryKey(),
-    assistantId: text("assistant_id")
-      .notNull()
-      .default(DAEMON_INTERNAL_ASSISTANT_ID),
     kind: text("kind").notNull(), // 'ask_guardian'
     sourceChannel: text("source_channel").notNull(), // 'voice'
     sourceConversationId: text("source_conversation_id").notNull(),
@@ -145,7 +141,6 @@ export const scopedApprovalGrants = sqliteTable(
   "scoped_approval_grants",
   {
     id: text("id").primaryKey(),
-    assistantId: text("assistant_id").notNull(),
     scopeMode: text("scope_mode").notNull(), // 'request_id' | 'tool_signature'
     requestId: text("request_id"),
     toolName: text("tool_name"),

package/src/memory/schema/infrastructure.ts

@@ -173,7 +173,6 @@ export const llmUsageEvents = sqliteTable(
 export const actorTokenRecords = sqliteTable("actor_token_records", {
   id: text("id").primaryKey(),
   tokenHash: text("token_hash").notNull(),
-  assistantId: text("assistant_id").notNull(),
   guardianPrincipalId: text("guardian_principal_id").notNull(),
   hashedDeviceId: text("hashed_device_id").notNull(),
   platform: text("platform").notNull(),
@@ -190,7 +189,6 @@ export const actorRefreshTokenRecords = sqliteTable(
     id: text("id").primaryKey(),
     tokenHash: text("token_hash").notNull(),
     familyId: text("family_id").notNull(),
-    assistantId: text("assistant_id").notNull(),
     guardianPrincipalId: text("guardian_principal_id").notNull(),
     hashedDeviceId: text("hashed_device_id").notNull(),
     platform: text("platform").notNull(),

package/src/memory/schema/notifications.ts

@@ -11,7 +11,6 @@ import { conversations } from "./conversations.js";
 
 export const notificationEvents = sqliteTable("notification_events", {
   id: text("id").primaryKey(),
-  assistantId: text("assistant_id").notNull(),
   sourceEventName: text("source_event_name").notNull(),
   sourceChannel: text("source_channel").notNull(),
   sourceSessionId: text("source_session_id").notNull(),
@@ -39,7 +38,6 @@ export const notificationDecisions = sqliteTable("notification_decisions", {
 
 export const notificationPreferences = sqliteTable("notification_preferences", {
   id: text("id").primaryKey(),
-  assistantId: text("assistant_id").notNull(),
   preferenceText: text("preference_text").notNull(),
   appliesWhenJson: text("applies_when_json").notNull().default("{}"),
   priority: integer("priority").notNull().default(0),
@@ -95,7 +93,6 @@ export const notificationDeliveries = sqliteTable(
     notificationDecisionId: text("notification_decision_id")
       .notNull()
       .references(() => notificationDecisions.id, { onDelete: "cascade" }),
-    assistantId: text("assistant_id").notNull(),
     channel: text("channel").notNull(),
     destination: text("destination").notNull(),
     status: text("status").notNull().default("pending"),
@@ -132,7 +129,6 @@ export const conversationAttentionEvents = sqliteTable(
     conversationId: text("conversation_id")
       .notNull()
       .references(() => conversations.id, { onDelete: "cascade" }),
-    assistantId: text("assistant_id").notNull(),
     sourceChannel: text("source_channel").notNull(),
     signalType: text("signal_type").notNull(),
     confidence: text("confidence").notNull(),
@@ -147,10 +143,7 @@ export const conversationAttentionEvents = sqliteTable(
       table.conversationId,
       table.observedAt,
     ),
-    index("idx_conv_attn_events_assistant_observed").on(
-      table.assistantId,
-      table.observedAt,
-    ),
+    index("idx_conv_attn_events_observed").on(table.observedAt),
     index("idx_conv_attn_events_channel_observed").on(
       table.sourceChannel,
       table.observedAt,
@@ -164,7 +157,6 @@ export const conversationAssistantAttentionState = sqliteTable(
     conversationId: text("conversation_id")
       .primaryKey()
       .references(() => conversations.id, { onDelete: "cascade" }),
-    assistantId: text("assistant_id").notNull(),
     latestAssistantMessageId: text("latest_assistant_message_id"),
     latestAssistantMessageAt: integer("latest_assistant_message_at"),
     lastSeenAssistantMessageId: text("last_seen_assistant_message_id"),
@@ -179,13 +171,7 @@ export const conversationAssistantAttentionState = sqliteTable(
     updatedAt: integer("updated_at").notNull(),
   },
   (table) => [
-    index("idx_conv_attn_state_assistant_latest_msg").on(
-      table.assistantId,
-      table.latestAssistantMessageAt,
-    ),
-    index("idx_conv_attn_state_assistant_last_seen").on(
-      table.assistantId,
-      table.lastSeenAssistantMessageAt,
-    ),
+    index("idx_conv_attn_state_latest_msg").on(table.latestAssistantMessageAt),
+    index("idx_conv_attn_state_last_seen").on(table.lastSeenAssistantMessageAt),
   ],
 );

package/src/memory/scoped-approval-grants.ts

@@ -29,7 +29,6 @@ export type GrantStatus = "active" | "consumed" | "expired" | "revoked";
 
 export interface ScopedApprovalGrant {
   id: string;
-  assistantId: string;
   scopeMode: ScopeMode;
   requestId: string | null;
   toolName: string | null;
@@ -65,7 +64,6 @@ function rowToGrant(
 ): ScopedApprovalGrant {
   return {
     id: row.id,
-    assistantId: row.assistantId,
     scopeMode: row.scopeMode as ScopeMode,
     requestId: row.requestId,
     toolName: row.toolName,
@@ -91,7 +89,6 @@ function rowToGrant(
 // ---------------------------------------------------------------------------
 
 export interface CreateScopedApprovalGrantParams {
-  assistantId: string;
   scopeMode: ScopeMode;
   requestId?: string | null;
   toolName?: string | null;
@@ -115,7 +112,6 @@ function createScopedApprovalGrant(
 
   const row = {
     id,
-    assistantId: params.assistantId,
     scopeMode: params.scopeMode,
     requestId: params.requestId ?? null,
     toolName: params.toolName ?? null,
@@ -143,7 +139,6 @@ function createScopedApprovalGrant(
       grantId: id,
       scopeMode: params.scopeMode,
       toolName: params.toolName ?? null,
-      assistantId: params.assistantId,
       requestChannel: params.requestChannel,
       decisionChannel: params.decisionChannel,
       executionChannel: params.executionChannel ?? null,
@@ -168,13 +163,12 @@ export interface ConsumeByRequestIdResult {
  * Atomically consume a grant by request ID.
  *
  * Only succeeds when exactly one active, non-expired grant matches the
- * given `requestId` and `assistantId`.  Uses compare-and-swap on the
- * `status` column so concurrent consumers race safely — at most one wins.
+ * given `requestId`.  Uses compare-and-swap on the `status` column so
+ * concurrent consumers race safely — at most one wins.
  */
 function consumeScopedApprovalGrantByRequestId(
   requestId: string,
   consumingRequestId: string,
-  assistantId: string,
   now?: string,
 ): ConsumeByRequestIdResult {
   const db = getDb();
@@ -189,7 +183,6 @@ function consumeScopedApprovalGrantByRequestId(
       .where(
         and(
           eq(scopedApprovalGrants.requestId, requestId),
-          eq(scopedApprovalGrants.assistantId, assistantId),
           eq(scopedApprovalGrants.scopeMode, "request_id"),
           eq(scopedApprovalGrants.status, "active"),
           sql`${scopedApprovalGrants.expiresAt} > ${currentTime}`,
@@ -204,7 +197,6 @@ function consumeScopedApprovalGrantByRequestId(
           event: "scoped_grant_consume_miss",
           requestId,
           consumingRequestId,
-          assistantId,
           scopeMode: "request_id",
           attempt,
         },
@@ -247,7 +239,6 @@ function consumeScopedApprovalGrantByRequestId(
         grantId: grant?.id,
         requestId,
         consumingRequestId,
-        assistantId,
         scopeMode: "request_id",
       },
       "Scoped approval grant consumed by request ID",
@@ -262,7 +253,6 @@ function consumeScopedApprovalGrantByRequestId(
       event: "scoped_grant_consume_miss",
       requestId,
       consumingRequestId,
-      assistantId,
       scopeMode: "request_id",
       reason: "cas_exhausted",
     },
@@ -280,7 +270,6 @@ export interface ConsumeByToolSignatureParams {
   inputDigest: string;
   consumingRequestId: string;
   /** Optional context constraints — only matched when the grant has a non-null value */
-  assistantId?: string;
   executionChannel?: string;
   conversationId?: string;
   callSessionId?: string;
@@ -319,12 +308,6 @@ function consumeScopedApprovalGrantByToolSignature(
     sql`${scopedApprovalGrants.expiresAt} > ${currentTime}`,
   ];
 
-  // assistantId is always set on grants — scope consumption to the current
-  // assistant so grants minted for one assistant cannot be consumed by another.
-  if (params.assistantId !== undefined) {
-    conditions.push(eq(scopedApprovalGrants.assistantId, params.assistantId));
-  }
-
   // Context constraints: grant field must be NULL (any) or match exactly
   if (params.executionChannel !== undefined) {
     conditions.push(
@@ -488,7 +471,6 @@ export function expireScopedApprovalGrants(now?: string): number {
 // ---------------------------------------------------------------------------
 
 export interface RevokeContextParams {
-  assistantId?: string;
   conversationId?: string;
   callSessionId?: string;
   requestChannel?: string;
@@ -510,9 +492,6 @@ export function revokeScopedApprovalGrantsForContext(
 
   const conditions = [eq(scopedApprovalGrants.status, "active")];
 
-  if (params.assistantId !== undefined) {
-    conditions.push(eq(scopedApprovalGrants.assistantId, params.assistantId));
-  }
   if (params.conversationId !== undefined) {
     conditions.push(
       eq(scopedApprovalGrants.conversationId, params.conversationId),
@@ -550,7 +529,6 @@ export function revokeScopedApprovalGrantsForContext(
       {
         event: "scoped_grant_revoked",
         count,
-        assistantId: params.assistantId,
         conversationId: params.conversationId,
         callSessionId: params.callSessionId,
         requestChannel: params.requestChannel,

package/src/notifications/adapters/sms.ts

@@ -13,6 +13,7 @@
  */
 
 import { getGatewayInternalBaseUrl } from "../../config/env.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 { getLogger } from "../../util/logger.js";
@@ -70,7 +71,7 @@ export class SmsAdapter implements ChannelAdapter {
         {
           chatId: phoneNumber,
           text: messageText,
-          assistantId: payload.assistantId,
+          assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
         },
         mintDaemonDeliveryToken(),
       );

package/src/notifications/broadcaster.ts

@@ -77,10 +77,7 @@ export class NotificationBroadcaster {
     decision: NotificationDecision,
     options?: BroadcastDecisionOptions,
   ): Promise<NotificationDeliveryResult[]> {
-    const destinations = resolveDestinations(
-      signal.assistantId,
-      decision.selectedChannels,
-    );
+    const destinations = resolveDestinations(decision.selectedChannels);
 
     // Ensure vellum is processed first so the notification_thread_created IPC
     // push fires immediately, before slower channel sends (e.g. Telegram 30s
@@ -271,7 +268,6 @@ export class NotificationBroadcaster {
       const payload: ChannelDeliveryPayload = {
         deliveryId,
         sourceEventName: signal.sourceEventName,
-        assistantId: signal.assistantId,
         copy,
         deepLinkTarget,
       };
@@ -291,7 +287,6 @@ export class NotificationBroadcaster {
           createDelivery({
             id: deliveryId,
             notificationDecisionId: persistedDecisionId,
-            assistantId: signal.assistantId,
             channel,
             destination: destinationLabel,
             status: "pending",