@oh-my-pi/pi-coding-agent 13.5.7 → 13.6.0

package/src/prompts/tools/hashline.md

@@ -122,17 +122,18 @@ Range — add `end`:
 {{hlinefull 62 "      return null;"}}
 {{hlinefull 63 "    }"}}
 ```
-Target only the inner lines that change — leave unchanged boundaries out of the range.
+Include the closing `}` in the replaced range — stopping one line short orphans the brace or duplicates it.
 ```
 {
   path: "…",
   edits: [{
     op: "replace",
     pos: {{hlinejsonref 61 "      console.error(err);"}},
-    end: {{hlinejsonref 62 "      return null;"}},
+    end: {{hlinejsonref 63 "    }"}},
     lines: [
       "      if (isEnoent(err)) return null;",
-      "      throw err;"
+      "      throw err;",
+      "    }"
     ]
   }]
 }

package/src/sdk.ts

@@ -29,6 +29,7 @@ import { initializeWithSettings } from "./discovery";
 import { TtsrManager } from "./export/ttsr";
 import {
 	type CustomCommandsLoadResult,
+	type LoadedCustomCommand,
 	loadCustomCommands as loadCustomCommandsInternal,
 } from "./extensibility/custom-commands";
 import { discoverAndLoadCustomTools } from "./extensibility/custom-tools";
