@oh-my-pi/pi-coding-agent 14.1.2 → 14.2.1

package/src/tools/bash.ts

@@ -9,7 +9,7 @@ import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
 import type { Theme } from "../modes/theme/theme";
 import bashDescription from "../prompts/tools/bash.md" with { type: "text" };
-import { DEFAULT_MAX_BYTES, TailBuffer } from "../session/streaming-output";
+import { DEFAULT_MAX_BYTES, streamTailUpdates, TailBuffer } from "../session/streaming-output";
 import { renderStatusLine } from "../tui";
 import { CachedOutputBlock } from "../tui/output-block";
 import { getSixelLineMask } from "../utils/sixel";
@@ -23,7 +23,7 @@ import { resolveToCwd } from "./path-utils";
 import { formatToolWorkingDirectory, replaceTabs } from "./render-utils";
 import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
-import { clampTimeout } from "./tool-timeouts";
+import { clampTimeout, TOOL_TIMEOUTS } from "./tool-timeouts";
 
 export const BASH_DEFAULT_PREVIEW_LINES = 10;
 
@@ -38,7 +38,7 @@ const bashSchemaBase = Type.Object({
 				"Additional environment variables passed to the command and rendered inline as shell assignments; prefer this for multiline or quote-heavy content",
 		}),
 	),
-	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (default: 300)" })),
+	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds", default: 300 })),
 	cwd: Type.Optional(Type.String({ description: "Working directory (default: cwd)" })),
 	head: Type.Optional(Type.Number({ description: "Return only first N lines of output" })),
 	tail: Type.Optional(Type.Number({ description: "Return only last N lines of output" })),
@@ -74,6 +74,7 @@ export interface BashToolInput {
 export interface BashToolDetails {
 	meta?: OutputMeta;
 	timeoutSeconds?: number;
+	requestedTimeoutSeconds?: number;
 	async?: {
 		state: "running" | "completed" | "failed";
 		jobId: string;
@@ -219,6 +220,13 @@ function getBashEnvForDisplay(args: BashRenderArgs): Record<string, string> | un
 	if (partialEnv && args.env) return { ...partialEnv, ...args.env };
 	return args.env ?? partialEnv;
 }
+
+function formatTimeoutClampNotice(requestedTimeoutSec: number, effectiveTimeoutSec: number): string | undefined {
+	return requestedTimeoutSec !== effectiveTimeoutSec
+		? `Timeout clamped to ${effectiveTimeoutSec}s (requested ${requestedTimeoutSec}s; allowed range ${TOOL_TIMEOUTS.bash.min}-${TOOL_TIMEOUTS.bash.max}s).`
+		: undefined;
+}
+
 /**
  * Bash tool implementation.
  *
@@ -289,9 +297,16 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		timeoutSec: number,
 		headLines?: number,
 		tailLines?: number,
+		options: { requestedTimeoutSec?: number; notices?: string[] } = {},
 	): AgentToolResult<BashToolDetails> {
-		const outputText = this.#formatResultOutput(result, headLines, tailLines);
+		const outputLines = [this.#formatResultOutput(result, headLines, tailLines)];
+		const notices = options.notices?.filter(Boolean) ?? [];
+		if (notices.length > 0) outputLines.push("", ...notices);
+		const outputText = outputLines.join("\n");
 		const details: BashToolDetails = { timeoutSeconds: timeoutSec };
+		if (options.requestedTimeoutSec !== undefined && options.requestedTimeoutSec !== timeoutSec) {
+			details.requestedTimeoutSeconds = options.requestedTimeoutSec;
+		}
 		const resultBuilder = toolResult(details).text(outputText).truncationFromSummary(result, { direction: "tail" });
 		this.#buildResultText(result, timeoutSec, outputText);
 		return resultBuilder.done();
@@ -302,16 +317,23 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		label: string,
 		previewText: string,
 		timeoutSec: number,
+		options: { requestedTimeoutSec?: number; notices?: string[] } = {},
 	): AgentToolResult<BashToolDetails> {
 		const details: BashToolDetails = {
 			timeoutSeconds: timeoutSec,
 			async: { state: "running", jobId, type: "bash" },
 		};
+		if (options.requestedTimeoutSec !== undefined && options.requestedTimeoutSec !== timeoutSec) {
+			details.requestedTimeoutSeconds = options.requestedTimeoutSec;
+		}
 		const lines: string[] = [];
 		const trimmedPreview = previewText.trimEnd();
 		if (trimmedPreview.length > 0) {
 			lines.push(trimmedPreview, "");
 		}
+		if (options.notices?.length) {
+			lines.push(...options.notices, "");
+		}
 		lines.push(`Background job ${jobId} started: ${label}`);
 		lines.push("Result will be delivered automatically when complete.");
 		lines.push(`Use \`poll\`, \`read jobs://${jobId}\`, or \`cancel_job\` if needed.`);
@@ -330,6 +352,8 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		commandCwd: string;
 		timeoutMs: number;
 		timeoutSec: number;
+		requestedTimeoutSec?: number;
+		timeoutClampNotice?: string;
 		headLines?: number;
 		tailLines?: number;
 		resolvedEnv?: Record<string, string>;
@@ -372,6 +396,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 						options.timeoutSec,
 						options.headLines,
 						options.tailLines,
+						{
+							requestedTimeoutSec: options.requestedTimeoutSec,
+							notices: [options.timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
+						},
 					);
 					const finalText = this.#extractTextResult(finalResult);
 					latestText = finalText;
@@ -512,7 +540,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			: undefined;
 
 		// Resolve protocol URLs (skill://, agent://, etc.) in extracted cwd.
-		if (cwd?.includes("://")) {
+		if (cwd?.includes("://") || cwd?.includes("local:/")) {
 			cwd = await expandInternalUrls(cwd, { ...internalUrlOptions, noEscape: true });
 		}
 
@@ -531,8 +559,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		}
 
 		// Clamp to reasonable range: 1s - 3600s (1 hour)
-		const timeoutSec = clampTimeout("bash", rawTimeout);
+		const requestedTimeoutSec = rawTimeout;
+		const timeoutSec = clampTimeout("bash", requestedTimeoutSec);
 		const timeoutMs = timeoutSec * 1000;
+		const timeoutClampNotice = formatTimeoutClampNotice(requestedTimeoutSec, timeoutSec);
 
 		if (asyncRequested) {
 			if (!this.session.asyncJobManager) {
@@ -543,13 +573,18 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				commandCwd,
 				timeoutMs,
 				timeoutSec,
+				requestedTimeoutSec,
+				timeoutClampNotice,
 				headLines,
 				tailLines,
 				resolvedEnv,
 				onUpdate,
 				startBackgrounded: true,
 			});
-			return this.#buildBackgroundStartResult(job.jobId, job.label, "", timeoutSec);
+			return this.#buildBackgroundStartResult(job.jobId, job.label, "", timeoutSec, {
+				requestedTimeoutSec,
+				notices: [timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
+			});
 		}
 
 		if (this.#autoBackgroundEnabled && !pty && this.session.asyncJobManager) {
@@ -560,6 +595,8 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				commandCwd,
 				timeoutMs,
 				timeoutSec,
+				requestedTimeoutSec,
+				timeoutClampNotice,
 				headLines,
 				tailLines,
 				resolvedEnv,
@@ -567,7 +604,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				startBackgrounded,
 			});
 			if (startBackgrounded) {
-				return this.#buildBackgroundStartResult(job.jobId, job.label, "", timeoutSec);
+				return this.#buildBackgroundStartResult(job.jobId, job.label, "", timeoutSec, {
+					requestedTimeoutSec,
+					notices: [timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
+				});
 			}
 			const waitResult = await this.#waitForManagedBashJob(job, autoBackgroundWaitMs, signal);
 			if (waitResult.kind === "completed") {
@@ -584,7 +624,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				throw new ToolAbortError(job.getLatestText() || "Command aborted");
 			}
 			job.setBackgrounded(true);
-			return this.#buildBackgroundStartResult(job.jobId, job.label, job.getLatestText(), timeoutSec);
+			return this.#buildBackgroundStartResult(job.jobId, job.label, job.getLatestText(), timeoutSec, {
+				requestedTimeoutSec,
+				notices: [timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
+			});
 		}
 
 		// Track output for streaming updates (tail only)
@@ -612,15 +655,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 					env: resolvedEnv,
 					artifactPath,
 					artifactId,
-					onChunk: chunk => {
-						tailBuffer.append(chunk);
-						if (onUpdate) {
-							onUpdate({
-								content: [{ type: "text", text: tailBuffer.text() }],
-								details: {},
-							});
-						}
-					},
+					onChunk: streamTailUpdates(tailBuffer, onUpdate),
 				});
 		if (result.cancelled) {
 			if (signal?.aborted) {
@@ -631,7 +666,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		if (isInteractiveResult(result) && result.timedOut) {
 			throw new ToolError(normalizeResultOutput(result) || `Command timed out after ${timeoutSec} seconds`);
 		}
-		return this.#buildCompletedResult(result, timeoutSec, headLines, tailLines);
+		return this.#buildCompletedResult(result, timeoutSec, headLines, tailLines, {
+			requestedTimeoutSec,
+			notices: [timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
+		});
 	}
 }
 
@@ -708,12 +746,16 @@ export const bashToolRenderer = {
 
 				// Build truncation warning
 				const timeoutSeconds = details?.timeoutSeconds ?? renderContext?.timeout;
-				const timeoutLine =
+				const requestedTimeoutSeconds = details?.requestedTimeoutSeconds;
+				const timeoutLabel =
 					typeof timeoutSeconds === "number"
-						? uiTheme.fg(
-								"dim",
-								`${uiTheme.format.bracketLeft}Timeout: ${timeoutSeconds}s${uiTheme.format.bracketRight}`,
-							)
+						? requestedTimeoutSeconds !== undefined && requestedTimeoutSeconds !== timeoutSeconds
+							? `Timeout: ${timeoutSeconds}s (requested ${requestedTimeoutSeconds}s clamped)`
+							: `Timeout: ${timeoutSeconds}s`
+						: undefined;
+				const timeoutLine =
+					timeoutLabel !== undefined
+						? uiTheme.fg("dim", `${uiTheme.format.bracketLeft}${timeoutLabel}${uiTheme.format.bracketRight}`)
 						: undefined;
 				let warningLine: string | undefined;
 				if (details?.meta?.truncation && !showingFullOutput) {

package/src/tools/browser.ts

@@ -411,7 +411,7 @@ const browserSchema = Type.Object({
 	value: Type.Optional(Type.String({ description: "Value to set (fill)" })),
 	attribute: Type.Optional(Type.String({ description: "Attribute name to read (get_attribute)" })),
 	key: Type.Optional(Type.String({ description: "Keyboard key to press (press)" })),
-	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (default: 30)" })),
+	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds", default: 30 })),
 	wait_until: Type.Optional(
 		StringEnum(["load", "domcontentloaded", "networkidle0", "networkidle2"], {
 			description: "Navigation wait condition (goto)",

package/src/tools/fetch.ts

@@ -18,7 +18,7 @@ import { ensureTool } from "../utils/tools-manager";
 import { extractWithParallel, findParallelApiKey, getParallelExtractContent } from "../web/parallel";
 import { specialHandlers } from "../web/scrapers";
 import type { RenderResult } from "../web/scrapers/types";
-import { finalizeOutput, loadPage, MAX_OUTPUT_CHARS } from "../web/scrapers/types";
+import { finalizeOutput, loadPage, looksLikeHtml, MAX_OUTPUT_CHARS } from "../web/scrapers/types";
 import { convertWithMarkit, fetchBinary } from "../web/scrapers/utils";
 import { applyListLimit } from "./list-limit";
 import { formatStyledArtifactReference, type OutputMeta } from "./output-meta";
@@ -253,19 +253,6 @@ function isInlineImageMimeTypeSupported(mimeType: string): boolean {
 	return SUPPORTED_INLINE_IMAGE_MIME_TYPES.has(mimeType);
 }
 
-/**
- * Check if content looks like HTML
- */
-function looksLikeHtml(content: string): boolean {
-	const trimmed = content.trim().toLowerCase();
-	return (
-		trimmed.startsWith("<!doctype") ||
-		trimmed.startsWith("<html") ||
-		trimmed.startsWith("<head") ||
-		trimmed.startsWith("<body")
-	);
-}
-
 /**
  * Try fetching URL with .md appended (llms.txt convention)
  */

package/src/tools/file-recorder.ts

@@ -0,0 +1,35 @@
+import * as path from "node:path";
+
+/**
+ * Creates a deduplicating recorder for relative file paths.
+ * Preserves insertion order in `list`; subsequent duplicates are ignored.
+ */
+export function createFileRecorder(): {
+	record: (relativePath: string) => void;
+	list: string[];
+} {
+	const seen = new Set<string>();
+	const list: string[] = [];
+	return {
+		record(relativePath: string) {
+			if (!seen.has(relativePath)) {
+				seen.add(relativePath);
+				list.push(relativePath);
+			}
+		},
+		list,
+	};
+}
+
+/**
+ * Strip a leading slash and, when the search scope is a directory, normalize
+ * Windows-style separators. For single-file scopes, fall back to the basename
+ * so tool output does not leak absolute paths.
+ */
+export function formatResultPath(filePath: string, isDirectory: boolean): string {
+	const cleanPath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
+	if (isDirectory) {
+		return cleanPath.replace(/\\/g, "/");
+	}
+	return path.basename(cleanPath);
+}

package/src/tools/find.ts

@@ -29,9 +29,12 @@ import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
 
 const findSchema = Type.Object({
-	pattern: Type.String({ description: "Glob pattern, e.g. '*.ts', 'src/**/*.json', 'lib/*.tsx'" }),
-	hidden: Type.Optional(Type.Boolean({ description: "Include hidden files and directories (default: true)" })),
-	limit: Type.Optional(Type.Number({ description: "Max results (default: 1000)" })),
+	pattern: Type.String({
+		description:
+			"Glob pattern including the search path (no separate path param), e.g. 'src/**/*.ts', 'lib/*.json'. Supports comma-separated lists like 'apps/,packages/,phases/'. Simple patterns like '*.ts' recurse from cwd.",
+	}),
+	hidden: Type.Optional(Type.Boolean({ description: "Include hidden files and directories", default: true })),
+	limit: Type.Optional(Type.Number({ description: "Max results", default: 1000 })),
 });
 
 export type FindToolInput = Static<typeof findSchema>;
@@ -126,6 +129,19 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 			const includeHidden = hidden ?? true;
 			const timeoutSignal = AbortSignal.timeout(GLOB_TIMEOUT_MS);
 			const combinedSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+			const formatMatchPath = (matchPath: string, fileType?: natives.FileType): string => {
+				const hadTrailingSlash = matchPath.endsWith("/") || matchPath.endsWith("\\");
+				const absolutePath = path.isAbsolute(matchPath) ? matchPath : path.resolve(searchPath, matchPath);
+				let relativePath = path.relative(this.session.cwd, absolutePath).replace(/\\/g, "/");
+				if (relativePath.length === 0) {
+					relativePath = ".";
+				}
+				if ((fileType === natives.FileType.Dir || hadTrailingSlash) && !relativePath.endsWith("/")) {
+					relativePath += "/";
+				}
+				return relativePath;
+			};
+
 			const buildResult = (files: string[]): AgentToolResult<FindToolDetails> => {
 				if (files.length === 0) {
 					const details: FindToolDetails = { scopePath, fileCount: 0, files: [], truncated: false };
@@ -173,12 +189,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 					ignore: ["**/node_modules/**", "**/.git/**"],
 					limit: effectiveLimit,
 				});
-				const relativized = results.map(p => {
-					if (p.startsWith(searchPath)) {
-						return p.slice(searchPath.length + 1);
-					}
-					return path.relative(searchPath, p);
-				});
+				const relativized = results.map(p => formatMatchPath(p));
 
 				return buildResult(relativized);
 			}
@@ -222,12 +233,8 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 			};
 			const onMatch = onUpdate
 				? (err: Error | null, match: natives.GlobMatch | null) => {
-						if (err || signal?.aborted || !match) return;
-						let relativePath = match.path;
-						if (!relativePath) return;
-						if (match.fileType === natives.FileType.Dir && !relativePath.endsWith("/")) {
-							relativePath += "/";
-						}
+						if (err || signal?.aborted || !match?.path) return;
+						const relativePath = formatMatchPath(match.path, match.fileType);
 						onUpdateMatches.push(relativePath);
 						emitUpdate();
 					}
