chainlesschain 0.162.176 → 0.162.178

package/src/lib/agent-team/team-worktree.js

@@ -23,7 +23,12 @@ import {
 } from "../../harness/worktree-isolator.js";
 import { isGitRepo as _isGitRepo } from "../../lib/git-integration.js";
 import { normalizeSparsePaths } from "../../lib/worktree-sparse.js";
-import { execFileSync, spawn } from "node:child_process";
+import executionBroker from "../../lib/process-execution-broker/index.js";
+
+export const _processDeps = {
+  spawn: executionBroker.spawn.bind(executionBroker),
+  execFileSync: executionBroker.execFileSync.bind(executionBroker),
+};
 
 /**
  * Resolve the sparse-checkout / dependency-symlink options for a task, letting a
@@ -49,7 +54,14 @@ function resolveWorktreeOptions(task, defaults) {
 
 function defaultRunShell(command, cwd) {
   return new Promise((resolve, reject) => {
-    const child = spawn(command, { cwd, shell: true, env: process.env });
+    const child = _processDeps.spawn(command, [], {
+      cwd,
+      shell: true,
+      env: process.env,
+      origin: "team-worktree:task-command",
+      policy: "allow",
+      scope: "team-worktree",
+    });
     let err = "";
     child.stderr?.on("data", (d) => (err += d.toString("utf8")));
     child.on("error", (e) => reject(new Error(e.message)));
@@ -61,12 +73,22 @@ function defaultRunShell(command, cwd) {
   });
 }
 
+function runTeamGit(args, cwd) {
+  return _processDeps.execFileSync("git", args, {
+    cwd,
+    stdio: "ignore",
+    origin: "team-worktree:commit",
+    policy: "allow",
+    scope: "team-worktree",
+    shell: false,
+  });
+}
+
 /** Stage + commit everything in a worktree. Returns true if a commit was made. */
 function defaultCommit(worktreePath, message) {
-  execFileSync("git", ["add", "-A"], { cwd: worktreePath, stdio: "ignore" });
+  runTeamGit(["add", "-A"], worktreePath);
   try {
-    execFileSync(
-      "git",
+    runTeamGit(
       [
         "-c",
         "user.email=team@chainlesschain.local",
@@ -76,7 +98,7 @@ function defaultCommit(worktreePath, message) {
         "-m",
         message,
       ],
-      { cwd: worktreePath, stdio: "ignore" },
+      worktreePath,
     );
     return true;
   } catch {

package/src/lib/agent-worktree.js

@@ -11,24 +11,28 @@
  *    a merge hint. Removal failures fail-open to "kept".
  */
 
-import { execFileSync, execSync } from "child_process";
 import { existsSync, realpathSync } from "node:fs";
 import { resolve } from "node:path";
 import { createWorktree, removeWorktree } from "./worktree-isolator.js";
 import { findProjectRoot } from "./project-instructions.js";
+import executionBroker from "./process-execution-broker/index.js";
 
 export const _deps = {
-  execFileSync,
-  execSync,
+  execFileSync: executionBroker.execFileSync.bind(executionBroker),
   createWorktree,
   removeWorktree,
 };
 
-function git(cmd, cwd, deps) {
-  return (deps.execSync || execSync)(`git ${cmd}`, {
+function git(args, cwd, deps, options = {}) {
+  const run = deps.execFileSync || _deps.execFileSync;
+  return run("git", args, {
     cwd,
     encoding: "utf8",
-    stdio: ["ignore", "pipe", "ignore"],
+    stdio: options.stdio || ["ignore", "pipe", "ignore"],
+    origin: options.origin || "agent-worktree:query",
+    policy: "allow",
+    scope: "agent-worktree",
+    shell: false,
   });
 }
 
@@ -90,17 +94,17 @@ export function validateAgentWorktree(info, { deps = _deps } = {}) {
     }
 
     const repoTop = canonicalPath(
-      git("rev-parse --show-toplevel", info.repoRoot, deps).trim(),
+      git(["rev-parse", "--show-toplevel"], info.repoRoot, deps).trim(),
     );
     const worktreeTop = canonicalPath(
-      git("rev-parse --show-toplevel", worktreePath, deps).trim(),
+      git(["rev-parse", "--show-toplevel"], worktreePath, deps).trim(),
     );
     if (repoTop !== repo || worktreeTop !== worktree) {
       return { valid: false, reason: "worktree path identity mismatch" };
     }
 
     const registered = parseRegisteredWorktrees(
-      git("worktree list --porcelain", info.repoRoot, deps),
+      git(["worktree", "list", "--porcelain"], info.repoRoot, deps),
     ).find((entry) => {
       try {
         return canonicalPath(entry.path) === worktree;
@@ -138,16 +142,13 @@ function removeVerifiedAgentWorktree(info, deps) {
     return null;
   }
 
-  const run = deps.execFileSync || execFileSync;
-  run("git", ["worktree", "remove", info.path], {
-    cwd: info.repoRoot,
-    encoding: "utf8",
+  git(["worktree", "remove", info.path], info.repoRoot, deps, {
+    origin: "agent-worktree:cleanup",
     stdio: ["ignore", "pipe", "pipe"],
   });
   try {
-    run("git", ["branch", "-D", "--", info.branch], {
-      cwd: info.repoRoot,
-      encoding: "utf8",
+    git(["branch", "-D", "--", info.branch], info.repoRoot, deps, {
+      origin: "agent-worktree:cleanup",
       stdio: ["ignore", "pipe", "pipe"],
     });
     return null;
@@ -174,7 +175,7 @@ export function setupAgentWorktree({
   const suffix = Math.random().toString(36).slice(2, 6);
   const branch = `cc-agent-${stamp}-${suffix}`;
   const info = (deps.createWorktree || createWorktree)(repoRoot, branch);
-  const baseSha = git("rev-parse HEAD", info.path, deps).trim();
+  const baseSha = git(["rev-parse", "HEAD"], info.path, deps).trim();
   return { ...info, repoRoot, baseSha };
 }
 
@@ -205,8 +206,8 @@ export function finishAgentWorktree(info, { deps = _deps } = {}) {
   let headSha = null;
   let readable = false;
   try {
-    dirty = git("status --porcelain", info.path, deps).trim().length > 0;
-    headSha = git("rev-parse HEAD", info.path, deps).trim();
+    dirty = git(["status", "--porcelain"], info.path, deps).trim().length > 0;
+    headSha = git(["rev-parse", "HEAD"], info.path, deps).trim();
     readable = true;
   } catch {
     /* unreadable → keep, never destroy work we cannot verify */