@vellumai/assistant 0.4.42 → 0.4.44

package/src/__tests__/conversation-attention-telegram.test.ts

@@ -22,8 +22,6 @@ mock.module("../util/platform.js", () => ({
   getDbPath: () => join(testDir, "test.db"),
   getLogPath: () => join(testDir, "test.log"),
   ensureDataDir: () => {},
-  migrateToDataLayout: () => {},
-  migrateToWorkspaceLayout: () => {},
 }));
 
 mock.module("../util/logger.js", () => ({
@@ -41,7 +39,7 @@ mock.module("../security/secret-ingress.js", () => ({
 }));
 
 // Mock render to return the raw content as text
-mock.module("../daemon/handlers.js", () => ({
+mock.module("../daemon/handlers/shared.js", () => ({
   renderHistoryContent: (content: unknown) => ({
     text: typeof content === "string" ? content : JSON.stringify(content),
   }),
@@ -50,8 +48,8 @@ mock.module("../daemon/handlers.js", () => ({
 import { eq } from "drizzle-orm";
 
 import { upsertContact } from "../contacts/contact-store.js";
-import * as channelDeliveryStore from "../memory/channel-delivery-store.js";
 import { getDb, initializeDb, resetDb, resetTestTables } from "../memory/db.js";
+import * as deliveryChannels from "../memory/delivery-channels.js";
 import { attachments, conversationAttentionEvents } from "../memory/schema.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
 import { handleChannelInbound } from "../runtime/routes/channel-routes.js";
@@ -76,7 +74,7 @@ function resetTables(): void {
     "conversation_attention_events",
     "conversation_assistant_attention_state",
     "channel_guardian_approval_requests",
-    "channel_guardian_verification_challenges",
+    "channel_verification_sessions",
     "conversation_keys",
     "message_runs",
     "channel_inbound_events",
@@ -85,7 +83,7 @@ function resetTables(): void {
     "contact_channels",
     "contacts",
   );
-  channelDeliveryStore.resetAllRunDeliveryClaims();
+  deliveryChannels.resetAllRunDeliveryClaims();
   pendingInteractions.clear();
 }
 
@@ -384,12 +382,11 @@ describe("duplicate event deduplication", () => {
 // ═══════════════════════════════════════════════════════════════════════════
 
 describe("non-Telegram channel filtering", () => {
-  test("SMS inbound message does not record a Telegram seen signal", async () => {
-    // Override contact store for SMS channel
+  test("email inbound message does not record a Telegram seen signal", async () => {
     const req = makeInboundRequest({
-      sourceChannel: "sms",
-      interface: "sms",
-      content: "sms message",
+      sourceChannel: "email",
+      interface: "email",
+      content: "email message",
     });
 
     const res = await handleChannelInbound(

package/src/__tests__/conversation-pairing.test.ts

@@ -51,7 +51,7 @@ const getConversationMock = mock((id: string) => {
   return mockExistingConversations[id] ?? null;
 });
 
-mock.module("../memory/conversation-store.js", () => ({
+mock.module("../memory/conversation-crud.js", () => ({
   getConversationThreadType: () => "default",
   setConversationOriginChannelIfUnset: () => {},
   updateConversationContextWindow: () => {},
@@ -405,22 +405,22 @@ describe("pairDeliveryWithConversation", () => {
       source: "user",
       title: "User Thread",
     };
-    mockBindings["notification:sms:+15551234567"] = {
+    mockBindings["notification:slack:C0123ABCDEF"] = {
       conversationId: "conv-user-owned",
-      sourceChannel: "notification:sms",
-      externalChatId: "+15551234567",
+      sourceChannel: "notification:slack",
+      externalChatId: "C0123ABCDEF",
     };
 
     const signal = makeSignal();
     const copy = makeCopy();
     const bindingContext: DestinationBindingContext = {
-      sourceChannel: "sms" as NotificationChannel,
-      externalChatId: "+15551234567",
+      sourceChannel: "slack" as NotificationChannel,
+      externalChatId: "C0123ABCDEF",
     };
 
     const result = await pairDeliveryWithConversation(
       signal,
-      "sms" as NotificationChannel,
+      "slack" as NotificationChannel,
       copy,
       { bindingContext },
     );
@@ -436,7 +436,7 @@ describe("pairDeliveryWithConversation", () => {
       unknown
     >;
     expect(upsertArgs.conversationId).toBe("conv-001");
-    expect(upsertArgs.sourceChannel).toBe("notification:sms");
+    expect(upsertArgs.sourceChannel).toBe("notification:slack");
   });
 
   test("falls back to new conversation when bound conversation no longer exists", async () => {
@@ -546,13 +546,13 @@ describe("pairDeliveryWithConversation", () => {
       conversationId: "conv-gone",
     };
     const bindingContext: DestinationBindingContext = {
-      sourceChannel: "sms" as NotificationChannel,
-      externalChatId: "+15559876543",
+      sourceChannel: "slack" as NotificationChannel,
+      externalChatId: "C9876ZYXWVU",
     };
 
     const result = await pairDeliveryWithConversation(
       signal,
-      "sms" as NotificationChannel,
+      "slack" as NotificationChannel,
       copy,
       { threadAction, bindingContext },
     );
@@ -567,8 +567,8 @@ describe("pairDeliveryWithConversation", () => {
       unknown
     >;
     expect(upsertArgs.conversationId).toBe("conv-001");
-    expect(upsertArgs.sourceChannel).toBe("notification:sms");
-    expect(upsertArgs.externalChatId).toBe("+15559876543");
+    expect(upsertArgs.sourceChannel).toBe("notification:slack");
+    expect(upsertArgs.externalChatId).toBe("C9876ZYXWVU");
   });
 
   test("explicit reuse_existing takes precedence over binding-key reuse", async () => {
@@ -663,7 +663,7 @@ describe("pairDeliveryWithConversation", () => {
     // accepts NotificationChannel which is then cast internally to ChannelId.
     const result = await pairDeliveryWithConversation(
       signal,
-      "voice" as NotificationChannel,
+      "phone" as NotificationChannel,
       copy,
     );
 

package/src/__tests__/conversation-routes-guardian-reply.test.ts

@@ -76,7 +76,7 @@ mock.module("../runtime/confirmation-request-guardian-bridge.js", () => ({
   bridgeConfirmationRequestToGuardian: async () => undefined,
 }));
 
-mock.module("../memory/conversation-store.js", () => ({
+mock.module("../memory/conversation-crud.js", () => ({
   addMessage: (
     conversationId: string,
     role: string,
@@ -152,7 +152,7 @@ describe("handleSendMessage canonical guardian reply interception", () => {
     const runAgentLoop = mock(async () => undefined);
     const session = {
       setTrustContext: () => {},
-      setStateSignalListener: () => {},
+      updateClient: () => {},
       emitConfirmationStateChanged: () => {},
       emitActivityState: () => {},
       setTurnChannelContext: () => {},
@@ -223,7 +223,7 @@ describe("handleSendMessage canonical guardian reply interception", () => {
     const runAgentLoop = mock(async () => undefined);
     const session = {
       setTrustContext: () => {},
-      setStateSignalListener: () => {},
+      updateClient: () => {},
       emitConfirmationStateChanged: () => {},
       emitActivityState: () => {},
       setTurnChannelContext: () => {},
@@ -289,7 +289,7 @@ describe("handleSendMessage canonical guardian reply interception", () => {
     const runAgentLoop = mock(async () => undefined);
     const session = {
       setTrustContext: () => {},
-      setStateSignalListener: () => {},
+      updateClient: () => {},
       emitConfirmationStateChanged: () => {},
       emitActivityState: () => {},
       setTurnChannelContext: () => {},
@@ -361,7 +361,7 @@ describe("handleSendMessage canonical guardian reply interception", () => {
     const runAgentLoop = mock(async () => undefined);
     const session = {
       setTrustContext: () => {},
-      setStateSignalListener: () => {},
+      updateClient: () => {},
       emitConfirmationStateChanged: () => {},
       emitActivityState: () => {},
       setTurnChannelContext: () => {},
@@ -428,7 +428,7 @@ describe("handleSendMessage canonical guardian reply interception", () => {
     const runAgentLoop = mock(async () => undefined);
     const session = {
       setTrustContext: () => {},
-      setStateSignalListener: () => {},
+      updateClient: () => {},
       emitConfirmationStateChanged: () => {},
       emitActivityState: () => {},
       setTurnChannelContext: () => {},
@@ -489,7 +489,7 @@ describe("handleSendMessage canonical guardian reply interception", () => {
     const runAgentLoop = mock(async () => undefined);
     const session = {
       setTrustContext: () => {},
-      setStateSignalListener: () => {},
+      updateClient: () => {},
       emitConfirmationStateChanged: () => {},
       emitActivityState: () => {},
       setTurnChannelContext: () => {},

package/src/__tests__/conversation-store.test.ts

@@ -39,8 +39,8 @@ import {
   getConversationMemoryScopeId,
   getConversationThreadType,
   getMessages,
-  isLastUserMessageToolResult,
-} from "../memory/conversation-store.js";
+} from "../memory/conversation-crud.js";
+import { isLastUserMessageToolResult } from "../memory/conversation-queries.js";
 import { getDb, initializeDb, resetDb } from "../memory/db.js";
 
 // Initialize db once before all tests

package/src/__tests__/conversation-unread-route.test.ts

@@ -0,0 +1,155 @@
+import { mkdtempSync, realpathSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
+
+const testDir = realpathSync(
+  mkdtempSync(join(tmpdir(), "conversation-unread-route-test-")),
+);
+
+mock.module("../util/platform.js", () => ({
+  getRootDir: () => testDir,
+  getDataDir: () => testDir,
+  isMacOS: () => process.platform === "darwin",
+  isLinux: () => process.platform === "linux",
+  isWindows: () => process.platform === "win32",
+  getSocketPath: () => join(testDir, "test.sock"),
+  getPidPath: () => join(testDir, "test.pid"),
+  getDbPath: () => join(testDir, "test.db"),
+  getLogPath: () => join(testDir, "test.log"),
+  ensureDataDir: () => {},
+}));
+
+mock.module("../util/logger.js", () => ({
+  getLogger: () =>
+    new Proxy({} as Record<string, unknown>, {
+      get: () => () => {},
+    }),
+}));
+
+mock.module("../config/env.js", () => ({
+  isHttpAuthDisabled: () => true,
+  hasUngatedHttpAuthDisabled: () => false,
+  getGatewayInternalBaseUrl: () => "http://127.0.0.1:7830",
+  getGatewayPort: () => 7830,
+  getRuntimeHttpPort: () => 7821,
+  getRuntimeHttpHost: () => "127.0.0.1",
+  getRuntimeGatewayOriginSecret: () => undefined,
+  getIngressPublicBaseUrl: () => undefined,
+  setIngressPublicBaseUrl: () => {},
+}));
+
+const mockMarkConversationUnread = mock((_conversationId: string) => {});
+
+mock.module("../memory/conversation-attention-store.js", () => ({
+  getAttentionStateByConversationIds: () => new Map(),
+  recordConversationSeenSignal: () => ({}),
+  markConversationUnread: mockMarkConversationUnread,
+}));
+
+import { getPolicy } from "../runtime/auth/route-policy.js";
+import { RuntimeHttpServer } from "../runtime/http-server.js";
+import { UserError } from "../util/errors.js";
+
+describe("POST /v1/conversations/unread", () => {
+  let server: RuntimeHttpServer;
+  let port: number;
+
+  beforeEach(() => {
+    mockMarkConversationUnread.mockReset();
+  });
+
+  afterAll(async () => {
+    await server?.stop();
+    try {
+      rmSync(testDir, { recursive: true, force: true });
+    } catch {
+      /* best effort */
+    }
+  });
+
+  async function startServer(): Promise<void> {
+    port = 20000 + Math.floor(Math.random() * 1000);
+    server = new RuntimeHttpServer({ port, bearerToken: "test-bearer-token" });
+    await server.start();
+  }
+
+  async function stopServer(): Promise<void> {
+    await server?.stop();
+  }
+
+  function unreadUrl(): string {
+    return `http://127.0.0.1:${port}/v1/conversations/unread`;
+  }
+
+  test("registers the unread route with chat.write policy", () => {
+    expect(getPolicy("conversations/unread")).toEqual({
+      requiredScopes: ["chat.write"],
+      allowedPrincipalTypes: ["actor", "svc_gateway", "svc_daemon", "ipc"],
+    });
+  });
+
+  test("returns BAD_REQUEST when conversationId is missing", async () => {
+    await startServer();
+
+    const res = await fetch(unreadUrl(), {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({}),
+    });
+
+    expect(res.status).toBe(400);
+    expect(await res.json()).toEqual({
+      error: {
+        code: "BAD_REQUEST",
+        message: "Missing conversationId",
+      },
+    });
+    expect(mockMarkConversationUnread).not.toHaveBeenCalled();
+
+    await stopServer();
+  });
+
+  test("marks a conversation unread", async () => {
+    await startServer();
+
+    const res = await fetch(unreadUrl(), {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ conversationId: "conv-123" }),
+    });
+
+    expect(res.status).toBe(200);
+    expect(await res.json()).toEqual({ ok: true });
+    expect(mockMarkConversationUnread).toHaveBeenCalledTimes(1);
+    expect(mockMarkConversationUnread).toHaveBeenCalledWith("conv-123");
+
+    await stopServer();
+  });
+
+  test("returns UNPROCESSABLE_ENTITY when the conversation has no assistant message", async () => {
+    mockMarkConversationUnread.mockImplementationOnce(() => {
+      throw new UserError(
+        "Conversation has no assistant message to mark unread",
+      );
+    });
+
+    await startServer();
+
+    const res = await fetch(unreadUrl(), {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ conversationId: "conv-no-assistant" }),
+    });
+
+    expect(res.status).toBe(422);
+    expect(await res.json()).toEqual({
+      error: {
+        code: "UNPROCESSABLE_ENTITY",
+        message: "Conversation has no assistant message to mark unread",
+      },
+    });
+
+    await stopServer();
+  });
+});

package/src/__tests__/credential-metadata-store.test.ts

@@ -502,7 +502,6 @@ describe("credential metadata store", () => {
             allowedDomains: ["github.com"],
             usageDescription: "GitHub PAT",
             grantedScopes: ["repo", "user"],
-            accountInfo: "octocat",
             createdAt: 1700000000000,
             updatedAt: 1700000000000,
           },
@@ -542,7 +541,6 @@ describe("credential metadata store", () => {
 
       // Original v1 fields preserved
       expect(records[0].grantedScopes).toEqual(["repo", "user"]);
-      expect(records[0].accountInfo).toBe("octocat");
       expect(records[1].expiresAt).toBe(1800000000000);
       expect(records[2].oauth2TokenUrl).toBe(
         "https://connect.stripe.com/oauth/token",

package/src/__tests__/credential-security-invariants.test.ts

@@ -199,17 +199,12 @@ describe("Invariant 2: no generic plaintext secret read API", () => {
     // Hard boundary: only these production files may import from secure-keys.
     // Any new import must be reviewed for secret-leak risk and added here.
     const ALLOWED_IMPORTERS = new Set([
-      "security/secure-keys.ts", // self (re-export infrastructure)
-      "index.ts", // daemon startup / API key config
       "config/loader.ts", // config management (API keys)
       "tools/credentials/vault.ts", // credential store tool
       "tools/credentials/broker.ts", // brokered credential access
       "tools/network/web-search.ts", // web search API key lookup
-      "daemon/handlers.ts", // Vercel API token + integration OAuth
-      "daemon/handlers/config-integrations.ts", // Vercel API token + Twitter integration OAuth
       "daemon/handlers/config-telegram.ts", // Telegram bot token management
-      "daemon/handlers/config-ingress.ts", // Ingress config (reads Twilio credentials for webhook sync)
-      "runtime/routes/twilio-routes.ts", // Twilio credential management (HTTP control-plane)
+      "runtime/routes/integrations/twilio.ts", // Twilio credential management (HTTP control-plane)
       "security/token-manager.ts", // OAuth token refresh flow
       "email/providers/index.ts", // email provider API key lookup
       "tools/network/script-proxy/session-manager.ts", // proxy credential injection at runtime
@@ -218,26 +213,25 @@ describe("Invariant 2: no generic plaintext secret read API", () => {
       "calls/twilio-config.ts", // call infrastructure credential lookup
       "calls/twilio-provider.ts", // call infrastructure credential lookup
       "calls/twilio-rest.ts", // Twilio REST API credential lookup
-      "runtime/channel-invite-transports/sms.ts", // SMS invite transport phone number lookup
       "runtime/channel-invite-transports/telegram.ts", // Telegram invite transport bot token lookup
-      "cli/keys.ts", // CLI credential management commands
-      "cli/credentials.ts", // CLI credential management commands
-      "runtime/http-server.ts", // HTTP server credential lookup
-      "daemon/handlers/twitter-auth.ts", // Twitter OAuth token storage
-      "twitter/oauth-client.ts", // Twitter OAuth API client (reads access token for API calls)
+      "cli/commands/keys.ts", // CLI credential management commands
+      "cli/commands/credentials.ts", // CLI credential management commands
       "messaging/providers/telegram-bot/adapter.ts", // Telegram bot token lookup for connectivity check
-      "messaging/providers/sms/adapter.ts", // Twilio credential lookup for SMS connectivity check
-      "runtime/channel-readiness-service.ts", // channel readiness probes for SMS/Telegram connectivity
+      "runtime/channel-readiness-service.ts", // channel readiness probes for Telegram connectivity
       "messaging/providers/whatsapp/adapter.ts", // WhatsApp credential lookup for connectivity check
       "schedule/integration-status.ts", // integration status checks for scheduled reports
-      "daemon/handlers/oauth-connect.ts", // OAuth connect handler for integration setup
       "daemon/handlers/config-slack-channel.ts", // Slack channel config credential management
+      "media/managed-avatar-client.ts", // managed avatar API key lookup for platform authentication
       "providers/managed-proxy/context.ts", // managed proxy API key lookup for provider initialization
       "mcp/mcp-oauth-provider.ts", // MCP OAuth token/client/discovery persistence
+      "runtime/routes/integrations/slack/share.ts", // Slack share routes credential lookup
       "mcp/client.ts", // MCP client cached-token lookup
       "oauth/token-persistence.ts", // OAuth token persistence (set/delete tokens)
       "runtime/routes/secret-routes.ts", // HTTP secret management routes (set/delete secrets)
+      "daemon/ride-shotgun-handler.ts", // learn session cookie persistence
       "daemon/session-messaging.ts", // credential storage during session messaging
+      "runtime/routes/settings-routes.ts", // settings routes OAuth credential lookup (client_id/client_secret/access tokens)
+      "twitter/platform-proxy-client.ts", // managed Twitter proxy auth token lookup
     ]);
 
     const thisDir = dirname(fileURLToPath(import.meta.url));
@@ -329,7 +323,7 @@ describe("Invariant 3: secrets never logged in plaintext", () => {
       test(`${tc.label}`, () => {
         const thisDir = dirname(fileURLToPath(import.meta.url));
         const ipcSrc = readFileSync(
-          resolve(thisDir, "../daemon/ipc-protocol.ts"),
+          resolve(thisDir, "../daemon/message-protocol.ts"),
           "utf-8",
         );
         // Verify log calls never include raw content fields — only safe

package/src/__tests__/credentials-cli.test.ts

@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, mock, test } from "bun:test";
+import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
 import { Command } from "commander";
 
@@ -93,7 +93,6 @@ mock.module("../tools/credentials/metadata-store.js", () => ({
       usageDescription?: string;
       expiresAt?: number | null;
       grantedScopes?: string[];
-      accountInfo?: string | null;
       alias?: string | null;
       injectionTemplates?: unknown[] | null;
     },
@@ -168,7 +167,8 @@ mock.module("../tools/credentials/metadata-store.js", () => ({
 // Import the module under test (after mocks are registered)
 // ---------------------------------------------------------------------------
 
-const { registerCredentialsCommand } = await import("../cli/credentials.js");
+const { registerCredentialsCommand } =
+  await import("../cli/commands/credentials.js");
 
 // ---------------------------------------------------------------------------
 // Test helper
@@ -317,7 +317,6 @@ describe("assistant credentials CLI", () => {
         expect(cred).toHaveProperty("usageDescription");
         expect(cred).toHaveProperty("allowedTools");
         expect(cred).toHaveProperty("allowedDomains");
-        expect(cred).toHaveProperty("accountInfo");
         expect(cred).toHaveProperty("grantedScopes");
         expect(cred).toHaveProperty("expiresAt");
         expect(cred).toHaveProperty("createdAt");
@@ -634,7 +633,6 @@ describe("assistant credentials CLI", () => {
       expect(parsed).toHaveProperty("usageDescription");
       expect(parsed).toHaveProperty("allowedTools");
       expect(parsed).toHaveProperty("allowedDomains");
-      expect(parsed).toHaveProperty("accountInfo");
       expect(parsed).toHaveProperty("grantedScopes");
       expect(parsed).toHaveProperty("expiresAt");
       expect(parsed).toHaveProperty("injectionTemplateCount");
@@ -796,6 +794,52 @@ describe("assistant credentials CLI", () => {
     });
   });
 
+  // =========================================================================
+  // instance-scoped BASE_DATA_DIR
+  // =========================================================================
+
+  describe("instance-scoped BASE_DATA_DIR", () => {
+    let savedBaseDataDir: string | undefined;
+
+    beforeEach(() => {
+      savedBaseDataDir = process.env.BASE_DATA_DIR;
+    });
+
+    afterEach(() => {
+      if (savedBaseDataDir === undefined) {
+        delete process.env.BASE_DATA_DIR;
+      } else {
+        process.env.BASE_DATA_DIR = savedBaseDataDir;
+      }
+    });
+
+    test("credential reveal reads from instance-scoped store when BASE_DATA_DIR is set", async () => {
+      // Point BASE_DATA_DIR to a temp directory (simulating instance-scoped dir)
+      const tmpDir = (await import("node:os")).tmpdir();
+      const instanceDir = (await import("node:path")).join(
+        tmpDir,
+        `vellum-test-instance-${Date.now()}`,
+      );
+      process.env.BASE_DATA_DIR = instanceDir;
+
+      // Seed a credential in the mock store
+      seedCredential("twilio", "auth_token", "instance_secret_abc123");
+
+      // Run `credentials reveal twilio:auth_token`
+      const result = await runCli(["reveal", "twilio:auth_token", "--json"]);
+      expect(result.exitCode).toBe(0);
+      const parsed = JSON.parse(result.stdout);
+      expect(parsed.ok).toBe(true);
+      expect(parsed.value).toBe("instance_secret_abc123");
+
+      // Verify the correct key was looked up in the secure store
+      expect(secureKeyStore.has("credential:twilio:auth_token")).toBe(true);
+      expect(secureKeyStore.get("credential:twilio:auth_token")).toBe(
+        "instance_secret_abc123",
+      );
+    });
+  });
+
   // =========================================================================
   // help text quality
   // =========================================================================

package/src/__tests__/daemon-assistant-events.test.ts

@@ -6,7 +6,6 @@
  *   - send()      → one mirrored assistant event per message
  *   - broadcast() → one mirrored assistant event per message (not per socket)
  */
-import * as net from "node:net";
 import { describe, expect, mock, test } from "bun:test";
 
 // ── Platform mock (must happen before imports that read it) ─────────────────
@@ -28,7 +27,6 @@ mock.module("../util/platform.js", () => ({
   getLogPath: () => "/tmp/test.log",
   getDbPath: () => "/tmp/test.db",
   ensureDataDir: () => {},
-  removeSocketFile: () => {},
 }));
 
 mock.module("../util/logger.js", () => ({
@@ -39,23 +37,13 @@ mock.module("../util/logger.js", () => ({
 }));
 
 // ── Imports (after mocks) ────────────────────────────────────────────────────
-import type { ServerMessage } from "../daemon/ipc-protocol.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
 import type { AssistantEvent } from "../runtime/assistant-event.js";
 import { buildAssistantEvent } from "../runtime/assistant-event.js";
 import { AssistantEventHub } from "../runtime/assistant-event-hub.js";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
-function makeFakeSocket(destroyed = false): net.Socket {
-  const s = Object.create(net.Socket.prototype) as net.Socket;
-  Object.assign(s, {
-    destroyed,
-    write: () => true,
-    on: () => s,
-  });
-  return s;
-}
-
 // ── buildAssistantEvent factory ───────────────────────────────────────────────
 
 describe("buildAssistantEvent", () => {
@@ -115,7 +103,7 @@ describe("daemon send → one mirrored assistant event", () => {
     expect(received[0].message.type).toBe("assistant_text_delta");
   });
 
-  test("sessionId falls back to socket binding when message lacks it", async () => {
+  test("sessionId falls back to explicit parameter when message lacks it", async () => {
     const hub = new AssistantEventHub();
     const received: AssistantEvent[] = [];
 
@@ -123,19 +111,13 @@ describe("daemon send → one mirrored assistant event", () => {
       received.push(e);
     });
 
-    // Simulate server.ts resolving sessionId from socket→session map
-    const socketSessionMap = new Map<object, string>();
-    const fakeSocket = makeFakeSocket();
-    socketSessionMap.set(fakeSocket, "sess_from_socket");
-
     const msg: ServerMessage = { type: "pong" }; // no sessionId field
-    const sessionId = socketSessionMap.get(fakeSocket);
-    const event = buildAssistantEvent("ast_ipc", msg, sessionId);
+    const event = buildAssistantEvent("ast_ipc", msg, "sess_explicit");
 
     await hub.publish(event);
 
     expect(received).toHaveLength(1);
-    expect(received[0].sessionId).toBe("sess_from_socket");
+    expect(received[0].sessionId).toBe("sess_explicit");
   });
 });
 

package/src/__tests__/db-migration-rollback.test.ts

@@ -16,7 +16,6 @@ import { describe, expect, test } from "bun:test";
 import { drizzle } from "drizzle-orm/bun-sqlite";
 
 import { getSqliteFrom } from "../memory/db-connection.js";
-import * as schema from "../memory/schema.js";
 import {
   migrateJobDeferrals,
   migrateMemoryEntityRelationDedup,
@@ -24,7 +23,8 @@ import {
   MIGRATION_REGISTRY,
   type MigrationValidationResult,
   validateMigrationState,
-} from "../memory/schema-migration.js";
+} from "../memory/migrations/index.js";
+import * as schema from "../memory/schema.js";
 
 // ---------------------------------------------------------------------------
 // Helpers