@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/task/output-manager.ts

@@ -0,0 +1,93 @@
+/**
+ * Session-scoped manager for agent output IDs.
+ *
+ * Ensures unique output IDs across task tool invocations within a session.
+ * Prefixes each ID with a sequential number (e.g., "0-AuthProvider", "1-AuthApi").
+ *
+ * This enables reliable agent:// URL resolution and prevents artifact collisions.
+ */
+import * as fs from "node:fs/promises";
+
+/**
+ * Manages agent output ID allocation to ensure uniqueness.
+ *
+ * Each allocated ID gets a numeric prefix based on allocation order.
+ * On resume, scans existing files to find the next available index.
+ */
+export class AgentOutputManager {
+	#nextId = 0;
+	#initialized = false;
+	readonly #getArtifactsDir: () => string | null;
+
+	constructor(getArtifactsDir: () => string | null) {
+		this.#getArtifactsDir = getArtifactsDir;
+	}
+
+	/**
+	 * Scan existing agent output files to find the next available ID.
+	 * This ensures we don't overwrite outputs when resuming a session.
+	 */
+	async #ensureInitialized(): Promise<void> {
+		if (this.#initialized) return;
+		this.#initialized = true;
+
+		const dir = this.#getArtifactsDir();
+		if (!dir) return;
+
+		let files: string[];
+		try {
+			files = await fs.readdir(dir);
+		} catch {
+			return; // Directory doesn't exist yet
+		}
+
+		let maxId = -1;
+		for (const file of files) {
+			// Agent outputs are named: {index}-{id}.md (e.g., "0-AuthProvider.md")
+			const match = file.match(/^(\d+)-.*\.md$/);
+			if (match) {
+				const id = parseInt(match[1], 10);
+				if (id > maxId) maxId = id;
+			}
+		}
+		this.#nextId = maxId + 1;
+	}
+
+	/**
+	 * Allocate a unique ID with numeric prefix.
+	 *
+	 * @param id Requested ID (e.g., "AuthProvider")
+	 * @returns Unique ID with prefix (e.g., "0-AuthProvider")
+	 */
+	async allocate(id: string): Promise<string> {
+		await this.#ensureInitialized();
+		return `${this.#nextId++}-${id}`;
+	}
+
+	/**
+	 * Allocate unique IDs for a batch of tasks.
+	 *
+	 * @param ids Array of requested IDs
+	 * @returns Array of unique IDs in same order
+	 */
+	async allocateBatch(ids: string[]): Promise<string[]> {
+		await this.#ensureInitialized();
+		return ids.map(id => `${this.#nextId++}-${id}`);
+	}
+
+	/**
+	 * Get the next ID that would be allocated (without allocating).
+	 */
+	async peekNextIndex(): Promise<number> {
+		await this.#ensureInitialized();
+		return this.#nextId;
+	}
+
+	/**
+	 * Reset state (primarily for testing).
+	 */
+	reset(): void {
+		this.#nextId = 0;
+		this.#initialized = false;
+	}
+}

package/src/task/parallel.ts

@@ -1,7 +1,6 @@
 /**
  * Parallel execution with concurrency control.
  */
-
 import { MAX_CONCURRENCY } from "./types";
 
 /** Result of parallel execution */

package/src/task/render.ts

@@ -4,10 +4,11 @@
  * Provides renderCall and renderResult functions for displaying
  * task execution in the terminal UI.
  */
-
 import path from "node:path";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Container, Text } from "@oh-my-pi/pi-tui";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
 import {
 	formatBadge,
 	formatDuration,
@@ -15,16 +16,15 @@ import {
 	formatStatusIcon,
 	formatTokens,
 	truncate,
-} from "@oh-my-pi/pi-coding-agent/tools/render-utils";
+} from "../tools/render-utils";
 import {
 	type FindingPriority,
 	getPriorityInfo,
 	PRIORITY_LABELS,
 	type ReportFindingDetails,
 	type SubmitReviewDetails,
-} from "@oh-my-pi/pi-coding-agent/tools/review";
-import type { Component } from "@oh-my-pi/pi-tui";
-import { Container, Text } from "@oh-my-pi/pi-tui";
+} from "../tools/review";
+import { renderStatusLine } from "../tui";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
 import type { AgentProgress, SingleResult, TaskParams, TaskToolDetails } from "./types";
 
