pi-goosedump 0.12.32 → 0.12.33

package/dist/index.ts

@@ -1251,6 +1251,40 @@ async function runSearchPanel(ctx, query) {
 async function runSessionsPanel(ctx, executablePath) {
   const OVERLAY_WIDTH = 84;
   const VIEWPORT = 18;
+  function buildChildrenMap(sessions) {
+    const byKey = new Map(sessions.map((s) => [`${s.provider}:${s.id}`, s]));
+    const childrenMap = new Map;
+    for (const session of sessions) {
+      if (!session.parent)
+        continue;
+      const parentKey = `${session.provider}:${session.parent}`;
+      if (!byKey.has(parentKey))
+        continue;
+      const siblings = childrenMap.get(parentKey) ?? [];
+      siblings.push(session);
+      childrenMap.set(parentKey, siblings);
+    }
+    for (const siblings of childrenMap.values()) {
+      siblings.sort((a, b) => {
+        const timeA = a.from ? new Date(a.from).getTime() : 0;
+        const timeB = b.from ? new Date(b.from).getTime() : 0;
+        return timeB - timeA;
+      });
+    }
+    return childrenMap;
+  }
+  function flattenTree(roots, childrenMap, expanded, depth) {
+    const rows = [];
+    for (const session of roots) {
+      const key = `${session.provider}:${session.id}`;
+      const children = childrenMap.get(key) ?? [];
+      rows.push({ session, depth, hasChildren: children.length > 0 });
+      if (children.length > 0 && expanded.has(key)) {
+        rows.push(...flattenTree(children, childrenMap, expanded, depth + 1));
+      }
+    }
+    return rows;
+  }
   await ctx.ui.custom((tui, theme, _kb, done) => {
     const currentTarget = currentSessionTarget(ctx);
     const borderFg = (s) => theme.fg("border", s);
@@ -1260,38 +1294,55 @@ async function runSessionsPanel(ctx, executablePath) {
     const dim = (s) => theme.fg("dim", s);
     const muted = (s) => theme.fg("muted", s);
     let sessions = [];
+    let childrenMap = new Map;
+    let roots = [];
+    let displayList = [];
+    let expandedNodes = new Set;
     let error = null;
     let selected = 0;
     let scroll = 0;
+    function rebuildDisplayList() {
+      displayList = flattenTree(roots, childrenMap, expandedNodes, 0);
+    }
     async function loadSessions() {
       try {
         const all = await goosedumpListSessions(undefined, executablePath);
-        const cwdSessions = all.filter((s) => s.cwd === ctx.cwd);
+        const cwdIds = new Set(all.filter((s) => s.cwd === ctx.cwd).map((s) => `${s.provider}:${s.id}`));
+        const cwdSessions = all.filter((s) => s.cwd === ctx.cwd || s.parent !== null && cwdIds.has(`${s.provider}:${s.parent}`));
         cwdSessions.sort((a, b) => {
           const timeA = a.from ? new Date(a.from).getTime() : 0;
           const timeB = b.from ? new Date(b.from).getTime() : 0;
           return timeB - timeA;
         });
         sessions = cwdSessions;
+        childrenMap = buildChildrenMap(sessions);
+        const sessionKeys = new Set(sessions.map((s) => `${s.provider}:${s.id}`));
+        roots = sessions.filter((s) => s.parent === null || !sessionKeys.has(`${s.provider}:${s.parent}`));
+        expandedNodes = new Set([...expandedNodes].filter((key) => sessionKeys.has(key)));
+        rebuildDisplayList();
         if (sessions.length === 0) {
           error = "No sessions found for current directory.";
         } else {
           error = null;
         }
-        selected = Math.min(selected, Math.max(0, sessions.length - 1));
-        scroll = Math.min(scroll, Math.max(0, sessions.length - VIEWPORT));
+        selected = Math.min(selected, Math.max(0, displayList.length - 1));
+        scroll = Math.min(scroll, Math.max(0, displayList.length - VIEWPORT));
         tui.requestRender();
       } catch (err) {
         sessions = [];
+        childrenMap = new Map;
+        roots = [];
+        displayList = [];
         error = err instanceof Error ? err.message : String(err);
         tui.requestRender();
       }
     }
     loadSessions();
     async function deleteSelected() {
-      const s = sessions[selected];
-      if (!s)
+      const row = displayList[selected];
+      if (!row)
         return;
+      const s = row.session;
       const target = formatTarget(s.provider, s.id);
       if (currentTarget === target) {
         ctx.ui.notify("Cannot delete the active session.", "error");
@@ -1319,29 +1370,33 @@ async function runSessionsPanel(ctx, executablePath) {
           lines.push(`${borderFg("╰")}${borderFg("─".repeat(width - 2))}${borderFg("╯")}`);
           return lines;
         }
-        const maxScroll = Math.max(0, sessions.length - VIEWPORT);
+        const maxScroll = Math.max(0, displayList.length - VIEWPORT);
         const clampScroll = Math.min(scroll, maxScroll);
-        const window = sessions.slice(clampScroll, clampScroll + VIEWPORT);
+        const window = displayList.slice(clampScroll, clampScroll + VIEWPORT);
         for (let i = 0;i < window.length; i++) {
           const absolute = clampScroll + i;
-          const s = window[i];
+          const row = window[i];
+          const s = row.session;
           const isSelected = absolute === selected;
           const isActive = currentTarget === formatTarget(s.provider, s.id);
+          const key = `${s.provider}:${s.id}`;
           const cursor = isSelected ? accent("▶") : " ";
+          const indent = " ".repeat(row.depth * 2);
+          const toggle = row.hasChildren ? expandedNodes.has(key) ? muted("−") : muted("+") : " ";
           const activeMark = isActive ? accent("(active)") : "";
           const idText = isSelected ? accent(s.id) : text(s.id);
           const providerTag = muted(`[${s.provider}]`);
           const countTag = dim(`${s.count} entries`);
           const dateTag = s.from ? dim(new Date(s.from).toLocaleDateString()) : "";
-          const rowContent = ` ${cursor} ${idText} ${providerTag} ${countTag} ${dateTag} ${activeMark}`.trimEnd();
+          const rowContent = ` ${cursor}${indent}${toggle} ${idText} ${providerTag} ${countTag} ${dateTag} ${activeMark}`.trimEnd();
           lines.push(makeRow(rowContent, innerW, border));
         }
         for (let i = window.length;i < VIEWPORT; i++)
           lines.push(makeRow("", innerW, border));
-        const count = sessions.length;
+        const count = displayList.length;
         const position = count > VIEWPORT ? `${clampScroll + 1}-${Math.min(clampScroll + VIEWPORT, count)} of ${count}` : `${count} session${count === 1 ? "" : "s"}`;
         lines.push(makeRow("", innerW, border));
-        lines.push(makeRow(dim(`↑↓ navigate  enter resume  d delete  esc close  (${position})`), innerW, border));
+        lines.push(makeRow(dim(`↑↓ navigate  space/+/− fold  enter resume  d delete  esc close  (${position})`), innerW, border));
         lines.push(`${borderFg("╰")}${borderFg("─".repeat(width - 2))}${borderFg("╯")}`);
         return lines;
       },
@@ -1350,9 +1405,9 @@ async function runSessionsPanel(ctx, executablePath) {
           done(undefined);
           return;
         }
-        if (error && sessions.length === 0)
+        if (error && displayList.length === 0)
           return;
-        const maxScroll = Math.max(0, sessions.length - VIEWPORT);
+        const maxScroll = Math.max(0, displayList.length - VIEWPORT);
         if (matchesKey(data, Key.up)) {
           selected = Math.max(0, selected - 1);
           if (selected < scroll)
@@ -1361,7 +1416,7 @@ async function runSessionsPanel(ctx, executablePath) {
           return;
         }
         if (matchesKey(data, Key.down)) {
-          selected = Math.min(Math.max(0, sessions.length - 1), selected + 1);
+          selected = Math.min(Math.max(0, displayList.length - 1), selected + 1);
           if (selected >= scroll + VIEWPORT)
             scroll = selected - VIEWPORT + 1;
           tui.requestRender();
@@ -1374,17 +1429,38 @@ async function runSessionsPanel(ctx, executablePath) {
           return;
         }
         if (matchesKey(data, Key.pageDown)) {
-          selected = Math.min(sessions.length - 1, selected + VIEWPORT);
+          selected = Math.min(displayList.length - 1, selected + VIEWPORT);
           scroll = Math.min(maxScroll, Math.max(scroll, selected - VIEWPORT + 1));
           tui.requestRender();
           return;
         }
+        const row = displayList[selected];
+        if (row && row.hasChildren && (data === " " || data === "+" || data === "-")) {
+          const key = `${row.session.provider}:${row.session.id}`;
+          if (data === "+") {
+            expandedNodes.add(key);
+          } else if (data === "-") {
+            expandedNodes.delete(key);
+          } else if (expandedNodes.has(key)) {
+            expandedNodes.delete(key);
+          } else {
+            expandedNodes.add(key);
+          }
+          rebuildDisplayList();
+          const newIndex = displayList.findIndex((d) => `${d.session.provider}:${d.session.id}` === key);
+          if (newIndex >= 0)
+            selected = newIndex;
+          if (selected < scroll)
+            scroll = selected;
+          tui.requestRender();
+          return;
+        }
         if (data === "d" || data === "D" || matchesKey(data, Key.delete)) {
           deleteSelected();
           return;
         }
         if (matchesKey(data, Key.enter) || matchesKey(data, Key.return)) {
-          const s = sessions[selected];
+          const s = displayList[selected]?.session;
           if (!s)
             return;
           if (s.provider !== "pi") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.12.32",
+  "version": "0.12.33",
   "description": "Pi extension for goosedump session search, durable memory, session management, and compaction",
   "keywords": [
     "compaction",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@earendil-works/pi-tui": "^0.82.1",
-    "@jarkkojs/goosedump": "^0.12.32",
+    "@jarkkojs/goosedump": "^0.12.33",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {