@oh-my-pi/pi-coding-agent 13.1.2 → 13.2.1

package/src/ssh/sshfs-mount.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { getRemoteDir } from "@oh-my-pi/pi-utils/dirs";
+import { getRemoteDir, postmortem } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { getControlDir, getControlPathTemplate, type SSHConnectionTarget } from "./connection-manager";
 import { buildSshTarget, sanitizeHostName } from "./utils";
@@ -83,6 +83,8 @@ export async function isMounted(path: string): Promise<boolean> {
 	return result.exitCode === 0;
 }
 
+let registered = false;
+
 export async function mountRemote(host: SSHConnectionTarget, remotePath = "/"): Promise<string | undefined> {
 	if (!hasSshfs()) return undefined;
 
@@ -90,6 +92,10 @@ export async function mountRemote(host: SSHConnectionTarget, remotePath = "/"):
 	await Promise.all([ensureDir(REMOTE_DIR), ensureDir(CONTROL_DIR), ensureDir(mountPath)]);
 
 	if (await isMounted(mountPath)) {
+		if (!registered) {
+			registered = true;
+			postmortem.register("sshfs-cleanup", unmountAll);
+		}
 		mountedPaths.add(mountPath);
 		return mountPath;
 	}

package/src/system-prompt.ts

@@ -5,8 +5,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { $env, hasFsCode, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getGpuCachePath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { $env, getGpuCachePath, getProjectDir, hasFsCode, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";
 import { systemPromptCapability } from "./capability/system-prompt";
@@ -16,7 +15,6 @@ import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile
 import { loadSkills, type Skill } from "./extensibility/skills";
 import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
-import type { ToolName } from "./tools";
 
 type PreloadedSkill = { name: string; content: string };
 
@@ -206,65 +204,6 @@ function getTerminalName(): string | undefined {
 	return term ?? undefined;
 }
 
-function normalizeDesktopValue(value: string): string | undefined {
-	const trimmed = value.trim();
-	if (!trimmed) return undefined;
-	const parts = trimmed
-		.split(":")
-		.map(part => part.trim())
-		.filter(Boolean);
-	return parts[0] ?? trimmed;
-}
-
-function getDesktopEnvironment(): string | undefined {
-	if (Bun.env.KDE_FULL_SESSION === "true") return "KDE";
-	const raw = firstNonEmpty(
-		Bun.env.XDG_CURRENT_DESKTOP,
-		Bun.env.DESKTOP_SESSION,
-		Bun.env.XDG_SESSION_DESKTOP,
-		Bun.env.GDMSESSION,
-	);
-	return raw ? normalizeDesktopValue(raw) : undefined;
-}
-
-function matchKnownWindowManager(value: string): string | null {
-	const normalized = value.toLowerCase();
-	const candidates = [
-		"sway",
-		"i3",
-		"i3wm",
-		"bspwm",
-		"openbox",
-		"awesome",
-		"herbstluftwm",
-		"fluxbox",
-		"icewm",
-		"dwm",
-		"hyprland",
-		"wayfire",
-		"river",
-		"labwc",
-		"qtile",
-	];
-	for (const candidate of candidates) {
-		if (normalized.includes(candidate)) return candidate;
-	}
-	return null;
-}
-
-function getWindowManager(): string | undefined {
-	const explicit = firstNonEmpty(Bun.env.WINDOWMANAGER);
-	if (explicit) return explicit;
-
-	const desktop = firstNonEmpty(Bun.env.XDG_CURRENT_DESKTOP, Bun.env.DESKTOP_SESSION);
-	if (desktop) {
-		const matched = matchKnownWindowManager(desktop);
-		if (matched) return matched;
-	}
-
-	return undefined;
-}
-
 /** Cached system info structure */
 interface GpuCache {
 	gpu: string;
@@ -308,13 +247,11 @@ async function getEnvironmentInfo(): Promise<Array<{ label: string; value: strin
 		{ label: "Distro", value: os.type() },
 		{ label: "Kernel", value: os.version() },
 		{ label: "Arch", value: os.arch() },
-		{ label: "CPU", value: `${cpus.length}x ${cpus[0]?.model}` },
+		{ label: "CPU", value: `${cpus[0]?.model}` },
 		{ label: "GPU", value: gpu },
 		{ label: "Terminal", value: getTerminalName() },
-		{ label: "DE", value: getDesktopEnvironment() },
-		{ label: "WM", value: getWindowManager() },
 	];
-	return entries.filter((e): e is { label: string; value: string } => e.value != null && e.value !== "unknown");
+	return entries.filter((e): e is { label: string; value: string } => !!e.value);
 }
 
 /** Resolve input as file path or literal string */
@@ -435,7 +372,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		appendSystemPrompt,
 		repeatToolDescriptions = false,
 		skillsSettings,
-		toolNames,
+		toolNames: providedToolNames,
 		cwd,
 		contextFiles: providedContextFiles,
 		skills: providedSkills,
@@ -554,25 +491,24 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		timeZoneName: "short",
 	});
 
-	// Build tool descriptions array
-	// Priority: toolNames (explicit list) > tools (Map) > defaults
+	// Build tool metadata for system prompt rendering
+	// Priority: explicit list > tools map > defaults
 	// Default includes both bash and python; actual availability determined by settings in createTools
-	const defaultToolNames: ToolName[] = ["read", "bash", "python", "edit", "write"];
-	let toolNamesArray: string[];
-	if (toolNames !== undefined) {
-		// Explicit toolNames list provided (could be empty)
-		toolNamesArray = toolNames;
-	} else if (tools !== undefined) {
-		// Tools map provided
-		toolNamesArray = Array.from(tools.keys());
-	} else {
-		// Use defaults
-		toolNamesArray = defaultToolNames;
+	let toolNames = providedToolNames;
+	if (!toolNames) {
+		if (tools) {
+			// Tools map provided
+			toolNames = Array.from(tools.keys());
+		} else {
+			// Use defaults
+			toolNames = ["read", "bash", "python", "edit", "write"]; // TODO: Why?
+		}
 	}
 
 	// Build tool descriptions for system prompt rendering
-	const toolDescriptions = toolNamesArray.map(name => ({
+	const toolInfo = toolNames.map(name => ({
 		name,
+		label: tools?.get(name)?.label ?? "",
 		description: tools?.get(name)?.description ?? "",
 	}));
 
@@ -580,29 +516,15 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const hasRead = tools?.has("read");
 	const filteredSkills = preloadedSkills === undefined && hasRead ? skills : [];
 
-	if (resolvedCustomPrompt) {
-		return renderPromptTemplate(customSystemPromptTemplate, {
-			systemPromptCustomization: systemPromptCustomization ?? "",
-			customPrompt: resolvedCustomPrompt,
-			appendPrompt: resolvedAppendPrompt ?? "",
-			contextFiles,
-			agentsMdSearch,
-			skills: filteredSkills,
-			preloadedSkills: preloadedSkillContents,
-			rules: rules ?? [],
-			date,
-			dateTime,
-			cwd: resolvedCwd,
-		});
-	}
-
 	const environment = await logger.timeAsync("getEnvironmentInfo", getEnvironmentInfo);
-	return renderPromptTemplate(systemPromptTemplate, {
-		tools: toolNamesArray,
-		toolDescriptions,
+	const data = {
+		systemPromptCustomization: systemPromptCustomization ?? "",
+		customPrompt: resolvedCustomPrompt,
+		appendPrompt: resolvedAppendPrompt ?? "",
+		tools: toolNames,
+		toolInfo,
 		repeatToolDescriptions,
 		environment,
-		systemPromptCustomization: systemPromptCustomization ?? "",
 		contextFiles,
 		agentsMdSearch,
 		skills: filteredSkills,
@@ -611,8 +533,8 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		date,
 		dateTime,
 		cwd: resolvedCwd,
-		appendSystemPrompt: resolvedAppendPrompt ?? "",
 		intentTracing: !!intentField,
 		intentField: intentField ?? "",
-	});
+	};
+	return renderPromptTemplate(resolvedCustomPrompt ? customSystemPromptTemplate : systemPromptTemplate, data);
 }

package/src/task/agents.ts

@@ -108,7 +108,7 @@ export function parseAgent(
 	});
 	const fields = parseAgentFields(frontmatter);
 	if (!fields) {
-		throw new AgentParsingError(new Error("Invalid agent fields"), filePath);
+		throw new AgentParsingError(new Error(`Invalid agent field: ${filePath}\n${content}`), filePath);
 	}
 	return {
 		...fields,

package/src/task/worktree.ts

@@ -1,8 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import path from "node:path";
-import { isEnoent, Snowflake } from "@oh-my-pi/pi-utils";
-import { getWorktreeDir } from "@oh-my-pi/pi-utils/dirs";
+import { getWorktreeDir, isEnoent, Snowflake } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 
 export interface WorktreeBaseline {

package/src/tools/ask.ts

@@ -59,7 +59,6 @@ export interface QuestionResult {
 }
 
 export interface AskToolDetails {
-	/** Single question mode (backwards compatible) */
 	question?: string;
 	options?: string[];
 	multi?: boolean;

package/src/tools/await-tool.ts

@@ -79,7 +79,7 @@ export class AwaitTool implements AgentTool<typeof awaitSchema, AwaitToolDetails
 		// If all watched jobs are already done, return immediately
 		const runningJobs = jobsToWatch.filter(j => j.status === "running");
 		if (runningJobs.length === 0) {
-			return this.#buildResult(jobsToWatch);
+			return this.#buildResult(manager, jobsToWatch);
 		}
 
 		// Block until at least one running job finishes or the call is aborted
@@ -100,13 +100,14 @@ export class AwaitTool implements AgentTool<typeof awaitSchema, AwaitToolDetails
 		}
 
 		if (signal?.aborted) {
-			return this.#buildResult(jobsToWatch);
+			return this.#buildResult(manager, jobsToWatch);
 		}
 
-		return this.#buildResult(jobsToWatch);
+		return this.#buildResult(manager, jobsToWatch);
 	}
 
 	#buildResult(
+		manager: NonNullable<ToolSession["asyncJobManager"]>,
 		jobs: {
 			id: string;
 			type: "bash" | "task";
@@ -128,6 +129,8 @@ export class AwaitTool implements AgentTool<typeof awaitSchema, AwaitToolDetails
 			...(j.errorText ? { errorText: j.errorText } : {}),
 		}));
 
+		manager.acknowledgeDeliveries(jobResults.filter(j => j.status !== "running").map(j => j.id));
+
 		const completed = jobResults.filter(j => j.status !== "running");
 		const running = jobResults.filter(j => j.status === "running");
 

package/src/tools/bash-interactive.ts

@@ -11,6 +11,7 @@ import {
 } from "@oh-my-pi/pi-tui";
 import type { Terminal as XtermTerminalType } from "@xterm/headless";
 import xterm from "@xterm/headless";
+import { NON_INTERACTIVE_ENV } from "../exec/non-interactive-env";
 import type { Theme } from "../modes/theme/theme";
 import { OutputSink, type OutputSummary } from "../session/streaming-output";
 import { formatStatusIcon, replaceTabs } from "./render-utils";
@@ -275,50 +276,6 @@ class BashInteractiveOverlayComponent implements Component {
 	}
 }
 
-export const NO_PAGER_ENV = {
-	// Disable pagers so commands don't block on interactive views.
-	PAGER: "cat",
-	GIT_PAGER: "cat",
-	MANPAGER: "cat",
-	SYSTEMD_PAGER: "cat",
-	BAT_PAGER: "cat",
-	DELTA_PAGER: "cat",
-	GH_PAGER: "cat",
-	GLAB_PAGER: "cat",
-	PSQL_PAGER: "cat",
-	MYSQL_PAGER: "cat",
-	AWS_PAGER: "",
-	HOMEBREW_PAGER: "cat",
-	LESS: "FRX",
-	// Disable editor and terminal credential prompts.
-	GIT_EDITOR: "true",
-	VISUAL: "true",
-	EDITOR: "true",
-	GIT_TERMINAL_PROMPT: "0",
-	SSH_ASKPASS: "/usr/bin/false",
-	CI: "1",
-	// Package manager defaults for unattended execution.
-	npm_config_yes: "true",
-	npm_config_update_notifier: "false",
-	npm_config_fund: "false",
-	npm_config_audit: "false",
-	npm_config_progress: "false",
-	PNPM_DISABLE_SELF_UPDATE_CHECK: "true",
-	PNPM_UPDATE_NOTIFIER: "false",
-	YARN_ENABLE_TELEMETRY: "0",
-	YARN_ENABLE_PROGRESS_BARS: "0",
-	// Cross-language/tooling non-interactive defaults.
-	CARGO_TERM_PROGRESS_WHEN: "never",
-	DEBIAN_FRONTEND: "noninteractive",
-	PIP_NO_INPUT: "1",
-	PIP_DISABLE_PIP_VERSION_CHECK: "1",
-	TF_INPUT: "0",
-	TF_IN_AUTOMATION: "1",
-	GH_PROMPT_DISABLED: "1",
-	COMPOSER_NO_INTERACTION: "1",
-	CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-};
-
 export async function runInteractiveBashPty(
 	ui: NonNullable<AgentToolContext["ui"]>,
 	options: {
@@ -388,8 +345,8 @@ export async function runInteractiveBashPty(
 						cwd: options.cwd,
 						timeoutMs: options.timeoutMs,
 						env: {
+							...NON_INTERACTIVE_ENV,
 							...options.env,
-							...NO_PAGER_ENV,
 						},
 						signal: options.signal,
 						cols,

package/src/tools/bash.ts

@@ -3,11 +3,11 @@ import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { $env, isEnoent } from "@oh-my-pi/pi-utils";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { $env, getProjectDir, isEnoent } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import { type BashResult, executeBash } from "../exec/bash-executor";
+import { NON_INTERACTIVE_ENV } from "../exec/non-interactive-env";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
 import type { Theme } from "../modes/theme/theme";
@@ -16,7 +16,7 @@ import { DEFAULT_MAX_BYTES, TailBuffer } from "../session/streaming-output";
 import { renderStatusLine } from "../tui";
 import { CachedOutputBlock } from "../tui/output-block";
 import type { ToolSession } from ".";
-import { type BashInteractiveResult, NO_PAGER_ENV, runInteractiveBashPty } from "./bash-interactive";
+import { type BashInteractiveResult, runInteractiveBashPty } from "./bash-interactive";
 import { checkBashInterception } from "./bash-interceptor";
 import { applyHeadTail } from "./bash-normalize";
 import { expandInternalUrls, type InternalUrlExpansionOptions } from "./bash-skill-urls";
@@ -222,7 +222,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 							sessionKey: `${this.session.getSessionId?.() ?? ""}:async:${jobId}`,
 							timeout: timeoutMs,
 							signal: runSignal,
-							env: NO_PAGER_ENV,
+							env: NON_INTERACTIVE_ENV,
 							artifactPath,
 							artifactId,
 							onChunk: chunk => {
@@ -273,7 +273,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 					sessionKey: this.session.getSessionId?.() ?? undefined,
 					timeout: timeoutMs,
 					signal,
-					env: NO_PAGER_ENV,
+					env: NON_INTERACTIVE_ENV,
 					artifactPath,
 					artifactId,
 					onChunk: chunk => {

package/src/tools/browser.ts

@@ -3,8 +3,7 @@ import * as path from "node:path";
 import { Readability } from "@mozilla/readability";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import { logger, Snowflake, untilAborted } from "@oh-my-pi/pi-utils";
-import { getPuppeteerDir } from "@oh-my-pi/pi-utils/dirs";
+import { getPuppeteerDir, logger, Snowflake, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { type HTMLElement, parseHTML } from "linkedom";
 import type {

package/src/tools/gemini-image.ts

@@ -13,8 +13,8 @@ import { resolveReadPath } from "./path-utils";
 const DEFAULT_MODEL = "gemini-3-pro-image-preview";
 const DEFAULT_OPENROUTER_MODEL = "google/gemini-3-pro-image-preview";
 const DEFAULT_ANTIGRAVITY_MODEL = "gemini-3-pro-image";
-const DEFAULT_TIMEOUT_SECONDS = 120;
-const MAX_IMAGE_SIZE = 20 * 1024 * 1024;
+const IMAGE_TIMEOUT = 3 * 60 * 1000; // 3 minutes
+const MAX_IMAGE_SIZE = 35 * 1024 * 1024;
 
 const ANTIGRAVITY_ENDPOINT = "https://daily-cloudcode-pa.sandbox.googleapis.com";
 const IMAGE_SYSTEM_INSTRUCTION =
@@ -76,13 +76,7 @@ const baseImageSchema = Type.Object(
 		style: Type.Optional(
 			Type.String({
 				description:
-					"Artistic style, mood, color grading (e.g., 'film noir mood, cinematic color grading', 'Studio Ghibli watercolor', 'photorealistic').",
-			}),
-		),
-		camera: Type.Optional(
-			Type.String({
-				description:
-					"Lens and camera specs (e.g., 'Shot on 35mm, f/1.8', 'macro lens, extreme close-up', '85mm portrait lens').",
+					"Artistic style, mood, color grading, camera (e.g., 'film noir mood, cinematic color grading', 'Studio Ghibli watercolor', 'photorealistic').",
 			}),
 		),
 		text: Type.Optional(
@@ -94,23 +88,16 @@ const baseImageSchema = Type.Object(
 		changes: Type.Optional(
 			Type.Array(Type.String(), {
 				description:
-					"For edits: specific changes to make (e.g., ['Change the tie to green', 'Remove the car in background']). Use with input_images.",
-			}),
-		),
-		preserve: Type.Optional(
-			Type.String({
-				description:
-					"For edits: what to keep unchanged (e.g., 'identity, face, hairstyle, lighting'). Use with input_images and changes.",
+					"For edits: specific changes to make, as well as, what to keep unchanged (e.g., ['Change the tie to green', 'Remove the car in background']). Use with input_images.",
 			}),
 		),
 		aspect_ratio: Type.Optional(aspectRatioSchema),
 		image_size: Type.Optional(imageSizeSchema),
-		input_images: Type.Optional(
+		input: Type.Optional(
 			Type.Array(inputImageSchema, {
 				description: "Optional input images for edits or variations.",
 			}),
 		),
-		timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (default: 120)" })),
 	},
 	{ additionalProperties: false },
 );
@@ -136,7 +123,6 @@ function assemblePrompt(params: GeminiImageParams): string {
 	// Technical details as separate sentences
 	if (params.composition) parts.push(params.composition);
 	if (params.lighting) parts.push(params.lighting);
-	if (params.camera) parts.push(params.camera);
 	if (params.style) parts.push(params.style);
 
 	// Join with periods for sentence structure
@@ -150,9 +136,6 @@ function assemblePrompt(params: GeminiImageParams): string {
 	// Edit mode: changes and preserve directives
 	if (params.changes?.length) {
 		prompt += `\n\nChanges:\n${params.changes.map(c => `- ${c}`).join("\n")}`;
-		if (params.preserve) {
-			prompt += `\n\nPreserve: ${params.preserve}`;
-		}
 	}
 
 	return prompt;
@@ -638,16 +621,13 @@ export const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageTo
 			const cwd = ctx.sessionManager.getCwd();
 
 			const resolvedImages: InlineImageData[] = [];
-			if (params.input_images?.length) {
-				for (const input of params.input_images) {
+			if (params.input?.length) {
+				for (const input of params.input) {
 					resolvedImages.push(await resolveInputImage(input, cwd));
 				}
 			}
 
-			const { timeout: rawTimeout = DEFAULT_TIMEOUT_SECONDS } = params;
-			// Clamp to reasonable range: 1s - 600s (10 min)
-			const timeoutSeconds = Math.max(1, Math.min(600, rawTimeout));
-			const requestSignal = ptree.combineSignals(signal, timeoutSeconds * 1000);
+			const requestSignal = ptree.combineSignals(signal, IMAGE_TIMEOUT);
 
 			if (provider === "antigravity") {
 				if (!apiKey.projectId) {

package/src/tools/json-tree.ts

@@ -1,6 +1,7 @@
 /**
  * JSON tree rendering utilities shared across tool renderers.
  */
+import { INTENT_FIELD } from "@oh-my-pi/pi-agent-core";
 import type { Theme } from "../modes/theme/theme";
 import { truncateToWidth } from "./render-utils";
 
@@ -13,7 +14,7 @@ export const JSON_TREE_SCALAR_LEN_COLLAPSED = 60;
 export const JSON_TREE_SCALAR_LEN_EXPANDED = 2000;
 
 /** Keys injected by the harness that should not be displayed to users */
-const HIDDEN_ARG_KEYS = new Set(["agent__intent"]);
+const HIDDEN_ARG_KEYS = new Set([INTENT_FIELD]);
 
 /** Strip harness-internal keys from tool args for display */
 export function stripInternalArgs(args: Record<string, unknown>): Record<string, unknown> {

package/src/tools/python.ts

@@ -4,7 +4,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Markdown, Text } from "@oh-my-pi/pi-tui";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { getProjectDir } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";

package/src/tools/read.ts

@@ -5,8 +5,7 @@ import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
 import { FileType, glob } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { ptree, untilAborted } from "@oh-my-pi/pi-utils";
-import { getRemoteDir } from "@oh-my-pi/pi-utils/dirs";
+import { getRemoteDir, ptree, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";

package/src/tools/render-utils.ts

@@ -6,11 +6,14 @@
  */
 import * as os from "node:os";
 import { type Ellipsis, truncateToWidth } from "@oh-my-pi/pi-tui";
-import { pluralize } from "@oh-my-pi/pi-utils";
+import { getIndentation, pluralize } from "@oh-my-pi/pi-utils";
 import type { Theme } from "../modes/theme/theme";
 
-export { Ellipsis, replaceTabs, truncateToWidth } from "@oh-my-pi/pi-tui";
+export { Ellipsis, truncateToWidth } from "@oh-my-pi/pi-tui";
 
+export function replaceTabs(text: string, file?: string): string {
+	return text.replaceAll("\t", getIndentation(file));
+}
 // =============================================================================
 // Standardized Display Constants
 // =============================================================================

package/src/tools/todo-write.ts

@@ -41,16 +41,18 @@ export interface TodoWriteToolDetails {
 // Schema
 // =============================================================================
 
-const StatusEnum = StringEnum(["pending", "in_progress", "completed", "abandoned"] as const);
+const StatusEnum = StringEnum(["pending", "in_progress", "completed", "abandoned"] as const, {
+	description: "Task status",
+});
 
 const InputTask = Type.Object({
-	content: Type.String(),
+	content: Type.String({ description: "Task description" }),
 	status: Type.Optional(StatusEnum),
-	notes: Type.Optional(Type.String()),
+	notes: Type.Optional(Type.String({ description: "Additional context or notes" })),
 });
 
 const InputPhase = Type.Object({
-	name: Type.String(),
+	name: Type.String({ description: "Phase name" }),
 	tasks: Type.Optional(Type.Array(InputTask)),
 });
 
@@ -63,21 +65,21 @@ const todoWriteSchema = Type.Object({
 			}),
 			Type.Object({
 				op: Type.Literal("add_phase"),
-				name: Type.String(),
+				name: Type.String({ description: "Phase name" }),
 				tasks: Type.Optional(Type.Array(InputTask)),
 			}),
 			Type.Object({
 				op: Type.Literal("add_task"),
 				phase: Type.String({ description: "Phase ID, e.g. phase-1" }),
-				content: Type.String(),
-				notes: Type.Optional(Type.String()),
+				content: Type.String({ description: "Task description" }),
+				notes: Type.Optional(Type.String({ description: "Additional context or notes" })),
 			}),
 			Type.Object({
 				op: Type.Literal("update"),
 				id: Type.String({ description: "Task ID, e.g. task-3" }),
 				status: Type.Optional(StatusEnum),
-				content: Type.Optional(Type.String()),
-				notes: Type.Optional(Type.String()),
+				content: Type.Optional(Type.String({ description: "Updated task description" })),
+				notes: Type.Optional(Type.String({ description: "Additional context or notes" })),
 			}),
 			Type.Object({
 				op: Type.Literal("remove_task"),

package/src/utils/tools-manager.ts

@@ -1,8 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { logger, ptree, TempDir } from "@oh-my-pi/pi-utils";
-import { APP_NAME, getToolsDir } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME, getToolsDir, logger, ptree, TempDir } from "@oh-my-pi/pi-utils";
 
 const TOOLS_DIR = getToolsDir();
 const TOOL_DOWNLOAD_TIMEOUT_MS = 15000;

package/src/web/scrapers/artifacthub.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface ArtifactHubMaintainer {
 	name: string;

package/src/web/scrapers/aur.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface AurPackage {
 	Name: string;

package/src/web/scrapers/biorxiv.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, loadPage, tryParseJson } from "./types";
+import { buildResult, loadPage } from "./types";
 
 interface BiorxivPaper {
 	biorxiv_doi?: string;

package/src/web/scrapers/bluesky.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatNumber, loadPage } from "./types";
 
 const API_BASE = "https://public.api.bsky.app/xrpc";
 

package/src/web/scrapers/chocolatey.ts

@@ -1,5 +1,6 @@
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import type { RenderResult, SpecialHandler } from "./types";
-import { buildResult, formatIsoDate, formatNumber, loadPage, tryParseJson } from "./types";
+import { buildResult, formatIsoDate, formatNumber, loadPage } from "./types";
 
 interface NuGetODataEntry {
 	Id: string;