@arhen/pi-core-subagent 1.3.39 → 1.3.40

package/README.md

@@ -147,9 +147,11 @@ On completion the extension commits the child's changes (the child is told not t
 git merge --no-ff subagents/<run>/<task>
 ```
 
-**Branch relationships — read this before merging.** A write task that `needs` a completed write task is **stacked**: its worktree branches from the upstream's branch, so the child actually sees the files its upstream wrote (basing on main `HEAD` would hand it a tree without them, and its merge would revert the upstream). The summary says `Stacked on <branch> — merge that branch FIRST`; merge in dependency order.
+**Branch relationships — read this before merging.** A write task that `needs` a completed write task is **stacked**: its worktree branches from the upstream's branch, so the child actually sees the files its upstream wrote. A stacked branch *contains* its upstream's commits, so merge order doesn't matter — merging the stacked branch brings both, and the upstream's own merge is then a no-op.
 
-Same-wave write tasks are **siblings**: both branch from the same base, so they are independent, not stacked. When two siblings changed the same file the summary emits `CONFLICT RISK` naming the overlap — the second `git merge` will be a real 3-way. Siblings that touched *different* but coupled files (a schema and its consumer) merge cleanly and can still break at runtime; that one is on you.
+Why this matters (verified against real git, not just reasoned about): when a downstream child *can't* see its upstream's work, merging produces spurious conflicts, half-clobbered files where the child's side looks like a phantom delete, and — worst — **clean merges that leave a broken tree**. If the upstream renamed `login`→`signIn` and the downstream wrote new code importing `login`, git reports success with exit 0 and the code doesn't compile. Stacking removes that class by construction.
+
+Same-wave write tasks are **siblings**: both branch from the same base, so they are independent. When two siblings changed the same file the summary emits `CONFLICT RISK` naming the overlap — the second `git merge` is a real 3-way and fails loudly, which is the safe outcome. The dangerous case is siblings touching *different* but coupled files: that merges clean and breaks at runtime. Nothing can detect it for you.
 
 **Dependencies are shared, not isolated.** `node_modules` is symlinked to the main checkout, so dependency writes escape the worktree: children are instructed never to install, upgrade, or delete deps. A task that genuinely needs a dependency change should edit the manifest and say so.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@arhen/pi-core-subagent",
-	"version": "1.3.39",
+	"version": "1.3.40",
 	"type": "module",
 	"description": "pi extension: fast in-process subagents with a dependency-graph scheduler (needs edges gate tasks and carry upstream output into dependent prompts), plus background runs, intercom and agent-to-agent mailbox. Leader defines agents inline.",
 	"license": "MIT",

package/src/format.ts

@@ -204,7 +204,12 @@ function worktreeLine(task: TaskSnapshot, siblings?: TaskSnapshot[]): string {
 			? ` (${task.changedFiles.length} file(s): ${truncateText(task.changedFiles.join(", "), 160)})`
 			: "";
 		parts.push(`Branch: ${task.branch}${files} — merge with \`git merge --no-ff ${task.branch}\` after review.`);
-		if (task.stackedOn) parts.push(`Stacked on ${task.stackedOn} — merge that branch FIRST.`);
+		// Stacked branches CONTAIN their upstream, so either merge order gives the
+		// same tree (merging this one pulls the upstream in; the upstream's own merge
+		// is then a no-op). Say that, rather than implying an ordering requirement.
+		if (task.stackedOn) {
+			parts.push(`Stacked on ${task.stackedOn} — contains that branch's commits, so merging this one brings both.`);
+		}
 		// Sibling branches are independent, not stacked: overlapping files mean the
 		// second merge is a real 3-way, and non-overlapping-but-coupled edits break
 		// silently. Both are computable from changedFiles, so say so.

package/src/manager.ts

@@ -61,6 +61,9 @@ export const MAX_CONCURRENCY = 8;
  *  event, so a child stuck in a retry/compaction livelock emits forever and is
  *  never "stalled" — only a cap that events CANNOT reset bounds that. */
 const DEFAULT_RUNTIME_MS = 3_600_000; // 1 h