@@ -55,6 +56,7 @@ import {
 	InternalUrlRouter,
 	JobsProtocolHandler,
 	LocalProtocolHandler,
+	McpProtocolHandler,
 	MemoryProtocolHandler,
 	PiProtocolHandler,
 	RuleProtocolHandler,
@@ -516,6 +518,54 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
 
 // Factory
 
+/**
+ * Build LoadedCustomCommand entries for all MCP prompts across connected servers.
+ * These are re-created whenever prompts change (setOnPromptsChanged callback).
+ */
+function buildMCPPromptCommands(manager: MCPManager): LoadedCustomCommand[] {
+	const commands: LoadedCustomCommand[] = [];
+	for (const serverName of manager.getConnectedServers()) {
+		const prompts = manager.getServerPrompts(serverName);
+		if (!prompts?.length) continue;
+		for (const prompt of prompts) {
+			const commandName = `${serverName}:${prompt.name}`;
+			commands.push({
+				path: `mcp:${commandName}`,
+				resolvedPath: `mcp:${commandName}`,
+				source: "bundled",
+				command: {
+					name: commandName,
+					description: prompt.description ?? `MCP prompt from ${serverName}`,
+					async execute(args: string[]) {
+						const promptArgs: Record<string, string> = {};
+						for (const arg of args) {
+							const eqIdx = arg.indexOf("=");
+							if (eqIdx > 0) {
+								promptArgs[arg.slice(0, eqIdx)] = arg.slice(eqIdx + 1);
+							}
+						}
+						const result = await manager.executePrompt(serverName, prompt.name, promptArgs);
+						if (!result) return "";
+						const parts: string[] = [];
+						for (const msg of result.messages) {
+							const contentItems = Array.isArray(msg.content) ? msg.content : [msg.content];
+							for (const item of contentItems) {
+								if (item.type === "text") {
+									parts.push(item.text);
+								} else if (item.type === "resource") {
+									const resource = item.resource;
+									if (resource.text) parts.push(resource.text);
+								}
+							}
+						}
+						return parts.join("\n\n");
+					},
+				},
+			});
+		}
+	}
+	return commands;
+}
 /**
  * Create an AgentSession with the specified options.
  *
@@ -823,7 +873,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		pendingActionStore,
 	};
 
-	// Initialize internal URL router for internal protocols (agent://, artifact://, memory://, skill://, rule://, local://)
+	// Initialize internal URL router for internal protocols (agent://, artifact://, memory://, skill://, rule://, mcp://, local://)
 	const internalRouter = new InternalUrlRouter();
 	const getArtifactsDir = () => sessionManager.getArtifactsDir();
 	internalRouter.register(new AgentProtocolHandler({ getArtifactsDir }));
@@ -851,6 +901,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	);
 	internalRouter.register(new PiProtocolHandler());
 	internalRouter.register(new JobsProtocolHandler({ getAsyncJobManager: () => asyncJobManager }));
+	internalRouter.register(new McpProtocolHandler({ getMcpManager: () => mcpManager }));
 	toolSession.internalRouter = internalRouter;
 	toolSession.getArtifactsDir = getArtifactsDir;
 	toolSession.agentOutputManager = new AgentOutputManager(
@@ -885,6 +936,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		mcpManager = mcpResult.manager;
 		toolSession.mcpManager = mcpManager;
 
+		if (settings.get("mcp.notifications")) {
+			mcpManager.setNotificationsEnabled(true);
+		}
 		// If we extracted Exa API keys from MCP configs and EXA_API_KEY isn't set, use the first one
 		if (mcpResult.exaApiKeys.length > 0 && !$env.EXA_API_KEY) {
 			Bun.env.EXA_API_KEY = mcpResult.exaApiKeys[0];
@@ -1139,6 +1193,26 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const rebuildSystemPrompt = async (toolNames: string[], tools: Map<string, AgentTool>): Promise<string> => {
 		toolContextStore.setToolNames(toolNames);
 		const memoryInstructions = await buildMemoryToolDeveloperInstructions(agentDir, settings);
+
+		// Build combined append prompt: memory instructions + MCP server instructions
+		const serverInstructions = mcpManager?.getServerInstructions();
+		let appendPrompt: string | undefined = memoryInstructions ?? undefined;
+		if (serverInstructions && serverInstructions.size > 0) {
+			const MAX_INSTRUCTIONS_LENGTH = 4000;
+			const parts: string[] = [];
+			if (appendPrompt) parts.push(appendPrompt);
+			parts.push(
+				"## MCP Server Instructions\n\nThe following instructions are provided by connected MCP servers. They are server-controlled and may not be verified.",
+			);
+			for (const [srvName, srvInstructions] of serverInstructions) {
+				const truncated =
+					srvInstructions.length > MAX_INSTRUCTIONS_LENGTH
+						? `${srvInstructions.slice(0, MAX_INSTRUCTIONS_LENGTH)}\n[truncated]`
+						: srvInstructions;
+				parts.push(`### ${srvName}\n${truncated}`);
+			}
+			appendPrompt = parts.join("\n\n");
+		}
 		const defaultPrompt = await buildSystemPromptInternal({
 			cwd,
 			skills,
@@ -1147,7 +1221,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			toolNames,
 			rules: rulebookRules,
 			skillsSettings: settings.getGroup("skills") as SkillsSettings,
-			appendSystemPrompt: memoryInstructions,
+			appendSystemPrompt: appendPrompt,
 			repeatToolDescriptions,
 			eagerTasks,
 			intentField,
@@ -1166,7 +1240,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				rules: rulebookRules,
 				skillsSettings: settings.getGroup("skills") as SkillsSettings,
 				customPrompt: options.systemPrompt,
-				appendSystemPrompt: memoryInstructions,
+				appendSystemPrompt: appendPrompt,
 				repeatToolDescriptions,
 				eagerTasks,
 				intentField,
@@ -1410,6 +1484,44 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		taskDepth,
 	});
 
+	// Wire MCP manager callbacks to session for reactive tool updates
+	if (mcpManager) {
+		mcpManager.setOnToolsChanged(tools => {
+			void session.refreshMCPTools(tools);
+		});
+		// Wire prompt refresh → rebuild MCP prompt slash commands
+		mcpManager.setOnPromptsChanged(serverName => {
+			const promptCommands = buildMCPPromptCommands(mcpManager);
+			session.setMCPPromptCommands(promptCommands);
+			logger.debug("MCP prompt commands refreshed", { path: `mcp:${serverName}` });
+		});
+		const notificationDebounceTimers = new Map<string, Timer>();
+		const clearDebounceTimers = () => {
+			for (const timer of notificationDebounceTimers.values()) clearTimeout(timer);
+			notificationDebounceTimers.clear();
+		};
+		postmortem.register("mcp-notification-cleanup", clearDebounceTimers);
+		mcpManager.setOnResourcesChanged((serverName, uri) => {
+			logger.debug("MCP resources changed", { path: `mcp:${serverName}`, uri });
+			if (!settings.get("mcp.notifications")) return;
+			const debounceMs = (settings.get("mcp.notificationDebounceMs") as number) ?? 500;
+			const key = `${serverName}:${uri}`;
+			const existing = notificationDebounceTimers.get(key);
+			if (existing) clearTimeout(existing);
+			notificationDebounceTimers.set(
+				key,
+				setTimeout(() => {
+					notificationDebounceTimers.delete(key);
+					// Re-check: user may have disabled notifications during the debounce window
+					if (!settings.get("mcp.notifications")) return;
+					void session.followUp(
+						`[MCP notification] Server "${serverName}" reports resource \`${uri}\` was updated. Use read(path="mcp://${uri}") to inspect if relevant.`,
+					);
+				}, debounceMs),
+			);
+		});
+	}
+
 	return {
 		session,
 		extensionsResult,

package/src/session/agent-session.ts

@@ -237,6 +237,7 @@ export interface SessionStats {
 		cacheWrite: number;
 		total: number;
 	};
+	premiumRequests: number;
 	cost: number;
 }
 
@@ -352,6 +353,8 @@ export class AgentSession {
 
 	// Custom commands (TypeScript slash commands)
 	#customCommands: LoadedCustomCommand[] = [];
+	/** MCP prompt commands (updated dynamically when prompts are loaded) */
+	#mcpPromptCommands: LoadedCustomCommand[] = [];
 
 	#skillsSettings: Required<SkillsSettings> | undefined;
 
@@ -1769,9 +1772,15 @@ export class AgentSession {
 		this.#slashCommands = [...slashCommands];
 	}
 
-	/** Custom commands (TypeScript slash commands) */
+	/** Custom commands (TypeScript slash commands and MCP prompts) */
 	get customCommands(): ReadonlyArray<LoadedCustomCommand> {
-		return this.#customCommands;
+		if (this.#mcpPromptCommands.length === 0) return this.#customCommands;
+		return [...this.#customCommands, ...this.#mcpPromptCommands];
+	}
+
+	/** Update the MCP prompt commands list. Called when server prompts are (re)loaded. */
+	setMCPPromptCommands(commands: LoadedCustomCommand[]): void {
+		this.#mcpPromptCommands = commands;
 	}
 
 	// =========================================================================
@@ -2173,7 +2182,7 @@ export class AgentSession {
 	 * If the command returns void, returns empty string to indicate it was handled.
 	 */
 	async #tryExecuteCustomCommand(text: string): Promise<string | null> {
-		if (this.#customCommands.length === 0) return null;
+		if (this.#customCommands.length === 0 && this.#mcpPromptCommands.length === 0) return null;
 
 		// Parse command name and args
 		const spaceIndex = text.indexOf(" ");
@@ -2181,7 +2190,9 @@ export class AgentSession {
 		const argsString = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1);
 
 		// Find matching command
-		const loaded = this.#customCommands.find(c => c.command.name === commandName);
+		const loaded =
+			this.#customCommands.find(c => c.command.name === commandName) ??
+			this.#mcpPromptCommands.find(c => c.command.name === commandName);
 		if (!loaded) return null;
 
 		// Get command context from extension runner (includes session control methods)
@@ -4781,6 +4792,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		let totalCacheWrite = 0;
 		let totalCost = 0;
 
+		let totalPremiumRequests = 0;
 		const getTaskToolUsage = (details: unknown): Usage | undefined => {
 			if (!details || typeof details !== "object") return undefined;
 			const record = details as Record<string, unknown>;
@@ -4797,6 +4809,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				totalOutput += assistantMsg.usage.output;
 				totalCacheRead += assistantMsg.usage.cacheRead;
 				totalCacheWrite += assistantMsg.usage.cacheWrite;
+				totalPremiumRequests += assistantMsg.usage.premiumRequests ?? 0;
 				totalCost += assistantMsg.usage.cost.total;
 			}
 
@@ -4807,6 +4820,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 					totalOutput += usage.output;
 					totalCacheRead += usage.cacheRead;
 					totalCacheWrite += usage.cacheWrite;
+					totalPremiumRequests += usage.premiumRequests ?? 0;
 					totalCost += usage.cost.total;
 				}
 			}
@@ -4828,6 +4842,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				total: totalInput + totalOutput + totalCacheRead + totalCacheWrite,
 			},
 			cost: totalCost,
+			premiumRequests: totalPremiumRequests,
 		};
 	}
 

package/src/session/session-manager.ts

@@ -1049,6 +1049,7 @@ export interface UsageStatistics {
 	output: number;
 	cacheRead: number;
 	cacheWrite: number;
+	premiumRequests: number;
 	cost: number;
 }
 
@@ -1144,9 +1145,16 @@ export class SessionManager {
 	#fileEntries: FileEntry[] = [];
 	#byId: Map<string, SessionEntry> = new Map();
 	#labelsById: Map<string, string> = new Map();
-	#leafId: string | null = null;
-	#usageStatistics: UsageStatistics = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
-	#persistWriter: NdjsonFileWriter | undefined;
+	#leafId = null as string | null;
+	#usageStatistics = {
+		input: 0,
+		output: 0,
+		cacheRead: 0,
+		cacheWrite: 0,
+		premiumRequests: 0,
+		cost: 0,
+	} satisfies UsageStatistics;
+	#persistWriter = undefined as NdjsonFileWriter | undefined;
 	#persistWriterPath: string | undefined;
 	#persistChain: Promise<void> = Promise.resolve();
 	#persistError: Error | undefined;
@@ -1373,7 +1381,7 @@ export class SessionManager {
 		this.#labelsById.clear();
 		this.#leafId = null;
 		this.#flushed = false;
-		this.#usageStatistics = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+		this.#usageStatistics = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, premiumRequests: 0, cost: 0 };
 
 		if (this.persist) {
 			const fileTimestamp = timestamp.replace(/[:.]/g, "-");
@@ -1387,7 +1395,7 @@ export class SessionManager {
 		this.#byId.clear();
 		this.#labelsById.clear();
 		this.#leafId = null;
-		this.#usageStatistics = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+		this.#usageStatistics = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, premiumRequests: 0, cost: 0 };
 		for (const entry of this.#fileEntries) {
 			if (entry.type === "session") continue;
 			this.#byId.set(entry.id, entry);
@@ -1405,6 +1413,7 @@ export class SessionManager {
 				this.#usageStatistics.output += usage.output;
 				this.#usageStatistics.cacheRead += usage.cacheRead;
 				this.#usageStatistics.cacheWrite += usage.cacheWrite;
+				this.#usageStatistics.premiumRequests += usage.premiumRequests ?? 0;
 				this.#usageStatistics.cost += usage.cost.total;
 			}
 
@@ -1415,6 +1424,7 @@ export class SessionManager {
 					this.#usageStatistics.output += usage.output;
 					this.#usageStatistics.cacheRead += usage.cacheRead;
 					this.#usageStatistics.cacheWrite += usage.cacheWrite;
+					this.#usageStatistics.premiumRequests += usage.premiumRequests ?? 0;
 					this.#usageStatistics.cost += usage.cost.total;
 				}
 			}
@@ -1679,6 +1689,7 @@ export class SessionManager {
 			this.#usageStatistics.output += usage.output;
 			this.#usageStatistics.cacheRead += usage.cacheRead;
 			this.#usageStatistics.cacheWrite += usage.cacheWrite;
+			this.#usageStatistics.premiumRequests += usage.premiumRequests ?? 0;
 			this.#usageStatistics.cost += usage.cost.total;
 		}
 
@@ -1689,6 +1700,7 @@ export class SessionManager {
 				this.#usageStatistics.output += usage.output;
 				this.#usageStatistics.cacheRead += usage.cacheRead;
 				this.#usageStatistics.cacheWrite += usage.cacheWrite;
+				this.#usageStatistics.premiumRequests += usage.premiumRequests ?? 0;
 				this.#usageStatistics.cost += usage.cost.total;
 			}
 		}

package/src/slash-commands/builtin-registry.ts

@@ -315,7 +315,17 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 			{ name: "unauth", description: "Remove OAuth auth from a server", usage: "<name>" },
 			{ name: "enable", description: "Enable an MCP server", usage: "<name>" },
 			{ name: "disable", description: "Disable an MCP server", usage: "<name>" },
+			{
+				name: "smithery-search",
+				description: "Search Smithery registry and deploy an MCP server",
+				usage: "<keyword> [--scope project|user] [--limit <1-100>] [--semantic]",
+			},
+			{ name: "smithery-login", description: "Login to Smithery and cache API key" },
+			{ name: "smithery-logout", description: "Remove cached Smithery API key" },
 			{ name: "reload", description: "Force reload MCP runtime tools" },
+			{ name: "resources", description: "List available resources from connected servers" },
+			{ name: "prompts", description: "List available prompts from connected servers" },
+			{ name: "notifications", description: "Show notification capabilities and subscriptions" },
 			{ name: "help", description: "Show help message" },
 		],
 		allowArgs: true,

package/src/task/executor.ts

@@ -499,12 +499,14 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			description: options.description,
 			exitCode: 1,
 			output: "",
-			stderr: "Aborted before start",
+			stderr: "Cancelled before start",
 			truncated: false,
 			durationMs: 0,
 			tokens: 0,
 			modelOverride,
-			error: "Aborted",
+			error: "Cancelled before start",
+			aborted: true,
+			abortReason: "Cancelled before start",
 		};
 	}
 
