pi-goosedump 0.4.0 → 0.5.1

package/index.ts

@@ -23,10 +23,11 @@ import { Type } from '@sinclair/typebox';
 
 const require = createRequire(import.meta.url);
 
-const GOOSEDUMP_VERSION = [0, 4, 2] as const;
+const GOOSEDUMP_VERSION = [0, 5, 0] as const;
 
 interface GoosedumpListing {
   id: string;
+  path: string | null;
 }
 
 interface GoosedumpMessage {
@@ -36,15 +37,14 @@ interface GoosedumpMessage {
   score?: number;
 }
 
-interface GoosedumpContextResult {
+interface GoosedumpSearchResult {
   messages: GoosedumpMessage[];
-  totalCount: number;
   page: number;
   totalPages: number;
 }
 
 interface ListJson {
-  sessions: { id: string }[];
+  sessions: { id: string; path?: string | null }[];
 }
 
 interface ToolCallJson {
@@ -86,10 +86,6 @@ interface SearchJson {
   hits: HitJson[];
 }
 
-interface GrepJson {
-  hits: HitJson[];
-}
-
 interface CompactJson {
   goals: string[];
   files: { modified: string[]; created: string[]; read: string[] };
@@ -232,6 +228,14 @@ function formatMessagesFull(messages: GoosedumpMessage[]): string {
   return messages.map((m) => `[${m.id}] ${m.role}:\n${m.content}`).join('\n\n---\n\n');
 }
 
+function textResult(text: string): AgentToolResult<void> {
+  return { content: [{ type: 'text', text }], details: undefined };
+}
+
+function missingContextId(action: string): AgentToolResult<void> {
+  return textResult(`contextId is required for ${action} when no current session is available`);
+}
+
 function runGoosedump(args: string[]): string {
   return execFileSync(process.execPath, [binaryPath(), ...args], {
     encoding: 'utf-8',
@@ -240,62 +244,37 @@ function runGoosedump(args: string[]): string {
 
 function goosedumpList(): GoosedumpListing[] {
   const json = JSON.parse(runGoosedump(['list', 'pi:*'])) as ListJson;
-  return (json.sessions ?? []).map((session) => ({ id: session.id }));
+  return (json.sessions ?? []).map((session) => ({
+    id: session.id,
+    path: session.path ?? null,
+  }));
 }
 
-function goosedumpContext(
+function goosedumpSearch(
   contextId: string,
-  options: {
-    scope?: string;
-    grep?: string;
-    ids?: string;
-    rank?: boolean;
-    page?: number;
-  } = {},
-): GoosedumpContextResult {
+  query: string,
+  options: { scope?: string; page?: number } = {},
+): GoosedumpSearchResult {
   const scope = options.scope ?? 'lineage';
-  const hasQuery = typeof options.grep === 'string';
-  const isSearch = hasQuery && options.rank !== false;
-  const target = `pi:${contextId}`;
-  const args = hasQuery
-    ? isSearch
-      ? ['search', target, options.grep ?? '']
-      : ['grep', target, options.grep ?? '']
-    : ['show', target];
-
-  if (options.ids) {
-    args.push('--ids', options.ids);
-  }
-  if (isSearch && options.page) {
-    args.push('--page', String(options.page));
-  }
+  const args = ['search', `pi:${contextId}`, query];
+  if (options.page) args.push('--page', String(options.page));
   args.push('--scope', scope);
 
-  const output = runGoosedump(args);
-
-  if (hasQuery) {
-    const json = JSON.parse(output) as SearchJson | GrepJson;
-    const messages = (json.hits ?? []).map(hitMessage);
-    const page = isSearch ? ((json as SearchJson).page ?? options.page ?? 1) : 1;
-    const totalPages = isSearch ? ((json as SearchJson).totalPages ?? 1) : 1;
-    return { messages, totalCount: messages.length, page, totalPages };
-  }
-
-  const json = JSON.parse(output) as ShowJson;
-  const messages = (json.messages ?? []).map(showMessage);
-  return { messages, totalCount: messages.length, page: options.page ?? 1, totalPages: 1 };
+  const json = JSON.parse(runGoosedump(args)) as SearchJson;
+  const messages = (json.hits ?? []).map(hitMessage);
+  return { messages, page: json.page ?? options.page ?? 1, totalPages: json.totalPages ?? 1 };
 }
 
-function goosedumpExpand(
+function goosedumpShow(
   contextId: string,
-  entryIds: string[],
-  scope: string = 'lineage',
+  options: { scope?: string; ids?: string[] } = {},
 ): GoosedumpMessage[] {
-  if (entryIds.length === 0) return [];
+  const scope = options.scope ?? 'lineage';
+  const args = ['show', `pi:${contextId}`];
+  if (options.ids && options.ids.length > 0) args.push('--ids', options.ids.join(','));
+  args.push('--scope', scope);
 
-  const json = JSON.parse(
-    runGoosedump(['show', `pi:${contextId}`, '--ids', entryIds.join(','), '--scope', scope]),
-  ) as ShowJson;
+  const json = JSON.parse(runGoosedump(args)) as ShowJson;
   return (json.messages ?? []).map(showMessage);
 }
 
@@ -588,14 +567,204 @@ function buildGoosedumpCompaction(
   };
 }
 
+async function runSessionBrowser(
+  ctx: ExtensionContext,
+  listings: GoosedumpListing[],
+): Promise<string | null | undefined> {
+  let resumePath: string | null | undefined;
+
+  await ctx.ui.custom<void>(
+    (tui, theme, _kb, done) => {
+      let selectedIndex = 0;
+      let mode: 'list' | 'compact' = 'list';
+      let compactLines: string[] = [];
+      let compactScroll = 0;
+      let compactTitle = '';
+
+      const COMPACT_VIEWPORT = 20;
+
+      return {
+        render(width: number): string[] {
+          const innerW = width - 4;
+          const border = theme.fg('border', '│');
+          const borderFg = (s: string) => theme.fg('border', s);
+          const dim = (s: string) => theme.fg('dim', s);
+          const accent = (s: string) => theme.fg('accent', s);
+          const text = (s: string) => theme.fg('text', s);
+          const muted = (s: string) => theme.fg('muted', s);
+
+          const lines: string[] = [];
+
+          if (mode === 'compact') {
+            const title = accent(` Compact: ${truncateToWidth(compactTitle, 40)} `);
+            const topFill = borderFg('─'.repeat(Math.max(0, width - 4 - visibleWidth(title))));
+            lines.push(`${borderFg('╭─')}${title}${topFill}${borderFg('─╮')}`);
+
+            const total = compactLines.length;
+            const maxScroll = Math.max(0, total - COMPACT_VIEWPORT);
+            if (compactScroll > maxScroll) compactScroll = maxScroll;
+            const window = compactLines.slice(compactScroll, compactScroll + COMPACT_VIEWPORT);
+            for (const row of window) {
+              lines.push(makeRow(text(truncateToWidth(row, innerW)), innerW, border));
+            }
+            for (let i = window.length; i < COMPACT_VIEWPORT; i++) {
+              lines.push(makeRow('', innerW, border));
+            }
+
+            const position =
+              total > COMPACT_VIEWPORT
+                ? `${compactScroll + 1}-${Math.min(compactScroll + COMPACT_VIEWPORT, total)} of ${total}`
+                : `${total} line${total === 1 ? '' : 's'}`;
+            lines.push(makeRow('', innerW, border));
+            lines.push(makeRow(dim(`↑↓ scroll  esc back  (${position})`), innerW, border));
+            lines.push(`${borderFg('╰')}${borderFg('─'.repeat(width - 2))}${borderFg('╯')}`);
+            return lines;
+          }
+
+          // Top border
+          const title = accent(' Goosedump Sessions ');
+          const topFill = borderFg('─'.repeat(Math.max(0, width - 4 - visibleWidth(title))));
+          lines.push(`${borderFg('╭─')}${title}${topFill}${borderFg('─╮')}`);
+
+          // Session count
+          const countInfo = `${listings.length} session${listings.length === 1 ? '' : 's'}`;
+          lines.push(makeRow(`${muted(countInfo)}`, innerW, border));
+
+          lines.push(makeRow('', innerW, border));
+
+          // Session list
+          const maxItems = Math.min(listings.length, 20);
+          for (let i = 0; i < maxItems; i++) {
+            const listing = listings[i];
+            const isSelected = i === selectedIndex;
+            const cursor = isSelected ? accent('▶') : ' ';
+            const idText = isSelected ? accent(listing.id) : text(listing.id);
+            const line = `  ${cursor} ${idText}`;
+            lines.push(makeRow(truncateToWidth(line, innerW), innerW, border));
+          }
+
+          if (listings.length > 20) {
+            lines.push(makeRow(dim(`  ... and ${listings.length - 20} more`), innerW, border));
+          }
+
+          // Footer
+          lines.push(makeRow('', innerW, border));
+          lines.push(
+            makeRow(
+              dim('↑↓ navigate  enter compact  shift+enter resume  esc close'),
+              innerW,
+              border,
+            ),
+          );
+
+          // Bottom border
+          lines.push(`${borderFg('╰')}${borderFg('─'.repeat(width - 2))}${borderFg('╯')}`);
+
+          return lines;
+        },
+
+        handleInput(data: string): void {
+          if (mode === 'compact') {
+            if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl('c'))) {
+              mode = 'list';
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, Key.up)) {
+              compactScroll = Math.max(0, compactScroll - 1);
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, Key.down)) {
+              compactScroll += 1;
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, Key.pageUp)) {
+              compactScroll = Math.max(0, compactScroll - COMPACT_VIEWPORT);
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, Key.pageDown)) {
+              compactScroll += COMPACT_VIEWPORT;
+              tui.requestRender();
+              return;
+            }
+            return;
+          }
+
+          if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl('c'))) {
+            done(undefined);
+            return;
+          }
+
+          if (matchesKey(data, Key.up)) {
+            selectedIndex = Math.max(0, selectedIndex - 1);
+            tui.requestRender();
+            return;
+          }
+
+          if (matchesKey(data, Key.down)) {
+            selectedIndex = Math.min(listings.length - 1, selectedIndex + 1);
+            tui.requestRender();
+            return;
+          }
+
+          if (matchesKey(data, Key.shift(Key.enter))) {
+            resumePath = listings[selectedIndex]?.path;
+            done(undefined);
+            return;
+          }
+
+          if (matchesKey(data, Key.enter) || matchesKey(data, Key.return)) {
+            const listing = listings[selectedIndex];
+            if (!listing) return;
+            compactTitle = listing.id;
+            compactScroll = 0;
+            try {
+              const summary = goosedumpCompact(listing.id, { scope: 'lineage' }).trim();
+              compactLines = summary
+                ? summary.split('\n')
+                : ['No compact summary available for this session.'];
+            } catch (err) {
+              const msg = err instanceof Error ? err.message : String(err);
+              compactLines = [`Failed to compact session: ${msg}`];
+            }
+            mode = 'compact';
+            tui.requestRender();
+            return;
+          }
+        },
+
+        invalidate(): void {},
+      };
+
+      function makeRow(content: string, innerW: number, border: string): string {
+        const line = truncateToWidth(content, innerW);
+        const pad = Math.max(0, innerW - visibleWidth(line));
+        return `${border} ${line}${' '.repeat(pad)} ${border}`;
+      }
+    },
+    {
+      overlay: true,
+      overlayOptions: {
+        anchor: 'center',
+        width: 72,
+        margin: 2,
+      },
+    },
+  );
+
+  return resumePath;
+}
+
 export function createGoosedumpIntegration(
   options: GoosedumpIntegrationOptions = {},
 ): GoosedumpIntegration {
   const shouldRegisterTool = options.registerTool ?? true;
   const shouldOverrideDefaultCompaction = options.overrideDefaultCompaction ?? true;
 
-  let goosedumpReady = false;
-  let goosedumpEnabled = false;
+  let goosedumpAvailable = false;
 
   function checkGoosedump(ctx?: ExtensionContext): boolean {
     const version = goosedumpVersion();
@@ -686,16 +855,10 @@ export function createGoosedumpIntegration(
             ),
           }),
           async execute(_id, params, _signal, _onUpdate, ctx): Promise<AgentToolResult<void>> {
-            if (!goosedumpEnabled || !goosedumpReady) {
-              return {
-                content: [
-                  {
-                    type: 'text',
-                    text: 'goosedump is not available. Install with: npm install @jarkkojs/goosedump',
-                  },
-                ],
-                details: undefined,
-              };
+            if (!goosedumpAvailable) {
+              return textResult(
+                'goosedump is not available. Install with: npm install @jarkkojs/goosedump',
+              );
             }
 
             try {
@@ -703,10 +866,7 @@ export function createGoosedumpIntegration(
                 case 'list': {
                   const listings = goosedumpList();
                   if (listings.length === 0) {
-                    return {
-                      content: [{ type: 'text', text: 'No sessions found.' }],
-                      details: undefined,
-                    };
+                    return textResult('No sessions found.');
                   }
 
                   const lines = ['Available sessions:', ''];
@@ -714,45 +874,22 @@ export function createGoosedumpIntegration(
                     lines.push(`  ${listing.id}`);
                   }
 
-                  return {
-                    content: [{ type: 'text', text: lines.join('\n') }],
-                    details: undefined,
-                  };
+                  return textResult(lines.join('\n'));
                 }
 
                 case 'search': {
                   const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) {
-                    return {
-                      content: [
-                        {
-                          type: 'text',
-                          text: 'contextId is required for search when no current session is available',
-                        },
-                      ],
-                      details: undefined,
-                    };
-                  }
+                  if (!contextId) return missingContextId('search');
 
-                  if (!params.query) {
-                    return {
-                      content: [{ type: 'text', text: 'query is required for search' }],
-                      details: undefined,
-                    };
-                  }
+                  if (!params.query) return textResult('query is required for search');
 
-                  const result = goosedumpContext(contextId, {
+                  const result = goosedumpSearch(contextId, params.query, {
                     scope: params.scope ?? 'lineage',
-                    grep: params.query,
-                    rank: true,
                     page: params.page ?? 1,
                   });
 
                   if (result.messages.length === 0) {
-                    return {
-                      content: [{ type: 'text', text: `No results for "${params.query}"` }],
-                      details: undefined,
-                    };
+                    return textResult(`No results for "${params.query}"`);
                   }
 
                   const useCompact = params.compact ?? true;
@@ -761,97 +898,48 @@ export function createGoosedumpIntegration(
                     : formatMessagesFull(result.messages);
 
                   const header = `Results for "${params.query}" (page ${result.page} of ${result.totalPages}):\n\n`;
-                  return {
-                    content: [{ type: 'text', text: header + text }],
-                    details: undefined,
-                  };
+                  return textResult(header + text);
                 }
 
                 case 'expand': {
                   const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) {
-                    return {
-                      content: [
-                        {
-                          type: 'text',
-                          text: 'contextId is required for expand when no current session is available',
-                        },
-                      ],
-                      details: undefined,
-                    };
-                  }
+                  if (!contextId) return missingContextId('expand');
 
                   if (!params.ids || params.ids.length === 0) {
-                    return {
-                      content: [
-                        { type: 'text', text: 'ids is required for expand (array of entry IDs)' },
-                      ],
-                      details: undefined,
-                    };
+                    return textResult('ids is required for expand (array of entry IDs)');
                   }
 
-                  const messages = goosedumpExpand(
-                    contextId,
-                    params.ids,
-                    params.scope ?? 'lineage',
-                  );
+                  const messages = goosedumpShow(contextId, {
+                    scope: params.scope ?? 'lineage',
+                    ids: params.ids,
+                  });
 
                   if (messages.length === 0) {
-                    return {
-                      content: [{ type: 'text', text: 'No entries found for the given IDs.' }],
-                      details: undefined,
-                    };
+                    return textResult('No entries found for the given IDs.');
                   }
 
-                  return {
-                    content: [{ type: 'text', text: formatMessagesFull(messages) }],
-                    details: undefined,
-                  };
+                  return textResult(formatMessagesFull(messages));
                 }
 
                 case 'view': {
                   const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) {
-                    return {
-                      content: [
-                        {
-                          type: 'text',
-                          text: 'contextId is required for view when no current session is available',
-                        },
-                      ],
-                      details: undefined,
-                    };
-                  }
+                  if (!contextId) return missingContextId('view');
 
-                  const result = goosedumpContext(contextId, {
-                    scope: params.scope ?? 'lineage',
-                  });
+                  const messages = goosedumpShow(contextId, { scope: params.scope ?? 'lineage' });
 
-                  if (result.messages.length === 0) {
-                    return {
-                      content: [{ type: 'text', text: `Session "${contextId}" has no messages.` }],
-                      details: undefined,
-                    };
+                  if (messages.length === 0) {
+                    return textResult(`Session "${contextId}" has no messages.`);
                   }
 
-                  return {
-                    content: [{ type: 'text', text: formatMessagesFull(result.messages) }],
-                    details: undefined,
-                  };
+                  return textResult(formatMessagesFull(messages));
                 }
 
                 default:
-                  return {
-                    content: [{ type: 'text', text: `Unknown action: ${params.action}` }],
-                    details: undefined,
-                  };
+                  return textResult(`Unknown action: ${params.action}`);
               }
             } catch (err) {
               const message = err instanceof Error ? err.message : String(err);
-              return {
-                content: [{ type: 'text', text: `goosedump error: ${message}` }],
-                details: undefined,
-              };
+              return textResult(`goosedump error: ${message}`);
             }
           },
         }),
@@ -859,10 +947,9 @@ export function createGoosedumpIntegration(
     }
 
     pi.on('session_start', async (_event, ctx) => {
-      goosedumpReady = checkGoosedump(ctx);
-      goosedumpEnabled = goosedumpReady;
+      goosedumpAvailable = checkGoosedump(ctx);
 
-      if (goosedumpReady) {
+      if (goosedumpAvailable) {
         const theme = ctx.ui.theme;
         const dot = theme.fg('success', '●');
         const label = theme.fg('text', 'Goosedump');
@@ -871,7 +958,7 @@ export function createGoosedumpIntegration(
     });
 
     pi.on('session_before_compact', async (event, ctx) => {
-      if (!shouldOverrideDefaultCompaction || !goosedumpEnabled || !goosedumpReady) return;
+      if (!shouldOverrideDefaultCompaction || !goosedumpAvailable) return;
       if (event.customInstructions?.trim()) return;
       if (event.signal.aborted) return;
 
@@ -901,7 +988,7 @@ export function createGoosedumpIntegration(
     });
 
     pi.on('session_compact', async (event, ctx) => {
-      if (!goosedumpEnabled || !goosedumpReady || !event.fromExtension) return;
+      if (!goosedumpAvailable || !event.fromExtension) return;
 
       const compactionEntry = event.compactionEntry;
       if (!compactionEntry) return;
@@ -925,7 +1012,7 @@ export function createGoosedumpIntegration(
     maybePi.registerCommand?.('goosedump', {
       description: 'Browse coding agent session history',
       handler: async (_args, ctx) => {
-        if (!goosedumpEnabled || !goosedumpReady) {
+        if (!goosedumpAvailable) {
           ctx.ui.notify(
             'goosedump is not available. Install with: npm install @jarkkojs/goosedump',
             'error',
@@ -941,99 +1028,13 @@ export function createGoosedumpIntegration(
             return;
           }
 
-          await ctx.ui.custom<void>(
-            (tui, theme, _kb, done) => {
-              let selectedIndex = 0;
-
-              return {
-                render(width: number): string[] {
-                  const innerW = width - 4;
-                  const border = theme.fg('border', '│');
-                  const borderFg = (s: string) => theme.fg('border', s);
-                  const dim = (s: string) => theme.fg('dim', s);
-                  const accent = (s: string) => theme.fg('accent', s);
-                  const text = (s: string) => theme.fg('text', s);
-                  const muted = (s: string) => theme.fg('muted', s);
-
-                  const lines: string[] = [];
-
-                  // Top border
-                  const title = accent(' Goosedump Sessions ');
-                  const topFill = borderFg(
-                    '─'.repeat(Math.max(0, width - 4 - visibleWidth(title))),
-                  );
-                  lines.push(`${borderFg('╭─')}${title}${topFill}${borderFg('─╮')}`);
-
-                  // Session count
-                  const countInfo = `${listings.length} session${listings.length === 1 ? '' : 's'}`;
-                  lines.push(makeRow(`${muted(countInfo)}`, innerW, border));
-
-                  lines.push(makeRow('', innerW, border));
-
-                  // Session list
-                  const maxItems = Math.min(listings.length, 20);
-                  for (let i = 0; i < maxItems; i++) {
-                    const listing = listings[i];
-                    const isSelected = i === selectedIndex;
-                    const cursor = isSelected ? accent('▶') : ' ';
-                    const idText = isSelected ? accent(listing.id) : text(listing.id);
-                    const line = `  ${cursor} ${idText}`;
-                    lines.push(makeRow(truncateToWidth(line, innerW), innerW, border));
-                  }
-
-                  if (listings.length > 20) {
-                    lines.push(
-                      makeRow(dim(`  ... and ${listings.length - 20} more`), innerW, border),
-                    );
-                  }
-
-                  // Footer
-                  lines.push(makeRow('', innerW, border));
-                  lines.push(makeRow(dim('↑↓ navigate  esc close'), innerW, border));
-
-                  // Bottom border
-                  lines.push(`${borderFg('╰')}${borderFg('─'.repeat(width - 2))}${borderFg('╯')}`);
-
-                  return lines;
-                },
+          const resumePath = await runSessionBrowser(ctx, listings);
 
-                handleInput(data: string): void {
-                  if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl('c'))) {
-                    done(undefined);
-                    return;
-                  }
-
-                  if (matchesKey(data, Key.up)) {
-                    selectedIndex = Math.max(0, selectedIndex - 1);
-                    tui.requestRender();
-                    return;
-                  }
-
-                  if (matchesKey(data, Key.down)) {
-                    selectedIndex = Math.min(listings.length - 1, selectedIndex + 1);
-                    tui.requestRender();
-                    return;
-                  }
-                },
-
-                invalidate(): void {},
-              };
-
-              function makeRow(content: string, innerW: number, border: string): string {
-                const line = truncateToWidth(content, innerW);
-                const pad = Math.max(0, innerW - visibleWidth(line));
-                return `${border} ${line}${' '.repeat(pad)} ${border}`;
-              }
-            },
-            {
-              overlay: true,
-              overlayOptions: {
-                anchor: 'center',
-                width: 72,
-                margin: 2,
-              },
-            },
-          );
+          if (resumePath) {
+            await ctx.switchSession(resumePath);
+          } else if (resumePath === null) {
+            ctx.ui.notify('Cannot resume: session file path is unavailable.', 'error');
+          }
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           ctx.ui.notify(`goosedump error: ${message}`, 'error');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Coding agent context data browser plugin for pi",
   "keywords": [
     "goosedump",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@earendil-works/pi-tui": "^0.78.0",
-    "@jarkkojs/goosedump": "^0.4.2",
+    "@jarkkojs/goosedump": "^0.5.0",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {