pi-goosedump 0.3.5 → 0.4.0

package/README.md

@@ -47,7 +47,7 @@ Opens an interactive session browser.
 ### Compaction
 
 pi-goosedump hooks Pi's `/compact` and auto-compaction flow. It uses
-`goosedump compact pi <session>` with Pi's compaction range (`--from`,
+`goosedump compact pi:<session>` with Pi's compaction range (`--from`,
 `--until`, and `--scope`) so the generated summary matches the entries Pi is
 about to replace.
 

package/index.ts

@@ -23,7 +23,7 @@ import { Type } from '@sinclair/typebox';
 
 const require = createRequire(import.meta.url);
 
-const GOOSEDUMP_VERSION = [0, 3, 3] as const;
+const GOOSEDUMP_VERSION = [0, 4, 2] as const;
 
 interface GoosedumpListing {
   id: string;
@@ -43,6 +43,62 @@ interface GoosedumpContextResult {
   totalPages: number;
 }
 
+interface ListJson {
+  sessions: { id: string }[];
+}
+
+interface ToolCallJson {
+  name: string;
+  arguments: unknown;
+}
+
+interface ShowMessageJson {
+  entryId: string;
+  kind: 'text' | 'assistant' | 'toolResult' | 'bash';
+  role?: string;
+  text?: string;
+  thinking?: string[];
+  toolCalls?: ToolCallJson[];
+  toolName?: string;
+  content?: string;
+  isError?: boolean;
+  command?: string;
+  output?: string;
+}
+
+interface ShowJson {
+  messages: ShowMessageJson[];
+}
+
+interface HitJson {
+  entryId: string;
+  role: string;
+  score: number;
+  text: string;
+  files: string[];
+  terms: string[];
+}
+
+interface SearchJson {
+  page: number;
+  totalPages: number;
+  total: number;
+  hits: HitJson[];
+}
+
+interface GrepJson {
+  hits: HitJson[];
+}
+
+interface CompactJson {
+  goals: string[];
+  files: { modified: string[]; created: string[]; read: string[] };
+  commits: string[];
+  outstanding: string[];
+  preferences: string[];
+  brief: string;
+}
+
 function resolveGoosedumpBinary(): string {
   try {
     return require.resolve('@jarkkojs/goosedump/bin/goosedump.js');
@@ -92,66 +148,76 @@ function hasMinimumVersion(version: string, minimum: readonly [number, number, n
   return true;
 }
 
-function parseListings(output: string): GoosedumpListing[] {
-  const listings: GoosedumpListing[] = [];
-  const lines = output.split('\n');
+function clip(value: string, max: number): string {
+  return value.length > max ? `${value.slice(0, max)}...` : value;
+}
 
-  for (const line of lines) {
-    if (line === 'Sessions:' || line.trim() === '') continue;
-    const match = line.match(/^  (\S+)/);
-    if (match) {
-      listings.push({ id: match[1] });
+function summarizeToolArgs(args: unknown): string {
+  if (args && typeof args === 'object' && !Array.isArray(args)) {
+    const obj = args as Record<string, unknown>;
+    for (const key of ['path', 'file_path', 'filePath', 'file']) {
+      if (typeof obj[key] === 'string') return `path=${obj[key] as string}`;
+    }
+    for (const key of ['command', 'query', 'pattern', 'description']) {
+      if (typeof obj[key] === 'string') return `${key}=${clip(obj[key] as string, 160)}`;
     }
+    const keys = Object.keys(obj);
+    return keys.length === 0 ? '' : keys.sort().join(', ');
   }
-
-  return listings;
+  if (typeof args === 'string') return clip(args, 160);
+  if (args == null) return '';
+  return clip(JSON.stringify(args), 160);
 }
 
-function parseMessages(output: string): GoosedumpMessage[] {
-  const messages: GoosedumpMessage[] = [];
-  const lines = output.split('\n');
-  let currentMsg: GoosedumpMessage | null = null;
-  let contentLines: string[] = [];
-
-  for (const line of lines) {
-    if (line.startsWith('results for ')) continue;
+function showMessageRole(m: ShowMessageJson): string {
+  switch (m.kind) {
+    case 'assistant':
+      return 'assistant';
+    case 'toolResult':
+      return `tool/${m.toolName ?? ''}${m.isError ? ' ⚠' : ''}`;
+    case 'bash':
+      return 'bash';
+    default:
+      return m.role && m.role.length > 0 ? m.role : 'unknown';
+  }
+}
 
-    const entryMatch = line.match(/^entryId:\s+(\S+)\s+\((.+?)\)(?:\s+\[[^\]]+\])?$/);
-    if (entryMatch) {
-      if (currentMsg) {
-        currentMsg.content = contentLines.join('\n').trim();
-        messages.push(currentMsg);
+function showMessageContent(m: ShowMessageJson): string {
+  switch (m.kind) {
+    case 'assistant': {
+      const parts: string[] = [];
+      if (m.thinking && m.thinking.length > 0) parts.push(m.thinking.join('\n'));
+      if (m.text) parts.push(m.text);
+      if (m.toolCalls && m.toolCalls.length > 0) {
+        parts.push(
+          m.toolCalls
+            .map((tc) => {
+              const summary = summarizeToolArgs(tc.arguments);
+              return summary ? `${tc.name}(${summary})` : tc.name;
+            })
+            .join('\n'),
+        );
       }
-      currentMsg = {
-        id: entryMatch[1],
-        role: entryMatch[2],
-        content: '',
-      };
-      contentLines = [];
-      continue;
+      return parts.join('\n');
     }
-
-    if (currentMsg) {
-      const indentedMatch = line.match(/^  (.+)$/);
-      if (indentedMatch) {
-        const content = indentedMatch[1];
-        if (content.startsWith('score: ')) {
-          const scoreVal = parseFloat(content.slice(7));
-          if (!isNaN(scoreVal)) currentMsg.score = scoreVal;
-          continue;
-        }
-        if (/^\.\.\.\(\d+ lines (?:above|below)\)$/.test(content)) continue;
-        contentLines.push(content);
-      }
+    case 'toolResult':
+      return m.content ?? '';
+    case 'bash': {
+      const cmd = m.command ? `$ ${m.command}` : '';
+      if (cmd && m.output) return `${cmd}\n${m.output}`;
+      return cmd || (m.output ?? '');
     }
+    default:
+      return m.text ?? '';
   }
+}
 
-  if (currentMsg) {
-    currentMsg.content = contentLines.join('\n').trim();
-    messages.push(currentMsg);
-  }
+function showMessage(m: ShowMessageJson): GoosedumpMessage {
+  return { id: m.entryId, role: showMessageRole(m), content: showMessageContent(m) };
+}
 
-  return messages;
+function hitMessage(h: HitJson): GoosedumpMessage {
+  return { id: h.entryId, role: h.role, content: h.text, score: h.score };
 }
 
 function formatMessagesCompact(messages: GoosedumpMessage[]): string {
@@ -172,21 +238,9 @@ function runGoosedump(args: string[]): string {
   });
 }
 
-function parsePageInfo(output: string, fallbackPage: number): { page: number; totalPages: number } {
-  const match = output.match(/\(page\s+(\d+)\s+of\s+(\d+)\):/i);
-  if (!match) {
-    return { page: fallbackPage, totalPages: 1 };
-  }
-
-  return {
-    page: Number(match[1]),
-    totalPages: Number(match[2]),
-  };
-}
-
 function goosedumpList(): GoosedumpListing[] {
-  const output = runGoosedump(['list', 'pi']);
-  return parseListings(output);
+  const json = JSON.parse(runGoosedump(['list', 'pi:*'])) as ListJson;
+  return (json.sessions ?? []).map((session) => ({ id: session.id }));
 }
 
 function goosedumpContext(
@@ -194,7 +248,6 @@ function goosedumpContext(
   options: {
     scope?: string;
     grep?: string;
-    compact?: boolean;
     ids?: string;
     rank?: boolean;
     page?: number;
@@ -202,33 +255,35 @@ function goosedumpContext(
 ): GoosedumpContextResult {
   const scope = options.scope ?? 'lineage';
   const hasQuery = typeof options.grep === 'string';
+  const isSearch = hasQuery && options.rank !== false;
+  const target = `pi:${contextId}`;
   const args = hasQuery
-    ? options.rank === false
-      ? ['grep', 'pi', contextId, options.grep ?? '']
-      : ['search', 'pi', contextId, options.grep ?? '']
-    : ['show', 'pi', contextId];
+    ? isSearch
+      ? ['search', target, options.grep ?? '']
+      : ['grep', target, options.grep ?? '']
+    : ['show', target];
 
-  if (options.compact) {
-    args.push('--clip');
-  }
   if (options.ids) {
     args.push('--ids', options.ids);
   }
-  if (hasQuery && options.rank !== false && options.page) {
+  if (isSearch && options.page) {
     args.push('--page', String(options.page));
   }
   args.push('--scope', scope);
 
   const output = runGoosedump(args);
-  const messages = parseMessages(output);
-  const pageInfo = parsePageInfo(output, options.page ?? 1);
 
-  return {
-    messages,
-    totalCount: messages.length,
-    page: pageInfo.page,
-    totalPages: pageInfo.totalPages,
-  };
+  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 };
 }
 
 function goosedumpExpand(
@@ -238,16 +293,38 @@ function goosedumpExpand(
 ): GoosedumpMessage[] {
   if (entryIds.length === 0) return [];
 
-  const output = runGoosedump([
-    'show',
-    'pi',
-    contextId,
-    '--ids',
-    entryIds.join(','),
-    '--scope',
-    scope,
-  ]);
-  return parseMessages(output);
+  const json = JSON.parse(
+    runGoosedump(['show', `pi:${contextId}`, '--ids', entryIds.join(','), '--scope', scope]),
+  ) as ShowJson;
+  return (json.messages ?? []).map(showMessage);
+}
+
+function capList(items: string[], limit: number): string {
+  const shown = items.slice(0, limit).join(', ');
+  return items.length > limit ? `${shown} (+${items.length - limit} more)` : shown;
+}
+
+function bulletSection(title: string, items: string[]): string | null {
+  if (items.length === 0) return null;
+  return `[${title}]\n${items.map((item) => `- ${item}`).join('\n')}`;
+}
+
+function renderCompactSummary(c: CompactJson): string {
+  const fileLines: string[] = [];
+  if (c.files.modified.length > 0) fileLines.push(`Modified: ${capList(c.files.modified, 10)}`);
+  if (c.files.created.length > 0) fileLines.push(`Created: ${capList(c.files.created, 10)}`);
+  if (c.files.read.length > 0) fileLines.push(`Read: ${capList(c.files.read, 10)}`);
+
+  const parts = [
+    bulletSection('Session Goal', c.goals),
+    bulletSection('Files And Changes', fileLines),
+    bulletSection('Commits', c.commits),
+    bulletSection('Outstanding Context', c.outstanding),
+    bulletSection('User Preferences', c.preferences),
+    c.brief.trim() ? c.brief : null,
+  ].filter((part): part is string => part !== null);
+
+  return parts.join('\n\n---\n\n');
 }
 
 function goosedumpCompact(
@@ -260,7 +337,7 @@ function goosedumpCompact(
   },
 ): string {
   const scope = options.scope ?? 'lineage';
-  const args = ['compact', 'pi', contextId, '--scope', scope];
+  const args = ['compact', `pi:${contextId}`, '--scope', scope];
 
   if (options.ids && options.ids.length > 0) {
     args.push('--ids', options.ids.join(','));
@@ -269,7 +346,8 @@ function goosedumpCompact(
     if (options.until) args.push('--until', options.until);
   }
 
-  return runGoosedump(args).trim();
+  const json = JSON.parse(runGoosedump(args)) as CompactJson;
+  return renderCompactSummary(json);
 }
 
 export interface GoosedumpIntegrationOptions {
@@ -666,7 +744,6 @@ export function createGoosedumpIntegration(
                   const result = goosedumpContext(contextId, {
                     scope: params.scope ?? 'lineage',
                     grep: params.query,
-                    compact: params.compact ?? true,
                     rank: true,
                     page: params.page ?? 1,
                   });
@@ -748,7 +825,6 @@ export function createGoosedumpIntegration(
 
                   const result = goosedumpContext(contextId, {
                     scope: params.scope ?? 'lineage',
-                    compact: false,
                   });
 
                   if (result.messages.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.3.5",
+  "version": "0.4.0",
   "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.3.3",
+    "@jarkkojs/goosedump": "^0.4.2",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {