@oh-my-pi/pi-coding-agent 14.9.2 → 14.9.3

package/src/session/agent-session.ts

@@ -570,6 +570,7 @@ export class AgentSession {
 	#agentId: string | undefined;
 	#agentRegistry: AgentRegistry | undefined;
 	#providerSessionId: string | undefined;
+	#isDisposed = false;
 	// Extension system
 	#extensionRunner: ExtensionRunner | undefined = undefined;
 	#turnIndex = 0;
@@ -646,23 +647,32 @@ export class AgentSession {
 	#hindsightSessionState: HindsightSessionState | undefined = undefined;
 	readonly rawSseDebugBuffer: RawSseDebugBuffer;
 
-	#startPowerAssertion(): void {
-		if (process.platform !== "darwin") {
-			return;
-		}
+	#acquirePowerAssertion(): void {
+		if (process.platform !== "darwin") return;
+		if (this.#powerAssertion) return;
+		const idle = this.settings.get("power.preventIdleSleep");
+		const system = this.settings.get("power.preventSystemSleep");
+		const user = this.settings.get("power.declareUserActive");
+		const display = this.settings.get("power.preventDisplaySleep");
+		// All four off → user opted out; do nothing.
+		if (!idle && !system && !user && !display) return;
 		try {
-			this.#powerAssertion = MacOSPowerAssertion.start({ reason: "Oh My Pi agent session" });
+			this.#powerAssertion = MacOSPowerAssertion.start({
+				reason: "Oh My Pi agent session",
+				idle,
+				system,
+				user,
+				display,
+			});
 		} catch (error) {
 			logger.warn("Failed to acquire macOS power assertion", { error: String(error) });
 		}
 	}
 
-	#stopPowerAssertion(): void {
+	#releasePowerAssertion(): void {
 		const assertion = this.#powerAssertion;
 		this.#powerAssertion = undefined;
-		if (!assertion) {
-			return;
-		}
+		if (!assertion) return;
 		try {
 			assertion.stop();
 		} catch (error) {
@@ -670,11 +680,30 @@ export class AgentSession {
 		}
 	}
 
