pi-readseek 0.3.2 → 0.3.4

package/src/read.ts

@@ -20,7 +20,7 @@ import { formatFileMapWithBudget } from "./readseek/formatter.js";
 import { findSymbol, type SymbolMatch } from "./readseek/symbol-lookup.js";
 import { formatAmbiguous, formatNotFound } from "./readseek/symbol-error-format.js";
 import { buildReadOutput } from "./read-output.js";
-import { buildReadRehydrateDescriptor } from "./context-hygiene.js";
+
 import { buildLocalBundle } from "./read-local-bundle.js";
 import { coerceObviousBase10Int } from "./coerce-obvious-int.js";
 import { readseekRead } from "./readseek-client.js";
@@ -681,14 +681,6 @@ export function registerReadTool(pi: ExtensionAPI, options: ReadToolOptions = {}
 					text: mapText,
 				},
 				...(bundleMetadata ? { bundle: bundleMetadata } : {}),
-				rehydrate: buildReadRehydrateDescriptor({
-					path: p.path,
-					offset: p.offset,
-					limit: p.limit,
-					symbol: p.symbol,
-					map: p.map,
-					bundle: p.bundle,
-				}),
 			});
 
 			return succeed({
@@ -696,7 +688,6 @@ export function registerReadTool(pi: ExtensionAPI, options: ReadToolOptions = {}
 				details: {
 					truncation: truncation.truncated ? truncation : undefined,
 					readseekValue: readOutput.readseekValue,
-					contextHygiene: readOutput.contextHygiene,
 				},
 			});
 		},

package/src/readseek-client.ts

@@ -6,7 +6,7 @@ import { DetailLevel } from "./readseek/enums.js";
 import type { FileMap, FileSymbol } from "./readseek/types.js";
 import { SymbolKind } from "./readseek/enums.js";
 
