pi-readseek 0.3.2 → 0.3.3

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/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/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[]);
-}