@vellumai/assistant 0.8.7-dev.202606052232.2ddc989 → 0.8.8

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

@@ -4,14 +4,12 @@
  * Exposes spawn, steer, cancel, close, sessions, and permission operations
  * over HTTP and IPC.
  */
-import { and, desc, eq, inArray, notInArray } from "drizzle-orm";
+import { desc, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
 
-import { resolveAgentWithAutoInstall } from "../../acp/auto-install.js";
 import { getAcpSessionManager } from "../../acp/index.js";
 import { prepareAgentEnv } from "../../acp/prepare-agent-env.js";
-import { formatResolveFailure } from "../../acp/resolve-agent.js";
-import { AcpResumeError } from "../../acp/session-manager.js";
+import { resolveAcpAgent } from "../../acp/resolve-agent.js";
 import type { AcpSessionState } from "../../acp/types.js";
 import { getDb } from "../../memory/db-connection.js";
 import { rawChanges } from "../../memory/raw-query.js";
@@ -63,19 +61,26 @@ async function spawnSession({ body }: RouteHandlerArgs) {
     throw new BadRequestError("agent, task, and conversationId are required");
   }
 
-  // Resolve the agent, silently auto-installing a missing allowlisted
-  // adapter binary (see acp/auto-install.ts). Shared with the skill-tool
-  // path in tools/acp/spawn.ts; only the transport mapping differs.
-  const { resolved, failureMessage } = await resolveAgentWithAutoInstall(agent);
-  if (failureMessage) {
-    throw new FailedDependencyError(failureMessage);
-  }
+  const resolved = resolveAcpAgent(agent);
   if (!resolved.ok) {
-    const message = formatResolveFailure(agent, resolved);
-    if (resolved.reason === "binary_not_found") {
-      throw new FailedDependencyError(message);
+    switch (resolved.reason) {
+      case "acp_disabled":
+        throw new BadRequestError(resolved.hint);
+      case "unknown_agent":
+        throw new BadRequestError(
+          `Unknown agent "${agent}". Available: ${resolved.available.join(", ")}.`,
+        );
+      case "binary_not_found":
+        throw new FailedDependencyError(
+          `${resolved.command} is not on PATH. ${resolved.hint}`,
+        );
+      default: {
+        const _exhaustive: never = resolved;
+        throw new Error(
+          `Unexpected acp resolver reason: ${(_exhaustive as { reason: string }).reason}`,
+        );
+      }
     }
-    throw new BadRequestError(message);
   }
 
   // Inject required env vars and preflight via the shared helper. See
@@ -111,31 +116,13 @@ async function steerSession({ pathParams, body }: RouteHandlerArgs) {
     throw new BadRequestError("instruction is required");
   }
 
-  // Sessions no longer in memory (completed, or lost to a daemon restart)
-  // are transparently resumed from persisted history with the instruction
-  // fired in the same call, mirroring the acp_steer skill tool.
-  // broadcastMessage plays the sender role spawnSession gives it, so
-  // connected clients render the session.
   const manager = getAcpSessionManager();
   try {
-    const { resumed } = await manager.steerOrResume(
-      id,
-      instruction,
-      broadcastMessage,
-    );
-    return resumed
-      ? { acpSessionId: id, steered: true, resumed: true }
-      : { acpSessionId: id, steered: true };
-  } catch (err) {
-    // Resume errors carry the actionable hint (legacy row without cwd,
-    // agent capability missing, resolver failures, ...).
-    if (err instanceof AcpResumeError) {
-      throw new FailedDependencyError(err.message);
-    }
-    // Unknown ids (no in-memory session, no history row) and plain steer
-    // failures both map to 404, as before.
+    await manager.steer(id, instruction);
+  } catch {
     throw new NotFoundError("ACP session not found");
   }
+  return { acpSessionId: id, steered: true };
 }
 
 async function cancelSession({ pathParams }: RouteHandlerArgs) {
@@ -174,25 +161,9 @@ function bulkDeleteSessions({ queryParams }: RouteHandlerArgs) {
       "status query param is required and must be 'completed'",
     );
   }
-  // Exclude sessions currently active in memory AND ids with a resume in
-  // flight (reserved but not yet registered): a resumed session reuses its
-  // original id, and its history row keeps the old terminal status until
-  // the next terminal upsert - a status-only delete would remove the row
-  // out from under the live (or resuming) session, and the later terminal
-  // upsert would resurrect it. Mirrors the 409 guard on the single-id
-  // delete route.
-  const activeIds = getAcpSessionManager().getActiveAndPendingIds();
-  const terminalFilter = inArray(
-    acpSessionHistory.status,
-    TERMINAL_SESSION_STATUSES,
-  );
   getDb()
     .delete(acpSessionHistory)
-    .where(
-      activeIds.length > 0
-        ? and(terminalFilter, notInArray(acpSessionHistory.id, activeIds))
-        : terminalFilter,
-    )
+    .where(inArray(acpSessionHistory.status, TERMINAL_SESSION_STATUSES))
     .run();
   const deleted = rawChanges();
   log.info({ deleted }, "Bulk-cleared terminal ACP session history");
@@ -201,10 +172,9 @@ function bulkDeleteSessions({ queryParams }: RouteHandlerArgs) {
 
 function deleteSession({ pathParams }: RouteHandlerArgs) {
   const id = pathParams?.id as string;
-  const manager = getAcpSessionManager();
 
   try {
-    const state = manager.getStatus(id);
+    const state = getAcpSessionManager().getStatus(id);
     if (
       !Array.isArray(state) &&
       (state.status === "running" || state.status === "initializing")
@@ -215,16 +185,7 @@ function deleteSession({ pathParams }: RouteHandlerArgs) {
     }
   } catch (err) {
     if (err instanceof ConflictError) throw err;
-    // Not registered in memory, but a resume may be in flight (id reserved
-    // while awaiting env preparation). Its history row must survive until
-    // the resume lands - the later terminal upsert would resurrect a
-    // deleted row.
-    if (manager.getActiveAndPendingIds().includes(id)) {
-      throw new ConflictError(
-        `ACP session "${id}" has a resume in flight. Wait for it to finish before deleting.`,
-      );
-    }
-    // Otherwise fall through to the (idempotent) DB delete.
+    // Not in memory — fall through to the (idempotent) DB delete.
   }
 
   getDb().delete(acpSessionHistory).where(eq(acpSessionHistory.id, id)).run();
@@ -272,11 +233,7 @@ export const ROUTES: RouteDefinition[] = [
     },
     handler: steerSession,
     summary: "Steer ACP session",
-    description:
-      "Send a steering instruction to an ACP session. Sessions no longer " +
-      "in memory (completed, or lost to a daemon restart) are " +
-      "transparently resumed from persisted history first, when the agent " +
-      "supports ACP session loading.",
+    description: "Send a steering instruction to an active ACP session.",
     tags: ["acp"],
     requestBody: z.object({
       instruction: z.string(),
@@ -284,12 +241,6 @@ export const ROUTES: RouteDefinition[] = [
     responseBody: z.object({
       acpSessionId: z.string(),
       steered: z.boolean(),
-      resumed: z
-        .boolean()
-        .optional()
-        .describe(
-          "True when the session was resumed from persisted history before steering.",
-        ),
     }),
   },
   {
@@ -373,9 +324,7 @@ export const ROUTES: RouteDefinition[] = [
     summary: "Bulk-clear terminal ACP sessions",
     description:
       "Remove every terminal-state row (completed/failed/cancelled) from " +
-      "the persisted acp_session_history table. Rows whose session is " +
-      "currently active in memory (e.g. resumed) or has a resume in " +
-      "flight are excluded.",
+      "the persisted acp_session_history table.",
     tags: ["acp"],
     queryParams: [
       {
@@ -401,8 +350,7 @@ export const ROUTES: RouteDefinition[] = [
     summary: "Delete ACP session from history",
     description:
       "Remove a persisted ACP session row. Rejects with 409 when the " +
-      "session is still active in memory or has a resume in flight; " +
-      "idempotent for unknown ids.",
+      "session is still active in memory; idempotent for unknown ids.",
     tags: ["acp"],
     responseBody: z.object({
       deleted: z.boolean(),

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

@@ -9,7 +9,7 @@
  */
 import { z } from "zod";
 
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import { getConversationByKey } from "../../memory/conversation-key-store.js";
 import type { UserDecision } from "../../permissions/types.js";
 import { getLogger } from "../../util/logger.js";

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

@@ -16,7 +16,7 @@ import {
   BROWSER_OPERATIONS,
   type BrowserOperation,
 } from "../../browser/types.js";
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import type { ContentBlock } from "../../providers/types.js";
 import { LOCAL_PRINCIPALS } from "../auth/route-policy.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";

package/src/runtime/routes/browser-tabs-routes.ts

@@ -7,7 +7,7 @@
 
 import { z } from "zod";
 
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import { getCdpClient } from "../../tools/browser/cdp-client/factory.js";
 import {
   clearPinnedTab,
@@ -73,7 +73,11 @@ async function handleBrowserTabs({ body = {} }: RouteHandlerArgs) {
           ? result.clientId
           : undefined;
       if (result?.tabId !== undefined) {
-        setPinnedTab(resolvedConversationId, String(result.tabId), clientId);
+        setPinnedTab(
+          resolvedConversationId,
+          String(result.tabId),
+          clientId,
+        );
       }
       return { ok: true, tab: result };
     } finally {
@@ -84,10 +88,10 @@ async function handleBrowserTabs({ body = {} }: RouteHandlerArgs) {
   if (command === "new") {
     const cdp = getCdpClient(context, cdpOptions);
     try {
-      const result = await cdp.send<{
-        tabId?: number | string;
-        clientId?: string;
-      }>("Vellum.createTab", {});
+      const result = await cdp.send<{ tabId?: number | string; clientId?: string }>(
+        "Vellum.createTab",
+        {},
+      );
       // Normalise to string for internal use (setCdpSessionId / setPinnedTab)
       // and keep the numeric form for the API response.
       const newTabIdStr: string | undefined =

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

@@ -9,7 +9,7 @@
 import { v4 as uuid } from "uuid";
 import { z } from "zod";
 
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import { clearAllConversations as clearAllActive } from "../../daemon/handlers/conversations.js";
 import { formatJson, formatMarkdown } from "../../export/formatter.js";
 import { ipcCall as ipcCallGateway } from "../../ipc/gateway-client.js";

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

@@ -9,7 +9,7 @@
 
 import { z } from "zod";
 
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import {
   type Confidence,
   getAttentionStateByConversationIds,

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

@@ -72,7 +72,7 @@ import { type LogRow } from "../../memory/llm-request-log-store.js";
 import { getMemoryRecallLogByMessageIds } from "../../memory/memory-recall-log-store.js";
 import { getMemoryV2ActivationLogByMessageIds } from "../../memory/memory-v2-activation-log-store.js";
 import { MEMORY_V2_CONSOLIDATION_SOURCE } from "../../memory/v2/constants.js";
-import { getMemoryV3SelectionForInspector } from "../../plugins/defaults/memory-v3-shadow/selection-log-store.js";
+import { getMemoryV3SelectionForInspector } from "../../memory/v3/selection-log-store.js";
 import {
   createConnection,
   listConnections,

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

@@ -680,14 +680,7 @@ export function handleListMessages({
   // assistant message has tool_use blocks but its matching user tool_result
   // is left visible, the result will render as a standalone orphan because
   // `mergeToolResultsIntoAssistantMessages` has nothing to merge it into.
-  //
-  // Only renderable roles reach this UI-facing transcript. `system` rows (a
-  // permitted `MessageRole`, e.g. skill-authored context) are agent-context
-  // scaffolding, never a displayed turn, so they are dropped here at the
-  // source rather than narrowed away per-client.
-  const visibleFilter = (m: MessageRow) =>
-    !isHiddenMessage(m.metadata) &&
-    (m.role === "user" || m.role === "assistant");
+  const visibleFilter = (m: MessageRow) => !isHiddenMessage(m.metadata);
 
   if (isPaginated) {
     const result = getMessagesPaginated(
@@ -779,15 +772,9 @@ export function handleListMessages({
       },
     );
 
-    // `visibleFilter` has already dropped every non-renderable role, so the
-    // only values reaching here are `user` and `assistant`; narrow the raw DB
-    // `string` to the wire union.
-    const role: "user" | "assistant" =
-      msg.role === "assistant" ? "assistant" : "user";
-
     return {
       id: msg.id,
-      role,
+      role: msg.role,
       content,
       createdAt: msg.createdAt,
       sentAt,

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

@@ -11,7 +11,6 @@ import { z } from "zod";
 import {
   checkpointKey,
   CK_ITEM_COUNT,
-  CK_LAST_ATTEMPT_AT,
   CK_LAST_GEN_AT,
   countActiveMemoryNodes,
   getCheckpointValue,
@@ -43,11 +42,10 @@ const starterItemSchema = z.object({
 
 type StarterItem = z.infer<typeof starterItemSchema>;
 
-export const CONVERSATION_STARTERS_STALE_TTL_MS = 4 * 60 * 60 * 1000;
+export const CONVERSATION_STARTERS_STALE_TTL_MS = 24 * 60 * 60 * 1000;
 
-/** Minimum interval between re-enqueue attempts (prevents tight retry loops
- *  when generation repeatedly fails or produces 0 valid starters). */
-const REFRESH_COOLDOWN_MS = 5 * 60 * 1000;
+/** Minimum interval between re-enqueue attempts triggered by invalid items. */
+const REFRESH_COOLDOWN_MS = 60_000;
 
 function hasActiveConversationStarterJob(
   db: ReturnType<typeof getDb>,
@@ -201,16 +199,12 @@ function handleListConversationStarters({
       Date.now() - lastGenAt >= CONVERSATION_STARTERS_STALE_TTL_MS;
     const checkpointAhead = lastCount != null && totalActive < lastCount;
     let hasActiveJob = hasActiveConversationStarterJob(db, scopeId);
-    const lastAttemptAt = parseCheckpointInt(
-      getCheckpointValue(checkpointKey(CK_LAST_ATTEMPT_AT, scopeId)),
-    );
     const withinCooldown =
-      lastAttemptAt != null && Date.now() - lastAttemptAt < REFRESH_COOLDOWN_MS;
+      lastGenAt != null && Date.now() - lastGenAt < REFRESH_COOLDOWN_MS;
     const shouldRefresh =
-      !withinCooldown &&
-      (staleByAge ||
-        checkpointAhead ||
-        (invalidItemCount > 0 && totalActive > 0));
+      staleByAge ||
+      checkpointAhead ||
+      (invalidItemCount > 0 && totalActive > 0 && !withinCooldown);
 
     if (shouldRefresh && !hasActiveJob && isMemoryEnabled()) {
       enqueueMemoryJob("generate_conversation_starters", { scopeId });

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

@@ -46,10 +46,7 @@ interface ImportPayload {
 
 // -- Helpers (ported from CLI) --
 
-function resolveTimestamps(
-  conv: ImportConversation,
-  messages: ImportMessage[],
-): {
+function resolveTimestamps(conv: ImportConversation): {
   convCreatedAt: number;
   convUpdatedAt: number;
   messageTimestamps: number[];
@@ -57,23 +54,13 @@ function resolveTimestamps(
   const now = Date.now();
   const convCreatedAt = conv.createdAt ?? now;
   const convUpdatedAt = conv.updatedAt ?? conv.createdAt ?? now;
-  const messageTimestamps = messages.map((msg, i) => {
+  const messageTimestamps = conv.messages.map((msg, i) => {
     if (msg.createdAt != null) return msg.createdAt;
     return convCreatedAt + i;
   });
   return { convCreatedAt, convUpdatedAt, messageTimestamps };
 }
 
-/**
- * The messages store is UI-facing (`ConversationMessage`), so only renderable
- * turns are persisted. Non-renderable roles (e.g. agent-context `system`
- * rows an export might carry) are dropped here rather than imported — the
- * import still succeeds with the displayable turns.
- */
-function isRenderableRole(role: string): role is "user" | "assistant" {
-  return role === "user" || role === "assistant";
-}
-
 // -- Handler --
 
 async function handleConversationsImport({ body }: RouteHandlerArgs) {
@@ -112,16 +99,12 @@ async function handleConversationsImport({ body }: RouteHandlerArgs) {
         }
       }
 
-      const messages = conv.messages.filter((msg) =>
-        isRenderableRole(msg.role),
-      );
-
       const { convCreatedAt, convUpdatedAt, messageTimestamps } =
-        resolveTimestamps(conv, messages);
+        resolveTimestamps(conv);
 
       const conversation = createConversation(conv.title);
 
-      for (const msg of messages) {
+      for (const msg of conv.messages) {
         const contentStr =
           typeof msg.content === "string"
             ? msg.content
@@ -161,8 +144,8 @@ async function handleConversationsImport({ body }: RouteHandlerArgs) {
       }
 
       // Index messages
-      for (let i = 0; i < dbMessages.length && i < messages.length; i++) {
-        const msg = messages[i];
+      for (let i = 0; i < dbMessages.length && i < conv.messages.length; i++) {
+        const msg = conv.messages[i];
         const contentStr =
           typeof msg.content === "string"
             ? msg.content
@@ -193,7 +176,7 @@ async function handleConversationsImport({ body }: RouteHandlerArgs) {
       }
 
       imported++;
-      totalMessages += messages.length;
+      totalMessages += conv.messages.length;
     } catch (err) {
       errors.push({
         index: idx,

package/src/runtime/routes/host-app-control-routes.ts

@@ -14,7 +14,7 @@
  */
 import { z } from "zod";
 
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import type {
   HostAppControlResultPayload,
   HostAppControlState,

package/src/runtime/routes/host-cu-routes.ts

@@ -6,7 +6,7 @@
  */
 import { z } from "zod";
 
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import {
   enforceSameActorOrThrow,

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

@@ -33,7 +33,6 @@ import { NotFoundError } from "./errors.js";
 import {
   getCachedIntro,
   readWorkspaceGreetings,
-  readWorkspaceIdentityIntro,
   setCachedIntro,
 } from "./identity-intro-cache.js";
 import type { RouteDefinition } from "./types.js";
@@ -456,30 +455,16 @@ function getIdentityIntro(): IdentityIntroResponse {
     return identityIntroResponse(FALLBACK_GREETINGS, "fallback");
   }
 
-  // 2. Cached LLM-generated greetings (populated by background refresh)
+  // 2. Cached LLM-generated greetings
   const cached = getCachedIntro();
   if (cached) {
     return identityIntroResponse(cached.greetings, "cache");
   }
 
-  // 3. Identity intro tagline from `## Identity Intro` in IDENTITY.md
-  //    (written during onboarding by BOOTSTRAP.md instructions)
-  const identityIntro = readWorkspaceIdentityIntro();
-  if (identityIntro) {
-    // Still trigger background generation so the next request gets
-    // LLM-generated greetings instead of the static tagline.
-    const refreshing = triggerEmptyStateGreetingGeneration();
-    return identityIntroResponse(
-      [identityIntro, ...FALLBACK_GREETINGS],
-      "workspace",
-      refreshing,
-    );
-  }
-
-  // 4. Trigger fresh generation without blocking the empty-state UI.
+  // 3. Trigger fresh generation without blocking the empty-state UI.
   const refreshing = triggerEmptyStateGreetingGeneration();
 
-  // 5. Generic fallback only when generation is unavailable.
+  // 4. Generic fallback only when generation is unavailable.
   return identityIntroResponse(FALLBACK_GREETINGS, "fallback", refreshing);
 }
 

package/src/runtime/routes/inbound-message-handler.ts

@@ -20,7 +20,7 @@ import {
   createApprovalConversationGenerator,
   createApprovalCopyGenerator,
 } from "../../daemon/approval-generators.js";
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import {
   canonicalizeTimeZone,
   resolveTurnTimezoneContext,

package/src/runtime/routes/memory-v3-routes.ts

@@ -21,26 +21,16 @@ import { join } from "node:path";
 import { z } from "zod";
 
 import { getPageIndex } from "../../memory/v2/page-index.js";
-import { loadCore } from "../../plugins/defaults/memory-v3-shadow/core.js";
-import {
-  computeV3Health,
-  renderV3Health,
-} from "../../plugins/defaults/memory-v3-shadow/health.js";
-import {
-  type LeafRef,
-  reconcileTree,
-} from "../../plugins/defaults/memory-v3-shadow/reconcile.js";
-import { invalidateLanes } from "../../plugins/defaults/memory-v3-shadow/shadow-plugin.js";
+import { loadCore } from "../../memory/v3/core.js";
+import { computeV3Health, renderV3Health } from "../../memory/v3/health.js";
+import { type LeafRef, reconcileTree } from "../../memory/v3/reconcile.js";
+import { invalidateLanes } from "../../memory/v3/shadow-plugin.js";
 import {
   coreSlugs,
   loadLeafTree,
   resolveDataDir,
-} from "../../plugins/defaults/memory-v3-shadow/tree.js";
-import type {
-  LeafPath,
-  LeafTree,
-  Slug,
-} from "../../plugins/defaults/memory-v3-shadow/types.js";
+} from "../../memory/v3/tree.js";
+import type { LeafPath, LeafTree, Slug } from "../../memory/v3/types.js";
 import { getLogger } from "../../util/logger.js";
 import { getWorkspaceDir } from "../../util/platform.js";
 import { ACTOR_PRINCIPALS, type RoutePolicy } from "../auth/route-policy.js";

package/src/runtime/routes/playground/helpers.ts

@@ -7,9 +7,9 @@
  */
 
 import type { Conversation } from "../../../daemon/conversation.js";
-import { findConversation } from "../../../daemon/conversation-registry.js";
 import {
   destroyActiveConversation,
+  findConversation,
   getOrCreateConversation,
 } from "../../../daemon/conversation-store.js";
 import {

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

@@ -18,8 +18,8 @@ import type { Conversation } from "../../daemon/conversation.js";
 import {
   findConversation,
   findConversationBySurfaceId,
-} from "../../daemon/conversation-registry.js";
-import { getOrCreateConversation } from "../../daemon/conversation-store.js";
+  getOrCreateConversation,
+} from "../../daemon/conversation-store.js";
 import { rawGet } from "../../memory/raw-query.js";
 
 /**
@@ -60,7 +60,6 @@ export async function resolveSurfaceConversation(
     `%"surfaceId":"${escaped}"%`,
   );
   if (!row) return undefined;
-  if (conversationId && conversationId !== row.conversation_id)
-    return undefined;
+  if (conversationId && conversationId !== row.conversation_id) return undefined;
   return await getOrCreateConversation(row.conversation_id);
 }

package/src/runtime/routes/work-items-routes.ts

@@ -8,8 +8,10 @@
 import { z } from "zod";
 
 import type { Conversation } from "../../daemon/conversation.js";
-import { findConversation } from "../../daemon/conversation-registry.js";
-import { getOrCreateConversation } from "../../daemon/conversation-store.js";
+import {
+  findConversation,
+  getOrCreateConversation,
+} from "../../daemon/conversation-store.js";
 import type { ServerMessage } from "../../daemon/message-protocol.js";
 import { getMessages } from "../../memory/conversation-crud.js";
 import { check, classifyRisk } from "../../permissions/checker.js";

package/src/runtime/services/conversation-serializer.ts

@@ -9,7 +9,7 @@
 
 import { parseChannelId } from "../../channels/types.js";
 import { getConfig } from "../../config/loader.js";
-import { findConversation } from "../../daemon/conversation-registry.js";
+import { findConversation } from "../../daemon/conversation-store.js";
 import { normalizeConversationType } from "../../daemon/message-types/shared.js";
 import {
   type AttentionState,

package/src/signals/cancel.ts

@@ -11,8 +11,10 @@ import { readFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { getIsContainerized } from "../config/env-registry.js";
-import { findConversation } from "../daemon/conversation-registry.js";
-import { touchConversation } from "../daemon/conversation-store.js";
+import {
+  findConversation,
+  touchConversation,
+} from "../daemon/conversation-store.js";
 import { getSubagentManager } from "../subagent/index.js";
 import { createAbortReason } from "../util/abort-reasons.js";
 import { getLogger } from "../util/logger.js";