oira666_pi-subagent 0.2.21 → 0.2.22

package/agents/code-architect.md

@@ -1,22 +1,22 @@
----
-name: code-architect
-description: Technical design agent for shaping implementations, APIs, module boundaries, and tradeoffs before coding. Use this agent for plans and architecture decisions.
----
-
-You are a senior software architect focused on practical design.
-
-Your job is to propose implementation approaches that balance simplicity,
-maintainability, extensibility, and delivery speed.
-
-Guidelines:
-- Start from the current codebase and constraints, not an idealized rewrite.
-- Prefer simple designs with clear ownership and minimal moving parts.
-- Call out tradeoffs, risks, migration concerns, and compatibility implications.
-- Recommend concrete module boundaries, data flow, and rollout steps when useful.
-- Avoid unnecessary abstraction.
-
-In your final response:
-- Present the recommended approach first.
-- Include 1-2 viable alternatives when relevant.
-- Explain why the recommendation fits this codebase.
-- Highlight the biggest implementation risks or unknowns.
+---
+name: code-architect
+description: Technical design agent for shaping implementations, APIs, module boundaries, and tradeoffs before coding. Use this agent for plans and architecture decisions.
+---
+
+You are a senior software architect focused on practical design.
+
+Your job is to propose implementation approaches that balance simplicity,
+maintainability, extensibility, and delivery speed.
+
+Guidelines:
+- Start from the current codebase and constraints, not an idealized rewrite.
+- Prefer simple designs with clear ownership and minimal moving parts.
+- Call out tradeoffs, risks, migration concerns, and compatibility implications.
+- Recommend concrete module boundaries, data flow, and rollout steps when useful.
+- Avoid unnecessary abstraction.
+
+In your final response:
+- Present the recommended approach first.
+- Include 1-2 viable alternatives when relevant.
+- Explain why the recommendation fits this codebase.
+- Highlight the biggest implementation risks or unknowns.

package/agents/code-reviwer.md

@@ -1,21 +1,21 @@
----
-name: code-reviwer
-description: Code review specialist for finding bugs, regressions, edge cases, and maintainability issues. Use this agent to review code, plans, or patches.
----
-
-You are a skeptical, detail-oriented code reviewer.
-
-Your goal is to identify the most important correctness, reliability, security,
-and maintainability issues in the provided code or plan.
-
-Guidelines:
-- Prioritize concrete issues over stylistic preferences.
-- Look for broken assumptions, missing edge-case handling, risky changes, and test gaps.
-- Prefer concise findings with clear reasoning and likely impact.
-- If the code looks good, say so explicitly instead of inventing problems.
-- Do not edit files; focus on analysis and recommendations.
-
-In your final response:
-- List findings ordered by severity.
-- Include file paths or symbols when possible.
-- If there are no meaningful issues, say "No significant issues found" and mention any residual risks briefly.
+---
+name: code-reviwer
+description: Code review specialist for finding bugs, regressions, edge cases, and maintainability issues. Use this agent to review code, plans, or patches.
+---
+
+You are a skeptical, detail-oriented code reviewer.
+
+Your goal is to identify the most important correctness, reliability, security,
+and maintainability issues in the provided code or plan.
+
+Guidelines:
+- Prioritize concrete issues over stylistic preferences.
+- Look for broken assumptions, missing edge-case handling, risky changes, and test gaps.
+- Prefer concise findings with clear reasoning and likely impact.
+- If the code looks good, say so explicitly instead of inventing problems.
+- Do not edit files; focus on analysis and recommendations.
+
+In your final response:
+- List findings ordered by severity.
+- Include file paths or symbols when possible.
+- If there are no meaningful issues, say "No significant issues found" and mention any residual risks briefly.

package/agents/code-writer.md

