@h-rig/runtime 0.0.6-alpha.32 → 0.0.6-alpha.34

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

@@ -288,62 +288,17 @@ function readBuildConfig() {
   }
 }
 
-// packages/runtime/src/control-plane/runtime/tooling/shell.ts
-import { tmpdir } from "os";
-import { basename, dirname as dirname2, resolve as resolve3 } from "path";
-var sharedNativeShellOutputDir = resolve3(tmpdir(), "rig-native");
-var sharedNativeShellOutputPath = resolve3(sharedNativeShellOutputDir, `rig-shell-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
-// packages/runtime/src/control-plane/runtime/tooling/file-tools.ts
-import { tmpdir as tmpdir2 } from "os";
-import { basename as basename2, dirname as dirname3, resolve as resolve4 } from "path";
-var sharedNativeToolsOutputDir = resolve4(tmpdir2(), "rig-native");
-var sharedNativeToolsOutputPath = resolve4(sharedNativeToolsOutputDir, `rig-tools-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
-// packages/runtime/src/control-plane/plugin-host-context.ts
-import { createPluginHost } from "@rig/core";
-import { loadConfig } from "@rig/core/load-config";
-
-// packages/runtime/src/control-plane/repos/registry.ts
-var MANAGED_REPOS = new Map;
-
-// packages/runtime/src/control-plane/native/scope-rules.ts
-var activeRules = null;
-function getScopeRules() {
-  return activeRules;
-}
-
-// packages/runtime/src/control-plane/skill-materializer.ts
-import { loadSkill } from "@rig/skill-loader";
-
-// packages/runtime/src/control-plane/tasks/source-aware-task-config-source.ts
-var STATUS_LABELS = new Set(["ready", "blocked", "in-progress", "under-review", "failed", "cancelled"]);
-
-// packages/runtime/src/control-plane/native/task-state.ts
-import { existsSync as existsSync7, readFileSync as readFileSync5, readdirSync, statSync as statSync2, writeFileSync as writeFileSync3 } from "fs";
-import { basename as basename4, resolve as resolve9 } from "path";
-
-// packages/runtime/src/control-plane/state-sync/types.ts
-var CANONICAL_TASK_LIFECYCLE_STATUSES = new Set([
-  "draft",
-  "open",
-  "ready",
-  "queued",
-  "in_progress",
-  "under_review",
-  "blocked",
-  "completed",
-  "cancelled"
-]);
 // packages/runtime/src/control-plane/native/git-native.ts
 import { chmodSync, copyFileSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, renameSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
-import { tmpdir as tmpdir3 } from "os";
-import { dirname as dirname4, isAbsolute, resolve as resolve5 } from "path";
+import { tmpdir } from "os";
+import { dirname as dirname2, isAbsolute, resolve as resolve3 } from "path";
 import { createHash } from "crypto";
-var sharedGitNativeOutputDir = resolve5(tmpdir3(), "rig-native");
-var sharedGitNativeOutputPath = resolve5(sharedGitNativeOutputDir, `rig-git-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+var sharedGitNativeOutputDir = resolve3(tmpdir(), "rig-native");
+var sharedGitNativeOutputPath = resolve3(sharedGitNativeOutputDir, `rig-git-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
 var trackerCommandUsageProbe = "usage: rig-git fetch-ref <repo-path> <remote> <branch>";
 function temporaryGitBinaryOutputPath(outputPath) {
   const suffix = process.platform === "win32" ? ".exe" : "";
-  return resolve5(dirname4(outputPath), `.rig-git-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}${suffix}`);
+  return resolve3(dirname2(outputPath), `.rig-git-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}${suffix}`);
 }
 function publishGitBinary(tempOutputPath, outputPath) {
   try {
@@ -361,27 +316,27 @@ function runtimeRigGitFileName() {
   return `rig-git${process.platform === "win32" ? ".exe" : ""}`;
 }
 function rigGitSourceCandidates() {
-  const execDir = process.execPath?.trim() ? dirname4(process.execPath.trim()) : "";
+  const execDir = process.execPath?.trim() ? dirname2(process.execPath.trim()) : "";
   const cwd = process.cwd()?.trim() || "";
   const projectRoot = process.env.PROJECT_RIG_ROOT?.trim() || "";
   const hostProjectRoot = process.env.RIG_HOST_PROJECT_ROOT?.trim() || "";
-  const moduleRelativeSource = resolve5(import.meta.dir, "../../../native/rig-git.zig");
+  const moduleRelativeSource = resolve3(import.meta.dir, "../../../native/rig-git.zig");
   return [...new Set([
     process.env.RIG_NATIVE_GIT_SOURCE?.trim() || "",
     moduleRelativeSource,
-    projectRoot ? resolve5(projectRoot, "packages/runtime/native/rig-git.zig") : "",
-    hostProjectRoot ? resolve5(hostProjectRoot, "packages/runtime/native/rig-git.zig") : "",
-    cwd ? resolve5(cwd, "packages/runtime/native/rig-git.zig") : "",
-    execDir ? resolve5(execDir, "..", "..", "packages/runtime/native/rig-git.zig") : "",
-    execDir ? resolve5(execDir, "..", "native", "rig-git.zig") : ""
+    projectRoot ? resolve3(projectRoot, "packages/runtime/native/rig-git.zig") : "",
+    hostProjectRoot ? resolve3(hostProjectRoot, "packages/runtime/native/rig-git.zig") : "",
+    cwd ? resolve3(cwd, "packages/runtime/native/rig-git.zig") : "",
+    execDir ? resolve3(execDir, "..", "..", "packages/runtime/native/rig-git.zig") : "",
+    execDir ? resolve3(execDir, "..", "native", "rig-git.zig") : ""
   ].filter(Boolean))];
 }
 function nativePackageBinaryCandidates(fromDir, fileName) {
   const candidates = [];
-  let cursor = resolve5(fromDir);
+  let cursor = resolve3(fromDir);
   for (let index = 0;index < 8; index += 1) {
-    candidates.push(resolve5(cursor, "native", `${process.platform}-${process.arch}`, fileName), resolve5(cursor, "native", `${process.platform}-${process.arch}`, "bin", fileName), resolve5(cursor, "native", fileName), resolve5(cursor, "native", "bin", fileName));
-    const parent = dirname4(cursor);
+    candidates.push(resolve3(cursor, "native", `${process.platform}-${process.arch}`, fileName), resolve3(cursor, "native", `${process.platform}-${process.arch}`, "bin", fileName), resolve3(cursor, "native", fileName), resolve3(cursor, "native", "bin", fileName));
+    const parent = dirname2(cursor);
     if (parent === cursor)
       break;
     cursor = parent;
@@ -389,15 +344,15 @@ function nativePackageBinaryCandidates(fromDir, fileName) {
   return candidates;
 }
 function rigGitBinaryCandidates() {
-  const execDir = process.execPath?.trim() ? dirname4(process.execPath.trim()) : "";
+  const execDir = process.execPath?.trim() ? dirname2(process.execPath.trim()) : "";
   const fileName = runtimeRigGitFileName();
   const explicit = process.env.RIG_NATIVE_GIT_BIN?.trim() || "";
   return [...new Set([
     explicit,
     ...nativePackageBinaryCandidates(import.meta.dir, fileName),
-    execDir ? resolve5(execDir, fileName) : "",
-    execDir ? resolve5(execDir, "..", fileName) : "",
-    execDir ? resolve5(execDir, "..", "bin", fileName) : "",
+    execDir ? resolve3(execDir, fileName) : "",
+    execDir ? resolve3(execDir, "..", fileName) : "",
+    execDir ? resolve3(execDir, "..", "bin", fileName) : "",
     sharedGitNativeOutputPath
   ].filter(Boolean))];
 }
@@ -473,7 +428,7 @@ function ensureRigGitBinaryPathSync(outputPath = preferredGitBinaryOutputPath())
   if (!zigBinary) {
     throw new Error("zig is required to build native Rig git tools.");
   }
-  mkdirSync2(dirname4(outputPath), { recursive: true });
+  mkdirSync2(dirname2(outputPath), { recursive: true });
   const sourceDigest = sha256FileSync(sourcePath);
   const buildKey = JSON.stringify({
     version: 1,
@@ -498,7 +453,7 @@ function ensureRigGitBinaryPathSync(outputPath = preferredGitBinaryOutputPath())
     "ReleaseFast",
     `-femit-bin=${tempOutputPath}`
   ], {
-    cwd: dirname4(sourcePath),
+    cwd: dirname2(sourcePath),
     stdout: "pipe",
     stderr: "pipe"
   });
@@ -622,8 +577,52 @@ function nativeFileHasChanges(repoPath, filePath) {
   return null;
 }
 
+// packages/runtime/src/control-plane/runtime/tooling/shell.ts
+import { tmpdir as tmpdir2 } from "os";
+import { basename, dirname as dirname3, resolve as resolve4 } from "path";
+var sharedNativeShellOutputDir = resolve4(tmpdir2(), "rig-native");
+var sharedNativeShellOutputPath = resolve4(sharedNativeShellOutputDir, `rig-shell-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+// packages/runtime/src/control-plane/runtime/tooling/file-tools.ts
+import { tmpdir as tmpdir3 } from "os";
+import { basename as basename2, dirname as dirname4, resolve as resolve5 } from "path";
+var sharedNativeToolsOutputDir = resolve5(tmpdir3(), "rig-native");
+var sharedNativeToolsOutputPath = resolve5(sharedNativeToolsOutputDir, `rig-tools-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+// packages/runtime/src/control-plane/plugin-host-context.ts
+import { createPluginHost } from "@rig/core";
+import { loadConfig } from "@rig/core/load-config";
+
+// packages/runtime/src/control-plane/repos/registry.ts
+var MANAGED_REPOS = new Map;
+
+// packages/runtime/src/control-plane/native/scope-rules.ts
+var activeRules = null;
+function getScopeRules() {
+  return activeRules;
+}
+
+// packages/runtime/src/control-plane/skill-materializer.ts
+import { loadSkill } from "@rig/skill-loader";
+
+// packages/runtime/src/control-plane/tasks/source-aware-task-config-source.ts
+var STATUS_LABELS = new Set(["ready", "blocked", "in-progress", "under-review", "failed", "cancelled"]);
+
+// packages/runtime/src/control-plane/native/task-state.ts
+import { existsSync as existsSync7, readFileSync as readFileSync5, readdirSync, statSync as statSync2, writeFileSync as writeFileSync3 } from "fs";
+import { basename as basename4, resolve as resolve9 } from "path";
+
+// packages/runtime/src/control-plane/state-sync/types.ts
+var CANONICAL_TASK_LIFECYCLE_STATUSES = new Set([
+  "draft",
+  "open",
+  "ready",
+  "queued",
+  "in_progress",
+  "under_review",
+  "blocked",
+  "completed",
+  "cancelled"
+]);
 // packages/runtime/src/control-plane/native/utils.ts
-import { ptr as ptr2 } from "bun:ffi";
 import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
 import { resolve as resolve8 } from "path";
 
@@ -745,12 +744,6 @@ var sharedNativeRuntimeOutputDir = resolve7(tmpdir4(), "rig-native");
 var sharedNativeRuntimeOutputPath = resolve7(sharedNativeRuntimeOutputDir, `runtime-native-${process.platform}-${process.arch}.${suffix}`);
 var colocatedNativeRuntimeFileName = `runtime-native.${suffix}`;
 var nativeRuntimeLibrary = await loadNativeRuntimeLibrary();
-function requireNativeRuntimeLibrary(feature) {
-  if (!nativeRuntimeLibrary) {
-    throw new Error(`Native Zig runtime is required for ${feature}`);
-  }
-  return nativeRuntimeLibrary;
-}
 async function ensureNativeRuntimeLibraryPath(outputPath = sharedNativeRuntimeOutputPath, options = {}) {
   if (await buildNativeRuntimeLibrary(outputPath, options)) {
     return outputPath;
@@ -916,7 +909,6 @@ function tryDlopenNativeRuntimeLibrary(outputPath) {
 function resolveMonorepoRoot2(projectRoot) {
   return resolveMonorepoRoot(projectRoot);
 }
-var nativeScopeMatcher = null;
 var scopeRegexCache = new Map;
 function runCapture(command, cwd, env) {
   const result = Bun.spawnSync(command, {
@@ -977,63 +969,6 @@ function resolveHarnessPaths(projectRoot) {
     reviewProfilePath: resolve8(stateDir, "review-profile.json")
   };
 }
-function normalizeRelativeScopePath(inputPath) {
-  let normalized = inputPath.replace(/^\.\//, "");
-  const rules = getScopeRules();
-  if (rules?.stripPrefixes) {
-    for (const prefix of rules.stripPrefixes) {
-      if (normalized.startsWith(prefix)) {
-        normalized = normalized.slice(prefix.length);
-      }
-    }
-  }
-  return normalized;
-}
-function normalizePathToScope(projectRoot, monorepoRoot, inputPath) {
-  let normalized = inputPath.replace(/^\.\//, "");
-  if (normalized.startsWith(projectRoot + "/")) {
-    normalized = normalized.slice(projectRoot.length + 1);
-  }
-  if (normalized.startsWith(monorepoRoot + "/")) {
-    normalized = normalized.slice(monorepoRoot.length + 1);
-  }
-  return normalizeRelativeScopePath(normalized);
-}
-function scopeMatches(path, scopes) {
-  const matcher = getNativeScopeMatcher();
-  const pathVariants = unique([path, normalizeRelativeScopePath(path)]);
-  for (const scope of scopes) {
-    const scopeVariants = unique([scope, normalizeRelativeScopePath(scope)]);
-    for (const candidatePath of pathVariants) {
-      for (const candidateScope of scopeVariants) {
-        if (candidatePath === candidateScope) {
-          return true;
-        }
-        if (matcher.match(candidateScope, candidatePath)) {
-          return true;
-        }
-      }
-    }
-  }
-  return false;
-}
-function getNativeScopeMatcher() {
-  if (nativeScopeMatcher) {
-    return nativeScopeMatcher;
-  }
-  nativeScopeMatcher = createNativeScopeMatcher();
-  return nativeScopeMatcher;
-}
-function createNativeScopeMatcher() {
-  const library = requireNativeRuntimeLibrary("scope matching");
-  return {
-    match: (pattern, path) => {
-      const patternBuffer = Buffer.from(`${pattern}\x00`);
-      const pathBuffer = Buffer.from(`${path}\x00`);
-      return library.symbols.rig_scope_match(Number(ptr2(patternBuffer)), Number(ptr2(pathBuffer))) !== 0;
-    }
-  };
-}
 // packages/runtime/src/control-plane/state-sync/reconcile.ts
 var STALE_CLAIM_MS = 24 * 60 * 60 * 1000;
 // packages/runtime/src/control-plane/native/task-state.ts
@@ -1415,12 +1350,6 @@ var BAKED_INFO_OUTPUT = BUILD_CONFIG.AGENT_INFO_OUTPUT ?? "";
 var BAKED_DEPS_OUTPUT = BUILD_CONFIG.AGENT_DEPS_OUTPUT ?? "";
 var BAKED_STATUS_OUTPUT = BUILD_CONFIG.AGENT_STATUS_OUTPUT ?? "";
 var REOPENABLE_TASK_STATUSES = new Set(["completed", "cancelled", "blocked"]);
-function hasRuntimeWorkspace() {
-  return Boolean(process.env.RIG_TASK_WORKSPACE?.trim());
-}
-function readTaskConfigForInvocation(projectRoot) {
-  return hasRuntimeWorkspace() ? readTaskConfig(projectRoot) : readSourceTaskConfig(projectRoot);
-}
 var GENERATED_TASK_ARTIFACT_FILES = new Set([
   "changed-files.txt",
   "decision-log.md",
@@ -1465,20 +1394,7 @@ function filterTaskChangedFiles(projectRoot, taskId, files, scoped) {
   if (!taskId) {
     return unique(uniqueFiles).sort();
   }
-  const filteredFiles = unique(uniqueFiles).filter((file) => !isGeneratedTaskChangePath(taskId, file));
-  if (!scoped) {
-    return filteredFiles.sort();
-  }
-  const paths = resolveHarnessPaths(projectRoot);
-  const monorepoRoot = resolveTaskMonorepoRoot(projectRoot);
-  const scopes = readTaskConfigForInvocation(projectRoot)[taskId]?.scope || [];
-  if (scopes.length === 0) {
-    return [];
-  }
-  return filteredFiles.filter((file) => {
-    const normalized = normalizePathToScope(projectRoot, monorepoRoot || paths.monorepoRoot, file);
-    return scopeMatches(file, scopes) || scopeMatches(normalized, scopes);
-  }).sort();
+  return unique(uniqueFiles).filter((file) => !isGeneratedTaskChangePath(taskId, file)).sort();
 }
 function resolveTaskMonorepoRoot(projectRoot) {
   const runtimeWorkspace = loadRuntimeContextFromEnv()?.workspaceDir || process.env.RIG_TASK_WORKSPACE?.trim();
@@ -1529,6 +1445,17 @@ function resolveMonorepoBaseCommit(projectRoot, repo) {
 }
 function collectWorkingTreeFiles(projectRoot, repo, baseline) {
   const files = new Set;
+  const nativeFiles = nativePendingFiles(repo);
+  if (nativeFiles !== null) {
+    for (const entry of nativeFiles) {
+      const normalized = normalizeChangedFilePath(entry.path);
+      if (!normalized || baseline.has(normalized)) {
+        continue;
+      }
+      files.add(normalized);
+    }
+    return [...files].sort();
+  }
   for (const args of [
     ["diff", "--name-only"],
     ["diff", "--cached", "--name-only"],
@@ -1660,7 +1587,7 @@ function shouldScopeGitCommit(args, hasTaskContext) {
   if (!hasTaskContext) {
     return false;
   }
-  return !args.includes("--all") && !args.includes("--unscoped");
+  return args.includes("--scoped");
 }
 function gitStatus(projectRoot, taskId) {
   const monorepoRoot = resolveOptionalMonorepoRoot(projectRoot);