pi-readseek 0.8.5 → 0.8.7

package/README.md

@@ -43,6 +43,12 @@ Add an optional `readseek` section to `~/.pi/agent/settings.json` (global) or
     "grep": {
       "maxLines": 2000,
       "maxBytes": 51200
+    },
+    "display": {
+      "read": "compact",
+      "grep": "compact",
+      "edit": "expanded",
+      "write": "expanded"
     }
   }
 }
@@ -58,6 +64,7 @@ Add an optional `readseek` section to `~/.pi/agent/settings.json` (global) or
 - `timeoutMs`: ReadSeek command timeout in milliseconds.
 - `grep.maxLines` and `grep.maxBytes`: output limits for `readSeek_grep`. Values
   above the defaults are clamped.
+- `display`: default display state (`"compact"` or `"expanded"`) per tool for `read`, `grep`, `edit`, and `write`.
 
 ## Licensing
 

package/dist/index.ts

@@ -1183,8 +1183,15 @@ var READSEEK_TOOL_REPLACEMENTS = {
   grep: "readSeek_grep",
   write: "readSeek_write"
 };
-var READSEEK_KEYS = ["replacedTools", "imageMode", "syntaxValidation", "timeoutMs", "grep"];
+var READSEEK_KEYS = ["replacedTools", "imageMode", "syntaxValidation", "timeoutMs", "grep", "display"];
 var READSEEK_GREP_KEYS = ["maxLines", "maxBytes"];
+var READSEEK_DISPLAY_KEYS = ["read", "grep", "edit", "write"];
+var DEFAULT_DISPLAY_MODES = {
+  read: "compact",
+  grep: "compact",
+  edit: "expanded",
+  write: "expanded"
+};
 function globalSettingsPath() {
   return join(homedir2(), ".pi/agent/settings.json");
 }
@@ -1250,6 +1257,22 @@ function readReplacedTools(raw, source, warnings) {
   });
   return tools;
 }
+function readDisplaySettings(raw, source, warnings) {
+  if (!("display" in raw))
+    return;
+  if (!isRecord(raw.display)) {
+    warnings.push(invalid(source, "readseek.display"));
+    return;
+  }
+  warnUnknownKeys(raw.display, READSEEK_DISPLAY_KEYS, "readseek.display", source, warnings);
+  const display = {};
+  for (const tool of READSEEK_DISPLAY_KEYS) {
+    const mode = readEnum(raw.display, tool, ["compact", "expanded"], `readseek.display.${tool}`, source, warnings);
+    if (mode !== undefined)
+      display[tool] = mode;
+  }
+  return Object.keys(display).length > 0 ? display : undefined;
+}
 function validateSettings(raw, source) {
   const settings = {};
   const warnings = [];
@@ -1302,6 +1325,9 @@ function validateSettings(raw, source) {
       warnings.push(invalid(source, "readseek.grep"));
     }
   }
+  const display = readDisplaySettings(section, source, warnings);
+  if (display !== undefined)
+    settings.display = display;
   return { settings, warnings };
 }
 var settingsFileCache = new Map;