@@ -1,16 +1,16 @@
----
-name: code-writer
-description: Focused implementation agent for writing and refactoring code with small, reliable diffs. Use this agent when you want code changes made directly.
----
-
-You are a pragmatic software engineer focused on implementation.
-
-Your job is to turn requirements into small, correct code changes.
-
-Guidelines:
-- Read the relevant files before editing.
-- Prefer minimal diffs that fit the existing style and architecture.
-- Preserve working behavior unless the task explicitly changes it.
-- When details are ambiguous, choose the simplest reasonable implementation and state your assumption.
-- If helpful, run targeted commands to inspect the codebase or validate your changes.
-- In your final response, summarize what you changed, note any assumptions, and mention any validation you performed.
+---
+name: code-writer
+description: Focused implementation agent for writing and refactoring code with small, reliable diffs. Use this agent when you want code changes made directly.
+---
+
+You are a pragmatic software engineer focused on implementation.
+
+Your job is to turn requirements into small, correct code changes.
+
+Guidelines:
+- Read the relevant files before editing.
+- Prefer minimal diffs that fit the existing style and architecture.
+- Preserve working behavior unless the task explicitly changes it.
+- When details are ambiguous, choose the simplest reasonable implementation and state your assumption.
+- If helpful, run targeted commands to inspect the codebase or validate your changes.
+- In your final response, summarize what you changed, note any assumptions, and mention any validation you performed.

package/agents.ts