@@ -612,6 +614,17 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		signal.addEventListener("abort", onAbort, { once: true, signal: listenerSignal });
 	}
 
+	const resolveSignalAbortReason = (): string => {
+		const reason = signal?.reason;
+		if (reason instanceof Error) {
+			const message = reason.message.trim();
+			if (message.length > 0) return message;
+		} else if (typeof reason === "string") {
+			const message = reason.trim();
+			if (message.length > 0) return message;
+		}
+		return "Cancelled by caller";
+	};
 	const PROGRESS_COALESCE_MS = 150;
 	let lastProgressEmitMs = 0;
 	let progressTimeoutId: NodeJS.Timeout | null = null;
@@ -898,16 +911,20 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		exitCode: number;
 		error?: string;
 		aborted?: boolean;
+		abortReason?: string;
 		durationMs: number;
 	}> => {
 		const sessionAbortController = new AbortController();
 		let exitCode = 0;
 		let error: string | undefined;
 		let aborted = false;
-
+		let abortReasonText: string | undefined;
 		const checkAbort = () => {
 			if (abortSignal.aborted) {
 				aborted = abortReason === "signal" || abortReason === undefined;
+				if (aborted) {
+					abortReasonText ??= resolveSignalAbortReason();
+				}
 				exitCode = 1;
 				throw new ToolAbortError();
 			}
@@ -1096,6 +1113,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			if (!submitResultCalled && !abortSignal.aborted) {
 				aborted = true;
 				exitCode = 1;
+				abortReasonText ??= SUBAGENT_WARNING_MISSING_SUBMIT_RESULT;
 				error ??= SUBAGENT_WARNING_MISSING_SUBMIT_RESULT;
 			}
 
@@ -1103,6 +1121,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			if (lastAssistant) {
 				if (lastAssistant.stopReason === "aborted") {
 					aborted = abortReason === "signal" || abortReason === undefined;
+					if (aborted) {
+						abortReasonText ??= resolveSignalAbortReason();
+					}
 					exitCode = 1;
 				} else if (lastAssistant.stopReason === "error") {
 					exitCode = 1;
@@ -1117,6 +1138,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		} finally {
 			if (abortSignal.aborted) {
 				aborted = abortReason === "signal" || abortReason === undefined;
+				if (aborted) {
+					abortReasonText ??= resolveSignalAbortReason();
+				}
 				if (exitCode === 0) exitCode = 1;
 			}
 			sessionAbortController.abort();
@@ -1143,6 +1167,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			exitCode,
 			error,
 			aborted,
+			abortReason: aborted ? abortReasonText : undefined,
 			durationMs: Date.now() - startTime,
 		};
 	};
@@ -1178,6 +1203,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	rawOutput = finalized.rawOutput;
 	exitCode = finalized.exitCode;
 	stderr = finalized.stderr;
+	const lastSubmitResult = submitResultItems?.[submitResultItems.length - 1];
+	const submitResultAbortReason =
+		lastSubmitResult?.status === "aborted" ? lastSubmitResult.error || "Subagent aborted task" : undefined;
 	const { abortedViaSubmitResult, hasSubmitResult } = finalized;
 	const { content: truncatedOutput, truncated } = truncateTail(rawOutput, {
 		maxBytes: MAX_OUTPUT_BYTES,
@@ -1203,6 +1231,11 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 
 	// Update final progress
 	const wasAborted = abortedViaSubmitResult || (!hasSubmitResult && (done.aborted || signal?.aborted || false));
+	const finalAbortReason = wasAborted
+		? abortedViaSubmitResult
+			? submitResultAbortReason
+			: (done.abortReason ?? (signal?.aborted ? resolveSignalAbortReason() : "Subagent aborted task"))
+		: undefined;
 	progress.status = wasAborted ? "aborted" : exitCode === 0 ? "completed" : "failed";
 	scheduleProgress(true);
 
@@ -1223,6 +1256,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		modelOverride,
 		error: exitCode !== 0 && stderr ? stderr : undefined,
 		aborted: wasAborted,
+		abortReason: finalAbortReason,
 		usage: hasUsage ? accumulatedUsage : undefined,
 		outputPath,
 		extractedToolData: progress.extractedToolData,

package/src/task/index.ts

@@ -32,6 +32,7 @@ import "../tools/review";
 import { generateCommitMessage } from "../utils/commit-message-generator";
 import { discoverAgents, getAgent } from "./discovery";
 import { runSubprocess } from "./executor";
+import { resolveIsolationBackendForTaskExecution } from "./isolation-backend";
 import { AgentOutputManager } from "./output-manager";
 import { mapWithConcurrencyLimit, Semaphore } from "./parallel";
 import { renderCall, renderResult } from "./render";
@@ -52,10 +53,12 @@ import {
 	captureBaseline,
 	captureDeltaPatch,
 	cleanupFuseOverlay,
+	cleanupProjfsOverlay,
 	cleanupTaskBranches,
 	cleanupWorktree,
 	commitToBranch,
 	ensureFuseOverlay,
+	ensureProjfsOverlay,
 	ensureWorktree,
 	getRepoRoot,
 	mergeTaskBranches,
@@ -442,7 +445,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 				content: [
 					{
 						type: "text",
-						text: "Task isolation is disabled. Remove the isolated argument or set task.isolation.mode to 'worktree' or 'fuse-overlay'.",
+						text: "Task isolation is disabled. Remove the isolated argument or set task.isolation.mode to 'worktree', 'fuse-overlay', or 'fuse-projfs'.",
 					},
 				],
 				details: {
@@ -605,6 +608,29 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 			}
 		}
 
+		let effectiveIsolationMode = isolationMode;
+		let isolationBackendWarning = "";
+		try {
+			const resolvedIsolation = await resolveIsolationBackendForTaskExecution(isolationMode, isIsolated, repoRoot);
+			effectiveIsolationMode = resolvedIsolation.effectiveIsolationMode;
+			isolationBackendWarning = resolvedIsolation.warning;
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			return {
+				content: [
+					{
+						type: "text",
+						text: message,
+					},
+				],
+				details: {
+					projectAgentsDir,
+					results: [],
+					totalDurationMs: Date.now() - startTime,
+				},
+			};
+		}
+
 		// Derive artifacts directory
 		const sessionFile = this.session.getSessionFile();
 		const artifactsDir = sessionFile ? sessionFile.slice(0, -6) : null;
@@ -761,8 +787,10 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 					}
 					const taskBaseline = structuredClone(baseline);
 
-					if (isolationMode === "fuse-overlay") {
+					if (effectiveIsolationMode === "fuse-overlay") {
 						isolationDir = await ensureFuseOverlay(repoRoot, task.id);
+					} else if (effectiveIsolationMode === "fuse-projfs") {
+						isolationDir = await ensureProjfsOverlay(repoRoot, task.id);
 					} else {
 						isolationDir = await ensureWorktree(repoRoot, task.id);
 						await applyBaseline(isolationDir, taskBaseline);
@@ -871,8 +899,10 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 					};
 				} finally {
 					if (isolationDir) {
-						if (isolationMode === "fuse-overlay") {
+						if (effectiveIsolationMode === "fuse-overlay") {
 							await cleanupFuseOverlay(isolationDir);
+						} else if (effectiveIsolationMode === "fuse-projfs") {
+							await cleanupProjfsOverlay(isolationDir);
 						} else {
 							await cleanupWorktree(isolationDir);
 						}
@@ -908,8 +938,9 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 					durationMs: 0,
 					tokens: 0,
 					modelOverride,
-					error: "Skipped",
+					error: "Cancelled before start",
 					aborted: true,
+					abortReason: "Cancelled before start",
 				};
 			});
 
@@ -1108,6 +1139,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 			});
 
 			const outputIds = results.filter(r => !r.aborted || r.output.trim()).map(r => `agent://${r.id}`);
+			const backendSummaryPrefix = isolationBackendWarning ? `\n\n${isolationBackendWarning}` : "";
 			const summary = renderPromptTemplate(taskSummaryTemplate, {
 				successCount,
 				totalCount: results.length,
@@ -1117,7 +1149,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 				summaries,
 				outputIds,
 				agentName,
-				mergeSummary,
+				mergeSummary: `${backendSummaryPrefix}${mergeSummary}`,
 			});
 
 			// Cleanup temp directory if used