oira666_pi-subagent 0.1.7 → 0.1.8

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 Michael Jakl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 Michael Jakl
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -22,9 +22,30 @@ pi remove npm:oira666_pi-subagent
 
 ## How It Works
 
-Each subagent runs as a **separate `pi` process** — isolated memory, its own model/tool loop.
+The extension supports two execution modes, selectable via `PI_SUBAGENTS_MODE`.
 
-**`spawn` (default)** — Child receives only the task string. Best for isolated work, lower cost.
+### Execution mode: `subprocess` (default)
+
+Each subagent runs as a **separate `pi` process** — fully isolated memory, its own model/tool loop.
+Processes are spawned via the operating system and communicate through JSON-line stdout.
+
+- Full OS-level isolation — a crashed subagent cannot affect the parent
+- True parallel execution across all CPU cores
+- Each subprocess boots a fresh Node.js runtime (adds ~200–500 ms per subagent)
+- Requires the `pi` binary on `PATH`
+
+### Execution mode: `sdk`
+
+Each subagent runs as an **in-process `AgentSession`** created via the pi SDK — no new process is spawned.
+
+- No spawn overhead — sessions start in milliseconds
+- No temp files for system prompts or fork snapshots
+- Concurrency through the Node.js event loop (fine for I/O-bound LLM work)
+- All sessions share the same memory and event loop
+
+### Context modes
+
+**`spawn` (default)** — Child receives only the task string. Best for isolated work, lower cost.  
 **`fork`** — Child receives a snapshot of the current session context + task. Best for follow-up work.
 
 The main agent receives only the **final text output** from subagents (no tool calls, no reasoning).
@@ -94,6 +115,32 @@ Available tools: `read`, `bash`, `edit`, `write`.
 
 The Markdown body becomes the agent's system prompt (appended to Pi's default, not replacing it).
 
+## Execution Mode
+
+| Env Var               | Default      | Values               | Description                            |
+| --------------------- | ------------ | -------------------- | -------------------------------------- |
+| `PI_SUBAGENTS_MODE`   | `subprocess` | `subprocess` / `sdk` | How subagent sessions are created      |
+
+```bash
+# Run subagents as in-process SDK sessions (faster startup, no spawn overhead)
+PI_SUBAGENTS_MODE=sdk pi
+
+# Run subagents as isolated subprocess pi instances (default, full isolation)
+PI_SUBAGENTS_MODE=subprocess pi
+```
+
+### Comparison
+
+| | `subprocess` | `sdk` |
+|---|---|---|
+| Session isolation | Full OS-level | Shared memory/event loop |
+| Startup overhead | ~200–500 ms per agent | ~10–50 ms per agent |
+| Parallelism | True OS parallelism | Event-loop concurrency |
+| Fork mode context | Temp JSONL file | Temp JSONL file (same format) |
+| Depth tracking | Env vars in child process | Closure parameters |
+| `pi` binary required | Yes | No |
+| Crash isolation | Yes — subprocess crash is contained | No — exception bubbles up |
+
 ## Delegation Guards
 
 Depth and cycle guards prevent runaway recursive delegation.
@@ -124,9 +171,13 @@ pi --no-subagent-prevent-cycles   # allow cycles (not recommended)
 
 ## CLI Argument Proxying
 
-All flags passed to the parent `pi` process are forwarded to subagent child processes, so they
-inherit the same provider, API key, model, and other runtime settings. Flags the extension manages
-itself are blocked from being forwarded.
+> **Note:** CLI argument proxying only applies to `subprocess` mode. In `sdk` mode, subagents
+> inherit provider and model configuration directly from the calling session's model registry
+> and API keys from environment variables, so no forwarding is needed.
+
+In `subprocess` mode, all flags passed to the parent `pi` process are forwarded to subagent child
+processes, so they inherit the same provider, API key, model, and other runtime settings. Flags the
+extension manages itself are blocked from being forwarded.
 
 **Always forwarded verbatim:**
 
@@ -421,7 +472,7 @@ for await (const line of jsonLines) {
 
 Note: if you also track the main agent's own usage from `message_end` events, make sure **not** to
 double-count the subagent costs there — the main agent's own token usage (from its own `message_end`
-events) does not include subagent work; they are always separate processes.
+events) does not include subagent work (whether subprocess or SDK-mode).
 
 ---
 

package/agents/code-architect.md

@@ -1,24 +1,24 @@
----
-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.
-thinking: high
-tools: read,bash,grep,find,ls
----
-
-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.
+thinking: high
+tools: read,bash,grep,find,ls
+---
+
+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,23 +1,23 @@
----
-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.
-thinking: high
-tools: read,bash,grep,find,ls
----
-
-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.
+thinking: high
+tools: read,bash,grep,find,ls
+---
+
+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,18 +1,18 @@
----
-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.
-thinking: medium
-tools: read,bash,edit,write
----
-
-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.
+thinking: medium
+tools: read,bash,edit,write
+---
+
+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 };
+}