@h-rig/runtime 0.0.6-alpha.36 → 0.0.6-alpha.38

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";
 
@@ -6975,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);
@@ -8133,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";
 
@@ -6986,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);
@@ -7907,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) {
@@ -8412,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";
 
@@ -6969,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);
@@ -8127,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
@@ -7256,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/runtime",
-  "version": "0.0.6-alpha.36",
+  "version": "0.0.6-alpha.38",
   "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.36",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.38",
     "@libsql/client": "^0.17.2",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.36",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.36",
-    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.36",
-    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.36",
-    "@rig/skill-loader": "npm:@h-rig/skill-loader@0.0.6-alpha.36",
-    "@rig/validator-kit": "npm:@h-rig/validator-kit@0.0.6-alpha.36",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.38",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.38",
+    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.38",
+    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.38",
+    "@rig/skill-loader": "npm:@h-rig/skill-loader@0.0.6-alpha.38",
+    "@rig/validator-kit": "npm:@h-rig/validator-kit@0.0.6-alpha.38",
     "effect": "4.0.0-beta.78",
     "smol-toml": "^1.6.0"
   }