-interface ReadseekHashline {
+export interface ReadseekHashline {
 	line: number;
 	hash: string;
 	text: string;

package/src/readseek-settings.ts

@@ -48,144 +48,16 @@ function invalid(source: string, path: string): ReadseekSettingsWarning {
   return { source, path, message: `Invalid readseek setting at ${path}` };
 }
 
-function readJsonObjectEnd(text: string, open: number): number {
-  let depth = 0;
-  let inString = false;
-  let escaped = false;
-
-  for (let i = open; i < text.length; i += 1) {
-    const char = text[i];
-    if (inString) {
-      if (escaped) escaped = false;
-      else if (char === "\\") escaped = true;
-      else if (char === '"') inString = false;
-      continue;
-    }
-
-    if (char === '"') {
-      inString = true;
-    } else if (char === "{") {
-      depth += 1;
-    } else if (char === "}") {
-      depth -= 1;
-      if (depth === 0) return i;
-    }
-  }
-
-  return -1;
-}
-
-function readJsonStringEnd(text: string, quote: number): number {
-  let escaped = false;
-  for (let i = quote + 1; i < text.length; i += 1) {
-    const char = text[i];
-    if (escaped) escaped = false;
-    else if (char === "\\") escaped = true;
-    else if (char === '"') return i;
-  }
-  return -1;
-}
-
-function readTopLevelObjectBodies(rawText: string, section: string): string[] {
-  const bodies: string[] = [];
-  let depth = 0;
-
-  for (let i = 0; i < rawText.length; i += 1) {
-    const char = rawText[i];
-    if (char === '"') {
-      const end = readJsonStringEnd(rawText, i);
-      if (end < 0) return bodies;
-
-      if (depth === 1) {
-        const fieldName = rawText.slice(i + 1, end);
-        let cursor = end + 1;
-        while (/\s/.test(rawText[cursor] ?? "")) cursor += 1;
-
-        if (rawText[cursor] === ":") {
-          cursor += 1;
-          while (/\s/.test(rawText[cursor] ?? "")) cursor += 1;
-          if (fieldName === section && rawText[cursor] === "{") {
-            const objectEnd = readJsonObjectEnd(rawText, cursor);
-            if (objectEnd < 0) return bodies;
-            bodies.push(rawText.slice(cursor + 1, objectEnd));
-            i = objectEnd;
-            continue;
-          }
-        }
-      }
-      i = end;
-    } else if (char === "{") {
-      depth += 1;
-    } else if (char === "}") {
-      depth = Math.max(0, depth - 1);
-    }
-  }
-
-  return bodies;
-}
-
-function rawFieldTokens(rawText: string, path: string): string[] {
-  const [section, key] = path.split(".");
-  const bodies = readTopLevelObjectBodies(rawText, section);
-  if (bodies.length !== 1) return [];
-
-  const body = bodies[0];
-  const tokens: string[] = [];
-  let depth = 0;
-
-  for (let i = 0; i < body.length; i += 1) {
-    const char = body[i];
-    if (char === '"') {
-      const end = readJsonStringEnd(body, i);
-      if (end < 0) return tokens;
-
-      if (depth === 0) {
-        const fieldName = body.slice(i + 1, end);
-        let cursor = end + 1;
-        while (/\s/.test(body[cursor] ?? "")) cursor += 1;
-
-        if (body[cursor] === ":") {
-          cursor += 1;
-          while (/\s/.test(body[cursor] ?? "")) cursor += 1;
-          if (fieldName === key) {
-            const valueStart = cursor;
-            while (cursor < body.length && !/[,}\s]/.test(body[cursor])) cursor += 1;
-            tokens.push(body.slice(valueStart, cursor));
-          }
-        }
-      }
-      i = end;
-    } else if (char === "{" || char === "[") {
-      depth += 1;
-    } else if (char === "}" || char === "]") {
-      depth = Math.max(0, depth - 1);
-    }
-  }
-
-  return tokens;
-}
-
-function isStrictJsonPositiveInteger(rawText: string, path: string, value: unknown): value is number {
-  const tokens = rawFieldTokens(rawText, path);
-  return (
-    typeof value === "number" &&
-    Number.isSafeInteger(value) &&
-    value > 0 &&
-    tokens.length === 1 &&
-    /^[1-9][0-9]*$/.test(tokens[0])
-  );
-}
-
 function readPositive(
   raw: Record<string, unknown>,
   key: string,
   path: string,
   source: string,
-  rawText: string,
   warnings: ReadseekSettingsWarning[],
 ): number | undefined {
   if (!(key in raw)) return undefined;
-  if (isStrictJsonPositiveInteger(rawText, path, raw[key])) return raw[key];
+  const val = raw[key];
+  if (typeof val === "number" && Number.isSafeInteger(val) && val > 0) return val;
   warnings.push(invalid(source, path));
   return undefined;
 }
@@ -203,16 +75,16 @@ function readBoolean(
   return undefined;
 }
 
-function validateSettings(raw: unknown, source: string, rawText: string): ReadseekSettingsResult {
+function validateSettings(raw: unknown, source: string): ReadseekSettingsResult {
   const settings: ReadseekJsonSettings = {};
   const warnings: ReadseekSettingsWarning[] = [];
   if (!isRecord(raw)) return { settings, warnings };
 
   if (isRecord(raw.grep)) {
     const grep: NonNullable<ReadseekJsonSettings["grep"]> = {};
-    const maxLines = readPositive(raw.grep, "maxLines", "grep.maxLines", source, rawText, warnings);
+    const maxLines = readPositive(raw.grep, "maxLines", "grep.maxLines", source, warnings);
     if (maxLines !== undefined) grep.maxLines = maxLines;
-    const maxBytes = readPositive(raw.grep, "maxBytes", "grep.maxBytes", source, rawText, warnings);
+    const maxBytes = readPositive(raw.grep, "maxBytes", "grep.maxBytes", source, warnings);
     if (maxBytes !== undefined) grep.maxBytes = maxBytes;
     if (Object.keys(grep).length > 0) settings.grep = grep;
   }
@@ -246,7 +118,7 @@ function readSettingsFile(path: string): ReadseekSettingsResult {
 
   try {
     const text = readFileSync(path, "utf8");
-    return validateSettings(JSON.parse(text) as unknown, path, text);
+    return validateSettings(JSON.parse(text) as unknown, path);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     return { settings: {}, warnings: [{ source: path, message: `Invalid JSON: ${message}` }] };

package/src/sg-output.ts

@@ -1,12 +1,4 @@
 import type { ReadseekLine, ReadseekRange } from "./readseek-value.js";
-import {
-  buildContextHygieneMetadata,
-  buildFileResource,
-  buildSymbolResource,
-  type ContextHygieneMetadata,
-  type ContextHygieneRehydrateDescriptor,
-  type ContextHygieneResource,
-} from "./context-hygiene.js";
 
 export interface SgOutputFile {
   displayPath: string;
@@ -19,7 +11,6 @@ export interface SgOutputFile {
 export interface BuildSgOutputInput {
   pattern: string;
   files: SgOutputFile[];
-  rehydrate?: ContextHygieneRehydrateDescriptor | null;
 }
 
 export interface SgOutputResult {
@@ -32,7 +23,6 @@ export interface SgOutputResult {
       lines: ReadseekLine[];
     }>;
   };
-  contextHygiene: ContextHygieneMetadata;
 }
 
 export function buildSgOutput(input: BuildSgOutputInput): SgOutputResult {
@@ -43,12 +33,6 @@ export function buildSgOutput(input: BuildSgOutputInput): SgOutputResult {
         tool: "search",
         files: [],
       },
-      contextHygiene: buildContextHygieneMetadata({
-        tool: "search",
-        classification: "search-context",
-        resources: [],
-        rehydrate: input.rehydrate ?? undefined,
-      }),
     };
   }
 
@@ -60,14 +44,6 @@ export function buildSgOutput(input: BuildSgOutputInput): SgOutputResult {
     }
   }
 
-  const contextHygieneResources: ContextHygieneResource[] = [];
-  for (const file of input.files) {
-    contextHygieneResources.push(buildFileResource(file.path));
-    for (const symbol of file.symbols ?? []) {
-      contextHygieneResources.push(buildSymbolResource(file.path, symbol.name, symbol.kind));
-    }
-  }
-
   return {
     text: blocks.join("\n"),
     readseekValue: {
@@ -78,11 +54,5 @@ export function buildSgOutput(input: BuildSgOutputInput): SgOutputResult {
         lines: file.lines.map((line) => ({ ...line })),
       })),
     },
-    contextHygiene: buildContextHygieneMetadata({
-      tool: "search",
-      classification: "search-context",
-      resources: contextHygieneResources,
-      rehydrate: input.rehydrate ?? undefined,
-    }),
   };
 }

package/src/sg.ts

@@ -4,12 +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 { ensureHashInit } from "./hashline.js";
-import { buildReadseekError, buildReadseekLine, type ReadseekLine } from "./readseek-value.js";
+import { escapeControlCharsForDisplay } from "./hashline.js";
+import { buildReadseekError, type ReadseekLine } from "./readseek-value.js";
 import { resolveToCwd } from "./path-utils.js";
-import { isReadseekAvailable, readseekSearch, type ReadseekSearchFileOutput } from "./readseek-client.js";
+import { isReadseekAvailable, readseekSearch, type ReadseekHashline, type ReadseekSearchFileOutput } from "./readseek-client.js";
 import { buildSgOutput } from "./sg-output.js";
-import { buildSearchRehydrateDescriptor } from "./context-hygiene.js";
+
 import { clampLineToWidth, clampLinesToWidth, isRendererExpanded, renderToolLabel, summaryLine } from "./tui-render-utils.js";
 
 type SgParams = { pattern: string; lang?: string; path?: string; cached?: boolean; others?: boolean; ignored?: boolean };
@@ -62,8 +62,14 @@ interface SgToolOptions {
   onFileAnchored?: (absolutePath: string) => void;
 }
 
-function readseekLineFromSearch(line: { line: number; text: string }): ReadseekLine {
-  return buildReadseekLine(line.line, line.text);
+function readseekLineFromSearch(line: ReadseekHashline): ReadseekLine {
+  return {
+    line: line.line,
+    hash: line.hash,
+    anchor: `${line.line}:${line.hash}`,
+    raw: line.text,
+    display: escapeControlCharsForDisplay(line.text),
+  };
 }
 
 function linesFromSearchResult(result: ReadseekSearchFileOutput, ranges: SgRange[]): ReadseekLine[] {
@@ -119,7 +125,6 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
     }),
     ptc: toolConfig,
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-      await ensureHashInit();
       const p = params as SgParams;
       if (p.ignored && !p.others) {
         const message = "Error: search parameter 'ignored' requires 'others'";
@@ -135,15 +140,6 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
           },
         };
       }
