@vellumai/assistant 0.5.1 → 0.5.3

package/src/daemon/lifecycle.ts

@@ -142,7 +142,6 @@ export async function runDaemon(): Promise<void> {
     await initLogfire();
 
     ensureDataDir();
-    await runWorkspaceMigrations(getWorkspaceDir(), WORKSPACE_MIGRATIONS);
 
     // Load (or generate + persist) the auth signing key so tokens survive
     // daemon restarts. Must happen after ensureDataDir() creates the
@@ -150,14 +149,16 @@ export async function runDaemon(): Promise<void> {
     const signingKey = loadOrCreateSigningKey();
     initAuthSigningKey(signingKey);
 
-    log.info("Daemon startup: migrations complete");
-
     seedInterfaceFiles();
 
     log.info("Daemon startup: installing templates and initializing DB");
     installTemplates();
     ensurePromptFiles();
 
+    // DB must be initialized before workspace migrations because some
+    // workspace migrations (e.g. 009-backfill-conversation-disk-view)
+    // depend on DB migrations having run (e.g. the inline-attachment-to-disk
+    // backfill that populates attachment filePaths).
     initializeDb();
     // Seed well-known OAuth provider configurations (insert-if-not-exists)
     seedOAuthProviders();
@@ -174,6 +175,9 @@ export async function runDaemon(): Promise<void> {
     }
     log.info("Daemon startup: DB initialized");
 
+    await runWorkspaceMigrations(getWorkspaceDir(), WORKSPACE_MIGRATIONS);
+    log.info("Daemon startup: workspace migrations complete");
+
     // Purge private (temporary) conversations from the previous daemon run.
     // These are ephemeral by design and should not survive daemon restarts.
     const { count: purgedCount, deletedMemory } = purgePrivateConversations();
@@ -196,31 +200,43 @@ export async function runDaemon(): Promise<void> {
           targetId: itemId,
         });
       }
+      for (const summaryId of deletedMemory.deletedSummaryIds) {
+        enqueueMemoryJob("delete_qdrant_vectors", {
+          targetType: "summary",
+          targetId: summaryId,
+        });
+      }
       if (
         deletedMemory.segmentIds.length > 0 ||
-        deletedMemory.orphanedItemIds.length > 0
+        deletedMemory.orphanedItemIds.length > 0 ||
+        deletedMemory.deletedSummaryIds.length > 0
       ) {
         log.info(
           {
             segments: deletedMemory.segmentIds.length,
             orphanedItems: deletedMemory.orphanedItemIds.length,
+            deletedSummaries: deletedMemory.deletedSummaryIds.length,
           },
           "Enqueued Qdrant vector cleanup jobs for purged private conversations",
         );
       }
     }
 
-    // Expire pending interaction-bound canonical guardian requests left over
-    // from before this process started.  Their in-memory pending-interaction
-    // session references are gone, so they can never be completed.  Only
-    // interaction-bound kinds (tool_approval, pending_question) are expired;
-    // persistent kinds (access_request, tool_grant_request) remain valid
-    // across restarts.
+    // Expire stale pending canonical guardian requests left over from before
+    // this process started.  Two categories are cleaned up:
+    //
+    // 1. Interaction-bound kinds (tool_approval, pending_question) — their
+    //    in-memory pending-interaction session references are gone, so they
+    //    can never be completed.
+    // 2. Any pending request whose expiresAt has already passed — persistent
+    //    kinds (access_request, tool_grant_request) that expired while the
+    //    daemon was stopped are transitioned so dedup logic doesn't return
+    //    stale rows.
     const expiredCount = expireAllPendingCanonicalRequests();
     if (expiredCount > 0) {
       log.info(
         { event: "startup_expired_stale_requests", expiredCount },
-        `Expired ${expiredCount} stale interaction-bound canonical request(s) from previous process`,
+        `Expired ${expiredCount} stale canonical request(s) from previous process`,
       );
     }
 