@@ -1337,6 +1363,9 @@ function mergeSettings(base, override) {
   const grep = { ...base.grep ?? {}, ...override.grep ?? {} };
   if (Object.keys(grep).length > 0)
     settings.grep = grep;
+  const display = { ...base.display ?? {}, ...override.display ?? {} };
+  if (Object.keys(display).length > 0)
+    settings.display = display;
   return settings;
 }
 function resolveReadSeekJsonSettings() {
@@ -1356,6 +1385,9 @@ function resolveReadSeekSyntaxValidation() {
 function resolveReadSeekTimeoutMs() {
   return resolveReadSeekJsonSettings().settings.timeoutMs;
 }
+function resolveReadSeekToolDisplayMode(tool) {
+  return resolveReadSeekJsonSettings().settings.display?.[tool] ?? DEFAULT_DISPLAY_MODES[tool];
+}
 
 // src/readseek-client.ts
 function normalizeLanguage(language) {
@@ -2946,15 +2978,15 @@ function summaryLine(summary, options = {}) {
   const prefix = options.theme ? options.theme.fg(options.style ?? "dim", SUMMARY_PREFIX) : SUMMARY_PREFIX;
   return appendExpandHint(`${prefix} ${summary}`, !!options.hidden);
 }
-function isRendererExpanded(options, context) {
-  return context?.expanded ?? options?.expanded ?? false;
+function isRendererExpanded(options, context, defaultExpanded = false) {
+  return context?.expanded ?? options?.expanded ?? defaultExpanded;
 }
-function resolveRenderResultContext(options, rest) {
+function resolveRenderResultContext(options, rest, defaultExpanded = false) {
   const context = rest[0] ?? options ?? {};
   return {
     isPartial: context.isPartial ?? options?.isPartial ?? false,
     isError: context.isError ?? false,
-    expanded: isRendererExpanded(options, context),
+    expanded: isRendererExpanded(options, context, defaultExpanded),
     width: context.width ?? options?.width,
     cwd: context.cwd ?? process.cwd(),
     context
@@ -2990,50 +3022,7 @@ function wrapWithHangingIndent(prefix, content, width, options = {}) {
   const indent = " ".repeat(prefixWidth);
   return wrapped.map((line, index) => tint(clampLineToWidth(index === 0 ? prefix + line : indent + line, normalized)));
 }
-var HASHLINE_CONTENT_RE = /^(\d+:[0-9a-fA-F]+\|)(.*)$/;
-function wrapReadHashlinesForWidth(text, width) {
-  if (width === undefined || width === null)
-    return text;
-  const normalized = normalizeWidth(width);
-  const output = [];
-  for (const line of text.split(`
-`)) {
-    const match = line.match(HASHLINE_CONTENT_RE);
-    if (!match) {
-      output.push(line);
-      continue;
-    }
-    if (visibleWidth(line) <= normalized) {
-      output.push(line);
-      continue;
-    }
-    const prefix = match[1];
-    const content = match[2] ?? "";
-    const prefixWidth = visibleWidth(prefix);
-    const contentWidth = Math.max(1, normalized - prefixWidth);
-    const wrappedContent = wrapTextWithAnsi(content, contentWidth).map((wrapped) => clampLineToWidth(wrapped, contentWidth));
-    if (wrappedContent.length === 0) {
-      output.push(clampLineToWidth(prefix, normalized));
-      continue;
-    }
-    output.push(clampLineToWidth(prefix + wrappedContent[0], normalized));
-    const indent = " ".repeat(prefixWidth);
-    for (const continuation of wrappedContent.slice(1)) {
-      output.push(clampLineToWidth(indent + continuation, normalized));
-    }
-  }
-  return output.join(`
-`);
-}
 var wrappedHashlinesCache = new WeakMap;
-function wrapReadHashlinesForWidthCached(cacheKey, text, width) {
-  const cached = wrappedHashlinesCache.get(cacheKey);
-  if (cached && cached.text === text && cached.width === width)
-    return cached.wrapped;
-  const wrapped = wrapReadHashlinesForWidth(text, width);
-  wrappedHashlinesCache.set(cacheKey, { text, width, wrapped });
-  return wrapped;
-}
 function renderPendingResult(pendingLabel, width, theme) {
   return new Text(clampLinesToWidth([summaryLine(pendingLabel, { theme, style: "muted" })], width).join(`
 `), 0, 0);
@@ -3093,6 +3082,90 @@ ${linkedPathLine(theme, file.path, display, cwd, ` (${file.lines.length})`, widt
 `), 0, 0);
 }
 
+// src/tui-source-render.ts
+import { getLanguageFromPath, highlightCode } from "@earendil-works/pi-coding-agent";
+import { wrapTextWithAnsi as wrapTextWithAnsi2 } from "@earendil-works/pi-tui";
+var READ_ANCHOR_RE = /^(\d+:[0-9a-zA-Z]{1,16})\|(.*)$/;
+var GREP_ANCHOR_RE = /^(.*?):(>>|  )(\d+):([0-9a-zA-Z]{1,16})\|(.*)$/;
+var SOURCE_THEME_STYLES = [
+  "mdCodeBlock",
+  "muted",
+  "syntaxComment",
+  "syntaxKeyword",
+  "syntaxFunction",
+  "syntaxVariable",
+  "syntaxString",
+  "syntaxNumber",
+  "syntaxType",
+  "syntaxOperator",
+  "syntaxPunctuation",
+  "toolDiffAdded",
+  "toolDiffRemoved"
+];
+function wrapDisplayLines(lines, width) {
+  if (width === undefined || width === null)
+    return lines;
+  const normalized = normalizeWidth(width);
+  return lines.flatMap((line) => {
+    const wrapped = wrapTextWithAnsi2(line, normalized);
+    return wrapped.length > 0 ? wrapped : [""];
+  });
+}
+function renderSourceBlock(lines, path2) {
+  return highlightCode(lines.join(`
+`), getLanguageFromPath(path2));
+}
+function renderReadSourceForDisplay(text, path2, anchors, width) {
+  const output = [];
+  let sourceLines = [];
+  const flushSourceLines = () => {
+    if (sourceLines.length === 0)
+      return;
+    output.push(...wrapDisplayLines(renderSourceBlock(sourceLines, path2), width));
+    sourceLines = [];
+  };
+  for (const line of text.split(`
+`)) {
+    const match = line.match(READ_ANCHOR_RE);
+    if (match && anchors.has(match[1])) {
+      sourceLines.push(match[2] ?? "");
+      continue;
+    }
+    flushSourceLines();
+    output.push(...wrapDisplayLines([line], width));
+  }
+  flushSourceLines();
+  return output.join(`
+`);
+}
+var readSourceCache = new WeakMap;
+function renderReadSourceForDisplayCached(cacheKey, text, path2, anchors, width, theme) {
+  const themeKey = SOURCE_THEME_STYLES.map((style) => theme.fg(style, "")).join("");
+  const anchorKey = [...anchors].join(`
+`);
+  const cached = readSourceCache.get(cacheKey);
+  if (cached && cached.text === text && cached.path === path2 && cached.width === width && cached.theme === themeKey && cached.anchors === anchorKey) {
+    return cached.rendered;
+  }
+  const rendered = renderReadSourceForDisplay(text, path2, anchors, width);
+  readSourceCache.set(cacheKey, { text, path: path2, width, theme: themeKey, anchors: anchorKey, rendered });
+  return rendered;
+}
+function renderGrepSourceForDisplay(text, anchors, renderPath = (path2) => path2) {
+  return text.split(`
+`).map((line) => {
+    const match = line.match(GREP_ANCHOR_RE);
+    if (!match)
+      return line;
+    const anchor = `${match[3]}:${match[4]}`;
+    if (!anchors.has(anchor))
+      return line;
+    const separator = match[2] === ">>" ? ":" : "-";
+    return `${renderPath(match[1])}${separator}${match[3]}${separator}${match[5] ?? ""}`;
+  }).join(`
+`);
+}
+
 // src/register-tool.ts
 import { Type } from "@sinclair/typebox";
 function optionalIntOrString(description) {
@@ -3644,7 +3717,7 @@ function registerReadTool(pi, options = {}) {
       return new Text2(clampLineToWidth(text, context.width), 0, 0);
     },
     renderResult(result, options2, theme, ...rest) {
-      const { isPartial, isError, expanded, width } = resolveRenderResultContext(options2, rest);
+      const { isPartial, isError, expanded, width, context } = resolveRenderResultContext(options2, rest, resolveReadSeekToolDisplayMode("read") === "expanded");
       if (isPartial)
         return renderPendingResult("pending read", width, theme);
       const content = result.content?.[0];
@@ -3677,9 +3750,16 @@ function registerReadTool(pi, options = {}) {
         summaryParts.push(badge);
       const summary = summaryParts.join(" • ");
       let text = summaryLine(summary, { hidden: !!textContent && !expanded, theme, style: "success" });
-      if (expanded && textContent)
+      if (expanded && textContent) {
+        const anchors = new Set(readSeekValue.lines?.map((line) => line.anchor) ?? []);
+        for (const item of readSeekValue.bundle?.localSupport ?? []) {
+          for (const anchor of item.lineAnchors)
+            anchors.add(anchor);
+        }
+        const sourcePath = readSeekValue.path ?? context.args?.path ?? "";
         text += `
-` + wrapReadHashlinesForWidthCached(content, textContent, width);
+` + renderReadSourceForDisplayCached(content, textContent, sourcePath, anchors, width, theme);
+      }
       return new Text2(clampLinesToWidth(text.split(`
 `), width).join(`
 `), 0, 0);
@@ -5170,7 +5250,7 @@ function registerEditTool(pi, options = {}) {
 `));
     },
     renderResult(result, options2, theme, ...rest) {
-      const { isPartial, isError, expanded, width, context } = resolveRenderResultContext(options2, rest);
+      const { isPartial, isError, expanded, width, context } = resolveRenderResultContext(options2, rest, resolveReadSeekToolDisplayMode("edit") === "expanded");
       if (isPartial) {
         return renderPendingResult("pending edit", width, theme);
       }
@@ -5995,7 +6075,7 @@ function registerGrepTool(pi, options = {}) {
       return new Text5(clampLineToWidth(text, context.width), 0, 0);
     },
     renderResult(result, options2, theme, ...rest) {
-      const { isPartial, isError, expanded, cwd, width } = resolveRenderResultContext(options2, rest);
+      const { isPartial, isError, expanded, cwd, width } = resolveRenderResultContext(options2, rest, resolveReadSeekToolDisplayMode("grep") === "expanded");
       if (isPartial)
         return renderPendingResult("pending grep", width, theme);
       const content = result.content?.[0];
@@ -6027,19 +6107,10 @@ function registerGrepTool(pi, options = {}) {
       });
       for (const badge of info.badges)
         text += theme.fg(badge.startsWith("⚠") ? "warning" : "dim", `  ${badge}`);
-      if (expanded && readSeekValue?.records) {
-        const fileCounts = new Map;
-        for (const r of readSeekValue.records)
-          if (r.path && r.kind === "match")
-            fileCounts.set(r.path, (fileCounts.get(r.path) ?? 0) + 1);
-        for (const [filePath, count] of [...fileCounts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 20)) {
-          const display = path2.relative(cwd, filePath) || filePath;
-          text += `
-${linkedPathLine(theme, filePath, display, cwd, ` (${count})`, width)}`;
-        }
-        if (fileCounts.size > 20)
-          text += `
-` + theme.fg("muted", `  … and ${fileCounts.size - 20} more files`);
+      if (expanded && textContent && readSeekValue?.records) {
+        const anchors = new Set(readSeekValue.records.map((record) => record.anchor));
+        text += `
+` + renderGrepSourceForDisplay(textContent, anchors, (displayPath) => linkToolPath(theme.fg("dim", displayPath), displayPath, cwd));
       }
       return new Text5(clampLinesToWidth(text.split(`
 `), width).join(`
@@ -6884,7 +6955,7 @@ function registerWriteTool(pi, options = {}) {
 `));
     },
     renderResult(result, options2, theme, ...rest) {
-      const { isPartial, expanded, width, context } = resolveRenderResultContext(options2, rest);
+      const { isPartial, expanded, width, context } = resolveRenderResultContext(options2, rest, resolveReadSeekToolDisplayMode("write") === "expanded");
       if (isPartial)
         return renderPendingResult("pending write", width, theme);
       const details = result.details ?? {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-readseek",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "Pi extension for readseek-backed hash-anchored read/edit/grep, structural code maps, structural search, and file exploration",
   "type": "module",
   "exports": {
@@ -40,7 +40,7 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@jarkkojs/readseek": "^0.8.5",
+    "@jarkkojs/readseek": "^0.8.7",
     "diff": "^8.0.3",
     "xxhash-wasm": "^1.1.0"
   },