@claude-sessions/core 0.4.0 → 0.4.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { M as MessagePayload, a as Message, P as Project, S as SummaryInfo, T as TodoItem, b as MoveSessionResult, A as AgentInfo, c as SessionSortOptions, C as CompressSessionOptions, d as SummarizeSessionOptions, e as ConversationLine, f as SearchResult, F as FileChange, g as SessionsIndex, h as SessionIndexEntry } from './types-BdPaAnP8.js';
-export { o as CleanupPreview, n as ClearSessionsResult, v as CompressSessionResult, i as ContentItem, D as DeleteSessionResult, w as ProjectKnowledge, q as ProjectTreeData, R as RenameSessionResult, r as ResumeSessionOptions, s as ResumeSessionResult, u as SessionAnalysis, l as SessionFilesSummary, j as SessionMeta, y as SessionSortField, z as SessionSortOrder, k as SessionTodos, p as SessionTreeData, m as SplitSessionResult, x as SummarizeSessionResult, t as ToolUsageStats } from './types-BdPaAnP8.js';
+import { M as MessagePayload$1, a as Message, P as Project, S as SummaryInfo, b as SessionTodos, c as MoveSessionResult, A as AgentInfo, d as SessionSortOptions, e as ProjectTreeData, C as CompressSessionOptions, f as SummarizeSessionOptions, g as ConversationLine, h as SearchResult, F as FileChange, i as SessionsIndex, j as SessionIndexEntry } from './types-DZsLFIFK.js';
+export { p as CleanupPreview, o as ClearSessionsResult, v as CompressSessionResult, k as ContentItem, D as DeleteSessionResult, w as ProjectKnowledge, R as RenameSessionResult, r as ResumeSessionOptions, s as ResumeSessionResult, u as SessionAnalysis, m as SessionFilesSummary, l as SessionMeta, y as SessionSortField, z as SessionSortOrder, q as SessionTreeData, n as SplitSessionResult, x as SummarizeSessionResult, T as TodoItem, t as ToolUsageStats } from './types-DZsLFIFK.js';
 import * as effect_Cause from 'effect/Cause';
 import { Effect } from 'effect';
 
