pi-readseek 0.4.15 → 0.4.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-readseek",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "Pi extension for readseek-backed hash-anchored read/edit/grep, structural code maps, structural search, and file exploration",
   "type": "module",
   "exports": {
@@ -41,8 +41,6 @@
   "dependencies": {
     "@jarkkojs/readseek": "^0.4.20",
     "diff": "^8.0.3",
-    "ignore": "^7.0.5",
-    "picomatch": "^4.0.4",
     "xxhash-wasm": "^1.1.0"
   },
   "peerDependencies": {

package/src/edit.ts

@@ -24,7 +24,7 @@ import { replaceSymbol } from "./replace-symbol.js";
 import { buildEditPreviewKey, buildPendingEditPreviewData, resolvePendingDiffPreview, type PendingDiffPreviewResult } from "./pending-diff-preview.js";
 import { buildDiffData, type DiffBlockRange } from "./diff-data.js";
 import { clampLineToWidth, clampLinesToWidth, linkToolPath, renderPendingResult, resolveRenderResultContext, summaryLine } from "./tui-render-utils.js";
-import { DiffPreviewComponent } from "./tui-diff-component.js";
+import { upsertDiffComponent, upsertTextComponent } from "./tui-diff-component.js";
 import type { FreshAnchorsPredicate } from "./tool-types.js";
 import { registerReadSeekTool } from "./register-tool.js";
 
@@ -643,11 +643,7 @@ export function registerEditTool(pi: ExtensionAPI, options: EditToolOptions = {}
 			// expandable diff). Keeping the "↳ pending edit" sub-line and its
 			// preview alongside the final result is just duplicate noise.
 			if (context.executionStarted) {
-				const textComponent = (context.lastComponent && !(context.lastComponent instanceof DiffPreviewComponent))
-					? context.lastComponent
-					: new Text("", 0, 0);
-				textComponent.setText(text);
-				return textComponent;
+				return upsertTextComponent(context.lastComponent, text);
 			}
 			const previewKey = buildEditPreviewKey(args ?? {});
 			const preview = resolvePendingDiffPreview(
@@ -659,17 +655,9 @@ export function registerEditTool(pi: ExtensionAPI, options: EditToolOptions = {}
 			const expanded = !!context.expanded || resolveEditDiffDisplay() === "expanded";
 			const preview2 = pendingPreviewLines(text, preview, expanded);
 			if (preview2.diffData) {
-				const diffComponent = context.lastComponent instanceof DiffPreviewComponent
-					? context.lastComponent
-					: new DiffPreviewComponent({ prefixLines: preview2.lines, diffData: preview2.diffData, theme, expanded: true });
-				diffComponent.update({ prefixLines: preview2.lines, diffData: preview2.diffData, theme, expanded: true });
-				return diffComponent;
+				return upsertDiffComponent(context.lastComponent, { prefixLines: preview2.lines, diffData: preview2.diffData, theme, expanded: true });
 			}
-			const textComponent = (context.lastComponent && !(context.lastComponent instanceof DiffPreviewComponent))
-				? context.lastComponent
-				: new Text("", 0, 0);
-			textComponent.setText(clampLinesToWidth(preview2.lines, context.width).join("\n"));
-			return textComponent;
+			return upsertTextComponent(context.lastComponent, clampLinesToWidth(preview2.lines, context.width).join("\n"));
 		},
 			renderResult(result: any, options: ToolRenderResultOptions, theme: any, ...rest: any[]) {
 			const { isPartial, isError, expanded: baseExpanded, width, context } = resolveRenderResultContext(options, rest);
@@ -719,11 +707,7 @@ export function registerEditTool(pi: ExtensionAPI, options: EditToolOptions = {}
 				if (info.warningsBadge) badges.push(info.warningsBadge);
 				text = summaryLine(badges.join(" • "), { hidden: !!diffData && !expanded });
 				if (expanded && diffData) {
-					const diffComponent = context.lastComponent instanceof DiffPreviewComponent
-						? context.lastComponent
-						: new DiffPreviewComponent({ prefixLines: text.split("\n"), diffData, theme, expanded: true });
-					diffComponent.update({ prefixLines: text.split("\n"), diffData, theme, expanded: true });
-					return diffComponent;
+					return upsertDiffComponent(context.lastComponent, { prefixLines: text.split("\n"), diffData, theme, expanded: true });
 				}
 			}
 			return new Text(clampLinesToWidth(text.split("\n"), width).join("\n"), 0, 0);

package/src/grep.ts

@@ -21,7 +21,8 @@ import { formatGrepCallText, formatGrepResultText } from "./grep-render-helpers.
 import { coerceObviousBase10Int } from "./coerce-obvious-int.js";
 import { clampLineToWidth, clampLinesToWidth, linkToolPath, renderErrorResult, renderPendingResult, renderToolLabel, resolveRenderResultContext, summaryLine } from "./tui-render-utils.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { registerReadSeekTool } from "./register-tool.js";
+import { optionalIntOrString, registerReadSeekTool } from "./register-tool.js";
+import { searchPathParam } from "./readseek-params.js";
 
 const GREP_PROMPT_METADATA = defineToolPromptMetadata({
 	promptUrl: new URL("../prompts/grep.md", import.meta.url),
@@ -30,34 +31,19 @@ const GREP_PROMPT_METADATA = defineToolPromptMetadata({
 
 const grepSchema = Type.Object({
 	pattern: Type.String({ description: "Pattern to search" }),
-	path: Type.Optional(Type.String({ description: "Search path" })),
+	path: searchPathParam(),
 	glob: Type.Optional(Type.String({ description: "Glob filter" })),
 	ignoreCase: Type.Optional(Type.Boolean({ description: "Ignore case" })),
 	literal: Type.Optional(Type.Boolean({ description: "Treat pattern literally" })),
-	context: Type.Optional(
-		Type.Union([
-			Type.Number({ description: "Context lines" }),
-			Type.String({ description: "Context lines" }),
-		]),
-	),
-	limit: Type.Optional(
-		Type.Union([
-			Type.Number({ description: "Max matches" }),
-			Type.String({ description: "Max matches" }),
-		]),
-	),
+	context: optionalIntOrString("Context lines"),
+	limit: optionalIntOrString("Max matches"),
 	summary: Type.Optional(Type.Boolean({ description: "Return per-file counts" })),
 	scope: Type.Optional(
 		Type.Literal("symbol", {
 			description: "Scope matches to symbols",
 		}),
 	),
-	scopeContext: Type.Optional(
-		Type.Union([
-			Type.Number({ description: "Symbol context lines" }),
-			Type.String({ description: "Symbol context lines" }),
-		]),
-	),
+	scopeContext: optionalIntOrString("Symbol context lines"),
 });
 
 interface GrepParams {

package/src/read.ts

@@ -29,7 +29,7 @@ import { readseekRead, readseekDetect, type ReadSeekDetection } from "./readseek
 import { formatReadCallText, formatReadResultText } from "./read-render-helpers.js";
 import { clampLineToWidth, clampLinesToWidth, linkToolPath, renderPendingResult, renderToolLabel, resolveRenderResultContext, summaryLine, wrapReadHashlinesForWidth } from "./tui-render-utils.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { registerReadSeekTool } from "./register-tool.js";
+import { optionalIntOrString, registerReadSeekTool } from "./register-tool.js";
 
 const READ_PROMPT_METADATA = defineToolPromptMetadata({
 	promptUrl: new URL("../prompts/read.md", import.meta.url),
@@ -145,7 +145,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 	} catch (err: any) {
 		const code = err?.code;
 		if (code === "EISDIR") {
-			const message = `Path is a directory: ${rawPath}. Use ls to inspect directories.`;
+			const message = `Path is a directory: ${rawPath}`;
 			return buildToolErrorResult("read", "path-is-directory", message, { path: rawParams.path, hint: `Use ls(${JSON.stringify(rawPath)}) to inspect directories.` });
 		}
 		if (code === "EACCES" || code === "EPERM") {
@@ -194,7 +194,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 	let startLine = p.offset !== undefined ? p.offset : 1;
 	let endIdx = p.limit !== undefined ? Math.min(startLine - 1 + p.limit, total) : total;
 	if (p.offset !== undefined && startLine > total) {
-		const message = `[offset ${p.offset} is past end of file (${total} lines)]`;
+		const message = `offset ${p.offset} is past end of file (${total} lines)`;
 		return buildToolErrorResult("read", "offset-past-end", message, { path: rawParams.path });
 	}
 	let symbolMatch: SymbolMatch | undefined;
@@ -451,18 +451,8 @@ export function registerReadTool(pi: ExtensionAPI, options: ReadToolOptions = {}
 		promptGuidelines: READ_PROMPT_METADATA.promptGuidelines,
 		parameters: Type.Object({
 			path: Type.String({ description: "File path" }),
-			offset: Type.Optional(
-				Type.Union([
-					Type.Number({ description: "Start line (1-indexed)" }),
-					Type.String({ description: "Start line (1-indexed)" }),
-				]),
-			),
-			limit: Type.Optional(
-				Type.Union([
-					Type.Number({ description: "Max lines" }),
-					Type.String({ description: "Max lines" }),
-				]),
-			),
+			offset: optionalIntOrString("Start line (1-indexed)"),
+			limit: optionalIntOrString("Max lines"),
 			symbol: Type.Optional(Type.String({ description: "Symbol name to read" })),
 			map: Type.Optional(Type.Boolean({ description: "Append structural map" })),
 			bundle: Type.Optional(

package/src/readseek-params.ts

@@ -0,0 +1,39 @@
+import { Type } from "@sinclair/typebox";
+
+import { buildToolErrorResult, type ToolErrorResult } from "./readseek-value.js";
+
+/** Optional search path shared by the readseek search tools. */
+export function searchPathParam() {
+  return Type.Optional(Type.String({ description: "Search path" }));
+}
+
+/** Optional language hint shared by the readseek search tools. */
+export function langParam() {
+  return Type.Optional(Type.String({ description: "Language hint" }));
+}
+
+/**
+ * TypeBox fragment for the Git-scope parameters shared by every readseek
+ * search tool. Returns fresh schema instances so each tool spreads its own.
+ */
+export function readseekGitSearchParams() {
+  return {
+    cached: Type.Optional(Type.Boolean({ description: "In a Git repository, search tracked/indexed files" })),
+    others: Type.Optional(Type.Boolean({ description: "In a Git repository, search untracked files" })),
+    ignored: Type.Optional(Type.Boolean({ description: "With others=true, include ignored untracked files" })),
+  };
+}
+
+/**
+ * Enforce that `ignored` is only meaningful alongside `others`. Returns an
+ * error envelope tagged with {@link tool} when the rule is violated, else null.
+ */
+export function validateIgnoredRequiresOthers(
+  tool: string,
+  params: { others?: boolean; ignored?: boolean },
+): ToolErrorResult | null {
+  if (params.ignored && !params.others) {
+    return buildToolErrorResult(tool, "invalid-parameter", `Error: ${tool} parameter 'ignored' requires 'others'`);
+  }
+  return null;
+}

package/src/refs.ts

@@ -1,5 +1,4 @@
 import type { ExtensionAPI, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 import path from "node:path";
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
@@ -9,9 +8,10 @@ import { resolveToCwd } from "./path-utils.js";
 import { classifyReadSeekFailure, readseekRefs, type ReadSeekReference } from "./readseek-client.js";
 import { buildRefsOutput, type RefsOutputFile, type RefsOutputLine } from "./refs-output.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
+import { langParam, readseekGitSearchParams, searchPathParam, validateIgnoredRequiresOthers } from "./readseek-params.js";
 import { registerReadSeekTool } from "./register-tool.js";
 
-import { clampLineToWidth, renderAnchoredFilesResult, renderToolLabel } from "./tui-render-utils.js";
+import { renderAnchoredFilesResult, renderReadSeekSearchCall } from "./tui-render-utils.js";
 
 type RefsParams = {
   name: string;
@@ -83,9 +83,8 @@ function isReadSeekCursorValidationFailure(message: string): boolean {
 export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
   const { params, signal, cwd, onFileAnchored } = opts;
   const p = params as RefsParams;
-  if (p.ignored && !p.others) {
-    return buildToolErrorResult("refs", "invalid-parameter", "Error: refs parameter 'ignored' requires 'others'");
-  }
+  const ignoredError = validateIgnoredRequiresOthers("refs", p);
+  if (ignoredError) return ignoredError;
   if (p.scope && p.line === undefined) {
     return buildToolErrorResult("refs", "invalid-parameter", "Error: refs parameter 'scope' requires 'line'");
   }
@@ -136,26 +135,22 @@ export function registerRefsTool(pi: ExtensionAPI, options: RefsToolOptions = {}
     promptGuidelines: REFS_PROMPT_METADATA.promptGuidelines,
     parameters: Type.Object({
       name: Type.String({ description: "Identifier to find references for" }),
-      path: Type.Optional(Type.String({ description: "Search path" })),
-      lang: Type.Optional(Type.String({ description: "Language hint" })),
+      path: searchPathParam(),
+      lang: langParam(),
       scope: Type.Optional(Type.Boolean({ description: "Restrict to the binding under line/column (single file)" })),
       line: Type.Optional(Type.Number({ description: "One-based cursor line, used with scope" })),
       column: Type.Optional(Type.Number({ description: "One-based cursor byte column, used with scope" })),
-      cached: Type.Optional(Type.Boolean({ description: "In a Git repository, search tracked/indexed files" })),
-      others: Type.Optional(Type.Boolean({ description: "In a Git repository, search untracked files" })),
-      ignored: Type.Optional(Type.Boolean({ description: "With others=true, include ignored untracked files" })),
+      ...readseekGitSearchParams(),
     }),
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       return executeRefs({ params, signal, cwd: ctx.cwd, onFileAnchored: options.onFileAnchored });
     },
     renderCall(args: any, theme: any, ...rest: any[]) {
-      const context = rest[0] ?? {};
-      let text = `${renderToolLabel(theme, "refs")} ${theme.fg("accent", args.name)}`;
-      text += theme.fg("dim", ` in ${args.path ?? "."}`);
-      if (args.lang) text += theme.fg("dim", ` (${args.lang})`);
-      const flags = [args.scope && "scope", args.cached && "cached", args.others && "others", args.ignored && "ignored"].filter(Boolean);
-      if (flags.length > 0) text += theme.fg("dim", ` [${flags.join(",")}]`);
-      return new Text(clampLineToWidth(text, context.width), 0, 0);
+      return renderReadSeekSearchCall(args, theme, rest, {
+        label: "refs",
+        accent: args.name,
+        flags: [args.scope && "scope", args.cached && "cached", args.others && "others", args.ignored && "ignored"],
+      });
     },
     renderResult(result: any, options: ToolRenderResultOptions, theme: any, ...rest: any[]) {
       return renderAnchoredFilesResult(result, options, theme, rest, {

package/src/register-tool.ts

@@ -1,4 +1,14 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@sinclair/typebox";
+
+/**
+ * Optional tool parameter accepting an integer or its string form, since models
+ * frequently pass integers as quoted strings. Both union halves share
+ * {@link description}.
+ */
+export function optionalIntOrString(description: string) {
+  return Type.Optional(Type.Union([Type.Number({ description }), Type.String({ description })]));
+}
 
 export type ReadSeekToolPolicy = "read-only" | "mutating";
 

package/src/sg.ts

@@ -1,7 +1,6 @@
 import path from "node:path";
 
 import type { ExtensionAPI, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
@@ -11,9 +10,10 @@ import { statSearchPathOrError } from "./stat-search-path.js";
 import { classifyReadSeekFailure, isReadSeekAvailable, readseekSearch, type ReadSeekHashline, type ReadSeekSearchFileOutput } from "./readseek-client.js";
 import { buildSgOutput } from "./sg-output.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
+import { langParam, readseekGitSearchParams, searchPathParam, validateIgnoredRequiresOthers } from "./readseek-params.js";
 import { registerReadSeekTool } from "./register-tool.js";
 
-import { clampLineToWidth, renderAnchoredFilesResult, renderToolLabel } from "./tui-render-utils.js";
+import { renderAnchoredFilesResult, renderReadSeekSearchCall } from "./tui-render-utils.js";
 
 type SgParams = { pattern: string; lang?: string; path?: string; cached?: boolean; others?: boolean; ignored?: boolean };
 
@@ -107,10 +107,8 @@ function readseekLanguageForPath(language: string | undefined, searchPath: strin
 export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
   const { params, signal, cwd, onFileAnchored } = opts;
   const p = params as SgParams;
-  if (p.ignored && !p.others) {
-    const message = "Error: search parameter 'ignored' requires 'others'";
-    return buildToolErrorResult("search", "invalid-parameter", message);
-  }
+  const ignoredError = validateIgnoredRequiresOthers("search", p);
+  if (ignoredError) return ignoredError;
   const searchPath = resolveToCwd(p.path ?? ".", cwd);
 
   const statResult = await statSearchPathOrError("search", p.path, searchPath);
@@ -201,23 +199,19 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
     promptGuidelines: SG_PROMPT_METADATA.promptGuidelines,
     parameters: Type.Object({
       pattern: Type.String({ description: "AST pattern" }),
-      lang: Type.Optional(Type.String({ description: "Language hint" })),
-      path: Type.Optional(Type.String({ description: "Search path" })),
-      cached: Type.Optional(Type.Boolean({ description: "In a Git repository, search tracked/indexed files" })),
-      others: Type.Optional(Type.Boolean({ description: "In a Git repository, search untracked files" })),
-      ignored: Type.Optional(Type.Boolean({ description: "With others=true, include ignored untracked files" })),
+      lang: langParam(),
+      path: searchPathParam(),
+      ...readseekGitSearchParams(),
     }),
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       return executeSg({ params, signal, cwd: ctx.cwd, onFileAnchored: options.onFileAnchored });
     },
     renderCall(args: any, theme: any, ...rest: any[]) {
-      const context = rest[0] ?? {};
-      let text = `${renderToolLabel(theme, "search")} ${theme.fg("accent", `/${args.pattern}/`)}`;
-      text += theme.fg("dim", ` in ${args.path ?? "."}`);
-      if (args.lang) text += theme.fg("dim", ` (${args.lang})`);
-      const flags = [args.cached && "cached", args.others && "others", args.ignored && "ignored"].filter(Boolean);
-      if (flags.length > 0) text += theme.fg("dim", ` [${flags.join(",")}]`);
-      return new Text(clampLineToWidth(text, context.width), 0, 0);
+      return renderReadSeekSearchCall(args, theme, rest, {
+        label: "search",
+        accent: `/${args.pattern}/`,
+        flags: [args.cached && "cached", args.others && "others", args.ignored && "ignored"],
+      });
     },
     renderResult(result: any, options: ToolRenderResultOptions, theme: any, ...rest: any[]) {
       return renderAnchoredFilesResult(result, options, theme, rest, {

package/src/tui-diff-component.ts

@@ -1,5 +1,5 @@
 import type { Component } from "@earendil-works/pi-tui";
-import { visibleWidth } from "@earendil-works/pi-tui";
+import { Text, visibleWidth } from "@earendil-works/pi-tui";
 import type { DiffData } from "./diff-data.js";
 import { renderTuiDiff } from "./tui-diff-renderer.js";
 import { clampLineToWidth, normalizeWidth, type RendererTheme } from "./tui-render-utils.js";
@@ -84,3 +84,25 @@ export class DiffPreviewComponent implements Component {
 		return clamped;
 	}
 }
+
+/**
+ * Reuse the prior render tick's {@link DiffPreviewComponent} when present, else
+ * construct one, then apply {@link options}. Keeps a streaming diff preview
+ * stable across ticks instead of remounting a fresh component each frame.
+ */
+export function upsertDiffComponent(lastComponent: unknown, options: DiffPreviewComponentOptions): DiffPreviewComponent {
+	const component = lastComponent instanceof DiffPreviewComponent ? lastComponent : new DiffPreviewComponent(options);
+	component.update(options);
+	return component;
+}
+
+/**
+ * Reuse the prior render tick's text component when it is not a
+ * {@link DiffPreviewComponent}, else construct a fresh {@link Text}, then set
+ * its content to {@link text}.
+ */
+export function upsertTextComponent(lastComponent: any, text: string): Text {
+	const component = lastComponent && !(lastComponent instanceof DiffPreviewComponent) ? lastComponent : new Text("", 0, 0);
+	component.setText(text);
+	return component;
+}

package/src/tui-render-utils.ts

@@ -177,6 +177,26 @@ export interface AnchoredFilesLabels {
   unitPlural: string;
 }
 
+/**
+ * Render the call line shared by the readseek search tools (search, refs): a
+ * tool label, an accent term, the search path, an optional language hint, and
+ * the active boolean flags. Falsy {@link opts.flags} entries are dropped.
+ */
+export function renderReadSeekSearchCall(
+  args: { path?: string; lang?: string },
+  theme: RendererTheme,
+  rest: any[],
+  opts: { label: string; accent: string; flags: Array<string | false | undefined> },
+): Text {
+  const context = rest[0] ?? {};
+  let text = `${renderToolLabel(theme, opts.label)} ${theme.fg("accent", opts.accent)}`;
+  text += theme.fg("dim", ` in ${args.path ?? "."}`);
+  if (args.lang) text += theme.fg("dim", ` (${args.lang})`);
+  const flags = opts.flags.filter(Boolean);
+  if (flags.length > 0) text += theme.fg("dim", ` [${flags.join(",")}]`);
+  return new Text(clampLineToWidth(text, context.width), 0, 0);
+}
+
 /**
  * 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

package/src/write.ts

@@ -1,7 +1,7 @@
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, relative } from "node:path";
 
-import { withFileMutationQueue, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { withFileMutationQueue, type ExtensionAPI, type ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 
@@ -16,8 +16,8 @@ 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";
 import { buildDiffData, type DiffData } from "./diff-data.js";
-import { clampLineToWidth, clampLinesToWidth, isRendererExpanded, linkToolPath, renderErrorResult, renderToolLabel, summaryLine } from "./tui-render-utils.js";
-import { DiffPreviewComponent } from "./tui-diff-component.js";
+import { clampLineToWidth, clampLinesToWidth, linkToolPath, renderErrorResult, renderPendingResult, renderToolLabel, resolveRenderResultContext, summaryLine } from "./tui-render-utils.js";
+import { upsertDiffComponent, upsertTextComponent } from "./tui-diff-component.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
 import { registerReadSeekTool } from "./register-tool.js";
 
@@ -399,32 +399,20 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
       // its preview alongside the final result is just duplicate noise — the
       // pre-execution state can no longer change in any meaningful way.
       if (context.executionStarted) {
-        const textComponent = (context.lastComponent && !(context.lastComponent instanceof DiffPreviewComponent))
-          ? context.lastComponent
-          : new Text("", 0, 0);
-        textComponent.setText(text);
-        return textComponent;
+        return upsertTextComponent(context.lastComponent, text);
       }
       const previewKey = buildWritePreviewKey(args ?? {});
       const preview = resolvePendingDiffPreview(context, WRITE_PENDING_PREVIEW_STATE_KEY, previewKey, () => buildPendingWritePreviewData(args ?? {}, context.cwd ?? process.cwd()));
       const expanded = !!context.expanded;
       const parts = pendingWritePreviewParts(text, preview, expanded, theme);
       if (parts.diffData) {
-        const diffComponent = context.lastComponent instanceof DiffPreviewComponent
-          ? context.lastComponent
-          : new DiffPreviewComponent({ prefixLines: parts.lines, diffData: parts.diffData, theme, expanded: true });
-        diffComponent.update({ prefixLines: parts.lines, diffData: parts.diffData, theme, expanded: true });
-        return diffComponent;
+        return upsertDiffComponent(context.lastComponent, { prefixLines: parts.lines, diffData: parts.diffData, theme, expanded: true });
       }
-      const textComponent = (context.lastComponent && !(context.lastComponent instanceof DiffPreviewComponent))
-        ? context.lastComponent
-        : new Text("", 0, 0);
-      textComponent.setText(clampLinesToWidth(parts.lines, context.width).join("\n"));
-      return textComponent;
+      return upsertTextComponent(context.lastComponent, clampLinesToWidth(parts.lines, context.width).join("\n"));
     },
-    renderResult(result: any, options: any, theme: any, context: any = {}) {
-      const expanded = isRendererExpanded(options, context);
-      const width = context.width ?? options?.width;
+    renderResult(result: any, options: ToolRenderResultOptions, theme: any, ...rest: any[]) {
+      const { isPartial, expanded, width, context } = resolveRenderResultContext(options, rest);
+      if (isPartial) return renderPendingResult("pending write", width);
       const details = result.details ?? {};
       const output = result.content?.[0]?.type === "text" ? result.content[0].text : "";
       if (result.isError || details.readseekValue?.ok === false) {
@@ -450,11 +438,7 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
       const hasExpandableDiff = !!diffData;
       let text = summaryLine(state, { hidden: hasExpandableDiff && !expanded });
       if (expanded && hasExpandableDiff) {
-        const diffComponent = context.lastComponent instanceof DiffPreviewComponent
-          ? context.lastComponent
-          : new DiffPreviewComponent({ prefixLines: text.split("\n"), diffData, theme, expanded: true });
-        diffComponent.update({ prefixLines: text.split("\n"), diffData, theme, expanded: true });
-        return diffComponent;
+        return upsertDiffComponent(context.lastComponent, { prefixLines: text.split("\n"), diffData, theme, expanded: true });
       }
       return new Text(clampLinesToWidth(text.split("\n"), width).join("\n"), 0, 0);
     },