+	#beginInFlight(): void {
+		this.#promptInFlightCount++;
+		if (this.#promptInFlightCount === 1) {
+			this.#acquirePowerAssertion();
+		}
+	}
+
+	#endInFlight(): void {
+		this.#promptInFlightCount = Math.max(0, this.#promptInFlightCount - 1);
+		if (this.#promptInFlightCount === 0) {
+			this.#releasePowerAssertion();
+		}
+	}
+
+	#resetInFlight(): void {
+		this.#promptInFlightCount = 0;
+		this.#releasePowerAssertion();
+	}
+
 	constructor(config: AgentSessionConfig) {
 		this.agent = config.agent;
 		this.sessionManager = config.sessionManager;
 		this.settings = config.settings;
-		this.#startPowerAssertion();
+		// Power assertions are taken per turn (see #beginInFlight); nothing acquired here.
 		this.#asyncJobManager = config.asyncJobManager;
 		this.#evalKernelOwnerId = config.evalKernelOwnerId ?? `agent-session:${Snowflake.next()}`;
 		this.#scopedModels = config.scopedModels ?? [];
@@ -2108,6 +2137,8 @@ export class AgentSession {
 	 * Call this when completely done with the session.
 	 */
 	async dispose(): Promise<void> {
+		this.#isDisposed = true;
+		this.#pendingBackgroundExchanges = [];
 		this.#evalExecutionDisposing = true;
 		try {
 			if (this.#extensionRunner?.hasHandlers("session_shutdown")) {
@@ -2130,7 +2161,7 @@ export class AgentSession {
 			);
 		}
 		await disposeKernelSessionsByOwner(this.#evalKernelOwnerId);
-		this.#stopPowerAssertion();
+		this.#releasePowerAssertion();
 		await this.sessionManager.close();
 		this.#closeAllProviderSessions("dispose");
 		const hindsightState = this.setHindsightSessionState(undefined);
@@ -3171,7 +3202,7 @@ export class AgentSession {
 			skipPostPromptRecoveryWait?: boolean;
 		},
 	): Promise<void> {
-		this.#promptInFlightCount++;
+		this.#beginInFlight();
 		const generation = this.#promptGeneration;
 		try {
 			// Flush any pending bash messages before the new prompt
@@ -3291,7 +3322,7 @@ export class AgentSession {
 				await this.#waitForPostPromptRecovery();
 			}
 		} finally {
-			this.#promptInFlightCount = Math.max(0, this.#promptInFlightCount - 1);
+			this.#endInFlight();
 		}
 	}
 
@@ -3877,7 +3908,7 @@ export class AgentSession {
 		// Clear prompt-in-flight state: waitForIdle resolves when the agent loop's finally
 		// block runs, but nested prompt setup/finalizers may still be unwinding. Without this,
 		// a subsequent prompt() can incorrectly observe the session as busy after an abort.
-		this.#promptInFlightCount = 0;
+		this.#resetInFlight();
 		// Safety net: if the agent loop aborted without producing an assistant
 		// message (e.g. failed before the first stream), the in-flight yield was
 		// never resolved or rejected by the normal message_end path. Reject it now
@@ -4699,7 +4730,7 @@ export class AgentSession {
 			if (handoffSignal.aborted) {
 				throw new Error("Handoff cancelled");
 			}
-			this.#promptInFlightCount++;
+			this.#beginInFlight();
 			try {
 				this.agent.setSystemPrompt(this.#baseSystemPrompt);
 				await this.#promptAgentWithIdleRetry([
@@ -4711,7 +4742,7 @@ export class AgentSession {
 					},
 				]);
 			} finally {
-				this.#promptInFlightCount = Math.max(0, this.#promptInFlightCount - 1);
+				this.#endInFlight();
 			}
 			await completionPromise;
 
@@ -6853,7 +6884,8 @@ export class AgentSession {
 		if (this.#scheduledBackgroundExchangeFlush) return;
 		this.#scheduledBackgroundExchangeFlush = true;
 		const attempt = (): void => {
-			if (this.#pendingBackgroundExchanges.length === 0) {
+			if (this.#pendingBackgroundExchanges.length === 0 || this.#isDisposed) {
+				this.#pendingBackgroundExchanges = [];
 				this.#scheduledBackgroundExchangeFlush = false;
 				return;
 			}

package/src/system-prompt.ts

@@ -12,8 +12,10 @@ import type { SkillsSettings } from "./config/settings";
 import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile } from "./discovery";
 import { loadSkills, type Skill } from "./extensibility/skills";
 import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md" with { type: "text" };
+import nowPromptTemplate from "./prompts/system/now-prompt.md" with { type: "text" };
 import projectPromptTemplate from "./prompts/system/project-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
+import { shortenPath } from "./tools/render-utils";
 import { AGENTS_MD_LIMIT, buildWorkspaceTree, type WorkspaceTree } from "./workspace-tree";
 
 interface AlwaysApplyRule {
@@ -503,7 +505,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 
 	const date = new Date().toISOString().slice(0, 10);
 	const dateTime = date;
-	const promptCwd = resolvedCwd.replace(/\\/g, "/");
+	const promptCwd = shortenPath(resolvedCwd.replace(/\\/g, "/"));
 
 	// Build tool metadata for system prompt rendering
 	// Priority: explicit list > tools map > defaults
@@ -541,7 +543,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const injectedAlwaysApplyRules = dedupeAlwaysApplyRules(alwaysApplyRules, promptSources);
 
 	const environment = await logger.time("getEnvironmentInfo", getEnvironmentInfo);
-	const reportToolIssueToolName = toolPromptNames.get("report_tool_issue") ?? "report_tool_issue";
 	const data = {
 		systemPromptCustomization: effectiveSystemPromptCustomization,
 		customPrompt: resolvedCustomPrompt,
@@ -568,18 +569,16 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		eagerTasks,
 		secretsEnabled,
 	};
-	let rendered = prompt.render(resolvedCustomPrompt ? customSystemPromptTemplate : systemPromptTemplate, data);
-
-	// When autoqa is active the report_tool_issue tool is in the tool set — nudge the agent.
-	if (toolNames.includes("report_tool_issue")) {
-		rendered += `\n\n<critical>\nThe \`${reportToolIssueToolName}\` tool is available for automated QA. If ANY tool you call returns output that is unexpected, incorrect, malformed, or otherwise inconsistent with what you anticipated given the tool's described behavior and your parameters, call \`${reportToolIssueToolName}\` with the tool name and a concise description of the discrepancy. Do not hesitate to report — false positives are acceptable.\n</critical>`;
-	}
-
+	const rendered = prompt.render(resolvedCustomPrompt ? customSystemPromptTemplate : systemPromptTemplate, data);
 	const systemPrompt = [rendered];
 	const projectPrompt = resolvedCustomPrompt ? "" : prompt.render(projectPromptTemplate, data).trim();
 	if (projectPrompt) {
 		systemPrompt.push(projectPrompt);
 	}
+	const nowPrompt = prompt.render(nowPromptTemplate, data).trim();
+	if (nowPrompt) {
+		systemPrompt.push(nowPrompt);
+	}
 
 	return { systemPrompt };
 }

package/src/task/executor.ts

@@ -139,6 +139,7 @@ export interface ExecutorOptions {
 	agent: AgentDefinition;
 	task: string;
 	assignment?: string;
+	context?: string;
 	description?: string;
 	index: number;
 	id: string;
@@ -994,17 +995,20 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				skills: options.skills,
 				promptTemplates: options.promptTemplates,
 				workspaceTree: options.workspaceTree,
-				systemPrompt: defaultPrompt => [
-					prompt.render(subagentSystemPromptTemplate, {
-						base: defaultPrompt.join("\n\n"),
+				systemPrompt: defaultPrompt => {
+					const subagentPrompt = prompt.render(subagentSystemPromptTemplate, {
 						agent: agent.systemPrompt,
+						context: options.context?.trim() ?? "",
 						worktree: worktree ?? "",
 						outputSchema: normalizedOutputSchema,
 						contextFile: options.contextFile,
 						ircPeers: ircEnabled ? renderIrcPeerRoster(id) : "",
 						ircSelfId: ircEnabled ? id : "",
-					}),
-				],
+					});
+					return defaultPrompt.length === 0
+						? [subagentPrompt]
+						: [...defaultPrompt.slice(0, -1), subagentPrompt, defaultPrompt[defaultPrompt.length - 1]];
+				},
 				sessionManager,
 				hasUI: false,
 				spawns: spawnsEnv,

package/src/task/index.ts

@@ -23,6 +23,7 @@ import type { ToolSession } from "..";
 import { resolveAgentModelPatterns } from "../config/model-resolver";
 import type { Theme } from "../modes/theme/theme";
 import planModeSubagentPrompt from "../prompts/system/plan-mode-subagent.md" with { type: "text" };
+import subagentUserPromptTemplate from "../prompts/system/subagent-user-prompt.md" with { type: "text" };
 import taskDescriptionTemplate from "../prompts/tools/task.md" with { type: "text" };
 import taskSummaryTemplate from "../prompts/tools/task-summary.md" with { type: "text" };
 import { formatBytes, formatDuration } from "../tools/render-utils";
@@ -38,7 +39,6 @@ import { AgentOutputManager } from "./output-manager";
 import { mapWithConcurrencyLimit, Semaphore } from "./parallel";
 import { renderResult, renderCall as renderTaskCall } from "./render";
 import { getTaskSimpleModeCapabilities, type TaskSimpleMode } from "./simple-mode";
-import { renderTemplate } from "./template";
 import {
 	type AgentDefinition,
 	type AgentProgress,
@@ -65,6 +65,12 @@ import {
 	type WorktreeBaseline,
 } from "./worktree";
 
+function renderSubagentUserPrompt(assignment: string, simpleMode: TaskSimpleMode): string {
+	return prompt.render(subagentUserPromptTemplate, {
+		assignment: assignment.trim(),
+		independentMode: simpleMode === "independent",
+	});
+}
 function createUsageTotals(): Usage {
 	return {
 		input: 0,
@@ -282,21 +288,19 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 		const uniqueIds = await outputManager.allocateBatch(taskItems.map(t => t.id));
 		const fallbackAgentSource =
 			this.#discoveredAgents.find(agent => agent.name === params.agent)?.source ?? "bundled";
-		const { contextEnabled } = getTaskSimpleModeCapabilities(simpleMode);
-		const sharedContext = contextEnabled ? params.context : undefined;
-		const renderedTasks = taskItems.map(taskItem => renderTemplate(sharedContext, taskItem, simpleMode));
 		const progressByTaskId = new Map<string, AgentProgress>();
-		for (let index = 0; index < renderedTasks.length; index++) {
-			const renderedTask = renderedTasks[index];
-			progressByTaskId.set(renderedTask.id, {
+		for (let index = 0; index < taskItems.length; index++) {
+			const taskItem = taskItems[index];
+			const assignment = taskItem.assignment.trim();
+			progressByTaskId.set(taskItem.id, {
 				index,
-				id: renderedTask.id,
+				id: taskItem.id,
 				agent: params.agent,
 				agentSource: fallbackAgentSource,
 				status: "pending",
-				task: renderedTask.task,
-				assignment: renderedTask.assignment,
-				description: renderedTask.description,
+				task: renderSubagentUserPrompt(assignment, simpleMode),
+				assignment,
+				description: taskItem.description,
 				recentTools: [],
 				recentOutput: [],
 				toolCount: 0,
@@ -506,7 +510,7 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 		const { agent: agentName, context, schema: outputSchema } = params;
 		const simpleMode = this.#getTaskSimpleMode();
 		const { contextEnabled, customSchemaEnabled } = getTaskSimpleModeCapabilities(simpleMode);
-		const sharedContext = contextEnabled ? context : undefined;
+		const sharedContext = contextEnabled ? context?.trim() : undefined;
 		const isolationMode = this.session.settings.get("task.isolation.mode");
 		const isolationRequested = "isolated" in params ? params.isolated === true : false;
 		const isIsolated = isolationMode !== "none" && isolationRequested;
@@ -802,8 +806,6 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 			}
 			const tasksWithUniqueIds = tasks.map((t, i) => ({ ...t, id: uniqueIds[i] }));
 
-			// Build full prompts using shared context only when the current task mode allows it.
-			const tasksWithContext = tasksWithUniqueIds.map(t => renderTemplate(sharedContext, t, simpleMode));
 			const availableSkills = [...(this.session.skills ?? [])];
 			const contextFiles = this.session.contextFiles?.filter(
 				file => path.basename(file.path).toLowerCase() !== "agents.md",
@@ -811,34 +813,36 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 			const promptTemplates = this.session.promptTemplates;
 
 			// Initialize progress for all tasks
-			for (let i = 0; i < tasksWithContext.length; i++) {
-				const t = tasksWithContext[i];
+			for (let i = 0; i < tasksWithUniqueIds.length; i++) {
+				const taskItem = tasksWithUniqueIds[i];
+				const assignment = taskItem.assignment.trim();
 				progressMap.set(i, {
 					index: i,
-					id: t.id,
+					id: taskItem.id,
 					agent: agentName,
 					agentSource: agent.source,
 					status: "pending",
-					task: t.task,
-					assignment: t.assignment,
+					task: renderSubagentUserPrompt(assignment, simpleMode),
+					assignment,
 					recentTools: [],
 					recentOutput: [],
 					toolCount: 0,
 					tokens: 0,
 					durationMs: 0,
 					modelOverride,
-					description: t.description,
+					description: taskItem.description,
 				});
 			}
 			emitProgress();
 
-			const runTask = async (task: (typeof tasksWithContext)[number], index: number) => {
+			const runTask = async (task: (typeof tasksWithUniqueIds)[number], index: number) => {
 				if (!isIsolated) {
 					return runSubprocess({
 						cwd: this.session.cwd,
 						agent,
-						task: task.task,
-						assignment: task.assignment,
+						task: renderSubagentUserPrompt(task.assignment, simpleMode),
+						assignment: task.assignment.trim(),
+						context: sharedContext,
 						description: task.description,
 						index,
 						id: task.id,
@@ -894,8 +898,9 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 						cwd: this.session.cwd,
 						worktree: isolationDir,
 						agent,
-						task: task.task,
-						assignment: task.assignment,
+						task: renderSubagentUserPrompt(task.assignment, simpleMode),
+						assignment: task.assignment.trim(),
+						context: sharedContext,
 						description: task.description,
 						index,
 						id: task.id,
@@ -979,13 +984,14 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 					return result;
 				} catch (err) {
 					const message = err instanceof Error ? err.message : String(err);
+					const assignment = task.assignment.trim();
 					return {
 						index,
 						id: task.id,
 						agent: agent.name,
 						agentSource: agent.source,
-						task: task.task,
-						assignment: task.assignment,
+						task: renderSubagentUserPrompt(assignment, simpleMode),
+						assignment,
 						description: task.description,
 						exitCode: 1,
 						output: "",
@@ -1011,7 +1017,7 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 
 			// Execute in parallel with concurrency limit
 			const { results: partialResults, aborted } = await mapWithConcurrencyLimit(
-				tasksWithContext,
+				tasksWithUniqueIds,
 				maxConcurrency,
 				runTask,
 				signal,
@@ -1022,14 +1028,15 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 				if (result !== undefined) {
 					return result;
 				}
-				const task = tasksWithContext[index];
+				const task = tasksWithUniqueIds[index];
+				const assignment = task.assignment.trim();
 				return {
 					index,
 					id: task.id,
 					agent: agentName,
 					agentSource: agent.source,
-					task: task.task,
-					assignment: task.assignment,
+					task: renderSubagentUserPrompt(assignment, simpleMode),
+					assignment,
 					description: task.description,
 					exitCode: 1,
 					output: "",

package/src/tools/bash.ts

@@ -16,7 +16,6 @@ import { getSixelLineMask } from "../utils/sixel";
 import type { ToolSession } from ".";
 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";
 import { formatStyledTruncationWarning, type OutputMeta } from "./output-meta";
 import { resolveToCwd } from "./path-utils";
@@ -50,8 +49,7 @@ const bashSchemaBase = Type.Object({
 	),
 	timeout: Type.Optional(Type.Number({ description: "timeout in seconds", default: 300 })),
 	cwd: Type.Optional(Type.String({ description: "working directory", examples: ["src/", "/tmp"] })),
-	head: Type.Optional(Type.Number({ description: "first n lines of output" })),
-	tail: Type.Optional(Type.Number({ description: "last n lines of output" })),
+
 	pty: Type.Optional(
 		Type.Boolean({
 			description: "run in pty mode",
@@ -75,8 +73,7 @@ export interface BashToolInput {
 	env?: Record<string, string>;
 	timeout?: number;
 	cwd?: string;
-	head?: number;
-	tail?: number;
+
 	async?: boolean;
 	pty?: boolean;
 }
@@ -266,16 +263,9 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		});
 	}
 
-	#formatResultOutput(result: BashResult | BashInteractiveResult, headLines?: number, tailLines?: number): string {
-		let outputText = normalizeResultOutput(result);
-		const headTailResult = applyHeadTail(outputText, headLines, tailLines);
-		if (headTailResult.applied) {
-			outputText = headTailResult.text;
-		}
-		if (!outputText) {
-			outputText = "(no output)";
-		}
-		return outputText;
+	#formatResultOutput(result: BashResult | BashInteractiveResult): string {
+		const outputText = normalizeResultOutput(result);
+		return outputText || "(no output)";
 	}
 
 	#buildResultText(result: BashResult | BashInteractiveResult, timeoutSec: number, outputText: string): string {
@@ -297,11 +287,9 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 	#buildCompletedResult(
 		result: BashResult | BashInteractiveResult,
 		timeoutSec: number,
-		headLines?: number,
-		tailLines?: number,
 		options: { requestedTimeoutSec?: number; notices?: string[] } = {},
 	): AgentToolResult<BashToolDetails> {
-		const outputLines = [this.#formatResultOutput(result, headLines, tailLines)];
+		const outputLines = [this.#formatResultOutput(result)];
 		const notices = options.notices?.filter(Boolean) ?? [];
 		if (notices.length > 0) outputLines.push("", ...notices);
 		const outputText = outputLines.join("\n");
@@ -356,8 +344,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		timeoutSec: number;
 		requestedTimeoutSec?: number;
 		timeoutClampNotice?: string;
-		headLines?: number;
-		tailLines?: number;
+
 		resolvedEnv?: Record<string, string>;
 		onUpdate?: AgentToolUpdateCallback<BashToolDetails>;
 		startBackgrounded: boolean;
@@ -394,16 +381,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 						},
 						onMinimizedSave: originalText => saveBashOriginalArtifact(this.session, originalText),
 					});
-					const finalResult = this.#buildCompletedResult(
-						result,
-						options.timeoutSec,
-						options.headLines,
-						options.tailLines,
-						{
-							requestedTimeoutSec: options.requestedTimeoutSec,
-							notices: [options.timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
-						},
-					);
+					const finalResult = this.#buildCompletedResult(result, options.timeoutSec, {
+						requestedTimeoutSec: options.requestedTimeoutSec,
+						notices: [options.timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
+					});
 					const finalText = this.#extractTextResult(finalResult);
 					latestText = finalText;
 					completion.resolve({ kind: "completed", result: finalResult });
@@ -481,8 +462,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			env: rawEnv,
 			timeout: rawTimeout = 300,
 			cwd,
-			head,
-			tail,
+
 			async: asyncRequested = false,
 			pty = false,
 		}: BashToolInput,
@@ -505,10 +485,6 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			throw new ToolError("Async bash execution is disabled. Enable async.enabled to use async mode.");
 		}
 
-		// Only apply explicit head/tail params from tool input.
-		const headLines = head;
-		const tailLines = tail;
-
 		// Check both the original command and the cwd-normalized command so
 		// leading `cd ... &&` wrappers do not hide either shell-navigation rules
 		// or the dedicated-tool command that follows the directory change.
@@ -583,8 +559,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				timeoutSec,
 				requestedTimeoutSec,
 				timeoutClampNotice,
-				headLines,
-				tailLines,
+
 				resolvedEnv,
 				onUpdate,
 				startBackgrounded: true,
@@ -605,8 +580,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				timeoutSec,
 				requestedTimeoutSec,
 				timeoutClampNotice,
-				headLines,
-				tailLines,
+
 				resolvedEnv,
 				onUpdate,
 				startBackgrounded,
@@ -675,7 +649,7 @@ 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, {
 			requestedTimeoutSec,
 			notices: [timeoutClampNotice].filter((notice): notice is string => Boolean(notice)),
 		});

package/src/tools/eval.ts

@@ -4,10 +4,10 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Markdown, Text } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { jsBackend, parseEvalInput, pythonBackend } from "../eval";
+import { jsBackend, parseEvalInput, pythonBackend, sniffEvalLanguage } from "../eval";
 import type { ExecutorBackend } from "../eval/backend";
 import evalGrammar from "../eval/eval.lark" with { type: "text" };
-import type { ParsedEvalCell } from "../eval/parse";
+import { ABORT_WARNING, type ParsedEvalCell } from "../eval/parse";
 import type { EvalCellResult, EvalLanguage, EvalStatusEvent, EvalToolDetails } from "../eval/types";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
@@ -26,7 +26,7 @@ export const EVAL_DEFAULT_PREVIEW_LINES = 10;
 
 export const evalSchema = Type.Object({
 	input: Type.String({
-		description: "eval input as a sequence of `===== <info> =====` cell headers followed by code",
+		description: "eval input as a sequence of `*** Begin <LANG>` cell headers followed by code",
 	}),
 });
 export type EvalToolParams = Static<typeof evalSchema>;
@@ -131,33 +131,6 @@ function timeoutSecondsFromMs(timeoutMs: number): number {
 	return clampTimeout("eval", timeoutMs / 1000);
 }
 
-/**
- * Best-effort language sniff for cells with no explicit `language`.
- *
- * Order:
- * 1. Shebang on first line (`#!/usr/bin/env python`, `#!/usr/bin/env node`, etc.)
- * 2. Strong syntactic markers unique to one language. We bias false negatives over
- *    false positives — anything ambiguous returns `undefined` and the caller falls
- *    back to the default-backend rules.
- */
-function sniffLanguage(code: string): EvalLanguage | undefined {
-	const stripped = code.replace(/^\s+/, "");
-	if (stripped.startsWith("#!")) {
-		const firstLine = stripped.split("\n", 1)[0]!.toLowerCase();
-		if (/(\bpython\d?\b|\bipython\b)/.test(firstLine)) return "python";
-		if (/(\bnode\b|\bbun\b|\bdeno\b|\bjavascript\b|\bjs\b)/.test(firstLine)) return "js";
-	}
-	const jsMarkers =
-		/(^|\n)\s*(const|let|var|async\s+function|function\s*\*?\s*[\w$]*\s*\(|import\s+[^\n]+\sfrom\s|export\s+(default|const|let|function|class|async)|require\s*\(|console\.\w+\s*\(|=>|;\s*$)/m;
-	const pyMarkers =
-		/(^|\n)\s*(def\s+\w+\s*\(|from\s+[\w.]+\s+import|import\s+\w+(\s+as\s+\w+)?\s*$|class\s+\w+\s*[(:]|print\s*\(|elif\s+[^\n]*:|with\s+[^\n]+:\s*$|@[\w.]+\s*$)/m;
-	const hasJs = jsMarkers.test(code);
-	const hasPy = pyMarkers.test(code);
-	if (hasJs && !hasPy) return "js";
-	if (hasPy && !hasJs) return "python";
-	return undefined;
-}
-
 async function resolveBackend(
 	session: ToolSession,
 	requested: EvalLanguage | undefined,
@@ -180,7 +153,7 @@ async function resolveBackend(
 		return { backend: jsBackend, fallback: false };
 	}
 	// Auto-detect.
-	const sniffed = sniffLanguage(code);
+	const sniffed = sniffEvalLanguage(code);
 	if (sniffed === "python" && allowPy && (await pythonBackend.isAvailable(session))) {
 		return { backend: pythonBackend, fallback: false };
 	}
@@ -446,10 +419,11 @@ export class EvalTool implements AgentTool<typeof evalSchema> {
 						pushUpdate();
 						const errorMsg = result.output || "Command aborted";
 						const combinedOutput = cellOutputs.join("\n\n");
+						const abortSuffix = parsedInput.aborted ? `\n\n${ABORT_WARNING}` : "";
 						const outputText =
-							cells.length > 1
+							(cells.length > 1
 								? `${combinedOutput}\n\nCell ${i + 1} aborted: ${errorMsg}`
-								: combinedOutput || errorMsg;
+								: combinedOutput || errorMsg) + abortSuffix;
 
 						const summaryForMeta = await summarizeFinal(combinedOutput, finalizeOutput);
 						const details: EvalToolDetails = {
@@ -473,12 +447,13 @@ export class EvalTool implements AgentTool<typeof evalSchema> {
 						cellResult.status = "error";
 						pushUpdate();
 						const combinedOutput = cellOutputs.join("\n\n");
+						const abortSuffix = parsedInput.aborted ? `\n\n${ABORT_WARNING}` : "";
 						const outputText =
-							cells.length > 1
+							(cells.length > 1
 								? `${combinedOutput}\n\nCell ${i + 1} failed (exit code ${result.exitCode}). Earlier cells succeeded—their state persists. Fix only cell ${i + 1}.`
 								: combinedOutput
 									? `${combinedOutput}\n\nCommand exited with code ${result.exitCode}`
-									: `Command exited with code ${result.exitCode}`;
+									: `Command exited with code ${result.exitCode}`) + abortSuffix;
 
 						const summaryForMeta = await summarizeFinal(combinedOutput, finalizeOutput);
 						const details: EvalToolDetails = {
@@ -503,8 +478,10 @@ export class EvalTool implements AgentTool<typeof evalSchema> {
 				}
 
 				const combinedOutput = cellOutputs.join("\n\n");
+				const abortSuffix = parsedInput.aborted ? `\n\n${ABORT_WARNING}` : "";
 				const outputText =
-					combinedOutput || (jsonOutputs.length > 0 || images.length > 0 ? "(no text output)" : "(no output)");
+					(combinedOutput || (jsonOutputs.length > 0 || images.length > 0 ? "(no text output)" : "(no output)")) +
+					abortSuffix;
 				const summaryForMeta = await summarizeFinal(combinedOutput, finalizeOutput);
 
 				const details: EvalToolDetails = {