@heyhuynhgiabuu/pi-pretty 0.6.18 → 0.6.20

package/src/tools/read.ts

@@ -1,27 +1,53 @@
 /* pi-pretty: read tool -- file reading with syntax highlighting and inline image support. */
 
+import { basename, dirname } from "node:path";
 import type { AgentToolResult, ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
-import { Image as TuiImage } from "@earendil-works/pi-tui";
 import {
 	BG_BASE,
 	BG_ERROR,
 	FG_DIM,
 	FG_LNUM,
 	FG_RULE,
-	MAX_PREVIEW_LINES,
 	RST,
 	resolveBaseBackground,
 	TOOL_RESULT_INDENT,
 	termWidth,
 } from "../config.js";
 import { normalizeLineEndings, shortPath } from "../helpers.js";
-import { fillToolBackground, renderFileContent, renderToolError, renderToolMetrics } from "../render.js";
+import { fillToolBackground, renderFileContent, renderToolError } from "../render.js";
 import { resolveTextCtor } from "../tui-text.js";
 import type { ReadDetails, RenderCtxLike, SdkToolDef, TextContent, ThemeLike } from "../types.js";
 import { wrapExecuteWithMetrics } from "./metrics.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
+function getSkillName(filePath: string, content: string): string | undefined {
+	if (basename(filePath) !== "SKILL.md") return undefined;
+
+	const lines = content.split("\n");
+	if (lines[0]?.trim() === "---") {
+		const end = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
+		for (const line of lines.slice(1, end < 0 ? 1 : end)) {
+			const match = /^name\s*:\s*(.+?)\s*$/.exec(line);
+			if (!match) continue;
+			const value = match[1].trim();
+			if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+				return value.slice(1, -1).trim() || basename(dirname(filePath));
+			}
+			return value || basename(dirname(filePath));
+		}
+	}
+
+	return basename(dirname(filePath));
+}
+
+function renderSkillHeader(skillName: string, expanded: boolean, theme: ThemeLike): string {
+	const label = theme.fg("accent", "[skill]");
+	const name = theme.fg("toolTitle", skillName);
+	const hint = theme.fg("dim", `ctrl+o to ${expanded ? "collapse" : "expand"}`);
+	return `${label} ${name} ${hint}`;
+}
+
 export function registerReadTool(
 	pi: ExtensionAPI,
 	cwd: string,
@@ -48,8 +74,6 @@ export function registerReadTool(
 				result.details = {
 					_type: "readImage",
 					filePath: String(p.path ?? ""),
-					data: imageBlock.data,
-					mimeType: imageBlock.mimeType ?? "image/png",
 				} as ReadDetails;
 				return result;
 			}
@@ -76,7 +100,7 @@ export function registerReadTool(
 
 			const path = String(args.path ?? "");
 			const label = theme.fg("error", theme.bold("→ read"));
-			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${label} ${theme.fg("toolTitle", path)}`, BG_ERROR));
+			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${label} ${theme.fg("toolTitle", path)}\n`, BG_ERROR));
 			return text;
 		},
 
