@oh-my-pi/pi-coding-agent 6.8.2 → 6.8.4

package/src/core/streaming-output.ts

@@ -2,7 +2,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { sanitizeText } from "@oh-my-pi/pi-utils";
 import { nanoid } from "nanoid";
-import { DEFAULT_MAX_BYTES, DEFAULT_MAX_COLUMN } from "./tools/truncate";
+import { DEFAULT_MAX_BYTES } from "./tools/truncate";
 
 export interface OutputResult {
 	output: string;
@@ -14,7 +14,6 @@ export interface OutputSinkOptions {
 	allocateFilePath?: () => string;
 	spillThreshold?: number;
 	maxColumn?: number;
-	onLine?: (line: string) => void;
 	onChunk?: (chunk: string) => void;
 }
 
@@ -29,182 +28,97 @@ function defaultFilePathAllocator(): string {
  * When memory limit exceeded, spills ~half to file in one batch operation.
  */
 export class OutputSink {
-	private buffer = "";
-	private lineEnds: number[] = []; // String index after each \n
-
-	private fileSink?: Bun.FileSink;
-	private filePath?: string;
-
-	private readonly allocateFilePath: () => string;
-	private readonly spillThreshold: number;
-	private readonly maxColumn: number;
-	private readonly onLine?: (line: string) => void;
-	private readonly onChunk?: (chunk: string) => void;
+	#buffer = "";
+	#file?: {
+		path: string;
+		sink: Bun.FileSink;
+	};
+	#bytesWritten: number = 0;
+	#pending: Promise<void> = Promise.resolve();
+
+	readonly #allocateFilePath: () => string;
+	readonly #spillThreshold: number;
+	readonly #onChunk?: (chunk: string) => void;
 
 	constructor(options?: OutputSinkOptions) {
 		const {
 			allocateFilePath = defaultFilePathAllocator,
 			spillThreshold = DEFAULT_MAX_BYTES,
-			maxColumn = DEFAULT_MAX_COLUMN,
-			onLine,
 			onChunk,
 		} = options ?? {};
 
-		this.allocateFilePath = allocateFilePath;
-		this.spillThreshold = spillThreshold;
-		this.maxColumn = maxColumn;
-		this.onLine = onLine;
-		this.onChunk = onChunk;
+		this.#allocateFilePath = allocateFilePath;
+		this.#spillThreshold = spillThreshold;
+		this.#onChunk = onChunk;
 	}
 
-	private pushLine(line: string, term?: string): void {
-		while (line.length > this.maxColumn) {
-			this.pushLine(line.slice(0, this.maxColumn), "--\n");
-			line = line.slice(this.maxColumn);
-		}
+	async #pushSanitized(data: string): Promise<void> {
+		this.#onChunk?.(data);
+		const dataBytes = Buffer.byteLength(data);
+		const overflow = dataBytes + this.#bytesWritten > this.#spillThreshold || this.#file != null;
 
-		this.buffer += line;
-		if (term) {
-			this.buffer += term;
-		}
+		const sink = overflow ? await this.#fileSink() : null;
 
-		this.lineEnds.push(this.buffer.length);
-		this.onLine?.(line);
+		this.#buffer += data;
+		await sink?.write(data);
 
-		if (this.buffer.length > this.spillThreshold) {
-			this.spillHalf();
+		if (this.#buffer.length > this.#spillThreshold) {
+			this.#buffer = this.#buffer.slice(-this.#spillThreshold);
 		}
 	}
 
-	private pushChunk(line: string): void {
-		this.onChunk?.(line);
-		this.pushLine(line);
-	}
-
-	private getFileSink(): Bun.FileSink {
-		if (!this.fileSink) {
-			const filePath = this.allocateFilePath();
-			this.filePath = filePath;
-			this.fileSink = Bun.file(filePath).writer();
+	async #fileSink(): Promise<Bun.FileSink> {
+		if (!this.#file) {
+			const filePath = this.#allocateFilePath();
+			this.#file = {
+				path: filePath,
+				sink: Bun.file(filePath).writer(),
+			};
+			await this.#file.sink.write(this.#buffer);
 		}
-		return this.fileSink;
+		return this.#file.sink;
 	}
 
-	private spillHalf(): void {
-		const target = this.buffer.length >>> 1;
-
-		// Binary search: first line ending >= target
-		let lo = 0;
-		let hi = this.lineEnds.length;
-		while (lo < hi) {
-			const mid = (lo + hi) >>> 1;
-			if (this.lineEnds[mid] < target) {
-				lo = mid + 1;
-			} else {
-				hi = mid;
-			}
-		}
-
-		// Clamp: evict at least 1 line, keep at least 1 line
-		const splitIdx = Math.max(1, Math.min(lo, this.lineEnds.length - 1));
-		const splitPos = this.lineEnds[splitIdx - 1];
-
-		// Write evicted portion to file
-		this.getFileSink().write(this.buffer.slice(0, splitPos));
-
-		// Truncate buffer, shift line positions
-		this.buffer = this.buffer.slice(splitPos);
-		const remaining = this.lineEnds.length - splitIdx;
-		for (let i = 0; i < remaining; i++) {
-			this.lineEnds[i] = this.lineEnds[i + splitIdx] - splitPos;
-		}
-		this.lineEnds.length = remaining;
+	async push(chunk: string): Promise<void> {
+		chunk = sanitizeText(chunk);
+		const op = this.#pending.then(() => this.#pushSanitized(chunk));
+		this.#pending = op.catch(() => {});
+		await op;
 	}
 
-	createWritable(): WritableStream<Uint8Array> {
-		const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
-		let buf = "";
-
-		const flushLines = () => {
-			let start = 0;
-			while (true) {
-				const nl = buf.indexOf("\n", start);
-				if (nl === -1) break;
-				this.pushChunk(buf.slice(start, nl + 1));
-				start = nl + 1;
-			}
-			buf = buf.slice(start);
-		};
-
-		const finalize = () => {
-			buf += sanitizeText(decoder.decode());
-			flushLines();
-			buf = buf.trimEnd();
-			if (buf) {
-				this.pushChunk(`${buf}\n`);
-			}
-		};
-
-		return new WritableStream<Uint8Array>({
-			write: (chunk) => {
-				buf += sanitizeText(decoder.decode(chunk, { stream: true }));
-				flushLines();
+	createInput(): WritableStream<Uint8Array | string> {
+		let decoder: TextDecoder | undefined;
+		let finalize = async () => {};
+
+		return new WritableStream<Uint8Array | string>({
+			write: async (chunk) => {
+				if (typeof chunk === "string") {
+					await this.push(chunk);
+				} else {
+					if (!decoder) {
+						const dec = new TextDecoder("utf-8", { ignoreBOM: true });
+						decoder = dec;
+						finalize = async () => {
+							await this.push(dec.decode());
+						};
+					}
+					await this.push(decoder.decode(chunk, { stream: true }));
+				}
 			},
 			close: finalize,
 			abort: finalize,
 		});
 	}
 
-	createStringWritable(): WritableStream<string> {
-		let buf = "";
-
-		const flushLines = () => {
-			let start = 0;
-			while (true) {
-				const nl = buf.indexOf("\n", start);
-				if (nl === -1) break;
-				this.pushChunk(buf.slice(start, nl + 1));
-				start = nl + 1;
-			}
-			buf = buf.slice(start);
-		};
-
-		const finalize = () => {
-			flushLines();
-			buf = buf.trimEnd();
-			if (buf) {
-				this.pushChunk(`${buf}\n`);
-			}
-		};
-
-		return new WritableStream<string>({
-			write: (chunk) => {
-				buf += sanitizeText(chunk);
-				flushLines();
-			},
-			close: finalize,
-			abort: finalize,
-		});
-	}
-
-	async close(): Promise<void> {
-		await this.fileSink?.end();
-	}
+	async dump(notice?: string): Promise<OutputResult> {
+		await this.#pending;
+		const noticeLine = notice ? `[${notice}]\n` : "";
 
-	dump(annotation?: string): OutputResult {
-		let output = this.buffer;
-		if (annotation) {
-			output += `\n${annotation}\n`;
-		}
-		if (!this.filePath) {
-			return { output, truncated: false };
+		if (this.#file) {
+			await this.#file.sink.end();
+			return { output: `${noticeLine}...${this.#buffer}`, truncated: true, fullOutputPath: this.#file.path };
+		} else {
+			return { output: `${noticeLine}${this.#buffer}`, truncated: false };
 		}
-		this.fileSink!.write(this.buffer);
-		this.fileSink!.flush();
-		return {
-			output,
-			truncated: true,
-			fullOutputPath: this.filePath,
-		};
 	}
 }

package/src/core/tools/bash.ts

@@ -6,14 +6,14 @@ import { Type } from "@sinclair/typebox";
 import { truncateToVisualLines } from "../../modes/interactive/components/visual-truncate";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import bashDescription from "../../prompts/tools/bash.md" with { type: "text" };
-import { type BashExecutorOptions, executeBash, executeBashWithOperations } from "../bash-executor";
+import { type BashExecutorOptions, executeBash } from "../bash-executor";
 import type { RenderResultOptions } from "../custom-tools/types";
 import { renderPromptTemplate } from "../prompt-templates";
 import { checkBashInterception, checkSimpleLsInterception } from "./bash-interceptor";
 import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
 import { ToolUIKit } from "./render-utils";
-import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateTail } from "./truncate";
+import { formatTailTruncationNotice, type TruncationResult, truncateTail } from "./truncate";
 
 export const BASH_DEFAULT_PREVIEW_LINES = 10;
 
@@ -31,32 +31,12 @@ export interface BashToolDetails {
 	fullOutput?: string;
 }
 
-/**
- * Pluggable operations for bash execution.
- * Override to delegate command execution to remote systems.
- */
-export interface BashOperations {
-	exec: (
-		command: string,
-		cwd: string,
-		options: {
-			onData: (data: Buffer) => void;
-			signal?: AbortSignal;
-			timeout?: number;
-		},
-	) => Promise<{ exitCode: number | null }>;
-}
-
-export interface BashToolOptions {
-	/** Custom operations for command execution. Default: local shell */
-	operations?: BashOperations;
-}
+export interface BashToolOptions {}
 
 /**
  * Bash tool implementation.
  *
  * Executes bash commands with optional timeout and working directory.
- * Supports custom operations for remote execution.
  */
 export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 	public readonly name = "bash";
@@ -65,11 +45,9 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 	public readonly parameters = bashSchema;
 
 	private readonly session: ToolSession;
-	private readonly options?: BashToolOptions;
 
-	constructor(session: ToolSession, options?: BashToolOptions) {
+	constructor(session: ToolSession) {
 		this.session = session;
-		this.options = options;
 		this.description = renderPromptTemplate(bashDescription);
 	}
 
@@ -125,12 +103,8 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 			},
 		};
 
-		// Use custom operations if provided, otherwise use default local executor
-		const result = this.options?.operations
-			? await executeBashWithOperations(command, commandCwd, this.options.operations, executorOptions)
-			: await executeBash(command, executorOptions);
-
 		// Handle errors
+		const result = await executeBash(command, executorOptions);
 		if (result.cancelled) {
 			throw new Error(result.output || "Command aborted");
 		}
@@ -147,18 +121,10 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 				fullOutputPath: result.fullOutputPath,
 				fullOutput: currentOutput,
 			};
-
-			const startLine = truncation.totalLines - truncation.outputLines + 1;
-			const endLine = truncation.totalLines;
-
-			if (truncation.lastLinePartial) {
-				const lastLineSize = formatSize(Buffer.byteLength(result.output.split("\n").pop() || "", "utf-8"));
-				outputText += `\n\n[Showing last ${formatSize(truncation.outputBytes)} of line ${endLine} (line is ${lastLineSize}). Full output: ${result.fullOutputPath}]`;
-			} else if (truncation.truncatedBy === "lines") {
-				outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}. Full output: ${result.fullOutputPath}]`;
-			} else {
-				outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(DEFAULT_MAX_BYTES)} limit). Full output: ${result.fullOutputPath}]`;
-			}
+			outputText += formatTailTruncationNotice(truncation, {
+				fullOutputPath: result.fullOutputPath,
+				originalContent: result.output,
+			});
 		}
 
 		if (result.exitCode !== 0 && result.exitCode !== undefined) {
@@ -263,7 +229,7 @@ export const bashToolRenderer = {
 					warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
 				} else {
 					warnings.push(
-						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`,
+						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes)} limit)`,
 					);
 				}
 			}

package/src/core/tools/index.ts

@@ -1,5 +1,5 @@
 export { AskTool, type AskToolDetails } from "./ask";
-export { type BashOperations, BashTool, type BashToolDetails, type BashToolOptions } from "./bash";
+export { BashTool, type BashToolDetails, type BashToolOptions } from "./bash";
 export { CalculatorTool, type CalculatorToolDetails } from "./calculator";
 export { CompleteTool } from "./complete";
 // Exa MCP tools (22 tools)

package/src/core/tools/output.ts

@@ -25,7 +25,6 @@ import {
 	TRUNCATE_LENGTHS,
 	truncate,
 } from "./render-utils";
-import { getArtifactsDir } from "./task/artifacts";
 
 const outputSchema = Type.Object({
 	ids: Type.Array(Type.String(), {
@@ -164,7 +163,7 @@ function applyQuery(data: unknown, query: string): unknown {
 function listAvailableOutputs(artifactsDir: string): string[] {
 	try {
 		const files = fs.readdirSync(artifactsDir);
-		return files.filter((f) => f.endsWith(".out.md")).map((f) => f.replace(".out.md", ""));
+		return files.filter((f) => f.endsWith(".md")).map((f) => f.replace(".md", ""));
 	} catch {
 		return [];
 	}
@@ -274,8 +273,8 @@ export class OutputTool implements AgentTool<typeof outputSchema, OutputToolDeta
 			};
 		}
 
-		const artifactsDir = getArtifactsDir(sessionFile);
-		if (!artifactsDir || !fs.existsSync(artifactsDir)) {
+		const artifactsDir = sessionFile.slice(0, -6); // strip .jsonl extension
+		if (!fs.existsSync(artifactsDir)) {
 			return {
 				content: [{ type: "text", text: "No artifacts directory found" }],
 				details: { outputs: [], notFound: params.ids },
@@ -296,14 +295,14 @@ export class OutputTool implements AgentTool<typeof outputSchema, OutputToolDeta
 		const queryResults: Array<{ id: string; value: unknown }> = [];
 
 		for (const id of params.ids) {
-			const outputPath = path.join(artifactsDir, `${id}.out.md`);
-
-			if (!fs.existsSync(outputPath)) {
+			const outputPath = path.join(artifactsDir, `${id}.md`);
+			const file = Bun.file(outputPath);
+			if (!(await file.exists())) {
 				notFound.push(id);
 				continue;
 			}
 
-			const rawContent = fs.readFileSync(outputPath, "utf-8");
+			const rawContent = await file.text();
 			const rawLines = rawContent.split("\n");
 			const totalLines = rawLines.length;
 			const totalChars = rawContent.length;

package/src/core/tools/python.ts

@@ -14,7 +14,7 @@ import type { PreludeHelper, PythonStatusEvent } from "../python-kernel";
 import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
 import { getTreeBranch, getTreeContinuePrefix, shortenPath, ToolUIKit, truncate } from "./render-utils";
-import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateTail } from "./truncate";
+import { DEFAULT_MAX_BYTES, formatTailTruncationNotice, type TruncationResult, truncateTail } from "./truncate";
 
 export const PYTHON_DEFAULT_PREVIEW_LINES = 10;
 
@@ -234,7 +234,6 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 			let details: PythonToolDetails | undefined;
 
 			if (truncation.truncated) {
-				const fullOutputSuffix = result.fullOutputPath ? ` Full output: ${result.fullOutputPath}` : "";
 				details = {
 					truncation,
 					fullOutputPath: result.fullOutputPath,
@@ -242,18 +241,10 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 					images,
 					statusEvents: statusEvents.length > 0 ? statusEvents : undefined,
 				};
-
-				const startLine = truncation.totalLines - truncation.outputLines + 1;
-				const endLine = truncation.totalLines;
-
-				if (truncation.lastLinePartial) {
-					const lastLineSize = formatSize(Buffer.byteLength(result.output.split("\n").pop() || "", "utf-8"));
-					outputText += `\n\n[Showing last ${formatSize(truncation.outputBytes)} of line ${endLine} (line is ${lastLineSize})${fullOutputSuffix}]`;
-				} else if (truncation.truncatedBy === "lines") {
-					outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}${fullOutputSuffix}]`;
-				} else {
-					outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(DEFAULT_MAX_BYTES)} limit)${fullOutputSuffix}]`;
-				}
+				outputText += formatTailTruncationNotice(truncation, {
+					fullOutputPath: result.fullOutputPath,
+					originalContent: result.output,
+				});
 			}
 
 			if (!details && (jsonOutputs.length > 0 || images.length > 0 || statusEvents.length > 0)) {
@@ -685,7 +676,7 @@ export const pythonToolRenderer = {
 					warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
 				} else {
 					warnings.push(
-						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`,
+						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes)} limit)`,
 					);
 				}
 			}

package/src/core/tools/ssh.ts

@@ -14,7 +14,7 @@ import { ensureHostInfo, getHostInfoForHost } from "../ssh/connection-manager";
 import { executeSSH } from "../ssh/ssh-executor";
 import type { ToolSession } from "./index";
 import { ToolUIKit } from "./render-utils";
-import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateTail } from "./truncate";
+import { formatTailTruncationNotice, type TruncationResult, truncateTail } from "./truncate";
 
 const sshSchema = Type.Object({
 	host: Type.String({ description: "Host name from ssh.json or .ssh.json" }),
@@ -193,18 +193,10 @@ export class SshTool implements AgentTool<typeof sshSchema, SSHToolDetails> {
 				truncation,
 				fullOutputPath: result.fullOutputPath,
 			};
-
-			const startLine = truncation.totalLines - truncation.outputLines + 1;
-			const endLine = truncation.totalLines;
-
-			if (truncation.lastLinePartial) {
-				const lastLineSize = formatSize(Buffer.byteLength(result.output.split("\n").pop() || "", "utf-8"));
-				outputText += `\n\n[Showing last ${formatSize(truncation.outputBytes)} of line ${endLine} (line is ${lastLineSize}). Full output: ${result.fullOutputPath}]`;
-			} else if (truncation.truncatedBy === "lines") {
-				outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}. Full output: ${result.fullOutputPath}]`;
-			} else {
-				outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(DEFAULT_MAX_BYTES)} limit). Full output: ${result.fullOutputPath}]`;
-			}
+			outputText += formatTailTruncationNotice(truncation, {
+				fullOutputPath: result.fullOutputPath,
+				originalContent: result.output,
+			});
 		}
 
 		if (result.exitCode !== 0 && result.exitCode !== undefined) {
@@ -311,7 +303,7 @@ export const sshToolRenderer = {
 					warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
 				} else {
 					warnings.push(
-						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`,
+						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes)} limit)`,
 					);
 				}
 			}

package/src/core/tools/task/executor.ts

@@ -4,6 +4,7 @@
  * Runs each subagent in a Bun Worker and forwards AgentEvents for progress tracking.
  */
 
+import path from "node:path";
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { AuthStorage } from "../../auth-storage";
 import type { EventBus } from "../../event-bus";
@@ -16,7 +17,6 @@ import type { ToolSession } from "..";
 import { LspTool } from "../lsp/index";
 import type { LspParams } from "../lsp/types";
 import { PythonTool } from "../python";
-import { ensureArtifactsDir, getArtifactPaths } from "./artifacts";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
 import {
 	type AgentDefinition,
@@ -256,20 +256,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	const fullTask = context ? `${context}\n\n${task}` : task;
 
 	// Set up artifact paths and write input file upfront if artifacts dir provided
-	let artifactPaths: { inputPath: string; outputPath: string; jsonlPath: string } | undefined;
 	let subtaskSessionFile: string | undefined;
-
 	if (options.artifactsDir) {
-		ensureArtifactsDir(options.artifactsDir);
-		artifactPaths = getArtifactPaths(options.artifactsDir, taskId);
-		subtaskSessionFile = artifactPaths.jsonlPath;
-
-		// Write input file immediately (real-time visibility)
-		try {
-			await Bun.write(artifactPaths.inputPath, fullTask);
-		} catch {
-			// Non-fatal, continue without input artifact
-		}
+		subtaskSessionFile = path.join(options.artifactsDir, `${taskId}.jsonl`);
 	}
 
 	// Add tools if specified
@@ -1042,9 +1031,11 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	// Write output artifact (input and jsonl already written in real-time)
 	// Compute output metadata for Output tool integration
 	let outputMeta: { lineCount: number; charCount: number } | undefined;
-	if (artifactPaths) {
+	let outputPath: string | undefined;
+	if (options.artifactsDir) {
+		outputPath = path.join(options.artifactsDir, `${taskId}.md`);
 		try {
-			await Bun.write(artifactPaths.outputPath, rawOutput);
+			await Bun.write(outputPath, rawOutput);
 			outputMeta = {
 				lineCount: rawOutput.split("\n").length,
 				charCount: rawOutput.length,
@@ -1076,7 +1067,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		error: exitCode !== 0 && stderr ? stderr : undefined,
 		aborted: wasAborted,
 		usage: hasUsage ? accumulatedUsage : undefined,
-		artifactPaths,
+		outputPath,
 		extractedToolData: progress.extractedToolData,
 		outputMeta,
 	};

package/src/core/tools/task/index.ts

@@ -13,13 +13,17 @@
  *   - Session artifacts for debugging
  */
 
+import { mkdir, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 import type { AgentTool, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Usage } from "@oh-my-pi/pi-ai";
+import { nanoid } from "nanoid";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import taskDescriptionTemplate from "../../../prompts/tools/task.md" with { type: "text" };
 import { renderPromptTemplate } from "../../prompt-templates";
+import type { ToolSession } from "..";
 import { formatDuration } from "../render-utils";
-import { cleanupTempDir, createTempArtifactsDir, getArtifactsDir } from "./artifacts";
 import { discoverAgents, getAgent } from "./discovery";
 import { runSubprocess } from "./executor";
 import { mapWithConcurrencyLimit } from "./parallel";
@@ -36,7 +40,6 @@ import {
 
 // Import review tools for side effects (registers subagent tool handlers)
 import "../review";
-import type { ToolSession } from "..";
 
 /** Format byte count for display */
 function formatBytes(bytes: number): string {
@@ -276,9 +279,10 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 
 		// Derive artifacts directory
 		const sessionFile = this.session.getSessionFile();
-		const artifactsDir = sessionFile ? getArtifactsDir(sessionFile) : null;
-		const tempArtifactsDir = artifactsDir ? null : createTempArtifactsDir();
+		const artifactsDir = sessionFile ? sessionFile.slice(0, -6) : null;
+		const tempArtifactsDir = artifactsDir ? null : path.join(tmpdir(), `omp-task-${nanoid()}`);
 		const effectiveArtifactsDir = artifactsDir || tempArtifactsDir!;
+		await mkdir(effectiveArtifactsDir, { recursive: true });
 
 		// Initialize progress tracking
 		const progressMap = new Map<number, AgentProgress>();
@@ -435,8 +439,8 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 			// Collect output paths (artifacts already written by executor in real-time)
 			const outputPaths: string[] = [];
 			for (const result of results) {
-				if (result.artifactPaths) {
-					outputPaths.push(result.artifactPaths.outputPath);
+				if (result.outputPath) {
+					outputPaths.push(result.outputPath);
 				}
 			}
 
@@ -468,7 +472,7 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 
 			// Cleanup temp directory if used
 			if (tempArtifactsDir) {
-				await cleanupTempDir(tempArtifactsDir);
+				await rm(tempArtifactsDir, { recursive: true, force: true });
 			}
 
 			return {
@@ -482,11 +486,6 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 				},
 			};
 		} catch (err) {
-			// Cleanup temp directory on error
-			if (tempArtifactsDir) {
-				await cleanupTempDir(tempArtifactsDir);
-			}
-
 			return {
 				content: [{ type: "text", text: `Task execution failed: ${err}` }],
 				details: {

package/src/core/tools/task/types.ts

@@ -153,7 +153,8 @@ export interface SingleResult {
 	aborted?: boolean;
 	/** Aggregated usage from the subprocess, accumulated incrementally from message_end events. */
 	usage?: Usage;
-	artifactPaths?: { inputPath: string; outputPath: string; jsonlPath?: string };
+	/** Output path for the task result */
+	outputPath?: string;
 	/** Data extracted by registered subprocess tool handlers (keyed by tool name) */
 	extractedToolData?: Record<string, unknown[]>;
 	/** Output metadata for Output tool integration */