pi-subagents 0.58.0 → 0.60.0

package/src/runs/shared/worktree.ts

@@ -77,6 +77,8 @@ interface CreateWorktreesOptions {
 	agents?: string[];
 	setupHook?: WorktreeSetupHookConfig;
 	baseDir?: string;
+	/** Called with deterministic ownership metadata before any worktree is created. */
+	beforeCreate?: (setup: WorktreeSetup) => void;
 }
 
 interface ResolvedWorktreeSetupHook {
@@ -680,6 +682,22 @@ export function createWorktrees(cwd: string, runId: string, count: number, optio
 	const repo = resolveRepoState(cwd);
 	const setupHook = resolveWorktreeSetupHook(repo.toplevel, options?.setupHook);
 	const baseDir = resolveWorktreeBaseDir(options?.baseDir, repo.toplevel);
+	const plannedSetup: WorktreeSetup = {
+		cwd: repo.toplevel,
+		baseCommit: repo.baseCommit,
+		worktrees: Array.from({ length: count }, (_, index) => {
+			const worktreePath = buildWorktreePath(baseDir, runId, index);
+			return {
+				path: worktreePath,
+				agentCwd: repo.cwdRelative ? path.join(worktreePath, repo.cwdRelative) : worktreePath,
+				branch: buildWorktreeBranch(runId, index),
+				index,
+				nodeModulesLinked: false,
+				syntheticPaths: [],
+			};
+		}),
+	};
+	options?.beforeCreate?.(plannedSetup);
 	const worktrees: WorktreeInfo[] = [];
 
 	try {

package/src/shared/child-session-name.ts

@@ -0,0 +1,46 @@
+import { previewDisplayText } from "./display-text.ts";
+import { PROMPT_REDACTED } from "./utils.ts";
+
+/**
+ * Human-readable display name for a child session, derived at launch time from
+ * the agent name and its task (or workflow node label). The parent computes it
+ * once and threads it two ways:
+ *
+ *  1. Into the child process via `PI_SUBAGENT_SESSION_NAME`, where the prompt
+ *     runtime calls `pi.setSessionName(...)` so the child's own session file
+ *     is identifiable in `pi --resume` and host session browsers.
+ *  2. Into the `sessionName` field of result/progress payloads, so hosts
+ *     rendering the parent stream can label each child row.
+ *
+ * The name is display-only metadata. When the intercom bridge is active the
+ * child keeps its machine intercom target as the session name instead — that
+ * name is a routing address and must win (see subagent-prompt-runtime).
+ */
+
+/** Longest task excerpt kept in the name; the full string is capped below. */
+const TASK_EXCERPT_MAX_CHARS = 60;
+/** Hard cap on the final name so host UI rows stay one line. */
+export const CHILD_SESSION_NAME_MAX_CHARS = 80;
+
+export function deriveChildSessionName(input: {
+	agent?: string;
+	task?: string;
+	/** Workflow node label; preferred over the task excerpt when present. */
+	label?: string;
+}): string | undefined {
+	const agent = input.agent?.trim() ?? "";
+	const rawLabel = input.label?.trim() ?? "";
+	const rawTask = input.task?.trim() ?? "";
+	// Never build a name from redacted text — the excerpt would be meaningless
+	// and the redaction marker itself carries no information.
+	const excerptSource =
+		rawLabel && rawLabel !== PROMPT_REDACTED
+			? rawLabel
+			: rawTask && rawTask !== PROMPT_REDACTED
+				? rawTask
+				: "";
+	const excerpt = excerptSource ? previewDisplayText(excerptSource, TASK_EXCERPT_MAX_CHARS) : "";
+	const base = agent && excerpt ? `${agent}: ${excerpt}` : agent || excerpt;
+	if (!base) return undefined;
+	return previewDisplayText(base, CHILD_SESSION_NAME_MAX_CHARS);
+}

package/src/shared/extension-context.ts

@@ -0,0 +1,24 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+/** Pi exposes replaced extension contexts as ordinary Errors without a stable code. */
+export function isStaleExtensionContextError(error: unknown): boolean {
+	return error instanceof Error
+		&& /extension ctx is stale|extension context no longer active|stale after session replacement or reload/i.test(error.message);
+}
+
+/** Run a synchronous operation against a cached UI context without leaking replacement errors. */
+export function withCachedUiContext<T>(
+	ctx: ExtensionContext | null | undefined,
+	onStale: () => void,
+	run: (ctx: ExtensionContext) => T,
+): T | undefined {
+	if (!ctx) return undefined;
+	try {
+		if (!ctx.hasUI) return undefined;
+		return run(ctx);
+	} catch (error) {
+		if (!isStaleExtensionContextError(error)) throw error;
+		onStale();
+		return undefined;
+	}
+}

package/src/shared/formatters.ts

@@ -11,10 +11,13 @@ import { previewDisplayText, sanitizeDisplayText } from "./display-text.ts";
 import { splitKnownThinkingSuffix, THINKING_LEVELS } from "./model-info.ts";
 
 /**
- * Format token count with k suffix for large numbers
+ * Format token count for compact display.
  */
 export function formatTokens(n: number): string {
-	return n < 1000 ? String(n) : n < 10000 ? `${(n / 1000).toFixed(1)}k` : `${Math.round(n / 1000)}k`;
+	if (n < 1000) return String(n);
+	if (n < 10000) return `${(n / 1000).toFixed(1)}k`;
+	if (n < 999_500) return `${Math.round(n / 1000)}k`;
+	return `${Number((n / 1_000_000).toFixed(1))}M`;
 }
 
 export function formatTokenUsage(usage: TokenUsage, legacyLabel = "tok"): string {

package/src/shared/launch-contract.ts

@@ -51,6 +51,7 @@ export function projectAgentDefinition(agent: AgentConfig): Record<string, unkno
 		fast: agent.fast,
 		thinking: agent.thinking,
 		tools: agent.tools,
+		allowNestedSubagents: agent.allowNestedSubagents,
 		mcpDirectTools: agent.mcpDirectTools,
 		extensions: agent.extensions,
 		subagentOnlyExtensions: agent.subagentOnlyExtensions,
@@ -63,7 +64,6 @@ export function projectAgentDefinition(agent: AgentConfig): Record<string, unkno
 		defaultContext: agent.defaultContext,
 		defaultAsync: agent.defaultAsync,
 		defaultTimeoutMs: agent.defaultTimeoutMs,
-		defaultTurnBudget: agent.defaultTurnBudget,
 		defaultAcceptance: agent.defaultAcceptance,
 		acceptanceRole: agent.acceptanceRole,
 		interactive: agent.interactive,

package/src/shared/settings.ts

@@ -7,41 +7,19 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { discoverAgents, formatUnknownAgentError, unknownAgentDiagnosticContext, type AgentConfig, type AgentScope, type UnknownAgentDiagnosticContext } from "../agents/agents.ts";
 import { normalizeSkillInput } from "../agents/skills.ts";
+import { normalizeOutputOverride, type OutputOverrideInput, type ResolvedStepBehavior } from "../runs/shared/child-launch-plan.ts";
 import { CHAIN_RUNS_DIR, type AcceptanceInput, type AgentContract, type ChainGateLayer, type JsonSchemaObject, type OutputMode, type ToolBudgetConfig } from "./types.ts";
 const CHAIN_DIR_MAX_AGE_MS = 24 * 60 * 60 * 1000; // 24 hours
 const INITIAL_PROGRESS_CONTENT = "# Progress\n\n## Status\nIn Progress\n\n## Tasks\n\n## Files Changed\n\n## Notes\n";
 
-// =============================================================================
-// Behavior Resolution Types
-// =============================================================================
-
-export interface ResolvedStepBehavior {
-	output: string | false;
-	outputMode: OutputMode;
-	reads: string[] | false;
-	progress: boolean;
-	skills: string[] | false;
-	model?: string;
-	fast?: boolean;
-}
-
-export type OutputOverrideInput = string | boolean;
-
-export interface StepOverrides {
-	output?: OutputOverrideInput;
-	outputMode?: OutputMode;
-	reads?: string[] | false;
-	progress?: boolean;
-	skills?: string[] | false;
-	model?: string;
-	fast?: boolean;
-}
-
-function normalizeOutputOverride(output: unknown): string | false | undefined {
-	if (output === false || output === "false") return false;
-	if (output === true || output === "true") return undefined;
-	return typeof output === "string" && output.length > 0 ? output : undefined;
-}
+export {
+	planChildLaunch,
+	resolveStepBehavior,
+	resolveTaskTextForFileUpdatePolicy,
+	suppressProgressForReadOnlyTask,
+	taskDisallowsFileUpdates,
+} from "../runs/shared/child-launch-plan.ts";
+export type { ChildLaunchPlan, ChildLaunchPlanInput, OutputOverrideInput, ResolvedStepBehavior, StepOverrides } from "../runs/shared/child-launch-plan.ts";
 
 // =============================================================================
 // Chain Step Types
@@ -239,78 +217,6 @@ export function resolveChainTemplates(
 	});
 }
 
-// =============================================================================
-// Behavior Resolution
-// =============================================================================
-
-/**
- * Resolve effective chain behavior per step.
- * Priority: step override > agent frontmatter > false (disabled)
- */
-export function resolveStepBehavior(
-	agentConfig: AgentConfig,
-	stepOverrides: StepOverrides,
-	chainSkills?: string[],
-): ResolvedStepBehavior {
-	// Output: step override > frontmatter > false (no output)
-	const stepOutput = normalizeOutputOverride(stepOverrides.output);
-	const output =
-		stepOutput !== undefined
-			? stepOutput
-			: normalizeOutputOverride(agentConfig.output) ?? false;
-
-	// Reads: step override > frontmatter defaultReads > false (no reads)
-	const reads =
-		stepOverrides.reads !== undefined
-			? stepOverrides.reads
-			: agentConfig.defaultReads ?? false;
-
-	// Progress: step override > frontmatter defaultProgress > false
-	const progress =
-		stepOverrides.progress !== undefined
-			? stepOverrides.progress
-			: agentConfig.defaultProgress ?? false;
-
-	let skills: string[] | false;
-	if (stepOverrides.skills === false) {
-		skills = false;
-	} else if (stepOverrides.skills !== undefined) {
-		skills = [...stepOverrides.skills];
-		if (chainSkills && chainSkills.length > 0) {
-			skills = [...new Set([...skills, ...chainSkills])];
-		}
-	} else {
-		skills = agentConfig.skills ? [...agentConfig.skills] : [];
-		if (chainSkills && chainSkills.length > 0) {
-			skills = [...new Set([...skills, ...chainSkills])];
-		}
-	}
-
-	const outputMode = stepOverrides.outputMode ?? agentConfig.outputMode ?? "inline";
-	const model = stepOverrides.model ?? agentConfig.model;
-	const fast = stepOverrides.fast ?? agentConfig.fast;
-	return { output, outputMode, reads, progress, skills, model, fast };
-}
-
-export function resolveTaskTextForFileUpdatePolicy(task: string | undefined, originalTask?: string): string | undefined {
-	if (!task) return originalTask;
-	return originalTask ? task.replaceAll("{task}", originalTask) : task;
-}
-
-export function taskDisallowsFileUpdates(task: string | undefined): boolean {
-	if (!task) return false;
-	return /\breview[- ]only\b/i.test(task)
-		|| /\bread[- ]only\s+(?:review|audit|inspection|pass)\b/i.test(task)
-		|| /\b(?:no|without)\s+(?:file\s+)?edits?\b/i.test(task)
-		|| /\b(?:do not|don't|must not)\s+(?:edit|modify|write|touch)\b/i.test(task)
-		|| /\bleave\s+files?\s+unchanged\b/i.test(task);
-}
-
-export function suppressProgressForReadOnlyTask(behavior: ResolvedStepBehavior, task: string | undefined, originalTask?: string): ResolvedStepBehavior {
-	const policyTask = resolveTaskTextForFileUpdatePolicy(task, originalTask);
-	return behavior.progress && taskDisallowsFileUpdates(policyTask) ? { ...behavior, progress: false } : behavior;
-}
-
 // =============================================================================
 // Chain Instruction Injection
 // =============================================================================