pi-goosedump 0.2.2 → 0.3.1

package/README.md

@@ -12,6 +12,9 @@ pi install npm:pi-goosedump
 This installs `pi-goosedump` and its `@jarkkojs/goosedump` dependency, which
 includes platform-specific native binaries for Linux, macOS, and Windows.
 
+The upstream `@jarkkojs/goosedump` packages are licensed separately as
+`Apache-2.0 AND LGPL-2.1-or-later`.
+
 ## Usage
 
 Once installed, pi-goosedump registers a tool and a slash command:

package/index.ts

@@ -23,7 +23,7 @@ import { Type } from '@sinclair/typebox';
 
 const require = createRequire(import.meta.url);
 
-const GOOSEDUMP_VERSION = [0, 2, 2] as const;
+const GOOSEDUMP_VERSION = [0, 3, 1] as const;
 
 interface GoosedumpListing {
   id: string;
@@ -116,7 +116,7 @@ function parseMessages(output: string): GoosedumpMessage[] {
   for (const line of lines) {
     if (line.startsWith('results for ')) continue;
 
-    const entryMatch = line.match(/^entryId:\s+(\S+)\s+\((.+)\)$/);
+    const entryMatch = line.match(/^entryId:\s+(\S+)\s+\((.+?)\)(?:\s+\[[^\]]+\])?$/);
     if (entryMatch) {
       if (currentMsg) {
         currentMsg.content = contentLines.join('\n').trim();
@@ -376,24 +376,103 @@ function buildCompactRange(
     : { scope: 'lineage', until: firstKeptEntryId };
 }
 
+const GOOSEDUMP_NOTE =
+  'Use `goosedump` to search prior active-lineage work, decisions, and context from before this summary. Do not redo work already completed.';
+const GOOSEDUMP_SEPARATOR = '\n\n---\n\n';
+const GOOSEDUMP_HEADERS = [
+  'Session Goal',
+  'Files And Changes',
+  'Commits',
+  'Outstanding Context',
+  'User Preferences',
+] as const;
+
+function isGoosedumpSection(value: string): boolean {
+  return GOOSEDUMP_HEADERS.some((header) => value.startsWith(`[${header}]`));
+}
+
+function stripGoosedumpRecallNote(summary: string): string {
+  const idx = summary.lastIndexOf(GOOSEDUMP_NOTE);
+  if (idx < 0) return summary.trim();
+  return summary
+    .slice(0, idx)
+    .replace(/\s*(?:\n\n---\n\n)?\s*$/, '')
+    .trim();
+}
+
+function sectionOf(summary: string, header: string): string {
+  const tag = `[${header}]`;
+  const start = summary.indexOf(tag);
+  if (start < 0) return '';
+
+  const rest = summary.slice(start);
+  const nextHeader = GOOSEDUMP_HEADERS.filter((h) => h !== header)
+    .map((h) => rest.indexOf(`[${h}]`))
+    .filter((idx) => idx > 0);
+  const nextSeparator = rest.indexOf(GOOSEDUMP_SEPARATOR);
+  const candidates = [...nextHeader, ...(nextSeparator > 0 ? [nextSeparator] : [])].sort(
+    (a, b) => a - b,
+  );
+  const end = candidates[0];
+  return (end ? rest.slice(0, end) : rest).trim();
+}
+
+function briefOf(summary: string): string {
+  return stripGoosedumpRecallNote(summary)
+    .split(GOOSEDUMP_SEPARATOR)
+    .map((part) => part.trim())
+    .filter((part) => part && !isGoosedumpSection(part))
+    .join(GOOSEDUMP_SEPARATOR);
+}
+
+function mergeSection(header: string, previous: string, next: string): string {
+  if (header === 'Outstanding Context') return next;
+  if (!previous) return next;
+  if (!next) return previous;
+
+  const lines = [
+    ...new Set(
+      [...previous.split('\n'), ...next.split('\n')].filter((line) => line.startsWith('- ')),
+    ),
+  ];
+  const cap = header === 'Session Goal' ? 8 : header === 'User Preferences' ? 15 : 10;
+  const capped = lines.length > cap ? lines.slice(-cap) : lines;
+  return capped.length > 0 ? `[${header}]\n${capped.join('\n')}` : '';
+}
+
+function capBriefTranscript(brief: string): string {
+  const lines = brief.split('\n');
+  if (lines.length <= 120) return brief;
+  const kept = lines.slice(-120);
+  const firstHeader = kept.findIndex((line) => /^\[(user|assistant)\]$/.test(line));
+  const clean = firstHeader > 0 ? kept.slice(firstHeader) : kept;
+  return `...(${lines.length - clean.length} earlier lines omitted)\n\n${clean.join('\n')}`;
+}
+
 function mergeWithPreviousSummary(
   summary: string,
   previousSummary: string | undefined,
 ): { summary: string; previousSummaryIncluded: boolean } {
-  const nextSummary = summary.trim();
-  const priorSummary = previousSummary?.trim();
+  const nextSummary = stripGoosedumpRecallNote(summary);
+  const priorSummary = previousSummary ? stripGoosedumpRecallNote(previousSummary) : '';
 
   if (!priorSummary) {
-    return { summary: nextSummary, previousSummaryIncluded: false };
+    return { summary: summary.trim(), previousSummaryIncluded: false };
   }
   if (!nextSummary) {
-    return { summary: priorSummary, previousSummaryIncluded: true };
+    return { summary: previousSummary?.trim() ?? '', previousSummaryIncluded: true };
   }
 
-  return {
-    summary: `${priorSummary}\n\n## Recent Compaction Update\n${nextSummary}`,
-    previousSummaryIncluded: true,
-  };
+  const sections = GOOSEDUMP_HEADERS.map((header) =>
+    mergeSection(header, sectionOf(priorSummary, header), sectionOf(nextSummary, header)),
+  ).filter(Boolean);
+  const brief = capBriefTranscript(
+    [briefOf(priorSummary), briefOf(nextSummary)].filter(Boolean).join('\n\n'),
+  );
+  const parts = [...sections, ...(brief ? [brief] : [])];
+  const merged = `${parts.join(GOOSEDUMP_SEPARATOR)}${GOOSEDUMP_SEPARATOR}${GOOSEDUMP_NOTE}`;
+
+  return { summary: merged.trim(), previousSummaryIncluded: true };
 }
 
 function buildGoosedumpCompaction(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.2.2",
+  "version": "0.3.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.2.2",
+    "@jarkkojs/goosedump": "^0.3.2",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {