pi-readseek 0.9.0 → 0.9.2

package/dist/index.ts

@@ -833,14 +833,12 @@ async function spawnReadSeekRaw(args, options = {}) {
       stdio,
       signal: cancelable ? options.signal : undefined
     });
-    if (cancelable) {
-      const timeoutMs = options.timeoutMs ?? readSeekTimeoutMs();
-      timeout = setTimeout(() => {
-        child.kill("SIGKILL");
-        fail(new Error(`readseek timed out after ${timeoutMs} ms`));
-      }, timeoutMs);
-      timeout.unref?.();
-    }
+    const timeoutMs = options.timeoutMs ?? readSeekTimeoutMs();
+    timeout = setTimeout(() => {
+      child.kill("SIGKILL");
+      fail(new Error(`readseek timed out after ${timeoutMs} ms`));
+    }, timeoutMs);
+    timeout.unref?.();
     const childStdout = child.stdout;
     const childStderr = child.stderr;
     const childStdin = child.stdin;
@@ -3388,159 +3386,6 @@ function resolveSyntaxValidateMode(opts) {
   return opts.syntaxValidate ?? resolveReadSeekSyntaxValidation() ?? DEFAULT;
 }
 
-// src/pending-diff-preview.ts
-import { existsSync as existsSync2, readFileSync as readFileSync4, realpathSync, statSync as statSync3 } from "node:fs";
-import { dirname, isAbsolute as isAbsolute2, relative as relative2, resolve, sep } from "node:path";
-var PENDING_DIFF_MAX_BYTES = 1024 * 1024;
-function skip(reason) {
-  return { type: "skip", reason };
-}
-function isInsidePath(parent, child) {
-  const rel = relative2(parent, child);
-  return rel === "" || rel !== "" && !rel.startsWith("..") && !rel.startsWith(sep) && !resolve(rel).startsWith(".." + sep);
-}
-function resolveWorkspacePreviewPath(rawPath, cwd, allowMissing) {
-  if (typeof rawPath !== "string" || rawPath.trim() === "")
-    return { type: "skip", reason: "missing path" };
-  const workspace = realpathSync(cwd);
-  const normalizedPath = rawPath.replace(/^@/, "");
-  const explicitAbsolute = isAbsolute2(normalizedPath);
-  const requested = resolve(workspace, normalizedPath);
-  if (existsSync2(requested)) {
-    const realTarget = realpathSync(requested);
-    if (!explicitAbsolute && !isInsidePath(workspace, realTarget))
-      return { type: "skip", reason: "path outside workspace" };
-    return { type: "ok", path: realTarget, existed: true };
-  }
-  if (!explicitAbsolute && !isInsidePath(workspace, requested))
-    return { type: "skip", reason: "path outside workspace" };
-  if (!allowMissing)
-    return { type: "skip", reason: "file not found" };
-  const parent = dirname(requested);
-  if (!existsSync2(parent))
-    return { type: "skip", reason: "parent directory not found" };
-  return { type: "ok", path: requested, existed: false };
-}
-function readUtf8File(filePath) {
-  const stat2 = statSync3(filePath);
-  if (!stat2.isFile())
-    return { type: "skip", reason: "not a file" };
-  if (stat2.size > PENDING_DIFF_MAX_BYTES)
-    return { type: "skip", reason: "file too large" };
-  const content = readFileSync4(filePath, "utf-8");
-  if (content.includes("\x00"))
-    return { type: "skip", reason: "binary file" };
-  return { type: "ok", content };
-}
-function buildData(filePath, previousContent, nextContent, existed, headerLabel) {
-  const diff = generateDiffString(normalizeToLF(previousContent), normalizeToLF(nextContent)).diff;
-  return {
-    type: "ok",
-    data: {
-      filePath,
-      previousContent,
-      nextContent,
-      fileExistedBeforeWrite: existed,
-      headerLabel,
-      diff
-    }
-  };
-}
-function getEdits(input) {
-  return Array.isArray(input.edits) ? input.edits : [];
-}
-function buildPendingWritePreviewData(input, cwd) {
-  if (typeof input.content !== "string")
-    return skip("missing content");
-  if (Buffer.byteLength(input.content, "utf8") > PENDING_DIFF_MAX_BYTES)
-    return skip("content too large");
-  const resolved = resolveWorkspacePreviewPath(input.path, cwd, true);
-  if (resolved.type === "skip")
-    return resolved;
-  const previous = resolved.existed ? readUtf8File(resolved.path) : { type: "ok", content: "" };
-  if (previous.type === "skip")
-    return previous;
-  return buildData(resolved.path, previous.content, input.content, resolved.existed, resolved.existed ? "pending overwrite" : "pending create");
-}
-async function buildPendingEditPreviewData(input, cwd) {
-  const edits = getEdits(input);
-  if (edits.length === 0)
-    return skip("missing edits");
-  const resolved = resolveWorkspacePreviewPath(input.path, cwd, false);
-  if (resolved.type === "skip")
-    return resolved;
-  const previous = readUtf8File(resolved.path);
-  if (previous.type === "skip")
-    return previous;
-  try {
-    const plan = await readSeekEdit(resolved.path, edits, {
-      language: typeof input.language === "string" ? input.language : undefined
-    });
-    if (typeof plan.content !== "string")
-      return skip("edit plan did not include content");
-    return buildData(resolved.path, previous.content, plan.content, true, "pending edit");
-  } catch (err) {
-    return skip(`edit projection failed: ${err?.message ?? String(err)}`);
-  }
-}
-function buildEditPreviewKey(input) {
-  if (typeof input.path !== "string")
-    return;
-  const edits = getEdits(input);
-  if (edits.length === 0)
-    return;
-  return JSON.stringify({ path: input.path, edits, language: input.language });
-}
-function buildWritePreviewKey(input) {
-  if (typeof input.path !== "string" || typeof input.content !== "string")
-    return;
-  return JSON.stringify({ path: input.path, content: input.content });
-}
-function resolvePendingDiffPreview(context, stateKey, previewKey, compute) {
-  if (!previewKey)
-    return;
-  const root = context?.state;
-  if (!root)
-    return;
-  const slot = root[stateKey] ??= {};
-  if (slot.key !== previewKey) {
-    slot.key = previewKey;
-    slot.data = undefined;
-    slot.pending = false;
-  }
-  if (slot.data !== undefined)
-    return slot.data;
-  if (slot.pending)
-    return;
-  let value;
-  try {
-    value = compute();
-  } catch (err) {
-    const skipped = { type: "skip", reason: `projection failed: ${err?.message ?? String(err)}` };
-    slot.data = skipped;
-    return skipped;
-  }
-  if (value && typeof value.then === "function") {
-    slot.pending = true;
-    value.then((resolved) => {
-      if (slot.key !== previewKey)
-        return;
-      slot.data = resolved;
-      slot.pending = false;
-      context?.invalidate?.();
-    }).catch((err) => {
-      if (slot.key !== previewKey)
-        return;
-      slot.data = { type: "skip", reason: `projection failed: ${err?.message ?? String(err)}` };
-      slot.pending = false;
-      context?.invalidate?.();
-    });
-    return;
-  }
-  slot.data = value;
-  return slot.data;
-}
-
 // src/diff-data.ts
 var MAX_INLINE_DIFF_LINE_LENGTH = 4096;
 var MAX_INLINE_DIFF_TOKENS = 512;