@@ -62,13 +62,22 @@ declare const findProjectByWorkspacePath: (workspacePath: string, projectNames:
  * Utility functions for message processing
  */
 
-declare const extractTextContent: (message: MessagePayload | undefined) => string;
+declare const extractTextContent: (message: MessagePayload$1 | undefined) => string;
+/**
+ * Parse command message content (e.g., slash commands like /commit)
+ * Returns the command name and message extracted from XML tags
+ */
+declare const parseCommandMessage: (content?: string) => {
+    name: string;
+    message: string;
+};
 declare const extractTitle: (text: string) => string;
 declare const isInvalidApiKeyMessage: (msg: Message) => boolean;
 declare const isContinuationSummary: (msg: Message) => boolean;
 /**
  * Get display title with fallback logic
  * Priority: customTitle > currentSummary (truncated) > title > fallback
+ * Also handles slash command format in title
  */
 declare const getDisplayTitle: (customTitle: string | undefined, currentSummary: string | undefined, title: string | undefined, maxLength?: number, fallback?: string) => string;
 /**
@@ -76,21 +85,6 @@ declare const getDisplayTitle: (customTitle: string | undefined, currentSummary:
  * Only masks the specified homeDir, not other users' paths
  */
 declare const maskHomePath: (text: string, homeDir: string) => string;
-/**
- * Get session sort timestamp based on official Claude Code extension behavior
- *
- * CRITICAL ARCHITECTURE:
- * - Summary records have `leafUuid` but NO timestamp in the summary record itself
- * - `leafUuid` points to a message in ANOTHER session (cross-session reference)
- * - The timestamp for sorting must come from the TARGET message's timestamp
- * - Official extension uses leafUuid's target message timestamp for sorting/display
- *
- * Priority: summaries[0].timestamp (leafUuid-based) > createdAt
- */
-declare const getSessionSortTimestamp: (session: {
-    summaries?: SummaryInfo[];
-    createdAt?: string;
-}) => string | undefined;
 /**
  * Sort projects with priority:
  * 1. Current project (if specified)
@@ -102,6 +96,14 @@ declare const sortProjects: (projects: Project[], options?: {
     homeDir?: string;
     filterEmpty?: boolean;
 }) => Project[];
+/**
+ * Get sort timestamp for session (Unix timestamp ms)
+ * Priority: summaries[0].timestamp > createdAt > 0
+ */
+declare const getSessionSortTimestamp: (session: {
+    summaries?: SummaryInfo[];
+    createdAt?: string;
+}) => number;
 
 declare const findLinkedAgents: (projectName: string, sessionId: string) => Effect.Effect<string[], effect_Cause.UnknownException, never>;
 declare const findOrphanAgents: (projectName: string) => Effect.Effect<{
@@ -121,15 +123,7 @@ declare const deleteOrphanAgents: (projectName: string) => Effect.Effect<{
 declare const loadAgentMessages: (projectName: string, _sessionId: string, // Reserved for future validation
 agentId: string) => Effect.Effect<Message[], effect_Cause.UnknownException, never>;
 
-declare const findLinkedTodos: (sessionId: string, agentIds?: string[]) => Effect.Effect<{
-    sessionId: string;
-    sessionTodos: TodoItem[];
-    agentTodos: {
-        agentId: string;
-        todos: TodoItem[];
-    }[];
-    hasTodos: boolean;
-}, effect_Cause.UnknownException, never>;
+declare const findLinkedTodos: (sessionId: string, agentIds?: string[]) => Effect.Effect<SessionTodos | undefined, effect_Cause.UnknownException, never>;
 declare const sessionHasTodos: (sessionId: string, agentIds?: string[]) => Effect.Effect<boolean, effect_Cause.UnknownException, never>;
 declare const deleteLinkedTodos: (sessionId: string, agentIds: string[]) => Effect.Effect<{
     deletedCount: number;
@@ -156,7 +150,7 @@ declare const listSessions: (projectName: string) => Effect.Effect<{
     updatedAt: string | undefined;
 }[], effect_Cause.UnknownException, never>;
 declare const readSession: (projectName: string, sessionId: string) => Effect.Effect<Message[], effect_Cause.UnknownException, never>;
-declare const deleteMessage: (projectName: string, sessionId: string, messageUuid: string) => Effect.Effect<{
+declare const deleteMessage: (projectName: string, sessionId: string, messageUuid: string, targetType?: "file-history-snapshot" | "summary") => Effect.Effect<{
     success: boolean;
     error: string;
     deletedMessage?: undefined;
@@ -217,48 +211,13 @@ declare const loadSessionTreeData: (projectName: string, sessionId: string) => E
     createdAt: string;
     updatedAt: string;
     fileMtime: number | undefined;
+    sortTimestamp: number;
     summaries: SummaryInfo[];
     agents: AgentInfo[];
-    todos: {
-        sessionId: string;
-        sessionTodos: TodoItem[];
-        agentTodos: {
-            agentId: string;
-            todos: TodoItem[];
-        }[];
-        hasTodos: boolean;
-    };
+    todos: SessionTodos | undefined;
     lastCompactBoundaryUuid: string | undefined;
 }, effect_Cause.UnknownException, never>;
-declare const loadProjectTreeData: (projectName: string, sortOptions?: SessionSortOptions) => Effect.Effect<{
-    name: string;
-    displayName: string;
-    path: string;
-    sessionCount: number;
-    sessions: {
-        id: string;
-        projectName: string;
-        title: string;
-        customTitle: string | undefined;
-        currentSummary: string;
-        messageCount: number;
-        createdAt: string;
-        updatedAt: string;
-        fileMtime: number | undefined;
-        summaries: SummaryInfo[];
-        agents: AgentInfo[];
-        todos: {
-            sessionId: string;
-            sessionTodos: TodoItem[];
-            agentTodos: {
-                agentId: string;
-                todos: TodoItem[];
-            }[];
-            hasTodos: boolean;
-        };
-        lastCompactBoundaryUuid: string | undefined;
-    }[];
-} | null, effect_Cause.UnknownException, never>;
+declare const loadProjectTreeData: (projectName: string, sortOptions?: SessionSortOptions) => Effect.Effect<ProjectTreeData | null, effect_Cause.UnknownException, never>;
 
 declare const analyzeSession: (projectName: string, sessionId: string) => Effect.Effect<{
     sessionId: string;
@@ -373,6 +332,75 @@ declare const getSessionFiles: (projectName: string, sessionId: string) => Effec
     totalChanges: number;
 }, effect_Cause.UnknownException, never>;
 
+/**
+ * Session message chain validation utilities
+ *
+ * Validates:
+ * 1. parentUuid chain integrity (skip file-history-snapshot)
+ * 2. tool_use_id / tool_result matching
+ */
+interface ChainError {
+    type: 'broken_chain' | 'orphan_parent';
+    uuid: string;
+    line: number;
+    parentUuid: string | null;
+    expectedParent?: string;
+}
+interface ToolUseResultError {
+    type: 'orphan_tool_result';
+    uuid: string;
+    line: number;
+    toolUseId: string;
+}
+interface ValidationResult {
+    valid: boolean;
+    errors: (ChainError | ToolUseResultError)[];
+}
+interface MessagePayload {
+    role?: string;
+    content?: unknown;
+}
+interface GenericMessage {
+    type?: string;
+    uuid?: string;
+    parentUuid?: string | null;
+    message?: MessagePayload;
+    messageId?: string;
+}
+/**
+ * Validate parentUuid chain for messages
+ *
+ * Rules:
+ * - Skip file-history-snapshot type (has no uuid, uses messageId instead)
+ * - Skip messages without uuid
+ * - First message can have null parentUuid
+ * - Subsequent messages must have valid parentUuid pointing to existing uuid
+ */
+declare function validateChain(messages: readonly GenericMessage[]): ValidationResult;
+/**
+ * Validate tool_use_id / tool_result matching
+ *
+ * Rules:
+ * - All tool_result blocks must have a corresponding tool_use block in the session
+ * - tool_use blocks are collected from all messages (not just previous)
+ */
+declare function validateToolUseResult(messages: readonly GenericMessage[]): ValidationResult;
+/**
+ * Delete a message and repair the parentUuid chain
+ *
+ * This is a pure function for client-side use (without file I/O)
+ * Server-side deleteMessage in crud.ts uses similar logic with file operations
+ *
+ * @param messages - Array of messages (will be mutated)
+ * @param targetId - uuid, messageId, or leafUuid of message to delete
+ * @param targetType - Optional: 'file-history-snapshot' or 'summary' to disambiguate collisions
+ * @returns Object with deleted message and messages to also delete (orphan tool_results)
+ */
+declare function deleteMessageWithChainRepair<T extends GenericMessage>(messages: T[], targetId: string, targetType?: 'file-history-snapshot' | 'summary'): {
+    deleted: T | null;
+    alsoDeleted: T[];
+};
+
 /**
  * Load sessions-index.json for a project
  * Returns null if the file doesn't exist
@@ -426,4 +454,4 @@ declare const getLogger: () => Logger;
  */
 declare const createLogger: (namespace: string) => Logger;
 
-export { AgentInfo, CompressSessionOptions, ConversationLine, FileChange, type Logger, Message, MessagePayload, MoveSessionResult, Project, SearchResult, SessionIndexEntry, SessionSortOptions, SessionsIndex, SummarizeSessionOptions, SummaryInfo, TodoItem, analyzeSession, clearSessions, compressSession, createLogger, deleteLinkedTodos, deleteMessage, deleteOrphanAgents, deleteOrphanTodos, deleteSession, displayPathToFolderName, extractProjectKnowledge, extractTextContent, extractTitle, findLinkedAgents, findLinkedTodos, findOrphanAgents, findOrphanTodos, findProjectByWorkspacePath, folderNameToDisplayPath, folderNameToPath, getDisplayTitle, getIndexEntryDisplayTitle, getLogger, getRealPathFromSession, getSessionFiles, getSessionSortTimestamp, getSessionsDir, getTodosDir, hasSessionsIndex, isContinuationSummary, isInvalidApiKeyMessage, listProjects, listSessions, loadAgentMessages, loadProjectTreeData, loadSessionTreeData, loadSessionsIndex, maskHomePath, moveSession, pathToFolderName, previewCleanup, readSession, renameSession, restoreMessage, searchSessions, sessionHasTodos, setLogger, sortIndexEntriesByModified, sortProjects, splitSession, summarizeSession, updateSessionSummary };
+export { AgentInfo, type ChainError, CompressSessionOptions, ConversationLine, FileChange, type Logger, Message, MessagePayload$1 as MessagePayload, MoveSessionResult, Project, ProjectTreeData, SearchResult, SessionIndexEntry, SessionSortOptions, SessionTodos, SessionsIndex, SummarizeSessionOptions, SummaryInfo, type ToolUseResultError, type ValidationResult, analyzeSession, clearSessions, compressSession, createLogger, deleteLinkedTodos, deleteMessage, deleteMessageWithChainRepair, deleteOrphanAgents, deleteOrphanTodos, deleteSession, displayPathToFolderName, extractProjectKnowledge, extractTextContent, extractTitle, findLinkedAgents, findLinkedTodos, findOrphanAgents, findOrphanTodos, findProjectByWorkspacePath, folderNameToDisplayPath, folderNameToPath, getDisplayTitle, getIndexEntryDisplayTitle, getLogger, getRealPathFromSession, getSessionFiles, getSessionSortTimestamp, getSessionsDir, getTodosDir, hasSessionsIndex, isContinuationSummary, isInvalidApiKeyMessage, listProjects, listSessions, loadAgentMessages, loadProjectTreeData, loadSessionTreeData, loadSessionsIndex, maskHomePath, moveSession, parseCommandMessage, pathToFolderName, previewCleanup, readSession, renameSession, restoreMessage, searchSessions, sessionHasTodos, setLogger, sortIndexEntriesByModified, sortProjects, splitSession, summarizeSession, updateSessionSummary, validateChain, validateToolUseResult };

package/dist/index.js

@@ -178,14 +178,19 @@ var extractTextContent = (message) => {
   }
   return "";
 };
+var parseCommandMessage = (content) => {
+  const name = content?.match(/<command-name>([^<]+)<\/command-name>/)?.[1] ?? "";
+  const message = content?.match(/<command-message>([^<]+)<\/command-message>/)?.[1] ?? "";
+  return { name, message };
+};
 var extractTitle = (text) => {
   if (!text) return "Untitled";
+  const { name } = parseCommandMessage(text);
+  if (name) return name;
   let cleaned = text.replace(/<ide_[^>]*>[\s\S]*?<\/ide_[^>]*>/g, "").trim();
   if (!cleaned) return "Untitled";
   if (cleaned.includes("\n\n")) {
     cleaned = cleaned.split("\n\n")[0];
-  } else if (cleaned.includes("\n")) {
-    cleaned = cleaned.split("\n")[0];
   }
   if (cleaned.length > 100) {
     return cleaned.slice(0, 100) + "...";
@@ -218,7 +223,13 @@ var getDisplayTitle = (customTitle, currentSummary, title, maxLength = 60, fallb
   if (currentSummary) {
     return currentSummary.length > maxLength ? currentSummary.slice(0, maxLength - 3) + "..." : currentSummary;
   }
-  if (title && title !== "Untitled") return title;
+  if (title && title !== "Untitled") {
+    if (title.includes("<command-name>")) {
+      const { name } = parseCommandMessage(title);
+      if (name) return name;
+    }
+    return title;
+  }
   return fallback;
 };
 var replaceMessageContent = (msg, text) => ({
@@ -254,9 +265,6 @@ var maskHomePath = (text, homeDir) => {
   const regex = new RegExp(`${escapedHome}(?=[/\\\\]|$)`, "g");
   return text.replace(regex, "~");
 };
-var getSessionSortTimestamp = (session) => {
-  return session.summaries?.[0]?.timestamp ?? session.createdAt;
-};
 var sortProjects = (projects, options = {}) => {
   const { currentProjectName, homeDir, filterEmpty = true } = options;
   const filtered = filterEmpty ? projects.filter((p) => p.sessionCount > 0) : projects;
@@ -275,6 +283,10 @@ var sortProjects = (projects, options = {}) => {
     return a.displayName.localeCompare(b.displayName);
   });
 };
+var getSessionSortTimestamp = (session) => {
+  const timestampStr = session.summaries?.[0]?.timestamp ?? session.createdAt;
+  return timestampStr ? new Date(timestampStr).getTime() : 0;
+};
 
 // src/agents.ts
 import { Effect } from "effect";
@@ -452,12 +464,7 @@ var findLinkedTodos = (sessionId, agentIds = []) => Effect2.gen(function* () {
     () => fs3.access(todosDir).then(() => true).catch(() => false)
   );
   if (!exists) {
-    return {
-      sessionId,
-      sessionTodos: [],
-      agentTodos: [],
-      hasTodos: false
-    };
+    return void 0;
   }
   const sessionTodoPath = path3.join(todosDir, `${sessionId}.json`);
   let sessionTodos = [];
@@ -675,6 +682,177 @@ import { Effect as Effect4, pipe, Array as A, Option as O } from "effect";
 import * as fs5 from "fs/promises";
 import * as path5 from "path";
 import * as crypto from "crypto";
+
+// src/session/validation.ts
+function validateChain(messages) {
+  const errors = [];
+  const uuids = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    if (msg.uuid) {
+      uuids.add(msg.uuid);
+    }
+  }
+  let foundFirstMessage = false;
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.type === "file-history-snapshot") {
+      continue;
+    }
+    if (!msg.uuid) {
+      continue;
+    }
+    if (!foundFirstMessage) {
+      foundFirstMessage = true;
+      if (msg.parentUuid === null) {
+        continue;
+      }
+      if (msg.parentUuid === void 0) {
+        errors.push({
+          type: "broken_chain",
+          uuid: msg.uuid,
+          line: i + 1,
+          parentUuid: null
+        });
+        continue;
+      }
+    }
+    if (msg.parentUuid === null || msg.parentUuid === void 0) {
+      errors.push({
+        type: "broken_chain",
+        uuid: msg.uuid,
+        line: i + 1,
+        parentUuid: null
+      });
+      continue;
+    }
+    if (!uuids.has(msg.parentUuid)) {
+      errors.push({
+        type: "orphan_parent",
+        uuid: msg.uuid,
+        line: i + 1,
+        parentUuid: msg.parentUuid
+      });
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function validateToolUseResult(messages) {
+  const errors = [];
+  const toolUseIds = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    const content = msg.message?.content;
+    if (Array.isArray(content)) {
+      for (const item of content) {
+        if (item.type === "tool_use" && item.id) {
+          toolUseIds.add(item.id);
+        }
+      }
+    }
+  }
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    const content = msg.message?.content;
+    if (!Array.isArray(content)) {
+      continue;
+    }
+    for (const item of content) {
+      if (item.type === "tool_result" && item.tool_use_id) {
+        if (!toolUseIds.has(item.tool_use_id)) {
+          errors.push({
+            type: "orphan_tool_result",
+            uuid: msg.uuid || "",
+            line: i + 1,
+            toolUseId: item.tool_use_id
+          });
+        }
+      }
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function deleteMessageWithChainRepair(messages, targetId, targetType) {
+  let targetIndex = -1;
+  if (targetType === "file-history-snapshot") {
+    targetIndex = messages.findIndex(
+      (m) => m.type === "file-history-snapshot" && m.messageId === targetId
+    );
+  } else if (targetType === "summary") {
+    targetIndex = messages.findIndex(
+      (m) => m.leafUuid === targetId
+    );
+  } else {
+    targetIndex = messages.findIndex((m) => m.uuid === targetId);
+    if (targetIndex === -1) {
+      targetIndex = messages.findIndex(
+        (m) => m.leafUuid === targetId
+      );
+    }
+    if (targetIndex === -1) {
+      targetIndex = messages.findIndex(
+        (m) => m.type === "file-history-snapshot" && m.messageId === targetId
+      );
+    }
+  }
+  if (targetIndex === -1) {
+    return { deleted: null, alsoDeleted: [] };
+  }
+  const deletedMsg = messages[targetIndex];
+  const toolUseIds = [];
+  if (deletedMsg.type === "assistant") {
+    const content = deletedMsg.message?.content;
+    if (Array.isArray(content)) {
+      for (const item of content) {
+        if (item.type === "tool_use" && item.id) {
+          toolUseIds.push(item.id);
+        }
+      }
+    }
+  }
+  const toolResultIndices = [];
+  if (toolUseIds.length > 0) {
+    for (let i = 0; i < messages.length; i++) {
+      const msg = messages[i];
+      if (msg.type === "user") {
+        const content = msg.message?.content;
+        if (Array.isArray(content)) {
+          for (const item of content) {
+            if (item.type === "tool_result" && item.tool_use_id && toolUseIds.includes(item.tool_use_id)) {
+              toolResultIndices.push(i);
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  const indicesToDelete = [targetIndex, ...toolResultIndices].sort((a, b) => b - a);
+  for (const idx of indicesToDelete) {
+    const msg = messages[idx];
+    const isInParentChain = msg.type !== "file-history-snapshot" && msg.uuid;
+    if (isInParentChain) {
+      const deletedUuid = msg.uuid;
+      const parentUuid = msg.parentUuid;
+      for (const m of messages) {
+        if (m.parentUuid === deletedUuid) {
+          m.parentUuid = parentUuid;
+        }
+      }
+    }
+  }
+  const alsoDeleted = toolResultIndices.map((i) => messages[i]);
+  for (const idx of indicesToDelete) {
+    messages.splice(idx, 1);
+  }
+  return { deleted: deletedMsg, alsoDeleted };
+}
+
+// src/session/crud.ts
 var updateSessionSummary = (projectName, sessionId, newSummary) => Effect4.gen(function* () {
   const filePath = path5.join(getSessionsDir(), projectName, `${sessionId}.jsonl`);
   const content = yield* Effect4.tryPromise(() => fs5.readFile(filePath, "utf-8"));
@@ -763,29 +941,18 @@ var readSession = (projectName, sessionId) => Effect4.gen(function* () {
   const lines = content.trim().split("\n").filter(Boolean);
   return lines.map((line) => JSON.parse(line));
 });
-var deleteMessage = (projectName, sessionId, messageUuid) => Effect4.gen(function* () {
+var deleteMessage = (projectName, sessionId, messageUuid, targetType) => Effect4.gen(function* () {
   const filePath = path5.join(getSessionsDir(), projectName, `${sessionId}.jsonl`);
   const content = yield* Effect4.tryPromise(() => fs5.readFile(filePath, "utf-8"));
   const lines = content.trim().split("\n").filter(Boolean);
   const messages = lines.map((line) => JSON.parse(line));
-  const targetIndex = messages.findIndex(
-    (m) => m.uuid === messageUuid || m.messageId === messageUuid || m.leafUuid === messageUuid
-  );
-  if (targetIndex === -1) {
+  const result = deleteMessageWithChainRepair(messages, messageUuid, targetType);
+  if (!result.deleted) {
     return { success: false, error: "Message not found" };
   }
-  const deletedMsg = messages[targetIndex];
-  const deletedUuid = deletedMsg?.uuid ?? deletedMsg?.messageId;
-  const parentUuid = deletedMsg?.parentUuid;
-  for (const msg of messages) {
-    if (msg.parentUuid === deletedUuid) {
-      msg.parentUuid = parentUuid;
-    }
-  }
-  messages.splice(targetIndex, 1);
   const newContent = messages.map((m) => JSON.stringify(m)).join("\n") + "\n";
   yield* Effect4.tryPromise(() => fs5.writeFile(filePath, newContent, "utf-8"));
-  return { success: true, deletedMessage: deletedMsg };
+  return { success: true, deletedMessage: result.deleted };
 });
 var restoreMessage = (projectName, sessionId, message, index) => Effect4.gen(function* () {
   const filePath = path5.join(getSessionsDir(), projectName, `${sessionId}.jsonl`);
@@ -1063,6 +1230,44 @@ var splitSession = (projectName, sessionId, splitAtMessageUuid) => Effect4.gen(f
 import { Effect as Effect5 } from "effect";
 import * as fs6 from "fs/promises";
 import * as path6 from "path";
+var sortSessions = (sessions, sort) => {
+  return sessions.sort((a, b) => {
+    let comparison = 0;
+    switch (sort.field) {
+      case "summary": {
+        comparison = a.sortTimestamp - b.sortTimestamp;
+        break;
+      }
+      case "modified": {
+        comparison = (a.fileMtime ?? 0) - (b.fileMtime ?? 0);
+        break;
+      }
+      case "created": {
+        const createdA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
+        const createdB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
+        comparison = createdA - createdB;
+        break;
+      }
+      case "updated": {
+        const updatedA = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+        const updatedB = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+        comparison = updatedA - updatedB;
+        break;
+      }
+      case "messageCount": {
+        comparison = a.messageCount - b.messageCount;
+        break;
+      }
+      case "title": {
+        const titleA = a.customTitle ?? a.currentSummary ?? a.title;
+        const titleB = b.customTitle ?? b.currentSummary ?? b.title;
+        comparison = titleA.localeCompare(titleB);
+        break;
+      }
+    }
+    return sort.order === "desc" ? -comparison : comparison;
+  });
+};
 var loadSessionTreeDataInternal = (projectName, sessionId, summariesByTargetSession, fileMtime) => Effect5.gen(function* () {
   const projectPath = path6.join(getSessionsDir(), projectName);
   const filePath = path6.join(projectPath, `${sessionId}.jsonl`);
@@ -1164,6 +1369,8 @@ var loadSessionTreeDataInternal = (projectName, sessionId, summariesByTargetSess
     }
   }
   const todos = yield* findLinkedTodos(sessionId, linkedAgentIds);
+  const createdAt = firstMessage?.timestamp ?? void 0;
+  const sortTimestamp = getSessionSortTimestamp({ summaries, createdAt });
   return {
     id: sessionId,
     projectName,
@@ -1171,9 +1378,10 @@ var loadSessionTreeDataInternal = (projectName, sessionId, summariesByTargetSess
     customTitle,
     currentSummary: summaries[0]?.summary,
     messageCount: userAssistantMessages.length > 0 ? userAssistantMessages.length : summaries.length > 0 ? 1 : 0,
-    createdAt: firstMessage?.timestamp ?? void 0,
+    createdAt,
     updatedAt: lastMessage?.timestamp ?? void 0,
     fileMtime,
+    sortTimestamp,
     summaries,
     agents,
     todos,
@@ -1275,46 +1483,7 @@ var loadProjectTreeData = (projectName, sortOptions) => Effect5.gen(function* ()
     }),
     { concurrency: 10 }
   );
-  const sortedSessions = sessions.sort((a, b) => {
-    let comparison = 0;
-    switch (sort.field) {
-      case "summary": {
-        const timeA = getSessionSortTimestamp(a);
-        const timeB = getSessionSortTimestamp(b);
-        const dateA = timeA ? new Date(timeA).getTime() : a.fileMtime ?? 0;
-        const dateB = timeB ? new Date(timeB).getTime() : b.fileMtime ?? 0;
-        comparison = dateA - dateB;
-        break;
-      }
-      case "modified": {
-        comparison = (a.fileMtime ?? 0) - (b.fileMtime ?? 0);
-        break;
-      }
-      case "created": {
-        const createdA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
-        const createdB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
-        comparison = createdA - createdB;
-        break;
-      }
-      case "updated": {
-        const updatedA = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
-        const updatedB = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
-        comparison = updatedA - updatedB;
-        break;
-      }
-      case "messageCount": {
-        comparison = a.messageCount - b.messageCount;
-        break;
-      }
-      case "title": {
-        const titleA = a.customTitle ?? a.currentSummary ?? a.title;
-        const titleB = b.customTitle ?? b.currentSummary ?? b.title;
-        comparison = titleA.localeCompare(titleB);
-        break;
-      }
-    }
-    return sort.order === "desc" ? -comparison : comparison;
-  });
+  const sortedSessions = sortSessions(sessions, sort);
   const filteredSessions = sortedSessions.filter((s) => {
     if (isErrorSessionTitle(s.title)) return false;
     if (isErrorSessionTitle(s.customTitle)) return false;
@@ -1988,6 +2157,7 @@ export {
   createLogger,
   deleteLinkedTodos,
   deleteMessage,
+  deleteMessageWithChainRepair,
   deleteOrphanAgents,
   deleteOrphanTodos,
   deleteSession,
@@ -2021,6 +2191,7 @@ export {
   loadSessionsIndex,
   maskHomePath,
   moveSession,
+  parseCommandMessage,
   pathToFolderName,
   previewCleanup,
   readSession,
@@ -2033,6 +2204,8 @@ export {
   sortProjects,
   splitSession,
   summarizeSession,
-  updateSessionSummary
+  updateSessionSummary,
+  validateChain,
+  validateToolUseResult
 };
 //# sourceMappingURL=index.js.map