@@ -78,7 +78,7 @@ function formatJsonScalar(value: unknown, theme: Theme): string {
 }
 
 function buildTreePrefix(ancestors: boolean[], theme: Theme): string {
-	return ancestors.map((hasNext) => (hasNext ? `${theme.tree.vertical}  ` : "   ")).join("");
+	return ancestors.map(hasNext => (hasNext ? `${theme.tree.vertical}  ` : "   ")).join("");
 }
 
 function renderJsonTreeLines(
@@ -229,7 +229,7 @@ function renderOutputSection(
 	maxExpanded = 10,
 ): string[] {
 	const lines: string[] = [];
-	const trimmedOutput = output.trim();
+	const trimmedOutput = output.trimEnd();
 	if (!trimmedOutput) return lines;
 
 	if (trimmedOutput.startsWith("{") || trimmedOutput.startsWith("[")) {
@@ -261,7 +261,7 @@ function renderOutputSection(
 
 	lines.push(`${continuePrefix}${theme.fg("dim", "Output")}`);
 
-	const outputLines = output.split("\n").filter((line) => line.trim());
+	const outputLines = output.trimEnd().split("\n");
 	const previewCount = expanded ? maxExpanded : maxCollapsed;
 	for (const line of outputLines.slice(0, previewCount)) {
 		lines.push(`${continuePrefix}  ${theme.fg("dim", truncate(line, 70, theme.format.ellipsis))}`);
@@ -294,7 +294,7 @@ function formatArgsInline(args: Record<string, string>, theme: Theme): string {
 
 /** Convert snake_case or kebab-case to Title Case */
 function humanizeKey(key: string): string {
-	return key.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
+	return key.replace(/[-_]/g, " ").replace(/\b\w/g, c => c.toUpperCase());
 }
 
 function formatScalarInline(value: unknown, maxLen: number, theme: Theme): string {
@@ -395,13 +395,8 @@ function renderArgsSection(
  * Render the tool call arguments.
  */
 export function renderCall(args: TaskParams, theme: Theme): Component {
-	const label = theme.fg("toolTitle", theme.bold("Task"));
-	const agentTag = theme.italic(
-		theme.fg("dim", `${theme.format.bracketLeft}${args.agent}${theme.format.bracketRight}`),
-	);
-
 	const lines: string[] = [];
-	lines.push(`${label} ${agentTag}`);
+	lines.push(renderStatusLine({ icon: "pending", title: "Task", description: args.agent }, theme));
 
 	const contextTemplate = args.context ?? "";
 	const context = contextTemplate.trim();
@@ -516,8 +511,8 @@ function renderAgentProgress(
 			const completeData = progress.extractedToolData.complete as Array<{ data: unknown }> | undefined;
 			const reportFindingData = progress.extractedToolData.report_finding as ReportFindingDetails[] | undefined;
 			const reviewData = completeData
-				?.map((c) => c.data as SubmitReviewDetails)
-				.filter((d) => d && typeof d === "object" && "overall_correctness" in d);
+				?.map(c => c.data as SubmitReviewDetails)
+				.filter(d => d && typeof d === "object" && "overall_correctness" in d);
 			if (reviewData && reviewData.length > 0) {
 				const summary = reviewData[reviewData.length - 1];
 				const findings = reportFindingData ?? [];
@@ -701,8 +696,8 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 
 	// Extract review verdict from complete tool's data field if it matches SubmitReviewDetails
 	const reviewData = completeData
-		?.map((c) => c.data as SubmitReviewDetails)
-		.filter((d) => d && typeof d === "object" && "overall_correctness" in d);
+		?.map(c => c.data as SubmitReviewDetails)
+		.filter(d => d && typeof d === "object" && "overall_correctness" in d);
 	const submitReviewData = reviewData && reviewData.length > 0 ? reviewData : undefined;
 
 	if (submitReviewData && submitReviewData.length > 0) {
@@ -734,13 +729,12 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 			if (handler?.renderFinal && (dataArray as unknown[]).length > 0) {
 				hasCustomRendering = true;
 				const component = handler.renderFinal(dataArray as unknown[], theme, expanded);
+				lines.push(`${continuePrefix}${theme.fg("dim", `Tool: ${toolName}`)}`);
 				if (component instanceof Text) {
 					// Prefix each line with continuePrefix
 					const text = component.getText();
 					for (const line of text.split("\n")) {
-						if (line.trim()) {
-							lines.push(`${continuePrefix}${line}`);
-						}
+						lines.push(`${continuePrefix}${line}`);
 					}
 				} else if (component instanceof Container) {
 					// For containers, render each child
@@ -780,12 +774,12 @@ export function renderResult(
 	theme: Theme,
 ): Component {
 	const { expanded, isPartial, spinnerFrame } = options;
-	const fallbackText = result.content.find((c) => c.type === "text")?.text ?? "";
+	const fallbackText = result.content.find(c => c.type === "text")?.text ?? "";
 	const details = result.details;
 
 	if (!details) {
 		// Fallback to simple text
-		const text = result.content.find((c) => c.type === "text")?.text || "";
+		const text = result.content.find(c => c.type === "text")?.text || "";
 		return new Text(theme.fg("dim", truncate(text, 100, theme.format.ellipsis)), 0, 0);
 	}
 
@@ -805,8 +799,8 @@ export function renderResult(
 		});
 
 		// Summary line
-		const abortedCount = details.results.filter((r) => r.aborted).length;
-		const successCount = details.results.filter((r) => !r.aborted && r.exitCode === 0).length;
+		const abortedCount = details.results.filter(r => r.aborted).length;
+		const successCount = details.results.filter(r => !r.aborted && r.exitCode === 0).length;
 		const failCount = details.results.length - successCount - abortedCount;
 		let summary = `${theme.fg("dim", "Total:")} `;
 		if (abortedCount > 0) {
@@ -834,7 +828,7 @@ export function renderResult(
 	if (fallbackText.trim()) {
 		const summaryLines = fallbackText.split("\n");
 		const markerIndex = summaryLines.findIndex(
-			(line) => line.includes("<system-notification>") || line.startsWith("Applied patches:"),
+			line => line.includes("<system-notification>") || line.startsWith("Applied patches:"),
 		);
 		if (markerIndex >= 0) {
 			const extra = summaryLines.slice(markerIndex);
@@ -845,7 +839,7 @@ export function renderResult(
 		}
 	}
 
-	const indented = lines.map((line) => (line.trim() ? `   ${line}` : ""));
+	const indented = lines.map(line => (line.length > 0 ? `   ${line}` : ""));
 	return new Text(indented.join("\n"), 0, 0);
 }
 

package/src/task/subprocess-tool-registry.ts

@@ -6,9 +6,8 @@
  * - Trigger subprocess termination on completion
  * - Provide custom rendering for realtime/final display
  */
-
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import type { Component } from "@oh-my-pi/pi-tui";
+import type { Theme } from "../modes/theme/theme";
 
 /** Event from subprocess tool execution (parsed from JSONL) */
 export interface SubprocessToolEvent {

package/src/task/worker-protocol.ts

@@ -1,7 +1,7 @@
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { SerializedModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import type { Settings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { SerializedAuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
+import type { SerializedModelRegistry } from "../config/model-registry";
+import type { Settings } from "../config/settings-manager";
+import type { SerializedAuthStorage } from "../session/auth-storage";
 
 /**
  * MCP tool metadata passed from parent to worker for proxy tool creation.

package/src/task/worker.ts

@@ -12,29 +12,23 @@
  * 4. Worker sends { type: "done", exitCode, ... } on completion
  * 5. Parent can send { type: "abort" } to request cancellation
  */
-
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { parseModelPattern, parseModelString } from "@oh-my-pi/pi-coding-agent/config/model-resolver";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { type LspToolDetails, lspSchema } from "@oh-my-pi/pi-coding-agent/lsp/types";
-import lspDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/lsp.md" with { type: "text" };
-import { createAgentSession, discoverAuthStorage, discoverModels } from "@oh-my-pi/pi-coding-agent/sdk";
-import type { AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import { AuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
-import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import {
-	getPythonToolDescription,
-	type PythonToolDetails,
-	type PythonToolParams,
-	pythonSchema,
-} from "@oh-my-pi/pi-coding-agent/tools/python";
-import { ToolAbortError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
 import { logger, postmortem, untilAborted } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
+import { ModelRegistry } from "../config/model-registry";
+import { parseModelPattern, parseModelString } from "../config/model-resolver";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { SettingsManager } from "../config/settings-manager";
+import type { CustomTool } from "../extensibility/custom-tools/types";
+import { type LspToolDetails, lspSchema } from "../lsp/types";
+import lspDescription from "../prompts/tools/lsp.md" with { type: "text" };
+import { createAgentSession, discoverAuthStorage, discoverModels } from "../sdk";
+import type { AgentSessionEvent } from "../session/agent-session";
+import { AuthStorage } from "../session/auth-storage";
+import { SessionManager } from "../session/session-manager";
+import { getPythonToolDescription, type PythonToolDetails, type PythonToolParams, pythonSchema } from "../tools/python";
+import { ToolAbortError } from "../tools/tool-errors";
 import type {
 	LspToolCallResponse,
 	MCPToolCallResponse,
@@ -47,7 +41,7 @@ import type {
 
 type PostMessageFn = (message: SubagentWorkerResponse) => void;
 
-const postMessageSafe: PostMessageFn = (message) => {
+const postMessageSafe: PostMessageFn = message => {
 	try {
 		(globalThis as typeof globalThis & { postMessage: PostMessageFn }).postMessage(message);
 	} catch {
@@ -132,11 +126,11 @@ function callMCPToolViaParent(
 	}
 
 	pendingMCPCalls.set(callId, {
-		resolve: (result) => {
+		resolve: result => {
 			cleanup();
 			resolve(result ?? { content: [] });
 		},
-		reject: (error) => {
+		reject: error => {
 			cleanup();
 			reject(error);
 		},
@@ -200,11 +194,11 @@ function callPythonToolViaParent(
 	}
 
 	pendingPythonCalls.set(callId, {
-		resolve: (result) => {
+		resolve: result => {
 			cleanup();
 			resolve(result ?? { content: [] });
 		},
-		reject: (error) => {
+		reject: error => {
 			cleanup();
 			reject(error);
 		},
@@ -260,11 +254,11 @@ function callLspToolViaParent(
 	}
 
 	pendingLspCalls.set(callId, {
-		resolve: (result) => {
+		resolve: result => {
 			cleanup();
 			resolve(result ?? { content: [] });
 		},
-		reject: (error) => {
+		reject: error => {
 			cleanup();
 			reject(error);
 		},
@@ -349,7 +343,7 @@ function createMCPProxyTool(metadata: MCPToolMetadata): CustomTool<TSchema> {
 					metadata.timeoutMs,
 				);
 				return {
-					content: result.content.map((c) =>
+					content: result.content.map(c =>
 						c.type === "text"
 							? { type: "text" as const, text: c.text ?? "" }
 							: { type: "text" as const, text: JSON.stringify(c) },
@@ -391,7 +385,7 @@ function createPythonProxyTool(): CustomTool<typeof pythonSchema> {
 				const result = await callPythonToolViaParent(params as PythonToolParams, signal, timeoutMs);
 				return {
 					content:
-						result?.content?.map((c) =>
+						result?.content?.map(c =>
 							c.type === "text"
 								? { type: "text" as const, text: c.text ?? "" }
 								: { type: "text" as const, text: JSON.stringify(c) },
@@ -424,7 +418,7 @@ function createLspProxyTool(): CustomTool<typeof lspSchema> {
 				const result = await callLspToolViaParent(params as Record<string, unknown>, signal);
 				return {
 					content:
-						result?.content?.map((c) =>
+						result?.content?.map(c =>
 							c.type === "text"
 								? { type: "text" as const, text: c.text ?? "" }
 								: { type: "text" as const, text: JSON.stringify(c) },
@@ -552,7 +546,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 		let modelRegistry: ModelRegistry;
 
 		if (payload.serializedAuth && payload.serializedModels) {
-			authStorage = AuthStorage.fromSerialized(payload.serializedAuth);
+			authStorage = await AuthStorage.fromSerialized(payload.serializedAuth);
 			modelRegistry = ModelRegistry.fromSerialized(payload.serializedModels, authStorage);
 		} else {
 			authStorage = await discoverAuthStorage();
@@ -606,7 +600,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 			outputSchema: payload.outputSchema,
 			requireCompleteTool: true,
 			// Append system prompt (equivalent to CLI's --append-system-prompt)
-			systemPrompt: (defaultPrompt) =>
+			systemPrompt: defaultPrompt =>
 				`${defaultPrompt}\n\n${payload.systemPrompt}\n\n${worktreeNotice}\n\n${completionInstruction}`,
 			sessionManager,
 			hasUI: false,
@@ -638,14 +632,14 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 				// ExtensionActions
 				{
 					sendMessage: (message, options) => {
-						session.sendCustomMessage(message, options).catch((e) => {
+						session.sendCustomMessage(message, options).catch(e => {
 							logger.error("Extension sendMessage failed", {
 								error: e instanceof Error ? e.message : String(e),
 							});
 						});
 					},
 					sendUserMessage: (content, options) => {
-						session.sendUserMessage(content, options).catch((e) => {
+						session.sendUserMessage(content, options).catch(e => {
 							logger.error("Extension sendUserMessage failed", {
 								error: e instanceof Error ? e.message : String(e),
 							});
@@ -660,14 +654,14 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 					getActiveTools: () => session.getActiveToolNames(),
 					getAllTools: () => session.getAllToolNames(),
 					setActiveTools: (toolNames: string[]) => session.setActiveToolsByName(toolNames),
-					setModel: async (model) => {
+					setModel: async model => {
 						const key = await session.modelRegistry.getApiKey(model);
 						if (!key) return false;
 						await session.setModel(model);
 						return true;
 					},
 					getThinkingLevel: () => session.thinkingLevel,
-					setThinkingLevel: (level) => session.setThinkingLevel(level),
+					setThinkingLevel: level => session.setThinkingLevel(level),
 				},
 				// ExtensionContextActions
 				{
@@ -677,7 +671,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 					hasPendingMessages: () => session.queuedMessageCount > 0,
 					shutdown: () => {},
 					getContextUsage: () => session.getContextUsage(),
-					compact: async (instructionsOrOptions) => {
+					compact: async instructionsOrOptions => {
 						const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
 						const options =
 							instructionsOrOptions && typeof instructionsOrOptions === "object"
@@ -687,7 +681,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 					},
 				},
 			);
-			extensionRunner.onError((err) => {
+			extensionRunner.onError(err => {
 				logger.error("Extension error", { path: err.extensionPath, error: err.error });
 			});
 			await extensionRunner.emit({ type: "session_start" });
@@ -844,11 +838,11 @@ declare const self: {
 	addEventListener(type: "messageerror", listener: (event: MessageEvent) => void): void;
 };
 
-self.addEventListener("error", (event) => {
+self.addEventListener("error", event => {
 	reportFatal(`Uncaught error: ${event.message || "Unknown error"}`);
 });
 
-self.addEventListener("unhandledrejection", (event) => {
+self.addEventListener("unhandledrejection", event => {
 	const reason = event.reason;
 	const message = reason instanceof Error ? reason.stack || reason.message : String(reason);
 

package/src/task/worktree.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
-import { cp, mkdir, rm } from "node:fs/promises";
-import { homedir, tmpdir } from "node:os";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
 import path from "node:path";
 import { $ } from "bun";
 
@@ -30,10 +30,10 @@ export async function getRepoRoot(cwd: string): Promise<string> {
 export async function ensureWorktree(baseCwd: string, id: string): Promise<string> {
 	const repoRoot = await getRepoRoot(baseCwd);
 	const encodedProject = getEncodedProjectName(repoRoot);
-	const worktreeDir = path.join(homedir(), ".omp", "wt", encodedProject, id);
-	await mkdir(path.dirname(worktreeDir), { recursive: true });
+	const worktreeDir = path.join(os.homedir(), ".omp", "wt", encodedProject, id);
+	await fs.mkdir(path.dirname(worktreeDir), { recursive: true });
 	await $`git worktree remove -f ${worktreeDir}`.cwd(repoRoot).quiet().nothrow();
-	await rm(worktreeDir, { recursive: true, force: true });
+	await fs.rm(worktreeDir, { recursive: true, force: true });
 	await $`git worktree add --detach ${worktreeDir} HEAD`.cwd(repoRoot).quiet();
 	return worktreeDir;
 }
@@ -44,8 +44,8 @@ export async function captureBaseline(repoRoot: string): Promise<WorktreeBaselin
 	const untrackedRaw = await $`git ls-files --others --exclude-standard`.cwd(repoRoot).quiet().text();
 	const untracked = untrackedRaw
 		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0);
+		.map(line => line.trim())
+		.filter(line => line.length > 0);
 
 	return {
 		repoRoot,
@@ -56,7 +56,7 @@ export async function captureBaseline(repoRoot: string): Promise<WorktreeBaselin
 }
 
 async function writeTempPatchFile(patch: string): Promise<string> {
-	const tempPath = path.join(tmpdir(), `omp-task-patch-${randomUUID()}.patch`);
+	const tempPath = path.join(os.tmpdir(), `omp-task-patch-${randomUUID()}.patch`);
 	await Bun.write(tempPath, patch);
 	return tempPath;
 }
@@ -76,7 +76,7 @@ async function applyPatch(
 		}
 		await runner;
 	} finally {
-		await rm(tempPath, { force: true });
+		await fs.rm(tempPath, { force: true });
 	}
 }
 
@@ -90,8 +90,8 @@ export async function applyBaseline(worktreeDir: string, baseline: WorktreeBasel
 		const destination = path.join(worktreeDir, entry);
 		const exists = await Bun.file(source).exists();
 		if (!exists) continue;
-		await mkdir(path.dirname(destination), { recursive: true });
-		await cp(source, destination, { recursive: true });
+		await fs.mkdir(path.dirname(destination), { recursive: true });
+		await fs.cp(source, destination, { recursive: true });
 	}
 }
 
@@ -106,7 +106,7 @@ async function applyPatchToIndex(cwd: string, patch: string, indexFile: string):
 			})
 			.quiet();
 	} finally {
-		await rm(tempPath, { force: true });
+		await fs.rm(tempPath, { force: true });
 	}
 }
 
@@ -114,12 +114,12 @@ async function listUntracked(cwd: string): Promise<string[]> {
 	const raw = await $`git ls-files --others --exclude-standard`.cwd(cwd).quiet().text();
 	return raw
 		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0);
+		.map(line => line.trim())
+		.filter(line => line.length > 0);
 }
 
 export async function captureDeltaPatch(worktreeDir: string, baseline: WorktreeBaseline): Promise<string> {
-	const tempIndex = path.join(tmpdir(), `omp-task-index-${randomUUID()}`);
+	const tempIndex = path.join(os.tmpdir(), `omp-task-index-${randomUUID()}`);
 	try {
 		await $`git read-tree HEAD`.cwd(worktreeDir).env({
 			GIT_INDEX_FILE: tempIndex,
@@ -136,18 +136,18 @@ export async function captureDeltaPatch(worktreeDir: string, baseline: WorktreeB
 
 		const currentUntracked = await listUntracked(worktreeDir);
 		const baselineUntracked = new Set(baseline.untracked);
-		const newUntracked = currentUntracked.filter((entry) => !baselineUntracked.has(entry));
+		const newUntracked = currentUntracked.filter(entry => !baselineUntracked.has(entry));
 
 		if (newUntracked.length === 0) return diff;
 
 		const untrackedDiffs = await Promise.all(
-			newUntracked.map((entry) =>
+			newUntracked.map(entry =>
 				$`git diff --binary --no-index /dev/null ${entry}`.cwd(worktreeDir).quiet().nothrow().text(),
 			),
 		);
 		return `${diff}${diff && !diff.endsWith("\n") ? "\n" : ""}${untrackedDiffs.join("\n")}`;
 	} finally {
-		await rm(tempIndex, { force: true });
+		await fs.rm(tempIndex, { force: true });
 	}
 }
 
@@ -161,6 +161,6 @@ export async function cleanupWorktree(dir: string): Promise<void> {
 			await $`git worktree remove -f ${dir}`.cwd(repoRoot).quiet().nothrow();
 		}
 	} finally {
-		await rm(dir, { recursive: true, force: true });
+		await fs.rm(dir, { recursive: true, force: true });
 	}
 }