oira666_pi-subagent 0.2.2 → 0.2.3

package/package.json

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

package/runner.ts

@@ -81,6 +81,25 @@ function cleanupTempDir(dir: string | null): void {
   }
 }
 
+function resolveWorkingDirectory(input: string, fallbackBase: string): string {
+  if (input.startsWith("~/")) return path.join(os.homedir(), input.slice(2));
+  if (path.isAbsolute(input)) return input;
+  return path.resolve(fallbackBase, input);
+}
+
+function getInvalidWorkingDirectoryMessage(input: string, resolved: string): string | null {
+  try {
+    const stat = fs.statSync(resolved);
+    if (!stat.isDirectory()) {
+      return `Invalid cwd "${input}" resolved to "${resolved}", but it is not a directory.`;
+    }
+    return null;
+  } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
+    return `Invalid cwd "${input}" resolved to "${resolved}": ${detail}`;
+  }
+}
+
 function getCurrentPiCliScript(): string | null {
   const script = process.argv[1];
   if (!script) return null;
@@ -504,6 +523,18 @@ export async function runAgentSubprocess(opts: RunAgentOptions): Promise<SingleR
 
   emitUpdate();
 
+  const requestedCwd = taskCwd ?? cwd;
+  const resolvedCwd = resolveWorkingDirectory(requestedCwd, cwd);
+  const invalidCwdMessage = getInvalidWorkingDirectoryMessage(requestedCwd, resolvedCwd);
+  if (invalidCwdMessage) {
+    result.exitCode = 1;
+    result.stopReason = "error";
+    result.errorMessage = invalidCwdMessage;
+    result.stderr = invalidCwdMessage;
+    emitUpdate();
+    return result;
+  }
+
   // Write system prompt to temp file if needed
   let promptTmpDir: string | null = null;
   let promptTmpPath: string | null = null;
@@ -533,7 +564,7 @@ export async function runAgentSubprocess(opts: RunAgentOptions): Promise<SingleR
       const spawnCmd = currentPiCli ? process.execPath : "pi";
       const spawnArgs = currentPiCli ? [currentPiCli, ...piArgs] : piArgs;
       const proc = spawn(spawnCmd, spawnArgs, {
-        cwd: taskCwd ?? cwd,
+        cwd: resolvedCwd,
         shell: false,
         stdio: ["ignore", "pipe", "pipe"],
         env: {
@@ -667,9 +698,10 @@ export async function runAgentSubprocess(opts: RunAgentOptions): Promise<SingleR
       });
 
       proc.on("error", (err) => {
-        result.stderr += `Spawn error: ${err.message}`;
+        const message = `Failed to spawn pi process in cwd "${resolvedCwd}": ${err.message}`;
+        result.stderr += result.stderr ? `\n${message}` : message;
         result.stopReason = "error";
-        result.errorMessage = `Failed to spawn pi process: ${err.message}`;
+        result.errorMessage = message;
         doResolve(1);
       });
 
@@ -840,7 +872,8 @@ export async function executeParallelSubprocess(
   const successCount = results.filter((r) => r.exitCode === 0).length;
   const summaries = results.map((r) => {
     const output = getFinalOutput(r.messages);
-    return `[${r.agent}] ${r.exitCode === 0 ? "completed" : "failed"}: ${output || "(no output)"}`;
+    const error = r.errorMessage || r.stderr;
+    return `[${r.agent}] ${r.exitCode === 0 ? "completed" : "failed"}: ${output || error || "(no output)"}`;
   });
 
   return {