@@ -92,19 +116,13 @@ export function registerReadTool(
 
 			const d = result.details as ReadDetails | undefined;
 
-			// Image rendering — use pi-tui Image component
+			// Image content is preserved for ToolExecution's host-generic image pass.
+			// Keep the SDK's text note visible as a fallback when host images are hidden
+			// or unsupported by the terminal.
 			if (d?._type === "readImage") {
-				const mimeType = d.mimeType.startsWith("image/svg") ? "image/svg+xml" : d.mimeType;
-				return new TuiImage(
-					d.data,
-					mimeType,
-					{
-						fallbackColor: (text) => theme.fg("toolTitle", text),
-					},
-					{
-						filename: d.filePath,
-					},
-				);
+				const note = getText(result);
+				text.setText(note ? fillToolBackground(note, BG_BASE) : "");
+				return text;
 			}
 
 			// File content — line-numbered display
@@ -112,9 +130,16 @@ export function registerReadTool(
 				const tw = termWidth();
 				const lines = d.content.split("\n");
 				const total = lines.length;
-				const p2 = shortPath(cwd, home, String(d.filePath ?? ""));
+				const filePath = String(d.filePath ?? "");
+				const skillName = getSkillName(filePath, d.content);
+				const p2 = shortPath(cwd, home, filePath);
 				const off2 = typeof d.offset === "number" ? `:${d.offset}` : "";
 				if (!ctx.expanded) {
+					if (skillName) {
+						const header = renderSkillHeader(skillName, false, theme);
+						text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${header}\n`, BG_BASE));
+						return text;
+					}
 					text.setText(
 						fillToolBackground(
 							`\n${TOOL_RESULT_INDENT}${theme.fg("toolTitle", theme.bold("→ read"))} ${theme.fg("toolTitle", p2)}${theme.fg("dim", off2)}\n${TOOL_RESULT_INDENT}${FG_DIM}${total} lines — ctrl+o to expand${RST}\n`,
@@ -129,7 +154,9 @@ export function registerReadTool(
 				const gw = nw + 3;
 				const cw = Math.max(1, tw - gw);
 
-				const header = `${theme.fg("toolTitle", theme.bold("→ read"))} ${theme.fg("toolTitle", p2)}${theme.fg("dim", off2)}`;
+				const header = skillName
+					? renderSkillHeader(skillName, true, theme)
+					: `${theme.fg("toolTitle", theme.bold("→ read"))} ${theme.fg("toolTitle", p2)}${theme.fg("dim", off2)}`;
 				const out: string[] = ["", `${TOOL_RESULT_INDENT}${header}`];
 				out.push(`${TOOL_RESULT_INDENT}${FG_RULE}${"─".repeat(tw - 1)}${RST}`);
 				for (let i = 0; i < show.length; i++) {
@@ -156,7 +183,10 @@ export function registerReadTool(
 							.split("\n")
 							.map((l) => `${TOOL_RESULT_INDENT}${l}`)
 							.join("\n");
-						const rendered = `\n${TOOL_RESULT_INDENT}${header}\n${padded}\n`;
+						const divider = skillName
+							? `${TOOL_RESULT_INDENT}${FG_RULE}${"─".repeat(Math.max(1, tw - 1))}${RST}\n`
+							: "";
+						const rendered = `\n${TOOL_RESULT_INDENT}${header}\n${divider}${padded}\n`;
 						text.setText(fillToolBackground(rendered, BG_BASE));
 						(ctx as any).state._rt = rendered;
 					})

package/src/types.ts

@@ -51,7 +51,7 @@ export interface ComponentLike {
 // ---------------------------------------------------------------------------
 
 export type ReadDetails =
-	| { _type: "readImage"; filePath: string; data: string; mimeType: string }
+	| { _type: "readImage"; filePath: string }
 	| { _type: "readFile"; filePath: string; content: string; offset: number; lineCount: number };
 
 export interface BashDetails extends Record<string, unknown> {
@@ -138,10 +138,15 @@ export interface SdkToolDef {
 
 export interface SdkTools {
 	createReadTool?: (cwd: string) => SdkToolDef;
+	createReadToolDefinition?: (cwd: string) => SdkToolDef;
 	createBashTool?: (cwd: string) => SdkToolDef;
+	createBashToolDefinition?: (cwd: string) => SdkToolDef;
 	createLsTool?: (cwd: string) => SdkToolDef;
+	createLsToolDefinition?: (cwd: string) => SdkToolDef;
 	createFindTool?: (cwd: string) => SdkToolDef;
+	createFindToolDefinition?: (cwd: string) => SdkToolDef;
 	createGrepTool?: (cwd: string) => SdkToolDef;
+	createGrepToolDefinition?: (cwd: string) => SdkToolDef;
 	getAgentDir?: () => string;
 }
 
@@ -174,17 +179,6 @@ export interface CursorStore {
 	get(id: string): unknown | undefined;
 }
 
-// ---------------------------------------------------------------------------
-// Constraint parsing
-// ---------------------------------------------------------------------------
-
-export interface ConstraintParseResult {
-	ok: boolean;
-	globs: string[];
-	tokens: string[];
-	error?: string;
-}
-
 // ---------------------------------------------------------------------------
 // DI
 // ---------------------------------------------------------------------------

package/src/collapsed-hint.ts

@@ -1,14 +0,0 @@
-import { FG_DIM, RST, TOOL_RESULT_INDENT } from "./config.js";
-
-/** Shown in collapsed tool results; Pi keybinding is still `app.tools.expand` (Ctrl+O). */
-export const COLLAPSED_EXPAND_LABEL = "ctrl+o to expand";
-
-/** Collapsed hint line (no extra blank lines above/below). */
-export function collapsedExpandBlock(countLabel: string): string {
-	return `${TOOL_RESULT_INDENT}${FG_DIM}${countLabel} — ${COLLAPSED_EXPAND_LABEL}${RST}\n`;
-}
-
-/** When line count / metrics already appear on the header line (bash). */
-export function collapsedExpandFooter(): string {
-	return `${TOOL_RESULT_INDENT}${FG_DIM}${COLLAPSED_EXPAND_LABEL}${RST}\n`;
-}

package/src/expand.ts

@@ -1,10 +0,0 @@
-import { MAX_PREVIEW_LINES } from "./config.js";
-
-/** Render context from pi tool UI (Ctrl+O toggles `expanded` per tool block). */
-export type ToolRenderCtx = { expanded?: boolean };
-
-/** Lines to show in tool result body when collapsed vs expanded. */
-export function previewLineCount(ctx: ToolRenderCtx, totalLines: number): number {
-	if (ctx.expanded) return totalLines;
-	return Math.min(totalLines, MAX_PREVIEW_LINES);
-}

package/src/image.ts

@@ -1,129 +0,0 @@
-/**
- * pi-pretty: Terminal image rendering (iTerm2 / Kitty / Ghostty inline image protocols).
- * Handles tmux passthrough for image protocols.
- */
-
-import { execFileSync } from "node:child_process";
-
-type ImageProtocol = "iterm2" | "kitty" | "none";
-
-let _tmuxClientTermCache: string | null | undefined;
-let _tmuxAllowPassthroughCache: boolean | null | undefined;
-let _tmuxClientTermOverrideForTests: string | null | undefined;
-let _tmuxAllowPassthroughOverrideForTests: boolean | null | undefined;
-
-function isTmuxSession(): boolean {
-	return !!process.env.TMUX || /^(tmux|screen)/.test(process.env.TERM ?? "");
-}
-
-function normalizeTerminalName(term: string): string {
-	const t = term.toLowerCase();
-	if (t.includes("kitty")) return "kitty";
-	if (t.includes("ghostty")) return "ghostty";
-	if (t.includes("wezterm")) return "WezTerm";
-	if (t.includes("iterm")) return "iTerm.app";
-	if (t.includes("mintty")) return "mintty";
-	return term;
-}
-
-function readTmuxClientTerm(): string | null {
-	if (_tmuxClientTermOverrideForTests !== undefined) {
-		return _tmuxClientTermOverrideForTests ? normalizeTerminalName(_tmuxClientTermOverrideForTests) : null;
-	}
-	if (!isTmuxSession()) return null;
-	if (_tmuxClientTermCache !== undefined) return _tmuxClientTermCache;
-	try {
-		const term = execFileSync("tmux", ["display-message", "-p", "#{client_termname}"], {
-			encoding: "utf8",
-			stdio: ["ignore", "pipe", "ignore"],
-			timeout: 200,
-		}).trim();
-		_tmuxClientTermCache = term ? normalizeTerminalName(term) : null;
-	} catch {
-		_tmuxClientTermCache = null;
-	}
-	return _tmuxClientTermCache;
-}
-
-function getOuterTerminal(): string {
-	if (process.env.LC_TERMINAL === "iTerm2") return "iTerm.app";
-	if (process.env.GHOSTTY_RESOURCES_DIR) return "ghostty";
-	if (process.env.KITTY_WINDOW_ID || process.env.KITTY_PID) return "kitty";
-	if (process.env.WEZTERM_EXECUTABLE || process.env.WEZTERM_CONFIG_DIR || process.env.WEZTERM_CONFIG_FILE) {
-		return "WezTerm";
-	}
-	const termProgram = process.env.TERM_PROGRAM ?? "";
-	if (termProgram && termProgram !== "tmux" && termProgram !== "screen") {
-		return normalizeTerminalName(termProgram);
-	}
-	const tmuxClientTerm = readTmuxClientTerm();
-	if (tmuxClientTerm) return tmuxClientTerm;
-	const term = process.env.TERM ?? "";
-	if (term) return normalizeTerminalName(term);
-	if (process.env.COLORTERM === "truecolor" || process.env.COLORTERM === "24bit") return "unknown-modern";
-	return termProgram;
-}
-
-function detectImageProtocol(): ImageProtocol {
-	const forced = (process.env.PRETTY_IMAGE_PROTOCOL ?? "").toLowerCase();
-	if (forced === "kitty" || forced === "iterm2" || forced === "none") return forced;
-	const term = getOuterTerminal();
-	if (term === "ghostty" || term === "kitty") return "kitty";
-	if (["iTerm.app", "WezTerm", "mintty"].includes(term)) return "iterm2";
-	if (process.env.LC_TERMINAL === "iTerm2") return "iterm2";
-	return "none";
-}
-
-function tmuxAllowsPassthrough(): boolean | null {
-	if (_tmuxAllowPassthroughOverrideForTests !== undefined) return _tmuxAllowPassthroughOverrideForTests;
-	if (!isTmuxSession()) return null;
-	if (_tmuxAllowPassthroughCache !== undefined) return _tmuxAllowPassthroughCache;
-	try {
-		const value = execFileSync("tmux", ["show-options", "-gv", "allow-passthrough"], {
-			encoding: "utf8",
-			stdio: ["ignore", "pipe", "ignore"],
-			timeout: 200,
-		})
-			.trim()
-			.toLowerCase();
-		_tmuxAllowPassthroughCache = value === "on" || value === "all";
-	} catch {
-		_tmuxAllowPassthroughCache = null;
-	}
-	return _tmuxAllowPassthroughCache;
-}
-
-function getTmuxPassthroughWarning(protocol: ImageProtocol): string | null {
-	if (!isTmuxSession() || protocol === "none") return null;
-	if (tmuxAllowsPassthrough() === false) {
-		return "tmux allow-passthrough is off. Run: tmux set -g allow-passthrough on";
-	}
-	return null;
-}
-
-function tmuxWrap(seq: string): string {
-	if (!isTmuxSession()) return seq;
-	const escaped = seq.split("\x1b").join("\x1b\x1b");
-	return `\x1bPtmux;${escaped}\x1b\\`;
-}
-
-export const __imageInternals = {
-	isTmuxSession,
-	getOuterTerminal,
-	detectImageProtocol,
-	tmuxWrap,
-	tmuxAllowsPassthrough,
-	getTmuxPassthroughWarning,
-	setTmuxClientTermOverrideForTests: (value: string | null | undefined) => {
-		_tmuxClientTermOverrideForTests = value;
-	},
-	setTmuxAllowPassthroughOverrideForTests: (value: boolean | null | undefined) => {
-		_tmuxAllowPassthroughOverrideForTests = value;
-	},
-	resetCachesForTests: () => {
-		_tmuxClientTermCache = undefined;
-		_tmuxAllowPassthroughCache = undefined;
-		_tmuxClientTermOverrideForTests = undefined;
-		_tmuxAllowPassthroughOverrideForTests = undefined;
-	},
-};