-      const rehydrate = buildSearchRehydrateDescriptor({
-        pattern: p.pattern,
-        lang: p.lang,
-        path: p.path,
-        cached: p.cached,
-        others: p.others,
-        ignored: p.ignored,
-      });
-
       const searchPath = resolveToCwd(p.path ?? ".", ctx.cwd);
       let searchPathIsFile = false;
 
@@ -206,12 +202,11 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
           signal,
         });
         if (results.length === 0) {
-          const emptyOutput = buildSgOutput({ pattern: p.pattern, files: [], rehydrate });
+          const emptyOutput = buildSgOutput({ pattern: p.pattern, files: [] });
           return {
             content: [{ type: "text", text: emptyOutput.text }],
             details: {
               readseekValue: emptyOutput.readseekValue,
-              contextHygiene: emptyOutput.contextHygiene,
             },
           };
         }
@@ -240,12 +235,11 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
         }
 
         if (readseekFiles.length === 0) {
-          const emptyOutput = buildSgOutput({ pattern: p.pattern, files: [], rehydrate });
+          const emptyOutput = buildSgOutput({ pattern: p.pattern, files: [] });
           return {
             content: [{ type: "text", text: emptyOutput.text }],
             details: {
               readseekValue: emptyOutput.readseekValue,
-              contextHygiene: emptyOutput.contextHygiene,
             },
           };
         }