@@ -251,10 +258,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 				);
 
 			try {
-				let result = await doGlob(true);
-				if (result.matches.length === 0 && !timeoutSignal.aborted) {
-					result = await doGlob(false);
-				}
+				const result = await doGlob(true);
 				// Sort by mtime descending (most recent first) in JS instead of native.
 				// This allows native glob to early-terminate at maxResults.
 				result.matches.sort((a, b) => (b.mtime ?? 0) - (a.mtime ?? 0));
@@ -273,19 +277,11 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 			const relativized: string[] = [];
 			for (const match of matches) {
 				throwIfAborted(signal);
-				const line = match.path;
-				if (!line) {
+				if (!match.path) {
 					continue;
 				}
 
-				const hadTrailingSlash = line.endsWith("/") || line.endsWith("\\");
-				let relativePath = line;
-				const isDirectory = match.fileType === natives.FileType.Dir;
-				if ((isDirectory || hadTrailingSlash) && !relativePath.endsWith("/")) {
-					relativePath += "/";
-				}
-
-				relativized.push(relativePath);
+				relativized.push(formatMatchPath(match.path, match.fileType));
 			}
 
 			return buildResult(relativized);

package/src/tools/gh-format.ts

@@ -0,0 +1,12 @@
+/**
+ * Return the first 12 hex characters of a commit SHA, or undefined when the
+ * input is missing. Shared between GitHub tool argument normalization and the
+ * run-watch renderer.
+ */
+export function formatShortSha(value: string | undefined): string | undefined {
+	if (!value) {
+		return undefined;
+	}
+
+	return value.slice(0, 12);
+}

package/src/tools/gh-renderer.ts

@@ -9,6 +9,7 @@ import type {
 	GhRunWatchViewDetails,
 	GhToolDetails,
 } from "./gh";
+import { formatShortSha } from "./gh-format";
 import {
 	formatExpandHint,
 	formatStatusIcon,
@@ -29,14 +30,6 @@ const RUNNING_STATUSES = new Set(["in_progress"]);
 const PENDING_STATUSES = new Set(["queued", "requested", "waiting", "pending"]);
 const FALLBACK_WIDTH = 80;
 
-function formatShortSha(value: string | undefined): string | undefined {
-	if (!value) {
-		return undefined;
-	}
-
-	return value.slice(0, 12);
-}
-
 function getWatchHeader(watch: GhRunWatchViewDetails): string {
 	if (watch.mode === "run" && watch.run) {
 		if (watch.state === "watching") {

package/src/tools/gh.ts

@@ -14,6 +14,7 @@ import ghSearchIssuesDescription from "../prompts/tools/gh-search-issues.md" wit
 import ghSearchPrsDescription from "../prompts/tools/gh-search-prs.md" with { type: "text" };
 import * as git from "../utils/git";
 import type { ToolSession } from ".";
+import { formatShortSha } from "./gh-format";
 import type { OutputMeta } from "./output-meta";
 import { ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
@@ -148,7 +149,7 @@ const ghIssueViewSchema = Type.Object({
 	repo: Type.Optional(
 		Type.String({ description: "Repository in OWNER/REPO format. Omit when passing a full issue URL." }),
 	),
-	comments: Type.Optional(Type.Boolean({ description: "Include issue comments (default: true)." })),
+	comments: Type.Optional(Type.Boolean({ description: "Include issue comments.", default: true })),
 });
 
 const ghPrViewSchema = Type.Object({
@@ -161,7 +162,7 @@ const ghPrViewSchema = Type.Object({
 	repo: Type.Optional(
 		Type.String({ description: "Repository in OWNER/REPO format. Omit when passing a full pull request URL." }),
 	),
-	comments: Type.Optional(Type.Boolean({ description: "Include pull request comments (default: true)." })),
+	comments: Type.Optional(Type.Boolean({ description: "Include pull request comments.", default: true })),
 });
 
 const ghPrDiffSchema = Type.Object({
@@ -217,13 +218,13 @@ const ghPrPushSchema = Type.Object({
 const ghSearchIssuesSchema = Type.Object({
 	query: Type.String({ description: "GitHub issue search query. Supports GitHub search syntax." }),
 	repo: Type.Optional(Type.String({ description: "Repository in OWNER/REPO format to scope the search." })),
-	limit: Type.Optional(Type.Number({ description: "Maximum results to return (default: 10, max: 50)." })),
+	limit: Type.Optional(Type.Number({ description: "Maximum results to return (max: 50).", default: 10 })),
 });
 
 const ghSearchPrsSchema = Type.Object({
 	query: Type.String({ description: "GitHub pull request search query. Supports GitHub search syntax." }),
 	repo: Type.Optional(Type.String({ description: "Repository in OWNER/REPO format to scope the search." })),
-	limit: Type.Optional(Type.Number({ description: "Maximum results to return (default: 10, max: 50)." })),
+	limit: Type.Optional(Type.Number({ description: "Maximum results to return (max: 50).", default: 10 })),
 });
 
 const ghRunWatchSchema = Type.Object({
@@ -239,7 +240,7 @@ const ghRunWatchSchema = Type.Object({
 		}),
 	),
 	tail: Type.Optional(
-		Type.Number({ description: "Number of log lines to include per failed job (default: 15, max: 200)." }),
+		Type.Number({ description: "Number of log lines to include per failed job (max: 200).", default: 15 }),
 	),
 });
 
@@ -545,14 +546,6 @@ function normalizeOptionalString(value: string | null | undefined): string | und
 	return normalized ? normalized : undefined;
 }
 
-function formatShortSha(value: string | undefined): string | undefined {
-	if (!value) {
-		return undefined;
-	}
-
-	return value.slice(0, 12);
-}
-
 function requireNonEmpty(value: string | null | undefined, label: string): string {
 	const normalized = normalizeOptionalString(value);
 	if (!normalized) {