oira666_pi-subagent 0.2.12 → 0.2.13

package/package.json

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

package/runner.ts

@@ -311,6 +311,20 @@ function hasMessage(result: SingleResult, message: Message): boolean {
   return result.messages.some((existing) => messageDedupKey(existing) === key);
 }
 
+function resultHasStarted(result: SingleResult | undefined): boolean {
+  if (!result) return false;
+  return result.messages.length > 0 || result.completedTurns > 0 || result.liveLog.length > 0 || Object.keys(result.toolCalls).length > 0;
+}
+
+function sessionDirExists(dir: string | undefined): boolean {
+  if (!dir) return false;
+  try {
+    return fs.existsSync(dir) && fs.statSync(dir).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
 export function processJsonLine(line: string, result: SingleResult): boolean {
   if (!line.trim()) return false;
 
@@ -536,25 +550,29 @@ export async function runAgentSubprocess(opts: RunAgentOptions): Promise<SingleR
     };
   }
 
-  if (resumeSession && sessionDir && (!fs.existsSync(sessionDir) || !fs.statSync(sessionDir).isDirectory())) {
-    const errorMessage = `Cannot resume subagent session: session directory does not exist: ${sessionDir}`;
-    return {
-      agent: agentName,
-      agentSource: agent.source,
-      task,
-      exitCode: 1,
-      messages: initialResult?.messages ? [...initialResult.messages] : [],
-      stderr: errorMessage,
-      usage: initialResult?.usage ? { ...initialResult.usage } : emptyUsage(),
-      toolCalls: initialResult?.toolCalls ? { ...initialResult.toolCalls } : {},
-      model: initialResult?.model ?? agent.model,
-      stopReason: "error",
-      errorMessage,
-      completedTurns: initialResult?.completedTurns ?? 0,
-      turnInProgress: false,
-      liveLog: initialResult?.liveLog ? [...initialResult.liveLog] : [],
-      sessionDir,
-    };
+  let shouldContinueSession = resumeSession;
+  if (resumeSession && sessionDir && !sessionDirExists(sessionDir)) {
+    if (resultHasStarted(initialResult)) {
+      const errorMessage = `Cannot resume subagent session: session directory does not exist: ${sessionDir}`;
+      return {
+        agent: agentName,
+        agentSource: agent.source,
+        task,
+        exitCode: 1,
+        messages: initialResult?.messages ? [...initialResult.messages] : [],
+        stderr: errorMessage,
+        usage: initialResult?.usage ? { ...initialResult.usage } : emptyUsage(),
+        toolCalls: initialResult?.toolCalls ? { ...initialResult.toolCalls } : {},
+        model: initialResult?.model ?? agent.model,
+        stopReason: "error",
+        errorMessage,
+        completedTurns: initialResult?.completedTurns ?? 0,
+        turnInProgress: false,
+        liveLog: initialResult?.liveLog ? [...initialResult.liveLog] : [],
+        sessionDir,
+      };
+    }
+    shouldContinueSession = false;
   }
 
   const result: SingleResult = {
@@ -603,7 +621,7 @@ export async function runAgentSubprocess(opts: RunAgentOptions): Promise<SingleR
       promptTmpPath,
       task,
       sessionDir,
-      resumeSession,
+      shouldContinueSession,
       fallbackModel,
     );
     let wasAborted = false;
@@ -883,7 +901,6 @@ export async function executeParallelSubprocess(
     completedTurns: 0,
     turnInProgress: false,
     liveLog: [],
-    sessionDir: getSessionDir?.(index, t),
   }));
 
   const emitProgress = () => {
@@ -918,7 +935,12 @@ export async function executeParallelSubprocess(
         emitProgress();
         return previousResult;
       }
-      const sessionDir = previousResult?.sessionDir ?? getSessionDir?.(index, t);
+      const savedSessionDir = previousResult?.sessionDir;
+      const savedSessionDirExists = sessionDirExists(savedSessionDir);
+      const shouldResumeThisSession = resumeExistingSessions && (!previousResult || !savedSessionDir || savedSessionDirExists);
+      const sessionDir = shouldResumeThisSession && savedSessionDirExists
+        ? savedSessionDir
+        : getSessionDir?.(index, t);
       const result = await runAgentSubprocess({
         cwd: defaultCwd,
         agents,
@@ -932,7 +954,7 @@ export async function executeParallelSubprocess(
         signal,
         sessionDir,
         sessionRoot,
-        resumeSession: resumeExistingSessions && !!sessionDir,
+        resumeSession: shouldResumeThisSession && !!sessionDir,
         initialResult: previousResult,
         fallbackModel,
         onUpdate: (partial) => {