@@ -253,7 +247,6 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
         const builtOutput = buildSgOutput({
           pattern: p.pattern,
           files: readseekFiles,
-          rehydrate,
         });
         for (const readseekFile of readseekFiles) {
           options.onFileAnchored?.(readseekFile.path);
@@ -262,7 +255,6 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
           content: [{ type: "text", text: builtOutput.text }],
           details: {
             readseekValue: builtOutput.readseekValue,
-            contextHygiene: builtOutput.contextHygiene,
           },
         };
       } catch (err: any) {

package/src/tool-prompt-metadata.ts

@@ -5,8 +5,7 @@ const COMPACT_DESCRIPTIONS: Record<string, string> = {
   "read.md": "Read text files/images by path; text has LINE:HASH anchors, images return attachments.",
   "edit.md": "Edit existing text files using fresh LINE:HASH anchors from read, grep, search, or write.",
   "grep.md": "Search file contents; non-summary results include LINE:HASH anchors for edits.",
-  "find.md": "Find files recursively by basename glob, respecting .gitignore.",
-  "ls.md": "List one directory with directories first and dotfiles included.",
+
   "write.md": "Create or overwrite a complete file and return anchors.",
   "sg.md": "Search code by AST pattern and return anchored matches.",
 };
@@ -25,12 +24,7 @@ const COMPACT_GUIDELINES: Record<string, string[]> = {
     "Use grep for text search and edit-ready matching anchors.",
     "Use grep summary mode for broad count/file discovery before narrowing.",
   ],
-  "find.md": [
-    "Use find for recursive file discovery by basename glob.",
-  ],
-  "ls.md": [
-    "Use ls to inspect one directory; use find for recursion.",
-  ],
+
   "write.md": [
     "Use write to create files or intentionally overwrite whole files.",
     "Use edit rather than write for small changes or appends to existing files.",

package/src/write.ts

@@ -9,7 +9,7 @@ import { buildReadseekError, buildReadseekLine, buildReadseekWarning, type Reads
 import { looksLikeBinary } from "./binary-detect.js";
 import { getOrGenerateMap } from "./map-cache.js";
 import { formatFileMapWithBudget } from "./readseek/formatter.js";
-import { buildContextHygieneMetadata, buildFileResource, type ContextHygieneMetadata } from "./context-hygiene.js";
+
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
 import { buildPendingWritePreviewData, buildWritePreviewKey, resolvePendingDiffPreview, type PendingDiffPreviewResult } from "./pending-diff-preview.js";
 import { generateCompactOrFullDiff, normalizeToLF, hasBareCarriageReturn } from "./edit-diff.js";
@@ -91,7 +91,6 @@ export interface WriteResult extends WriteDiffFields {
     diffData?: DiffData;
     map?: { appended: boolean };
   };
-  contextHygiene: ContextHygieneMetadata;
 }
 
 function readPreviousTextForDiff(filePath: string): string {
@@ -185,11 +184,6 @@ export async function executeWrite(opts: {
   const { path: filePath, content, map: requestMap, cwd } = opts;
   const warnings: string[] = [];
   const readseekWarnings: ReadseekWarning[] = [];
-  const contextHygiene = buildContextHygieneMetadata({
-    tool: "write",
-    classification: "mutation",
-    resources: [buildFileResource(filePath)],
-  });
 
   if (hasBareCarriageReturn(content)) {
     const message = "File content contains bare CR (\\r) line endings; write refuses to emit anchors that read/edit would normalize differently.";
@@ -204,7 +198,6 @@ export async function executeWrite(opts: {
         lines: [],
         warnings: readseekWarnings,
       },
-      contextHygiene,
     };
   }
   const previousContent = readPreviousTextForDiff(filePath);
@@ -239,7 +232,6 @@ export async function executeWrite(opts: {
         lines: [],
         warnings: readseekWarnings,
       },
-      contextHygiene,
     };
   }
 
@@ -309,7 +301,6 @@ export async function executeWrite(opts: {
       diffData,
       ...(requestMap !== undefined ? { map: { appended: mapAppended } } : {}),
     },
-    contextHygiene,
   };
 }
 
@@ -391,7 +382,6 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
               error: buildReadseekError("binary-content", binaryWarning.message),
             },
             warnings: result.warnings,
-            contextHygiene: result.contextHygiene,
           },
         };
       }
