@oh-my-pi/pi-coding-agent 6.8.1 → 6.8.3

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 ## [Unreleased]
 
+## [6.8.3] - 2026-01-21
+
+### Changed
+
+- Updated keybinding system to normalize key IDs to lowercase
+- Changed label edit shortcut from 'l' to 'Shift+L' in tree selector
+- Changed output file extension from `.out.md` to `.md` for artifacts
+
+### Removed
+
+- Removed bundled worktree command from custom commands loader
+
+### Fixed
+
+- Fixed keybinding case sensitivity issues by normalizing all key IDs
+- Fixed task artifact path handling and simplified file structure
+
+## [6.8.2] - 2026-01-21
+
+### Fixed
+
+- Improved error messages when multiple text occurrences are found by showing line previews and context
+- Enhanced patch application to better handle duplicate content in context lines
+- Added occurrence previews to help users disambiguate between multiple matches
+- Fixed cache invalidation for streaming edits to prevent stale data
+- Fixed file existence check for prompt templates directory
+- Fixed bash output streaming to prevent premature stream closure
+- Fixed LSP client request handling when signal is already aborted
+- Fixed git apply operations with stdin input handling
+
+### Security
+
+- Updated Anthropic authentication to handle manual code input securely
+
 ## [6.8.1] - 2026-01-20
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "6.8.1",
+	"version": "6.8.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -40,11 +40,11 @@
 		"prepublishOnly": "bun run generate-template && bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-agent-core": "6.8.1",
-		"@oh-my-pi/pi-ai": "6.8.1",
-		"@oh-my-pi/pi-git-tool": "6.8.1",
-		"@oh-my-pi/pi-tui": "6.8.1",
-		"@oh-my-pi/pi-utils": "6.8.1",
+		"@oh-my-pi/pi-agent-core": "6.8.3",
+		"@oh-my-pi/pi-ai": "6.8.3",
+		"@oh-my-pi/pi-git-tool": "6.8.3",
+		"@oh-my-pi/pi-tui": "6.8.3",
+		"@oh-my-pi/pi-utils": "6.8.3",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/core/agent-session.ts

@@ -63,7 +63,6 @@ import { unmountAll } from "./ssh/sshfs-mount";
 import type { BashOperations } from "./tools/bash";
 import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "./tools/patch";
 import { resolveToCwd } from "./tools/path-utils";
-import { getArtifactsDir } from "./tools/task/artifacts";
 import type { TodoItem } from "./tools/todo-write";
 import type { TtsrManager } from "./ttsr";
 
@@ -454,15 +453,19 @@ export class AgentSession {
 			}
 
 			if (event.message.role === "toolResult") {
-				const { $normative, toolCallId } = event.message as {
+				const { toolName, $normative, toolCallId, details } = event.message as {
 					toolName?: string;
 					toolCallId?: string;
-					details?: unknown;
+					details?: { path?: string };
 					$normative?: Record<string, unknown>;
 				};
 				if ($normative && toolCallId && this.settingsManager.getNormativeRewrite()) {
 					await this._rewriteToolCallArgs(toolCallId, $normative);
 				}
+				// Invalidate streaming edit cache when edit tool completes to prevent stale data
+				if (toolName === "edit" && details?.path) {
+					this._invalidateFileCacheForPath(details.path);
+				}
 			}
 		}
 
@@ -579,11 +582,16 @@ export class AgentSession {
 				this._streamingEditFileCache.set(resolvedPath, normalizeToLF(text));
 			}
 		} catch {
-			// Ignore errors - mark as empty string so we don't retry
-			this._streamingEditFileCache.set(resolvedPath, "");
+			// Don't cache on read errors - let the edit tool handle them
 		}
 	}
 
