@h-rig/runtime 0.0.6-alpha.35 → 0.0.6-alpha.37

package/dist/bin/rig-agent.js

@@ -3616,7 +3616,7 @@ class GeneralCliEventBus {
 }
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync25, lstatSync, mkdirSync as mkdirSync12, readFileSync as readFileSync15, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync25, lstatSync, mkdirSync as mkdirSync12, readFileSync as readFileSync15, unlinkSync, writeFileSync as writeFileSync12 } from "fs";
 import { dirname as dirname15, isAbsolute as isAbsolute2, resolve as resolve28 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -6693,14 +6693,19 @@ function resolveTaskMonorepoRoot(projectRoot) {
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
 function collectCommittedMonorepoFiles(projectRoot, repo) {
-  const defaultRef = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
-  if (defaultRef.exitCode === 0 && defaultRef.stdout.trim()) {
-    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", defaultRef.stdout.trim()], projectRoot);
-    if (mergeBase.exitCode === 0 && mergeBase.stdout.trim()) {
-      const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
-      if (result.exitCode === 0) {
-        return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-      }
+  const baseRefCandidates = [];
+  const originHead = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
+  if (originHead.exitCode === 0 && originHead.stdout.trim()) {
+    baseRefCandidates.push(originHead.stdout.trim());
+  }
+  baseRefCandidates.push("origin/main", "origin/dev", "origin/master", "main", "dev", "master");
+  for (const baseRef of baseRefCandidates) {
+    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", baseRef], projectRoot);
+    if (mergeBase.exitCode !== 0 || !mergeBase.stdout.trim())
+      continue;
+    const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
+    if (result.exitCode === 0) {
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     }
   }
   const initialHeadCommit = resolveRuntimeInitialHeadCommit(projectRoot, repo);
@@ -7826,9 +7831,23 @@ function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files
     console.log(`Skipping ${label}: no changes to commit.`);
     return;
   }
-  const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
-  if (addArgs) {
-    runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+  if (scopedFiles.length > 0) {
+    const pathspecFile = resolve28(repo, ".git", `rig-stage-${process.pid}-${Date.now()}.txt`);
+    writeFileSync12(pathspecFile, `${scopedFiles.join(`
+`)}
+`, "utf-8");
+    try {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, "add", `--pathspec-from-file=${pathspecFile}`), `Failed to stage changes for ${label}`);
+    } finally {
+      try {
+        unlinkSync(pathspecFile);
+      } catch {}
+    }
+  } else {
+    const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
+    if (addArgs) {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+    }
   }
   const stagedChanges = stagedChangeCount(projectRoot, repo);
   if (stagedChanges === 0) {

package/dist/src/control-plane/harness-main.js

@@ -9,7 +9,7 @@ import { existsSync as existsSync31 } from "fs";
 import { resolve as resolve31 } from "path";
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync24, lstatSync, mkdirSync as mkdirSync12, readFileSync as readFileSync13, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync24, lstatSync, mkdirSync as mkdirSync12, readFileSync as readFileSync13, unlinkSync, writeFileSync as writeFileSync12 } from "fs";
 import { dirname as dirname12, isAbsolute as isAbsolute2, resolve as resolve26 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -6228,17 +6228,28 @@ function loadGithubPullRequestCheckRollup(projectRoot, repoName, prNumber) {
   return response.statusCheckRollup || [];
 }
 function evaluatePullRequestCiChecks(checks, repoName, prNumber, options = {}) {
-  const nonGreptileChecks = checks.filter((check) => {
-    const label = (check.name || check.context || "").toLowerCase();
-    return label.length > 0 && !label.includes("greptile");
-  });
-  const pending = nonGreptileChecks.filter((check) => {
+  const isPendingCheck2 = (check) => {
     if ((check.__typename || "") === "CheckRun") {
       return (check.status || "").toUpperCase() !== "COMPLETED";
     }
     const state = (check.state || check.status || "").toUpperCase();
     return state === "PENDING" || state === "EXPECTED" || state === "QUEUED" || state === "IN_PROGRESS";
+  };
+  const pendingGreptile = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.includes("greptile") && isPendingCheck2(check);
+  });
+  if (pendingGreptile.length > 0) {
+    return {
+      verdict: "SKIP",
+      reasons: pendingGreptile.map((check) => `[CI] ${repoName}#${prNumber} mandatory Greptile check is still pending: ${check.name || check.context || "unknown"}.`)
+    };
+  }
+  const nonGreptileChecks = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.length > 0 && !label.includes("greptile");
   });
+  const pending = nonGreptileChecks.filter(isPendingCheck2);
   const mergeClean = (options.mergeStateStatus || "").toUpperCase() === "CLEAN";
   if (pending.length > 0 && !mergeClean) {
     return {
@@ -6964,14 +6975,19 @@ function resolveTaskMonorepoRoot(projectRoot) {
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
 function collectCommittedMonorepoFiles(projectRoot, repo) {
-  const defaultRef = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
-  if (defaultRef.exitCode === 0 && defaultRef.stdout.trim()) {
-    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", defaultRef.stdout.trim()], projectRoot);
-    if (mergeBase.exitCode === 0 && mergeBase.stdout.trim()) {
-      const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
-      if (result.exitCode === 0) {
-        return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-      }
+  const baseRefCandidates = [];
+  const originHead = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
+  if (originHead.exitCode === 0 && originHead.stdout.trim()) {
+    baseRefCandidates.push(originHead.stdout.trim());
+  }
+  baseRefCandidates.push("origin/main", "origin/dev", "origin/master", "main", "dev", "master");
+  for (const baseRef of baseRefCandidates) {
+    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", baseRef], projectRoot);
+    if (mergeBase.exitCode !== 0 || !mergeBase.stdout.trim())
+      continue;
+    const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
+    if (result.exitCode === 0) {
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     }
   }
   const initialHeadCommit = resolveRuntimeInitialHeadCommit(projectRoot, repo);
@@ -8122,9 +8138,23 @@ function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files
     console.log(`Skipping ${label}: no changes to commit.`);
     return;
   }
-  const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
-  if (addArgs) {
-    runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+  if (scopedFiles.length > 0) {
+    const pathspecFile = resolve26(repo, ".git", `rig-stage-${process.pid}-${Date.now()}.txt`);
+    writeFileSync12(pathspecFile, `${scopedFiles.join(`
+`)}
+`, "utf-8");
+    try {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, "add", `--pathspec-from-file=${pathspecFile}`), `Failed to stage changes for ${label}`);
+    } finally {
+      try {
+        unlinkSync(pathspecFile);
+      } catch {}
+    }
+  } else {
+    const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
+    if (addArgs) {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+    }
   }
   const stagedChanges = stagedChangeCount(projectRoot, repo);
   if (stagedChanges === 0) {

package/dist/src/control-plane/hooks/completion-verification.js

@@ -1073,7 +1073,7 @@ function primeGuardHotPaths() {
 primeGuardHotPaths();
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync22, lstatSync, mkdirSync as mkdirSync13, readFileSync as readFileSync13, writeFileSync as writeFileSync13 } from "fs";
+import { existsSync as existsSync22, lstatSync, mkdirSync as mkdirSync13, readFileSync as readFileSync13, unlinkSync, writeFileSync as writeFileSync13 } from "fs";
 import { dirname as dirname11, isAbsolute as isAbsolute2, resolve as resolve24 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -6661,17 +6661,28 @@ function loadGithubPullRequestCheckRollup(projectRoot, repoName, prNumber) {
   return response.statusCheckRollup || [];
 }
 function evaluatePullRequestCiChecks(checks, repoName, prNumber, options = {}) {
-  const nonGreptileChecks = checks.filter((check) => {
-    const label = (check.name || check.context || "").toLowerCase();
-    return label.length > 0 && !label.includes("greptile");
-  });
-  const pending = nonGreptileChecks.filter((check) => {
+  const isPendingCheck2 = (check) => {
     if ((check.__typename || "") === "CheckRun") {
       return (check.status || "").toUpperCase() !== "COMPLETED";
     }
     const state = (check.state || check.status || "").toUpperCase();
     return state === "PENDING" || state === "EXPECTED" || state === "QUEUED" || state === "IN_PROGRESS";
+  };
+  const pendingGreptile = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.includes("greptile") && isPendingCheck2(check);
+  });
+  if (pendingGreptile.length > 0) {
+    return {
+      verdict: "SKIP",
+      reasons: pendingGreptile.map((check) => `[CI] ${repoName}#${prNumber} mandatory Greptile check is still pending: ${check.name || check.context || "unknown"}.`)
+    };
+  }
+  const nonGreptileChecks = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.length > 0 && !label.includes("greptile");
   });
+  const pending = nonGreptileChecks.filter(isPendingCheck2);
   const mergeClean = (options.mergeStateStatus || "").toUpperCase() === "CLEAN";
   if (pending.length > 0 && !mergeClean) {
     return {
@@ -6975,14 +6986,19 @@ function resolveTaskMonorepoRoot(projectRoot) {
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
 function collectCommittedMonorepoFiles(projectRoot, repo) {
-  const defaultRef = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
-  if (defaultRef.exitCode === 0 && defaultRef.stdout.trim()) {
-    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", defaultRef.stdout.trim()], projectRoot);
-    if (mergeBase.exitCode === 0 && mergeBase.stdout.trim()) {
-      const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
-      if (result.exitCode === 0) {
-        return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-      }
+  const baseRefCandidates = [];
+  const originHead = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
+  if (originHead.exitCode === 0 && originHead.stdout.trim()) {
+    baseRefCandidates.push(originHead.stdout.trim());
+  }
+  baseRefCandidates.push("origin/main", "origin/dev", "origin/master", "main", "dev", "master");
+  for (const baseRef of baseRefCandidates) {
+    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", baseRef], projectRoot);
+    if (mergeBase.exitCode !== 0 || !mergeBase.stdout.trim())
+      continue;
+    const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
+    if (result.exitCode === 0) {
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     }
   }
   const initialHeadCommit = resolveRuntimeInitialHeadCommit(projectRoot, repo);
@@ -7896,9 +7912,23 @@ function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files
     console.log(`Skipping ${label}: no changes to commit.`);
     return;
   }
-  const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
-  if (addArgs) {
-    runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+  if (scopedFiles.length > 0) {
+    const pathspecFile = resolve24(repo, ".git", `rig-stage-${process.pid}-${Date.now()}.txt`);
+    writeFileSync13(pathspecFile, `${scopedFiles.join(`
+`)}
+`, "utf-8");
+    try {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, "add", `--pathspec-from-file=${pathspecFile}`), `Failed to stage changes for ${label}`);
+    } finally {
+      try {
+        unlinkSync(pathspecFile);
+      } catch {}
+    }
+  } else {
+    const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
+    if (addArgs) {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+    }
   }
   const stagedChanges = stagedChangeCount(projectRoot, repo);
   if (stagedChanges === 0) {
@@ -8401,7 +8431,7 @@ async function main() {
       target: "monorepo",
       message: `rig: ${taskId} task completion`,
       allowEmpty: false,
-      scoped: true
+      scoped: false
     });
     console.log("OK: Task changes committed");
   } else {

package/dist/src/control-plane/hooks/submodule-branch.js

@@ -126,7 +126,7 @@ import { resolve as resolve38 } from "path";
 import { resolveProjectRoot } from "@rig/hook-kit";
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync25, lstatSync, mkdirSync as mkdirSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync25, lstatSync, mkdirSync as mkdirSync11, readFileSync as readFileSync13, unlinkSync, writeFileSync as writeFileSync10 } from "fs";
 import { dirname as dirname11, isAbsolute as isAbsolute2, resolve as resolve25 } from "path";
 
 // packages/runtime/src/control-plane/runtime/baked-secrets.ts

package/dist/src/control-plane/hooks/task-runtime-start.js

@@ -126,7 +126,7 @@ import { resolve as resolve38 } from "path";
 import { resolveProjectRoot } from "@rig/hook-kit";
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync25, lstatSync, mkdirSync as mkdirSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync25, lstatSync, mkdirSync as mkdirSync11, readFileSync as readFileSync13, unlinkSync, writeFileSync as writeFileSync10 } from "fs";
 import { dirname as dirname11, isAbsolute as isAbsolute2, resolve as resolve25 } from "path";
 
 // packages/runtime/src/control-plane/runtime/baked-secrets.ts

package/dist/src/control-plane/native/git-ops.js

@@ -1,6 +1,6 @@
 // @bun
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync9, lstatSync, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync9, lstatSync, mkdirSync as mkdirSync5, readFileSync as readFileSync7, unlinkSync, writeFileSync as writeFileSync5 } from "fs";
 import { dirname as dirname7, isAbsolute as isAbsolute2, resolve as resolve11 } from "path";
 import { fileURLToPath } from "url";
 
@@ -1404,14 +1404,19 @@ function resolveTaskMonorepoRoot(projectRoot) {
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
 function collectCommittedMonorepoFiles(projectRoot, repo) {
-  const defaultRef = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
-  if (defaultRef.exitCode === 0 && defaultRef.stdout.trim()) {
-    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", defaultRef.stdout.trim()], projectRoot);
-    if (mergeBase.exitCode === 0 && mergeBase.stdout.trim()) {
-      const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
-      if (result.exitCode === 0) {
-        return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-      }
+  const baseRefCandidates = [];
+  const originHead = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
+  if (originHead.exitCode === 0 && originHead.stdout.trim()) {
+    baseRefCandidates.push(originHead.stdout.trim());
+  }
+  baseRefCandidates.push("origin/main", "origin/dev", "origin/master", "main", "dev", "master");
+  for (const baseRef of baseRefCandidates) {
+    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", baseRef], projectRoot);
+    if (mergeBase.exitCode !== 0 || !mergeBase.stdout.trim())
+      continue;
+    const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
+    if (result.exitCode === 0) {
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     }
   }
   const initialHeadCommit = resolveRuntimeInitialHeadCommit(projectRoot, repo);
@@ -2439,9 +2444,23 @@ function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files
     console.log(`Skipping ${label}: no changes to commit.`);
     return;
   }
-  const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
-  if (addArgs) {
-    runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+  if (scopedFiles.length > 0) {
+    const pathspecFile = resolve11(repo, ".git", `rig-stage-${process.pid}-${Date.now()}.txt`);
+    writeFileSync5(pathspecFile, `${scopedFiles.join(`
+`)}
+`, "utf-8");
+    try {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, "add", `--pathspec-from-file=${pathspecFile}`), `Failed to stage changes for ${label}`);
+    } finally {
+      try {
+        unlinkSync(pathspecFile);
+      } catch {}
+    }
+  } else {
+    const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
+    if (addArgs) {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+    }
   }
   const stagedChanges = stagedChangeCount(projectRoot, repo);
   if (stagedChanges === 0) {

package/dist/src/control-plane/native/harness-cli.js

@@ -4,7 +4,7 @@ import { existsSync as existsSync31 } from "fs";
 import { resolve as resolve31 } from "path";
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync24, lstatSync, mkdirSync as mkdirSync12, readFileSync as readFileSync13, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync24, lstatSync, mkdirSync as mkdirSync12, readFileSync as readFileSync13, unlinkSync, writeFileSync as writeFileSync12 } from "fs";
 import { dirname as dirname12, isAbsolute as isAbsolute2, resolve as resolve26 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -6222,17 +6222,28 @@ function loadGithubPullRequestCheckRollup(projectRoot, repoName, prNumber) {
   return response.statusCheckRollup || [];
 }
 function evaluatePullRequestCiChecks(checks, repoName, prNumber, options = {}) {
-  const nonGreptileChecks = checks.filter((check) => {
-    const label = (check.name || check.context || "").toLowerCase();
-    return label.length > 0 && !label.includes("greptile");
-  });
-  const pending = nonGreptileChecks.filter((check) => {
+  const isPendingCheck2 = (check) => {
     if ((check.__typename || "") === "CheckRun") {
       return (check.status || "").toUpperCase() !== "COMPLETED";
     }
     const state = (check.state || check.status || "").toUpperCase();
     return state === "PENDING" || state === "EXPECTED" || state === "QUEUED" || state === "IN_PROGRESS";
+  };
+  const pendingGreptile = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.includes("greptile") && isPendingCheck2(check);
+  });
+  if (pendingGreptile.length > 0) {
+    return {
+      verdict: "SKIP",
+      reasons: pendingGreptile.map((check) => `[CI] ${repoName}#${prNumber} mandatory Greptile check is still pending: ${check.name || check.context || "unknown"}.`)
+    };
+  }
+  const nonGreptileChecks = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.length > 0 && !label.includes("greptile");
   });
+  const pending = nonGreptileChecks.filter(isPendingCheck2);
   const mergeClean = (options.mergeStateStatus || "").toUpperCase() === "CLEAN";
   if (pending.length > 0 && !mergeClean) {
     return {
@@ -6958,14 +6969,19 @@ function resolveTaskMonorepoRoot(projectRoot) {
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
 function collectCommittedMonorepoFiles(projectRoot, repo) {
-  const defaultRef = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
-  if (defaultRef.exitCode === 0 && defaultRef.stdout.trim()) {
-    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", defaultRef.stdout.trim()], projectRoot);
-    if (mergeBase.exitCode === 0 && mergeBase.stdout.trim()) {
-      const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
-      if (result.exitCode === 0) {
-        return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-      }
+  const baseRefCandidates = [];
+  const originHead = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
+  if (originHead.exitCode === 0 && originHead.stdout.trim()) {
+    baseRefCandidates.push(originHead.stdout.trim());
+  }
+  baseRefCandidates.push("origin/main", "origin/dev", "origin/master", "main", "dev", "master");
+  for (const baseRef of baseRefCandidates) {
+    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", baseRef], projectRoot);
+    if (mergeBase.exitCode !== 0 || !mergeBase.stdout.trim())
+      continue;
+    const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
+    if (result.exitCode === 0) {
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     }
   }
   const initialHeadCommit = resolveRuntimeInitialHeadCommit(projectRoot, repo);
@@ -8116,9 +8132,23 @@ function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files
     console.log(`Skipping ${label}: no changes to commit.`);
     return;
   }
-  const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
-  if (addArgs) {
-    runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+  if (scopedFiles.length > 0) {
+    const pathspecFile = resolve26(repo, ".git", `rig-stage-${process.pid}-${Date.now()}.txt`);
+    writeFileSync12(pathspecFile, `${scopedFiles.join(`
+`)}
+`, "utf-8");
+    try {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, "add", `--pathspec-from-file=${pathspecFile}`), `Failed to stage changes for ${label}`);
+    } finally {
+      try {
+        unlinkSync(pathspecFile);
+      } catch {}
+    }
+  } else {
+    const addArgs = buildStageAddArgs(repo, scopedFiles, scoped);
+    if (addArgs) {
+      runOrThrow(projectRoot, gitCmd(projectRoot, repo, ...addArgs), `Failed to stage changes for ${label}`);
+    }
   }
   const stagedChanges = stagedChangeCount(projectRoot, repo);
   if (stagedChanges === 0) {

package/dist/src/control-plane/native/task-ops.js

@@ -3816,7 +3816,7 @@ function resolveRuntimeSecrets(env, baked = BAKED_RUNTIME_SECRETS) {
 }
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync21, lstatSync, mkdirSync as mkdirSync10, readFileSync as readFileSync11, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync21, lstatSync, mkdirSync as mkdirSync10, readFileSync as readFileSync11, unlinkSync, writeFileSync as writeFileSync10 } from "fs";
 import { dirname as dirname12, isAbsolute as isAbsolute2, resolve as resolve23 } from "path";
 
 // packages/runtime/src/control-plane/native/pr-review-gate.ts
@@ -6402,17 +6402,28 @@ function loadGithubPullRequestCheckRollup(projectRoot, repoName, prNumber) {
   return response.statusCheckRollup || [];
 }
 function evaluatePullRequestCiChecks(checks, repoName, prNumber, options = {}) {
-  const nonGreptileChecks = checks.filter((check) => {
-    const label = (check.name || check.context || "").toLowerCase();
-    return label.length > 0 && !label.includes("greptile");
-  });
-  const pending = nonGreptileChecks.filter((check) => {
+  const isPendingCheck2 = (check) => {
     if ((check.__typename || "") === "CheckRun") {
       return (check.status || "").toUpperCase() !== "COMPLETED";
     }
     const state = (check.state || check.status || "").toUpperCase();
     return state === "PENDING" || state === "EXPECTED" || state === "QUEUED" || state === "IN_PROGRESS";
+  };
+  const pendingGreptile = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.includes("greptile") && isPendingCheck2(check);
   });
+  if (pendingGreptile.length > 0) {
+    return {
+      verdict: "SKIP",
+      reasons: pendingGreptile.map((check) => `[CI] ${repoName}#${prNumber} mandatory Greptile check is still pending: ${check.name || check.context || "unknown"}.`)
+    };
+  }
+  const nonGreptileChecks = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.length > 0 && !label.includes("greptile");
+  });
+  const pending = nonGreptileChecks.filter(isPendingCheck2);
   const mergeClean = (options.mergeStateStatus || "").toUpperCase() === "CLEAN";
   if (pending.length > 0 && !mergeClean) {
     return {
@@ -7245,14 +7256,19 @@ function resolveTaskMonorepoRoot(projectRoot) {
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
 function collectCommittedMonorepoFiles(projectRoot, repo) {
-  const defaultRef = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
-  if (defaultRef.exitCode === 0 && defaultRef.stdout.trim()) {
-    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", defaultRef.stdout.trim()], projectRoot);
-    if (mergeBase.exitCode === 0 && mergeBase.stdout.trim()) {
-      const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
-      if (result.exitCode === 0) {
-        return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-      }
+  const baseRefCandidates = [];
+  const originHead = runCapture(["git", "-C", repo, "rev-parse", "--abbrev-ref", "origin/HEAD"], projectRoot);
+  if (originHead.exitCode === 0 && originHead.stdout.trim()) {
+    baseRefCandidates.push(originHead.stdout.trim());
+  }
+  baseRefCandidates.push("origin/main", "origin/dev", "origin/master", "main", "dev", "master");
+  for (const baseRef of baseRefCandidates) {
+    const mergeBase = runCapture(["git", "-C", repo, "merge-base", "HEAD", baseRef], projectRoot);
+    if (mergeBase.exitCode !== 0 || !mergeBase.stdout.trim())
+      continue;
+    const result = runCapture(["git", "-C", repo, "diff", "--name-only", `${mergeBase.stdout.trim()}..HEAD`], projectRoot);
+    if (result.exitCode === 0) {
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
     }
   }
   const initialHeadCommit = resolveRuntimeInitialHeadCommit(projectRoot, repo);

package/dist/src/control-plane/native/verifier.js

@@ -47,7 +47,7 @@ function resolveRuntimeSecrets(env, baked = BAKED_RUNTIME_SECRETS) {
 }
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync13, lstatSync, mkdirSync as mkdirSync6, readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync13, lstatSync, mkdirSync as mkdirSync6, readFileSync as readFileSync9, unlinkSync, writeFileSync as writeFileSync7 } from "fs";
 import { dirname as dirname9, isAbsolute as isAbsolute2, resolve as resolve14 } from "path";
 
 // packages/runtime/src/control-plane/runtime/context.ts
@@ -4452,17 +4452,28 @@ function loadGithubPullRequestCheckRollup(projectRoot, repoName, prNumber) {
   return response.statusCheckRollup || [];
 }
 function evaluatePullRequestCiChecks(checks, repoName, prNumber, options = {}) {
-  const nonGreptileChecks = checks.filter((check) => {
-    const label = (check.name || check.context || "").toLowerCase();
-    return label.length > 0 && !label.includes("greptile");
-  });
-  const pending = nonGreptileChecks.filter((check) => {
+  const isPendingCheck2 = (check) => {
     if ((check.__typename || "") === "CheckRun") {
       return (check.status || "").toUpperCase() !== "COMPLETED";
     }
     const state = (check.state || check.status || "").toUpperCase();
     return state === "PENDING" || state === "EXPECTED" || state === "QUEUED" || state === "IN_PROGRESS";
+  };
+  const pendingGreptile = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.includes("greptile") && isPendingCheck2(check);
+  });
+  if (pendingGreptile.length > 0) {
+    return {
+      verdict: "SKIP",
+      reasons: pendingGreptile.map((check) => `[CI] ${repoName}#${prNumber} mandatory Greptile check is still pending: ${check.name || check.context || "unknown"}.`)
+    };
+  }
+  const nonGreptileChecks = checks.filter((check) => {
+    const label = (check.name || check.context || "").toLowerCase();
+    return label.length > 0 && !label.includes("greptile");
   });
+  const pending = nonGreptileChecks.filter(isPendingCheck2);
   const mergeClean = (options.mergeStateStatus || "").toUpperCase() === "CLEAN";
   if (pending.length > 0 && !mergeClean) {
     return {

package/dist/src/control-plane/pi-sessiond/bin.js

@@ -525,9 +525,6 @@ class RigPiSessionService {
     await this.prompt(sessionId, trimmed, active.runtime.session.isStreaming ? "steer" : undefined);
     return { type: "done", message: `Accepted ${trimmed}` };
   }
-  respondToCommand(_sessionId, _requestId, _value) {
-    return { type: "unsupported", message: "No pending command selection is active." };
-  }
   respondToExtensionUi(sessionId, input) {
     const active = this.requireActive(sessionId);
     return { accepted: active.ui.respond(input) };
@@ -737,10 +734,6 @@ async function runRigPiSessionDaemon(options = {}) {
           const body = await readJson(req);
           return json(await sessions.runCommand(sessionId, requireText(body, "text")));
         }
-        if (action === "commands/respond" && req.method === "POST") {
-          const body = await readJson(req);
-          return json(sessions.respondToCommand(sessionId, requireText(body, "requestId"), body.value));
-        }
         if (action === "extension-ui/respond" && req.method === "POST") {
           const body = await readJson(req);
           return json(sessions.respondToExtensionUi(sessionId, {

package/dist/src/control-plane/pi-sessiond/server.js

@@ -523,9 +523,6 @@ class RigPiSessionService {
     await this.prompt(sessionId, trimmed, active.runtime.session.isStreaming ? "steer" : undefined);
     return { type: "done", message: `Accepted ${trimmed}` };
   }
-  respondToCommand(_sessionId, _requestId, _value) {
-    return { type: "unsupported", message: "No pending command selection is active." };
-  }
   respondToExtensionUi(sessionId, input) {
     const active = this.requireActive(sessionId);
     return { accepted: active.ui.respond(input) };
@@ -735,10 +732,6 @@ async function runRigPiSessionDaemon(options = {}) {
           const body = await readJson(req);
           return json(await sessions.runCommand(sessionId, requireText(body, "text")));
         }
-        if (action === "commands/respond" && req.method === "POST") {
-          const body = await readJson(req);
-          return json(sessions.respondToCommand(sessionId, requireText(body, "requestId"), body.value));
-        }
         if (action === "extension-ui/respond" && req.method === "POST") {
           const body = await readJson(req);
           return json(sessions.respondToExtensionUi(sessionId, {

package/dist/src/control-plane/pi-sessiond/session-service.js

@@ -462,9 +462,6 @@ class RigPiSessionService {
     await this.prompt(sessionId, trimmed, active.runtime.session.isStreaming ? "steer" : undefined);
     return { type: "done", message: `Accepted ${trimmed}` };
   }
-  respondToCommand(_sessionId, _requestId, _value) {
-    return { type: "unsupported", message: "No pending command selection is active." };
-  }
   respondToExtensionUi(sessionId, input) {
     const active = this.requireActive(sessionId);
     return { accepted: active.ui.respond(input) };

package/dist/src/index.js

@@ -624,17 +624,25 @@ async function waitForServerHealthy(baseUrl, authToken, timeoutMs) {
   }
   return false;
 }
-function resolveRigServerSpawnPlan(projectRoot, host, authToken, which = (command) => Bun.which(command)) {
+function resolveRigServerCommand(projectRoot, which = (command) => Bun.which(command)) {
   const binary = process.env.RIG_SERVER_BIN?.trim() || which("rig-server")?.trim();
-  const args = ["start", "--host", host, "--port", "0", "--auth-token", authToken];
   if (binary) {
-    return { command: binary, args, cwd: projectRoot };
+    return { command: binary, commandArgs: [], cwd: projectRoot };
   }
-  return {
-    command: "bun",
-    args: ["run", "packages/server/src/server.ts", ...args],
-    cwd: resolve5(import.meta.dir, "../../..")
-  };
+  const workspaceEntry = resolve5(import.meta.dir, "../../..", "packages/server/src/server.ts");
+  if (existsSync4(workspaceEntry)) {
+    return { command: "bun", commandArgs: ["run", workspaceEntry], cwd: resolve5(import.meta.dir, "../../..") };
+  }
+  try {
+    const installedEntry = Bun.resolveSync("@rig/server/src/server.ts", projectRoot);
+    return { command: "bun", commandArgs: ["run", installedEntry], cwd: projectRoot };
+  } catch {}
+  return { command: "bun", commandArgs: ["run", workspaceEntry], cwd: resolve5(import.meta.dir, "../../..") };
+}
+function resolveRigServerSpawnPlan(projectRoot, host, authToken, which = (command) => Bun.which(command)) {
+  const resolved = resolveRigServerCommand(projectRoot, which);
+  const args = ["start", "--host", host, "--port", "0", "--auth-token", authToken];
+  return { command: resolved.command, args: [...resolved.commandArgs, ...args], cwd: resolved.cwd };
 }
 async function waitForPublishedServer(projectRoot, authToken, timeoutMs) {
   const deadline = Date.now() + timeoutMs;

package/dist/src/local-server.js

@@ -134,17 +134,25 @@ async function waitForServerHealthy(baseUrl, authToken, timeoutMs) {
   }
   return false;
 }
-function resolveRigServerSpawnPlan(projectRoot, host, authToken, which = (command) => Bun.which(command)) {
+function resolveRigServerCommand(projectRoot, which = (command) => Bun.which(command)) {
   const binary = process.env.RIG_SERVER_BIN?.trim() || which("rig-server")?.trim();
-  const args = ["start", "--host", host, "--port", "0", "--auth-token", authToken];
   if (binary) {
-    return { command: binary, args, cwd: projectRoot };
+    return { command: binary, commandArgs: [], cwd: projectRoot };
   }
-  return {
-    command: "bun",
-    args: ["run", "packages/server/src/server.ts", ...args],
-    cwd: resolve2(import.meta.dir, "../../..")
-  };
+  const workspaceEntry = resolve2(import.meta.dir, "../../..", "packages/server/src/server.ts");
+  if (existsSync2(workspaceEntry)) {
+    return { command: "bun", commandArgs: ["run", workspaceEntry], cwd: resolve2(import.meta.dir, "../../..") };
+  }
+  try {
+    const installedEntry = Bun.resolveSync("@rig/server/src/server.ts", projectRoot);
+    return { command: "bun", commandArgs: ["run", installedEntry], cwd: projectRoot };
+  } catch {}
+  return { command: "bun", commandArgs: ["run", workspaceEntry], cwd: resolve2(import.meta.dir, "../../..") };
+}
+function resolveRigServerSpawnPlan(projectRoot, host, authToken, which = (command) => Bun.which(command)) {
+  const resolved = resolveRigServerCommand(projectRoot, which);
+  const args = ["start", "--host", host, "--port", "0", "--auth-token", authToken];
+  return { command: resolved.command, args: [...resolved.commandArgs, ...args], cwd: resolved.cwd };
 }
 async function waitForPublishedServer(projectRoot, authToken, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
@@ -201,6 +209,7 @@ var __testOnly = {
   resolveRigServerSpawnPlan
 };
 export {
+  resolveRigServerCommand,
   readPublishedRigServerStateSync,
   readPublishedRigServerState,
   ensureLocalRigServerConnection,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/runtime",
-  "version": "0.0.6-alpha.35",
+  "version": "0.0.6-alpha.37",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -63,14 +63,14 @@
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.35",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.37",
     "@libsql/client": "^0.17.2",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.35",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.35",
-    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.35",
-    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.35",
-    "@rig/skill-loader": "npm:@h-rig/skill-loader@0.0.6-alpha.35",
-    "@rig/validator-kit": "npm:@h-rig/validator-kit@0.0.6-alpha.35",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.37",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.37",
+    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.37",
+    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.37",
+    "@rig/skill-loader": "npm:@h-rig/skill-loader@0.0.6-alpha.37",
+    "@rig/validator-kit": "npm:@h-rig/validator-kit@0.0.6-alpha.37",
     "effect": "4.0.0-beta.78",
     "smol-toml": "^1.6.0"
   }