@@ -408,7 +398,6 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
               error: buildReadseekError("bare-cr", bareCrWarning.message),
             },
             warnings: result.warnings,
-            contextHygiene: result.contextHygiene,
           },
         };
       }
@@ -421,7 +410,6 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
           ...(result.writeState ? { writeState: result.writeState } : {}),
           readseekValue: result.readseekValue,
           warnings: result.warnings,
-          contextHygiene: result.contextHygiene,
         },
       };
       });

package/prompts/find.md

@@ -1,18 +0,0 @@
-Find files or directories recursively by basename. Uses glob patterns by default, respects nested `.gitignore`, includes hidden entries, and returns relative paths.
-
-## Parameters
-
-- `pattern` — required. Glob by default; with `regex: true`, JavaScript regex against each basename.
-- `path` — directory to search, default cwd.
-- `type` — `"file"` default, `"dir"`, or `"any"`.
-- `limit` — max returned entries after filtering/sorting, default 1000.
-- `maxDepth` — non-negative directory depth limit.
-- `sortBy` — `"name"` default, `"mtime"`, or `"size"`; use `reverse: true` for descending/newest/largest first.
-- `modifiedSince` — keep entries modified strictly after an ISO date/time or relative age like `30m`, `1h`, `24h`, `7d`.
-- `minSize` / `maxSize` — inclusive file-size filters; numbers are bytes, strings accept 1024-based `KB`, `MB`, `GB`, etc. Directories are not removed by size filters.
-
-## Output and usage
-
-Output is one relative path per line. Directories end with `/`. Filtering and sorting happen before `limit`, so newest/largest queries work as expected.
-
-Use `find` for recursive name discovery, `ls` for one directory, `grep` or `search` for contents, and `read` for file content. Remember: `pattern` matches basenames, not full paths.