+	/** Invalidate cache for a file after an edit completes to prevent stale data */
+	private _invalidateFileCacheForPath(path: string): void {
+		const resolvedPath = resolveToCwd(path, this.sessionManager.getCwd());
+		this._streamingEditFileCache.delete(resolvedPath);
+	}
+
 	private _maybeAbortStreamingEdit(event: AgentEvent): void {
 		if (!this.settingsManager.getEditStreamingAbort()) return;
 		if (this._streamingEditAbortTriggered) return;
@@ -1982,10 +1990,7 @@ export class AgentSession {
 		const sessionFile = this.sessionManager.getSessionFile();
 		if (!sessionFile) return;
 
-		const artifactsDir = getArtifactsDir(sessionFile);
-		if (!artifactsDir) return;
-
-		const todoPath = `${artifactsDir}/todos.json`;
+		const todoPath = `${sessionFile.slice(0, -6)}/todos.json`;
 		const file = Bun.file(todoPath);
 		if (!(await file.exists())) {
 			this._todoReminderCount = 0;

package/src/core/auth-storage.ts

@@ -560,7 +560,11 @@ export class AuthStorage {
 
 		switch (provider) {
 			case "anthropic":
-				credentials = await loginAnthropic(ctrl);
+				credentials = await loginAnthropic({
+					...ctrl,
+					onManualCodeInput: async () =>
+						ctrl.onPrompt({ message: "Paste the authorization code (or full redirect URL):" }),
+				});
 				break;
 			case "github-copilot":
 				credentials = await loginGitHubCopilot({

package/src/core/bash-executor.ts

@@ -34,7 +34,7 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 	const prefixedCommand = prefix ? `${prefix} ${command}` : command;
 	const finalCommand = `${snapshotPrefix}${prefixedCommand}`;
 
-	const stream = new OutputSink({ onLine: options?.onChunk });
+	const stream = new OutputSink({ onChunk: options?.onChunk });
 
 	const child = cspawn([shell, ...args, finalCommand], {
 		cwd: options?.cwd,
@@ -44,6 +44,7 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 	});
 
 	// Pump streams - errors during abort/timeout are expected
+	// Use preventClose to avoid closing the shared sink when either stream finishes
 	await Promise.allSettled([
 		child.stdout.pipeTo(stream.createWritable()),
 		child.stderr.pipeTo(stream.createWritable()),
@@ -92,7 +93,7 @@ export async function executeBashWithOperations(
 	operations: BashOperations,
 	options?: BashExecutorOptions,
 ): Promise<BashResult> {
-	const stream = new OutputSink({ onLine: options?.onChunk });
+	const stream = new OutputSink({ onChunk: options?.onChunk });
 	const writable = stream.createWritable();
 	const writer = writable.getWriter();
 

package/src/core/custom-commands/loader.ts

@@ -13,7 +13,6 @@ import { getAgentDir, getConfigDirs } from "../../config";
 import * as piCodingAgent from "../../index";
 import { execCommand } from "../exec";
 import { ReviewCommand } from "./bundled/review";
-import { WorktreeCommand } from "./bundled/wt";
 import type {
 	CustomCommand,
 	CustomCommandAPI,
@@ -153,13 +152,6 @@ function loadBundledCommands(sharedApi: CustomCommandAPI): LoadedCustomCommand[]
 		source: "bundled",
 	});
 
-	bundled.push({
-		path: "bundled:wt",
-		resolvedPath: "bundled:wt",
-		command: new WorktreeCommand(sharedApi),
-		source: "bundled",
-	});
-
 	return bundled;
 }
 

package/src/core/keybindings.ts

@@ -124,6 +124,8 @@ const KEY_LABELS: Record<string, string> = {
 	right: "Right",
 };
 
+const normalizeKeyId = (key: KeyId): KeyId => key.toLowerCase() as KeyId;
+
 function formatKeyPart(part: string): string {
 	const lower = part.toLowerCase();
 	const modifier = MODIFIER_LABELS[lower];
@@ -199,14 +201,20 @@ export class KeybindingsManager {
 		// Set defaults for app actions
 		for (const [action, keys] of Object.entries(DEFAULT_APP_KEYBINDINGS)) {
 			const keyArray = Array.isArray(keys) ? keys : [keys];
-			this.appActionToKeys.set(action as AppAction, [...keyArray]);
+			this.appActionToKeys.set(
+				action as AppAction,
+				keyArray.map((key) => normalizeKeyId(key as KeyId)),
+			);
 		}
 
 		// Override with user config (app actions only)
 		for (const [action, keys] of Object.entries(this.config)) {
 			if (keys === undefined || !isAppAction(action)) continue;
 			const keyArray = Array.isArray(keys) ? keys : [keys];
-			this.appActionToKeys.set(action, keyArray);
+			this.appActionToKeys.set(
+				action,
+				keyArray.map((key) => normalizeKeyId(key as KeyId)),
+			);
 		}
 	}
 

package/src/core/prompt-templates.ts

@@ -432,7 +432,7 @@ async function loadTemplatesFromDir(
 			}
 		}
 	} catch (error) {
-		if (!Bun.file(dir).exists()) {
+		if (!(await Bun.file(dir).exists())) {
 			return [];
 		}
 		logger.warn("Failed to scan prompt templates directory", { dir, error: String(error) });

package/src/core/tools/lsp/client.ts

@@ -741,7 +741,7 @@ export async function sendRequest(
 		signal.addEventListener("abort", abortHandler, { once: true });
 		if (signal.aborted) {
 			abortHandler();
-			return;
+			return promise;
 		}
 	}
 

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/patch/applicator.ts

@@ -92,17 +92,17 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		}
 	}
 
-	// Build a map from trimmed content to available (pattern index, actual index) pairs
-	// This lets us find context lines and their corresponding actual content
-	const contentToIndices = new Map<string, Array<{ patternIdx: number; actualIdx: number }>>();
-	for (let i = 0; i < Math.min(patternLines.length, actualLines.length); i++) {
-		const trimmed = patternLines[i].trim();
+	// Build a map from trimmed content to actual lines (by content, not position)
+	// This handles fuzzy matches where pattern and actual may not be positionally aligned
+	const contentToActualLines = new Map<string, string[]>();
+	for (const line of actualLines) {
+		const trimmed = line.trim();
 		if (trimmed.length === 0) continue;
-		const arr = contentToIndices.get(trimmed);
+		const arr = contentToActualLines.get(trimmed);
 		if (arr) {
-			arr.push({ patternIdx: i, actualIdx: i });
+			arr.push(line);
 		} else {
-			contentToIndices.set(trimmed, [{ patternIdx: i, actualIdx: i }]);
+			contentToActualLines.set(trimmed, [line]);
 		}
 	}
 
@@ -119,8 +119,8 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 	}
 	const avgDelta = deltaCount > 0 ? Math.round(totalDelta / deltaCount) : 0;
 
-	// Track which indices we've used to handle duplicate content correctly
-	const usedIndices = new Set<number>();
+	// Track which actual lines we've used to handle duplicate content correctly
+	const usedActualLines = new Map<string, number>(); // trimmed content -> count used
 
 	return newLines.map((newLine) => {
 		if (newLine.trim().length === 0) {
@@ -128,16 +128,15 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		}
 
 		const trimmed = newLine.trim();
-		const indices = contentToIndices.get(trimmed);
-
-		// Check if this is a context line (same trimmed content exists in pattern)
-		if (indices) {
-			for (const { patternIdx, actualIdx } of indices) {
-				if (!usedIndices.has(patternIdx)) {
-					usedIndices.add(patternIdx);
-					// Use actual file content directly for context lines
-					return actualLines[actualIdx];
-				}
+		const matchingActualLines = contentToActualLines.get(trimmed);
+
+		// Check if this is a context line (same trimmed content exists in actual)
+		if (matchingActualLines && matchingActualLines.length > 0) {
+			const usedCount = usedActualLines.get(trimmed) ?? 0;
+			if (usedCount < matchingActualLines.length) {
+				usedActualLines.set(trimmed, usedCount + 1);
+				// Use actual file content directly for context lines
+				return matchingActualLines[usedCount];
 			}
 		}
 
@@ -599,9 +598,11 @@ function applyCharacterMatch(
 
 	// Check for multiple exact occurrences
 	if (matchOutcome.occurrences && matchOutcome.occurrences > 1) {
+		const previews = matchOutcome.occurrencePreviews?.join("\n\n") ?? "";
+		const moreMsg = matchOutcome.occurrences > 5 ? ` (showing first 5 of ${matchOutcome.occurrences})` : "";
 		throw new ApplyPatchError(
-			`Found ${matchOutcome.occurrences} occurrences of the text in ${path}. ` +
-				`The text must be unique. Please provide more context to make it unique.`,
+			`Found ${matchOutcome.occurrences} occurrences in ${path}${moreMsg}:\n\n${previews}\n\n` +
+				`Add more context lines to disambiguate.`,
 		);
 	}
 
@@ -857,9 +858,22 @@ function computeReplacements(
 		if (hunk.changeContext === undefined && !hunk.hasContextLines && !hunk.isEndOfFile && lineHint === undefined) {
 			const secondMatch = seekSequence(originalLines, pattern, found + 1, false, { allowFuzzy });
 			if (secondMatch.index !== undefined) {
+				// Extract 3-line previews for each match
+				const formatPreview = (startIdx: number) => {
+					const lines = originalLines.slice(startIdx, startIdx + 3);
+					return lines
+						.map((line, i) => {
+							const num = startIdx + i + 1;
+							const truncated = line.length > 60 ? `${line.slice(0, 57)}...` : line;
+							return `  ${num} | ${truncated}`;
+						})
+						.join("\n");
+				};
+				const preview1 = formatPreview(found);
+				const preview2 = formatPreview(secondMatch.index);
 				throw new ApplyPatchError(
-					`Found 2 occurrences of the text in ${path}. ` +
-						`The text must be unique. Please provide more context to make it unique.`,
+					`Found 2 occurrences in ${path}:\n\n${preview1}\n\n${preview2}\n\n` +
+						`Add more context lines to disambiguate.`,
 				);
 			}
 		}

package/src/core/tools/patch/diff.ts

@@ -228,9 +228,11 @@ export function replaceText(content: string, oldText: string, newText: string, o
 	});
 
 	if (matchOutcome.occurrences && matchOutcome.occurrences > 1) {
+		const previews = matchOutcome.occurrencePreviews?.join("\n\n") ?? "";
+		const moreMsg = matchOutcome.occurrences > 5 ? ` (showing first 5 of ${matchOutcome.occurrences})` : "";
 		throw new Error(
-			`Found ${matchOutcome.occurrences} occurrences of the text. ` +
-				`The text must be unique. Please provide more context to make it unique, or use all: true to replace all.`,
+			`Found ${matchOutcome.occurrences} occurrences${moreMsg}:\n\n${previews}\n\n` +
+				`Add more context lines to disambiguate.`,
 		);
 	}
 
@@ -307,8 +309,10 @@ export async function computeEditDiff(
 			});
 
 			if (matchOutcome.occurrences && matchOutcome.occurrences > 1) {
+				const previews = matchOutcome.occurrencePreviews?.join("\n\n") ?? "";
+				const moreMsg = matchOutcome.occurrences > 5 ? ` (showing first 5 of ${matchOutcome.occurrences})` : "";
 				return {
-					error: `Found ${matchOutcome.occurrences} occurrences of the text in ${path}. The text must be unique. Please provide more context to make it unique, or use all: true to replace all.`,
+					error: `Found ${matchOutcome.occurrences} occurrences in ${path}${moreMsg}:\n\n${previews}\n\nAdd more context lines to disambiguate.`,
 				};
 			}
 

package/src/core/tools/patch/fuzzy.ts

@@ -215,7 +215,25 @@ export function findMatch(
 	if (exactIndex !== -1) {
 		const occurrences = content.split(target).length - 1;
 		if (occurrences > 1) {
-			return { occurrences };
+			// Find line numbers and previews for each occurrence (up to 5)
+			const contentLines = content.split("\n");
+			const occurrenceLines: number[] = [];
+			const occurrencePreviews: string[] = [];
+			let searchStart = 0;
+			for (let i = 0; i < 5; i++) {
+				const idx = content.indexOf(target, searchStart);
+				if (idx === -1) break;
+				const lineNumber = content.slice(0, idx).split("\n").length;
+				occurrenceLines.push(lineNumber);
+				// Extract 3 lines starting from match (0-indexed)
+				const previewLines = contentLines.slice(lineNumber - 1, lineNumber + 2);
+				const preview = previewLines
+					.map((line, i) => `  ${lineNumber + i} | ${line.length > 60 ? `${line.slice(0, 57)}...` : line}`)
+					.join("\n");
+				occurrencePreviews.push(preview);
+				searchStart = idx + 1;
+			}
+			return { occurrences, occurrenceLines, occurrencePreviews };
 		}
 		const startLine = content.slice(0, exactIndex).split("\n").length;
 		return {

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

@@ -390,8 +390,11 @@ export class EditTool implements AgentTool<TInput> {
 			});
 
 			if (matchOutcome.occurrences && matchOutcome.occurrences > 1) {
+				const previews = matchOutcome.occurrencePreviews?.join("\n\n") ?? "";
+				const moreMsg = matchOutcome.occurrences > 5 ? ` (showing first 5 of ${matchOutcome.occurrences})` : "";
 				throw new Error(
-					`Found ${matchOutcome.occurrences} occurrences of the text in ${path}. The text must be unique. Please provide more context to make it unique, or use all: true to replace all.`,
+					`Found ${matchOutcome.occurrences} occurrences in ${path}${moreMsg}:\n\n${previews}\n\n` +
+						`Add more context lines to disambiguate.`,
 				);
 			}
 

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

@@ -40,6 +40,10 @@ export interface MatchOutcome {
 	closest?: FuzzyMatch;
 	/** Number of occurrences if multiple exact matches found */
 	occurrences?: number;
+	/** Line numbers where occurrences were found (1-indexed) */
+	occurrenceLines?: number[];
+	/** Preview snippets for each occurrence (up to 5) */
+	occurrencePreviews?: string[];
 	/** Number of fuzzy matches above threshold */
 	fuzzyMatches?: number;
 }

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

@@ -4,19 +4,19 @@
  * 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";
 import { callTool } from "../../mcp/client";
 import type { MCPManager } from "../../mcp/manager";
 import type { ModelRegistry } from "../../model-registry";
+import { formatModelString, parseModelPattern } from "../../model-resolver";
 import { checkPythonKernelAvailability } from "../../python-kernel";
 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 { resolveModelPattern } from "./model-resolver";
 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
@@ -296,10 +285,26 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	}
 
 	const serializedSettings = options.settingsManager?.serialize();
-	const availableModels = options.modelRegistry?.getAvailable().map((model) => `${model.provider}/${model.id}`);
-
-	// Resolve and add model
-	const resolvedModel = await resolveModelPattern(modelOverride || agent.model, availableModels, serializedSettings);
+	const availableModels = options.modelRegistry?.getAvailable() ?? [];
+
+	// Resolve model pattern to provider/modelId string
+	const modelPattern = modelOverride ?? agent.model;
+	let resolvedModel: string | undefined;
+	if (modelPattern) {
+		// Handle omp/<role> or pi/<role> aliases (e.g., "omp/slow", "pi/fast")
+		let effectivePattern = modelPattern;
+		const lower = modelPattern.toLowerCase();
+		if (lower.startsWith("omp/") || lower.startsWith("pi/")) {
+			const role = lower.startsWith("omp/") ? modelPattern.slice(4) : modelPattern.slice(3);
+			const roles = serializedSettings?.modelRoles as Record<string, string> | undefined;
+			const configured = roles?.[role] ?? roles?.[role.toLowerCase()];
+			if (configured) {
+				effectivePattern = configured;
+			}
+		}
+		const { model } = parseModelPattern(effectivePattern, availableModels);
+		resolvedModel = model ? formatModelString(model) : undefined;
+	}
 	const sessionFile = subtaskSessionFile ?? null;
 	const spawnsEnv = agent.spawns === undefined ? "" : agent.spawns === "*" ? "*" : agent.spawns.join(",");
 
@@ -1026,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,
@@ -1060,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 */