@@ -1,188 +1,188 @@
-/**
- * Agent discovery and configuration.
- *
- * Agents are Markdown files with YAML frontmatter that define name, description,
- * optional model/tools, and a system prompt body.
- *
- * Lookup locations:
- *   - User agents:    ~/.pi/agent/agents/*.md  (or $PI_CODING_AGENT_DIR/agents/ when env var is set)
- *   - Project agents: .pi/agents/*.md  (walks up from cwd)
- *   - Bundled agents: ./agents/*.md    (fallback only when no user/project agents exist)
- */
-
-import { getAgentDir, parseFrontmatter } from "@mariozechner/pi-coding-agent";
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { fileURLToPath } from "node:url";
-
-export type AgentScope = "user" | "project" | "both";
-export type AgentSource = "user" | "project" | "builtin";
-
-export interface AgentConfig {
-	name: string;
-	description: string;
-	tools?: string[];
-	model?: string;
-	thinking?: string;
-	systemPrompt: string;
-	source: AgentSource;
-	filePath: string;
-}
-
-export interface AgentDiscoveryResult {
-	agents: AgentConfig[];
-	projectAgentsDir: string | null;
-}
-
-const BUNDLED_AGENTS_DIR = path.join(
-	path.dirname(fileURLToPath(import.meta.url)),
-	"agents",
-);
-
-// ---------------------------------------------------------------------------
-// Internal helpers
-// ---------------------------------------------------------------------------
-
-function isDirectory(p: string): boolean {
-	try {
-		return fs.statSync(p).isDirectory();
-	} catch {
-		return false;
-	}
-}
-
-/** Walk up from `cwd` looking for a `.pi/agents` directory. */
-function findNearestProjectAgentsDir(cwd: string): string | null {
-	let dir = cwd;
-	while (true) {
-		const candidate = path.join(dir, ".pi", "agents");
-		if (isDirectory(candidate)) return candidate;
-		const parent = path.dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
-	}
-}
-
-/** Parse a single agent markdown file into an AgentConfig. Returns null on skip. */
-function parseAgentFile(filePath: string, source: AgentSource): AgentConfig | null {
-	let content: string;
-	try {
-		content = fs.readFileSync(filePath, "utf-8");
-	} catch {
-		return null;
-	}
-
-	let parsed: { frontmatter: Record<string, unknown>; body: string };
-	try {
-		parsed = parseFrontmatter<Record<string, unknown>>(content);
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		console.warn(`[pi-subagent] Skipping invalid agent file "${filePath}": ${message}`);
-		return null;
-	}
-
-	const frontmatter = parsed.frontmatter ?? {};
-	const body = parsed.body ?? "";
-
-	const name = typeof frontmatter.name === "string" ? frontmatter.name.trim() : "";
-	const description = typeof frontmatter.description === "string" ? frontmatter.description.trim() : "";
-	if (!name || !description) return null;
-
-	let tools: string[] | undefined;
-	if (typeof frontmatter.tools === "string") {
-		const parsedTools = frontmatter.tools
-			.split(",")
-			.map((t) => t.trim())
-			.filter(Boolean);
-		if (parsedTools.length > 0) tools = parsedTools;
-	} else if (Array.isArray(frontmatter.tools)) {
-		const parsedTools = frontmatter.tools
-			.filter((t): t is string => typeof t === "string")
-			.map((t) => t.trim())
-			.filter(Boolean);
-		if (parsedTools.length > 0) tools = parsedTools;
-	} else if (frontmatter.tools !== undefined) {
-		console.warn(
-			`[pi-subagent] Ignoring invalid tools field in "${filePath}". Expected a comma-separated string or string array.`,
-		);
-	}
-
-	return {
-		name,
-		description,
-		tools,
-		model: typeof frontmatter.model === "string" ? frontmatter.model : undefined,
-		thinking: typeof frontmatter.thinking === "string" ? frontmatter.thinking : undefined,
-		systemPrompt: body,
-		source,
-		filePath,
-	};
-}
-
-/** Load all agent definitions from a directory. */
-function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
-	if (!fs.existsSync(dir)) return [];
-
-	let entries: fs.Dirent[];
-	try {
-		entries = fs.readdirSync(dir, { withFileTypes: true });
-	} catch {
-		return [];
-	}
-
-	entries.sort((a, b) => a.name.localeCompare(b.name));
-
-	const agents: AgentConfig[] = [];
-	for (const entry of entries) {
-		if (!entry.name.endsWith(".md")) continue;
-		if (!entry.isFile() && !entry.isSymbolicLink()) continue;
-
-		const agent = parseAgentFile(path.join(dir, entry.name), source);
-		if (agent) agents.push(agent);
-	}
-	return agents;
-}
-
-/**
- * Merge agents with last-write-wins deduplication by name.
- * Priority (lowest → highest): user < project.
- */
-function dedupeAgents(
-	userAgents: AgentConfig[],
-	projectAgents: AgentConfig[],
-): AgentConfig[] {
-	const agentMap = new Map<string, AgentConfig>();
-	for (const agent of userAgents) agentMap.set(agent.name, agent);
-	for (const agent of projectAgents) agentMap.set(agent.name, agent);
-	return Array.from(agentMap.values());
-}
-
-// ---------------------------------------------------------------------------
-// Public API
-// ---------------------------------------------------------------------------
-
-/**
- * Discover all available agents according to the requested scope.
- *
- * When scope is "both", project agents override user agents with the same name.
- * If no user or project agents exist at all, bundled fallback agents are returned.
- */
-export function discoverAgents(cwd: string, scope: AgentScope): AgentDiscoveryResult {
-	const userDir = path.join(getAgentDir(), "agents");
-	const projectAgentsDir = findNearestProjectAgentsDir(cwd);
-
-	const userAgents = loadAgentsFromDir(userDir, "user");
-	const projectAgents = projectAgentsDir ? loadAgentsFromDir(projectAgentsDir, "project") : [];
-
-	const hasConfiguredAgents = userAgents.length > 0 || projectAgents.length > 0;
-	if (!hasConfiguredAgents) {
-		return {
-			agents: loadAgentsFromDir(BUNDLED_AGENTS_DIR, "builtin"),
-			projectAgentsDir,
-		};
-	}
-
-	if (scope === "user") return { agents: userAgents, projectAgentsDir };
-	if (scope === "project") return { agents: projectAgents, projectAgentsDir };
-	return { agents: dedupeAgents(userAgents, projectAgents), projectAgentsDir };
-}
+/**
+ * Agent discovery and configuration.
+ *
+ * Agents are Markdown files with YAML frontmatter that define name, description,
+ * optional model/tools, and a system prompt body.
+ *
+ * Lookup locations:
+ *   - User agents:    ~/.pi/agent/agents/*.md  (or $PI_CODING_AGENT_DIR/agents/ when env var is set)
+ *   - Project agents: .pi/agents/*.md  (walks up from cwd)
+ *   - Bundled agents: ./agents/*.md    (fallback only when no user/project agents exist)
+ */
+
+import { getAgentDir, parseFrontmatter } from "@mariozechner/pi-coding-agent";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+
+export type AgentScope = "user" | "project" | "both";
+export type AgentSource = "user" | "project" | "builtin";
+
+export interface AgentConfig {
+	name: string;
+	description: string;
+	tools?: string[];
+	model?: string;
+	thinking?: string;
+	systemPrompt: string;
+	source: AgentSource;
+	filePath: string;
+}
+
+export interface AgentDiscoveryResult {
+	agents: AgentConfig[];
+	projectAgentsDir: string | null;
+}
+
+const BUNDLED_AGENTS_DIR = path.join(
+	path.dirname(fileURLToPath(import.meta.url)),
+	"agents",
+);
+
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+
+function isDirectory(p: string): boolean {
+	try {
+		return fs.statSync(p).isDirectory();
+	} catch {
+		return false;
+	}
+}
+
+/** Walk up from `cwd` looking for a `.pi/agents` directory. */
+function findNearestProjectAgentsDir(cwd: string): string | null {
+	let dir = cwd;
+	while (true) {
+		const candidate = path.join(dir, ".pi", "agents");
+		if (isDirectory(candidate)) return candidate;
+		const parent = path.dirname(dir);
+		if (parent === dir) return null;
+		dir = parent;
+	}
+}
+
+/** Parse a single agent markdown file into an AgentConfig. Returns null on skip. */
+function parseAgentFile(filePath: string, source: AgentSource): AgentConfig | null {
+	let content: string;
+	try {
+		content = fs.readFileSync(filePath, "utf-8");
+	} catch {
+		return null;
+	}
+
+	let parsed: { frontmatter: Record<string, unknown>; body: string };
+	try {
+		parsed = parseFrontmatter<Record<string, unknown>>(content);
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		console.warn(`[pi-subagent] Skipping invalid agent file "${filePath}": ${message}`);
+		return null;
+	}
+
+	const frontmatter = parsed.frontmatter ?? {};
+	const body = parsed.body ?? "";
+
+	const name = typeof frontmatter.name === "string" ? frontmatter.name.trim() : "";
+	const description = typeof frontmatter.description === "string" ? frontmatter.description.trim() : "";
+	if (!name || !description) return null;
+
+	let tools: string[] | undefined;
+	if (typeof frontmatter.tools === "string") {
+		const parsedTools = frontmatter.tools
+			.split(",")
+			.map((t) => t.trim())
+			.filter(Boolean);
+		if (parsedTools.length > 0) tools = parsedTools;
+	} else if (Array.isArray(frontmatter.tools)) {
+		const parsedTools = frontmatter.tools
+			.filter((t): t is string => typeof t === "string")
+			.map((t) => t.trim())
+			.filter(Boolean);
+		if (parsedTools.length > 0) tools = parsedTools;
+	} else if (frontmatter.tools !== undefined) {
+		console.warn(
+			`[pi-subagent] Ignoring invalid tools field in "${filePath}". Expected a comma-separated string or string array.`,
+		);
+	}
+
+	return {
+		name,
+		description,
+		tools,
+		model: typeof frontmatter.model === "string" ? frontmatter.model : undefined,
+		thinking: typeof frontmatter.thinking === "string" ? frontmatter.thinking : undefined,
+		systemPrompt: body,
+		source,
+		filePath,
+	};
+}
+
+/** Load all agent definitions from a directory. */
+function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
+	if (!fs.existsSync(dir)) return [];
+
+	let entries: fs.Dirent[];
+	try {
+		entries = fs.readdirSync(dir, { withFileTypes: true });
+	} catch {
+		return [];
+	}
+
+	entries.sort((a, b) => a.name.localeCompare(b.name));
+
+	const agents: AgentConfig[] = [];
+	for (const entry of entries) {
+		if (!entry.name.endsWith(".md")) continue;
+		if (!entry.isFile() && !entry.isSymbolicLink()) continue;
+
+		const agent = parseAgentFile(path.join(dir, entry.name), source);
+		if (agent) agents.push(agent);
+	}
+	return agents;
+}
+
+/**
+ * Merge agents with last-write-wins deduplication by name.
+ * Priority (lowest → highest): user < project.
+ */
+function dedupeAgents(
+	userAgents: AgentConfig[],
+	projectAgents: AgentConfig[],
+): AgentConfig[] {
+	const agentMap = new Map<string, AgentConfig>();
+	for (const agent of userAgents) agentMap.set(agent.name, agent);
+	for (const agent of projectAgents) agentMap.set(agent.name, agent);
+	return Array.from(agentMap.values());
+}
+
+// ---------------------------------------------------------------------------
+// Public API
+// ---------------------------------------------------------------------------
+
+/**
+ * Discover all available agents according to the requested scope.
+ *
+ * When scope is "both", project agents override user agents with the same name.
+ * If no user or project agents exist at all, bundled fallback agents are returned.
+ */
+export function discoverAgents(cwd: string, scope: AgentScope): AgentDiscoveryResult {
+	const userDir = path.join(getAgentDir(), "agents");
+	const projectAgentsDir = findNearestProjectAgentsDir(cwd);
+
+	const userAgents = loadAgentsFromDir(userDir, "user");
+	const projectAgents = projectAgentsDir ? loadAgentsFromDir(projectAgentsDir, "project") : [];
+
+	const hasConfiguredAgents = userAgents.length > 0 || projectAgents.length > 0;
+	if (!hasConfiguredAgents) {
+		return {
+			agents: loadAgentsFromDir(BUNDLED_AGENTS_DIR, "builtin"),
+			projectAgentsDir,
+		};
+	}
+
+	if (scope === "user") return { agents: userAgents, projectAgentsDir };
+	if (scope === "project") return { agents: projectAgents, projectAgentsDir };
+	return { agents: dedupeAgents(userAgents, projectAgents), projectAgentsDir };
+}

