pi-goosedump 0.5.6 → 0.6.1

package/README.md

@@ -21,7 +21,7 @@ Once installed, pi-goosedump registers a tool and a slash command:
 
 ### Tool: `goosedump`
 
-The agent can browse the current session by default or a named session with `contextId`:
+The agent can browse the current Pi session by default or a named session with `contextId`:
 
 | Action   | Description                              |
 | -------- | ---------------------------------------- |
@@ -42,6 +42,34 @@ goosedump({ action: "expand", ids: ["entry-a", "entry-b"] })
 goosedump({ action: "view" })
 ```
 
+#### Other providers
+
+By default the tool browses Pi sessions. Set `provider` (one of `claude`,
+`codex`, `crush`, `gemini`, `goose`, `opencode`, `pi`) with a `contextId` to
+browse another tool's sessions; results render the same way as Pi sessions.
+Non-pi providers have no current session, so they require an explicit
+`contextId`.
+
+```
+goosedump({ action: "list", provider: "claude" })
+goosedump({ action: "view", provider: "claude", contextId: "abc123" })
+```
+
+#### Raw native output
+
+By default every action renders through the normal structured view. Set
+`outputFormat` to emit the raw native session instead — one of `claude`,
+`codex`, `crush`, `gemini`, `goose`, `opencode`, `pi`, or `json`. JSONL providers
+(`claude`, `codex`, `pi`, `gemini`) emit the raw session file; SQLite providers
+(`crush`, `goose`, `opencode`) emit a row-oriented JSON projection of their
+tables; `json` emits goosedump's structured JSON. This is round-trippable and
+applies to `view`, `expand`, `grep`, and `search`.
+
+```
+goosedump({ action: "view", outputFormat: "goose" })
+goosedump({ action: "grep", pattern: "*rand*", outputFormat: "claude" })
+```
+
 ### Command: `/goosedump`
 
 Opens an interactive session browser.

package/index.ts

@@ -13,10 +13,10 @@ import type {
 import { defineTool } from '@earendil-works/pi-coding-agent';
 
 import { execFileSync } from 'node:child_process';
-import { type Dirent, existsSync, readdirSync, readFileSync } from 'node:fs';
+import { type Dirent, existsSync, readdirSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
-import { basename, join } from 'node:path';
+import { basename, extname, join } from 'node:path';
 
 import {
   Key,
@@ -29,7 +29,7 @@ import { Type } from '@sinclair/typebox';
 
 const require = createRequire(import.meta.url);
 
-const GOOSEDUMP_VERSION = [0, 5, 1] as const;
+const GOOSEDUMP_VERSION = [0, 6, 2] as const;
 
 interface GoosedumpListing {
   id: string;
@@ -234,7 +234,10 @@ function textResult(text: string): AgentToolResult<void> {
   return { content: [{ type: 'text', text }], details: undefined };
 }
 
-function missingContextId(action: string): AgentToolResult<void> {
+function missingContextId(action: string, provider = 'pi'): AgentToolResult<void> {
+  if (provider !== 'pi') {
+    return textResult(`contextId is required for ${action} when provider is "${provider}"`);
+  }
   return textResult(`contextId is required for ${action} when no current session is available`);
 }
 
@@ -244,14 +247,16 @@ function runGoosedump(args: string[]): string {
   });
 }
 
-function goosedumpList(): GoosedumpListing[] {
-  const ids = runGoosedump(['list', 'pi:*'])
+function goosedumpList(provider = 'pi'): GoosedumpListing[] {
+  const prefix = `${provider}:`;
+  const ids = runGoosedump(['list', `${prefix}*`])
     .split('\n')
     .map((line) => line.trim())
-    .filter((line) => line.startsWith('pi:'))
-    .map((line) => line.slice('pi:'.length));
+    .filter((line) => line.startsWith(prefix))
+    .map((line) => line.slice(prefix.length));
 
-  const paths = indexPiSessionPaths();
+  // Only pi sessions live in the local sessions tree we can map back to files.
+  const paths = provider === 'pi' ? indexPiSessionPaths() : new Map<string, string>();
   return ids.map((id) => ({ id, path: paths.get(id) ?? null }));
 }
 
@@ -264,7 +269,7 @@ function piSessionsDir(): string {
 
 // goosedump's `list` no longer reports session file paths, so map each pi
 // session id back to its file by scanning the sessions tree, matching the same
-// id goosedump derives from the session header.
+// id goosedump derives from the session file stem.
 function indexPiSessionPaths(): Map<string, string> {
   const paths = new Map<string, string>();
   const walk = (dir: string): void => {
@@ -289,12 +294,12 @@ function indexPiSessionPaths(): Map<string, string> {
 }
 
 function goosedumpSearch(
-  contextId: string,
+  target: string,
   query: string,
   options: { scope?: string; page?: number } = {},
 ): GoosedumpSearchResult {
   const scope = options.scope ?? 'lineage';
-  const args = ['search', `pi:${contextId}`, query];
+  const args = ['search', target, query];
   if (options.page) args.push('--page', String(options.page));
   args.push('--scope', scope);
 
@@ -304,23 +309,23 @@ function goosedumpSearch(
 }
 
 function goosedumpGrep(
-  contextId: string,
+  target: string,
   pattern: string,
   options: { scope?: string } = {},
 ): GoosedumpMessage[] {
   const scope = options.scope ?? 'lineage';
-  const json = JSON.parse(runGoosedump(['grep', `pi:${contextId}`, pattern, '--scope', scope])) as {
+  const json = JSON.parse(runGoosedump(['grep', target, pattern, '--scope', scope])) as {
     hits?: HitJson[];
   };
   return (json.hits ?? []).map(hitMessage);
 }
 
 function goosedumpShow(
-  contextId: string,
+  target: string,
   options: { scope?: string; ids?: string[] } = {},
 ): GoosedumpMessage[] {
   const scope = options.scope ?? 'lineage';
-  const args = ['show', `pi:${contextId}`];
+  const args = ['show', target];
   if (options.ids && options.ids.length > 0) args.push('--ids', options.ids.join(','));
   args.push('--scope', scope);
 
@@ -328,6 +333,35 @@ function goosedumpShow(
   return (json.messages ?? []).map(showMessage);
 }
 
+// goosedump 0.6.2+ accepts --output-format on show/grep/search to emit a context
+// in a provider's native, round-trippable format. That output is raw native text
+// (not the ShowJson/HitJson shapes), so this bypasses the JSON-parsing wrappers
+// and returns it verbatim. Only used when the caller explicitly sets outputFormat.
+function goosedumpConvert(
+  subcommand: 'show' | 'grep' | 'search',
+  target: string,
+  outputFormat: string,
+  options: { positionals?: string[]; scope?: string; ids?: string[]; page?: number } = {},
+): string {
+  const args = [subcommand, target, ...(options.positionals ?? [])];
+  if (options.ids && options.ids.length > 0) args.push('--ids', options.ids.join(','));
+  if (options.page) args.push('--page', String(options.page));
+  args.push('--scope', options.scope ?? 'lineage', '--output-format', outputFormat);
+  return runGoosedump(args);
+}
+
+// Resolve a <provider>:<contextId> target. contextId falls back to the current
+// session only for pi; other providers have no current session, so they require
+// an explicit contextId.
+function resolveTarget(
+  ctx: ExtensionContext,
+  provider: string,
+  contextId: string | undefined,
+): string | null {
+  const id = contextId ?? (provider === 'pi' ? currentSessionContextId(ctx) : null);
+  return id ? `${provider}:${id}` : null;
+}
+
 function capList(items: string[], limit: number): string {
   const shown = items.slice(0, limit).join(', ');
   return items.length > limit ? `${shown} (+${items.length - limit} more)` : shown;
@@ -414,19 +448,11 @@ export default function (pi: ExtensionAPI) {
 function sessionFileContextId(sessionFile: string | null | undefined): string | null {
   if (!sessionFile) return null;
 
+  // goosedump 0.6+ derives a pi context id from the session file stem (file name
+  // without its extension), so match that exactly rather than the inner UUID.
   const name = basename(sessionFile);
-  const nameMatch = name.match(
-    /(?:^|_)([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/i,
-  );
-  if (nameMatch) return nameMatch[1];
-
-  try {
-    const firstLine = readFileSync(sessionFile, 'utf-8').split(/\r?\n/, 1)[0];
-    const header = JSON.parse(firstLine) as { id?: unknown };
-    return typeof header.id === 'string' && header.id.length > 0 ? header.id : null;
-  } catch {
-    return null;
-  }
+  const ext = extname(name);
+  return ext ? name.slice(0, -ext.length) : name;
 }
 
 function currentSessionContextId(ctx: ExtensionContext): string | null {
@@ -859,14 +885,16 @@ export function createGoosedumpIntegration(
           name: 'goosedump',
           label: 'goosedump',
           description:
-            'Browse coding agent session history. List all sessions, or view/search/grep the current or a named session. Supports ranked search, glob filtering, compact overview, and result expansion. Default scope is active lineage.',
+            "Browse coding agent session history across providers. List sessions, or view/search/grep the current Pi session or a named session. Set provider to browse another tool's sessions (claude, codex, gemini, ...); set outputFormat for raw native output. Supports ranked search, glob filtering, compact overview, and result expansion. Default scope is active lineage.",
           promptSnippet:
-            'goosedump({ action: "search", query, contextId?, scope?, page? }) - search session history; omit contextId for current session',
+            'goosedump({ action: "search", query, contextId?, provider?, scope?, page? }) - search session history; omit contextId for current Pi session',
           promptGuidelines: [
             'When researching past conversation history, use goosedump to find relevant context.',
             'Start with compact ranked search (compact: true) for quick overview, then expand interesting entries.',
             'Default scope is "lineage" (current branch); use scope: "all" to include all entries in the session.',
             'Omit contextId to search, expand, or view the current Pi session; use list first for other sessions.',
+            'Set provider (e.g. "claude", "gemini") with a contextId to browse another tool\'s sessions; results render the same way as Pi sessions.',
+            'Set outputFormat (e.g. "claude", "json") only when you explicitly need the raw native session instead of the rendered view.',
           ],
           parameters: Type.Object({
             action: Type.Union(
@@ -885,7 +913,7 @@ export function createGoosedumpIntegration(
             contextId: Type.Optional(
               Type.String({
                 description:
-                  'Context/session ID (defaults to current session for search, expand, view)',
+                  'Context/session ID. Defaults to the current Pi session for search, grep, expand, view; required when provider is not pi.',
               }),
             ),
             query: Type.Optional(
@@ -918,6 +946,42 @@ export function createGoosedumpIntegration(
                 description: 'Page number for ranked results',
               }),
             ),
+            provider: Type.Optional(
+              Type.Union(
+                [
+                  Type.Literal('pi'),
+                  Type.Literal('claude'),
+                  Type.Literal('codex'),
+                  Type.Literal('crush'),
+                  Type.Literal('gemini'),
+                  Type.Literal('goose'),
+                  Type.Literal('opencode'),
+                ],
+                {
+                  default: 'pi',
+                  description:
+                    'Source provider whose sessions to browse (list, view, search, grep, expand). Defaults to pi. Non-pi providers have no current session, so they require an explicit contextId. Results render through the normal structured view regardless of provider.',
+                },
+              ),
+            ),
+            outputFormat: Type.Optional(
+              Type.Union(
+                [
+                  Type.Literal('json'),
+                  Type.Literal('claude'),
+                  Type.Literal('codex'),
+                  Type.Literal('crush'),
+                  Type.Literal('gemini'),
+                  Type.Literal('goose'),
+                  Type.Literal('opencode'),
+                  Type.Literal('pi'),
+                ],
+                {
+                  description:
+                    "Explicitly emit raw native output instead of the normal rendered view (view, expand, grep, search). JSONL providers (claude, codex, pi, gemini) emit raw session JSONL; SQLite providers (crush, goose, opencode) emit a JSON table projection; json emits goosedump's structured JSON. Omit to render normally.",
+                },
+              ),
+            ),
           }),
           async execute(_id, params, _signal, _onUpdate, ctx): Promise<AgentToolResult<void>> {
             if (!goosedumpAvailable) {
@@ -929,7 +993,7 @@ export function createGoosedumpIntegration(
             try {
               switch (params.action) {
                 case 'list': {
-                  const listings = goosedumpList();
+                  const listings = goosedumpList(params.provider ?? 'pi');
                   if (listings.length === 0) {
                     return textResult('No sessions found.');
                   }
@@ -943,12 +1007,23 @@ export function createGoosedumpIntegration(
                 }
 
                 case 'search': {
-                  const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) return missingContextId('search');
+                  const provider = params.provider ?? 'pi';
+                  const target = resolveTarget(ctx, provider, params.contextId);
+                  if (!target) return missingContextId('search', provider);
 
                   if (!params.query) return textResult('query is required for search');
 
-                  const result = goosedumpSearch(contextId, params.query, {
+                  if (params.outputFormat) {
+                    return textResult(
+                      goosedumpConvert('search', target, params.outputFormat, {
+                        positionals: [params.query],
+                        scope: params.scope,
+                        page: params.page ?? 1,
+                      }),
+                    );
+                  }
+
+                  const result = goosedumpSearch(target, params.query, {
                     scope: params.scope ?? 'lineage',
                     page: params.page ?? 1,
                   });
@@ -967,12 +1042,22 @@ export function createGoosedumpIntegration(
                 }
 
                 case 'grep': {
-                  const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) return missingContextId('grep');
+                  const provider = params.provider ?? 'pi';
+                  const target = resolveTarget(ctx, provider, params.contextId);
+                  if (!target) return missingContextId('grep', provider);
 
                   if (!params.pattern) return textResult('pattern is required for grep');
 
-                  const messages = goosedumpGrep(contextId, params.pattern, {
+                  if (params.outputFormat) {
+                    return textResult(
+                      goosedumpConvert('grep', target, params.outputFormat, {
+                        positionals: [params.pattern],
+                        scope: params.scope,
+                      }),
+                    );
+                  }
+
+                  const messages = goosedumpGrep(target, params.pattern, {
                     scope: params.scope ?? 'lineage',
                   });
 
@@ -989,14 +1074,24 @@ export function createGoosedumpIntegration(
                 }
 
                 case 'expand': {
-                  const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) return missingContextId('expand');
+                  const provider = params.provider ?? 'pi';
+                  const target = resolveTarget(ctx, provider, params.contextId);
+                  if (!target) return missingContextId('expand', provider);
 
                   if (!params.ids || params.ids.length === 0) {
                     return textResult('ids is required for expand (array of entry IDs)');
                   }
 
-                  const messages = goosedumpShow(contextId, {
+                  if (params.outputFormat) {
+                    return textResult(
+                      goosedumpConvert('show', target, params.outputFormat, {
+                        ids: params.ids,
+                        scope: params.scope,
+                      }),
+                    );
+                  }
+
+                  const messages = goosedumpShow(target, {
                     scope: params.scope ?? 'lineage',
                     ids: params.ids,
                   });
@@ -1009,13 +1104,24 @@ export function createGoosedumpIntegration(
                 }
 
                 case 'view': {
-                  const contextId = params.contextId ?? currentSessionContextId(ctx);
-                  if (!contextId) return missingContextId('view');
+                  const provider = params.provider ?? 'pi';
+                  const target = resolveTarget(ctx, provider, params.contextId);
+                  if (!target) return missingContextId('view', provider);
+
+                  if (params.outputFormat) {
+                    return textResult(
+                      goosedumpConvert('show', target, params.outputFormat, {
+                        scope: params.scope,
+                      }),
+                    );
+                  }
 
-                  const messages = goosedumpShow(contextId, { scope: params.scope ?? 'lineage' });
+                  const messages = goosedumpShow(target, { scope: params.scope ?? 'lineage' });
 
                   if (messages.length === 0) {
-                    return textResult(`Session "${contextId}" has no messages.`);
+                    return textResult(
+                      `Session "${target.slice(provider.length + 1)}" has no messages.`,
+                    );
                   }
 
                   return textResult(formatMessagesFull(messages));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.5.6",
+  "version": "0.6.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.5.1",
+    "@jarkkojs/goosedump": "^0.6.2",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {