pi-shorthand 0.10.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-shorthand",
-	"version": "0.10.0",
+	"version": "0.12.0",
 	"description": "Pi tool for editing repositories with Bun programs, with first-class support for TypeScript and JavaScript.",
 	"keywords": [
 		"ast-grep",
@@ -26,7 +26,7 @@
 	],
 	"type": "module",
 	"dependencies": {
-		"shorthand-code": "0.10.0"
+		"shorthand-code": "0.12.0"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",

package/src/display.ts

@@ -25,8 +25,7 @@ const ANSI_CUBE_VALUES = [0, 95, 135, 175, 215, 255];
 const ANSI_GRAY_VALUES = Array.from({ length: 24 }, (_, index) => 8 + index * 10);
 
 const OUTPUT_PREVIEW_LINES = 5; // like Pi's bash tool
-const INLINE_DIFF_LINES = 40; // a longer diff collapses to a list of its files…
-const LISTED_FILES = 8; // …showing this many, then "and N more files"
+const LISTED_FILES = 8; // a diff too tall for the screen lists this many files, then "and N more files"
 const EXPANDED_DIFF_LINES = 2000; // even expanded, a diff of hundreds of files stops here
 
 export function callLine(
@@ -60,7 +59,8 @@ function indent(line: string): string {
 	return `  ${line}`;
 }
 
-export function resultLines(run: RunResult, expanded: boolean, theme: Theme): string[] {
+/** `collapseDiff` swaps the applied diff for a list of its files; see FitsScreen for when. */
+export function resultLines(run: RunResult, expanded: boolean, theme: Theme, collapseDiff = false): string[] {
 	const applied = run.changes.filter((change) => run.applied.includes(change.path));
 	const notApplied = run.changes.filter(
 		(change) => !run.applied.includes(change.path) && !run.rolledBack.includes(change.path),
@@ -95,7 +95,7 @@ export function resultLines(run: RunResult, expanded: boolean, theme: Theme): st
 	const sections: string[][] = [];
 	const background: ToolBackground =
 		run.exitCode === 0 && run.conflicts.length === 0 && run.rolledBack.length === 0 ? "toolSuccessBg" : "toolErrorBg";
-	if (applied.length > 0) sections.push(diffLines(applied, expanded, theme, background));
+	if (applied.length > 0) sections.push(diffLines(applied, collapseDiff && !expanded, theme, background));
 	if (output && (expanded || !error)) sections.push(outputLines(output, expanded, run.changes.length > 0, theme));
 	if (notApplied.length > 0) sections.push(notAppliedLines(notApplied, expanded, theme, background));
 	for (const section of sections) lines.push("", ...section);
@@ -157,14 +157,12 @@ function outputLines(output: string, expanded: boolean, labelled: boolean, theme
 	return [...label, hint, ...lines.slice(-OUTPUT_PREVIEW_LINES)];
 }
 
-/** Each file's diff under its name, in Pi's own diff style. A long diff collapses to a list of files. */
-function diffLines(changes: FileChange[], expanded: boolean, theme: Theme, background: ToolBackground): string[] {
-	const files = changes.map((change) => [fileLine(change, theme), ...renderFileDiff(change, theme, background)]);
-	const total = files.reduce((sum, file) => sum + file.length, 0);
-	if (!expanded && total > INLINE_DIFF_LINES) {
+/** Each file's diff under its name, in Pi's own diff style, or when collapsed a list of the files. */
+function diffLines(changes: FileChange[], collapse: boolean, theme: Theme, background: ToolBackground): string[] {
+	if (collapse) {
 		return [...fileList(changes, theme), theme.fg("muted", `(${keyHint("app.tools.expand", "to see the diff")})`)];
 	}
-
+	const files = changes.map((change) => [fileLine(change, theme), ...renderFileDiff(change, theme, background)]);
 	const lines = files.flatMap((file, index) => (index === 0 ? file : ["", ...file]));
 	if (lines.length <= EXPANDED_DIFF_LINES) return lines;
 	const more = lines.length - EXPANDED_DIFF_LINES;
@@ -316,7 +314,7 @@ function colorDistance(first: number[], second: number[]): number {
 
 function notAppliedLines(changes: FileChange[], expanded: boolean, theme: Theme, background: ToolBackground): string[] {
 	const heading = theme.fg("muted", `Would have changed ${fileCount(changes)} · `) + stats(changes, theme);
-	if (expanded) return [heading, "", ...diffLines(changes, true, theme, background)];
+	if (expanded) return [heading, "", ...diffLines(changes, false, theme, background)];
 	return [heading + theme.fg("muted", ` (${keyHint("app.tools.expand", "to see the diff")})`)];
 }
 

package/src/index.ts

@@ -7,7 +7,7 @@ import { createRequire } from "node:module";
 import * as path from "node:path";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { type ExtensionAPI, type Theme, truncateHead, truncateTail } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
+import { type Component, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import {
 	DEFAULT_TIMEOUT_SECONDS,
@@ -35,7 +35,7 @@ Common operations:
 - await refactor.renameFile({ from, to }) moves a TypeScript file and updates module paths that resolve to it.
 - await refactor.move({ file, symbol, to }) moves a top-level declaration to another file and updates the imports that follow it.
 
-See the shorthand skill for renames, moves and call-site migrations. Read its advanced-refactors.md guide only to extract code, move syntax or use rule objects. The default timeout is two seconds; request more for longer programs. Time spent inside the helpers above does not count toward it, up to 60 extra seconds.`;
+See the shorthand skill for renames, moves and call-site migrations. Read its advanced-refactors.md guide only to extract code, move syntax or use rule objects. The default timeout is five seconds; request more for longer programs. Time spent inside the helpers above does not count toward it, up to 60 extra seconds.`;
 
 const GRAPH_DESCRIPTION =
 	"- await graph.query(request | request[]) queries symbols and relationships; graph results can be passed to sg as scope. The graph shows the repository before this program's edits.\n";
@@ -151,7 +151,7 @@ export function renderCodeResult(
 	result: { content: readonly unknown[]; details?: unknown },
 	{ expanded, isPartial }: { expanded: boolean; isPartial: boolean },
 	theme: Theme,
-): Text {
+): Component {
 	if (isPartial) {
 		const progress = (result.details as { progress?: string } | undefined)?.progress;
 		return new Text(theme.fg("muted", progress ? `running… ${progress}` : "running…"), 0, 0);
@@ -170,5 +170,32 @@ export function renderCodeResult(
 	}
 	const run = result.details as RunResult | undefined;
 	if (!run) return new Text(theme.fg("error", unstructuredResultText(result.content)), 0, 0);
-	return new Text(resultLines(run, expanded, theme).join("\n"), 0, 0);
+	const full = new Text(resultLines(run, expanded, theme).join("\n"), 0, 0);
+	if (expanded) return full;
+	return new FitsScreen(full, new Text(resultLines(run, false, theme, true).join("\n"), 0, 0));
+}
+
+/** Rows Pi keeps for itself below a tool result: the editor, its borders and the footer. */
+const PI_CHROME_ROWS = 8;
+
+/**
+ * Shows the whole result while it fits on screen once wrapped, like Pi's edit tool, and otherwise the version
+ * with the diff collapsed to a list of files. Measured on each render, so resizing the terminal is followed.
+ */
+export class FitsScreen implements Component {
+	constructor(
+		private readonly full: Component,
+		private readonly collapsed: Component,
+		private readonly rows = () => process.stdout.rows || 24,
+	) {}
+
+	render(width: number): string[] {
+		const lines = this.full.render(width);
+		return lines.length <= this.rows() - PI_CHROME_ROWS ? lines : this.collapsed.render(width);
+	}
+
+	invalidate(): void {
+		this.full.invalidate();
+		this.collapsed.invalidate();
+	}
 }