@vellumai/assistant 0.10.3 → 0.10.4-dev.202607010028.1a4efcc

package/src/runtime/routes/conversation-routes.ts

@@ -11,7 +11,9 @@ import {
   createUserMessage,
 } from "../../agent/message-types.js";
 import {
+  BackgroundToolCompletionSchema,
   type ConversationContentBlock,
+  type ConversationMessage,
   ConversationMessageSchema,
 } from "../../api/responses/conversation-message.js";
 import {
@@ -19,12 +21,18 @@ import {
   INTERFACE_IDS,
   isInteractiveInterface,
   parseChannelId,
+  parseClientOs,
   parseInterfaceId,
   supportsHostProxy,
 } from "../../channels/types.js";
 import { isAssistantFeatureFlagEnabled } from "../../config/assistant-feature-flags.js";
 import { isHttpAuthDisabled } from "../../config/env.js";
 import { getConfig } from "../../config/loader.js";
+import {
+  listCanonicalGuardianRequests,
+  listPendingRequestsByConversationScope,
+  resolveCanonicalGuardianRequest,
+} from "../../contacts/canonical-guardian-store.js";
 import {
   mergeConsecutiveAssistantMessages,
   mergeToolResultsIntoAssistantMessages,
@@ -38,6 +46,7 @@ import {
   formatCompactResult,
   isModelSlashCommand,
 } from "../../daemon/conversation-process.js";
+import { findConversation } from "../../daemon/conversation-registry.js";
 import {
   buildSlashContextForContent,
   resolveSlash,
@@ -75,40 +84,38 @@ import {
   writeRelationshipState,
 } from "../../home/relationship-state-writer.js";
 import { ipcCall } from "../../ipc/gateway-client.js";
+import { buildSlackMessageDeepLinks } from "../../messaging/providers/slack/deep-link.js";
+import {
+  readSlackMetadataFromMessageMetadata,
+  type SlackMessageMetadata,
+} from "../../messaging/providers/slack/message-metadata.js";
+import { recordOnboardingEvent } from "../../onboarding/onboarding-events-store.js";
 import {
+  classifyKind,
   getAttachmentById,
   getAttachmentMetadataForMessage,
   getAttachmentsByIds,
   getSourcePathsForAttachments,
-} from "../../memory/attachments-store.js";
-import {
-  listCanonicalGuardianRequests,
-  listPendingRequestsByConversationScope,
-  resolveCanonicalGuardianRequest,
-} from "../../memory/canonical-guardian-store.js";
+} from "../../persistence/attachments-store.js";
 import {
   addMessage,
   extractImageSourcePaths,
   getConversation,
+  getConversationPersistedSeq,
   getMessages,
   getMessagesPaginated,
   hasMessages,
+  isConversationProcessing,
   type MessageRow,
   provenanceFromTrustContext,
   setConversationInferenceProfile,
-} from "../../memory/conversation-crud.js";
+} from "../../persistence/conversation-crud.js";
 import {
   getConversationByKey,
   getOrCreateConversation,
-} from "../../memory/conversation-key-store.js";
-import { searchConversations } from "../../memory/conversation-queries.js";
-import { MEMORY_RETROSPECTIVE_FORK_SOURCE } from "../../memory/memory-retrospective-constants.js";
-import { recordOnboardingEvent } from "../../memory/onboarding-events-store.js";
-import { buildSlackMessageDeepLinks } from "../../messaging/providers/slack/deep-link.js";
-import {
-  readSlackMetadataFromMessageMetadata,
-  type SlackMessageMetadata,
-} from "../../messaging/providers/slack/message-metadata.js";
+} from "../../persistence/conversation-key-store.js";
+import { searchConversations } from "../../persistence/conversation-queries.js";
+import { MEMORY_RETROSPECTIVE_FORK_SOURCE } from "../../plugins/defaults/memory/memory-retrospective-constants.js";
 import { normalizeOnboardingContext } from "../../prompts/normalize-onboarding.js";
 import { writeOnboardingSection } from "../../prompts/persona-resolver.js";
 import { getConfiguredProvider } from "../../providers/provider-send-message.js";
