@geminixiang/mikan 1.0.0-beta.87 → 1.0.0-beta.89

package/dist/adapters/web/session-view/portal.d.ts

@@ -15,6 +15,5 @@ export declare function parseUserBody(raw: string): {
     header: string | null;
     content: string;
 };
-export declare function resolveExistingSessionFile(office: Office, sessionKey: string): string | null;
-export declare function loadSessionViewModel(sessionFile: string): Promise<SessionViewModel>;
+export declare function loadSessionViewModel(office: Office, sessionKey: string): Promise<SessionViewModel>;
 //# sourceMappingURL=portal.d.ts.map

package/dist/adapters/web/session-view/portal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../../src/adapters/web/session-view/portal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAejE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAGV,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAGV,6BAA6B,EAC9B,MAAM,mBAAmB,CAAC;AAmB3B,qBAAa,6BAA8B,SAAQ,kBAAkB,CAAC,gBAAgB,CAAC;IACrF,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG,gBAAgB,CAS/D;CACF;AA6DD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAIhE,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,GAAG,EACR,qBAAqB,CAAC,EAAE,6BAA6B,EACrD,WAAW,CAAC,EAAE,6BAA6B,GAC1C,OAAO,CAAC,OAAO,CAAC,CAuElB;AAwLD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG;IAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CA4BA;AAm6CD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK5F;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyDzF"}
+{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../../src/adapters/web/session-view/portal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAOjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAGV,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAGV,6BAA6B,EAC9B,MAAM,mBAAmB,CAAC;AAmB3B,qBAAa,6BAA8B,SAAQ,kBAAkB,CAAC,gBAAgB,CAAC;IACrF,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG,gBAAgB,CAS/D;CACF;AA6DD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAIhE,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,GAAG,EACR,qBAAqB,CAAC,EAAE,6BAA6B,EACrD,WAAW,CAAC,EAAE,6BAA6B,GAC1C,OAAO,CAAC,OAAO,CAAC,CAsElB;AA4ID,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG;IAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CA4BA;AAm6CD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,gBAAgB,CAAC,CA4C3B"}

package/dist/adapters/web/session-view/portal.js

@@ -1,9 +1,4 @@
-import { dirname, join, resolve } from "node:path";
-import { existsSync, readdirSync } from "node:fs";
 import { SessionStore } from "../../../sessions/session-store.js";
-import { getThreadSessionFile, tryResolveCurrentSession, tryResolveThreadSession, } from "../../../sessions/store.js";
-import { isPlatformHistorySession } from "../../../sessions/store.js";
-import { basename } from "node:path";
 import { InMemoryTokenStore } from "../token-store.js";
 import MarkdownIt from "markdown-it";
 import { createConversationEvent, createConversationMessage, createOfficeAddress, } from "../../../office/index.js";
@@ -21,7 +16,7 @@ export class InMemorySessionViewTokenStore extends InMemoryTokenStore {
             platformUserName: options.platformUserName || undefined,
             conversationId: options.conversationId,
             sessionKey: options.sessionKey,
-            sessionFile: options.sessionFile,
+            office: options.office,
         });
     }
 }
@@ -85,9 +80,9 @@ export async function handleSessionViewRequest(req, res, url, sessionViewTokenSt
         res.end(renderStatusPage("Session unavailable", target.message));
         return true;
     }
