@hermespilot/link 0.3.5 → 0.3.7

package/dist/{chunk-ZQO7TU7G.js → chunk-TZVQZFWU.js}

@@ -9,8 +9,21 @@ import { randomUUID as randomUUID7 } from "crypto";
 // src/database/link-database.ts
 import { mkdir } from "fs/promises";
 import { randomUUID } from "crypto";
-import { createRequire } from "module";
 import path from "path";
+
+// src/database/sqlite.ts
+import Database from "better-sqlite3";
+function openSqliteDatabase(filePath, options = {}) {
+  return new Database(filePath, {
+    ...options.readonly === void 0 ? {} : {
+      readonly: options.readonly,
+      fileMustExist: options.readonly
+    },
+    ...options.timeout === void 0 ? {} : { timeout: options.timeout }
+  });
+}
+
+// src/database/link-database.ts
 var MIGRATIONS = [
   {
     version: 1,
@@ -136,7 +149,6 @@ var MIGRATIONS = [
     `
   }
 ];
-var nodeRequire = createRequire(import.meta.url);
 async function migrateLinkDatabase(paths) {
   await mkdir(path.dirname(paths.databaseFile), { recursive: true, mode: 448 });
   const db = openDatabase(paths);
@@ -210,6 +222,92 @@ async function upsertConversationStats(paths, record) {
     db.close();
   }
 }
+async function listConversationStatsPage(paths, input) {
+  await migrateLinkDatabase(paths);
+  const rawLimit = Number.isFinite(input.limit) ? Math.trunc(input.limit) : 25;
+  const limit = Math.max(1, Math.min(100, rawLimit));
+  const db = openDatabase(paths);
+  try {
+    const conditions = ["status = ?"];
+    const params = ["active"];
+    if (input.cursor) {
+      conditions.push(`(
+        updated_at < ?
+        OR (updated_at = ? AND conversation_id < ?)
+      )`);
+      params.push(
+        input.cursor.updatedAt,
+        input.cursor.updatedAt,
+        input.cursor.conversationId
+      );
+    }
+    const rows = db.prepare(`
+      SELECT conversation_id, updated_at
+      FROM conversation_stats
+      WHERE ${conditions.join(" AND ")}
+      ORDER BY updated_at DESC, conversation_id DESC
+      LIMIT ?
+    `).all(...params, limit + 1);
+    const records = rows.slice(0, limit).map((row) => ({
+      conversationId: readString(row, "conversation_id") ?? "",
+      updatedAt: readString(row, "updated_at") ?? ""
+    })).filter((row) => row.conversationId && row.updatedAt);
+    return {
+      records,
+      hasMore: rows.length > limit
+    };
+  } finally {
+    db.close();
+  }
+}
+async function searchConversationStatsPage(paths, input) {
+  await migrateLinkDatabase(paths);
+  const rawLimit = Number.isFinite(input.limit) ? Math.trunc(input.limit) : 25;
+  const limit = Math.max(1, Math.min(100, rawLimit));
+  const query = input.query.trim();
+  if (!query) {
+    return listConversationStatsPage(paths, {
+      limit,
+      cursor: input.cursor
+    });
+  }
+  const db = openDatabase(paths);
+  try {
+    const conditions = ["status = ?", "LOWER(title) LIKE ? ESCAPE '\\'"];
+    const params = [
+      "active",
+      `%${escapeSqlLike(query.toLowerCase())}%`
+    ];
+    if (input.cursor) {
+      conditions.push(`(
+        updated_at < ?
+        OR (updated_at = ? AND conversation_id < ?)
+      )`);
+      params.push(
+        input.cursor.updatedAt,
+        input.cursor.updatedAt,
+        input.cursor.conversationId
+      );
+    }
+    const rows = db.prepare(`
+      SELECT conversation_id, updated_at
+      FROM conversation_stats
+      WHERE ${conditions.join(" AND ")}
+      ORDER BY updated_at DESC, conversation_id DESC
+      LIMIT ?
+    `).all(...params, limit + 1);
+    const records = rows.slice(0, limit).map((row) => ({
+      conversationId: readString(row, "conversation_id") ?? "",
+      updatedAt: readString(row, "updated_at") ?? ""
+    })).filter((row) => row.conversationId && row.updatedAt);
+    return {
+      records,
+      hasMore: rows.length > limit
+    };
+  } finally {
+    db.close();
+  }
+}
 async function replaceRunUsageFactsForConversation(paths, conversationId, records) {
   await migrateLinkDatabase(paths);
   const db = openDatabase(paths);
@@ -618,8 +716,7 @@ async function deleteConversationStatsForProfile(paths, input) {
   }
 }
 function openDatabase(paths) {
-  const { DatabaseSync } = nodeRequire("node:sqlite");
-  const db = new DatabaseSync(paths.databaseFile, {
+  const db = openSqliteDatabase(paths.databaseFile, {
     timeout: 5e3
   });
   db.exec(`
@@ -826,6 +923,9 @@ function readString(row, key) {
   const value = row?.[key];
   return typeof value === "string" && value.trim() ? value : void 0;
 }
+function escapeSqlLike(value) {
+  return value.replace(/[\\%_]/gu, (match) => `\\${match}`);
+}
 function statisticsWhereClause(filter) {
   const profileUid = filter.profileUid?.trim();
   const profileName = filter.profileName?.trim();
@@ -3724,7 +3824,7 @@ import os2 from "os";
 import path5 from "path";
 
 // src/constants.ts
-var LINK_VERSION = "0.3.5";
+var LINK_VERSION = "0.3.7";
 var LINK_COMMAND = "hermeslink";
 var LINK_DEFAULT_PORT = 52379;
 var LINK_RUNTIME_DIR_NAME = ".hermeslink";
@@ -4859,6 +4959,9 @@ function toRecord3(value) {
 }
 
 // src/conversations/statistics.ts
+var ESTIMATED_CONTEXT_CHARS_PER_TOKEN = 4;
+var ESTIMATED_CONTEXT_BASE_OVERHEAD_TOKENS = 256;
+var ESTIMATED_CONTEXT_PER_MESSAGE_OVERHEAD_TOKENS = 8;
 function buildConversationStats(manifest, snapshot) {
   if (manifest.stats && manifest.status !== "active" && snapshot.messages.length === 0 && snapshot.runs.length === 0) {
     return manifest.stats;
@@ -4973,12 +5076,21 @@ function readUsage(payload) {
     return void 0;
   }
   const usage = toRecord4(payload.usage);
-  const inputTokens = readInteger(usage, "input_tokens") ?? readInteger(usage, "prompt_tokens") ?? readInteger(payload, "input_tokens") ?? readInteger(payload, "prompt_tokens");
-  const outputTokens = readInteger(usage, "output_tokens") ?? readInteger(usage, "completion_tokens") ?? readInteger(payload, "output_tokens") ?? readInteger(payload, "completion_tokens");
-  const totalTokens = readInteger(usage, "total_tokens") ?? readInteger(payload, "total_tokens") ?? (inputTokens ?? 0) + (outputTokens ?? 0);
-  const contextWindow = readInteger(usage, "context_window") ?? readInteger(usage, "context_max") ?? readInteger(payload, "context_window") ?? readInteger(payload, "context_max");
-  const explicitContextTokens = readInteger(usage, "context_tokens") ?? readInteger(usage, "context_used") ?? readInteger(usage, "current_context_tokens") ?? readInteger(usage, "last_prompt_tokens") ?? readInteger(payload, "context_tokens") ?? readInteger(payload, "context_used") ?? readInteger(payload, "current_context_tokens") ?? readInteger(payload, "last_prompt_tokens");
-  if (!inputTokens && !outputTokens && !totalTokens) {
+  const response = toRecord4(payload.response);
+  const responseUsage = toRecord4(response.usage);
+  const context = firstRecord(
+    payload.context,
+    usage.context,
+    response.context,
+    responseUsage.context
+  );
+  const inputTokens = readInteger(usage, "input_tokens") ?? readInteger(usage, "prompt_tokens") ?? readInteger(responseUsage, "input_tokens") ?? readInteger(responseUsage, "prompt_tokens") ?? readInteger(payload, "input_tokens") ?? readInteger(payload, "prompt_tokens");
+  const outputTokens = readInteger(usage, "output_tokens") ?? readInteger(usage, "completion_tokens") ?? readInteger(responseUsage, "output_tokens") ?? readInteger(responseUsage, "completion_tokens") ?? readInteger(payload, "output_tokens") ?? readInteger(payload, "completion_tokens");
+  const totalTokens = readInteger(usage, "total_tokens") ?? readInteger(responseUsage, "total_tokens") ?? readInteger(payload, "total_tokens") ?? (inputTokens ?? 0) + (outputTokens ?? 0);
+  const contextWindow = readInteger(context, "window_tokens") ?? readInteger(context, "windowTokens") ?? readInteger(context, "context_window") ?? readInteger(context, "context_max") ?? readInteger(context, "context_length") ?? readInteger(usage, "context_window") ?? readInteger(usage, "context_max") ?? readInteger(usage, "context_length") ?? readInteger(responseUsage, "context_window") ?? readInteger(responseUsage, "context_max") ?? readInteger(responseUsage, "context_length") ?? readInteger(response, "context_window") ?? readInteger(response, "context_max") ?? readInteger(response, "context_length") ?? readInteger(payload, "context_window") ?? readInteger(payload, "context_max") ?? readInteger(payload, "context_length");
+  const explicitContextTokens = readInteger(context, "used_tokens") ?? readInteger(context, "usedTokens") ?? readInteger(context, "context_tokens") ?? readInteger(context, "context_used") ?? readInteger(context, "current_context_tokens") ?? readInteger(context, "last_prompt_tokens") ?? readInteger(usage, "context_tokens") ?? readInteger(usage, "context_used") ?? readInteger(usage, "current_context_tokens") ?? readInteger(usage, "last_prompt_tokens") ?? readInteger(responseUsage, "context_tokens") ?? readInteger(responseUsage, "context_used") ?? readInteger(responseUsage, "current_context_tokens") ?? readInteger(responseUsage, "last_prompt_tokens") ?? readInteger(response, "context_tokens") ?? readInteger(response, "context_used") ?? readInteger(response, "current_context_tokens") ?? readInteger(response, "last_prompt_tokens") ?? readInteger(payload, "context_tokens") ?? readInteger(payload, "context_used") ?? readInteger(payload, "current_context_tokens") ?? readInteger(payload, "last_prompt_tokens");
+  const explicitUsagePercent = readInteger(context, "usage_percent") ?? readInteger(context, "context_percent") ?? readInteger(usage, "usage_percent") ?? readInteger(usage, "context_percent") ?? readInteger(responseUsage, "usage_percent") ?? readInteger(responseUsage, "context_percent") ?? readInteger(response, "usage_percent") ?? readInteger(response, "context_percent") ?? readInteger(payload, "usage_percent") ?? readInteger(payload, "context_percent");
+  if (!inputTokens && !outputTokens && !totalTokens && explicitContextTokens === void 0) {
     return void 0;
   }
   return {
@@ -4987,14 +5099,44 @@ function readUsage(payload) {
     total_tokens: totalTokens,
     ...explicitContextTokens !== void 0 ? { context_tokens: explicitContextTokens } : {},
     ...contextWindow !== void 0 ? { context_window: contextWindow } : {},
+    ...explicitContextTokens !== void 0 ? { context_source: "explicit" } : {},
     ...explicitContextTokens !== void 0 && contextWindow ? {
-      usage_percent: Math.min(
+      usage_percent: explicitUsagePercent !== void 0 ? Math.min(100, explicitUsagePercent) : Math.min(
         100,
         Math.round(explicitContextTokens / contextWindow * 100)
       )
     } : {}
   };
 }
+function estimateContextUsage(input) {
+  const currentInput = input.currentInput.trim();
+  const instructions = input.instructions?.trim() ?? "";
+  const messageCount = input.conversationHistory.length + (currentInput ? 1 : 0) + (instructions ? 1 : 0);
+  if (messageCount === 0) {
+    return void 0;
+  }
+  const serializedRequest = JSON.stringify({
+    instructions: instructions || void 0,
+    conversation_history: input.conversationHistory,
+    input: currentInput || void 0
+  });
+  const estimatedTokens = Math.ceil(serializedRequest.length / ESTIMATED_CONTEXT_CHARS_PER_TOKEN) + ESTIMATED_CONTEXT_BASE_OVERHEAD_TOKENS + messageCount * ESTIMATED_CONTEXT_PER_MESSAGE_OVERHEAD_TOKENS;
+  const contextTokens = input.contextWindow ? Math.min(input.contextWindow, estimatedTokens) : estimatedTokens;
+  return {
+    input_tokens: 0,
+    output_tokens: 0,
+    total_tokens: 0,
+    context_tokens: contextTokens,
+    ...input.contextWindow !== void 0 ? { context_window: input.contextWindow } : {},
+    ...input.contextWindow ? {
+      usage_percent: Math.min(
+        100,
+        Math.round(contextTokens / input.contextWindow * 100)
+      )
+    } : {},
+    context_source: "estimated"
+  };
+}
 function isAgentRun(run) {
   return run.kind !== "command";
 }
@@ -5015,6 +5157,14 @@ function readInteger(payload, key) {
 function toRecord4(value) {
   return typeof value === "object" && value !== null ? value : {};
 }
+function firstRecord(...values) {
+  for (const value of values) {
+    if (typeof value === "object" && value !== null) {
+      return value;
+    }
+  }
+  return {};
+}
 
 // src/conversations/blob-store.ts
 import { randomUUID as randomUUID3 } from "crypto";
@@ -5730,7 +5880,7 @@ async function buildConversationRuntimeMetadata(paths, manifest, snapshot) {
   };
   const contextWindow = current.contextWindow ?? usage.context_window ?? usageRun?.context_window;
   const contextTokens = usage.context_tokens;
-  const contextSource = contextTokens === void 0 ? "unknown" : "explicit";
+  const contextSource = contextTokens === void 0 ? "unknown" : usage.context_source ?? "explicit";
   const provider = current.provider ?? usageRun?.provider;
   const reasoningEffort = current.reasoningEffort;
   return {
@@ -6324,12 +6474,12 @@ var ConversationCommandHandlers = class {
 };
 function formatContextUsageLines(runtime) {
   const windowTokens = runtime.context.window_tokens ?? runtime.context.context_window;
-  if (runtime.context.source === "explicit") {
+  if (runtime.context.source === "explicit" || runtime.context.source === "estimated") {
     const usedTokens = runtime.context.used_tokens ?? runtime.context.input_tokens;
     const percent = runtime.context.usage_percent ?? (windowTokens && windowTokens > 0 ? Math.min(100, Math.round(usedTokens / windowTokens * 100)) : void 0);
     return [
       `\u4E0A\u4E0B\u6587\uFF1A${usedTokens}${windowTokens ? ` / ${windowTokens}` : ""}${percent === void 0 ? "" : `\uFF08${percent}%\uFF09`}`,
-      "\u6765\u6E90\uFF1A\u6A21\u578B\u8FD4\u56DE"
+      runtime.context.source === "estimated" ? "\u6765\u6E90\uFF1A\u672C\u5730\u4F30\u7B97" : "\u6765\u6E90\uFF1A\u6A21\u578B\u8FD4\u56DE"
     ];
   }
   return [
@@ -6703,9 +6853,7 @@ function isUsableLanIpv4(value) {
 
 // src/hermes/session-title.ts
 import { stat as stat6 } from "fs/promises";
-import { createRequire as createRequire2 } from "module";
 import path11 from "path";
-var nodeRequire2 = createRequire2(import.meta.url);
 async function readHermesSessionTitle(sessionId, paths, profileName) {
   const trimmedSessionId = sessionId.trim();
   if (!trimmedSessionId) {
@@ -6751,11 +6899,8 @@ async function readHermesCompressionTip(sessionId, paths, profileName) {
 function readSessionTitleFromStateDb(dbPath, sessionId) {
   let db = null;
   try {
-    const { DatabaseSync } = nodeRequire2(
-      "node:sqlite"
-    );
-    db = new DatabaseSync(dbPath, {
-      readOnly: true,
+    db = openSqliteDatabase(dbPath, {
+      readonly: true,
       timeout: 1e3
     });
     const row = db.prepare("SELECT title FROM sessions WHERE id = ? LIMIT 1").get(sessionId);
@@ -6770,11 +6915,8 @@ function readSessionTitleFromStateDb(dbPath, sessionId) {
 function readCompressionTipFromStateDb(dbPath, sessionId) {
   let db = null;
   try {
-    const { DatabaseSync } = nodeRequire2(
-      "node:sqlite"
-    );
-    db = new DatabaseSync(dbPath, {
-      readOnly: true,
+    db = openSqliteDatabase(dbPath, {
+      readonly: true,
       timeout: 1e3
     });
     let current = sessionId;
@@ -8234,12 +8376,63 @@ function toRecord6(value) {
 }
 
 // src/conversations/conversation-queries.ts
+var DEFAULT_CONVERSATION_LIST_PAGE_SIZE = 25;
+var MAX_CONVERSATION_LIST_PAGE_SIZE = 100;
 var ConversationQueryCoordinator = class {
   constructor(deps) {
     this.deps = deps;
   }
   deps;
   async listConversations() {
+    return this.listConversationsFromStore();
+  }
+  async listConversationPage(options = {}) {
+    const limit = normalizeConversationListPageLimit(options.limit);
+    const cursor = decodeConversationListCursor(options.cursor);
+    const indexedPage = await listConversationStatsPage(this.deps.paths, {
+      limit,
+      cursor
+    });
+    if (indexedPage.records.length === 0) {
+      return this.listConversationPageFromStore({ limit, cursor });
+    }
+    const summaries = await this.summarizeIndexedConversations(
+      indexedPage.records
+    );
+    return {
+      conversations: summaries,
+      page: {
+        limit,
+        has_more: indexedPage.hasMore,
+        next_cursor: indexedPage.hasMore && indexedPage.records.length > 0 ? encodeConversationListCursor(indexedPage.records.at(-1)) : null
+      }
+    };
+  }
+  async searchConversationPage(options = {}) {
+    const query = normalizeConversationSearchQuery(options.query);
+    if (!query) {
+      return this.listConversationPage(options);
+    }
+    const limit = normalizeConversationListPageLimit(options.limit);
+    const cursor = decodeConversationListCursor(options.cursor);
+    const indexedPage = await searchConversationStatsPage(this.deps.paths, {
+      limit,
+      cursor,
+      query
+    });
+    const summaries = await this.summarizeIndexedConversations(
+      indexedPage.records
+    );
+    return {
+      conversations: summaries,
+      page: {
+        limit,
+        has_more: indexedPage.hasMore,
+        next_cursor: indexedPage.hasMore && indexedPage.records.length > 0 ? encodeConversationListCursor(indexedPage.records.at(-1)) : null
+      }
+    };
+  }
+  async listConversationsFromStore() {
     const summaries = [];
     for (const conversationId of await this.deps.store.listConversationIds()) {
       const manifest = await this.deps.store.readManifest(conversationId).catch(
@@ -8255,9 +8448,41 @@ var ConversationQueryCoordinator = class {
       summaries.push(await this.summarizeConversation(refreshed, snapshot));
     }
     return summaries.sort(
-      (left, right) => Date.parse(right.updated_at) - Date.parse(left.updated_at)
+      (left, right) => Date.parse(right.updated_at) - Date.parse(left.updated_at) || right.id.localeCompare(left.id)
     );
   }
+  async listConversationPageFromStore(input) {
+    const all = await this.listConversationsFromStore();
+    const startIndex = input.cursor ? all.findIndex((summary) => isAfterConversationListCursor(summary, input.cursor)) : 0;
+    const safeStartIndex = startIndex < 0 ? all.length : startIndex;
+    const conversations = all.slice(safeStartIndex, safeStartIndex + input.limit);
+    const hasMore = safeStartIndex + input.limit < all.length;
+    return {
+      conversations,
+      page: {
+        limit: input.limit,
+        has_more: hasMore,
+        next_cursor: hasMore && conversations.length > 0 ? encodeConversationListCursorFromSummary(conversations.at(-1)) : null
+      }
+    };
+  }
+  async summarizeIndexedConversations(records) {
+    const summaries = [];
+    for (const record of records) {
+      const manifest = await this.deps.store.readManifest(record.conversationId).catch(
+        () => null
+      );
+      if (!manifest || manifest.status !== "active") {
+        continue;
+      }
+      const snapshot = await this.deps.store.readSnapshot(record.conversationId).catch(
+        () => emptySnapshot2()
+      );
+      const refreshed = await this.deps.metadata.refreshTitleFromHermes(manifest, { snapshot }).catch(() => manifest);
+      summaries.push(await this.summarizeConversation(refreshed, snapshot));
+    }
+    return summaries;
+  }
   async getMessages(conversationId, options = {}) {
     const manifest = await this.deps.store.readActiveManifest(conversationId);
     const snapshot = await this.deps.store.readSnapshot(conversationId);
@@ -8344,6 +8569,61 @@ var ConversationQueryCoordinator = class {
     });
   }
 };
+function normalizeConversationListPageLimit(value) {
+  if (value === void 0 || !Number.isFinite(value)) {
+    return DEFAULT_CONVERSATION_LIST_PAGE_SIZE;
+  }
+  return Math.max(
+    1,
+    Math.min(MAX_CONVERSATION_LIST_PAGE_SIZE, Math.floor(value))
+  );
+}
+function encodeConversationListCursor(record) {
+  return Buffer.from(
+    JSON.stringify({
+      updated_at: record.updatedAt,
+      conversation_id: record.conversationId
+    }),
+    "utf8"
+  ).toString("base64url");
+}
+function encodeConversationListCursorFromSummary(summary) {
+  return encodeConversationListCursor({
+    conversationId: summary.id,
+    updatedAt: summary.updated_at
+  });
+}
+function decodeConversationListCursor(value) {
+  if (!value) {
+    return null;
+  }
+  try {
+    const decoded = JSON.parse(
+      Buffer.from(value, "base64url").toString("utf8")
+    );
+    const updatedAt = readNonEmptyString(decoded.updated_at);
+    const conversationId = readNonEmptyString(decoded.conversation_id);
+    if (!updatedAt || !conversationId) {
+      throw new Error("invalid cursor");
+    }
+    return { updatedAt, conversationId };
+  } catch {
+    throw new LinkHttpError(
+      400,
+      "conversation_cursor_invalid",
+      "Conversation list cursor is invalid"
+    );
+  }
+}
+function readNonEmptyString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function normalizeConversationSearchQuery(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function isAfterConversationListCursor(summary, cursor) {
+  return summary.updated_at < cursor.updatedAt || summary.updated_at === cursor.updatedAt && summary.id < cursor.conversationId;
+}
 function hydrateAgentEventBlocks(blocks, agentEvents) {
   if (!blocks?.length || agentEvents.length === 0) {
     return blocks;
@@ -8518,61 +8798,393 @@ function isNodeError8(error, code) {
 
 // src/conversations/hermes-session-sync.ts
 import { randomUUID as randomUUID6 } from "crypto";
-import { readdir as readdir5, readFile as readFile8, stat as stat7 } from "fs/promises";
-import { createRequire as createRequire3 } from "module";
+import { readdir as readdir6, readFile as readFile9, stat as stat8 } from "fs/promises";
 import os4 from "os";
+import path14 from "path";
+
+// src/conversations/delivery-import.ts
+import { lstat, readFile as readFile8, readdir as readdir5, stat as stat7 } from "fs/promises";
 import path13 from "path";
-var nodeRequire3 = createRequire3(import.meta.url);
-var PROFILE_NAME_PATTERN3 = /^[a-zA-Z0-9._-]{1,64}$/u;
-var DEFAULT_PROFILE_NAME = "default";
-var MAX_IMPORTABLE_SESSIONS = 100;
-var HIDDEN_SESSION_SOURCES = /* @__PURE__ */ new Set(["tool"]);
-var HERMES_IMPORT_PROJECTION_VERSION = "turn_blocks_v2";
-var MESSAGE_COLUMNS = [
-  "id",
-  "session_id",
-  "role",
-  "content",
-  "tool_call_id",
-  "tool_calls",
-  "tool_name",
-  "timestamp",
-  "token_count",
-  "finish_reason",
-  "reasoning",
-  "reasoning_content",
-  "reasoning_details",
-  "codex_reasoning_items"
-];
-async function syncHermesSessionsIntoConversations(paths, logger, options = {}) {
-  const maxImports = options.maxImports ?? MAX_IMPORTABLE_SESSIONS;
-  const store = new ConversationStore(paths);
-  const knownHermesSessions = await readKnownHermesSessions(store);
-  const profileNames = await discoverHermesProfileNames();
-  const result = {
-    scanned_profiles: profileNames.length,
-    scanned_sessions: 0,
-    eligible_sessions: 0,
-    imported_count: 0,
-    reprojected_count: 0,
-    skipped_existing: 0,
-    skipped_hidden: 0,
-    skipped_deleted: 0,
-    skipped_over_limit: 0,
-    errors: []
+var MAX_IMPORTED_BLOB_BYTES = 100 * 1024 * 1024;
+var MAX_MEDIA_IMPORT_FAILURES = 20;
+var MAX_DELIVERY_FILES = 50;
+var DELIVERY_STAGING_SEGMENT = "delivery-staging";
+var SUPPORTED_DELIVERY_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".webp",
+  ".heic",
+  ".pdf",
+  ".txt",
+  ".log",
+  ".md",
+  ".markdown",
+  ".json",
+  ".jsonl",
+  ".yaml",
+  ".yml",
+  ".toml",
+  ".ini",
+  ".xml",
+  ".html",
+  ".css",
+  ".js",
+  ".ts",
+  ".jsx",
+  ".tsx",
+  ".dart",
+  ".py",
+  ".java",
+  ".kt",
+  ".swift",
+  ".go",
+  ".rs",
+  ".rb",
+  ".php",
+  ".c",
+  ".cc",
+  ".cpp",
+  ".h",
+  ".hpp",
+  ".cs",
+  ".sql",
+  ".csv",
+  ".tsv",
+  ".doc",
+  ".docx",
+  ".xls",
+  ".xlsx",
+  ".ppt",
+  ".pptx",
+  ".zip",
+  ".rar",
+  ".7z",
+  ".tar",
+  ".gz",
+  ".mp4",
+  ".mov",
+  ".avi",
+  ".mkv",
+  ".webm",
+  ".ogg",
+  ".opus",
+  ".mp3",
+  ".wav",
+  ".m4a"
+]);
+function resolveDeliveryStagingTarget(paths, stagingDir) {
+  const resolvedDir = path13.resolve(stagingDir);
+  const relative = path13.relative(path13.resolve(paths.conversationsDir), resolvedDir);
+  if (!relative || relative.startsWith("..") || path13.isAbsolute(relative)) {
+    throw new LinkHttpError(
+      400,
+      "delivery_staging_invalid",
+      "delivery staging directory must be inside Hermes Link conversations"
+    );
+  }
+  const segments = relative.split(path13.sep);
+  if (segments.length !== 3 || segments[1] !== DELIVERY_STAGING_SEGMENT || !segments[0] || !segments[2]) {
+    throw new LinkHttpError(
+      400,
+      "delivery_staging_invalid",
+      "delivery staging directory is invalid"
+    );
+  }
+  return {
+    conversationId: segments[0],
+    runId: segments[2],
+    stagingDir: resolvedDir
   };
-  const candidates = [];
-  for (const profileName of profileNames) {
-    const profileDir = resolveHermesProfileDir(profileName);
-    const dbPath = path13.join(profileDir, "state.db");
-    const sessions = await listProfileSessions(dbPath).catch((error) => {
-      result.errors.push({
-        profile: profileName,
-        message: error instanceof Error ? error.message : String(error)
-      });
-      return [];
-    });
-    result.scanned_sessions += sessions.length;
+}
+async function collectStagedDeliveryReferences(stagingDir) {
+  const directoryStat = await lstat(stagingDir).catch((error) => {
+    if (isNodeError9(error, "ENOENT")) {
+      throw new LinkHttpError(
+        404,
+        "delivery_staging_not_found",
+        "delivery staging directory was not found"
+      );
+    }
+    throw error;
+  });
+  if (!directoryStat.isDirectory()) {
+    throw new LinkHttpError(
+      400,
+      "delivery_staging_not_directory",
+      "delivery staging path is not a directory"
+    );
+  }
+  const entries = await readdir5(stagingDir, { withFileTypes: true });
+  return entries.filter((entry) => entry.isFile() && !entry.name.startsWith(".")).filter((entry) => isSupportedDeliveryFilename(entry.name)).sort(
+    (left, right) => left.name.localeCompare(right.name, "en", { numeric: true })
+  ).slice(0, MAX_DELIVERY_FILES).map((entry) => {
+    const sourcePath = path13.join(stagingDir, entry.name);
+    const mime = inferMimeType(sourcePath);
+    return {
+      path: sourcePath,
+      kind: mediaKindForMime(mime),
+      mime
+    };
+  });
+}
+async function importMediaReferencesForMessage(deps, input) {
+  const references = input.references.slice(0, input.maxReferences ?? MAX_DELIVERY_FILES);
+  if (references.length === 0) {
+    return emptyImportResult(input);
+  }
+  const snapshot = await deps.readSnapshot(input.conversationId);
+  const assistant = snapshot.messages.find(
+    (message) => message.id === input.messageId
+  );
+  if (!assistant) {
+    return emptyImportResult(input);
+  }
+  const importedSourceKeys = readImportedMediaSourceKeys(assistant);
+  const failedSourceKeys = readFailedMediaSourceKeys(assistant);
+  const failureRecordsByKey = new Map(
+    readMediaImportFailures(assistant).map((failure) => [failure.key, failure])
+  );
+  const importedParts = [];
+  const newFailures = [];
+  let skippedCount = 0;
+  for (const reference of references) {
+    let sourceKey;
+    try {
+      sourceKey = mediaSourceKey(reference.path);
+      if (importedSourceKeys.has(sourceKey) || failedSourceKeys.has(sourceKey)) {
+        skippedCount += 1;
+        continue;
+      }
+      const blob = await writeBlobFromFile(deps, input.conversationId, reference);
+      const part = {
+        type: reference.kind ?? mediaKindForMime(blob.mime),
+        blob: blob.id,
+        mime: blob.mime,
+        size: blob.size,
+        filename: blob.filename,
+        url: `/api/v1/conversations/${encodeURIComponent(input.conversationId)}/blobs/${encodeURIComponent(blob.id)}`
+      };
+      assistant.parts.push(part);
+      assistant.attachments.push({
+        blob_id: blob.id,
+        mime: blob.mime,
+        size: blob.size,
+        filename: blob.filename,
+        source: "hermes_output"
+      });
+      importedSourceKeys.add(sourceKey);
+      importedParts.push(part);
+    } catch (error) {
+      if (sourceKey && !failedSourceKeys.has(sourceKey)) {
+        const failure = describeMediaImportFailure(reference, sourceKey, error);
+        failedSourceKeys.add(sourceKey);
+        failureRecordsByKey.set(sourceKey, failure);
+        newFailures.push(failure);
+      }
+      void deps.logger.warn("conversation_media_import_failed", {
+        conversation_id: input.conversationId,
+        run_id: input.runId,
+        message_id: input.messageId,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  if (importedParts.length === 0 && newFailures.length === 0) {
+    return {
+      ...emptyImportResult(input),
+      discovered_count: references.length,
+      skipped_count: skippedCount
+    };
+  }
+  assistant.hermes = {
+    ...toRecord7(assistant.hermes),
+    imported_media_source_keys: [...importedSourceKeys],
+    media_import_failed_source_keys: [...failedSourceKeys],
+    media_import_failures: [...failureRecordsByKey.values()].slice(
+      -MAX_MEDIA_IMPORT_FAILURES
+    )
+  };
+  assistant.updated_at = (/* @__PURE__ */ new Date()).toISOString();
+  await deps.writeSnapshot(input.conversationId, snapshot);
+  let lastEventSeq;
+  if (importedParts.length > 0) {
+    const event = await deps.appendEvent(input.conversationId, {
+      type: "message.parts.created",
+      message_id: input.messageId,
+      run_id: input.runId,
+      payload: { parts: importedParts }
+    });
+    lastEventSeq = event.seq;
+  }
+  return {
+    conversation_id: input.conversationId,
+    run_id: input.runId,
+    message_id: input.messageId,
+    discovered_count: references.length,
+    imported_count: importedParts.length,
+    skipped_count: skippedCount,
+    failed_count: newFailures.length,
+    parts: importedParts,
+    ...lastEventSeq ? { last_event_seq: lastEventSeq } : {}
+  };
+}
+function readMediaImportFailures(message) {
+  const hermes = toRecord7(message.hermes);
+  const failures = hermes.media_import_failures;
+  if (!Array.isArray(failures)) {
+    return [];
+  }
+  return failures.flatMap((item) => {
+    const record = toRecord7(item);
+    const key = readString8(record, "key");
+    const filename = readString8(record, "filename");
+    const reason = readString8(record, "reason");
+    if (!key || !filename || !reason) {
+      return [];
+    }
+    return [
+      {
+        key,
+        filename,
+        reason,
+        ...readString8(record, "code") ? { code: readString8(record, "code") } : {}
+      }
+    ];
+  });
+}
+function readFailedMediaSourceKeys(message) {
+  const hermes = toRecord7(message.hermes);
+  const keys = hermes.media_import_failed_source_keys;
+  if (!Array.isArray(keys)) {
+    return /* @__PURE__ */ new Set();
+  }
+  return new Set(
+    keys.filter(
+      (key) => typeof key === "string" && key.length > 0
+    )
+  );
+}
+function emptyImportResult(input) {
+  return {
+    conversation_id: input.conversationId,
+    run_id: input.runId,
+    message_id: input.messageId,
+    discovered_count: 0,
+    imported_count: 0,
+    skipped_count: 0,
+    failed_count: 0,
+    parts: []
+  };
+}
+async function writeBlobFromFile(deps, conversationId, source) {
+  const sourcePath = resolveMediaSourcePath(source.path);
+  const fileStat = await stat7(sourcePath).catch((error) => {
+    if (isNodeError9(error, "ENOENT")) {
+      throw new LinkHttpError(
+        404,
+        "media_source_not_found",
+        "Hermes output file was not found"
+      );
+    }
+    throw error;
+  });
+  if (!fileStat.isFile()) {
+    throw new LinkHttpError(
+      400,
+      "media_source_not_file",
+      "Hermes output media source is not a file"
+    );
+  }
+  if (fileStat.size > MAX_IMPORTED_BLOB_BYTES) {
+    throw new LinkHttpError(
+      413,
+      "media_source_too_large",
+      "Hermes output media source is too large"
+    );
+  }
+  return deps.writeBlob(conversationId, {
+    bytes: await readFile8(sourcePath),
+    filename: path13.basename(sourcePath),
+    mime: source.mime ?? inferMimeType(sourcePath)
+  });
+}
+function describeMediaImportFailure(reference, sourceKey, error) {
+  return {
+    key: sourceKey,
+    filename: sanitizeFilename(reference.path, "attachment"),
+    reason: error instanceof Error ? error.message : String(error),
+    ...isNodeError9(error) && error.code ? { code: error.code } : {}
+  };
+}
+function isSupportedDeliveryFilename(filename) {
+  return SUPPORTED_DELIVERY_EXTENSIONS.has(path13.extname(filename).toLowerCase());
+}
+function readString8(payload, key) {
+  const value = payload[key];
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function toRecord7(value) {
+  return typeof value === "object" && value !== null ? value : {};
+}
+function isNodeError9(error, code) {
+  return typeof error === "object" && error !== null && "code" in error && (code === void 0 || error.code === code);
+}
+
+// src/conversations/hermes-session-sync.ts
+var PROFILE_NAME_PATTERN3 = /^[a-zA-Z0-9._-]{1,64}$/u;
+var DEFAULT_PROFILE_NAME = "default";
+var MAX_IMPORTABLE_SESSIONS = 100;
+var HIDDEN_SESSION_SOURCES = /* @__PURE__ */ new Set(["tool"]);
+var HERMES_IMPORT_PROJECTION_VERSION = "turn_blocks_v3";
+var IMPORTED_MEDIA_PLACEHOLDER_RUN_ID = "imported_from_hermes";
+var MAX_IMPORTED_HERMES_MEDIA_BYTES = 100 * 1024 * 1024;
+var MESSAGE_COLUMNS = [
+  "id",
+  "session_id",
+  "role",
+  "content",
+  "tool_call_id",
+  "tool_calls",
+  "tool_name",
+  "timestamp",
+  "token_count",
+  "finish_reason",
+  "reasoning",
+  "reasoning_content",
+  "reasoning_details",
+  "codex_reasoning_items"
+];
+async function syncHermesSessionsIntoConversations(paths, logger, options = {}) {
+  const maxImports = options.maxImports ?? MAX_IMPORTABLE_SESSIONS;
+  const store = new ConversationStore(paths);
+  const knownHermesSessions = await readKnownHermesSessions(store);
+  const profileNames = await discoverHermesProfileNames();
+  const result = {
+    scanned_profiles: profileNames.length,
+    scanned_sessions: 0,
+    eligible_sessions: 0,
+    imported_count: 0,
+    reprojected_count: 0,
+    skipped_existing: 0,
+    skipped_hidden: 0,
+    skipped_deleted: 0,
+    skipped_over_limit: 0,
+    errors: []
+  };
+  const candidates = [];
+  for (const profileName of profileNames) {
+    const profileDir = resolveHermesProfileDir(profileName);
+    const dbPath = path14.join(profileDir, "state.db");
+    const sessions = await listProfileSessions(dbPath).catch((error) => {
+      result.errors.push({
+        profile: profileName,
+        message: error instanceof Error ? error.message : String(error)
+      });
+      return [];
+    });
+    result.scanned_sessions += sessions.length;
     for (const session of sessions) {
       if (isDeletedSession(session)) {
         result.skipped_deleted += 1;
@@ -8599,6 +9211,7 @@ async function syncHermesSessionsIntoConversations(paths, logger, options = {})
       const reprojected = await reprojectExistingHermesConversation({
         paths,
         store,
+        logger,
         candidate,
         conversationIds: knownHermesSessions.conversationIdsBySessionId.get(
           candidate.session.id
@@ -8618,6 +9231,7 @@ async function syncHermesSessionsIntoConversations(paths, logger, options = {})
     const imported = await importHermesSession({
       paths,
       store,
+      logger,
       candidate,
       existingHermesSessionIds: knownHermesSessions.ids
     }).catch((error) => {
@@ -8639,7 +9253,7 @@ async function syncHermesSessionsIntoConversations(paths, logger, options = {})
   return result;
 }
 async function importHermesSession(input) {
-  const { paths, store, candidate, existingHermesSessionIds } = input;
+  const { paths, store, logger, candidate, existingHermesSessionIds } = input;
   const profile = await resolveConversationProfileTarget(
     paths,
     candidate.profileName
@@ -8662,7 +9276,7 @@ async function importHermesSession(input) {
     }),
     runs: []
   };
-  const title = readString8(candidate.session, "title") ?? firstUserText(snapshot);
+  const title = readString9(candidate.session, "title") ?? firstUserText(snapshot);
   const manifest = {
     id: conversationId,
     schema_version: 1,
@@ -8680,6 +9294,13 @@ async function importHermesSession(input) {
     last_event_seq: 0
   };
   await store.createConversation(manifest, snapshot);
+  await hydrateImportedConversationMedia({
+    paths,
+    store,
+    logger,
+    conversationId
+  });
+  const hydratedSnapshot = await store.readSnapshot(conversationId);
   await store.appendEvent(conversationId, {
     type: "conversation.created",
     payload: {
@@ -8693,7 +9314,7 @@ async function importHermesSession(input) {
       }
     }
   });
-  for (const message of snapshot.messages) {
+  for (const message of hydratedSnapshot.messages) {
     await store.appendEvent(conversationId, {
       type: "message.created",
       message_id: message.id,
@@ -8703,7 +9324,7 @@ async function importHermesSession(input) {
   }
   const stats = buildConversationStats(
     await store.readManifest(conversationId),
-    snapshot
+    hydratedSnapshot
   );
   await store.writeManifest({
     ...await store.readManifest(conversationId),
@@ -8749,8 +9370,15 @@ async function reprojectExistingHermesConversation(input) {
         ...snapshot.messages.slice(prefix.endIndex)
       ]
     };
-    const stats = buildConversationStats(manifest, nextSnapshot);
     await input.store.writeSnapshot(conversationId, nextSnapshot);
+    await hydrateImportedConversationMedia({
+      paths: input.paths,
+      store: input.store,
+      logger: input.logger,
+      conversationId
+    });
+    const hydratedSnapshot = await input.store.readSnapshot(conversationId);
+    const stats = buildConversationStats(manifest, hydratedSnapshot);
     await input.store.writeManifest({ ...manifest, stats });
     await upsertConversationStats(
       input.paths,
@@ -8765,6 +9393,7 @@ function collectImportedHermesPrefix(snapshot) {
   const seen = /* @__PURE__ */ new Set();
   let needsProjectionVersion = false;
   let hasToolMetadata = false;
+  let hasMediaDeliveryMarkup = false;
   let endIndex = 0;
   for (; endIndex < snapshot.messages.length; endIndex += 1) {
     const message = snapshot.messages[endIndex];
@@ -8782,6 +9411,9 @@ function collectImportedHermesPrefix(snapshot) {
       if (hasHermesToolMetadata(row)) {
         hasToolMetadata = true;
       }
+      if (collectMediaTags(normalizeContent(row.content)).length > 0) {
+        hasMediaDeliveryMarkup = true;
+      }
     }
     for (const event of message.agent_events ?? []) {
       for (const row of readHermesRowsFromAgentEvent(event)) {
@@ -8789,6 +9421,9 @@ function collectImportedHermesPrefix(snapshot) {
         if (hasHermesToolMetadata(row)) {
           hasToolMetadata = true;
         }
+        if (collectMediaTags(normalizeContent(row.content)).length > 0) {
+          hasMediaDeliveryMarkup = true;
+        }
       }
     }
   }
@@ -8798,7 +9433,7 @@ function collectImportedHermesPrefix(snapshot) {
   return {
     endIndex,
     messages: rows,
-    needsUpgrade: needsProjectionVersion && hasToolMetadata
+    needsUpgrade: needsProjectionVersion && (hasToolMetadata || hasMediaDeliveryMarkup)
   };
 }
 function isHermesImportedMessage(message) {
@@ -8808,13 +9443,13 @@ function readHermesRowsFromAgentEvent(event) {
   if (event.raw?.format !== "hermes-message" && event.raw?.format !== "hermes-message-group") {
     return [];
   }
-  const payload = toRecord7(event.raw.payload);
-  const message = toRecord7(payload.message);
-  if (normalizeMessageRole(readString8(message, "role") ?? void 0) === "tool") {
+  const payload = toRecord8(event.raw.payload);
+  const message = toRecord8(payload.message);
+  if (normalizeMessageRole(readString9(message, "role") ?? void 0) === "tool") {
     return [message];
   }
   return readHermesRawMessageRows(event.raw).filter(
-    (row) => Boolean(readString8(row, "role"))
+    (row) => Boolean(readString9(row, "role"))
   );
 }
 function appendHermesRowOnce(rows, seen, row) {
@@ -8832,7 +9467,7 @@ function hermesRowKey(row, fallbackIndex) {
   return `fallback:${fallbackIndex}:${row.role ?? ""}:${row.timestamp ?? ""}:${normalizeContent(row.content)}`;
 }
 function hasHermesToolMetadata(row) {
-  return normalizeMessageRole(row.role) === "tool" || readHermesToolCalls(row).length > 0 || Boolean(readString8(row, "tool_call_id")) || Boolean(readString8(row, "tool_name"));
+  return normalizeMessageRole(row.role) === "tool" || readHermesToolCalls(row).length > 0 || Boolean(readString9(row, "tool_call_id")) || Boolean(readString9(row, "tool_name"));
 }
 function toLinkMessages(input) {
   const linkMessages = [];
@@ -8950,8 +9585,8 @@ function toLinkMessages(input) {
   return linkMessages;
 }
 function consumePendingToolCall(input) {
-  const toolCallId = readString8(input.toolMessage, "tool_call_id");
-  const toolName = readString8(input.toolMessage, "tool_name");
+  const toolCallId = readString9(input.toolMessage, "tool_call_id");
+  const toolName = readString9(input.toolMessage, "tool_name");
   let pending = toolCallId ? input.toolCallsById.get(toolCallId) : void 0;
   if (!pending && toolName) {
     pending = input.pendingToolCalls.find(
@@ -9001,13 +9636,13 @@ function readHermesToolCalls(message) {
   );
 }
 function normalizeHermesToolCall(value) {
-  const record = toRecord7(value);
+  const record = toRecord8(value);
   if (Object.keys(record).length === 0) {
     return null;
   }
-  const fn = toRecord7(record.function);
-  const id = readString8(record, "id") ?? readString8(record, "call_id") ?? readString8(record, "tool_call_id") ?? readString8(fn, "id") ?? void 0;
-  const name = readString8(fn, "name") ?? readString8(record, "name") ?? readString8(record, "tool_name") ?? readString8(record, "tool") ?? "tool";
+  const fn = toRecord8(record.function);
+  const id = readString9(record, "id") ?? readString9(record, "call_id") ?? readString9(record, "tool_call_id") ?? readString9(fn, "id") ?? void 0;
+  const name = readString9(fn, "name") ?? readString9(record, "name") ?? readString9(record, "tool_name") ?? readString9(record, "tool") ?? "tool";
   const rawArguments = fn.arguments ?? record.arguments ?? record.args ?? record.input;
   return {
     ...id ? { id } : {},
@@ -9046,8 +9681,8 @@ function projectHermesToolCompletedEvent(input) {
   const createdAt = isoFromHermesTime(input.sourceMessage.timestamp) ?? new Date(Date.now() + input.index).toISOString();
   const output = normalizeContent(input.sourceMessage.content);
   const parsedOutput = parseJsonValue(output);
-  const toolCallId = readString8(input.sourceMessage, "tool_call_id") ?? input.pending?.toolCall.id;
-  const toolName = readString8(input.sourceMessage, "tool_name") ?? input.pending?.toolCall.name ?? "tool";
+  const toolCallId = readString9(input.sourceMessage, "tool_call_id") ?? input.pending?.toolCall.id;
+  const toolName = readString9(input.sourceMessage, "tool_name") ?? input.pending?.toolCall.name ?? "tool";
   return projectHermesAgentEvent({
     conversationId: input.conversationId,
     messageId: input.messageId,
@@ -9259,10 +9894,10 @@ function rememberKnownHermesConversation(map, sessionId, conversationId) {
 }
 async function discoverHermesProfileNames() {
   const names = /* @__PURE__ */ new Set([DEFAULT_PROFILE_NAME]);
-  const profilesDir = path13.join(os4.homedir(), ".hermes", "profiles");
-  const entries = await readdir5(profilesDir, { withFileTypes: true }).catch(
+  const profilesDir = path14.join(os4.homedir(), ".hermes", "profiles");
+  const entries = await readdir6(profilesDir, { withFileTypes: true }).catch(
     (error) => {
-      if (isNodeError9(error, "ENOENT")) {
+      if (isNodeError10(error, "ENOENT")) {
         return [];
       }
       throw error;
@@ -9289,11 +9924,8 @@ async function listProfileSessions(dbPath) {
   }
   let db = null;
   try {
-    const { DatabaseSync } = nodeRequire3(
-      "node:sqlite"
-    );
-    db = new DatabaseSync(dbPath, {
-      readOnly: true,
+    db = openSqliteDatabase(dbPath, {
+      readonly: true,
       timeout: 1e3
     });
     const sessionColumns = readTableColumns(db, "sessions");
@@ -9325,683 +9957,458 @@ function appendHermesRawMessage(message, row) {
     format: "hermes-message",
     payload: row
   } : {
-    format: "hermes-message-group",
-    payload: { messages: [...rows, row] }
-  };
-}
-function readHermesRawMessageRows(raw) {
-  if (!raw) {
-    return [];
-  }
-  if (raw.format === "hermes-message-group") {
-    const payload = toRecord7(raw.payload);
-    return Array.isArray(payload.messages) ? payload.messages.filter(
-      (item) => typeof item === "object" && item !== null
-    ) : [];
-  }
-  if (raw.format === "hermes-message") {
-    return typeof raw.payload === "object" && raw.payload !== null ? [raw.payload] : [];
-  }
-  return [];
-}
-function rememberHermesMessageId(message, row) {
-  if (row.id === void 0 || row.id === null) {
-    return;
-  }
-  const existing = Array.isArray(message.hermes?.message_ids) ? message.hermes.message_ids : message.hermes?.message_id === void 0 ? [] : [message.hermes.message_id];
-  const id = row.id;
-  message.hermes = {
-    ...message.hermes ?? {},
-    message_ids: existing.includes(id) ? existing : [...existing, id]
-  };
-}
-function joinImportedText(left, right) {
-  if (!left) {
-    return right;
-  }
-  if (!right) {
-    return left;
-  }
-  if (/\s$/u.test(left) || /^\s/u.test(right)) {
-    return `${left}${right}`;
-  }
-  return `${left}
-
-${right}`;
-}
-function projectCompressionTips(rows) {
-  const byId = /* @__PURE__ */ new Map();
-  const childrenByParent = /* @__PURE__ */ new Map();
-  for (const row of rows) {
-    const id = readString8(row, "id");
-    if (!id) {
-      continue;
-    }
-    byId.set(id, row);
-    const parentId = readString8(row, "parent_session_id");
-    if (parentId) {
-      const children = childrenByParent.get(parentId) ?? [];
-      children.push(row);
-      childrenByParent.set(parentId, children);
-    }
-  }
-  const projected = [];
-  for (const row of rows) {
-    const id = readString8(row, "id");
-    if (!id || readString8(row, "parent_session_id")) {
-      continue;
-    }
-    let tip = row;
-    const visited = /* @__PURE__ */ new Set([id]);
-    while (readString8(tip, "end_reason") === "compression") {
-      const tipId2 = readString8(tip, "id");
-      if (!tipId2) {
-        break;
-      }
-      const next = (childrenByParent.get(tipId2) ?? []).filter((child) => readString8(child, "id")).sort(
-        (left, right) => (readNumber2(right.last_active) ?? 0) - (readNumber2(left.last_active) ?? 0)
-      )[0];
-      const nextId = next ? readString8(next, "id") : null;
-      if (!next || !nextId || visited.has(nextId)) {
-        break;
-      }
-      tip = next;
-      visited.add(nextId);
-    }
-    const tipId = readString8(tip, "id");
-    if (tipId) {
-      projected.push({
-        ...tip,
-        id: tipId,
-        _lineage_root_id: id,
-        started_at: readNumber2(row.started_at) ?? readNumber2(tip.started_at)
-      });
-    }
-  }
-  return projected;
-}
-async function readHermesSessionMessages(candidate) {
-  const [dbMessages, jsonlMessages] = await Promise.all([
-    readStateDbMessages(candidate.dbPath, candidate.session.id),
-    readJsonlMessages(candidate.profileName, candidate.session.id)
-  ]);
-  return jsonlMessages.length > dbMessages.length ? jsonlMessages : dbMessages;
-}
-async function readStateDbMessages(dbPath, sessionId) {
-  if (!await isFile(dbPath)) {
-    return [];
-  }
-  let db = null;
-  try {
-    const { DatabaseSync } = nodeRequire3(
-      "node:sqlite"
-    );
-    db = new DatabaseSync(dbPath, {
-      readOnly: true,
-      timeout: 1e3
-    });
-    const columns = readTableColumns(db, "messages");
-    if (!columns.has("session_id") || !columns.has("role")) {
-      return [];
-    }
-    const selectColumns = MESSAGE_COLUMNS.map(
-      (column) => columns.has(column) ? quoteIdentifier(column) : `NULL AS ${column}`
-    ).join(", ");
-    return db.prepare(
-      `
-        SELECT ${selectColumns}
-        FROM messages
-        WHERE session_id = ?
-        ORDER BY timestamp, id
-      `
-    ).all(sessionId);
-  } catch {
-    return [];
-  } finally {
-    db?.close();
-  }
-}
-async function readJsonlMessages(profileName, sessionId) {
-  if (!/^[A-Za-z0-9._:-]{1,160}$/u.test(sessionId)) {
-    return [];
-  }
-  const profileDir = resolveHermesProfileDir(profileName);
-  const sessionsDir = await readHermesSessionsDir(profileName).then((value) => value.sessionsDir).catch(() => path13.join(profileDir, "sessions"));
-  const transcriptPath = path13.join(sessionsDir, `${sessionId}.jsonl`);
-  const raw = await readFile8(transcriptPath, "utf8").catch((error) => {
-    if (isNodeError9(error, "ENOENT")) {
-      return "";
-    }
-    throw error;
-  });
-  if (!raw.trim()) {
-    return [];
-  }
-  const rows = [];
-  for (const line of raw.split(/\r?\n/u)) {
-    if (!line.trim()) {
-      continue;
-    }
-    try {
-      const parsed = JSON.parse(line);
-      const normalized = normalizeJsonlMessage(parsed);
-      if (normalized) {
-        rows.push(normalized);
-      }
-    } catch {
-      continue;
-    }
-  }
-  return rows;
-}
-function normalizeJsonlMessage(row) {
-  const role = readString8(row, "role");
-  if (!role) {
-    return null;
-  }
-  const content = normalizeContent(row.content);
-  const timestamp = readNumber2(row.timestamp) ?? readNumber2(row.created_at) ?? readNumber2(row.createdAt);
-  return {
-    ...row,
-    role,
-    content,
-    timestamp: timestamp ?? void 0
-  };
-}
-function toLinkMessage(input) {
-  const role = normalizeMessageRole(input.message.role);
-  const text = normalizeContent(input.message.content);
-  const createdAt = isoFromHermesTime(input.message.timestamp) ?? new Date(Date.now() + input.index).toISOString();
-  return {
-    id: `msg_${randomUUID6().replaceAll("-", "")}`,
-    schema_version: 1,
-    conversation_id: input.conversationId,
-    role,
-    status: "completed",
-    created_at: createdAt,
-    updated_at: createdAt,
-    sender: senderForRole({
-      role,
-      profileName: input.profileName,
-      profileUid: input.profileUid,
-      profileDisplayName: input.profileDisplayName
-    }),
-    parts: text ? [{ type: "text", text }] : [],
-    attachments: [],
-    hermes: {
-      session_id: input.sessionId,
-      message_id: input.message.id,
-      imported_from: "hermes",
-      import_projection: HERMES_IMPORT_PROJECTION_VERSION
-    },
-    raw: {
-      format: "hermes-message",
-      payload: input.message
-    }
-  };
-}
-function senderForRole(input) {
-  switch (input.role) {
-    case "user":
-      return { id: "hermes_user", type: "human", display_name: "Me" };
-    case "assistant":
-      return {
-        id: `agent_${input.profileName}`,
-        type: "agent",
-        display_name: input.profileDisplayName,
-        profile_uid: input.profileUid,
-        profile: input.profileName
-      };
-    case "tool":
-      return { id: "hermes_tool", type: "tool", display_name: "Tool" };
-    case "system":
-      return { id: "hermes_system", type: "system", display_name: "System" };
-  }
-}
-function firstUserText(snapshot) {
-  return snapshot.messages.find((message) => message.role === "user")?.parts.find((part) => part.type === "text")?.text?.slice(0, 80);
-}
-function normalizeTitle(value) {
-  const normalized = value?.replace(/\s+/gu, " ").trim();
-  return normalized || DEFAULT_CONVERSATION_TITLE;
-}
-function normalizeMessageRole(value) {
-  switch (value?.trim().toLowerCase()) {
-    case "user":
-      return "user";
-    case "assistant":
-      return "assistant";
-    case "tool":
-      return "tool";
-    case "system":
-      return "system";
-    default:
-      return "system";
-  }
-}
-function normalizeContent(value) {
-  if (typeof value === "string") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => {
-      if (typeof item === "string") {
-        return item;
-      }
-      if (typeof item === "object" && item !== null) {
-        return readString8(item, "text") ?? "";
-      }
-      return "";
-    }).filter(Boolean).join("");
-  }
-  return "";
+    format: "hermes-message-group",
+    payload: { messages: [...rows, row] }
+  };
 }
-function parseJsonValue(value) {
-  if (typeof value !== "string") {
-    return void 0;
+function readHermesRawMessageRows(raw) {
+  if (!raw) {
+    return [];
   }
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return void 0;
+  if (raw.format === "hermes-message-group") {
+    const payload = toRecord8(raw.payload);
+    return Array.isArray(payload.messages) ? payload.messages.filter(
+      (item) => typeof item === "object" && item !== null
+    ) : [];
   }
-  try {
-    return JSON.parse(trimmed);
-  } catch {
-    return void 0;
+  if (raw.format === "hermes-message") {
+    return typeof raw.payload === "object" && raw.payload !== null ? [raw.payload] : [];
   }
+  return [];
 }
-function toRecord7(value) {
-  return typeof value === "object" && value !== null ? value : {};
-}
-function isDeletedSession(session) {
-  return readBoolean(session.deleted) || readBoolean(session.is_deleted) || Boolean(readString8(session, "deleted_at")) || ["deleted", "removed"].includes(readString8(session, "status") ?? "");
-}
-function isHiddenSession(session) {
-  const source = readString8(session, "source")?.toLowerCase();
-  const status = readString8(session, "status")?.toLowerCase();
-  const visibility = readString8(session, "visibility")?.toLowerCase();
-  return Boolean(source && HIDDEN_SESSION_SOURCES.has(source)) || readBoolean(session.hidden) || readBoolean(session.archived) || Boolean(readString8(session, "archived_at")) || status === "hidden" || status === "archived" || visibility === "hidden" || visibility === "hide";
-}
-function readTableColumns(db, tableName) {
-  try {
-    const rows = db.prepare(`PRAGMA table_info(${quoteIdentifier(tableName)})`).all();
-    return new Set(
-      rows.map((row) => typeof row.name === "string" ? row.name : "").filter(Boolean)
-    );
-  } catch {
-    return /* @__PURE__ */ new Set();
+function rememberHermesMessageId(message, row) {
+  if (row.id === void 0 || row.id === null) {
+    return;
   }
+  const existing = Array.isArray(message.hermes?.message_ids) ? message.hermes.message_ids : message.hermes?.message_id === void 0 ? [] : [message.hermes.message_id];
+  const id = row.id;
+  message.hermes = {
+    ...message.hermes ?? {},
+    message_ids: existing.includes(id) ? existing : [...existing, id]
+  };
 }
-function quoteIdentifier(value) {
-  return `"${value.replaceAll('"', '""')}"`;
-}
-async function isFile(filePath) {
-  return stat7(filePath).then((value) => value.isFile()).catch((error) => {
-    if (isNodeError9(error, "ENOENT")) {
-      return false;
-    }
-    throw error;
-  });
-}
-function createConversationId() {
-  return `conv_${randomUUID6().replaceAll("-", "")}`;
-}
-function isoFromHermesTime(value) {
-  const numeric = readNumber2(value);
-  if (!numeric || numeric <= 0) {
-    return void 0;
+function joinImportedText(left, right) {
+  if (!left) {
+    return right;
   }
-  const millis = numeric > 1e10 ? numeric : numeric * 1e3;
-  return new Date(millis).toISOString();
-}
-function readString8(payload, key) {
-  const value = payload[key];
-  return typeof value === "string" && value.trim() ? value.trim() : null;
-}
-function readNumber2(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : null;
+  if (!right) {
+    return left;
+  }
+  if (/\s$/u.test(left) || /^\s/u.test(right)) {
+    return `${left}${right}`;
+  }
+  return `${left}
+
+${right}`;
 }
-function readBoolean(value) {
-  if (value === true || value === 1) {
-    return true;
+function projectCompressionTips(rows) {
+  const byId = /* @__PURE__ */ new Map();
+  const childrenByParent = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const id = readString9(row, "id");
+    if (!id) {
+      continue;
+    }
+    byId.set(id, row);
+    const parentId = readString9(row, "parent_session_id");
+    if (parentId) {
+      const children = childrenByParent.get(parentId) ?? [];
+      children.push(row);
+      childrenByParent.set(parentId, children);
+    }
   }
-  if (typeof value === "string") {
-    return ["1", "true", "yes", "on"].includes(value.trim().toLowerCase());
+  const projected = [];
+  for (const row of rows) {
+    const id = readString9(row, "id");
+    if (!id || readString9(row, "parent_session_id")) {
+      continue;
+    }
+    let tip = row;
+    const visited = /* @__PURE__ */ new Set([id]);
+    while (readString9(tip, "end_reason") === "compression") {
+      const tipId2 = readString9(tip, "id");
+      if (!tipId2) {
+        break;
+      }
+      const next = (childrenByParent.get(tipId2) ?? []).filter((child) => readString9(child, "id")).sort(
+        (left, right) => (readNumber2(right.last_active) ?? 0) - (readNumber2(left.last_active) ?? 0)
+      )[0];
+      const nextId = next ? readString9(next, "id") : null;
+      if (!next || !nextId || visited.has(nextId)) {
+        break;
+      }
+      tip = next;
+      visited.add(nextId);
+    }
+    const tipId = readString9(tip, "id");
+    if (tipId) {
+      projected.push({
+        ...tip,
+        id: tipId,
+        _lineage_root_id: id,
+        started_at: readNumber2(row.started_at) ?? readNumber2(tip.started_at)
+      });
+    }
   }
-  return false;
+  return projected;
 }
-function isNodeError9(error, code) {
-  return typeof error === "object" && error !== null && "code" in error && error.code === code;
+async function readHermesSessionMessages(candidate) {
+  const [dbMessages, jsonlMessages] = await Promise.all([
+    readStateDbMessages(candidate.dbPath, candidate.session.id),
+    readJsonlMessages(candidate.profileName, candidate.session.id)
+  ]);
+  return jsonlMessages.length > dbMessages.length ? jsonlMessages : dbMessages;
 }
-
-// src/conversations/delivery-import.ts
-import { lstat, readFile as readFile9, readdir as readdir6, stat as stat8 } from "fs/promises";
-import path14 from "path";
-var MAX_IMPORTED_BLOB_BYTES = 100 * 1024 * 1024;
-var MAX_MEDIA_IMPORT_FAILURES = 20;
-var MAX_DELIVERY_FILES = 50;
-var DELIVERY_STAGING_SEGMENT = "delivery-staging";
-var SUPPORTED_DELIVERY_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".png",
-  ".jpg",
-  ".jpeg",
-  ".gif",
-  ".webp",
-  ".heic",
-  ".pdf",
-  ".txt",
-  ".log",
-  ".md",
-  ".markdown",
-  ".json",
-  ".jsonl",
-  ".yaml",
-  ".yml",
-  ".toml",
-  ".ini",
-  ".xml",
-  ".html",
-  ".css",
-  ".js",
-  ".ts",
-  ".jsx",
-  ".tsx",
-  ".dart",
-  ".py",
-  ".java",
-  ".kt",
-  ".swift",
-  ".go",
-  ".rs",
-  ".rb",
-  ".php",
-  ".c",
-  ".cc",
-  ".cpp",
-  ".h",
-  ".hpp",
-  ".cs",
-  ".sql",
-  ".csv",
-  ".tsv",
-  ".doc",
-  ".docx",
-  ".xls",
-  ".xlsx",
-  ".ppt",
-  ".pptx",
-  ".zip",
-  ".rar",
-  ".7z",
-  ".tar",
-  ".gz",
-  ".mp4",
-  ".mov",
-  ".avi",
-  ".mkv",
-  ".webm",
-  ".ogg",
-  ".opus",
-  ".mp3",
-  ".wav",
-  ".m4a"
-]);
-function resolveDeliveryStagingTarget(paths, stagingDir) {
-  const resolvedDir = path14.resolve(stagingDir);
-  const relative = path14.relative(path14.resolve(paths.conversationsDir), resolvedDir);
-  if (!relative || relative.startsWith("..") || path14.isAbsolute(relative)) {
-    throw new LinkHttpError(
-      400,
-      "delivery_staging_invalid",
-      "delivery staging directory must be inside Hermes Link conversations"
-    );
+async function readStateDbMessages(dbPath, sessionId) {
+  if (!await isFile(dbPath)) {
+    return [];
   }
-  const segments = relative.split(path14.sep);
-  if (segments.length !== 3 || segments[1] !== DELIVERY_STAGING_SEGMENT || !segments[0] || !segments[2]) {
-    throw new LinkHttpError(
-      400,
-      "delivery_staging_invalid",
-      "delivery staging directory is invalid"
-    );
+  let db = null;
+  try {
+    db = openSqliteDatabase(dbPath, {
+      readonly: true,
+      timeout: 1e3
+    });
+    const columns = readTableColumns(db, "messages");
+    if (!columns.has("session_id") || !columns.has("role")) {
+      return [];
+    }
+    const selectColumns = MESSAGE_COLUMNS.map(
+      (column) => columns.has(column) ? quoteIdentifier(column) : `NULL AS ${column}`
+    ).join(", ");
+    return db.prepare(
+      `
+        SELECT ${selectColumns}
+        FROM messages
+        WHERE session_id = ?
+        ORDER BY timestamp, id
+      `
+    ).all(sessionId);
+  } catch {
+    return [];
+  } finally {
+    db?.close();
   }
-  return {
-    conversationId: segments[0],
-    runId: segments[2],
-    stagingDir: resolvedDir
-  };
-}
-async function collectStagedDeliveryReferences(stagingDir) {
-  const directoryStat = await lstat(stagingDir).catch((error) => {
+}
+async function readJsonlMessages(profileName, sessionId) {
+  if (!/^[A-Za-z0-9._:-]{1,160}$/u.test(sessionId)) {
+    return [];
+  }
+  const profileDir = resolveHermesProfileDir(profileName);
+  const sessionsDir = await readHermesSessionsDir(profileName).then((value) => value.sessionsDir).catch(() => path14.join(profileDir, "sessions"));
+  const transcriptPath = path14.join(sessionsDir, `${sessionId}.jsonl`);
+  const raw = await readFile9(transcriptPath, "utf8").catch((error) => {
     if (isNodeError10(error, "ENOENT")) {
-      throw new LinkHttpError(
-        404,
-        "delivery_staging_not_found",
-        "delivery staging directory was not found"
-      );
+      return "";
     }
     throw error;
   });
-  if (!directoryStat.isDirectory()) {
-    throw new LinkHttpError(
-      400,
-      "delivery_staging_not_directory",
-      "delivery staging path is not a directory"
-    );
+  if (!raw.trim()) {
+    return [];
   }
-  const entries = await readdir6(stagingDir, { withFileTypes: true });
-  return entries.filter((entry) => entry.isFile() && !entry.name.startsWith(".")).filter((entry) => isSupportedDeliveryFilename(entry.name)).sort(
-    (left, right) => left.name.localeCompare(right.name, "en", { numeric: true })
-  ).slice(0, MAX_DELIVERY_FILES).map((entry) => {
-    const sourcePath = path14.join(stagingDir, entry.name);
-    const mime = inferMimeType(sourcePath);
-    return {
-      path: sourcePath,
-      kind: mediaKindForMime(mime),
-      mime
-    };
-  });
+  const rows = [];
+  for (const line of raw.split(/\r?\n/u)) {
+    if (!line.trim()) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(line);
+      const normalized = normalizeJsonlMessage(parsed);
+      if (normalized) {
+        rows.push(normalized);
+      }
+    } catch {
+      continue;
+    }
+  }
+  return rows;
 }
-async function importMediaReferencesForMessage(deps, input) {
-  const references = input.references.slice(0, input.maxReferences ?? MAX_DELIVERY_FILES);
-  if (references.length === 0) {
-    return emptyImportResult(input);
+function normalizeJsonlMessage(row) {
+  const role = readString9(row, "role");
+  if (!role) {
+    return null;
   }
-  const snapshot = await deps.readSnapshot(input.conversationId);
-  const assistant = snapshot.messages.find(
-    (message) => message.id === input.messageId
-  );
-  if (!assistant) {
-    return emptyImportResult(input);
+  const content = normalizeContent(row.content);
+  const timestamp = readNumber2(row.timestamp) ?? readNumber2(row.created_at) ?? readNumber2(row.createdAt);
+  return {
+    ...row,
+    role,
+    content,
+    timestamp: timestamp ?? void 0
+  };
+}
+async function hydrateImportedConversationMedia(input) {
+  const snapshot = await input.store.readSnapshot(input.conversationId);
+  const imports = snapshot.messages.map((message) => ({
+    messageId: message.id,
+    references: collectMessageMediaReferences(message)
+  })).filter((item) => item.references.length > 0);
+  if (imports.length === 0) {
+    return;
   }
-  const importedSourceKeys = readImportedMediaSourceKeys(assistant);
-  const failedSourceKeys = readFailedMediaSourceKeys(assistant);
-  const failureRecordsByKey = new Map(
-    readMediaImportFailures(assistant).map((failure) => [failure.key, failure])
-  );
-  const importedParts = [];
-  const newFailures = [];
-  let skippedCount = 0;
-  for (const reference of references) {
-    let sourceKey;
-    try {
-      sourceKey = mediaSourceKey(reference.path);
-      if (importedSourceKeys.has(sourceKey) || failedSourceKeys.has(sourceKey)) {
-        skippedCount += 1;
-        continue;
-      }
-      const blob = await writeBlobFromFile(deps, input.conversationId, reference);
-      const part = {
-        type: reference.kind ?? mediaKindForMime(blob.mime),
-        blob: blob.id,
-        mime: blob.mime,
-        size: blob.size,
-        filename: blob.filename,
-        url: `/api/v1/conversations/${encodeURIComponent(input.conversationId)}/blobs/${encodeURIComponent(blob.id)}`
-      };
-      assistant.parts.push(part);
-      assistant.attachments.push({
-        blob_id: blob.id,
-        mime: blob.mime,
-        size: blob.size,
-        filename: blob.filename,
-        source: "hermes_output"
-      });
-      importedSourceKeys.add(sourceKey);
-      importedParts.push(part);
-    } catch (error) {
-      if (sourceKey && !failedSourceKeys.has(sourceKey)) {
-        const failure = describeMediaImportFailure(reference, sourceKey, error);
-        failedSourceKeys.add(sourceKey);
-        failureRecordsByKey.set(sourceKey, failure);
-        newFailures.push(failure);
+  const outcomes = /* @__PURE__ */ new Map();
+  for (const item of imports) {
+    const result = await importMediaReferencesForMessage(
+      {
+        logger: input.logger,
+        readSnapshot: (conversationId) => input.store.readSnapshot(conversationId),
+        writeSnapshot: (conversationId, nextSnapshot2) => input.store.writeSnapshot(conversationId, nextSnapshot2),
+        appendEvent: async (conversationId, event) => ({
+          seq: 0,
+          conversation_id: conversationId,
+          created_at: (/* @__PURE__ */ new Date()).toISOString(),
+          ...event
+        }),
+        writeBlob: (conversationId, blob) => writeConversationBlob(input.paths, conversationId, blob, {
+          maxBytes: MAX_IMPORTED_HERMES_MEDIA_BYTES
+        })
+      },
+      {
+        conversationId: input.conversationId,
+        runId: IMPORTED_MEDIA_PLACEHOLDER_RUN_ID,
+        messageId: item.messageId,
+        references: item.references
       }
-      void deps.logger.warn("conversation_media_import_failed", {
-        conversation_id: input.conversationId,
-        run_id: input.runId,
-        message_id: input.messageId,
-        error: error instanceof Error ? error.message : String(error)
+    );
+    if (result.imported_count > 0 || result.failed_count > 0) {
+      outcomes.set(item.messageId, {
+        imported: result.imported_count > 0,
+        failed: result.failed_count > 0
       });
     }
   }
-  if (importedParts.length === 0 && newFailures.length === 0) {
-    return {
-      ...emptyImportResult(input),
-      discovered_count: references.length,
-      skipped_count: skippedCount
-    };
+  if (outcomes.size === 0) {
+    return;
   }
-  assistant.hermes = {
-    ...toRecord8(assistant.hermes),
-    imported_media_source_keys: [...importedSourceKeys],
-    media_import_failed_source_keys: [...failedSourceKeys],
-    media_import_failures: [...failureRecordsByKey.values()].slice(
-      -MAX_MEDIA_IMPORT_FAILURES
-    )
+  const nextSnapshot = await input.store.readSnapshot(input.conversationId);
+  let changed = false;
+  for (const message of nextSnapshot.messages) {
+    const outcome = outcomes.get(message.id);
+    if (!outcome) {
+      continue;
+    }
+    if (outcome.imported) {
+      cleanMessageTextParts(message);
+      changed = true;
+    }
+    if (outcome.failed) {
+      changed = appendImportedMediaImportFailureNotice(message) || changed;
+    }
+  }
+  if (changed) {
+    await input.store.writeSnapshot(input.conversationId, nextSnapshot);
+  }
+}
+function collectMessageMediaReferences(message) {
+  return message.parts.flatMap(
+    (part) => part.type === "text" && part.text ? collectMediaTags(part.text) : []
+  );
+}
+function appendImportedMediaImportFailureNotice(message) {
+  const hermes = toRecord8(message.hermes);
+  if (hermes.media_import_failure_notice_appended === true) {
+    return false;
+  }
+  const failures = readMediaImportFailures(message);
+  if (failures.length === 0) {
+    return false;
+  }
+  const notice = formatImportedMediaImportFailureNotice(failures);
+  const textPart = message.parts.find((part) => part.type === "text");
+  if (textPart) {
+    const currentText = textPart.text ?? "";
+    const separator = currentText.trim().length > 0 ? "\n\n" : "";
+    textPart.text = `${currentText.trimEnd()}${separator}${notice}`;
+  } else {
+    message.parts.unshift({ type: "text", text: notice });
+  }
+  message.hermes = {
+    ...hermes,
+    media_import_failure_notice_appended: true
   };
-  assistant.updated_at = (/* @__PURE__ */ new Date()).toISOString();
-  await deps.writeSnapshot(input.conversationId, snapshot);
-  let lastEventSeq;
-  if (importedParts.length > 0) {
-    const event = await deps.appendEvent(input.conversationId, {
-      type: "message.parts.created",
-      message_id: input.messageId,
-      run_id: input.runId,
-      payload: { parts: importedParts }
-    });
-    lastEventSeq = event.seq;
+  return true;
+}
+function formatImportedMediaImportFailureNotice(failures) {
+  const filenames = failures.map((failure) => failure.filename);
+  const target = filenames.length === 1 ? `\u6587\u4EF6\u201C${filenames[0]}\u201D` : `${filenames.length} \u4E2A\u6587\u4EF6\uFF08${formatImportedFilenameList(filenames)}\uFF09`;
+  const permissionDenied = failures.some((failure) => {
+    const code = failure.code?.toUpperCase();
+    return code === "EPERM" || code === "EACCES" || /operation not permitted|permission denied/iu.test(failure.reason);
+  });
+  if (permissionDenied) {
+    return `${target}\u6CA1\u80FD\u4F5C\u4E3A\u9644\u4EF6\u5BFC\u5165\uFF1AHermes Link \u8BFB\u53D6\u6587\u4EF6\u65F6\u88AB macOS \u62D2\u7EDD\u4E86\u3002\u8BF7\u5728\u201C\u7CFB\u7EDF\u8BBE\u7F6E > \u9690\u79C1\u4E0E\u5B89\u5168\u6027 > \u5B8C\u5168\u78C1\u76D8\u8BBF\u95EE\u6743\u9650\u201D\u91CC\u7ED9\u8FD0\u884C Link \u7684\u7EC8\u7AEF\u6216 Node \u6388\u6743\u540E\u91CD\u8BD5\u3002`;
+  }
+  return `${target}\u6CA1\u80FD\u4F5C\u4E3A\u9644\u4EF6\u5BFC\u5165\uFF1AHermes Link \u8BFB\u53D6\u672C\u673A\u6587\u4EF6\u5931\u8D25\u4E86\uFF0C\u8BF7\u786E\u8BA4\u6587\u4EF6\u8FD8\u5728\u539F\u4F4D\u7F6E\u5E76\u7A0D\u540E\u91CD\u8BD5\u3002`;
+}
+function formatImportedFilenameList(filenames) {
+  const preview = filenames.slice(0, 3).map((filename) => `\u201C${filename}\u201D`);
+  const remaining = filenames.length - preview.length;
+  return remaining > 0 ? `${preview.join("\u3001")} \u7B49 ${filenames.length} \u4E2A` : preview.join("\u3001");
+}
+function toLinkMessage(input) {
+  const role = normalizeMessageRole(input.message.role);
+  const text = normalizeContent(input.message.content);
+  const createdAt = isoFromHermesTime(input.message.timestamp) ?? new Date(Date.now() + input.index).toISOString();
+  return {
+    id: `msg_${randomUUID6().replaceAll("-", "")}`,
+    schema_version: 1,
+    conversation_id: input.conversationId,
+    role,
+    status: "completed",
+    created_at: createdAt,
+    updated_at: createdAt,
+    sender: senderForRole({
+      role,
+      profileName: input.profileName,
+      profileUid: input.profileUid,
+      profileDisplayName: input.profileDisplayName
+    }),
+    parts: text ? [{ type: "text", text }] : [],
+    attachments: [],
+    hermes: {
+      session_id: input.sessionId,
+      message_id: input.message.id,
+      imported_from: "hermes",
+      import_projection: HERMES_IMPORT_PROJECTION_VERSION
+    },
+    raw: {
+      format: "hermes-message",
+      payload: input.message
+    }
+  };
+}
+function senderForRole(input) {
+  switch (input.role) {
+    case "user":
+      return { id: "hermes_user", type: "human", display_name: "Me" };
+    case "assistant":
+      return {
+        id: `agent_${input.profileName}`,
+        type: "agent",
+        display_name: input.profileDisplayName,
+        profile_uid: input.profileUid,
+        profile: input.profileName
+      };
+    case "tool":
+      return { id: "hermes_tool", type: "tool", display_name: "Tool" };
+    case "system":
+      return { id: "hermes_system", type: "system", display_name: "System" };
+  }
+}
+function firstUserText(snapshot) {
+  return snapshot.messages.find((message) => message.role === "user")?.parts.find((part) => part.type === "text")?.text?.slice(0, 80);
+}
+function normalizeTitle(value) {
+  const normalized = value?.replace(/\s+/gu, " ").trim();
+  return normalized || DEFAULT_CONVERSATION_TITLE;
+}
+function normalizeMessageRole(value) {
+  switch (value?.trim().toLowerCase()) {
+    case "user":
+      return "user";
+    case "assistant":
+      return "assistant";
+    case "tool":
+      return "tool";
+    case "system":
+      return "system";
+    default:
+      return "system";
   }
-  return {
-    conversation_id: input.conversationId,
-    run_id: input.runId,
-    message_id: input.messageId,
-    discovered_count: references.length,
-    imported_count: importedParts.length,
-    skipped_count: skippedCount,
-    failed_count: newFailures.length,
-    parts: importedParts,
-    ...lastEventSeq ? { last_event_seq: lastEventSeq } : {}
-  };
 }
-function readMediaImportFailures(message) {
-  const hermes = toRecord8(message.hermes);
-  const failures = hermes.media_import_failures;
-  if (!Array.isArray(failures)) {
-    return [];
+function normalizeContent(value) {
+  if (typeof value === "string") {
+    return value;
   }
-  return failures.flatMap((item) => {
-    const record = toRecord8(item);
-    const key = readString9(record, "key");
-    const filename = readString9(record, "filename");
-    const reason = readString9(record, "reason");
-    if (!key || !filename || !reason) {
-      return [];
-    }
-    return [
-      {
-        key,
-        filename,
-        reason,
-        ...readString9(record, "code") ? { code: readString9(record, "code") } : {}
+  if (Array.isArray(value)) {
+    return value.map((item) => {
+      if (typeof item === "string") {
+        return item;
       }
-    ];
-  });
+      if (typeof item === "object" && item !== null) {
+        return readString9(item, "text") ?? "";
+      }
+      return "";
+    }).filter(Boolean).join("");
+  }
+  return "";
 }
-function readFailedMediaSourceKeys(message) {
-  const hermes = toRecord8(message.hermes);
-  const keys = hermes.media_import_failed_source_keys;
-  if (!Array.isArray(keys)) {
+function parseJsonValue(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return void 0;
+  }
+}
+function toRecord8(value) {
+  return typeof value === "object" && value !== null ? value : {};
+}
+function isDeletedSession(session) {
+  return readBoolean(session.deleted) || readBoolean(session.is_deleted) || Boolean(readString9(session, "deleted_at")) || ["deleted", "removed"].includes(readString9(session, "status") ?? "");
+}
+function isHiddenSession(session) {
+  const source = readString9(session, "source")?.toLowerCase();
+  const status = readString9(session, "status")?.toLowerCase();
+  const visibility = readString9(session, "visibility")?.toLowerCase();
+  return Boolean(source && HIDDEN_SESSION_SOURCES.has(source)) || readBoolean(session.hidden) || readBoolean(session.archived) || Boolean(readString9(session, "archived_at")) || status === "hidden" || status === "archived" || visibility === "hidden" || visibility === "hide";
+}
+function readTableColumns(db, tableName) {
+  try {
+    const rows = db.prepare(`PRAGMA table_info(${quoteIdentifier(tableName)})`).all();
+    return new Set(
+      rows.map((row) => typeof row.name === "string" ? row.name : "").filter(Boolean)
+    );
+  } catch {
     return /* @__PURE__ */ new Set();
   }
-  return new Set(
-    keys.filter(
-      (key) => typeof key === "string" && key.length > 0
-    )
-  );
 }
-function emptyImportResult(input) {
-  return {
-    conversation_id: input.conversationId,
-    run_id: input.runId,
-    message_id: input.messageId,
-    discovered_count: 0,
-    imported_count: 0,
-    skipped_count: 0,
-    failed_count: 0,
-    parts: []
-  };
+function quoteIdentifier(value) {
+  return `"${value.replaceAll('"', '""')}"`;
 }
-async function writeBlobFromFile(deps, conversationId, source) {
-  const sourcePath = resolveMediaSourcePath(source.path);
-  const fileStat = await stat8(sourcePath).catch((error) => {
+async function isFile(filePath) {
+  return stat8(filePath).then((value) => value.isFile()).catch((error) => {
     if (isNodeError10(error, "ENOENT")) {
-      throw new LinkHttpError(
-        404,
-        "media_source_not_found",
-        "Hermes output file was not found"
-      );
+      return false;
     }
     throw error;
   });
-  if (!fileStat.isFile()) {
-    throw new LinkHttpError(
-      400,
-      "media_source_not_file",
-      "Hermes output media source is not a file"
-    );
-  }
-  if (fileStat.size > MAX_IMPORTED_BLOB_BYTES) {
-    throw new LinkHttpError(
-      413,
-      "media_source_too_large",
-      "Hermes output media source is too large"
-    );
-  }
-  return deps.writeBlob(conversationId, {
-    bytes: await readFile9(sourcePath),
-    filename: path14.basename(sourcePath),
-    mime: source.mime ?? inferMimeType(sourcePath)
-  });
 }
-function describeMediaImportFailure(reference, sourceKey, error) {
-  return {
-    key: sourceKey,
-    filename: sanitizeFilename(reference.path, "attachment"),
-    reason: error instanceof Error ? error.message : String(error),
-    ...isNodeError10(error) && error.code ? { code: error.code } : {}
-  };
+function createConversationId() {
+  return `conv_${randomUUID6().replaceAll("-", "")}`;
 }
-function isSupportedDeliveryFilename(filename) {
-  return SUPPORTED_DELIVERY_EXTENSIONS.has(path14.extname(filename).toLowerCase());
+function isoFromHermesTime(value) {
+  const numeric = readNumber2(value);
+  if (!numeric || numeric <= 0) {
+    return void 0;
+  }
+  const millis = numeric > 1e10 ? numeric : numeric * 1e3;
+  return new Date(millis).toISOString();
 }
 function readString9(payload, key) {
   const value = payload[key];
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
-function toRecord8(value) {
-  return typeof value === "object" && value !== null ? value : {};
+function readNumber2(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function readBoolean(value) {
+  if (value === true || value === 1) {
+    return true;
+  }
+  if (typeof value === "string") {
+    return ["1", "true", "yes", "on"].includes(value.trim().toLowerCase());
+  }
+  return false;
 }
 function isNodeError10(error, code) {
-  return typeof error === "object" && error !== null && "code" in error && (code === void 0 || error.code === code);
+  return typeof error === "object" && error !== null && "code" in error && error.code === code;
 }
 
 // src/conversations/run-lifecycle.ts
@@ -10400,9 +10807,7 @@ function readString10(payload, key) {
 
 // src/conversations/history-builder.ts
 import { readFile as readFile10, stat as stat9 } from "fs/promises";
-import { createRequire as createRequire4 } from "module";
 import path15 from "path";
-var nodeRequire4 = createRequire4(import.meta.url);
 var HISTORY_ROLES = /* @__PURE__ */ new Set(["user", "assistant"]);
 var HERMES_HISTORY_COLUMNS = [
   "role",
@@ -10564,11 +10969,8 @@ async function readHermesJsonlHistory(sessionsDir, sessionId) {
 function readHistoryRows(dbPath, sessionId) {
   let db = null;
   try {
-    const { DatabaseSync } = nodeRequire4(
-      "node:sqlite"
-    );
-    db = new DatabaseSync(dbPath, {
-      readOnly: true,
+    db = openSqliteDatabase(dbPath, {
+      readonly: true,
       timeout: 1e3
     });
     const columns = readTableColumns2(db, "messages");
@@ -11278,8 +11680,9 @@ function readChatCompletionUsage(payload) {
   const input = readInteger2(usage, "prompt_tokens") ?? readInteger2(usage, "input_tokens");
   const output = readInteger2(usage, "completion_tokens") ?? readInteger2(usage, "output_tokens");
   const total = readInteger2(usage, "total_tokens");
-  const contextWindow = readInteger2(usage, "context_window") ?? readInteger2(usage, "context_max");
+  const contextWindow = readInteger2(usage, "context_window") ?? readInteger2(usage, "context_max") ?? readInteger2(usage, "context_length");
   const explicitContextTokens = readInteger2(usage, "context_tokens") ?? readInteger2(usage, "context_used") ?? readInteger2(usage, "current_context_tokens") ?? readInteger2(usage, "last_prompt_tokens");
+  const explicitUsagePercent = readInteger2(usage, "usage_percent") ?? readInteger2(usage, "context_percent");
   if (input === void 0 && output === void 0 && total === void 0) {
     return void 0;
   }
@@ -11290,7 +11693,7 @@ function readChatCompletionUsage(payload) {
     ...explicitContextTokens !== void 0 ? { context_tokens: explicitContextTokens } : {},
     ...contextWindow !== void 0 ? { context_window: contextWindow } : {},
     ...explicitContextTokens !== void 0 && contextWindow ? {
-      usage_percent: Math.min(
+      usage_percent: explicitUsagePercent !== void 0 ? Math.min(100, explicitUsagePercent) : Math.min(
         100,
         Math.round(explicitContextTokens / contextWindow * 100)
       )
@@ -11437,10 +11840,20 @@ var ConversationRunLifecycle = class {
         });
         return void 0;
       });
+      const instructions = buildRunInstructions(run, deliveryStagingDir);
+      const estimatedUsage = estimateContextUsage({
+        conversationHistory: conversationHistory.messages,
+        currentInput: resolvedInput,
+        instructions,
+        contextWindow: run.context_window
+      });
+      if (estimatedUsage) {
+        await this.updateRun(conversationId, runId, { usage: estimatedUsage });
+      }
       const response = await streamHermesResponses(
         {
           input: resolvedInput,
-          instructions: buildRunInstructions(run, deliveryStagingDir),
+          instructions,
           session_id: hermesSessionId,
           model: run.model,
           ...previousResponseId ? { previous_response_id: previousResponseId } : {},
@@ -11943,7 +12356,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
       run.hermes_response_id = responseId;
     }
     if (usage) {
-      run.usage = usage;
+      run.usage = mergeRunUsage(run.usage, usage);
     }
     if (assistant) {
       assistant.status = "completed";
@@ -11995,7 +12408,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
     const visibleMessage = formatFailureMessage(message, run.error_detail);
     const usage = readUsage(source?.payload);
     if (usage) {
-      run.usage = usage;
+      run.usage = mergeRunUsage(run.usage, usage);
     }
     const assistant = snapshot.messages.find(
       (item) => item.id === run.assistant_message_id
@@ -12014,6 +12427,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
       }
     }
     await this.deps.writeSnapshot(conversationId, snapshot);
+    const contextUsage = contextUsagePayload(run);
     await this.deps.appendEvent(conversationId, {
       type: "run.failed",
       message_id: assistant?.id,
@@ -12022,6 +12436,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
         error: { message },
         ...run.error_detail ? { error_detail: run.error_detail } : {},
         run,
+        ...contextUsage ? { context: contextUsage } : {},
         ...source ? { hermes: source.payload } : {}
       },
       ...source ? { raw: { format: "hermes-run-event", payload: source.rawPayload } } : {}
@@ -12353,6 +12768,7 @@ function contextUsagePayload(run) {
       source: "unknown"
     };
   }
+  const contextSource = usage.context_source ?? "explicit";
   return {
     input_tokens: contextTokens,
     output_tokens: usage?.output_tokens ?? 0,
@@ -12360,7 +12776,7 @@ function contextUsagePayload(run) {
     ...contextWindow ? { context_window: contextWindow } : {},
     used_tokens: contextTokens,
     ...contextWindow ? { window_tokens: contextWindow } : {},
-    source: "explicit",
+    source: contextSource,
     ...usage?.usage_percent !== void 0 ? { usage_percent: usage.usage_percent } : contextWindow ? {
       usage_percent: Math.min(
         100,
@@ -12369,6 +12785,41 @@ function contextUsagePayload(run) {
     } : {}
   };
 }
+function mergeRunUsage(previous, next) {
+  const nextContextWindow = next.context_window ?? previous?.context_window;
+  const nextContextTokens = next.context_tokens ?? refineEstimatedContextTokens(
+    previous,
+    next.input_tokens,
+    nextContextWindow
+  );
+  const nextContextSource = next.context_tokens !== void 0 ? next.context_source ?? "explicit" : nextContextTokens !== void 0 ? previous?.context_source : void 0;
+  return {
+    ...next,
+    ...nextContextTokens !== void 0 ? { context_tokens: nextContextTokens } : {},
+    ...nextContextWindow !== void 0 ? { context_window: nextContextWindow } : {},
+    ...nextContextSource ? { context_source: nextContextSource } : {},
+    ...nextContextTokens !== void 0 && nextContextWindow ? {
+      usage_percent: next.usage_percent ?? previous?.usage_percent ?? Math.min(
+        100,
+        Math.round(nextContextTokens / nextContextWindow * 100)
+      )
+    } : {}
+  };
+}
+function refineEstimatedContextTokens(previous, inputTokens, contextWindow) {
+  if (previous?.context_source !== "estimated") {
+    return void 0;
+  }
+  const currentEstimate = previous.context_tokens;
+  if (currentEstimate === void 0) {
+    return void 0;
+  }
+  const upperBound = inputTokens > 0 ? contextWindow ? Math.min(inputTokens, contextWindow) : inputTokens : contextWindow;
+  if (upperBound === void 0) {
+    return currentEstimate;
+  }
+  return Math.min(currentEstimate, upperBound);
+}
 function findPreviousHermesResponseId(snapshot, run) {
   const currentProfile = normalizeRunProfileForCompare(run.profile);
   if (!currentProfile) {
@@ -12510,6 +12961,12 @@ var ConversationService = class {
   async listConversations() {
     return this.queries.listConversations();
   }
+  listConversationPage(input = {}) {
+    return this.queries.listConversationPage(input);
+  }
+  searchConversationPage(input = {}) {
+    return this.queries.searchConversationPage(input);
+  }
   async getStatistics(filter = {}) {
     return readLinkStatistics(this.paths, filter);
   }
@@ -13972,13 +14429,84 @@ function isLanHost(hostname) {
 }
 
 // src/http/sse.ts
+var DEFAULT_SSE_RETRY_MS = 1e3;
+var DEFAULT_SSE_HEARTBEAT_MS = 15e3;
+function beginSseStream(request, response, options = {}) {
+  const retryMs = normalizeRetryMs(options.retryMs);
+  const heartbeatMs = Math.max(1e3, options.heartbeatMs ?? DEFAULT_SSE_HEARTBEAT_MS);
+  response.statusCode = 200;
+  response.setHeader("content-type", "text/event-stream; charset=utf-8");
+  response.setHeader("cache-control", "no-store");
+  response.setHeader("connection", "keep-alive");
+  response.flushHeaders();
+  writeSseRetry(response, retryMs);
+  writeSseComment(response, options.initialComment ?? "connected");
+  let closed = false;
+  let heartbeat = null;
+  const cleanup = () => {
+    if (closed) {
+      return;
+    }
+    closed = true;
+    if (heartbeat != null) {
+      clearInterval(heartbeat);
+      heartbeat = null;
+    }
+    request.off("close", cleanup);
+    response.off("close", cleanup);
+    options.onClose?.();
+    if (!response.writableEnded && !response.destroyed) {
+      response.end();
+    }
+  };
+  heartbeat = setInterval(() => {
+    if (response.writableEnded || response.destroyed) {
+      cleanup();
+      return;
+    }
+    writeSseComment(response);
+  }, heartbeatMs);
+  heartbeat.unref();
+  request.once("close", cleanup);
+  response.once("close", cleanup);
+  return cleanup;
+}
 function writeSseEvent(response, event) {
-  response.write(`event: ${event.type}
+  writeJsonSseEvent(response, {
+    event: event.type,
+    data: event,
+    id: event.seq
+  });
+}
+function writeJsonSseEvent(response, event) {
+  if (event.retryMs != null) {
+    response.write(`retry: ${normalizeRetryMs(event.retryMs)}
+`);
+  }
+  if (event.id != null && event.id !== "") {
+    response.write(`id: ${event.id}
+`);
+  }
+  response.write(`event: ${event.event}
+`);
+  response.write(`data: ${JSON.stringify(event.data)}
+
 `);
-  response.write(`data: ${JSON.stringify(event)}
+}
+function writeSseComment(response, comment = "keep-alive") {
+  response.write(`: ${comment}
+
+`);
+}
+function writeSseRetry(response, retryMs) {
+  response.write(`retry: ${normalizeRetryMs(retryMs)}
 
 `);
 }
+function normalizeRetryMs(retryMs) {
+  const parsed = Number.isFinite(retryMs) ? Math.trunc(retryMs) : DEFAULT_SSE_RETRY_MS;
+  return parsed >= 0 ? parsed : DEFAULT_SSE_RETRY_MS;
+}
 
 // src/http/routes/conversations.ts
 function registerConversationRoutes(router, options) {
@@ -13986,9 +14514,28 @@ function registerConversationRoutes(router, options) {
   router.get("/api/v1/conversations", async (ctx) => {
     await authenticateRequest(ctx, paths);
     ctx.set("cache-control", "no-store");
+    const result = await conversations.listConversationPage({
+      limit: readLimit(ctx.query.limit),
+      cursor: readQueryString(ctx.query.cursor) ?? readQueryString(ctx.query.after) ?? readQueryString(ctx.query.page_cursor)
+    });
+    ctx.body = {
+      ok: true,
+      conversations: result.conversations,
+      page: result.page
+    };
+  });
+  router.get("/api/v1/conversations/search", async (ctx) => {
+    await authenticateRequest(ctx, paths);
+    ctx.set("cache-control", "no-store");
+    const result = await conversations.searchConversationPage({
+      limit: readLimit(ctx.query.limit),
+      cursor: readQueryString(ctx.query.cursor) ?? readQueryString(ctx.query.after) ?? readQueryString(ctx.query.page_cursor),
+      query: readQueryString(ctx.query.query) ?? readQueryString(ctx.query.q) ?? readQueryString(ctx.query.keyword) ?? ""
+    });
     ctx.body = {
       ok: true,
-      conversations: await conversations.listConversations()
+      conversations: result.conversations,
+      page: result.page
     };
   });
   router.post("/api/v1/conversations", async (ctx) => {
@@ -14022,49 +14569,44 @@ function registerConversationRoutes(router, options) {
     const notificationOnly = mode === "notifications";
     ctx.respond = false;
     const response = ctx.res;
-    response.statusCode = 200;
-    response.setHeader("content-type", "text/event-stream; charset=utf-8");
-    response.setHeader("cache-control", "no-store");
-    response.setHeader("connection", "keep-alive");
-    const unsubscribe = conversations.subscribeAll((event) => {
+    let unsubscribe = () => {
+    };
+    beginSseStream(ctx.req, response, {
+      onClose: () => unsubscribe()
+    });
+    unsubscribe = conversations.subscribeAll((event) => {
       if (notificationOnly && !isConversationNotificationEvent(event)) {
         return;
       }
       writeSseEvent(response, event);
     });
-    const cleanup = () => {
-      unsubscribe();
-      response.end();
-    };
-    ctx.req.on("close", cleanup);
   });
   router.get("/api/v1/conversations/:conversationId/events", async (ctx) => {
     await authenticateRequest(ctx, paths);
-    const after = readInteger3(ctx.query.after) ?? 0;
+    const after = resolveConversationEventCursor({
+      queryAfter: ctx.query.after,
+      lastEventIdHeader: ctx.req.headers["last-event-id"]
+    });
     const history = await conversations.listEvents(
       ctx.params.conversationId,
       after
     );
     ctx.respond = false;
     const response = ctx.res;
-    response.statusCode = 200;
-    response.setHeader("content-type", "text/event-stream; charset=utf-8");
-    response.setHeader("cache-control", "no-store");
-    response.setHeader("connection", "keep-alive");
+    let unsubscribe = () => {
+    };
+    beginSseStream(ctx.req, response, {
+      onClose: () => unsubscribe()
+    });
     for (const event of history) {
       writeSseEvent(response, event);
     }
-    const unsubscribe = conversations.subscribe(
+    unsubscribe = conversations.subscribe(
       ctx.params.conversationId,
       (event) => {
         writeSseEvent(response, event);
       }
     );
-    const cleanup = () => {
-      unsubscribe();
-      response.end();
-    };
-    ctx.req.on("close", cleanup);
   });
   router.post("/api/v1/conversations/:conversationId/messages", async (ctx) => {
     await authenticateRequest(ctx, paths);
@@ -14267,6 +14809,19 @@ function registerConversationRoutes(router, options) {
     }
   );
 }
+function resolveConversationEventCursor(input) {
+  const queryAfter = readInteger3(input.queryAfter) ?? 0;
+  const headerAfter = readNonNegativeIntegerHeader(input.lastEventIdHeader) ?? 0;
+  return Math.max(queryAfter, headerAfter);
+}
+function readNonNegativeIntegerHeader(value) {
+  const raw = Array.isArray(value) ? value[0] : value;
+  if (!raw) {
+    return null;
+  }
+  const parsed = Number.parseInt(raw, 10);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : null;
+}
 function contentDispositionInline(filename) {
   const fallback = asciiFilenameFallback(filename);
   return `inline; filename="${fallback}"; filename*=UTF-8''${encodeRfc5987Value(filename)}`;
@@ -18260,22 +18815,18 @@ function registerProfileRoutes(router, options) {
     await authenticateRequest(ctx, paths);
     ctx.respond = false;
     const response = ctx.res;
-    response.statusCode = 200;
-    response.setHeader("content-type", "text/event-stream; charset=utf-8");
-    response.setHeader("cache-control", "no-store");
-    response.setHeader("connection", "keep-alive");
+    let unsubscribe = () => {
+    };
+    beginSseStream(ctx.req, response, {
+      onClose: () => unsubscribe()
+    });
     writeProfileCreationSseEvent(
       response,
       await readHermesProfileCreationStatus(paths)
     );
-    const unsubscribe = subscribeHermesProfileCreationStatus((status) => {
+    unsubscribe = subscribeHermesProfileCreationStatus((status) => {
       writeProfileCreationSseEvent(response, status);
     });
-    const cleanup = () => {
-      unsubscribe();
-      response.end();
-    };
-    ctx.req.on("close", cleanup);
   });
   router.get("/api/v1/profiles/:name/status", async (ctx) => {
     await authenticateRequest(ctx, paths);
@@ -18491,10 +19042,10 @@ function isProfileAvatarUrl(value) {
   return isHttpUrl(value) || /^data:image\/[a-z0-9.+-]+;base64,/iu.test(value);
 }
 function writeProfileCreationSseEvent(response, status) {
-  response.write("event: profile.creation.status\n");
-  response.write(`data: ${JSON.stringify(status)}
-
-`);
+  writeJsonSseEvent(response, {
+    event: "profile.creation.status",
+    data: status
+  });
 }
 
 // src/http/routes/runs.ts
@@ -19784,6 +20335,7 @@ var DEFAULT_STARTUP_REPORT_MIN_INTERVAL_MS = 15 * 6e4;
 function startLanIpMonitor(options) {
   let running = false;
   let closed = false;
+  let current = Promise.resolve();
   const check = async (context = {}) => {
     if (running || closed) {
       return;
@@ -19799,15 +20351,16 @@ function startLanIpMonitor(options) {
       running = false;
     }
   };
-  void check({ forceReport: true, publishToRelay: true });
+  current = check({ forceReport: true, publishToRelay: true });
   const timer = setInterval(() => {
-    void check();
+    current = check();
   }, options.intervalMs ?? DEFAULT_INTERVAL_MS);
   timer.unref?.();
   return {
-    close() {
+    async close() {
       closed = true;
       clearInterval(timer);
+      await current.catch(() => void 0);
     }
   };
 }
@@ -19877,6 +20430,7 @@ async function checkLanIpChange(options, context = {}) {
 // src/daemon/scheduler.ts
 function startCronDeliveryScheduler(options) {
   let running = false;
+  let current = Promise.resolve();
   const syncCronDeliveries = async () => {
     if (running) {
       return;
@@ -19897,17 +20451,19 @@ function startCronDeliveryScheduler(options) {
     }
   };
   const timer = setInterval(() => {
-    void syncCronDeliveries();
+    current = syncCronDeliveries();
   }, options.intervalMs ?? 3e4);
   timer.unref?.();
   return {
-    close() {
+    async close() {
       clearInterval(timer);
+      await current.catch(() => void 0);
     }
   };
 }
 function startHermesSessionSyncScheduler(options) {
   let running = false;
+  let current = Promise.resolve();
   const syncSessions = async () => {
     if (running) {
       return;
@@ -19924,12 +20480,13 @@ function startHermesSessionSyncScheduler(options) {
     }
   };
   const timer = setInterval(() => {
-    void syncSessions();
+    current = syncSessions();
   }, options.intervalMs ?? 10 * 60 * 1e3);
   timer.unref?.();
   return {
-    close() {
+    async close() {
       clearInterval(timer);
+      await current.catch(() => void 0);
     }
   };
 }
@@ -19953,8 +20510,9 @@ async function startLinkService(options = {}) {
   }
   const conversations = new ConversationService(paths, logger);
   await conversations.rebuildStatisticsIndex();
+  let hermesSessionSync = Promise.resolve();
   const triggerHermesSessionSync = () => {
-    void conversations.syncHermesSessions().catch((error) => {
+    hermesSessionSync = Promise.resolve().then(() => conversations.syncHermesSessions()).then(() => void 0).catch((error) => {
       void logger.warn("hermes_session_sync_failed", {
         error: error instanceof Error ? error.message : String(error)
       });
@@ -20028,11 +20586,14 @@ async function startLinkService(options = {}) {
   }
   return {
     async close() {
-      scheduler.close();
-      hermesSessionSyncScheduler.close();
-      lanIpMonitor.close();
       relay?.close();
       await closeServer(server);
+      await Promise.all([
+        scheduler.close(),
+        hermesSessionSyncScheduler.close(),
+        lanIpMonitor.close(),
+        hermesSessionSync.catch(() => void 0)
+      ]);
       await logger.info("service_stopped");
       await logger.flush();
       if (options.writePidFile) {
@@ -21646,26 +22207,22 @@ function registerHermesUpdateRoutes(router, options) {
     await authenticateRequest(ctx, paths);
     ctx.respond = false;
     const response = ctx.res;
-    response.statusCode = 200;
-    response.setHeader("content-type", "text/event-stream; charset=utf-8");
-    response.setHeader("cache-control", "no-store");
-    response.setHeader("connection", "keep-alive");
+    let unsubscribe = () => {
+    };
+    beginSseStream(ctx.req, response, {
+      onClose: () => unsubscribe()
+    });
     writeUpdateSseEvent(response, await readHermesUpdateStatus(paths));
-    const unsubscribe = subscribeHermesUpdateStatus((status) => {
+    unsubscribe = subscribeHermesUpdateStatus((status) => {
       writeUpdateSseEvent(response, status);
     });
-    const cleanup = () => {
-      unsubscribe();
-      response.end();
-    };
-    ctx.req.on("close", cleanup);
   });
 }
 function writeUpdateSseEvent(response, status) {
-  response.write("event: hermes.update.status\n");
-  response.write(`data: ${JSON.stringify(status)}
-
-`);
+  writeJsonSseEvent(response, {
+    event: "hermes.update.status",
+    data: status
+  });
 }
 
 // src/http/routes/link-updates.ts
@@ -21695,26 +22252,22 @@ function registerLinkUpdateRoutes(router, options) {
     await authenticateRequest(ctx, paths);
     ctx.respond = false;
     const response = ctx.res;
-    response.statusCode = 200;
-    response.setHeader("content-type", "text/event-stream; charset=utf-8");
-    response.setHeader("cache-control", "no-store");
-    response.setHeader("connection", "keep-alive");
+    let unsubscribe = () => {
+    };
+    beginSseStream(ctx.req, response, {
+      onClose: () => unsubscribe()
+    });
     writeUpdateSseEvent2(response, await readLinkUpdateStatus(paths));
-    const unsubscribe = subscribeLinkUpdateStatus((status) => {
+    unsubscribe = subscribeLinkUpdateStatus((status) => {
       writeUpdateSseEvent2(response, status);
     });
-    const cleanup = () => {
-      unsubscribe();
-      response.end();
-    };
-    ctx.req.on("close", cleanup);
   });
 }
 function writeUpdateSseEvent2(response, status) {
-  response.write("event: link.update.status\n");
-  response.write(`data: ${JSON.stringify(status)}
-
-`);
+  writeJsonSseEvent(response, {
+    event: "link.update.status",
+    data: status
+  });
 }
 
 // src/http/routes/pairing.ts