@@ -329,56 +345,74 @@ export async function runDaemon(): Promise<void> {
     await server.start();
     log.info("Daemon startup: DaemonServer started");
 
-    // Initialize Qdrant vector store — non-fatal so the daemon stays up without it
-    // Prefer QDRANT_HTTP_PORT (locally-spawned Qdrant on a specific port) over
-    // QDRANT_URL (external Qdrant instance) so the CLI can set the port without
-    // triggering QdrantManager's external mode which skips local process spawn.
-    const qdrantHttpPort = getQdrantHttpPortEnv();
-    const qdrantUrl = qdrantHttpPort
-      ? `http://127.0.0.1:${qdrantHttpPort}`
-      : getQdrantUrlEnv() || config.memory.qdrant.url;
-    log.info({ qdrantUrl }, "Daemon startup: initializing Qdrant");
-    const qdrantManager = new QdrantManager({ url: qdrantUrl });
-    try {
-      await qdrantManager.start();
-      const embeddingSelection = await selectEmbeddingBackend(config);
-      const embeddingModel = embeddingSelection.backend
-        ? `${embeddingSelection.backend.provider}:${embeddingSelection.backend.model}:sparse-v${SPARSE_EMBEDDING_VERSION}`
-        : undefined;
-      const qdrantClient = initQdrantClient({
-        url: qdrantUrl,
-        collection: config.memory.qdrant.collection,
-        vectorSize: config.memory.qdrant.vectorSize,
-        onDisk: config.memory.qdrant.onDisk,
-        quantization: config.memory.qdrant.quantization,
-        embeddingModel,
-      });
+    // Mutable refs for Qdrant and memory worker so background init can assign
+    // them and the shutdown handler always sees the latest value.
+    const bgRefs: {
+      qdrantManager: QdrantManager | null;
+      memoryWorker: { stop(): void } | null;
+    } = { qdrantManager: null, memoryWorker: null };
+
+    // Initialize Qdrant vector store and memory worker in the background so the
+    // RuntimeHttpServer can start accepting requests without waiting for Qdrant.
+    async function initializeQdrantAndMemory(): Promise<void> {
+      // Prefer QDRANT_HTTP_PORT (locally-spawned Qdrant on a specific port) over
+      // QDRANT_URL (external Qdrant instance) so the CLI can set the port without
+      // triggering QdrantManager's external mode which skips local process spawn.
+      const qdrantHttpPort = getQdrantHttpPortEnv();
+      const qdrantUrl = qdrantHttpPort
+        ? `http://127.0.0.1:${qdrantHttpPort}`
+        : getQdrantUrlEnv() || config.memory.qdrant.url;
+      log.info({ qdrantUrl }, "Daemon startup: initializing Qdrant");
+      const manager = new QdrantManager({ url: qdrantUrl });
+      bgRefs.qdrantManager = manager;
+      try {
+        await manager.start();
+        const embeddingSelection = await selectEmbeddingBackend(config);
+        const embeddingModel = embeddingSelection.backend
+          ? `${embeddingSelection.backend.provider}:${embeddingSelection.backend.model}:sparse-v${SPARSE_EMBEDDING_VERSION}`
+          : undefined;
+        const qdrantClient = initQdrantClient({
+          url: qdrantUrl,
+          collection: config.memory.qdrant.collection,
+          vectorSize: config.memory.qdrant.vectorSize,
+          onDisk: config.memory.qdrant.onDisk,
+          quantization: config.memory.qdrant.quantization,
+          embeddingModel,
+        });
+
+        // Eagerly ensure the collection exists so we detect migrations
+        // (unnamed→named vectors, dimension/model changes) at startup.
+        // If a destructive migration occurred, enqueue a rebuild_index job
+        // to re-embed all memory items from the SQLite cache.
+        const { migrated } = await qdrantClient.ensureCollection();
+        if (migrated) {
+          enqueueMemoryJob("rebuild_index", {});
+          log.info(
+            "Qdrant collection was migrated — enqueued rebuild_index job",
+          );
+        }
 
-      // Eagerly ensure the collection exists so we detect migrations
-      // (unnamed→named vectors, dimension/model changes) at startup.
-      // If a destructive migration occurred, enqueue a rebuild_index job
-      // to re-embed all memory items from the SQLite cache.
-      const { migrated } = await qdrantClient.ensureCollection();
-      if (migrated) {
-        enqueueMemoryJob("rebuild_index", {});
-        log.info("Qdrant collection was migrated — enqueued rebuild_index job");
+        log.info("Qdrant vector store initialized");
+      } catch (err) {
+        log.warn(
+          { err },
+          "Qdrant failed to start — memory features will be unavailable",
+        );
       }
 
-      log.info("Qdrant vector store initialized");
-    } catch (err) {
-      log.warn(
-        { err },
-        "Qdrant failed to start — memory features will be unavailable",
+      log.info("Daemon startup: starting memory worker");
+      bgRefs.memoryWorker = startMemoryJobsWorker();
+
+      // Seed capability memories for first-party catalog skills so the memory
+      // pipeline can surface relevant skills via semantic search.
+      void seedCatalogSkillMemories().catch((err) =>
+        log.warn({ err }, "Catalog skill memory seeding failed — continuing"),
       );
     }
 
-    log.info("Daemon startup: starting memory worker");
-    const memoryWorker = startMemoryJobsWorker();
-
-    // Seed capability memories for first-party catalog skills so the memory
-    // pipeline can surface relevant skills via semantic search.
-    void seedCatalogSkillMemories().catch((err) =>
-      log.warn({ err }, "Catalog skill memory seeding failed — continuing"),
+    // Fire-and-forget: Qdrant init runs concurrently with the rest of startup
+    void initializeQdrantAndMemory().catch((err) =>
+      log.warn({ err }, "Background Qdrant init failed"),
     );
 
     registerWatcherProviders();
@@ -459,7 +493,7 @@ export async function runDaemon(): Promise<void> {
             title: notification.title,
             body: notification.body,
           },
-          dedupeKey: `watcher:notification:${Date.now()}`,
+          dedupeKey: `watcher:notification:${crypto.randomUUID()}`,
         });
       },
       (params) => {
@@ -477,7 +511,7 @@ export async function runDaemon(): Promise<void> {
             title: params.title,
             body: params.body,
           },
-          dedupeKey: `watcher:escalation:${Date.now()}`,
+          dedupeKey: `watcher:escalation:${crypto.randomUUID()}`,
         });
       },
       (info) => {
@@ -532,13 +566,22 @@ export async function runDaemon(): Promise<void> {
         getOrCreateConversation: (conversationId) =>
           server.getConversationForMessages(conversationId),
         assistantEventHub,
-        resolveAttachments: (attachmentIds) =>
-          attachmentsStore.getAttachmentsByIds(attachmentIds).map((a) => ({
+        resolveAttachments: (attachmentIds) => {
+          const resolved = attachmentsStore.getAttachmentsByIds(attachmentIds, {
+            hydrateFileData: true,
+          });
+          const sourcePaths =
+            attachmentsStore.getSourcePathsForAttachments(attachmentIds);
+          return resolved.map((a) => ({
             id: a.id,
             filename: a.originalFilename,
             mimeType: a.mimeType,
             data: a.dataBase64,
-          })),
+            ...(sourcePaths.has(a.id)
+              ? { filePath: sourcePaths.get(a.id) }
+              : {}),
+          }));
+        },
       },
       findConversation: (conversationId) =>
         server.findConversation(conversationId),
@@ -623,13 +666,20 @@ export async function runDaemon(): Promise<void> {
     setVoiceBridgeDeps({
       getOrCreateConversation: (conversationId, _transport) =>
         server.getConversationForMessages(conversationId),
-      resolveAttachments: (attachmentIds) =>
-        attachmentsStore.getAttachmentsByIds(attachmentIds).map((a) => ({
+      resolveAttachments: (attachmentIds) => {
+        const resolved = attachmentsStore.getAttachmentsByIds(attachmentIds, {
+          hydrateFileData: true,
+        });
+        const sourcePaths =
+          attachmentsStore.getSourcePathsForAttachments(attachmentIds);
+        return resolved.map((a) => ({
           id: a.id,
           filename: a.originalFilename,
           mimeType: a.mimeType,
           data: a.dataBase64,
-        })),
+          ...(sourcePaths.has(a.id) ? { filePath: sourcePaths.get(a.id) } : {}),
+        }));
+      },
       deriveDefaultStrictSideEffects: (conversationId) => {
         const conversationType = getConversationType(conversationId);
         return conversationType === "private";
@@ -881,8 +931,8 @@ export async function runDaemon(): Promise<void> {
       hookManager,
       runtimeHttp,
       scheduler,
-      memoryWorker,
-      qdrantManager,
+      getMemoryWorker: () => bgRefs.memoryWorker,
+      getQdrantManager: () => bgRefs.qdrantManager,
       mcpManager,
       telemetryReporter,
       cleanupPidFile,

package/src/daemon/message-protocol.ts

@@ -38,6 +38,7 @@ export * from "./message-types/skills.js";
 export * from "./message-types/subagents.js";
 export * from "./message-types/surfaces.js";
 export * from "./message-types/trust.js";
+export * from "./message-types/upgrades.js";
 export * from "./message-types/work-items.js";
 export * from "./message-types/workspace.js";
 
@@ -123,6 +124,7 @@ import type {
   _TrustClientMessages,
   _TrustServerMessages,
 } from "./message-types/trust.js";
+import type { _UpgradesServerMessages } from "./message-types/upgrades.js";
 import type {
   _WorkItemsClientMessages,
   _WorkItemsServerMessages,
@@ -194,6 +196,7 @@ export type ServerMessage =
   | _InboxServerMessages
   | _PairingServerMessages
   | _NotificationsServerMessages
+  | _UpgradesServerMessages
   | _AcpServerMessages
   | SubagentEvent;
 

package/src/daemon/message-types/conversations.ts

@@ -80,6 +80,7 @@ export interface ModelGetRequest {
 export interface ModelSetRequest {
   type: "model_set";
   model: string;
+  provider?: string;
 }
 
 export interface ImageGenModelSetRequest {
@@ -177,6 +178,12 @@ export interface AssistantAttention {
   lastSeenSignalType?: string;
 }
 
+export interface ConversationForkParent {
+  conversationId: string;
+  messageId: string;
+  title: string;
+}
+
 export interface ConversationListResponse {
   type: "conversation_list_response";
   conversations: Array<{
@@ -193,6 +200,7 @@ export interface ConversationListResponse {
     assistantAttention?: AssistantAttention;
     displayOrder?: number;
     isPinned?: boolean;
+    forkParent?: ConversationForkParent;
   }>;
   /** Whether more conversations exist beyond the returned page. */
   hasMore?: boolean;
@@ -231,6 +239,7 @@ export interface GenerationHandoff {
   requestId?: string;
   queuedCount: number;
   attachments?: UserMessageAttachment[];
+  attachmentWarnings?: string[];
   /** Database ID of the persisted assistant message, if any. */
   messageId?: string;
 }
@@ -240,6 +249,15 @@ export interface ModelInfo {
   model: string;
   provider: string;
   configuredProviders?: string[];
+  availableModels?: Array<{ id: string; displayName: string }>;
+  allProviders?: Array<{
+    id: string;
+    displayName: string;
+    models: Array<{ id: string; displayName: string }>;
+    defaultModel: string;
+    apiKeyUrl?: string;
+    apiKeyPlaceholder?: string;
+  }>;
 }
 
 export interface HistoryResponseToolCall {

package/src/daemon/message-types/messages.ts

@@ -183,6 +183,7 @@ export interface MessageComplete {
   type: "message_complete";
   conversationId?: string;
   attachments?: UserMessageAttachment[];
+  attachmentWarnings?: string[];
   /** Database ID of the persisted assistant message, if any. */
   messageId?: string;
 }

package/src/daemon/message-types/shared.ts

@@ -34,6 +34,8 @@ export interface UserMessageAttachment {
   filename: string;
   mimeType: string;
   data: string;
+  /** Origin of the attachment on the daemon side, when known. */
+  sourceType?: "sandbox_file" | "host_file" | "tool_block";
   extractedText?: string;
   /** Original file size in bytes. Present when data was omitted from history_response to reduce payload size. */
   sizeBytes?: number;

package/src/daemon/message-types/surfaces.ts

@@ -100,6 +100,8 @@ export interface DynamicPageSurfaceData {
   width?: number;
   height?: number;
   appId?: string;
+  /** Filesystem directory name for this app (may differ from `appId`). */
+  dirName?: string;
   reloadGeneration?: number;
   status?: string;
   preview?: DynamicPagePreview;

package/src/daemon/message-types/upgrades.ts

@@ -0,0 +1,23 @@
+/** Broadcast to connected clients when a service group update is about to begin. */
+export interface ServiceGroupUpdateStarting {
+  type: "service_group_update_starting";
+  /** The version being upgraded to. */
+  targetVersion: string;
+  /** Estimated seconds of downtime. */
+  expectedDowntimeSeconds: number;
+}
+
+/** Broadcast to connected clients when a service group update has completed. */
+export interface ServiceGroupUpdateComplete {
+  type: "service_group_update_complete";
+  /** The version that was installed (may differ from target if rolled back). */
+  installedVersion: string;
+  /** Whether the update succeeded or rolled back. */
+  success: boolean;
+  /** If rolled back, the version reverted to. */
+  rolledBackToVersion?: string;
+}
+
+export type _UpgradesServerMessages =
+  | ServiceGroupUpdateStarting
+  | ServiceGroupUpdateComplete;

package/src/daemon/server.ts

@@ -6,6 +6,7 @@ import {
   getAcpSessionManager,
   setBroadcastToAllClients,
 } from "../acp/index.js";
+import { enrichMessageWithSourcePaths } from "../agent/attachments.js";
 import {
   createAssistantMessage,
   createUserMessage,
@@ -34,12 +35,14 @@ import {
 } from "../memory/canonical-guardian-store.js";
 import {
   addMessage,
+  getConversation,
   getConversationMemoryScopeId,
   getConversationType,
   provenanceFromTrustContext,
   setConversationOriginChannelIfUnset,
   setConversationOriginInterfaceIfUnset,
 } from "../memory/conversation-crud.js";
+import { updateMetaFile } from "../memory/conversation-disk-view.js";
 import { getOrCreateConversation } from "../memory/conversation-key-store.js";
 import { buildSystemPrompt } from "../prompts/system-prompt.js";
 import { resolveManagedProxyContext } from "../providers/managed-proxy/context.js";
@@ -75,7 +78,7 @@ import {
 } from "./conversation.js";
 import { ConversationEvictor } from "./conversation-evictor.js";
 import { resolveChannelCapabilities } from "./conversation-runtime-assembly.js";
-import { resolveSlash } from "./conversation-slash.js";
+import { resolveSlash, type SlashContext } from "./conversation-slash.js";
 import { undoLastMessage } from "./handlers/conversations.js";
 import { parseIdentityFields } from "./handlers/identity.js";
 import type {
@@ -878,6 +881,7 @@ export class DaemonServer {
       filename: string;
       mimeType: string;
       data: string;
+      filePath?: string;
     }[];
   }> {
     const ingressCheck = checkIngressForSecrets(content);
@@ -960,12 +964,22 @@ export class DaemonServer {
     });
 
     const attachments = attachmentIds
-      ? attachmentsStore.getAttachmentsByIds(attachmentIds).map((a) => ({
-          id: a.id,
-          filename: a.originalFilename,
-          mimeType: a.mimeType,
-          data: a.dataBase64,
-        }))
+      ? (() => {
+          const resolved = attachmentsStore.getAttachmentsByIds(attachmentIds, {
+            hydrateFileData: true,
+          });
+          const sourcePaths =
+            attachmentsStore.getSourcePathsForAttachments(attachmentIds);
+          return resolved.map((a) => ({
+            id: a.id,
+            filename: a.originalFilename,
+            mimeType: a.mimeType,
+            data: a.dataBase64,
+            ...(sourcePaths.has(a.id)
+              ? { filePath: sourcePaths.get(a.id) }
+              : {}),
+          }));
+        })()
       : [];
 
     return { conversation, attachments };
@@ -1057,14 +1071,32 @@ export class DaemonServer {
         sourceInterface,
       );
 
-    const slashResult = await resolveSlash(content);
+    const config = getConfig();
+    const serverInterfaceCtx = conversation.getTurnInterfaceContext();
+    const slashContext: SlashContext = {
+      messageCount: conversation.getMessages().length,
+      inputTokens: conversation.usageStats.inputTokens,
+      outputTokens: conversation.usageStats.outputTokens,
+      maxInputTokens: config.contextWindow.maxInputTokens,
+      model: config.services.inference.model,
+      provider: config.services.inference.provider,
+      estimatedCost: conversation.usageStats.estimatedCost,
+      userMessageInterface: serverInterfaceCtx?.userMessageInterface,
+    };
+    const slashResult = await resolveSlash(content, slashContext);
 
     if (slashResult.kind === "unknown") {
       const serverTurnCtx = conversation.getTurnChannelContext();
-      const serverInterfaceCtx = conversation.getTurnInterfaceContext();
       const serverProvenance = provenanceFromTrustContext(
         conversation.trustContext,
       );
+      const imageSourcePaths: Record<string, string> = {};
+      for (let i = 0; i < attachments.length; i++) {
+        const a = attachments[i];
+        if (a.filePath && a.mimeType.toLowerCase().startsWith("image/")) {
+          imageSourcePaths[`${i}:${a.filename}`] = a.filePath;
+        }
+      }
       const serverChannelMeta = {
         ...serverProvenance,
         ...(serverTurnCtx
@@ -1080,15 +1112,19 @@ export class DaemonServer {
                 serverInterfaceCtx.assistantMessageInterface,
             }
           : {}),
+        ...(Object.keys(imageSourcePaths).length > 0
+          ? { imageSourcePaths }
+          : {}),
       };
-      const userMsg = createUserMessage(content, attachments);
+      const cleanMsg = createUserMessage(content, attachments);
+      const llmMsg = enrichMessageWithSourcePaths(cleanMsg, attachments);
       const persisted = await addMessage(
         conversationId,
         "user",
-        JSON.stringify(userMsg.content),
+        JSON.stringify(cleanMsg.content),
         serverChannelMeta,
       );
-      conversation.getMessages().push(userMsg);
+      conversation.getMessages().push(llmMsg);
 
       if (serverTurnCtx) {
         try {
@@ -1117,6 +1153,21 @@ export class DaemonServer {
         }
       }
 
+      // Rewrite meta.json so the on-disk metadata reflects the origin channel
+      if (serverTurnCtx || serverInterfaceCtx) {
+        try {
+          const convForMeta = getConversation(conversationId);
+          if (convForMeta) {
+            updateMetaFile(convForMeta);
+          }
+        } catch (err) {
+          log.warn(
+            { err, conversationId },
+            "Failed to update disk meta (best-effort)",
+          );
+        }
+      }
+
       const assistantMsg = createAssistantMessage(slashResult.message);
       await addMessage(
         conversationId,
@@ -1198,9 +1249,29 @@ export class DaemonServer {
    * Look up an active conversation that owns a given surfaceId.
    */
   findConversationBySurfaceId(surfaceId: string): Conversation | undefined {
+    // Fast path: exact surfaceId match in surfaceState
     for (const c of this.conversations.values()) {
       if (c.surfaceState.has(surfaceId)) return c;
     }
+
+    // Fallback: standalone app surfaces use "app-open-{appId}" IDs that
+    // were never part of any conversation.  Extract the appId and find
+    // a conversation whose surfaceState has a surface for that app.
+    const appOpenPrefix = "app-open-";
+    if (surfaceId.startsWith(appOpenPrefix)) {
+      const appId = surfaceId.slice(appOpenPrefix.length);
+      for (const c of this.conversations.values()) {
+        for (const [, state] of c.surfaceState.entries()) {
+          const data = state.data as unknown as Record<string, unknown>;
+          if (data?.appId === appId) {
+            // Register this surfaceId so subsequent lookups are O(1)
+            c.surfaceState.set(surfaceId, state);
+            return c;
+          }
+        }
+      }
+    }
+
     return undefined;
   }
 

package/src/daemon/shutdown-handlers.ts

@@ -21,8 +21,8 @@ export interface ShutdownDeps {
   hookManager: HookManager;
   runtimeHttp: RuntimeHttpServer | null;
   scheduler: { stop(): void };
-  memoryWorker: { stop(): void };
-  qdrantManager: QdrantManager;
+  getMemoryWorker: () => { stop(): void } | null;
+  getQdrantManager: () => QdrantManager | null;
   mcpManager: McpServerManager | null;
   telemetryReporter: { stop(): Promise<void> } | null;
   cleanupPidFile: () => void;
@@ -106,7 +106,7 @@ export function installShutdownHandlers(deps: ShutdownDeps): void {
     if (deps.runtimeHttp) await deps.runtimeHttp.stop();
     await browserManager.closeAllPages();
     deps.scheduler.stop();
-    deps.memoryWorker.stop();
+    deps.getMemoryWorker()?.stop();
 
     if (deps.mcpManager) {
       try {
@@ -116,7 +116,7 @@ export function installShutdownHandlers(deps: ShutdownDeps): void {
       }
     }
 
-    await deps.qdrantManager.stop();
+    await deps.getQdrantManager()?.stop();
 
     // Checkpoint WAL and close SQLite so no writes are lost on exit.
     // Checkpoint and close are in separate try blocks so that close()
@@ -143,7 +143,10 @@ export function installShutdownHandlers(deps: ShutdownDeps): void {
   process.on("SIGHUP", shutdown);
 
   process.on("unhandledRejection", (reason) => {
-    log.error({ err: reason }, "Unhandled promise rejection — initiating shutdown");
+    log.error(
+      { err: reason },
+      "Unhandled promise rejection — initiating shutdown",
+    );
     Sentry.captureException(reason);
     exitCode = 1;
     void shutdown();

package/src/daemon/startup-error.ts

@@ -27,6 +27,14 @@ const DAEMON_ERROR_PREFIX = "DAEMON_ERROR:";
  * Inspect an error and return a categorized {@link DaemonStartupError}.
  */
 export function categorizeDaemonError(err: unknown): DaemonStartupError {
+  if (err == null) {
+    return {
+      error: "UNKNOWN",
+      message: String(err),
+      detail: "An unexpected error occurred during startup.",
+    };
+  }
+
   const code = (err as { code?: string }).code ?? "";
   const name = (err as { name?: string }).name ?? "";
   const message =
@@ -96,6 +104,7 @@ export function categorizeDaemonError(err: unknown): DaemonStartupError {
     message.startsWith("Invalid RUNTIME_HTTP_PORT") ||
     message.startsWith("Invalid integer for GATEWAY_PORT") ||
     message.startsWith("Invalid integer for RUNTIME_HTTP_PORT") ||
+    message.startsWith("Invalid integer for QDRANT_HTTP_PORT") ||
     /\benv\b.*\bvalidat/i.test(message) ||
     /\bvalidat.*\benv\b/i.test(message)
   ) {