-    const { activeSessionKey, entry, targetSessionFile } = target;
+    const { activeSessionKey, entry } = target;
     try {
-        const model = await loadSessionViewModel(targetSessionFile);
+        const model = await loadSessionViewModel(entry.office, activeSessionKey);
         const displayedSessionKey = activeSessionKey;
         const isRunning = interactive?.handler.isRunning(createOfficeAddress(entry.platform, entry.conversationId), displayedSessionKey) ?? false;
         res.writeHead(200, {
@@ -104,7 +99,7 @@ export async function handleSessionViewRequest(req, res, url, sessionViewTokenSt
         }));
     }
     catch (error) {
-        log.logWarning(`[${entry.conversationId}] Failed to render session ${entry.sessionFile}`, errorMessage(error));
+        log.logWarning(`[${entry.conversationId}] Failed to render session ${activeSessionKey}`, errorMessage(error));
         reportUserFacingError(error, {
             domain: "session_view",
             surface: "session_view",
@@ -113,8 +108,7 @@ export async function handleSessionViewRequest(req, res, url, sessionViewTokenSt
             platform: entry.platform,
             context: {
                 conversationId: entry.conversationId,
-                sessionKey: entry.sessionKey,
-                sessionFile: basename(targetSessionFile),
+                sessionKey: activeSessionKey,
             },
         });
         res.writeHead(500, { "Content-Type": "text/html; charset=utf-8" });
@@ -131,46 +125,11 @@ async function resolveSessionRequestTarget(sessionViewTokenStore, rawToken, requ
     if (!entry) {
         return { ok: false, status: 400, message: "This session link is invalid or has expired." };
     }
-    let targetSessionFile;
-    try {
-        targetSessionFile = await resolveRequestedSessionFile(entry.sessionFile, requestedSession);
-    }
-    catch (error) {
-        log.logWarning(`[${entry.conversationId}] Corrupted session file referenced for ${entry.sessionFile}`, errorMessage(error));
-        reportUserFacingError(error, {
-            domain: "session_view",
-            surface: "session_view",
-            operation: "resolve_requested_session",
-            severity: "error",
-            platform: entry.platform,
-            context: {
-                conversationId: entry.conversationId,
-                sessionKey: entry.sessionKey,
-                sessionFile: basename(entry.sessionFile),
-                requestedSession,
-            },
-        });
-        return { ok: false, status: 500, message: "The selected session file is corrupted." };
-    }
-    if (!targetSessionFile) {
+    const requested = requestedSession?.trim() || entry.sessionKey;
+    if (!(await SessionStore.exists(entry.office, requested))) {
         return { ok: false, status: 400, message: "The selected session is invalid." };
     }
-    return {
-        ok: true,
-        entry,
-        targetSessionFile,
-        activeSessionKey: resolveDisplayedSessionKey(entry, targetSessionFile),
-    };
-}
-function resolveDisplayedSessionKey(entry, sessionFile) {
-    if (entry.platform === "slack") {
-        const fileName = basename(sessionFile, ".jsonl");
-        if (/^\d+\.\d+$/.test(fileName)) {
-            return `${entry.conversationId}:${fileName}`;
-        }
-        return entry.conversationId;
-    }
-    return entry.sessionKey;
+    return { ok: true, entry, activeSessionKey: requested };
 }
 function sessionStreamKey(entry) {
     return `${entry.platform}:${entry.conversationId}:${entry.sessionKey}`;
@@ -207,7 +166,7 @@ function renderSessionPage(options) {
 
     <div class="session-detail-row">
       <span class="session-detail"><span class="session-detail-label">Session</span><code>${esc(model.sessionId.slice(0, 8))}</code></span>
-      <span class="session-detail"><span class="session-detail-label">File</span><code>${esc(model.fileName)}</code></span>
+      <span class="session-detail"><span class="session-detail-label">Session</span><code>${esc(model.sessionKey)}</code></span>
       <span class="session-detail"><span class="session-detail-label">Expires</span><span>${esc(formatDate(new Date(expiresAt).toISOString()))}</span></span>
     </div>
 
@@ -224,7 +183,7 @@ function renderSessionPage(options) {
     <section class="composer-card">
       <form class="composer-form" data-session-composer>
         <input type="hidden" name="token" value="${esc(token)}">
-        <input type="hidden" name="session" value="${esc(model.fileName)}">
+        <input type="hidden" name="session" value="${esc(model.sessionKey)}">
         <input type="hidden" name="sessionKey" value="${esc(displayedSessionKey)}">
         <textarea name="text" rows="1" placeholder="Ask mikan in this session… (replies stay in Session View)" required></textarea>
         <div class="composer-actions">
@@ -236,13 +195,13 @@ function renderSessionPage(options) {
     return renderHtmlDocument(`${model.title} · Session Viewer`, body, isRunning);
 }
 function renderRelationCard(relation, token) {
-    const href = `/session?token=${encodeURIComponent(token)}&session=${encodeURIComponent(relation.fileName)}`;
+    const href = `/session?token=${encodeURIComponent(token)}&session=${encodeURIComponent(relation.sessionKey)}`;
     const summary = relation.summary ? `<p class="related-summary">${esc(relation.summary)}</p>` : "";
     return `<a class="related-link" href="${href}">
     <span class="related-copy">
       <strong class="related-title">${esc(relation.title)}</strong>
       ${summary}
-      <span class="related-meta">${esc(formatDate(relation.updatedAt))} · ${esc(String(relation.entryCount))} entries · ${esc(relation.fileName)}</span>
+      <span class="related-meta">${esc(formatDate(relation.updatedAt))} · ${esc(String(relation.entryCount))} entries · ${esc(relation.sessionKey)}</span>
     </span>
     <span class="related-arrow" aria-hidden="true">→</span>
   </a>`;
@@ -252,7 +211,7 @@ function renderThreadLinks(relations, token) {
         return "";
     return `<div class="thread-links">${relations
         .map((relation) => {
-        const href = `/session?token=${encodeURIComponent(token)}&session=${encodeURIComponent(relation.fileName)}`;
+        const href = `/session?token=${encodeURIComponent(token)}&session=${encodeURIComponent(relation.sessionKey)}`;
         return `<a class="thread-link" href="${href}" title="Open ${esc(relation.title)}">
         <span class="thread-dot" aria-hidden="true"></span>
         <span class="thread-text">Thread</span>
@@ -418,7 +377,7 @@ async function handleSessionStreamRequest(req, res, url, sessionViewTokenStore,
     const send = (event) => res.write(`data: ${JSON.stringify(event)}\n\n`);
     const unsubscribe = sessionViewStreamHub.subscribe(streamKey, send);
     const liveRun = createLiveRunProjection(send, async () => {
-        const model = await loadSessionViewModel(target.targetSessionFile);
+        const model = await loadSessionViewModel(target.entry.office, target.activeSessionKey);
         return {
             type: "refresh",
             timelineHtml: renderTimelineItems(model.items, url.searchParams.get("token") ?? ""),
@@ -1650,29 +1609,24 @@ function entryIsoTime(entry) {
     }
     return new Date(entry.timestamp).toISOString();
 }
-export function resolveExistingSessionFile(office, sessionKey) {
-    if (isThreadSessionKey(sessionKey)) {
-        return tryResolveThreadSession(getThreadSessionFile(office.sessionsDir, sessionKey));
-    }
-    return tryResolveCurrentSession(office.sessionsDir);
-}
-export async function loadSessionViewModel(sessionFile) {
-    const resolvedFile = resolve(sessionFile);
-    const sm = await SessionStore.inspect(resolvedFile);
+export async function loadSessionViewModel(office, sessionKey) {
+    const sm = await SessionStore.inspect(office, sessionKey);
+    if (!sm)
+        throw new Error(`Session not found: ${sessionKey}`);
     const header = sm.getHeader();
     const entries = await sm.getEntries();
-    const updatedAt = entryIsoTime(entries.at(-1)) ?? header.timestamp;
+    const updatedAt = entryIsoTime(entries.at(-1)) ?? new Date(header.createdAt).toISOString();
     const title = (await sm.getSessionName()) || `Session ${header.id.slice(0, 8)}`;
-    const parent = await resolveParentRelation(resolvedFile, header);
-    const threadCandidates = [];
-    for (const candidate of listRelatedSessionFiles(resolvedFile)) {
-        if (candidate === resolvedFile)
-            continue;
-        const relation = await buildSessionRelation(candidate, "thread", resolvedFile, header.id, entries);
+    const listing = await SessionStore.list(office);
+    const parentListing = listing.find((session) => session.id === header.parentSessionId);
+    const parent = parentListing ? await buildSessionRelation(office, parentListing) : undefined;
+    const threads = [];
+    for (const child of listing.filter((session) => session.parentSessionId === header.id)) {
+        const relation = await buildSessionRelation(office, child);
         if (relation)
-            threadCandidates.push(relation);
+            threads.push(relation);
     }
-    const threads = threadCandidates.toSorted((a, b) => a.updatedAt < b.updatedAt ? -1 : a.updatedAt > b.updatedAt ? 1 : 0);
+    threads.sort((a, b) => (a.updatedAt < b.updatedAt ? -1 : a.updatedAt > b.updatedAt ? 1 : 0));
     const threadsByEntryId = new Map();
     for (const thread of threads) {
         if (!thread.anchorEntryId)
@@ -1685,270 +1639,37 @@ export async function loadSessionViewModel(sessionFile) {
         const item = mapEntryToItem(entry);
         if (!item)
             return [];
-        if (item.entryId) {
-            const anchoredThreads = threadsByEntryId.get(item.entryId);
-            if (anchoredThreads) {
-                item.threads = anchoredThreads;
-            }
-        }
+        const anchoredThreads = item.entryId ? threadsByEntryId.get(item.entryId) : undefined;
+        if (anchoredThreads)
+            item.threads = anchoredThreads;
         return [item];
     });
     return {
         sessionId: header.id,
-        fileName: basename(resolvedFile),
+        sessionKey,
         title,
-        createdAt: header.timestamp,
+        createdAt: new Date(header.createdAt).toISOString(),
         updatedAt,
         entryCount: entries.length,
         items,
         parent: parent ?? undefined,
-        threads,
     };
 }
-async function resolveRequestedSessionFile(baseSessionFile, requestedFileName) {
-    const resolvedBase = resolve(baseSessionFile);
-    if (!requestedFileName)
-        return resolvedBase;
-    const trimmed = requestedFileName.trim();
-    if (!trimmed)
-        return resolvedBase;
-    const fileName = basename(trimmed);
-    if (fileName !== trimmed || !fileName.endsWith(".jsonl"))
-        return null;
-    const candidate = join(dirname(resolvedBase), fileName);
-    if (!existsSync(candidate))
+async function buildSessionRelation(office, session) {
+    const sm = await SessionStore.inspect(office, session.key);
+    if (!sm)
         return null;
-    try {
-        if (!SessionStore.readHeader(candidate))
-            throw new Error("Invalid session header");
-    }
-    catch (err) {
-        throw new Error(`Session file is corrupted: ${candidate}: ${errorMessage(err)}`, {
-            cause: err,
-        });
-    }
-    return candidate;
-}
-function listRelatedSessionFiles(sessionFile) {
-    const dir = dirname(sessionFile);
-    if (!existsSync(dir))
-        return [];
-    return readdirSync(dir)
-        .filter((name) => name.endsWith(".jsonl"))
-        .map((fileName) => join(dir, fileName));
-}
-async function buildSessionRelation(sessionFile, kind, expectedParent, expectedParentId, expectedParentEntries) {
-    let sm;
-    try {
-        sm = await SessionStore.inspect(sessionFile);
-    }
-    catch (err) {
-        log.logWarning(`Skipping corrupted session file while building ${kind} relation: ${sessionFile}`, errorMessage(err));
-        return null;
-    }
     const header = sm.getHeader();
-    if (kind === "thread" &&
-        !isChildThreadSession(sessionFile, expectedParent, expectedParentId, header.parentSessionId)) {
-        return null;
-    }
     const entries = await sm.getEntries();
-    const updatedAt = entryIsoTime(entries.at(-1)) ?? header.timestamp;
-    const threadId = kind === "thread" ? getFixedThreadSessionId(sessionFile) : null;
-    const anchorEntryId = kind === "thread" && expectedParent
-        ? findThreadAnchorEntryId(expectedParentEntries ??
-            (await (await SessionStore.inspect(expectedParent)).getEntries()), entries, threadId)
-        : undefined;
     return {
-        kind,
-        fileName: basename(sessionFile),
-        sessionId: header.id,
+        sessionKey: session.key,
         title: (await sm.getSessionName()) || `Session ${header.id.slice(0, 8)}`,
-        updatedAt,
+        updatedAt: entryIsoTime(entries.at(-1)) ?? new Date(header.createdAt).toISOString(),
         entryCount: entries.length,
         summary: extractSessionSummary(entries),
-        anchorEntryId,
+        anchorEntryId: session.forkEntryId,
     };
 }
-async function resolveParentRelation(sessionFile, header) {
-    if (header.parentSessionId) {
-        const found = findSessionFileById(dirname(sessionFile), header.parentSessionId);
-        if (found)
-            return (await buildSessionRelation(found, "parent")) ?? undefined;
-    }
-    return buildInferredThreadParentRelation(sessionFile);
-}
-function findSessionFileById(sessionDir, targetId) {
-    if (!existsSync(sessionDir))
-        return null;
-    for (const name of readdirSync(sessionDir)) {
-        if (!name.endsWith(".jsonl"))
-            continue;
-        try {
-            const filePath = join(sessionDir, name);
-            if (SessionStore.readHeader(filePath)?.id === targetId)
-                return filePath;
-        }
-        catch {
-            continue;
-        }
-    }
-    return null;
-}
-async function buildInferredThreadParentRelation(sessionFile) {
-    if (!getFixedThreadSessionId(sessionFile))
-        return undefined;
-    const parentSession = tryResolveCurrentSession(dirname(sessionFile));
-    if (!parentSession || parentSession === sessionFile)
-        return undefined;
-    return (await buildSessionRelation(parentSession, "parent")) ?? undefined;
-}
-function isChildThreadSession(sessionFile, expectedParent, expectedParentId, threadParentSessionId) {
-    if (!expectedParent)
-        return false;
-    if (threadParentSessionId) {
-        if (threadParentSessionId === expectedParentId)
-            return true;
-        const parent = findSessionFileById(dirname(sessionFile), threadParentSessionId);
-        return (parent !== null &&
-            isPlatformHistorySession(expectedParent) &&
-            isPlatformHistorySession(parent));
-    }
-    if (!getFixedThreadSessionId(sessionFile))
-        return false;
-    return tryResolveCurrentSession(dirname(sessionFile)) === expectedParent;
-}
-function getFixedThreadSessionId(sessionFile) {
-    const fileName = basename(sessionFile);
-    if (!fileName.endsWith(".jsonl"))
-        return null;
-    if (/^\d{4}-\d{2}-\d{2}T.+_[0-9a-f]{8}\.jsonl$/i.test(fileName))
-        return null;
-    return fileName.slice(0, -".jsonl".length);
-}
-function findThreadAnchorEntryId(parentEntries, childEntries, threadId) {
-    const threadTimestamp = threadId ? Number(threadId) * 1000 : undefined;
-    if (threadTimestamp !== undefined && Number.isFinite(threadTimestamp)) {
-        const timestampAnchor = findEntryIdByMessageTimestamp(parentEntries, threadTimestamp);
-        if (timestampAnchor)
-            return timestampAnchor;
-    }
-    let sharedCount = 0;
-    while (sharedCount < parentEntries.length &&
-        sharedCount < childEntries.length &&
-        parentEntries[sharedCount]?.id === childEntries[sharedCount]?.id) {
-        sharedCount += 1;
-    }
-    if (sharedCount > 0) {
-        return parentEntries[sharedCount - 1]?.id;
-    }
-    const contentAnchor = findSharedContentAnchorEntryId(parentEntries, childEntries);
-    if (contentAnchor)
-        return contentAnchor;
-    const childRoot = findComparableUserMessage(childEntries);
-    if (!childRoot)
-        return undefined;
-    return findParentAnchorByRootMessage(parentEntries, childRoot);
-}
-function findEntryIdByMessageTimestamp(entries, timestamp) {
-    for (const entry of entries) {
-        if (entry.type !== "message")
-            continue;
-        const messageTimestamp = entry.message.timestamp;
-        if (messageTimestamp === timestamp)
-            return entry.id;
-    }
-    return undefined;
-}
-function findSharedContentAnchorEntryId(parentEntries, childEntries) {
-    const parentMessages = parentEntries.flatMap((entry) => {
-        const comparable = getComparableSessionMessage(entry);
-        return comparable ? [comparable] : [];
-    });
-    const childMessages = childEntries.flatMap((entry) => {
-        const comparable = getComparableSessionMessage(entry);
-        return comparable ? [comparable] : [];
-    });
-    if (parentMessages.length === 0 || childMessages.length === 0)
-        return undefined;
-    let bestParentEnd = -1;
-    let bestLength = 0;
-    for (let parentStart = 0; parentStart < parentMessages.length; parentStart++) {
-        let length = 0;
-        while (parentStart + length < parentMessages.length && length < childMessages.length) {
-            const parentMessage = parentMessages[parentStart + length];
-            const childMessage = childMessages[length];
-            if (parentMessage === undefined ||
-                childMessage === undefined ||
-                parentMessage.role !== childMessage.role ||
-                parentMessage.normalizedText !== childMessage.normalizedText) {
-                break;
-            }
-            length += 1;
-        }
-        if (length > bestLength) {
-            bestLength = length;
-            bestParentEnd = parentStart + length - 1;
-        }
-    }
-    return bestLength > 0 ? parentMessages[bestParentEnd]?.entryId : undefined;
-}
-function getComparableSessionMessage(entry) {
-    if (entry.type !== "message")
-        return null;
-    const role = entry.message.role;
-    if (role !== "user" && role !== "assistant")
-        return null;
-    const body = contentToText(entry.message.content);
-    const normalizedText = normalizeComparableSessionText(body, role);
-    if (!normalizedText)
-        return null;
-    return { entryId: entry.id, role, normalizedText };
-}
-function normalizeComparableSessionText(text, role) {
-    const normalized = role === "user" ? normalizeComparableUserText(text) : text.trim();
-    return normalized.replace(/\s+/g, " ").trim();
-}
-function findParentAnchorByRootMessage(parentEntries, childRoot) {
-    let textMatchId;
-    for (const entry of parentEntries) {
-        const comparable = getComparableUserMessage(entry);
-        if (!comparable)
-            continue;
-        if (comparable.normalizedText !== childRoot.normalizedText)
-            continue;
-        if (childRoot.messageTimestamp !== undefined &&
-            comparable.messageTimestamp !== undefined &&
-            comparable.messageTimestamp === childRoot.messageTimestamp) {
-            return entry.id;
-        }
-        textMatchId ??= entry.id;
-    }
-    return textMatchId;
-}
-function findComparableUserMessage(entries) {
-    for (const entry of entries) {
-        const comparable = getComparableUserMessage(entry);
-        if (comparable)
-            return comparable;
-    }
-    return null;
-}
-function getComparableUserMessage(entry) {
-    if (entry.type !== "message" || entry.message.role !== "user")
-        return null;
-    const body = contentToText(entry.message.content);
-    const normalizedText = normalizeComparableUserText(body);
-    if (!normalizedText)
-        return null;
-    const messageTimestamp = typeof entry.message.timestamp === "number" ? entry.message.timestamp : undefined;
-    return { normalizedText, messageTimestamp };
-}
-function normalizeComparableUserText(text) {
-    const withoutTimestamp = text.replace(/^\[[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[+-][0-9]{2}:[0-9]{2}\]\s+(?=\[[^\]]+\](?:\s+\[in-thread:[^\]]+\])?:\s)/, "");
-    return withoutTimestamp
-        .replace(/\n*<slack_attachments>\n[\s\S]*?\n<\/slack_attachments>\s*$/g, "")
-        .trim();
-}
 function extractSessionSummary(entries) {
     for (const entry of entries) {
         if (entry.type !== "message")
@@ -1970,8 +1691,6 @@ function mapEntryToItem(entry) {
             return mapMessageEntry(entry);
         case "compaction":
             return mapCompactionEntry(entry);
-        case "branch_summary":
-            return mapSessionSummaryEntry(entry);
         case "custom":
             return {
                 kind: "system",
@@ -2077,15 +1796,6 @@ function mapCompactionEntry(entry) {
         kind: "system",
         title: "Context compacted",
         body: entry.summary,
-        meta: `${entryIsoTime(entry) ?? ""} · ${entry.tokensBefore} tokens before compaction`,
-        tone: "muted",
-    };
-}
-function mapSessionSummaryEntry(entry) {
-    return {
-        kind: "system",
-        title: "Session summary",
-        body: entry.summary,
         meta: entryIsoTime(entry) ?? "",
         tone: "muted",
     };