package/index.ts

@@ -363,6 +363,19 @@ function hasCliInitialPrompt(argv: string[]): boolean {
   return false;
 }
 
+function isStreamingSteerInput(event: any, ctx: { isIdle: () => boolean }): boolean {
+  // Newer Pi versions provide this directly. Undefined means the input was
+  // submitted while idle; "followUp" means it is queued for the next turn.
+  // Only "steer" should be intercepted for subagent broadcast routing.
+  if (Object.prototype.hasOwnProperty.call(event ?? {}, "streamingBehavior")) {
+    return event.streamingBehavior === "steer";
+  }
+
+  // Backward compatibility for older Pi versions that emitted `input` without
+  // delivery metadata: non-idle input was treated as a steering message.
+  return !ctx.isIdle();
+}
+
 const RESUME_STATE_KEY = "__piSubagentResumeState";
 const SUBAGENT_FALLBACK_MODEL_ENV = "PI_SUBAGENT_FALLBACK_MODEL";
 const RESUME_INTERACTIVE_DELAY_MS = 50;
@@ -1033,10 +1046,11 @@ export default function (pi: ExtensionAPI) {
   pi.on("input", async (event, ctx) => {
     try {
       // Pi emits this before it applies the built-in streaming behavior. When a
-      // subagent tool is running, user input is a normal steering message to the
-      // parent. Give the user a chance to route it to child RPC sessions instead.
+      // subagent tool is running, only mid-stream steering messages should be
+      // candidates for child broadcast. Idle prompts and queued follow-ups must
+      // continue normally so they reach the parent conversation as intended.
       if (activeSubagents.size === 0) return { action: "continue" as const };
-      if (ctx.isIdle()) return { action: "continue" as const };
+      if (!isStreamingSteerInput(event, ctx)) return { action: "continue" as const };
       const result = await askBroadcastForSteering(event.text, ctx);
       return result === "handled"
         ? { action: "handled" as const }