+/** "Unlimited" still has a ceiling — an unbounded child pins hasActiveRun() and
+ *  its concurrency slot for the life of the session. */
+const UNLIMITED_RUNTIME_MS = 21_600_000; // 6 h
 /** Last-resort hang detector, not a latency budget. A healthy child can be
  *  silent for minutes (big-context upload, non-streamed reasoning, provider
  *  retry backoff), so this is deliberately far above any normal quiet window —
@@ -1010,10 +1013,11 @@ export class SubagentManager {
 					),
 			});
 
-			// auto-limit off = drop the DEFAULT ceiling, but never an explicit request:
-			// discarding the leader's own maxRuntimeMs removed the last escape from a
-			// livelocked child.
-			const maxRuntimeMs = input.maxRuntimeMs ?? (this.autoLimit ? DEFAULT_RUNTIME_MS : 0);
+			// The ceiling is the ONLY bound on a child that emits events forever (retry
+			// or tool-call livelock): the stall watchdog is touched by every event and
+			// cannot fire for one. So auto-limit off RAISES it, never removes it —
+			// removing it reproduced the immortal-child hang.
+			const maxRuntimeMs = input.maxRuntimeMs ?? (this.autoLimit ? DEFAULT_RUNTIME_MS : UNLIMITED_RUNTIME_MS);
 			const promptPromise = child.prompt(task.task, { source: "extension" });
 			const races: Promise<unknown>[] = [promptPromise, childFailurePromise, childEndPromise, watchdog.promise];
 			if (maxRuntimeMs > 0) {
@@ -1108,12 +1112,21 @@ export class SubagentManager {
 			} catch {
 				/* ignore */
 			}
+			// Publish whatever the child DID say before it was killed. A timeout or
+			// abort used to discard it, so a chain dependent received nothing at all
+			// while the child's partial work was still committed to its branch.
+			const salvaged =
+				task.finalText ||
+				truncateText(
+					(child?.messages as AssistantMessage[] | undefined)?.map(getFirstText).filter(Boolean).at(-1) || "",
+				);
 			this.updateTask(
 				run,
 				task,
 				{
 					status: aborted ? "aborted" : ((subagentStatus as TaskStatus) ?? "failed"),
 					error: err instanceof Error ? err.message : String(err),
+					finalText: salvaged || undefined,
 					endedAt: Date.now(),
 				},
 				ctx,

package/src/worktree.ts

@@ -28,6 +28,11 @@ const BRANCH_PREFIX = "subagents/";
 const COMMIT_CONFIG = ["-c", "commit.gpgsign=false", "-c", "user.name=pi subagent", "-c", "user.email=subagent@local"];
 const GIT_TIMEOUT_MS = 120_000;
 const GIT_MAX_BUFFER = 32 * 1024 * 1024;
+/** Capture stderr instead of inheriting it. execFileSync only redirects stdout by
+ *  default, so git's progress chatter ("Preparing worktree (new branch ...)")
+ *  printed straight into the TUI and corrupted the rendered frame. Captured
+ *  stderr still reaches us on failure via the thrown error. */
+const GIT_STDIO: ("ignore" | "pipe")[] = ["ignore", "pipe", "pipe"];
 
 function git(root: string, args: string[]): string {
 	return gitRaw(root, args).trim();
@@ -39,6 +44,7 @@ function gitRaw(root: string, args: string[]): string {
 		encoding: "utf8",
 		timeout: GIT_TIMEOUT_MS,
 		maxBuffer: GIT_MAX_BUFFER,
+		stdio: GIT_STDIO,
 	});
 }
 
@@ -49,6 +55,7 @@ function gitIn(dir: string, args: string[]): string {
 		encoding: "utf8",
 		timeout: GIT_TIMEOUT_MS,
 		maxBuffer: GIT_MAX_BUFFER,
+		stdio: GIT_STDIO,
 	}).trim();
 }
 
@@ -269,9 +276,30 @@ export function cleanupMerged(root: string, opts: { skipBranches?: Set<string>;
 		cleaned += 1;
 	}
 	prune(root);
+	pruneEmptyRunDirs(root);
 	return cleaned;
 }
 
+/** Remove `<subagents>/<runId>/` once its task dirs are gone. Cleanup left these
+ *  behind forever, so `.git/subagents` grew one empty dir per run. */
+function pruneEmptyRunDirs(root: string): void {
+	const sub = subagentsDir(root);
+	if (!sub || !existsSync(sub)) return;
+	try {
+		for (const entry of readdirSync(sub, { withFileTypes: true })) {
+			if (!entry.isDirectory()) continue;
+			const runDir = join(sub, entry.name);
+			try {
+				if (readdirSync(runDir).length === 0) rmSync(runDir, { recursive: true, force: true });
+			} catch {
+				/* skip */
+			}
+		}
+	} catch {
+		/* best-effort */
+	}
+}
+
 /** Branch names currently checked out in any worktree, or undefined when git
  *  couldn't be asked — callers MUST treat undefined as "unknown", never as "none",
  *  or they will happily delete live checkouts. */