pi-subagents 0.14.0 → 0.15.0

package/render.ts

@@ -20,7 +20,6 @@ function getTermWidth(): number {
 	return process.stdout.columns || 120;
 }
 
-// Grapheme segmenter for proper Unicode handling (shared instance)
 const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
 
 /**
@@ -35,42 +34,38 @@ const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
 function truncLine(text: string, maxWidth: number): string {
 	if (visibleWidth(text) <= maxWidth) return text;
 
-	const targetWidth = maxWidth - 1; // Room for single ellipsis character
+	const targetWidth = maxWidth - 1;
 	let result = "";
 	let currentWidth = 0;
-	let activeStyles: string[] = []; // Track ALL active styles (not just last)
+	let activeStyles: string[] = [];
 	let i = 0;
 
 	while (i < text.length) {
-		// Check for ANSI escape code
 		const ansiMatch = text.slice(i).match(/^\x1b\[[0-9;]*m/);
 		if (ansiMatch) {
 			const code = ansiMatch[0];
 			result += code;
 
 			if (code === "\x1b[0m" || code === "\x1b[m") {
-				activeStyles = []; // Reset clears all styles
+				activeStyles = [];
 			} else {
-				activeStyles.push(code); // Stack styles (bold + color, etc.)
+				activeStyles.push(code);
 			}
 			i += code.length;
 			continue;
 		}
 
-		// Find end of non-ANSI text segment
 		let end = i;
 		while (end < text.length && !text.slice(end).match(/^\x1b\[[0-9;]*m/)) {
 			end++;
 		}
 
-		// Segment into graphemes for proper Unicode handling
 		const textPortion = text.slice(i, end);
 		for (const seg of segmenter.segment(textPortion)) {
 			const grapheme = seg.segment;
 			const graphemeWidth = visibleWidth(grapheme);
 
 			if (currentWidth + graphemeWidth > targetWidth) {
-				// Re-apply all active styles before ellipsis to preserve background/colors
 				return result + activeStyles.join("") + "…";
 			}
 
@@ -80,16 +75,11 @@ function truncLine(text: string, maxWidth: number): string {
 		i = end;
 	}
 
-	// Reached end without exceeding width (shouldn't happen given initial check)
 	return result + activeStyles.join("") + "…";
 }
 
-// Track last rendered widget state to avoid no-op re-renders
 let lastWidgetHash = "";
 
-/**
- * Compute a simple hash of job states for change detection
- */
 function computeWidgetHash(jobs: AsyncJobState[]): string {
 	return jobs.slice(0, MAX_WIDGET_JOBS).map(job =>
 		`${job.asyncId}:${job.status}:${job.currentStep}:${job.updatedAt}:${job.totalTokens?.total ?? 0}`
@@ -124,13 +114,11 @@ export function renderWidget(ctx: ExtensionContext, jobs: AsyncJobState[]): void
 		return;
 	}
 
-	// Check if anything changed since last render
-	// Always re-render if any displayed job is running (output tail updates constantly)
 	const displayedJobs = jobs.slice(0, MAX_WIDGET_JOBS);
 	const hasRunningJobs = displayedJobs.some(job => job.status === "running");
 	const newHash = computeWidgetHash(jobs);
 	if (!hasRunningJobs && newHash === lastWidgetHash) {
-		return; // Skip re-render, nothing changed
+		return;
 	}
 	lastWidgetHash = newHash;
 
@@ -194,12 +182,12 @@ export function renderSubagentResult(
 		const r = d.results[0];
 		const isRunning = r.progress?.status === "running";
 		const icon = isRunning
-			? theme.fg("warning", "...")
+			? theme.fg("warning", "running")
 			: r.detached
-				? theme.fg("warning", "↗")
+				? theme.fg("warning", "detached")
 				: r.exitCode === 0
 					? theme.fg("success", "ok")
-					: theme.fg("error", "X");
+					: theme.fg("error", "failed");
 		const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
 		const output = r.truncation?.text || getSingleResultOutput(r);
 
@@ -265,7 +253,7 @@ export function renderSubagentResult(
 			c.addChild(new Text(truncLine(theme.fg("dim", `Skills: ${r.skills.join(", ")}`), w), 0, 0));
 		}
 		if (r.skillsWarning) {
-			c.addChild(new Text(truncLine(theme.fg("warning", `⚠️ ${r.skillsWarning}`), w), 0, 0));
+			c.addChild(new Text(truncLine(theme.fg("warning", `Warning: ${r.skillsWarning}`), w), 0, 0));
 		}
 		if (r.attemptedModels && r.attemptedModels.length > 1) {
 			c.addChild(new Text(truncLine(theme.fg("dim", `Fallbacks: ${r.attemptedModels.join(" → ")}`), w), 0, 0));
@@ -291,12 +279,12 @@ export function renderSubagentResult(
 		&& hasEmptyTextOutputWithoutOutputTarget(r.task, getSingleResultOutput(r)),
 	);
 	const icon = hasRunning
-		? theme.fg("warning", "...")
+		? theme.fg("warning", "running")
 		: hasEmptyWithoutTarget
-			? theme.fg("warning", "⚠")
+			? theme.fg("warning", "warning")
 			: ok === d.results.length
 				? theme.fg("success", "ok")
-				: theme.fg("error", "X");
+				: theme.fg("error", "failed");
 
 	const totalSummary =
 		d.progressSummary ||
@@ -323,17 +311,11 @@ export function renderSubagentResult(
 
 	const modeLabel = d.mode;
 	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
-	// For parallel-in-chain, show task count (results) for consistency with step display
-	// For sequential chains, show logical step count
 	const hasParallelInChain = d.chainAgents?.some((a) => a.startsWith("["));
 	const totalCount = hasParallelInChain ? d.results.length : (d.totalSteps ?? d.results.length);
 	const currentStep = d.currentStepIndex !== undefined ? d.currentStepIndex + 1 : ok + 1;
 	const stepInfo = hasRunning ? ` ${currentStep}/${totalCount}` : ` ${ok}/${totalCount}`;
 	
-	// Build chain visualization: "scout → planner" with status icons
-	// Note: Only works correctly for sequential chains. Chains with parallel steps
-	// (indicated by "[agent1+agent2]" format) have multiple results per step,
-	// breaking the 1:1 mapping between chainAgents and results.
 	const chainVis = d.chainAgents?.length && !hasParallelInChain
 		? d.chainAgents
 				.map((agent, i) => {
@@ -345,14 +327,14 @@ export function renderSubagentResult(
 						&& hasEmptyTextOutputWithoutOutputTarget(result.task, getSingleResultOutput(result));
 					const isCurrent = i === (d.currentStepIndex ?? d.results.length);
 					const stepIcon = isFailed
-						? theme.fg("error", "✗")
+						? theme.fg("error", "failed")
 						: isEmptyWithoutTarget
-							? theme.fg("warning", "⚠")
+							? theme.fg("warning", "warning")
 							: isComplete
-								? theme.fg("success", "✓")
+								? theme.fg("success", "done")
 								: isCurrent && hasRunning
-									? theme.fg("warning", "●")
-									: theme.fg("dim", "○");
+									? theme.fg("warning", "running")
+									: theme.fg("dim", "pending");
 					return `${stepIcon} ${agent}`;
 				})
 				.join(theme.fg("dim", " → "))
@@ -367,15 +349,10 @@ export function renderSubagentResult(
 			0,
 		),
 	);
-	// Show chain visualization
 	if (chainVis) {
 		c.addChild(new Text(truncLine(`  ${chainVis}`, w), 0, 0));
 	}
 
-	// === STATIC STEP LAYOUT (like clarification UI) ===
-	// Each step gets a fixed section with task/output/status
-	// Note: For chains with parallel steps, chainAgents indices don't map 1:1 to results
-	// (parallel steps produce multiple results). Fall back to result-based iteration.
 	const useResultsDirectly = hasParallelInChain || !d.chainAgents?.length;
 	const stepsToShow = useResultsDirectly ? d.results.length : d.chainAgents!.length;
 
@@ -388,9 +365,8 @@ export function renderSubagentResult(
 			: (d.chainAgents![i] || r?.agent || `step-${i + 1}`);
 
 		if (!r) {
-			// Pending step
 			c.addChild(new Text(truncLine(theme.fg("dim", `  Step ${i + 1}: ${agentName}`), w), 0, 0));
-			c.addChild(new Text(theme.fg("dim", `    status: ○ pending`), 0, 0));
+			c.addChild(new Text(theme.fg("dim", `    status: pending`), 0, 0));
 			c.addChild(new Spacer(1));
 			continue;
 		}
@@ -402,12 +378,12 @@ export function renderSubagentResult(
 
 		const resultOutput = getSingleResultOutput(r);
 		const statusIcon = rRunning
-			? theme.fg("warning", "●")
+			? theme.fg("warning", "running")
 			: r.exitCode !== 0
-				? theme.fg("error", "✗")
+				? theme.fg("error", "failed")
 				: hasEmptyTextOutputWithoutOutputTarget(r.task, resultOutput)
-					? theme.fg("warning", "⚠")
-					: theme.fg("success", "✓");
+					? theme.fg("warning", "warning")
+					: theme.fg("success", "done");
 		const stats = rProg ? ` | ${rProg.toolCount} tools, ${formatDuration(rProg.durationMs)}` : "";
 		const modelDisplay = r.model ? theme.fg("dim", ` (${r.model})`) : "";
 		const stepHeader = rRunning
@@ -430,7 +406,7 @@ export function renderSubagentResult(
 			c.addChild(new Text(truncLine(theme.fg("dim", `    skills: ${r.skills.join(", ")}`), w), 0, 0));
 		}
 		if (r.skillsWarning) {
-			c.addChild(new Text(truncLine(theme.fg("warning", `    ⚠️ ${r.skillsWarning}`), w), 0, 0));
+			c.addChild(new Text(truncLine(theme.fg("warning", `    Warning: ${r.skillsWarning}`), w), 0, 0));
 		}
 		if (r.attemptedModels && r.attemptedModels.length > 1) {
 			c.addChild(new Text(truncLine(theme.fg("dim", `    fallbacks: ${r.attemptedModels.join(" → ")}`), w), 0, 0));
@@ -440,7 +416,6 @@ export function renderSubagentResult(
 			if (rProg.skills?.length) {
 				c.addChild(new Text(truncLine(theme.fg("accent", `    skills: ${rProg.skills.join(", ")}`), w), 0, 0));
 			}
-			// Current tool for running step
 			if (rProg.currentTool) {
 				const maxToolArgsLen = Math.max(50, w - 20);
 				const toolArgsPreview = rProg.currentToolArgs
@@ -453,7 +428,6 @@ export function renderSubagentResult(
 					: rProg.currentTool;
 				c.addChild(new Text(truncLine(theme.fg("warning", `    > ${toolLine}`), w), 0, 0));
 			}
-			// Recent tools
 			if (rProg.recentTools?.length) {
 				for (const t of rProg.recentTools.slice(-3)) {
 					const maxArgsLen = Math.max(40, w - 30);
@@ -463,7 +437,6 @@ export function renderSubagentResult(
 					c.addChild(new Text(truncLine(theme.fg("dim", `      ${t.tool}: ${argsPreview}`), w), 0, 0));
 				}
 			}
-			// Recent output - let truncLine handle truncation entirely
 			const recentLines = (rProg.recentOutput ?? []).slice(-5);
 			for (const line of recentLines) {
 				c.addChild(new Text(truncLine(theme.fg("dim", `      ${line}`), w), 0, 0));

package/schemas.ts

@@ -70,7 +70,7 @@ export const SubagentParams = Type.Object({
 	})),
 	// Agent/chain configuration for create/update (nested to avoid conflicts with execution fields)
 	config: Type.Optional(Type.Any({
-		description: "Agent or chain config for create/update. Agent: name, description, scope ('user'|'project', default 'user'), systemPrompt, model, tools (comma-separated), extensions (comma-separated), skills (comma-separated), thinking, output, reads, progress, maxSubagentDepth. Chain: name, description, scope, steps (array of {agent, task?, output?, reads?, model?, skills?, progress?}). Presence of 'steps' creates a chain instead of an agent."
+		description: "Agent or chain config for create/update. Agent: name, description, scope ('user'|'project', default 'user'), systemPrompt, systemPromptMode, inheritProjectContext, inheritSkills, model, tools (comma-separated), extensions (comma-separated), skills (comma-separated), thinking, output, reads, progress, maxSubagentDepth. Chain: name, description, scope, steps (array of {agent, task?, output?, reads?, model?, skills?, progress?}). Presence of 'steps' creates a chain instead of an agent."
 	})),
 	tasks: Type.Optional(Type.Array(TaskItem, { description: "PARALLEL mode: [{agent, task, count?}, ...]" })),
 	worktree: Type.Optional(Type.Boolean({

package/settings.ts

@@ -356,5 +356,5 @@ export function createParallelDirs(
 	}
 }
 
-export type { ParallelTaskResult } from "./parallel-utils.js";
-export { aggregateParallelOutputs } from "./parallel-utils.js";
+export type { ParallelTaskResult } from "./parallel-utils.ts";
+export { aggregateParallelOutputs } from "./parallel-utils.ts";

package/single-output.ts

@@ -84,11 +84,11 @@ export function finalizeSingleOutput(params: {
 }): { displayOutput: string; savedPath?: string; saveError?: string } {
 	let displayOutput = params.truncatedOutput || params.fullOutput;
 	if (params.exitCode === 0 && params.savedPath) {
-		displayOutput += `\n\n📄 Output saved to: ${params.savedPath}`;
+		displayOutput += `\n\nOutput saved to: ${params.savedPath}`;
 		return { displayOutput, savedPath: params.savedPath };
 	}
 	if (params.exitCode === 0 && params.saveError && params.outputPath) {
-		displayOutput += `\n\n⚠️ Failed to save output to: ${params.outputPath}\n${params.saveError}`;
+		displayOutput += `\n\nFailed to save output to: ${params.outputPath}\n${params.saveError}`;
 		return { displayOutput, saveError: params.saveError };
 	}
 	return { displayOutput };

package/slash-commands.ts

@@ -1,18 +1,18 @@
 import { randomUUID } from "node:crypto";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { Key, matchesKey } from "@mariozechner/pi-tui";
-import { discoverAgents, discoverAgentsAll } from "./agents.js";
-import { AgentManagerComponent, type ManagerResult } from "./agent-manager.js";
-import { SubagentsStatusComponent } from "./subagents-status.js";
-import { discoverAvailableSkills } from "./skills.js";
-import type { SubagentParamsLike } from "./subagent-executor.js";
-import type { SlashSubagentResponse, SlashSubagentUpdate } from "./slash-bridge.js";
+import { discoverAgents, discoverAgentsAll } from "./agents.ts";
+import { AgentManagerComponent, type ManagerResult } from "./agent-manager.ts";
+import { SubagentsStatusComponent } from "./subagents-status.ts";
+import { discoverAvailableSkills } from "./skills.ts";
+import type { SubagentParamsLike } from "./subagent-executor.ts";
+import type { SlashSubagentResponse, SlashSubagentUpdate } from "./slash-bridge.ts";
 import {
 	applySlashUpdate,
 	buildSlashInitialResult,
 	failSlashResult,
 	finalizeSlashResult,
-} from "./slash-live-state.js";
+} from "./slash-live-state.ts";
 import {
 	MAX_PARALLEL,
 	SLASH_RESULT_TYPE,
@@ -22,7 +22,7 @@ import {
 	SLASH_SUBAGENT_STARTED_EVENT,
 	SLASH_SUBAGENT_UPDATE_EVENT,
 	type SubagentState,
-} from "./types.js";
+} from "./types.ts";
 
 interface InlineConfig {
 	output?: string | false;

package/subagent-executor.ts

@@ -25,7 +25,7 @@ import { executeAsyncChain, executeAsyncSingle, isAsyncAvailable } from "./async
 import { createForkContextResolver } from "./fork-context.ts";
 import { applyIntercomBridgeToAgent, resolveIntercomBridge, resolveIntercomSessionTarget } from "./intercom-bridge.ts";
 import { finalizeSingleOutput, injectSingleOutputInstruction, resolveSingleOutputPath } from "./single-output.ts";
-import { getSingleResultOutput, mapConcurrent } from "./utils.ts";
+import { compactForegroundDetails, getSingleResultOutput, mapConcurrent, resolveChildCwd } from "./utils.ts";
 import {
 	cleanupWorktrees,
 	createWorktrees,
@@ -101,6 +101,7 @@ interface ExecutorDeps {
 
 interface ExecutionContextData {
 	params: SubagentParamsLike;
+	effectiveCwd: string;
 	ctx: ExtensionContext;
 	signal: AbortSignal;
 	onUpdate?: (r: AgentToolResult<Details>) => void;
@@ -116,6 +117,10 @@ interface ExecutionContextData {
 	effectiveAsync: boolean;
 }
 
+function resolveRequestedCwd(runtimeCwd: string, requestedCwd: string | undefined): string {
+	return requestedCwd ? path.resolve(runtimeCwd, requestedCwd) : runtimeCwd;
+}
+
 function validateExecutionInput(
 	params: SubagentParamsLike,
 	agents: AgentConfig[],
@@ -333,6 +338,7 @@ function wrapChainTasksForFork(chain: ChainStep[], context: SubagentParamsLike["
 function runAsyncPath(data: ExecutionContextData, deps: ExecutorDeps): AgentToolResult<Details> | null {
 	const {
 		params,
+		effectiveCwd,
 		agents,
 		ctx,
 		shareEnabled,
@@ -347,7 +353,7 @@ function runAsyncPath(data: ExecutionContextData, deps: ExecutorDeps): AgentTool
 	if (!effectiveAsync) return null;
 
 	if (hasChain && params.chain) {
-		const chainWorktreeTaskCwdError = buildChainWorktreeTaskCwdError(params.chain as ChainStep[], params.cwd ?? ctx.cwd);
+		const chainWorktreeTaskCwdError = buildChainWorktreeTaskCwdError(params.chain as ChainStep[], effectiveCwd);
 		if (chainWorktreeTaskCwdError) {
 			return {
 				content: [{ type: "text", text: chainWorktreeTaskCwdError }],
@@ -387,7 +393,7 @@ function runAsyncPath(data: ExecutionContextData, deps: ExecutorDeps): AgentTool
 			agents,
 			ctx: asyncCtx,
 			availableModels,
-			cwd: params.cwd,
+			cwd: effectiveCwd,
 			maxOutput: params.maxOutput,
 			artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
 			artifactConfig,
@@ -422,7 +428,7 @@ function runAsyncPath(data: ExecutionContextData, deps: ExecutorDeps): AgentTool
 			agentConfig: a,
 			ctx: asyncCtx,
 			availableModels,
-			cwd: params.cwd,
+			cwd: effectiveCwd,
 			maxOutput: params.maxOutput,
 			artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
 			artifactConfig,
@@ -444,6 +450,7 @@ function runAsyncPath(data: ExecutionContextData, deps: ExecutorDeps): AgentTool
 async function runChainPath(data: ExecutionContextData, deps: ExecutorDeps): Promise<AgentToolResult<Details>> {
 	const {
 		params,
+		effectiveCwd,
 		agents,
 		ctx,
 		signal,
@@ -467,7 +474,7 @@ async function runChainPath(data: ExecutionContextData, deps: ExecutorDeps): Pro
 		ctx,
 		signal,
 		runId,
-		cwd: params.cwd,
+		cwd: effectiveCwd,
 		shareEnabled,
 		sessionDirForIndex,
 		sessionFileForIndex,
@@ -508,7 +515,7 @@ async function runChainPath(data: ExecutionContextData, deps: ExecutorDeps): Pro
 				id: m.id,
 				fullId: `${m.provider}/${m.id}`,
 			})),
-			cwd: params.cwd,
+			cwd: effectiveCwd,
 			maxOutput: params.maxOutput,
 			artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
 			artifactConfig,
@@ -595,7 +602,7 @@ function buildChainWorktreeTaskCwdError(chain: ChainStep[], sharedCwd: string):
 	for (let stepIndex = 0; stepIndex < chain.length; stepIndex++) {
 		const step = chain[stepIndex]!;
 		if (!isParallelStep(step) || !step.worktree) continue;
-		const stepCwd = step.cwd ?? sharedCwd;
+		const stepCwd = resolveChildCwd(sharedCwd, step.cwd);
 		const conflict = findWorktreeTaskCwdConflict(step.parallel, stepCwd);
 		if (!conflict) continue;
 		const detail = formatWorktreeTaskCwdConflict(conflict, stepCwd);
@@ -611,7 +618,8 @@ function resolveParallelTaskCwd(
 	index: number,
 ): string | undefined {
 	if (worktreeSetup) return worktreeSetup.worktrees[index]!.agentCwd;
-	return task.cwd ?? paramsCwd;
+	if (!paramsCwd) return task.cwd;
+	return resolveChildCwd(paramsCwd, task.cwd);
 }
 
 function buildParallelWorktreeSuffix(
@@ -672,6 +680,7 @@ async function runForegroundParallelTasks(input: ForegroundParallelRunInput): Pr
 async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps): Promise<AgentToolResult<Details>> {
 	const {
 		params,
+		effectiveCwd,
 		agents,
 		ctx,
 		signal,
@@ -714,7 +723,6 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 		resolveChildMaxSubagentDepth(currentMaxSubagentDepth, config.maxSubagentDepth),
 	);
 
-	const effectiveCwd = params.cwd ?? ctx.cwd;
 	if (params.worktree) {
 		const worktreeTaskCwdError = buildParallelWorktreeTaskCwdError(tasks, effectiveCwd);
 		if (worktreeTaskCwdError) return buildParallelModeError(worktreeTaskCwdError);
@@ -738,7 +746,7 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 		const behaviors = agentConfigs.map((c, i) =>
 			resolveStepBehavior(c, { skills: skillOverrides[i] }),
 		);
-		const availableSkills = discoverAvailableSkills(params.cwd ?? ctx.cwd);
+		const availableSkills = discoverAvailableSkills(effectiveCwd);
 
 		const result = await ctx.ui.custom<ChainClarifyResult>(
 			(tui, theme, _kb, done) =>
@@ -796,7 +804,7 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 				agents,
 				ctx: asyncCtx,
 				availableModels,
-				cwd: params.cwd,
+				cwd: effectiveCwd,
 				maxOutput: params.maxOutput,
 				artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
 				artifactConfig,
@@ -844,7 +852,7 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 			artifactConfig,
 			artifactsDir,
 			maxOutput: params.maxOutput,
-			paramsCwd: params.cwd,
+			paramsCwd: effectiveCwd,
 			availableModels,
 			modelOverrides,
 			skillOverrides,
@@ -885,12 +893,12 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 
 		return {
 			content: [{ type: "text", text: fullContent }],
-			details: {
+			details: compactForegroundDetails({
 				mode: "parallel",
 				results,
 				progress: params.includeProgress ? allProgress : undefined,
 				artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
-			},
+			}),
 		};
 	} finally {
 		if (worktreeSetup) cleanupWorktrees(worktreeSetup);
@@ -900,6 +908,7 @@ async function runParallelPath(data: ExecutionContextData, deps: ExecutorDeps):
 async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Promise<AgentToolResult<Details>> {
 	const {
 		params,
+		effectiveCwd,
 		agents,
 		ctx,
 		signal,
@@ -943,7 +952,7 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 
 	if (params.clarify === true && ctx.hasUI) {
 		const behavior = resolveStepBehavior(agentConfig, { output: effectiveOutput, skills: skillOverride });
-		const availableSkills = discoverAvailableSkills(params.cwd ?? ctx.cwd);
+		const availableSkills = discoverAvailableSkills(effectiveCwd);
 
 		const result = await ctx.ui.custom<ChainClarifyResult>(
 			(tui, theme, _kb, done) =>
@@ -994,7 +1003,7 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 				agentConfig,
 				ctx: asyncCtx,
 				availableModels,
-				cwd: params.cwd,
+				cwd: effectiveCwd,
 				maxOutput: params.maxOutput,
 				artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
 				artifactConfig,
@@ -1015,7 +1024,7 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 		task = wrapForkTask(task);
 	}
 	const cleanTask = task;
-	const outputPath = resolveSingleOutputPath(effectiveOutput, ctx.cwd, params.cwd);
+	const outputPath = resolveSingleOutputPath(effectiveOutput, ctx.cwd, effectiveCwd);
 	task = injectSingleOutputInstruction(task, outputPath);
 
 	let effectiveSkills: string[] | undefined;
@@ -1026,7 +1035,7 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 	}
 
 	const r = await runSync(ctx.cwd, agents, params.agent!, task, {
-		cwd: params.cwd,
+		cwd: effectiveCwd,
 		signal,
 		allowIntercomDetach: agentConfig.systemPrompt?.includes("Intercom orchestration channel:") === true,
 		intercomEvents: deps.pi.events,
@@ -1063,37 +1072,37 @@ async function runSinglePath(data: ExecutionContextData, deps: ExecutorDeps): Pr
 	if (r.detached) {
 		return {
 			content: [{ type: "text", text: `Detached for intercom coordination: ${params.agent}` }],
-			details: {
+			details: compactForegroundDetails({
 				mode: "single",
 				results: [r],
 				progress: params.includeProgress ? allProgress : undefined,
 				artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
 				truncation: r.truncation,
-			},
+			}),
 		};
 	}
 
 	if (r.exitCode !== 0)
 		return {
 			content: [{ type: "text", text: r.error || "Failed" }],
-			details: {
+			details: compactForegroundDetails({
 				mode: "single",
 				results: [r],
 				progress: params.includeProgress ? allProgress : undefined,
 				artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
 				truncation: r.truncation,
-			},
+			}),
 			isError: true,
 		};
 	return {
 		content: [{ type: "text", text: finalizedOutput.displayOutput || "(no output)" }],
-		details: {
+		details: compactForegroundDetails({
 			mode: "single",
 			results: [r],
 			progress: params.includeProgress ? allProgress : undefined,
 			artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
 			truncation: r.truncation,
-		},
+		}),
 	};
 }
 
@@ -1114,6 +1123,8 @@ export function createSubagentExecutor(deps: ExecutorDeps): {
 		ctx: ExtensionContext,
 	): Promise<AgentToolResult<Details>> => {
 		deps.state.baseCwd = ctx.cwd;
+		const requestCwd = resolveRequestedCwd(ctx.cwd, params.cwd);
+		const paramsWithResolvedCwd = params.cwd === undefined ? params : { ...params, cwd: requestCwd };
 		if (params.action) {
 			const validActions = ["list", "get", "create", "update", "delete"];
 			if (!validActions.includes(params.action)) {
@@ -1123,7 +1134,7 @@ export function createSubagentExecutor(deps: ExecutorDeps): {
 					details: { mode: "management" as const, results: [] },
 				};
 			}
-			return handleManagementAction(params.action, params, ctx);
+			return handleManagementAction(params.action, paramsWithResolvedCwd, { ...ctx, cwd: requestCwd });
 		}
 
 		const { blocked, depth, maxDepth } = checkSubagentDepth(deps.config.maxSubagentDepth);
@@ -1143,14 +1154,15 @@ export function createSubagentExecutor(deps: ExecutorDeps): {
 			};
 		}
 
-		const normalized = normalizeRepeatedParallelCounts(params);
+		const normalized = normalizeRepeatedParallelCounts(paramsWithResolvedCwd);
 		if (normalized.error) return normalized.error;
 		const normalizedParams = normalized.params!;
 
 		const scope: AgentScope = resolveExecutionAgentScope(normalizedParams.agentScope);
+		const effectiveCwd = normalizedParams.cwd ?? ctx.cwd;
 		const parentSessionFile = ctx.sessionManager.getSessionFile() ?? null;
 		deps.state.currentSessionId = parentSessionFile ?? `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-		const discoveredAgents = deps.discoverAgents(ctx.cwd, scope).agents;
+		const discoveredAgents = deps.discoverAgents(effectiveCwd, scope).agents;
 		const sessionName = resolveIntercomSessionTarget(deps.pi.getSessionName(), ctx.sessionManager.getSessionId());
 		const intercomBridge = resolveIntercomBridge({
 			config: deps.config.intercomBridge,
@@ -1227,6 +1239,7 @@ export function createSubagentExecutor(deps: ExecutorDeps): {
 
 		const execData: ExecutionContextData = {
 			params: normalizedParams,
+			effectiveCwd,
 			ctx,
 			signal,
 			onUpdate: onUpdateWithContext,

package/subagent-prompt-runtime.ts

@@ -0,0 +1,67 @@
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+
+export const SUBAGENT_INHERIT_PROJECT_CONTEXT_ENV = "PI_SUBAGENT_INHERIT_PROJECT_CONTEXT";
+export const SUBAGENT_INHERIT_SKILLS_ENV = "PI_SUBAGENT_INHERIT_SKILLS";
+
+const PROJECT_CONTEXT_HEADER = "\n\n# Project Context\n\nProject-specific instructions and guidelines:\n\n";
+const SKILLS_HEADER = "\n\nThe following skills provide specialized instructions for specific tasks.";
+const DATE_HEADER = "\nCurrent date:";
+
+function readBooleanEnv(name: string): boolean | undefined {
+	const value = process.env[name];
+	if (value === undefined) return undefined;
+	return value !== "0";
+}
+
+function findSectionEnd(prompt: string, startIndex: number, nextHeaders: string[]): number {
+	let endIndex = prompt.length;
+	for (const header of nextHeaders) {
+		const index = prompt.indexOf(header, startIndex);
+		if (index !== -1 && index < endIndex) {
+			endIndex = index;
+		}
+	}
+	return endIndex;
+}
+
+export function stripProjectContext(prompt: string): string {
+	const startIndex = prompt.indexOf(PROJECT_CONTEXT_HEADER);
+	if (startIndex === -1) return prompt;
+	const endIndex = findSectionEnd(prompt, startIndex + PROJECT_CONTEXT_HEADER.length, [SKILLS_HEADER, DATE_HEADER]);
+	return `${prompt.slice(0, startIndex)}${prompt.slice(endIndex)}`;
+}
+
+export function stripInheritedSkills(prompt: string): string {
+	const startIndex = prompt.indexOf(SKILLS_HEADER);
+	if (startIndex === -1) return prompt;
+	const endIndex = findSectionEnd(prompt, startIndex + SKILLS_HEADER.length, [DATE_HEADER]);
+	return `${prompt.slice(0, startIndex)}${prompt.slice(endIndex)}`;
+}
+
+export function rewriteSubagentPrompt(
+	prompt: string,
+	options: { inheritProjectContext: boolean; inheritSkills: boolean },
+): string {
+	let rewritten = prompt;
+	if (!options.inheritProjectContext) {
+		rewritten = stripProjectContext(rewritten);
+	}
+	if (!options.inheritSkills) {
+		rewritten = stripInheritedSkills(rewritten);
+	}
+	return rewritten;
+}
+
+export default function registerSubagentPromptRuntime(pi: ExtensionAPI): void {
+	pi.on("before_agent_start", async (event) => {
+		const inheritProjectContext = readBooleanEnv(SUBAGENT_INHERIT_PROJECT_CONTEXT_ENV);
+		const inheritSkills = readBooleanEnv(SUBAGENT_INHERIT_SKILLS_ENV);
+		if (inheritProjectContext === undefined && inheritSkills === undefined) return;
+		const rewritten = rewriteSubagentPrompt(event.systemPrompt, {
+			inheritProjectContext: inheritProjectContext ?? true,
+			inheritSkills: inheritSkills ?? true,
+		});
+		if (rewritten === event.systemPrompt) return;
+		return { systemPrompt: rewritten };
+	});
+}