pi-readseek 0.3.19 → 0.3.20

package/src/readseek-value.ts

@@ -55,8 +55,12 @@ export interface ReadseekEditResult {
   semanticSummary?: SemanticSummary;
 }
 
-export function buildReadseekLine(line: number, raw: string): ReadseekLine {
-  const hash = computeLineHash(line, raw);
+/**
+ * Build a {@link ReadseekLine} from an already-known hash. Use this when the
+ * hash is supplied by readseek (search, refs) rather than computed from `raw`;
+ * {@link buildReadseekLine} delegates here after hashing.
+ */
+export function buildReadseekLineWithHash(line: number, hash: string, raw: string): ReadseekLine {
   return {
     line,
     hash,
@@ -66,6 +70,10 @@ export function buildReadseekLine(line: number, raw: string): ReadseekLine {
   };
 }
 
+export function buildReadseekLine(line: number, raw: string): ReadseekLine {
+  return buildReadseekLineWithHash(line, computeLineHash(line, raw), raw);
+}
+
 export function buildReadseekLines(startLine: number, rawLines: string[]): ReadseekLine[] {
   return rawLines.map((raw, index) => buildReadseekLine(startLine + index, raw));
 }

package/src/refs.ts

@@ -4,13 +4,12 @@ import { Type } from "@sinclair/typebox";
 import path from "node:path";
 import { stat as fsStat } from "node:fs/promises";
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
-import { escapeControlCharsForDisplay } from "./hashline.js";
-import { buildToolErrorResult } from "./readseek-value.js";
+import { buildReadseekLineWithHash, buildToolErrorResult } from "./readseek-value.js";
 import { resolveToCwd } from "./path-utils.js";
 import { isReadseekAvailable, readseekRefs, type ReadseekReference } from "./readseek-client.js";
 import { buildRefsOutput, type RefsOutputFile, type RefsOutputLine } from "./refs-output.js";
 
-import { clampLineToWidth, clampLinesToWidth, renderToolLabel, resolveRenderResultContext, summaryLine } from "./tui-render-utils.js";
+import { clampLineToWidth, renderAnchoredFilesResult, renderToolLabel } from "./tui-render-utils.js";
 
 type RefsParams = {
   name: string;
@@ -39,11 +38,7 @@ interface RefsToolOptions {
 
 function refsLine(reference: ReadseekReference): RefsOutputLine {
   return {
-    line: reference.line,
-    hash: reference.line_hash,
-    anchor: `${reference.line}:${reference.line_hash}`,
-    raw: reference.text,
-    display: escapeControlCharsForDisplay(reference.text),
+    ...buildReadseekLineWithHash(reference.line, reference.line_hash, reference.text),
     enclosingSymbol: reference.enclosingSymbol,
   };
 }
@@ -165,35 +160,12 @@ export function registerRefsTool(pi: ExtensionAPI, options: RefsToolOptions = {}
       return new Text(clampLineToWidth(text, context.width), 0, 0);
     },
     renderResult(result: any, options: ToolRenderResultOptions, theme: any, ...rest: any[]) {
-      const { isPartial, isError, expanded, cwd, width } = resolveRenderResultContext(options, rest);
-
-      if (isPartial) return new Text(clampLinesToWidth([summaryLine("pending refs")], width).join("\n"), 0, 0);
-
-      const content = result.content?.[0];
-      const textContent = content?.type === "text" ? content.text : "";
-      if (isError || result.isError) {
-        const firstLine = textContent.split("\n")[0] || "Error";
-        const body = expanded && textContent ? textContent : firstLine;
-        return new Text(clampLinesToWidth(summaryLine(body).split("\n"), width).join("\n"), 0, 0);
-      }
-      const readseekValue = (result.details as any)?.readseekValue as
-        | { tool: "refs"; files: Array<{ path: string; lines: any[] }> }
-        | undefined;
-      const files = readseekValue?.files ?? [];
-      if (files.length === 0) return new Text(summaryLine("no references"), 0, 0);
-      const fileCount = files.length;
-      const totalRefs = files.reduce((sum: number, f: any) => sum + f.lines.length, 0);
-      const refWord = totalRefs === 1 ? "reference" : "references";
-      const fileWord = fileCount === 1 ? "file" : "files";
-      let text = summaryLine(`${totalRefs} ${refWord} in ${fileCount} ${fileWord}`, { hidden: !expanded });
-      if (expanded) {
-        for (const file of files.slice(0, 20)) {
-          const display = path.relative(cwd, file.path) || file.path;
-          text += "\n" + theme.fg("dim", `  ${display} (${file.lines.length})`);
-        }
-        if (files.length > 20) text += "\n" + theme.fg("muted", `  … and ${files.length - 20} more files`);
-      }
-      return new Text(clampLinesToWidth(text.split("\n"), width).join("\n"), 0, 0);
+      return renderAnchoredFilesResult(result, options, theme, rest, {
+        pendingLabel: "pending refs",
+        emptyLabel: "no references",
+        unitSingular: "reference",
+        unitPlural: "references",
+      });
     },
   } satisfies Parameters<ExtensionAPI["registerTool"]>[0] & { ptc: typeof toolConfig };
 

package/src/sg.ts

@@ -4,13 +4,12 @@ import { Type } from "@sinclair/typebox";
 import path from "node:path";
 import { stat as fsStat } from "node:fs/promises";
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
-import { escapeControlCharsForDisplay } from "./hashline.js";
-import { buildToolErrorResult, type ReadseekLine } from "./readseek-value.js";
+import { buildReadseekLineWithHash, buildToolErrorResult, type ReadseekLine } from "./readseek-value.js";
 import { resolveToCwd } from "./path-utils.js";
 import { isReadseekAvailable, readseekSearch, type ReadseekHashline, type ReadseekSearchFileOutput } from "./readseek-client.js";
 import { buildSgOutput } from "./sg-output.js";
 
-import { clampLineToWidth, clampLinesToWidth, renderToolLabel, resolveRenderResultContext, summaryLine } from "./tui-render-utils.js";
+import { clampLineToWidth, renderAnchoredFilesResult, renderToolLabel } from "./tui-render-utils.js";
 
 type SgParams = { pattern: string; lang?: string; path?: string; cached?: boolean; others?: boolean; ignored?: boolean };
 
@@ -58,13 +57,7 @@ interface SgToolOptions {
 }
 
 function readseekLineFromSearch(line: ReadseekHashline): ReadseekLine {
-  return {
-    line: line.line,
-    hash: line.hash,
-    anchor: `${line.line}:${line.hash}`,
-    raw: line.text,
-    display: escapeControlCharsForDisplay(line.text),
-  };
+  return buildReadseekLineWithHash(line.line, line.hash, line.text);
 }
 
 function linesFromSearchResult(result: ReadseekSearchFileOutput, ranges: SgRange[]): ReadseekLine[] {
@@ -230,35 +223,12 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
       return new Text(clampLineToWidth(text, context.width), 0, 0);
     },
     renderResult(result: any, options: ToolRenderResultOptions, theme: any, ...rest: any[]) {
-      const { isPartial, isError, expanded, cwd, width } = resolveRenderResultContext(options, rest);
-
-      if (isPartial) return new Text(clampLinesToWidth([summaryLine("pending search")], width).join("\n"), 0, 0);
-
-      const content = result.content?.[0];
-      const textContent = content?.type === "text" ? content.text : "";
-      if (isError || result.isError) {
-        const firstLine = textContent.split("\n")[0] || "Error";
-        const body = expanded && textContent ? textContent : firstLine;
-        return new Text(clampLinesToWidth(summaryLine(body).split("\n"), width).join("\n"), 0, 0);
-      }
-      const readseekValue = (result.details as any)?.readseekValue as
-        | { tool: "search"; files: Array<{ path: string; lines: any[] }> }
-        | undefined;
-      const files = readseekValue?.files ?? [];
-      if (files.length === 0) return new Text(summaryLine("no matches"), 0, 0);
-      const fileCount = files.length;
-      const totalMatches = files.reduce((sum: number, f: any) => sum + f.lines.length, 0);
-      const matchWord = totalMatches === 1 ? "match" : "matches";
-      const fileWord = fileCount === 1 ? "file" : "files";
-      let text = summaryLine(`${totalMatches} ${matchWord} in ${fileCount} ${fileWord}`, { hidden: files.length > 0 && !expanded });
-      if (expanded) {
-        for (const file of files.slice(0, 20)) {
-          const display = path.relative(cwd, file.path) || file.path;
-          text += "\n" + theme.fg("dim", `  ${display} (${file.lines.length})`);
-        }
-        if (files.length > 20) text += "\n" + theme.fg("muted", `  … and ${files.length - 20} more files`);
-      }
-      return new Text(clampLinesToWidth(text.split("\n"), width).join("\n"), 0, 0);
+      return renderAnchoredFilesResult(result, options, theme, rest, {
+        pendingLabel: "pending search",
+        emptyLabel: "no matches",
+        unitSingular: "match",
+        unitPlural: "matches",
+      });
     },
   } satisfies Parameters<ExtensionAPI["registerTool"]>[0] & { ptc: typeof toolConfig };
 

package/src/tui-render-utils.ts

@@ -1,4 +1,5 @@
-import { getCapabilities, hyperlink, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { getCapabilities, hyperlink, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { relative } from "node:path";
 import { pathToFileURL } from "node:url";
 import { resolveToCwd } from "./path-utils.js";
 
@@ -154,3 +155,56 @@ export function wrapReadHashlinesForWidth(text: string, width: number | undefine
   }
   return output.join("\n");
 }
+
+export interface AnchoredFilesLabels {
+  pendingLabel: string;
+  emptyLabel: string;
+  unitSingular: string;
+  unitPlural: string;
+}
+
+/**
+ * Render the result summary shared by the anchored-files search tools (search,
+ * refs): a pending line, an error first-line/expanded body, an empty-result
+ * line, or a `<count> <unit> in <n> files` summary with an expandable per-file
+ * list. The four call-site differences are supplied via {@link labels}.
+ */
+export function renderAnchoredFilesResult(
+  result: any,
+  options: any,
+  theme: RendererTheme,
+  rest: any[],
+  labels: AnchoredFilesLabels,
+): Text {
+  const { isPartial, isError, expanded, cwd, width } = resolveRenderResultContext(options, rest);
+
+  if (isPartial) return new Text(clampLinesToWidth([summaryLine(labels.pendingLabel)], width).join("\n"), 0, 0);
+
+  const content = result.content?.[0];
+  const textContent = content?.type === "text" ? content.text : "";
+  if (isError || result.isError) {
+    const firstLine = textContent.split("\n")[0] || "Error";
+    const body = expanded && textContent ? textContent : firstLine;
+    return new Text(clampLinesToWidth(summaryLine(body).split("\n"), width).join("\n"), 0, 0);
+  }
+
+  const readseekValue = (result.details as any)?.readseekValue as
+    | { files: Array<{ path: string; lines: any[] }> }
+    | undefined;
+  const files = readseekValue?.files ?? [];
+  if (files.length === 0) return new Text(summaryLine(labels.emptyLabel), 0, 0);
+
+  const fileCount = files.length;
+  const total = files.reduce((sum: number, f: any) => sum + f.lines.length, 0);
+  const unitWord = total === 1 ? labels.unitSingular : labels.unitPlural;
+  const fileWord = fileCount === 1 ? "file" : "files";
+  let text = summaryLine(`${total} ${unitWord} in ${fileCount} ${fileWord}`, { hidden: !expanded });
+  if (expanded) {
+    for (const file of files.slice(0, 20)) {
+      const display = relative(cwd, file.path) || file.path;
+      text += "\n" + theme.fg("dim", `  ${display} (${file.lines.length})`);
+    }
+    if (files.length > 20) text += "\n" + theme.fg("muted", `  … and ${files.length - 20} more files`);
+  }
+  return new Text(clampLinesToWidth(text.split("\n"), width).join("\n"), 0, 0);
+}