@@ -3959,15 +3804,6 @@ function upsertTextComponent(lastComponent, text) {
 }
 
 // src/edit.ts
-var EDIT_PENDING_PREVIEW_STATE_KEY = "hashline-edit-pending-preview";
-function pendingPreviewLines(summary, preview, expanded) {
-  if (!preview || preview.type !== "ok")
-    return { lines: summary.split(`
-`) };
-  const diffData = buildDiffData({ path: preview.data.filePath, oldContent: preview.data.previousContent, newContent: preview.data.nextContent, diff: preview.data.diff });
-  const headerLine = summaryLine(preview.data.headerLabel, { hidden: !expanded });
-  return { lines: [summary, headerLine], diffData: expanded ? diffData : undefined, headerLabel: preview.data.headerLabel };
-}
 var hashlineEditItemSchema = Type3.Object({
   set_line: Type3.Optional(Type3.Object({
     anchor: Type3.String({ description: "Fresh LINE:HASH anchor for the line to replace" }),
@@ -4203,18 +4039,7 @@ function registerEditTool(pi, options = {}) {
         text += ` ${theme.fg("dim", suffix)}`;
       }
       text = clampLineToWidth(text, context.width);
-      if (context.executionStarted) {
-        return upsertTextComponent(context.lastComponent, text);
-      }
-      const previewKey = buildEditPreviewKey(args ?? {});
-      const preview = resolvePendingDiffPreview(context, EDIT_PENDING_PREVIEW_STATE_KEY, previewKey, () => buildPendingEditPreviewData(args ?? {}, context.cwd ?? process.cwd()));
-      const expanded = !!context.expanded;
-      const preview2 = pendingPreviewLines(text, preview, expanded);
-      if (preview2.diffData) {
-        return upsertDiffComponent(context.lastComponent, { prefixLines: preview2.lines, diffData: preview2.diffData, theme, expanded: true });
-      }
-      return upsertTextComponent(context.lastComponent, clampLinesToWidth(preview2.lines, context.width).join(`
-`));
+      return upsertTextComponent(context.lastComponent, text);
     },
     renderResult(result, options2, theme, ...rest) {
       const { isPartial, isError, expanded, width, context } = resolveRenderResultContext(options2, rest, resolveReadSeekToolDisplayMode("edit") === "expanded");
@@ -5568,6 +5393,129 @@ import { dirname as dirname2, relative as relative3 } from "node:path";
 import { withFileMutationQueue as withFileMutationQueue2, truncateHead as truncateHead4 } from "@earendil-works/pi-coding-agent";
 import { Text as Text7 } from "@earendil-works/pi-tui";
 import { Type as Type9 } from "@sinclair/typebox";
+
+// src/pending-diff-preview.ts
+import { existsSync as existsSync2, readFileSync as readFileSync4, realpathSync, statSync as statSync3 } from "node:fs";
+import { dirname, isAbsolute as isAbsolute2, relative as relative2, resolve, sep } from "node:path";
+var PENDING_DIFF_MAX_BYTES = 1024 * 1024;
+function skip(reason) {
+  return { type: "skip", reason };
+}
+function isInsidePath(parent, child) {
+  const rel = relative2(parent, child);
+  return rel === "" || rel !== "" && !rel.startsWith("..") && !rel.startsWith(sep) && !resolve(rel).startsWith(".." + sep);
+}
+function resolveWorkspacePreviewPath(rawPath, cwd, allowMissing) {
+  if (typeof rawPath !== "string" || rawPath.trim() === "")
+    return { type: "skip", reason: "missing path" };
+  const workspace = realpathSync(cwd);
+  const normalizedPath = rawPath.replace(/^@/, "");
+  const explicitAbsolute = isAbsolute2(normalizedPath);
+  const requested = resolve(workspace, normalizedPath);
+  if (existsSync2(requested)) {
+    const realTarget = realpathSync(requested);
+    if (!explicitAbsolute && !isInsidePath(workspace, realTarget))
+      return { type: "skip", reason: "path outside workspace" };
+    return { type: "ok", path: realTarget, existed: true };
+  }
+  if (!explicitAbsolute && !isInsidePath(workspace, requested))
+    return { type: "skip", reason: "path outside workspace" };
+  if (!allowMissing)
+    return { type: "skip", reason: "file not found" };
+  const parent = dirname(requested);
+  if (!existsSync2(parent))
+    return { type: "skip", reason: "parent directory not found" };
+  return { type: "ok", path: requested, existed: false };
+}
+function readUtf8File(filePath) {
+  const stat2 = statSync3(filePath);
+  if (!stat2.isFile())
+    return { type: "skip", reason: "not a file" };
+  if (stat2.size > PENDING_DIFF_MAX_BYTES)
+    return { type: "skip", reason: "file too large" };
+  const content = readFileSync4(filePath, "utf-8");
+  if (content.includes("\x00"))
+    return { type: "skip", reason: "binary file" };
+  return { type: "ok", content };
+}
+function buildData(filePath, previousContent, nextContent, existed, headerLabel) {
+  const diff = generateDiffString(normalizeToLF(previousContent), normalizeToLF(nextContent)).diff;
+  return {
+    type: "ok",
+    data: {
+      filePath,
+      previousContent,
+      nextContent,
+      fileExistedBeforeWrite: existed,
+      headerLabel,
+      diff
+    }
+  };
+}
+function buildPendingWritePreviewData(input, cwd) {
+  if (typeof input.content !== "string")
+    return skip("missing content");
+  if (Buffer.byteLength(input.content, "utf8") > PENDING_DIFF_MAX_BYTES)
+    return skip("content too large");
+  const resolved = resolveWorkspacePreviewPath(input.path, cwd, true);
+  if (resolved.type === "skip")
+    return resolved;
+  const previous = resolved.existed ? readUtf8File(resolved.path) : { type: "ok", content: "" };
+  if (previous.type === "skip")
+    return previous;
+  return buildData(resolved.path, previous.content, input.content, resolved.existed, resolved.existed ? "pending overwrite" : "pending create");
+}
+function buildWritePreviewKey(input) {
+  if (typeof input.path !== "string" || typeof input.content !== "string")
+    return;
+  return JSON.stringify({ path: input.path, content: input.content });
+}
+function resolvePendingDiffPreview(context, stateKey, previewKey, compute) {
+  if (!previewKey)
+    return;
+  const root = context?.state;
+  if (!root)
+    return;
+  const slot = root[stateKey] ??= {};
+  if (slot.key !== previewKey) {
+    slot.key = previewKey;
+    slot.data = undefined;
+    slot.pending = false;
+  }
+  if (slot.data !== undefined)
+    return slot.data;
+  if (slot.pending)
+    return;
+  let value;
+  try {
+    value = compute();
+  } catch (err) {
+    const skipped = { type: "skip", reason: `projection failed: ${err?.message ?? String(err)}` };
+    slot.data = skipped;
+    return skipped;
+  }
+  if (value && typeof value.then === "function") {
+    slot.pending = true;
+    value.then((resolved) => {
+      if (slot.key !== previewKey)
+        return;
+      slot.data = resolved;
+      slot.pending = false;
+      context?.invalidate?.();
+    }).catch((err) => {
+      if (slot.key !== previewKey)
+        return;
+      slot.data = { type: "skip", reason: `projection failed: ${err?.message ?? String(err)}` };
+      slot.pending = false;
+      context?.invalidate?.();
+    });
+    return;
+  }
+  slot.data = value;
+  return slot.data;
+}
+
+// src/write.ts
 var WRITE_PENDING_PREVIEW_STATE_KEY = "hashline-write-pending-preview";
 var CONTENT_PREVIEW_MAX_LINES = 200;
 function formatContentPreviewLines(content, theme) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-readseek",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Pi extension for LINE:HASH-anchored file operations and structural code navigation",
   "type": "module",
   "exports": {
@@ -40,7 +40,7 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@jarkkojs/readseek": "^0.9.0",
+    "@jarkkojs/readseek": "^0.9.2",
     "diff": "^9.0.0",
     "xxhash-wasm": "^1.1.0"
   },