hammoc 1.8.3 → 1.9.0

package/packages/server/dist/services/sessionBufferManager.js

@@ -3,10 +3,10 @@
  * Story 27.1: Holds history + streaming messages in memory,
  * delivers all message data exclusively via WebSocket.
  */
-import { ROOT_BRANCH_KEY } from '@hammoc/shared';
+import { ROOT_BRANCH_KEY, COMPACT_MESSAGE_PREFIX, COMPACT_COMMAND_ECHO } from '@hammoc/shared';
 import { parseJSONLFile, transformToHistoryMessages } from './historyParser.js';
 import { sessionService } from './sessionService.js';
-import { buildRawMessageTree, getActiveRawBranch, getDefaultRawBranchSelections, } from '../utils/messageTree.js';
+import { buildRawMessageTree, getActiveRawBranch, getDefaultRawBranchSelections, repairPostCompactParenting, } from '../utils/messageTree.js';
 import { createLogger } from '../utils/logger.js';
 const log = createLogger('sessionBufferManager');
 /**
@@ -30,6 +30,22 @@ function sortHistoryMessagesByTimestamp(messages) {
         messages[i] = indexed[i].m;
     }
 }
+/**
+ * Pick the message that carries root-level (epoch) branch info.
+ * The client renders branch pagination only on compact_boundary dividers and
+ * visible user bubbles. The chronologically-first message of a compact epoch
+ * is one the chat view hides — the SDK stamps the summary echo 1-2ms BEFORE
+ * the boundary, and a manual /compact leaves its command echo even earlier —
+ * so attaching to messages[0] would pin the pagination onto an invisible
+ * message (arrows never render, even in branch viewer mode).
+ */
+function findRootBranchCarrier(messages) {
+    return messages.find((m) => m.type === 'system' && m.subtype === 'compact_boundary')
+        ?? messages.find((m) => m.type === 'user'
+            && !m.content.startsWith(COMPACT_MESSAGE_PREFIX)
+            && m.content !== COMPACT_COMMAND_ECHO)
+        ?? messages[0];
+}
 export class SessionBufferManager {
     buffers = new Map();
     create(sessionId, streaming = false) {
@@ -80,6 +96,7 @@ export class SessionBufferManager {
             return [];
         }
         const tree = buildRawMessageTree(rawMessages);
+        repairPostCompactParenting(tree);
         const defaults = getDefaultRawBranchSelections(tree.roots);
         const selections = branchSelections
             ? { ...defaults, ...branchSelections }
@@ -100,8 +117,9 @@ export class SessionBufferManager {
             for (const [msgId, info] of Object.entries(branchPoints)) {
                 const msg = idIndex.get(msgId)
                     // ROOT_BRANCH_KEY ('__root__') won't match any message ID —
-                    // attach to the first message so root-level branches are navigable.
-                    ?? (msgId === ROOT_BRANCH_KEY ? historyMessages[0] : undefined);
+                    // attach to a message the client actually renders as a pagination
+                    // carrier so root-level branches are navigable.
+                    ?? (msgId === ROOT_BRANCH_KEY ? findRootBranchCarrier(historyMessages) : undefined);
                 if (msg) {
                     msg.branchInfo = info;
                 }

package/packages/server/dist/services/sessionBufferManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessionBufferManager.js","sourceRoot":"","sources":["../../src/services/sessionBufferManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionBufferManager.js","sourceRoot":"","sources":["../../src/services/sessionBufferManager.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/services/sessionExportService.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Session Export Service
+ *
+ * Converts a Claude Code session JSONL file into a self-contained Markdown
+ * document that preserves ALL conversation branches (edits, rewinds, forks).
+ *
+ * Unlike sessionService.getSessionMessages — which extracts only the *active*
+ * branch for on-screen display — this walks the ENTIRE message tree depth-first
+ * and inserts a "branch" divider at every fork, so every alternative path the
+ * user ever explored is included. The underlying tree-building primitives
+ * (buildRawMessageTree / groupRawChildrenIntoBranches / repairPostCompactParenting)
+ * are reused verbatim so the export structure matches what the chat view derives.
+ */
+import type { RawJSONLMessage } from '@hammoc/shared';
+export interface SessionMarkdownMeta {
+    sessionId: string;
+    projectSlug: string;
+    sessionName?: string | null;
+    exportedAt?: string;
+}
+/**
+ * Pure transform: raw JSONL messages → Markdown string containing every branch.
+ * Separated from file IO so it can be unit-tested with in-memory fixtures.
+ */
+export declare function renderSessionMarkdown(raw: RawJSONLMessage[], meta: SessionMarkdownMeta): string;
+/**
+ * Convert a session's JSONL into a Markdown string containing every branch.
+ * Returns null if the session file does not exist.
+ */
+export declare function exportSessionToMarkdown(projectSlug: string, sessionId: string, opts?: {
+    sessionName?: string | null;
+    exportedAt?: string;
+}): Promise<string | null>;
+//# sourceMappingURL=sessionExportService.d.ts.map

package/packages/server/dist/services/sessionExportService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionExportService.d.ts","sourceRoot":"","sources":["../../src/services/sessionExportService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EACV,eAAe,EAMhB,MAAM,gBAAgB,CAAC;AAgNxB,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAuC/F;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9D,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAWxB"}

package/packages/server/dist/services/sessionExportService.js

@@ -0,0 +1,269 @@
+/**
+ * Session Export Service
+ *
+ * Converts a Claude Code session JSONL file into a self-contained Markdown
+ * document that preserves ALL conversation branches (edits, rewinds, forks).
+ *
+ * Unlike sessionService.getSessionMessages — which extracts only the *active*
+ * branch for on-screen display — this walks the ENTIRE message tree depth-first
+ * and inserts a "branch" divider at every fork, so every alternative path the
+ * user ever explored is included. The underlying tree-building primitives
+ * (buildRawMessageTree / groupRawChildrenIntoBranches / repairPostCompactParenting)
+ * are reused verbatim so the export structure matches what the chat view derives.
+ */
+import { existsSync } from 'fs';
+import { sanitizeToolResultContent } from '@hammoc/shared';
+import { buildRawMessageTree, groupRawChildrenIntoBranches, repairPostCompactParenting, isConversationRoot, } from '../utils/messageTree.js';
+import { parseJSONLFile, cleanCommandTags, parseTaskNotification } from './historyParser.js';
+import { sessionService } from './sessionService.js';
+/**
+ * Build a map of tool_use block id → tool name across the whole file, so a
+ * tool_result (which only carries the id) can be labelled with its tool name.
+ */
+function buildToolNameMap(raw) {
+    const map = new Map();
+    for (const m of raw) {
+        if (m.type === 'assistant' && Array.isArray(m.message?.content)) {
+            for (const block of m.message.content) {
+                if (block.type === 'tool_use') {
+                    map.set(block.id, block.name);
+                }
+            }
+        }
+        else if (m.type === 'tool_use' && m.toolName) {
+            // Legacy inline tool_use format keyed by uuid
+            map.set(m.uuid, m.toolName);
+        }
+    }
+    return map;
+}
+/**
+ * Wrap content in a fenced code block whose fence is guaranteed longer than any
+ * backtick run inside the content, so embedded code fences can't break out.
+ */
+function fence(content, lang = '') {
+    const longestRun = (content.match(/`+/g) ?? []).reduce((max, s) => Math.max(max, s.length), 0);
+    const bar = '`'.repeat(Math.max(3, longestRun + 1));
+    return `${bar}${lang}\n${content}\n${bar}`;
+}
+/** Collapse a long value into a <details> block; short values stay inline. */
+function collapsible(summary, body) {
+    return `<details><summary>${summary}</summary>\n\n${body}\n\n</details>`;
+}
+/**
+ * Neutralize <details>/<summary> tags in a PROSE body destined for a collapsible
+ * wrapper. The body renders as markdown, where a raw closing tag passes through
+ * as HTML — it would close the wrapper early and spill the rest of the document
+ * out of it (an opening tag would nest). `&lt;` renders back as a literal `<` in
+ * prose, so display fidelity is kept. Fenced bodies (tool results) don't need
+ * this — fence content is inert in markdown.
+ */
+function escapeDetailsTags(text) {
+    return text.replace(/<(\/?)(details|summary)\b/gi, '&lt;$1$2');
+}
+function extractText(content) {
+    if (!content)
+        return '';
+    if (typeof content === 'string')
+        return content;
+    return content
+        .filter((b) => b.type === 'text')
+        .map((b) => b.text)
+        .join('\n');
+}
+function renderToolUse(block) {
+    const input = block.input && Object.keys(block.input).length > 0
+        ? `\n\n${fence(JSON.stringify(block.input, null, 2), 'json')}`
+        : '';
+    return `### 🔧 ${block.name}${input}`;
+}
+function renderToolResult(block, toolNames) {
+    const name = toolNames.get(block.tool_use_id);
+    const isError = block.is_error ?? false;
+    const rawContent = typeof block.content === 'string'
+        ? block.content
+        : Array.isArray(block.content)
+            ? block.content.map((c) => (typeof c === 'string' ? c : JSON.stringify(c))).join('\n')
+            : '';
+    const cleaned = sanitizeToolResultContent(rawContent).trim();
+    if (!cleaned)
+        return '';
+    const summary = `↳ Result${name ? ` · ${name}` : ''}${isError ? ' ⚠️ error' : ''}`;
+    return collapsible(summary, fence(cleaned));
+}
+/**
+ * Render one raw message into zero or more Markdown blocks.
+ * Returns an empty string for messages that produce no visible output.
+ */
+function renderMessage(msg, toolNames) {
+    // Skip SDK-injected meta messages (expanded slash commands etc.)
+    if (msg.isMeta)
+        return '';
+    if (msg.type === 'system') {
+        if (msg.subtype === 'compact_boundary') {
+            return `\n---\n\n> 🗜️ **${msg.content || 'Conversation compacted'}**\n\n---`;
+        }
+        return '';
+    }
+    if (msg.type === 'assistant') {
+        const content = msg.message?.content;
+        const blocks = [];
+        if (Array.isArray(content)) {
+            for (const block of content) {
+                if (block.type === 'thinking') {
+                    const thinking = block.thinking?.trim();
+                    if (thinking)
+                        blocks.push(collapsible('💭 Thinking', escapeDetailsTags(thinking)));
+                }
+                else if (block.type === 'text') {
+                    const text = block.text?.trim();
+                    if (text && text !== '(no content)')
+                        blocks.push(text);
+                }
+                else if (block.type === 'tool_use') {
+                    blocks.push(renderToolUse(block));
+                }
+            }
+        }
+        else {
+            const text = extractText(content).trim();
+            if (text && text !== '(no content)')
+                blocks.push(text);
+        }
+        if (blocks.length === 0)
+            return '';
+        return `## 🤖 Assistant\n\n${blocks.join('\n\n')}`;
+    }
+    if (msg.type === 'user') {
+        const content = msg.message?.content;
+        if (Array.isArray(content)) {
+            const toolResults = content.filter((b) => b.type === 'tool_result');
+            if (toolResults.length > 0) {
+                const rendered = toolResults.map((b) => renderToolResult(b, toolNames)).filter(Boolean);
+                return rendered.join('\n\n');
+            }
+            const imageCount = content.filter((b) => b.type === 'image').length;
+            const text = extractText(content);
+            const notif = parseTaskNotification(text);
+            if (notif) {
+                return `> 🔔 **Background task ${notif.status}** — ${notif.summary}`;
+            }
+            const cleaned = cleanCommandTags(text);
+            const imageNote = imageCount > 0 ? `🖼️ _[${imageCount} image(s) attached]_` : '';
+            const body = [imageNote, cleaned].filter(Boolean).join('\n\n');
+            if (!body.trim())
+                return '';
+            return `## 👤 User\n\n${body}`;
+        }
+        const text = extractText(content);
+        const notif = parseTaskNotification(text);
+        if (notif) {
+            return `> 🔔 **Background task ${notif.status}** — ${notif.summary}`;
+        }
+        const cleaned = cleanCommandTags(text);
+        if (!cleaned.trim())
+            return '';
+        return `## 👤 User\n\n${cleaned}`;
+    }
+    if (msg.type === 'tool_use') {
+        // Legacy inline tool_use
+        const input = msg.toolInput && Object.keys(msg.toolInput).length > 0
+            ? `\n\n${fence(JSON.stringify(msg.toolInput, null, 2), 'json')}`
+            : '';
+        return `### 🔧 ${msg.toolName ?? 'tool'}${input}`;
+    }
+    if (msg.type === 'tool_result') {
+        // Legacy inline tool_result
+        const body = msg.error || msg.result || '';
+        if (!body.trim())
+            return '';
+        return collapsible(`↳ Result${msg.error ? ' ⚠️ error' : ''}`, fence(sanitizeToolResultContent(body)));
+    }
+    return '';
+}
+/** A horizontal branch divider, e.g. "━━━ Branch 2/3 · latest ━━━". */
+function branchDivider(index, total, isLast) {
+    const bar = '━'.repeat(12);
+    const suffix = isLast ? ' · latest' : '';
+    return `\n#### ${bar} Branch ${index}/${total}${suffix} ${bar}\n`;
+}
+/**
+ * Depth-first walk that emits every message and, at each fork, a branch divider
+ * before each alternative path. Metadata-only branches are still walked so no
+ * content is silently dropped.
+ */
+function walk(node, out, toolNames) {
+    const rendered = renderMessage(node.message, toolNames);
+    if (rendered)
+        out.push(rendered);
+    const branches = groupRawChildrenIntoBranches(node.children);
+    if (branches.length <= 1) {
+        for (const child of branches[0] ?? []) {
+            walk(child, out, toolNames);
+        }
+        return;
+    }
+    for (let i = 0; i < branches.length; i++) {
+        out.push(branchDivider(i + 1, branches.length, i === branches.length - 1));
+        for (const child of branches[i]) {
+            walk(child, out, toolNames);
+        }
+    }
+}
+/**
+ * Pure transform: raw JSONL messages → Markdown string containing every branch.
+ * Separated from file IO so it can be unit-tested with in-memory fixtures.
+ */
+export function renderSessionMarkdown(raw, meta) {
+    const tree = buildRawMessageTree(raw);
+    repairPostCompactParenting(tree);
+    const toolNames = buildToolNameMap(raw);
+    const messageCount = raw.filter((m) => m.type === 'user' || m.type === 'assistant').length;
+    const body = [];
+    const convRoots = tree.roots.filter(isConversationRoot);
+    if (convRoots.length > 1) {
+        // Multiple conversation roots (e.g. compact epochs or root-level edits):
+        // include them all, each under its own segment divider.
+        for (let i = 0; i < convRoots.length; i++) {
+            body.push(`\n### ▓▓ Conversation root ${i + 1}/${convRoots.length} ▓▓\n`);
+            walk(convRoots[i], body, toolNames);
+        }
+    }
+    else {
+        const start = convRoots.length > 0 ? convRoots : tree.roots;
+        for (const root of start) {
+            walk(root, body, toolNames);
+        }
+    }
+    const exportedAt = meta.exportedAt ?? new Date().toISOString();
+    const title = meta.sessionName || 'Claude Code Session';
+    const header = [
+        `# ${title}`,
+        '',
+        `- **Session**: \`${meta.sessionId}\``,
+        `- **Project**: \`${meta.projectSlug}\``,
+        `- **Exported**: ${exportedAt}`,
+        `- **Messages**: ${messageCount}`,
+        '',
+        '---',
+        '',
+    ].join('\n');
+    return header + body.join('\n\n') + '\n';
+}
+/**
+ * Convert a session's JSONL into a Markdown string containing every branch.
+ * Returns null if the session file does not exist.
+ */
+export async function exportSessionToMarkdown(projectSlug, sessionId, opts = {}) {
+    const filePath = sessionService.getSessionFilePath(projectSlug, sessionId);
+    if (!existsSync(filePath))
+        return null;
+    const raw = await parseJSONLFile(filePath);
+    return renderSessionMarkdown(raw, {
+        sessionId,
+        projectSlug,
+        sessionName: opts.sessionName,
+        exportedAt: opts.exportedAt,
+    });
+}
+//# sourceMappingURL=sessionExportService.js.map

package/packages/server/dist/services/sessionExportService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionExportService.js","sourceRoot":"","sources":["../../src/services/sessionExportService.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/services/sessionService.d.ts

@@ -125,6 +125,12 @@ export declare class SessionService {
      */
     listSessionsBySlug(projectSlug: string, params?: SessionListParams & {
         sessionNames?: Record<string, string>;
+        /**
+         * Turn start times (ms) of sessions with a running stream. A streaming session's
+         * last activity is "now" — the index cache only refreshes at turn end, so without
+         * this override a mid-turn list fetch would sort the session by its previous turn.
+         */
+        activeStreamStartTimes?: Map<string, number>;
     }): Promise<{
         sessions: SessionListItem[];
         total: number;

package/packages/server/dist/services/sessionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionService.d.ts","sourceRoot":"","sources":["../../src/services/sessionService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionService.d.ts","sourceRoot":"","sources":["../../src/services/sessionService.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/services/sessionService.js

@@ -12,7 +12,7 @@ import { existsSync, createReadStream, readFileSync, writeFileSync, unlinkSync,
 import readline from 'readline';
 import { createLogger } from '../utils/logger.js';
 import { parseJSONLFile, parseJSONLSessionMeta, transformToHistoryMessages, cleanCommandTags, } from './historyParser.js';
-import { buildRawMessageTree, getActiveRawBranch, getDefaultRawBranchSelections, } from '../utils/messageTree.js';
+import { buildRawMessageTree, getActiveRawBranch, getDefaultRawBranchSelections, repairPostCompactParenting, } from '../utils/messageTree.js';
 const log = createLogger('sessionService');
 /**
  * SessionService - Manages Claude Code session data
@@ -435,7 +435,13 @@ export class SessionService {
      * - Supports search by query and content search (Story 23.1)
      */
     async listSessionsBySlug(projectSlug, params = {}) {
-        const { includeEmpty = false, limit = 0, offset = 0, query, searchContent, sessionNames } = params;
+        const { includeEmpty = false, limit = 0, offset = 0, query, searchContent, sessionNames, activeStreamStartTimes } = params;
+        const nowIso = new Date().toISOString();
+        const nowMs = new Date(nowIso).getTime();
+        // Most recent activity first; ties (concurrent streams share "now") break by
+        // most recently started turn.
+        const byActivityDesc = (a, b) => (b.mtimeMs - a.mtimeMs) ||
+            ((activeStreamStartTimes?.get(b.sessionId) ?? 0) - (activeStreamStartTimes?.get(a.sessionId) ?? 0));
         const queryLower = query?.toLowerCase();
         const projectDir = path.join(this.claudeProjectsDir, projectSlug);
         const indexPath = path.join(projectDir, 'sessions-index.json');
@@ -468,6 +474,10 @@ export class SessionService {
                 const fileEntries = [];
                 for (const file of jsonlFiles) {
                     const sessionId = file.replace('.jsonl', '');
+                    if (activeStreamStartTimes?.has(sessionId)) {
+                        fileEntries.push({ file, sessionId, mtimeMs: nowMs });
+                        continue;
+                    }
                     const cached = indexMap.get(sessionId);
                     if (cached && cached.modified) {
                         fileEntries.push({ file, sessionId, mtimeMs: new Date(cached.modified).getTime() || 0 });
@@ -496,8 +506,8 @@ export class SessionService {
                         }
                     }
                 }
-                // Sort by modified time descending
-                fileEntries.sort((a, b) => b.mtimeMs - a.mtimeMs);
+                // Sort by modified time descending (streaming sessions pinned to "now")
+                fileEntries.sort(byActivityDesc);
                 // When search is active, resolve cache misses for filtering
                 let candidates = fileEntries;
                 if (queryLower) {
@@ -545,7 +555,7 @@ export class SessionService {
                         const contentHits = contentMatched.filter((e) => e !== null);
                         candidates = [...metadataFiltered, ...contentHits];
                         // Re-sort after merging
-                        candidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
+                        candidates.sort(byActivityDesc);
                     }
                     else {
                         candidates = metadataFiltered;
@@ -560,7 +570,7 @@ export class SessionService {
                             firstPrompt: this.truncateFirstPrompt(cached.firstPrompt),
                             messageCount: cached.messageCount,
                             created: stat.birthtime.toISOString(),
-                            modified: stat.mtime.toISOString(),
+                            modified: activeStreamStartTimes?.has(sessionId) ? nowIso : stat.mtime.toISOString(),
                         };
                     }));
                     return { sessions, total: candidates.length };
@@ -616,7 +626,7 @@ export class SessionService {
                             firstPrompt: firstPrompt ? this.truncateFirstPrompt(firstPrompt) : '',
                             messageCount,
                             created: stat.birthtime.toISOString(),
-                            modified: stat.mtime.toISOString(),
+                            modified: activeStreamStartTimes?.has(sessionId) ? nowIso : stat.mtime.toISOString(),
                         });
                     }
                     else {
@@ -695,8 +705,18 @@ export class SessionService {
         if (sessionMap.size === 0) {
             return { sessions: [], total: 0 };
         }
+        // Streaming sessions' last activity is "now" — override the stale on-disk timestamp
+        if (activeStreamStartTimes) {
+            for (const sid of activeStreamStartTimes.keys()) {
+                const active = sessionMap.get(sid);
+                if (active)
+                    active.modified = nowIso;
+            }
+        }
+        const byModifiedDesc = (a, b) => (this.parseDate(b.modified) - this.parseDate(a.modified)) ||
+            ((activeStreamStartTimes?.get(b.sessionId) ?? 0) - (activeStreamStartTimes?.get(a.sessionId) ?? 0));
         // Sort by modified descending (AC 3)
-        let sorted = [...sessionMap.values()].sort((a, b) => this.parseDate(b.modified) - this.parseDate(a.modified));
+        let sorted = [...sessionMap.values()].sort(byModifiedDesc);
         // Apply search filter for full path
         if (queryLower) {
             const metadataMatched = new Set();
@@ -721,7 +741,7 @@ export class SessionService {
                         contentHits.push(s);
                 }
                 sorted = [...metadataFiltered, ...contentHits];
-                sorted.sort((a, b) => this.parseDate(b.modified) - this.parseDate(a.modified));
+                sorted.sort(byModifiedDesc);
             }
             else {
                 sorted = metadataFiltered;
@@ -924,6 +944,7 @@ export class SessionService {
         const rawMessages = await parseJSONLFile(filePath);
         // Build tree and extract active branch (Story 25.4)
         const tree = buildRawMessageTree(rawMessages);
+        repairPostCompactParenting(tree);
         const effectiveSelections = branchSelections && Object.keys(branchSelections).length > 0
             ? branchSelections
             : getDefaultRawBranchSelections(tree.roots);