@@ -122,7 +129,6 @@ import {
 } from "../../util/platform.js";
 import { silentlyWithLog } from "../../util/silently.js";
 import { assistantEventHub, broadcastMessage } from "../assistant-event-hub.js";
-import { getPersistedSeq } from "../assistant-stream-state.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import {
   type GuardianPendingScope,
@@ -393,6 +399,8 @@ function buildSlackHistoryMessage(
       : {}),
     ...(messageLink ? { messageLink } : {}),
     ...(threadLink ? { threadLink } : {}),
+    ...(slackMeta.eventKind ? { eventKind: slackMeta.eventKind } : {}),
+    ...(slackMeta.reaction ? { reaction: slackMeta.reaction } : {}),
   };
 }
 
@@ -600,6 +608,65 @@ async function tryConsumeCanonicalGuardianReply(params: {
   return { consumed: true, messageId };
 }
 
+/**
+ * Render the live conversation's in-memory message queue into history rows.
+ *
+ * Messages enqueued while the agent is mid-turn live only in memory until the
+ * queue drains and persists them, so they never reach the DB-sourced history
+ * list. The live path surfaces them via `message_queued` SSE events; a cold
+ * reload (no event replay) would otherwise drop them. Each queued row carries
+ * `queueStatus: "queued"` with its 1-based `queuePosition` (mirroring the
+ * client `DisplayMessage` queue fields) and is ordered FIFO so it appends to
+ * the newest page in send order, mirroring how the agent will drain them.
+ *
+ * Returns an empty array when the conversation is not live in memory (cold, or
+ * aged out of the registry) — there is no queue to read in that case.
+ */
+function buildQueuedMessagePayloads(
+  conversationId: string,
+): RuntimeMessagePayload[] {
+  const conversation = findConversation(conversationId);
+  if (!conversation) return [];
+
+  return conversation.snapshotQueuedMessages().map((item, index) => {
+    const text = item.displayContent ?? item.content;
+    const attachments: RuntimeAttachmentMetadata[] = item.attachments.map(
+      (a, idx) => ({
+        id: a.id ?? `${item.requestId}:attachment:${idx}`,
+        filename: a.filename,
+        mimeType: a.mimeType,
+        sizeBytes:
+          a.sizeBytes ?? (a.data ? Math.floor((a.data.length * 3) / 4) : 0),
+        kind: classifyKind(a.mimeType),
+        ...(a.mimeType.startsWith("image/") && a.data ? { data: a.data } : {}),
+        ...(a.thumbnailData ? { thumbnailData: a.thumbnailData } : {}),
+      }),
+    );
+
+    const contentBlocks: ConversationContentBlock[] = [];
+    if (text.length > 0) contentBlocks.push({ type: "text", text });
+    for (const attachment of attachments) {
+      contentBlocks.push({ type: "attachment", attachment });
+    }
+
+    return {
+      // The queued message has no DB row yet; its requestId is the stable
+      // identifier the queued-message delete/steer endpoints key on.
+      id: item.requestId,
+      role: "user" as const,
+      content: text,
+      timestamp: new Date(item.sentAt).toISOString(),
+      attachments,
+      ...(contentBlocks.length > 0 ? { contentBlocks } : {}),
+      ...(item.clientMessageId
+        ? { clientMessageId: item.clientMessageId }
+        : {}),
+      queueStatus: "queued" as const,
+      queuePosition: index + 1,
+    };
+  });
+}
+
 export function handleListMessages({
   queryParams,
 }: RouteHandlerArgs): Record<string, unknown> {
@@ -657,6 +724,7 @@ export function handleListMessages({
         oldestTimestamp: null,
         oldestMessageId: null,
         seq: null,
+        processing: false,
       };
     }
     return { messages: [] };
@@ -772,10 +840,30 @@ export function handleListMessages({
           conversationId?: string;
         }
       | undefined;
+    let acpNotification: { acpSessionId: string; agent?: string } | undefined;
+    let backgroundToolNotification: boolean | undefined;
+    let backgroundToolCompletion: ConversationMessage["backgroundToolCompletion"];
     if (msg.metadata) {
       try {
         const meta = JSON.parse(msg.metadata);
         if (typeof meta.sentAt === "number") sentAt = meta.sentAt;
+        // The backgrounded bash/host_bash completion wake persists a
+        // `<background_event source="background-tool">` row (see
+        // `persistWakeTriggerMessage`). Flag it so clients hide it from the
+        // transcript like a subagent/ACP notification — the inline card carries
+        // the status.
+        if (meta.backgroundEventSource === "background-tool") {
+          backgroundToolNotification = true;
+        }
+        // `persistWakeTriggerMessage` stamps the structured completion onto the
+        // same wake row, letting the web rebuild a terminal inline card from
+        // history after a restart (the in-memory completed ring does not survive).
+        const completionParse = BackgroundToolCompletionSchema.safeParse(
+          meta.backgroundToolCompletion,
+        );
+        if (completionParse.success) {
+          backgroundToolCompletion = completionParse.data;
+        }
         if (meta.subagentNotification) {
           const n = meta.subagentNotification;
           if (typeof n.subagentId === "string" && typeof n.label === "string") {
@@ -793,6 +881,15 @@ export function handleListMessages({
             };
           }
         }
+        if (meta.acpNotification) {
+          const n = meta.acpNotification;
+          if (typeof n.acpSessionId === "string") {
+            acpNotification = {
+              acpSessionId: n.acpSessionId,
+              ...(typeof n.agent === "string" ? { agent: n.agent } : {}),
+            };
+          }
+        }
       } catch {
         // Ignore malformed metadata
       }
@@ -818,6 +915,9 @@ export function handleListMessages({
       createdAt: msg.createdAt,
       sentAt,
       subagentNotification,
+      acpNotification,
+      backgroundToolNotification,
+      backgroundToolCompletion,
       slackMessage,
       clientMessageId: msg.clientMessageId ?? undefined,
     };
@@ -1001,16 +1101,40 @@ export function handleListMessages({
       ...(m.subagentNotification
         ? { subagentNotification: m.subagentNotification }
         : {}),
+      ...(m.acpNotification ? { acpNotification: m.acpNotification } : {}),
+      ...(m.backgroundToolNotification
+        ? { backgroundToolNotification: true }
+        : {}),
+      ...(m.backgroundToolCompletion
+        ? { backgroundToolCompletion: m.backgroundToolCompletion }
+        : {}),
       ...(m.slackMessage ? { slackMessage: m.slackMessage } : {}),
     };
   });
 
   // Snapshot↔stream alignment token: the `seq` of the last event whose
-  // content is durably persisted for this conversation in the current
-  // daemon process. Returned on every resolved-conversation response so a
-  // client can apply only stream events with a higher `seq`. Null when
-  // nothing has been persisted in-process (cold/aged-out/post-restart).
-  const persistedSeq = getPersistedSeq(resolvedConversationId);
+  // content is durably persisted for this conversation, read from the
+  // `conversations.seq` column. Returned on every resolved-conversation
+  // response so a client can apply only stream events with a higher `seq`.
+  // Null when nothing has been persisted (the conversation was created before
+  // any stream activity, or predates the column) -- the client cold-starts.
+  const persistedSeq = getConversationPersistedSeq(resolvedConversationId);
+
+  // Authoritative "is the agent mid-turn?" signal, sourced from the
+  // `processing_started_at` column (persisted, survives daemon restarts).
+  // Clients use this to distinguish a live turn still in flight from a
+  // turn that silently died — without it, a dropped SSE stream leaves the
+  // UI spinning forever with no way to learn the server is actually idle.
+  const processing = isConversationProcessing(resolvedConversationId);
+
+  // Append the in-memory queue's pending user messages to the newest page so a
+  // cold reload restores them alongside persisted history. They are the newest
+  // rows in the conversation (enqueued during the in-flight turn) and are not
+  // yet persisted, so they belong only on a request for the latest content —
+  // never on an older-history page (`beforeTimestamp` set).
+  if (beforeTimestamp == null) {
+    messages.push(...buildQueuedMessagePayloads(resolvedConversationId));
+  }
 
   if (isPaginated) {
     // Prefer the page's oldest visible row (the documented cursor semantic).
@@ -1034,6 +1158,7 @@ export function handleListMessages({
         oldestTimestamp: oldestTimestamp ?? null,
         oldestMessageId: oldestMessageId ?? null,
         seq: persistedSeq,
+        processing,
       };
     }
 
@@ -1043,10 +1168,11 @@ export function handleListMessages({
       ...(oldestTimestamp != null ? { oldestTimestamp } : {}),
       ...(oldestMessageId != null ? { oldestMessageId } : {}),
       seq: persistedSeq,
+      processing,
     };
   }
 
-  return { messages, seq: persistedSeq };
+  return { messages, seq: persistedSeq, processing };
 }
 
 /**
@@ -1153,6 +1279,7 @@ export async function handleSendMessage(
     hostHomeDir?: string;
     hostUsername?: string;
     clientTimezone?: unknown;
+    clientOs?: unknown;
     clientId?: string;
     clientMessageId?: string;
     inferenceProfile?: string | null;
@@ -1251,6 +1378,15 @@ export async function handleSendMessage(
     typeof body.clientTimezone === "string"
       ? (canonicalizeTimeZone(body.clientTimezone) ?? undefined)
       : undefined;
+  // Client OS surface ("web" | "ios" | "macos" | "android"), reported
+  // separately from the transport `interface`. Validated against the dedicated
+  // `ClientOs` value set (NOT the interface vocabulary) and only kept when it
+  // resolves — it drives the per-turn `client_os:` context line, never
+  // transport/host-proxy gating.
+  const clientOs =
+    typeof body.clientOs === "string"
+      ? (parseClientOs(body.clientOs) ?? undefined)
+      : undefined;
 
   // Reject non-string content values (numbers, objects, etc.)
   if (content != null && typeof content !== "string") {
@@ -1410,11 +1546,13 @@ export async function handleSendMessage(
         hostHomeDir: body.hostHomeDir,
         hostUsername: body.hostUsername,
         ...(clientTimezone ? { clientTimezone } : {}),
+        ...(clientOs ? { clientOs } : {}),
       } satisfies HostProxyTransportMetadata)
     : ({
         channelId: sourceChannel,
         interfaceId: sourceInterface,
         ...(clientTimezone ? { clientTimezone } : {}),
+        ...(clientOs ? { clientOs } : {}),
       } satisfies NonHostProxyTransportMetadata);
 
   const conversation = await smDeps.getOrCreateConversation(
@@ -1642,6 +1780,7 @@ export async function handleSendMessage(
         attachments,
         requestId: crypto.randomUUID(),
         metadata: greetingMeta,
+        clientMessageId,
       });
 
       const conversationId = mapping.conversationId;
@@ -2688,6 +2827,12 @@ export const ROUTES: RouteDefinition[] = [
         .describe(
           "Global SSE `seq` of the last event whose content is durably persisted for this conversation in the current daemon process. A client can align this snapshot with the `/events` stream by applying only events with `seq` greater than this value. Null when no events have been persisted in this process (cold conversation, after a daemon restart, or when the conversation has aged out of the in-memory map) — clients should cold-start in that case. Absent on older daemons that predate this field.",
         ),
+      processing: z
+        .boolean()
+        .optional()
+        .describe(
+          "Whether the agent is currently mid-turn for this conversation, sourced authoritatively from the persisted `processing_started_at` column. `true` means a turn is in flight; `false` means the conversation is idle. Clients use this to recover from a dropped SSE stream: if a turn appears to be running locally but the server reports `processing: false`, the turn has ended (or died) and the UI should stop waiting rather than spin indefinitely. Absent on older daemons that predate this field.",
+        ),
     }),
     handler: (args) => handleListMessages(args),
   },
@@ -2731,6 +2876,12 @@ export const ROUTES: RouteDefinition[] = [
       conversationType: z.string().optional(),
       slashCommand: z.string().optional(),
       clientTimezone: z.string().optional(),
+      clientOs: z
+        .string()
+        .optional()
+        .describe(
+          'Client OS surface ("web" | "ios" | "macos" | "android"), reported separately from `interface`. Drives the per-turn `client_os` context only; does not affect transport/host-proxy capabilities.',
+        ),
       clientMessageId: z
         .string()
         .describe(

package/src/runtime/routes/conversation-starter-routes.ts

@@ -16,14 +16,20 @@ import {
   countActiveMemoryNodes,
   getCheckpointValue,
   parseCheckpointInt,
-} from "../../memory/conversation-starter-checkpoints.js";
+} from "../../home/conversation-starter-checkpoints.js";
 import {
   buildConversationStarterValidationContext,
   isValidConversationStarterText,
-} from "../../memory/conversation-starter-validation.js";
-import { getDb, getMemoryDb } from "../../memory/db-connection.js";
-import { enqueueMemoryJob, isMemoryEnabled } from "../../memory/jobs-store.js";
-import { conversationStarters, memoryJobs } from "../../memory/schema.js";
+} from "../../home/conversation-starter-validation.js";
+import { getDb, getMemoryDb } from "../../persistence/db-connection.js";
+import {
+  enqueueMemoryJob,
+  isMemoryEnabled,
+} from "../../persistence/jobs-store.js";
+import {
+  conversationStarters,
+  memoryJobs,
+} from "../../persistence/schema/index.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { NotFoundError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";

package/src/runtime/routes/conversations-import-routes.ts

@@ -6,18 +6,19 @@ import {
   addMessage,
   createConversation,
   type MessageRole,
-} from "../../memory/conversation-crud.js";
+} from "../../persistence/conversation-crud.js";
 import {
   getConversationByKey,
   setConversationKey,
-} from "../../memory/conversation-key-store.js";
-import { getDb } from "../../memory/db-connection.js";
-import { indexMessageNow } from "../../memory/indexer.js";
+} from "../../persistence/conversation-key-store.js";
+import { getDb } from "../../persistence/db-connection.js";
 import {
   conversations as conversationsTable,
   messages as messagesTable,
-} from "../../memory/schema.js";
+} from "../../persistence/schema/index.js";
+import { indexMessageNow } from "../../plugins/defaults/memory/indexer.js";
 import { getLogger } from "../../util/logger.js";
+import { withSqliteRetry } from "../../util/sqlite-retry.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
@@ -119,7 +120,10 @@ async function handleConversationsImport({ body }: RouteHandlerArgs) {
       const { convCreatedAt, convUpdatedAt, messageTimestamps } =
         resolveTimestamps(conv, messages);
 
-      const conversation = createConversation(conv.title);
+      const conversation = await withSqliteRetry(
+        () => createConversation(conv.title),
+        { op: "conversationsImport.createConversation" },
+      );
 
       for (const msg of messages) {
         const contentStr =

package/src/runtime/routes/debug-routes.ts

@@ -8,9 +8,9 @@ import { z } from "zod";
 
 import { resolveCallSiteConfig } from "../../config/llm-resolver.js";
 import { getConfig } from "../../config/loader.js";
-import { countConversations } from "../../memory/conversation-queries.js";
-import { getMemoryJobCounts } from "../../memory/jobs-store.js";
-import { rawAll } from "../../memory/raw-query.js";
+import { countConversations } from "../../persistence/conversation-queries.js";
+import { getMemoryJobCounts } from "../../persistence/jobs-store.js";
+import { rawAll } from "../../persistence/raw-query.js";
 import {
   getProviderRoutingSource,
   listProviders,

package/src/runtime/routes/defer-routes.ts

@@ -7,7 +7,7 @@
 
 import { z } from "zod";
 
-import { getConversation } from "../../memory/conversation-crud.js";
+import { getConversation } from "../../persistence/conversation-crud.js";
 import {
   cancelSchedule,
   createSchedule,
@@ -94,7 +94,7 @@ async function handleDeferCreate({ body = {} }: RouteHandlerArgs) {
     );
   }
 
-  const job = createSchedule({
+  const job = await createSchedule({
     name: name ?? "Deferred wake",
     message: hint,
     mode: "wake",
@@ -145,7 +145,7 @@ async function handleDeferCancel({ body = {} }: RouteHandlerArgs) {
     if (!job || job.mode !== "wake" || job.createdBy !== "defer") {
       return { cancelled: 0, error: "Not a deferred wake" };
     }
-    const ok = cancelSchedule(id);
+    const ok = await cancelSchedule(id);
     return { cancelled: ok ? 1 : 0 };
   }
 
@@ -159,7 +159,7 @@ async function handleDeferCancel({ body = {} }: RouteHandlerArgs) {
     let count = 0;
     for (const j of jobs) {
       if (j.status === "active" || j.status === "firing") {
-        if (cancelSchedule(j.id)) count++;
+        if (await cancelSchedule(j.id)) count++;
       }
     }
     return { cancelled: count };

package/src/runtime/routes/documents-routes.ts

@@ -12,7 +12,7 @@ import {
   getDocumentsForConversation,
   saveDocument,
 } from "../../documents/document-store.js";
-import { rawAll } from "../../memory/raw-query.js";
+import { rawAll } from "../../persistence/raw-query.js";
 import { getLogger } from "../../util/logger.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { renderMarkdownToPDF } from "./document-pdf-renderer.js";

package/src/runtime/routes/empty-state-greeting-cache.ts

@@ -15,7 +15,7 @@ import { getConfig } from "../../config/loader.js";
 import {
   getMemoryCheckpoint,
   setMemoryCheckpoint,
-} from "../../memory/checkpoints.js";
+} from "../../persistence/checkpoints.js";
 
 const CHECKPOINT_KEY_TEXT = "empty_state:greeting:text";
 const CHECKPOINT_KEY_TIMESTAMP = "empty_state:greeting:cached_at";

package/src/runtime/routes/events-routes.ts

@@ -25,9 +25,9 @@ import { z } from "zod";
 
 import type { HostProxyCapability } from "../../channels/types.js";
 import { parseInterfaceId, supportsHostProxy } from "../../channels/types.js";
-import { emitContactChange } from "../../contacts/contact-events.js";
-import { getConversation } from "../../memory/conversation-crud.js";
-import { getOrCreateConversation } from "../../memory/conversation-key-store.js";
+import { notifyContactsChanged } from "../../contacts/notify-contacts-changed.js";
+import { getConversation } from "../../persistence/conversation-crud.js";
+import { getOrCreateConversation } from "../../persistence/conversation-key-store.js";
 import { getLogger } from "../../util/logger.js";
 import { formatSseFrame, formatSseHeartbeat } from "../assistant-event.js";
 import type {
@@ -583,7 +583,7 @@ export const ROUTES: RouteDefinition[] = [
     handler: ({ body }) => {
       const { kind } = EmitEventBodySchema.parse(body);
       if (kind === "contacts_changed") {
-        emitContactChange();
+        notifyContactsChanged();
       }
       return null;
     },

package/src/runtime/routes/filing-routes.ts

@@ -10,7 +10,7 @@
 import { z } from "zod";
 
 import { getConfig } from "../../config/loader.js";
-import { FilingService } from "../../filing/filing-service.js";
+import { FilingService } from "../../plugins/defaults/memory/filing-service.js";
 import { getLogger } from "../../util/logger.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, InternalError } from "./errors.js";

package/src/runtime/routes/global-search-routes.ts

@@ -12,13 +12,13 @@ import { z } from "zod";
 
 import { getConfig } from "../../config/loader.js";
 import { searchContacts } from "../../contacts/contact-store.js";
-import { searchConversations } from "../../memory/conversation-queries.js";
+import { searchConversations } from "../../persistence/conversation-queries.js";
 import {
   embedWithBackend,
   getMemoryBackendStatus,
-} from "../../memory/embedding-backend.js";
-import { rawAll } from "../../memory/raw-query.js";
-import { semanticSearch } from "../../memory/search/semantic.js";
+} from "../../persistence/embeddings/embedding-backend.js";
+import { rawAll } from "../../persistence/raw-query.js";
+import { semanticSearch } from "../../plugins/defaults/memory/search/semantic.js";
 import { listSchedules } from "../../schedule/schedule-store.js";
 import { getLogger } from "../../util/logger.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";

package/src/runtime/routes/group-routes.ts

@@ -17,7 +17,7 @@ import {
   listGroups,
   reorderGroups,
   updateGroup,
-} from "../../memory/group-crud.js";
+} from "../../persistence/group-crud.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { publishConversationListChanged } from "../sync/resource-sync-events.js";
 import { BadRequestError, ForbiddenError, NotFoundError } from "./errors.js";

package/src/runtime/routes/guardian-action-routes.ts

@@ -17,7 +17,7 @@ import { isHttpAuthDisabled } from "../../config/env.js";
 import {
   type CanonicalGuardianRequest,
   listPendingRequestsByConversationScope,
-} from "../../memory/canonical-guardian-store.js";
+} from "../../contacts/canonical-guardian-store.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { processGuardianDecision } from "../guardian-action-service.js";
 import type { GuardianDecisionPrompt } from "../guardian-decision-types.js";

package/src/runtime/routes/heartbeat-routes.ts

@@ -18,8 +18,8 @@ import {
 } from "../../config/loader.js";
 import { listHeartbeatRuns } from "../../heartbeat/heartbeat-run-store.js";
 import { HeartbeatService } from "../../heartbeat/heartbeat-service.js";
-import { getConversation } from "../../memory/conversation-crud.js";
-import { getUsageCostForConversationWindow } from "../../memory/llm-usage-store.js";
+import { getConversation } from "../../persistence/conversation-crud.js";
+import { getUsageCostForConversationWindow } from "../../persistence/llm-usage-store.js";
 import { readTextFileSync } from "../../util/fs.js";
 import { getLogger } from "../../util/logger.js";
 import { getWorkspacePromptPath } from "../../util/platform.js";

package/src/runtime/routes/home-feed-routes.ts

@@ -36,8 +36,9 @@ import { getSuggestedPrompts } from "../../home/suggested-prompts.js";
 import {
   addMessage,
   createConversation,
-} from "../../memory/conversation-crud.js";
+} from "../../persistence/conversation-crud.js";
 import { getLogger } from "../../util/logger.js";
+import { withSqliteRetry } from "../../util/sqlite-retry.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, InternalError, NotFoundError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
@@ -321,10 +322,14 @@ export async function handlePostFeedAction({
   }
 
   try {
-    const conversation = createConversation({
-      title: action.label,
-      source: "home-feed",
-    });
+    const conversation = await withSqliteRetry(
+      () =>
+        createConversation({
+          title: action.label,
+          source: "home-feed",
+        }),
+      { op: "homeFeed.createConversation" },
+    );
     await addMessage(
       conversation.id,
       "user",