@esso0428/pi-subagents 0.17.6 → 0.17.7

package/src/worktree.ts

@@ -4,13 +4,17 @@
  * Creates a temporary git worktree so the agent works on an isolated copy of the repo.
  * On completion, if no changes were made, the worktree is cleaned up.
  * If changes exist, a branch is created and returned in the result.
+ *
+ * Every git call goes through `pi.exec` (async) rather than `execFileSync`: a
+ * worktree copy can take seconds, and a session that spawns several isolated
+ * agents at once would otherwise serialize them all on the TUI's event loop.
  */
 
-import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, relative } from "node:path";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 export interface WorktreeInfo {
   /** Absolute path to the worktree directory (the copied repo's root). */
@@ -28,6 +32,26 @@ export interface WorktreeInfo {
   workPath: string;
 }
 
+/**
+ * Project-wide switch for worktree isolation (`worktreeIsolation` in
+ * subagents.json). Default `true` — unchanged behaviour.
+ *
+ * The `"off"` isolation value gives a model a legal way to decline a worktree,
+ * but it still depends on the model choosing it. This is the deterministic half
+ * of the same fix: on a large repo where every worktree costs real time and
+ * disk (#184), turning it off means no caller can create one, whatever it
+ * passes.
+ */
+let worktreeIsolationEnabled = true;
+
+export function setWorktreeIsolationEnabled(enabled: boolean): void {
+  worktreeIsolationEnabled = enabled;
+}
+
+export function isWorktreeIsolationEnabled(): boolean {
+  return worktreeIsolationEnabled;
+}
+
 export interface WorktreeCleanupResult {
   /** Whether changes were found in the worktree. */
   hasChanges: boolean;
@@ -37,26 +61,43 @@ export interface WorktreeCleanupResult {
   path?: string;
 }
 
+/**
+ * Run git and return its trimmed stdout, throwing on failure so callers keep
+ * the try/catch control flow `execFileSync` gave them.
+ *
+ * `pi.exec` never rejects — it reports failure in the result — and a command
+ * killed by its timeout comes back as `killed` with an exit code of 0, so both
+ * have to be checked to reproduce `execFileSync`'s "throws on anything but a
+ * clean exit".
+ */
+async function git(pi: ExtensionAPI, cwd: string, args: string[], timeout: number): Promise<string> {
+  const result = await pi.exec("git", args, { cwd, timeout });
+  if (result.killed || result.code !== 0) {
+    throw new Error(result.stderr.trim() || `git ${args.join(" ")} failed (exit ${result.code})`);
+  }
+  return result.stdout.trim();
+}
+
 /**
  * Create a temporary git worktree for an agent.
  * Returns the worktree path, or undefined if not in a git repo.
  */
-export function createWorktree(cwd: string, agentId: string): WorktreeInfo | undefined {
+export async function createWorktree(
+  pi: ExtensionAPI,
+  cwd: string,
+  agentId: string,
+): Promise<WorktreeInfo | undefined> {
   // Verify we're in a git repo with at least one commit (HEAD must exist)
   let baseSha: string;
   let subdir: string;
   try {
-    execFileSync("git", ["rev-parse", "--is-inside-work-tree"], { cwd, stdio: "pipe", timeout: 5000 });
-    baseSha = execFileSync("git", ["rev-parse", "HEAD"], { cwd, stdio: "pipe", timeout: 5000 })
-      .toString()
-      .trim();
+    await git(pi, cwd, ["rev-parse", "--is-inside-work-tree"], 5000);
+    baseSha = await git(pi, cwd, ["rev-parse", "HEAD"], 5000);
     // Where cwd sits inside the repo ("" at the root): the agent must work at
     // the same subdirectory inside the copy, or a monorepo-package cwd would
     // silently widen to the whole repo. realpath both sides — git emits
     // resolved paths while cwd may arrive through a symlink (macOS /tmp).
-    const topLevel = execFileSync("git", ["rev-parse", "--show-toplevel"], { cwd, stdio: "pipe", timeout: 5000 })
-      .toString()
-      .trim();
+    const topLevel = await git(pi, cwd, ["rev-parse", "--show-toplevel"], 5000);
     subdir = relative(realpathSync(topLevel), realpathSync(cwd));
   } catch {
     return undefined;
@@ -68,11 +109,7 @@ export function createWorktree(cwd: string, agentId: string): WorktreeInfo | und
 
   try {
     // Create detached worktree at HEAD
-    execFileSync("git", ["worktree", "add", "--detach", worktreePath, "HEAD"], {
-      cwd,
-      stdio: "pipe",
-      timeout: 30000,
-    });
+    await git(pi, cwd, ["worktree", "add", "--detach", worktreePath, "HEAD"], 30000);
     return { path: worktreePath, branch, baseSha, workPath: subdir ? join(worktreePath, subdir) : worktreePath };
   } catch {
     // If worktree creation fails, return undefined (agent runs in normal cwd)
@@ -85,44 +122,33 @@ export function createWorktree(cwd: string, agentId: string): WorktreeInfo | und
  * - If no changes: remove worktree entirely.
  * - If changes exist: create a branch, commit changes, return branch info.
  */
-export function cleanupWorktree(
+export async function cleanupWorktree(
+  pi: ExtensionAPI,
   cwd: string,
   worktree: WorktreeInfo,
   agentDescription: string,
-): WorktreeCleanupResult {
+): Promise<WorktreeCleanupResult> {
   if (!existsSync(worktree.path)) {
     return { hasChanges: false };
   }
 
   try {
     // Check for uncommitted changes in the worktree
-    const status = execFileSync("git", ["status", "--porcelain"], {
-      cwd: worktree.path,
-      stdio: "pipe",
-      timeout: 10000,
-    }).toString().trim();
+    const status = await git(pi, worktree.path, ["status", "--porcelain"], 10000);
 
     if (status) {
       // Changes exist — stage, commit, and create a branch
-      execFileSync("git", ["add", "-A"], { cwd: worktree.path, stdio: "pipe", timeout: 10000 });
-      // Truncate description for commit message (no shell sanitization needed — execFileSync uses argv)
+      await git(pi, worktree.path, ["add", "-A"], 10000);
+      // Truncate description for commit message (no shell sanitization needed — pi.exec uses argv)
       const safeDesc = agentDescription.slice(0, 200);
       const commitMsg = `pi-agent: ${safeDesc}`;
-      execFileSync("git", ["commit", "--no-verify", "-m", commitMsg], {
-        cwd: worktree.path,
-        stdio: "pipe",
-        timeout: 10000,
-      });
+      await git(pi, worktree.path, ["commit", "--no-verify", "-m", commitMsg], 10000);
     } else {
-      const currentSha = execFileSync("git", ["rev-parse", "HEAD"], {
-        cwd: worktree.path,
-        stdio: "pipe",
-        timeout: 5000,
-      }).toString().trim();
+      const currentSha = await git(pi, worktree.path, ["rev-parse", "HEAD"], 5000);
 
       if (currentSha === worktree.baseSha) {
         // No changes — remove worktree
-        removeWorktree(cwd, worktree.path);
+        await removeWorktree(pi, cwd, worktree.path);
         return { hasChanges: false };
       }
     }
@@ -131,25 +157,17 @@ export function cleanupWorktree(
     // If the branch already exists, append a suffix to avoid overwriting previous work.
     let branchName = worktree.branch;
     try {
-      execFileSync("git", ["branch", branchName], {
-        cwd: worktree.path,
-        stdio: "pipe",
-        timeout: 5000,
-      });
+      await git(pi, worktree.path, ["branch", branchName], 5000);
     } catch {
       // Branch already exists — use a unique suffix
       branchName = `${worktree.branch}-${Date.now()}`;
-      execFileSync("git", ["branch", branchName], {
-        cwd: worktree.path,
-        stdio: "pipe",
-        timeout: 5000,
-      });
+      await git(pi, worktree.path, ["branch", branchName], 5000);
     }
     // Update branch name in worktree info for the caller
     worktree.branch = branchName;
 
     // Remove the worktree (branch persists in main repo)
-    removeWorktree(cwd, worktree.path);
+    await removeWorktree(pi, cwd, worktree.path);
 
     return {
       hasChanges: true,
@@ -158,7 +176,7 @@ export function cleanupWorktree(
     };
   } catch {
     // Best effort cleanup on error
-    try { removeWorktree(cwd, worktree.path); } catch { /* ignore */ }
+    try { await removeWorktree(pi, cwd, worktree.path); } catch { /* ignore */ }
     return { hasChanges: false };
   }
 }
@@ -166,17 +184,13 @@ export function cleanupWorktree(
 /**
  * Force-remove a worktree.
  */
-function removeWorktree(cwd: string, worktreePath: string): void {
+async function removeWorktree(pi: ExtensionAPI, cwd: string, worktreePath: string): Promise<void> {
   try {
-    execFileSync("git", ["worktree", "remove", "--force", worktreePath], {
-      cwd,
-      stdio: "pipe",
-      timeout: 10000,
-    });
+    await git(pi, cwd, ["worktree", "remove", "--force", worktreePath], 10000);
   } catch {
     // If git worktree remove fails, try pruning
     try {
-      execFileSync("git", ["worktree", "prune"], { cwd, stdio: "pipe", timeout: 5000 });
+      await git(pi, cwd, ["worktree", "prune"], 5000);
     } catch { /* ignore */ }
   }
 }
@@ -184,8 +198,8 @@ function removeWorktree(cwd: string, worktreePath: string): void {
 /**
  * Prune any orphaned worktrees (crash recovery).
  */
-export function pruneWorktrees(cwd: string): void {
+export async function pruneWorktrees(pi: ExtensionAPI, cwd: string): Promise<void> {
   try {
-    execFileSync("git", ["worktree", "prune"], { cwd, stdio: "pipe", timeout: 5000 });
+    await git(pi, cwd, ["worktree", "prune"], 5000);
   } catch { /* ignore */ }
 }

package/src/xml.ts

@@ -0,0 +1,13 @@
+/**
+ * xml.ts — escaping for the `<task-notification>` payloads.
+ *
+ * A module of its own because both notification builders need it and they sit
+ * on opposite sides of a dependency edge: the agent one lives in `index.ts`,
+ * which imports `workflow/task.ts`, so the workflow one cannot reach back for
+ * it without a cycle.
+ */
+
+/** Escape XML special characters to prevent injection in structured notifications. */
+export function escapeXml(s: string): string {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}

package/vitest.config.ts

@@ -1,18 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  // The print-mode e2e suite (test/subagents-print-mode-e2e.test.ts) drives REAL
-  // faux-model turns through pi-coding-agent + pi-agent-core. That requires ONE
-  // shared @earendil-works/pi-ai instance so the faux provider the test registers
-  // lands in the same api-registry the session streams through. npm physically
-  // duplicates pi-ai (a top-level copy and one nested under pi-coding-agent), which
-  // otherwise yields two registries and "No API provider registered" errors.
-  // Inlining the @earendil-works packages routes them through Vite's resolver so
-  // dedupe can collapse pi-ai to a single instance — for the parent AND for every
-  // subagent session the extension spawns. dedupe alone is insufficient (it only
-  // affects modules Vite resolves; without inline the runtime stays externalized).
-  test: {
-    server: { deps: { inline: [/@earendil-works\/pi-/] } },
-  },
-  resolve: { dedupe: ["@earendil-works/pi-ai"] },
-});