@h-rig/runtime 0.0.6-alpha.12 → 0.0.6-alpha.14

package/dist/bin/rig-agent.js

@@ -7174,7 +7174,7 @@ function gitOpenPr(options) {
     "",
     "## Review",
     "- Completion verification will run validation, verifier review, and PR policy checks.",
-    "- When repository policy allows it, Rig enables GitHub auto-merge after approval."
+    "- When repository policy allows it, Rig attempts an immediate strict-gated, head-locked merge after approval."
   ].join(`
 `);
   const preCheck = runCapture2(withGhRepo([gh, "pr", "list", "--state", "merged", "--head", branch, "--json", "url,mergedAt", "--jq", ".[0]"], repoNameWithOwner), repoRoot);

package/dist/src/control-plane/authority-files.js

@@ -464,10 +464,6 @@ function runBelongsToProject(projectRoot, run, runsDir) {
   if (recordedProjectRoot) {
     return resolve2(recordedProjectRoot) === normalizedRoot;
   }
-  const projectLocalRunsDir = resolve2(normalizedRoot, ".rig", "runs");
-  if (isPathWithin(projectLocalRunsDir, resolve2(runsDir))) {
-    return true;
-  }
   const pathFields = [
     run.worktreePath,
     run.artifactRoot,
@@ -475,10 +471,20 @@ function runBelongsToProject(projectRoot, run, runsDir) {
     run.sessionPath,
     run.sessionLogPath
   ].filter((value) => typeof value === "string" && value.trim().length > 0);
-  if (pathFields.length === 0) {
+  if (pathFields.length > 0) {
+    if (pathFields.some((value) => isPathWithin(normalizedRoot, resolve2(value)))) {
+      return true;
+    }
+    const pointsAtManagedWorkspace = pathFields.some((value) => /(?:^|[/\\])\.worktrees(?:[/\\]|$)/.test(value));
+    if (pointsAtManagedWorkspace) {
+      return false;
+    }
+  }
+  const projectLocalRunsDir = resolve2(normalizedRoot, ".rig", "runs");
+  if (isPathWithin(projectLocalRunsDir, resolve2(runsDir))) {
     return true;
   }
-  return pathFields.some((value) => isPathWithin(normalizedRoot, resolve2(value)));
+  return pathFields.length === 0;
 }
 function isPathWithin(root, candidate) {
   const relativePath = relative(root, candidate);