package/prompts/ls.md

@@ -1,11 +0,0 @@
-List one directory. Output is directories first (with `/`), then files, sorted alphabetically; dotfiles are included.
-
-## Parameters
-
-- `path` — directory to list, default cwd.
-- `limit` — max entries, default 500; must be positive.
-- `glob` — optional entry-name filter such as `*.ts`, `.env*`, or `test-*`.
-
-## Usage
-
-Use `ls` to inspect one known directory. Use `find` for recursive discovery, `grep` or `search` for contents, and `read` for file content. If output exceeds `limit` or 50 KB, narrow with `glob` or switch to `find`.

package/src/context-application.ts

@@ -1,70 +0,0 @@
-import {
-  renderStaleContextPlaceholder,
-  type ContextHygieneReport,
-  type ContextHygieneStaleRecord,
-} from "./context-hygiene.js";
-
-type ContextToolResultMessage = {
-  role?: unknown;
-  toolCallId?: unknown;
-  toolName?: unknown;
-  content?: unknown;
-  details?: unknown;
-  [key: string]: unknown;
-};
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return !!value && typeof value === "object";
-}
-
-function isMaskableStaleTool(tool: string): boolean {
-  return tool === "read" || tool === "grep" || tool === "search";
-}
-
-function staleRecordsByResultId(report: ContextHygieneReport): Map<string, ContextHygieneStaleRecord> {
-  const records = new Map<string, ContextHygieneStaleRecord>();
-  for (const candidate of report.staleCandidates) {
-    for (const record of candidate.staleResults) {
-      if (!record.originalResultId || !isMaskableStaleTool(record.originalTool)) continue;
-      const existing = records.get(record.originalResultId);
-      if (!existing || existing.invalidatingMutationEventId < record.invalidatingMutationEventId) {
-        records.set(record.originalResultId, record);
-      }
-    }
-  }
-  return records;
-}
-
-function maskStaleToolResultMessage<T extends ContextToolResultMessage>(message: T, record: ContextHygieneStaleRecord): T {
-  const details = isRecord(message.details) ? message.details : {};
-  return {
-    ...message,
-    content: [{ type: "text" as const, text: renderStaleContextPlaceholder(record) }],
-    details: {
-      ...details,
-      contextHygieneStale: record,
-    },
-  };
-}
-
-export function applyContextHygieneStaleContext<T extends ContextToolResultMessage>(
-  messages: readonly T[],
-  report: ContextHygieneReport,
-): T[] {
-  const staleByResultId = staleRecordsByResultId(report);
-  if (staleByResultId.size === 0) return messages as T[];
-
-  let changed = false;
-  const nextMessages = messages.map((message) => {
-    if (message.role !== "toolResult" || typeof message.toolCallId !== "string") return message;
-    const staleRecord = staleByResultId.get(message.toolCallId);
-    if (staleRecord) {
-      if (message.toolName !== staleRecord.originalTool) return message;
-      changed = true;
-      return maskStaleToolResultMessage(message, staleRecord);
-    }
-    return message;
-  });
-
-  return changed ? nextMessages : (messages as T[]);
-}