oira666_pi-subagent 0.1.4 → 0.1.6

package/README.md

@@ -62,8 +62,12 @@ Three fallback agents ship with the extension (used when no user/project agents
 Create Markdown files with YAML frontmatter:
 
 - **User agents:** `~/.pi/agent/agents/*.md`
+- **Env agents:** `$PI_CODING_AGENT_DIR/agents/*.md` *(when `PI_CODING_AGENT_DIR` is set)*
 - **Project agents:** `.pi/agents/*.md` *(may prompt for confirmation — see `PI_SUBAGENT_CONFIRM_PROJECT_AGENTS`)*
 
+Agent discovery priority (highest wins on name collision): project > env > user.
+Built-in agents are only used as a fallback when **all three** locations are empty.
+
 ```markdown
 ---
 name: writer
@@ -112,6 +116,12 @@ pi --no-subagent-prevent-cycles   # allow cycles (not recommended)
 | `PI_SUBAGENT_MAX_PARALLEL_TASKS` | `16`    | Max tasks per single call                |
 | `PI_SUBAGENT_MAX_CONCURRENCY`    | `8`     | Max subagents running simultaneously     |
 
+## Agent Discovery
+
+| Env Var                 | Description                                                  |
+| ----------------------- | ------------------------------------------------------------ |
+| `PI_CODING_AGENT_DIR`   | Base path for an additional agents directory (`$PI_CODING_AGENT_DIR/agents/*.md`). Agents here override user agents but are overridden by project agents. Built-in agents are only used when user, env, and project locations all yield zero agents. |
+
 ## CLI Argument Proxying
 
 All flags passed to the parent `pi` process are forwarded to subagent child processes, so they

package/agents.ts

@@ -5,14 +5,13 @@
  * optional model/tools, and a system prompt body.
  *
  * Lookup locations:
- *   - User agents:    ~/.pi/agent/agents/*.md
+ *   - 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 { parseFrontmatter } from "@mariozechner/pi-coding-agent";
+import { getAgentDir, parseFrontmatter } from "@mariozechner/pi-coding-agent";
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -144,6 +143,10 @@ function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
 	return agents;
 }
 
+/**
+ * Merge agents with last-write-wins deduplication by name.
+ * Priority (lowest → highest): user < project.
+ */
 function dedupeAgents(
 	userAgents: AgentConfig[],
 	projectAgents: AgentConfig[],
@@ -165,7 +168,7 @@ function dedupeAgents(
  * 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(os.homedir(), ".pi", "agent", "agents");
+	const userDir = path.join(getAgentDir(), "agents");
 	const projectAgentsDir = findNearestProjectAgentsDir(cwd);
 
 	const userAgents = loadAgentsFromDir(userDir, "user");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-subagent",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
   "type": "module",
   "main": "index.ts",

package/runner.ts

@@ -482,7 +482,13 @@ export async function runAgent(opts: RunAgentOptions): Promise<SingleResult> {
       const nextDepth = Math.max(0, Math.floor(parentDepth)) + 1;
       const propagatedMaxDepth = Math.max(0, Math.floor(maxDepth));
       const propagatedStack = [...parentAgentStack, agentName];
-      const proc = spawn("pi", piArgs, {
+      // On Windows, `pi` is a .CMD shim that requires the shell to execute,
+      // but shell:true splits arguments on whitespace — breaking task strings.
+      // Fix: reuse the running node binary + the pi CLI script path directly,
+      // so the child is spawned without a shell and args are passed safely.
+      const spawnCmd = process.platform === "win32" ? process.execPath : "pi";
+      const spawnArgs = process.platform === "win32" ? [process.argv[1], ...piArgs] : piArgs;
+      const proc = spawn(spawnCmd, spawnArgs, {
         cwd: taskCwd ?? cwd,
         shell: false,
         stdio: ["ignore", "pipe", "pipe"],