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

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

@@ -1361,16 +1361,297 @@ function readBuildConfig() {
   }
 }
 
-// packages/runtime/src/control-plane/runtime/tooling/shell.ts
+// packages/runtime/src/control-plane/native/git-native.ts
+import { chmodSync, copyFileSync as copyFileSync2, existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync5, renameSync as renameSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { basename as basename2, dirname as dirname4, resolve as resolve7 } from "path";
-var sharedNativeShellOutputDir = resolve7(tmpdir2(), "rig-native");
-var sharedNativeShellOutputPath = resolve7(sharedNativeShellOutputDir, `rig-shell-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
-// packages/runtime/src/control-plane/runtime/tooling/file-tools.ts
+import { dirname as dirname4, isAbsolute, resolve as resolve7 } from "path";
+import { createHash } from "crypto";
+var sharedGitNativeOutputDir = resolve7(tmpdir2(), "rig-native");
+var sharedGitNativeOutputPath = resolve7(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 suffix2 = process.platform === "win32" ? ".exe" : "";
+  return resolve7(dirname4(outputPath), `.rig-git-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}${suffix2}`);
+}
+function publishGitBinary(tempOutputPath, outputPath) {
+  try {
+    renameSync2(tempOutputPath, outputPath);
+  } catch (error) {
+    if (process.platform === "win32" && existsSync7(outputPath)) {
+      rmSync2(outputPath, { force: true });
+      renameSync2(tempOutputPath, outputPath);
+      return;
+    }
+    throw error;
+  }
+}
+function runtimeRigGitFileName() {
+  return `rig-git${process.platform === "win32" ? ".exe" : ""}`;
+}
+function rigGitSourceCandidates() {
+  const execDir = process.execPath?.trim() ? dirname4(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 = resolve7(import.meta.dir, "../../../native/rig-git.zig");
+  return [...new Set([
+    process.env.RIG_NATIVE_GIT_SOURCE?.trim() || "",
+    moduleRelativeSource,
+    projectRoot ? resolve7(projectRoot, "packages/runtime/native/rig-git.zig") : "",
+    hostProjectRoot ? resolve7(hostProjectRoot, "packages/runtime/native/rig-git.zig") : "",
+    cwd ? resolve7(cwd, "packages/runtime/native/rig-git.zig") : "",
+    execDir ? resolve7(execDir, "..", "..", "packages/runtime/native/rig-git.zig") : "",
+    execDir ? resolve7(execDir, "..", "native", "rig-git.zig") : ""
+  ].filter(Boolean))];
+}
+function nativePackageBinaryCandidates(fromDir, fileName) {
+  const candidates = [];
+  let cursor = resolve7(fromDir);
+  for (let index = 0;index < 8; index += 1) {
+    candidates.push(resolve7(cursor, "native", `${process.platform}-${process.arch}`, fileName), resolve7(cursor, "native", `${process.platform}-${process.arch}`, "bin", fileName), resolve7(cursor, "native", fileName), resolve7(cursor, "native", "bin", fileName));
+    const parent = dirname4(cursor);
+    if (parent === cursor)
+      break;
+    cursor = parent;
+  }
+  return candidates;
+}
+function rigGitBinaryCandidates() {
+  const execDir = process.execPath?.trim() ? dirname4(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 ? resolve7(execDir, fileName) : "",
+    execDir ? resolve7(execDir, "..", fileName) : "",
+    execDir ? resolve7(execDir, "..", "bin", fileName) : "",
+    sharedGitNativeOutputPath
+  ].filter(Boolean))];
+}
+function resolveGitSourcePath() {
+  for (const candidate of rigGitSourceCandidates()) {
+    if (candidate && existsSync7(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function resolveGitBinaryPath() {
+  if (process.env.RIG_DISABLE_ZIG_NATIVE === "1") {
+    return null;
+  }
+  for (const candidate of rigGitBinaryCandidates()) {
+    if (candidate && existsSync7(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function preferredGitBinaryOutputPath() {
+  const explicit = process.env.RIG_NATIVE_GIT_BIN?.trim() || "";
+  return explicit || sharedGitNativeOutputPath;
+}
+function binarySupportsTrackerCommandsSync(binaryPath) {
+  try {
+    const probe = Bun.spawnSync([binaryPath, "fetch-ref", "."], {
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const stdout = probe.stdout.toString().trim();
+    const stderr = probe.stderr.toString().trim();
+    if (stdout.includes('"error":"unknown command"')) {
+      return false;
+    }
+    return probe.exitCode === 2 && stderr.includes(trackerCommandUsageProbe);
+  } catch {
+    return false;
+  }
+}
+function nativeBuildManifestPath(outputPath) {
+  return `${outputPath}.build-manifest.json`;
+}
+function hasMatchingNativeBuildManifestSync(manifestPath, buildKey) {
+  if (!existsSync7(manifestPath)) {
+    return false;
+  }
+  try {
+    const manifest = JSON.parse(readFileSync5(manifestPath, "utf8"));
+    return manifest.version === 1 && manifest.buildKey === buildKey;
+  } catch {
+    return false;
+  }
+}
+function sha256FileSync(path) {
+  return createHash("sha256").update(readFileSync5(path)).digest("hex");
+}
+function ensureRigGitBinaryPathSync(outputPath = preferredGitBinaryOutputPath()) {
+  if (process.env.RIG_DISABLE_ZIG_NATIVE === "1") {
+    throw new Error("Zig native git is disabled via RIG_DISABLE_ZIG_NATIVE=1");
+  }
+  const sourcePath = resolveGitSourcePath();
+  if (!sourcePath) {
+    const binaryPath = resolveGitBinaryPath();
+    if (binaryPath) {
+      return binaryPath;
+    }
+    throw new Error("rig-git.zig source file not found.");
+  }
+  const zigBinary = Bun.which("zig");
+  if (!zigBinary) {
+    throw new Error("zig is required to build native Rig git tools.");
+  }
+  mkdirSync3(dirname4(outputPath), { recursive: true });
+  const sourceDigest = sha256FileSync(sourcePath);
+  const buildKey = JSON.stringify({
+    version: 1,
+    zigBinary,
+    platform: process.platform,
+    arch: process.arch,
+    sourcePath,
+    sourceDigest
+  });
+  const manifestPath = nativeBuildManifestPath(outputPath);
+  const needsBuild = !existsSync7(outputPath) || !hasMatchingNativeBuildManifestSync(manifestPath, buildKey) || !binarySupportsTrackerCommandsSync(outputPath);
+  if (!needsBuild) {
+    chmodSync(outputPath, 493);
+    return outputPath;
+  }
+  const tempOutputPath = temporaryGitBinaryOutputPath(outputPath);
+  const build = Bun.spawnSync([
+    zigBinary,
+    "build-exe",
+    sourcePath,
+    "-O",
+    "ReleaseFast",
+    `-femit-bin=${tempOutputPath}`
+  ], {
+    cwd: dirname4(sourcePath),
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  if (build.exitCode !== 0 || !existsSync7(tempOutputPath)) {
+    const stderr = build.stderr.toString().trim();
+    const stdout = build.stdout.toString().trim();
+    const details = [stderr, stdout].filter(Boolean).join(`
+`);
+    throw new Error(`Failed to build native Rig git tools: ${details || `zig exited with code ${build.exitCode}`}`);
+  }
+  chmodSync(tempOutputPath, 493);
+  if (existsSync7(outputPath) && hasMatchingNativeBuildManifestSync(manifestPath, buildKey)) {
+    rmSync2(tempOutputPath, { force: true });
+    chmodSync(outputPath, 493);
+    return outputPath;
+  }
+  publishGitBinary(tempOutputPath, outputPath);
+  if (!binarySupportsTrackerCommandsSync(outputPath)) {
+    rmSync2(outputPath, { force: true });
+    throw new Error("Failed to build native Rig git tools: tracker command probe failed");
+  }
+  writeFileSync2(manifestPath, `${JSON.stringify({ version: 1, buildKey }, null, 2)}
+`, "utf8");
+  return outputPath;
+}
+function runGitNative(command, args) {
+  if (process.env.RIG_DISABLE_ZIG_NATIVE === "1") {
+    return { ok: false, error: "rig-git native disabled" };
+  }
+  const trackerCommand = command === "fetch-ref" || command === "read-blob-at-ref" || command === "write-tree-commit" || command === "push-ref-with-lease";
+  let binaryPath = null;
+  if (trackerCommand) {
+    try {
+      binaryPath = ensureRigGitBinaryPathSync(preferredGitBinaryOutputPath());
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (message.includes("rig-git.zig source file not found")) {
+        return { ok: false, error: "rig-git binary not found" };
+      }
+      return { ok: false, error: message };
+    }
+  } else {
+    const explicitBinaryPath = process.env.RIG_NATIVE_GIT_BIN?.trim() || "";
+    binaryPath = explicitBinaryPath && existsSync7(explicitBinaryPath) ? explicitBinaryPath : !explicitBinaryPath ? resolveGitBinaryPath() : null;
+    if (!binaryPath) {
+      try {
+        binaryPath = ensureRigGitBinaryPathSync(preferredGitBinaryOutputPath());
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (message.includes("rig-git.zig source file not found")) {
+          return { ok: false, error: "rig-git binary not found" };
+        }
+        return { ok: false, error: message };
+      }
+    }
+  }
+  try {
+    const proc = Bun.spawnSync([binaryPath, command, ...args], {
+      stdout: "pipe",
+      stderr: "pipe",
+      env: process.env
+    });
+    if (proc.exitCode !== 0) {
+      const stdoutText = proc.stdout.toString().trim();
+      if (stdoutText) {
+        try {
+          const parsed = JSON.parse(stdoutText);
+          if (!parsed.ok) {
+            return parsed;
+          }
+        } catch {}
+      }
+      const errText = proc.stderr.toString().trim() || `exit code ${proc.exitCode}`;
+      return { ok: false, error: errText };
+    }
+    const output = proc.stdout.toString().trim();
+    return JSON.parse(output);
+  } catch (err) {
+    return { ok: false, error: String(err) };
+  }
+}
+function nativeBranchName(repoPath) {
+  const result = runGitNative("branch-name", [repoPath]);
+  if (!result.ok)
+    return null;
+  if ("value" in result && typeof result.value === "string")
+    return result.value;
+  return null;
+}
+function nativeChangeCount(repoPath) {
+  const result = runGitNative("change-count", [repoPath]);
+  if (!result.ok)
+    return null;
+  if ("count" in result && typeof result.count === "number")
+    return result.count;
+  return null;
+}
+function nativePendingFiles(repoPath) {
+  const result = runGitNative("pending-files", [repoPath]);
+  if (!result.ok)
+    return null;
+  if ("files" in result && Array.isArray(result.files)) {
+    return result.files.map((f) => ({ path: f.path, status: f.status }));
+  }
+  return null;
+}
+function nativeFileHasChanges(repoPath, filePath) {
+  const result = runGitNative("file-has-changes", [repoPath, filePath]);
+  if (!result.ok)
+    return null;
+  if ("has_changes" in result && typeof result.has_changes === "boolean")
+    return result.has_changes;
+  return null;
+}
+
+// packages/runtime/src/control-plane/runtime/tooling/shell.ts
 import { tmpdir as tmpdir3 } from "os";
-import { basename as basename3, dirname as dirname5, resolve as resolve8 } from "path";
-var sharedNativeToolsOutputDir = resolve8(tmpdir3(), "rig-native");
-var sharedNativeToolsOutputPath = resolve8(sharedNativeToolsOutputDir, `rig-tools-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+import { basename as basename2, dirname as dirname5, resolve as resolve8 } from "path";
+var sharedNativeShellOutputDir = resolve8(tmpdir3(), "rig-native");
+var sharedNativeShellOutputPath = resolve8(sharedNativeShellOutputDir, `rig-shell-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+// packages/runtime/src/control-plane/runtime/tooling/file-tools.ts
+import { tmpdir as tmpdir4 } from "os";
+import { basename as basename3, dirname as dirname6, resolve as resolve9 } from "path";
+var sharedNativeToolsOutputDir = resolve9(tmpdir4(), "rig-native");
+var sharedNativeToolsOutputPath = resolve9(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";
@@ -1517,7 +1798,7 @@ function createTaskFieldRegistry(extensions) {
 }
 
 // packages/runtime/src/control-plane/validators/runtime-registration.ts
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync8 } from "fs";
 import { join } from "path";
 function createValidatorRegistry() {
   const map = new Map;
@@ -1550,7 +1831,7 @@ function registerBuiltInValidators(registry) {
 }
 async function runStdTypecheck(ctx) {
   const packageJsonPath = join(ctx.workspaceRoot, "package.json");
-  if (!existsSync7(packageJsonPath)) {
+  if (!existsSync8(packageJsonPath)) {
     return {
       id: "std:typecheck",
       passed: false,
@@ -1578,8 +1859,8 @@ async function runStdTypecheck(ctx) {
 }
 
 // packages/runtime/src/control-plane/hook-materializer.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname6, resolve as resolve9 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname7, resolve as resolve10 } from "path";
 var MARKER_PLUGIN = "_rigPlugin";
 var MARKER_HOOK_ID = "_rigHookId";
 function matcherToString(matcher) {
@@ -1593,8 +1874,8 @@ function isPluginOwned(cmd) {
   return typeof cmd[MARKER_PLUGIN] === "string";
 }
 function materializeHooks(projectRoot, entries) {
-  const settingsPath = resolve9(projectRoot, ".claude", "settings.json");
-  const existing = existsSync8(settingsPath) ? safeReadJson(settingsPath) : {};
+  const settingsPath = resolve10(projectRoot, ".claude", "settings.json");
+  const existing = existsSync9(settingsPath) ? safeReadJson(settingsPath) : {};
   const hooks = existing.hooks ?? {};
   for (const event of Object.keys(hooks)) {
     const groups = hooks[event] ?? [];
@@ -1636,56 +1917,56 @@ function materializeHooks(projectRoot, entries) {
   } else {
     delete next.hooks;
   }
-  mkdirSync3(dirname6(settingsPath), { recursive: true });
-  writeFileSync2(settingsPath, `${JSON.stringify(next, null, 2)}
+  mkdirSync4(dirname7(settingsPath), { recursive: true });
+  writeFileSync3(settingsPath, `${JSON.stringify(next, null, 2)}
 `, "utf-8");
   return settingsPath;
 }
 function safeReadJson(path) {
   try {
-    return JSON.parse(readFileSync5(path, "utf-8"));
+    return JSON.parse(readFileSync6(path, "utf-8"));
   } catch {
     return {};
   }
 }
 
 // packages/runtime/src/control-plane/skill-materializer.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync6, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
-import { resolve as resolve10 } from "path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync5, readFileSync as readFileSync7, readdirSync, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
+import { resolve as resolve11 } from "path";
 import { loadSkill } from "@rig/skill-loader";
 var MARKER_FILENAME = ".rig-plugin";
 function skillDirName(id) {
   return id.replace(/[^a-zA-Z0-9._-]+/g, "-");
 }
 async function materializeSkills(projectRoot, entries) {
-  const skillsRoot = resolve10(projectRoot, ".pi", "skills");
-  if (existsSync9(skillsRoot)) {
+  const skillsRoot = resolve11(projectRoot, ".pi", "skills");
+  if (existsSync10(skillsRoot)) {
     for (const name of readdirSync(skillsRoot)) {
-      const dir = resolve10(skillsRoot, name);
-      if (existsSync9(resolve10(dir, MARKER_FILENAME))) {
-        rmSync2(dir, { recursive: true, force: true });
+      const dir = resolve11(skillsRoot, name);
+      if (existsSync10(resolve11(dir, MARKER_FILENAME))) {
+        rmSync3(dir, { recursive: true, force: true });
       }
     }
   }
   const written = [];
   for (const { pluginName, skill } of entries) {
-    const sourcePath = resolve10(projectRoot, skill.path);
-    if (!existsSync9(sourcePath)) {
+    const sourcePath = resolve11(projectRoot, skill.path);
+    if (!existsSync10(sourcePath)) {
       console.warn(`[plugin-host] skill "${skill.id}" from plugin "${pluginName}" not materialized: ${sourcePath} does not exist`);
       continue;
     }
     let body;
     try {
       await loadSkill(sourcePath);
-      body = readFileSync6(sourcePath, "utf-8");
+      body = readFileSync7(sourcePath, "utf-8");
     } catch (err) {
       console.warn(`[plugin-host] skill "${skill.id}" from plugin "${pluginName}" not materialized: ${err instanceof Error ? err.message : err}`);
       continue;
     }
-    const dir = resolve10(skillsRoot, skillDirName(skill.id));
-    mkdirSync4(dir, { recursive: true });
-    writeFileSync3(resolve10(dir, "SKILL.md"), body, "utf-8");
-    writeFileSync3(resolve10(dir, MARKER_FILENAME), `${JSON.stringify({ plugin: pluginName, skillId: skill.id }, null, 2)}
+    const dir = resolve11(skillsRoot, skillDirName(skill.id));
+    mkdirSync5(dir, { recursive: true });
+    writeFileSync4(resolve11(dir, "SKILL.md"), body, "utf-8");
+    writeFileSync4(resolve11(dir, MARKER_FILENAME), `${JSON.stringify({ plugin: pluginName, skillId: skill.id }, null, 2)}
 `, "utf-8");
     written.push({ id: skill.id, pluginName, directory: dir });
   }
@@ -1752,12 +2033,12 @@ async function buildPluginHostContext(projectRoot) {
 
 // packages/runtime/src/control-plane/tasks/source-aware-task-config-source.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync11, readFileSync as readFileSync8, readdirSync as readdirSync2, statSync as statSync3, writeFileSync as writeFileSync4 } from "fs";
-import { basename as basename4, join as join2, resolve as resolve12 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync9, readdirSync as readdirSync2, statSync as statSync3, writeFileSync as writeFileSync5 } from "fs";
+import { basename as basename4, join as join2, resolve as resolve13 } from "path";
 
 // packages/runtime/src/control-plane/tasks/legacy-task-config-source.ts
-import { existsSync as existsSync10, readFileSync as readFileSync7 } from "fs";
-import { resolve as resolve11 } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
+import { resolve as resolve12 } from "path";
 
 // packages/runtime/src/control-plane/tasks/task-record-reader.ts
 async function findTaskById(reader, id) {
@@ -1780,7 +2061,7 @@ class LegacyTaskConfigReadError extends Error {
   }
 }
 function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve11(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve12(projectRoot, ".rig", "task-config.json");
   const reader = {
     async listTasks() {
       return readLegacyTaskRecords(projectRoot, configPath);
@@ -1791,8 +2072,8 @@ function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
   };
   return reader;
 }
-function readLegacyTaskRecords(projectRoot, configPath = resolve11(projectRoot, ".rig", "task-config.json")) {
-  if (!existsSync10(configPath)) {
+function readLegacyTaskRecords(projectRoot, configPath = resolve12(projectRoot, ".rig", "task-config.json")) {
+  if (!existsSync11(configPath)) {
     return [];
   }
   const rawConfig = readLegacyTaskConfigJson(projectRoot, configPath);
@@ -1800,7 +2081,7 @@ function readLegacyTaskRecords(projectRoot, configPath = resolve11(projectRoot,
 }
 function readLegacyTaskConfigJson(projectRoot, configPath) {
   try {
-    const parsed = JSON.parse(readFileSync7(configPath, "utf8"));
+    const parsed = JSON.parse(readFileSync8(configPath, "utf8"));
     if (isPlainRecord(parsed)) {
       return parsed;
     }
@@ -1884,7 +2165,7 @@ function isPlainRecord(candidate) {
 var STATUS_LABELS = new Set(["ready", "blocked", "in-progress", "under-review", "failed", "cancelled"]);
 var FILE_TASK_PATTERN = /\.(task\.)?json$/;
 function createSourceAwareTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve12(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve13(projectRoot, ".rig", "task-config.json");
   const legacy = createLegacyTaskConfigRecordReader(projectRoot, { configPath });
   const spawnFn = options.spawn ?? spawnSync;
   const ghBinary = options.ghBinary ?? "gh";
@@ -1950,7 +2231,7 @@ async function readSourceAwareTaskStatus(projectRoot, taskId, options = {}) {
   }
 }
 function updateSourceAwareTaskConfigTask(projectRoot, taskId, update, options = {}) {
-  const configPath = options.configPath ?? resolve12(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve13(projectRoot, ".rig", "task-config.json");
   const rawEntry = readRawTaskEntry(configPath, taskId);
   if (!rawEntry) {
     const configuredFilesPath = readConfiguredFilesTaskSourcePath(projectRoot);
@@ -2003,10 +2284,10 @@ function readMaterializedTaskMetadata(entry) {
   return metadata;
 }
 function readConfiguredFilesTaskSourcePath(projectRoot) {
-  const jsonPath = resolve12(projectRoot, "rig.config.json");
-  if (existsSync11(jsonPath)) {
+  const jsonPath = resolve13(projectRoot, "rig.config.json");
+  if (existsSync12(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync8(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync9(jsonPath, "utf8"));
       if (isPlainRecord2(parsed) && isPlainRecord2(parsed.taskSource)) {
         const source = parsed.taskSource;
         return source.kind === "files" && typeof source.path === "string" ? source.path : null;
@@ -2015,12 +2296,12 @@ function readConfiguredFilesTaskSourcePath(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve12(projectRoot, "rig.config.ts");
-  if (!existsSync11(tsPath)) {
+  const tsPath = resolve13(projectRoot, "rig.config.ts");
+  if (!existsSync12(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync8(tsPath, "utf8");
+    const source = readFileSync9(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     if (kind !== "files") {
@@ -2040,10 +2321,10 @@ function readRawTaskEntry(configPath, taskId) {
   return isPlainRecord2(entry) ? entry : null;
 }
 function readRawTaskConfig(configPath) {
-  if (!existsSync11(configPath)) {
+  if (!existsSync12(configPath)) {
     return null;
   }
-  const parsed = JSON.parse(readFileSync8(configPath, "utf8"));
+  const parsed = JSON.parse(readFileSync9(configPath, "utf8"));
   return isPlainRecord2(parsed) ? parsed : null;
 }
 function stripLegacyTaskConfigMetadata2(raw) {
@@ -2060,16 +2341,16 @@ function writeLegacyTaskStatus(configPath, taskId, status) {
     return;
   }
   entry.status = status;
-  writeFileSync4(configPath, `${JSON.stringify(rawConfig, null, 2)}
+  writeFileSync5(configPath, `${JSON.stringify(rawConfig, null, 2)}
 `, "utf8");
 }
 function updateFileBackedTask(projectRoot, sourcePath, taskId, update) {
-  const directory = resolve12(projectRoot, sourcePath);
+  const directory = resolve13(projectRoot, sourcePath);
   const file = findFileBackedTaskFile(directory, taskId);
   if (!file) {
     return false;
   }
-  const raw = JSON.parse(readFileSync8(file, "utf8"));
+  const raw = JSON.parse(readFileSync9(file, "utf8"));
   if (!isPlainRecord2(raw)) {
     return false;
   }
@@ -2086,13 +2367,13 @@ function updateFileBackedTask(projectRoot, sourcePath, taskId, update) {
       { body: update.comment, createdAt: new Date().toISOString(), source: "rig" }
     ];
   }
-  writeFileSync4(file, `${JSON.stringify(raw, null, 2)}
+  writeFileSync5(file, `${JSON.stringify(raw, null, 2)}
 `, "utf8");
   return true;
 }
 function listFileBackedTasks(projectRoot, sourcePath) {
-  const directory = resolve12(projectRoot, sourcePath);
-  if (!existsSync11(directory)) {
+  const directory = resolve13(projectRoot, sourcePath);
+  if (!existsSync12(directory)) {
     return [];
   }
   const tasks = [];
@@ -2107,11 +2388,11 @@ function listFileBackedTasks(projectRoot, sourcePath) {
   return tasks;
 }
 function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
-  const file = findFileBackedTaskFile(resolve12(projectRoot, sourcePath), taskId);
+  const file = findFileBackedTaskFile(resolve13(projectRoot, sourcePath), taskId);
   if (!file) {
     return null;
   }
-  const raw = JSON.parse(readFileSync8(file, "utf8"));
+  const raw = JSON.parse(readFileSync9(file, "utf8"));
   if (!isPlainRecord2(raw)) {
     return null;
   }
@@ -2124,7 +2405,7 @@ function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
   };
 }
 function findFileBackedTaskFile(directory, taskId) {
-  if (!existsSync11(directory)) {
+  if (!existsSync12(directory)) {
     return null;
   }
   for (const name of readdirSync2(directory)) {
@@ -2134,7 +2415,7 @@ function findFileBackedTaskFile(directory, taskId) {
     try {
       if (!statSync3(file).isFile())
         continue;
-      const raw = JSON.parse(readFileSync8(file, "utf8"));
+      const raw = JSON.parse(readFileSync9(file, "utf8"));
       const inferredId = basename4(file).replace(FILE_TASK_PATTERN, "");
       const id = isPlainRecord2(raw) && typeof raw.id === "string" ? raw.id : inferredId;
       if (id === taskId) {
@@ -2327,457 +2608,177 @@ function assertGhSuccess(args, res) {
     const msg = res.error.message ?? String(res.error);
     throw new Error(`gh CLI not available \u2014 install gh (brew install gh / apt install gh): ${msg}`);
   }
-  if (res.status !== 0) {
-    throw new Error(`gh ${args.join(" ")} failed (exit ${res.status}): ${res.stderr}`);
-  }
-}
-function parseDeps(body) {
-  return parseIssueRefs(body, /^depends-on:\s*([^\n]+)/im);
-}
-function parseParents(body) {
-  return parseIssueRefs(body, /^parents?:\s*([^\n]+)/im);
-}
-function parseIssueRefs(body, pattern) {
-  const match = body.match(pattern);
-  if (!match)
-    return [];
-  return match[1].split(",").map((value) => value.trim()).map((value) => value.replace(/^#/, "").match(/^(\d+)/)?.[1] ?? "").filter((value) => value.length > 0);
-}
-function issueTypeFor(labels) {
-  const typed = labels.find((label) => label.startsWith("type:"));
-  if (typed)
-    return typed.slice("type:".length);
-  if (labels.includes("epic"))
-    return "epic";
-  return "task";
-}
-function isPlainRecord2(candidate) {
-  return typeof candidate === "object" && candidate !== null && !Array.isArray(candidate);
-}
-
-// packages/runtime/src/control-plane/tasks/source-lifecycle.ts
-function hasRunnableTaskSource(source) {
-  return Boolean(source && typeof source === "object" && !Array.isArray(source));
-}
-function cleanString(value) {
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
-}
-function taskIdFromSourceIssueId(value) {
-  const raw = cleanString(value);
-  if (!raw)
-    return null;
-  const issueNumber = raw.match(/#([^#\s]+)$/)?.[1];
-  return issueNumber ?? raw;
-}
-function resolveSourceTaskId(taskId, sourceTask) {
-  return cleanString(sourceTask?.id) ?? taskIdFromSourceIssueId(sourceTask?.sourceIssueId) ?? taskIdFromSourceIssueId(sourceTask?.source_issue_id) ?? taskId;
-}
-async function getPluginTask(projectRoot, taskId) {
-  const ctx = await buildPluginHostContext(projectRoot);
-  const [source] = ctx?.taskSourceRegistry.list() ?? [];
-  if (!hasRunnableTaskSource(source)) {
-    return ctx ? { configured: false, sourceKind: null, task: null } : null;
-  }
-  const task = source.get ? await source.get(taskId) ?? null : (await source.list()).find((entry) => entry.id === taskId) ?? null;
-  return {
-    configured: true,
-    sourceKind: source.kind,
-    task
-  };
-}
-async function readConfiguredTaskSourceTask(projectRoot, taskId) {
-  const pluginResult = await getPluginTask(projectRoot, taskId);
-  if (pluginResult)
-    return pluginResult;
-  const task = await createSourceAwareTaskConfigRecordReader(projectRoot).getTask(taskId);
-  return {
-    configured: false,
-    sourceKind: null,
-    task
-  };
-}
-async function updatePluginTaskSourceTask(projectRoot, taskId, update) {
-  const ctx = await buildPluginHostContext(projectRoot);
-  const [source] = ctx?.taskSourceRegistry.list() ?? [];
-  if (!hasRunnableTaskSource(source)) {
-    return ctx ? { taskId, updated: false, source: "none", sourceKind: null, status: null } : null;
-  }
-  if (source.updateTask) {
-    await source.updateTask(taskId, update);
-  } else if (update.status && source.updateStatus) {
-    await source.updateStatus(taskId, update.status);
-  } else {
-    return {
-      taskId,
-      updated: false,
-      source: "plugin",
-      sourceKind: source.kind,
-      status: null
-    };
-  }
-  const status = source.get ? (await source.get(taskId))?.status ?? update.status ?? null : update.status ?? null;
-  return {
-    taskId,
-    updated: true,
-    source: "plugin",
-    sourceKind: source.kind,
-    status
-  };
-}
-async function updateConfiguredTaskSourceTask(projectRoot, input) {
-  const taskId = resolveSourceTaskId(input.taskId, input.sourceTask);
-  let pluginResult = null;
-  try {
-    pluginResult = await updatePluginTaskSourceTask(projectRoot, taskId, input.update);
-  } catch (error) {
-    const fallbackUpdated = updateSourceAwareTaskConfigTask(projectRoot, taskId, input.update, {
-      allowLocalTaskConfigStatusFallback: false
-    });
-    if (!fallbackUpdated) {
-      throw error;
-    }
-    return {
-      taskId,
-      updated: true,
-      source: "compat",
-      sourceKind: null,
-      status: await readSourceAwareTaskStatus(projectRoot, taskId)
-    };
-  }
-  if (pluginResult) {
-    return pluginResult;
-  }
-  const updated = updateSourceAwareTaskConfigTask(projectRoot, taskId, input.update);
-  return {
-    taskId,
-    updated,
-    source: updated ? "compat" : "none",
-    sourceKind: null,
-    status: await readSourceAwareTaskStatus(projectRoot, taskId)
-  };
-}
-function buildTaskRunLifecycleComment(input) {
-  const lines = [
-    "<!-- rig:status-comment -->",
-    `### Rig status: ${input.status}`,
-    "",
-    input.summary,
-    "",
-    `- Run: ${input.runId}`,
-    `- Status: ${input.status}`
-  ];
-  if (input.errorText?.trim()) {
-    lines.push(`- Error: ${input.errorText.trim()}`);
-  }
-  if (input.runtimeWorkspace?.trim()) {
-    lines.push(`- Runtime workspace: ${input.runtimeWorkspace.trim()}`);
-  }
-  if (input.logsDir?.trim()) {
-    lines.push(`- Logs: ${input.logsDir.trim()}`);
-  }
-  if (input.sessionDir?.trim()) {
-    lines.push(`- Session: ${input.sessionDir.trim()}`);
-  }
-  return lines.join(`
-`);
-}
-
-// packages/runtime/src/control-plane/native/task-state.ts
-import { existsSync as existsSync13, readFileSync as readFileSync10, readdirSync as readdirSync3, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
-import { basename as basename5, resolve as resolve14 } 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 as copyFileSync2, existsSync as existsSync12, mkdirSync as mkdirSync5, readFileSync as readFileSync9, renameSync as renameSync2, rmSync as rmSync3, writeFileSync as writeFileSync5 } from "fs";
-import { tmpdir as tmpdir4 } from "os";
-import { dirname as dirname7, isAbsolute, resolve as resolve13 } from "path";
-import { createHash } from "crypto";
-var sharedGitNativeOutputDir = resolve13(tmpdir4(), "rig-native");
-var sharedGitNativeOutputPath = resolve13(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 suffix2 = process.platform === "win32" ? ".exe" : "";
-  return resolve13(dirname7(outputPath), `.rig-git-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}${suffix2}`);
-}
-function publishGitBinary(tempOutputPath, outputPath) {
-  try {
-    renameSync2(tempOutputPath, outputPath);
-  } catch (error) {
-    if (process.platform === "win32" && existsSync12(outputPath)) {
-      rmSync3(outputPath, { force: true });
-      renameSync2(tempOutputPath, outputPath);
-      return;
-    }
-    throw error;
-  }
-}
-function runtimeRigGitFileName() {
-  return `rig-git${process.platform === "win32" ? ".exe" : ""}`;
-}
-function rigGitSourceCandidates() {
-  const execDir = process.execPath?.trim() ? dirname7(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 = resolve13(import.meta.dir, "../../../native/rig-git.zig");
-  return [...new Set([
-    process.env.RIG_NATIVE_GIT_SOURCE?.trim() || "",
-    moduleRelativeSource,
-    projectRoot ? resolve13(projectRoot, "packages/runtime/native/rig-git.zig") : "",
-    hostProjectRoot ? resolve13(hostProjectRoot, "packages/runtime/native/rig-git.zig") : "",
-    cwd ? resolve13(cwd, "packages/runtime/native/rig-git.zig") : "",
-    execDir ? resolve13(execDir, "..", "..", "packages/runtime/native/rig-git.zig") : "",
-    execDir ? resolve13(execDir, "..", "native", "rig-git.zig") : ""
-  ].filter(Boolean))];
-}
-function nativePackageBinaryCandidates(fromDir, fileName) {
-  const candidates = [];
-  let cursor = resolve13(fromDir);
-  for (let index = 0;index < 8; index += 1) {
-    candidates.push(resolve13(cursor, "native", `${process.platform}-${process.arch}`, fileName), resolve13(cursor, "native", `${process.platform}-${process.arch}`, "bin", fileName), resolve13(cursor, "native", fileName), resolve13(cursor, "native", "bin", fileName));
-    const parent = dirname7(cursor);
-    if (parent === cursor)
-      break;
-    cursor = parent;
-  }
-  return candidates;
-}
-function rigGitBinaryCandidates() {
-  const execDir = process.execPath?.trim() ? dirname7(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 ? resolve13(execDir, fileName) : "",
-    execDir ? resolve13(execDir, "..", fileName) : "",
-    execDir ? resolve13(execDir, "..", "bin", fileName) : "",
-    sharedGitNativeOutputPath
-  ].filter(Boolean))];
-}
-function resolveGitSourcePath() {
-  for (const candidate of rigGitSourceCandidates()) {
-    if (candidate && existsSync12(candidate)) {
-      return candidate;
-    }
-  }
-  return null;
-}
-function resolveGitBinaryPath() {
-  if (process.env.RIG_DISABLE_ZIG_NATIVE === "1") {
-    return null;
-  }
-  for (const candidate of rigGitBinaryCandidates()) {
-    if (candidate && existsSync12(candidate)) {
-      return candidate;
-    }
-  }
-  return null;
-}
-function preferredGitBinaryOutputPath() {
-  const explicit = process.env.RIG_NATIVE_GIT_BIN?.trim() || "";
-  return explicit || sharedGitNativeOutputPath;
-}
-function binarySupportsTrackerCommandsSync(binaryPath) {
-  try {
-    const probe = Bun.spawnSync([binaryPath, "fetch-ref", "."], {
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const stdout = probe.stdout.toString().trim();
-    const stderr = probe.stderr.toString().trim();
-    if (stdout.includes('"error":"unknown command"')) {
-      return false;
-    }
-    return probe.exitCode === 2 && stderr.includes(trackerCommandUsageProbe);
-  } catch {
-    return false;
-  }
-}
-function nativeBuildManifestPath(outputPath) {
-  return `${outputPath}.build-manifest.json`;
-}
-function hasMatchingNativeBuildManifestSync(manifestPath, buildKey) {
-  if (!existsSync12(manifestPath)) {
-    return false;
-  }
-  try {
-    const manifest = JSON.parse(readFileSync9(manifestPath, "utf8"));
-    return manifest.version === 1 && manifest.buildKey === buildKey;
-  } catch {
-    return false;
-  }
-}
-function sha256FileSync(path) {
-  return createHash("sha256").update(readFileSync9(path)).digest("hex");
-}
-function ensureRigGitBinaryPathSync(outputPath = preferredGitBinaryOutputPath()) {
-  if (process.env.RIG_DISABLE_ZIG_NATIVE === "1") {
-    throw new Error("Zig native git is disabled via RIG_DISABLE_ZIG_NATIVE=1");
-  }
-  const sourcePath = resolveGitSourcePath();
-  if (!sourcePath) {
-    const binaryPath = resolveGitBinaryPath();
-    if (binaryPath) {
-      return binaryPath;
-    }
-    throw new Error("rig-git.zig source file not found.");
-  }
-  const zigBinary = Bun.which("zig");
-  if (!zigBinary) {
-    throw new Error("zig is required to build native Rig git tools.");
-  }
-  mkdirSync5(dirname7(outputPath), { recursive: true });
-  const sourceDigest = sha256FileSync(sourcePath);
-  const buildKey = JSON.stringify({
-    version: 1,
-    zigBinary,
-    platform: process.platform,
-    arch: process.arch,
-    sourcePath,
-    sourceDigest
-  });
-  const manifestPath = nativeBuildManifestPath(outputPath);
-  const needsBuild = !existsSync12(outputPath) || !hasMatchingNativeBuildManifestSync(manifestPath, buildKey) || !binarySupportsTrackerCommandsSync(outputPath);
-  if (!needsBuild) {
-    chmodSync(outputPath, 493);
-    return outputPath;
-  }
-  const tempOutputPath = temporaryGitBinaryOutputPath(outputPath);
-  const build = Bun.spawnSync([
-    zigBinary,
-    "build-exe",
-    sourcePath,
-    "-O",
-    "ReleaseFast",
-    `-femit-bin=${tempOutputPath}`
-  ], {
-    cwd: dirname7(sourcePath),
-    stdout: "pipe",
-    stderr: "pipe"
-  });
-  if (build.exitCode !== 0 || !existsSync12(tempOutputPath)) {
-    const stderr = build.stderr.toString().trim();
-    const stdout = build.stdout.toString().trim();
-    const details = [stderr, stdout].filter(Boolean).join(`
-`);
-    throw new Error(`Failed to build native Rig git tools: ${details || `zig exited with code ${build.exitCode}`}`);
-  }
-  chmodSync(tempOutputPath, 493);
-  if (existsSync12(outputPath) && hasMatchingNativeBuildManifestSync(manifestPath, buildKey)) {
-    rmSync3(tempOutputPath, { force: true });
-    chmodSync(outputPath, 493);
-    return outputPath;
+  if (res.status !== 0) {
+    throw new Error(`gh ${args.join(" ")} failed (exit ${res.status}): ${res.stderr}`);
   }
-  publishGitBinary(tempOutputPath, outputPath);
-  if (!binarySupportsTrackerCommandsSync(outputPath)) {
-    rmSync3(outputPath, { force: true });
-    throw new Error("Failed to build native Rig git tools: tracker command probe failed");
+}
+function parseDeps(body) {
+  return parseIssueRefs(body, /^depends-on:\s*([^\n]+)/im);
+}
+function parseParents(body) {
+  return parseIssueRefs(body, /^parents?:\s*([^\n]+)/im);
+}
+function parseIssueRefs(body, pattern) {
+  const match = body.match(pattern);
+  if (!match)
+    return [];
+  return match[1].split(",").map((value) => value.trim()).map((value) => value.replace(/^#/, "").match(/^(\d+)/)?.[1] ?? "").filter((value) => value.length > 0);
+}
+function issueTypeFor(labels) {
+  const typed = labels.find((label) => label.startsWith("type:"));
+  if (typed)
+    return typed.slice("type:".length);
+  if (labels.includes("epic"))
+    return "epic";
+  return "task";
+}
+function isPlainRecord2(candidate) {
+  return typeof candidate === "object" && candidate !== null && !Array.isArray(candidate);
+}
+
+// packages/runtime/src/control-plane/tasks/source-lifecycle.ts
+function hasRunnableTaskSource(source) {
+  return Boolean(source && typeof source === "object" && !Array.isArray(source));
+}
+function cleanString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function taskIdFromSourceIssueId(value) {
+  const raw = cleanString(value);
+  if (!raw)
+    return null;
+  const issueNumber = raw.match(/#([^#\s]+)$/)?.[1];
+  return issueNumber ?? raw;
+}
+function resolveSourceTaskId(taskId, sourceTask) {
+  return cleanString(sourceTask?.id) ?? taskIdFromSourceIssueId(sourceTask?.sourceIssueId) ?? taskIdFromSourceIssueId(sourceTask?.source_issue_id) ?? taskId;
+}
+async function getPluginTask(projectRoot, taskId) {
+  const ctx = await buildPluginHostContext(projectRoot);
+  const [source] = ctx?.taskSourceRegistry.list() ?? [];
+  if (!hasRunnableTaskSource(source)) {
+    return ctx ? { configured: false, sourceKind: null, task: null } : null;
   }
-  writeFileSync5(manifestPath, `${JSON.stringify({ version: 1, buildKey }, null, 2)}
-`, "utf8");
-  return outputPath;
+  const task = source.get ? await source.get(taskId) ?? null : (await source.list()).find((entry) => entry.id === taskId) ?? null;
+  return {
+    configured: true,
+    sourceKind: source.kind,
+    task
+  };
 }
-function runGitNative(command, args) {
-  if (process.env.RIG_DISABLE_ZIG_NATIVE === "1") {
-    return { ok: false, error: "rig-git native disabled" };
+async function readConfiguredTaskSourceTask(projectRoot, taskId) {
+  const pluginResult = await getPluginTask(projectRoot, taskId);
+  if (pluginResult)
+    return pluginResult;
+  const task = await createSourceAwareTaskConfigRecordReader(projectRoot).getTask(taskId);
+  return {
+    configured: false,
+    sourceKind: null,
+    task
+  };
+}
+async function updatePluginTaskSourceTask(projectRoot, taskId, update) {
+  const ctx = await buildPluginHostContext(projectRoot);
+  const [source] = ctx?.taskSourceRegistry.list() ?? [];
+  if (!hasRunnableTaskSource(source)) {
+    return ctx ? { taskId, updated: false, source: "none", sourceKind: null, status: null } : null;
   }
-  const trackerCommand = command === "fetch-ref" || command === "read-blob-at-ref" || command === "write-tree-commit" || command === "push-ref-with-lease";
-  let binaryPath = null;
-  if (trackerCommand) {
-    try {
-      binaryPath = ensureRigGitBinaryPathSync(preferredGitBinaryOutputPath());
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      if (message.includes("rig-git.zig source file not found")) {
-        return { ok: false, error: "rig-git binary not found" };
-      }
-      return { ok: false, error: message };
-    }
+  if (source.updateTask) {
+    await source.updateTask(taskId, update);
+  } else if (update.status && source.updateStatus) {
+    await source.updateStatus(taskId, update.status);
   } else {
-    const explicitBinaryPath = process.env.RIG_NATIVE_GIT_BIN?.trim() || "";
-    binaryPath = explicitBinaryPath && existsSync12(explicitBinaryPath) ? explicitBinaryPath : !explicitBinaryPath ? resolveGitBinaryPath() : null;
-    if (!binaryPath) {
-      try {
-        binaryPath = ensureRigGitBinaryPathSync(preferredGitBinaryOutputPath());
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        if (message.includes("rig-git.zig source file not found")) {
-          return { ok: false, error: "rig-git binary not found" };
-        }
-        return { ok: false, error: message };
-      }
-    }
+    return {
+      taskId,
+      updated: false,
+      source: "plugin",
+      sourceKind: source.kind,
+      status: null
+    };
   }
+  const status = source.get ? (await source.get(taskId))?.status ?? update.status ?? null : update.status ?? null;
+  return {
+    taskId,
+    updated: true,
+    source: "plugin",
+    sourceKind: source.kind,
+    status
+  };
+}
+async function updateConfiguredTaskSourceTask(projectRoot, input) {
+  const taskId = resolveSourceTaskId(input.taskId, input.sourceTask);
+  let pluginResult = null;
   try {
-    const proc = Bun.spawnSync([binaryPath, command, ...args], {
-      stdout: "pipe",
-      stderr: "pipe",
-      env: process.env
+    pluginResult = await updatePluginTaskSourceTask(projectRoot, taskId, input.update);
+  } catch (error) {
+    const fallbackUpdated = updateSourceAwareTaskConfigTask(projectRoot, taskId, input.update, {
+      allowLocalTaskConfigStatusFallback: false
     });
-    if (proc.exitCode !== 0) {
-      const stdoutText = proc.stdout.toString().trim();
-      if (stdoutText) {
-        try {
-          const parsed = JSON.parse(stdoutText);
-          if (!parsed.ok) {
-            return parsed;
-          }
-        } catch {}
-      }
-      const errText = proc.stderr.toString().trim() || `exit code ${proc.exitCode}`;
-      return { ok: false, error: errText };
+    if (!fallbackUpdated) {
+      throw error;
     }
-    const output = proc.stdout.toString().trim();
-    return JSON.parse(output);
-  } catch (err) {
-    return { ok: false, error: String(err) };
+    return {
+      taskId,
+      updated: true,
+      source: "compat",
+      sourceKind: null,
+      status: await readSourceAwareTaskStatus(projectRoot, taskId)
+    };
   }
-}
-function nativeBranchName(repoPath) {
-  const result = runGitNative("branch-name", [repoPath]);
-  if (!result.ok)
-    return null;
-  if ("value" in result && typeof result.value === "string")
-    return result.value;
-  return null;
-}
-function nativeChangeCount(repoPath) {
-  const result = runGitNative("change-count", [repoPath]);
-  if (!result.ok)
-    return null;
-  if ("count" in result && typeof result.count === "number")
-    return result.count;
-  return null;
-}
-function nativePendingFiles(repoPath) {
-  const result = runGitNative("pending-files", [repoPath]);
-  if (!result.ok)
-    return null;
-  if ("files" in result && Array.isArray(result.files)) {
-    return result.files.map((f) => ({ path: f.path, status: f.status }));
+  if (pluginResult) {
+    return pluginResult;
   }
-  return null;
+  const updated = updateSourceAwareTaskConfigTask(projectRoot, taskId, input.update);
+  return {
+    taskId,
+    updated,
+    source: updated ? "compat" : "none",
+    sourceKind: null,
+    status: await readSourceAwareTaskStatus(projectRoot, taskId)
+  };
 }
-function nativeFileHasChanges(repoPath, filePath) {
-  const result = runGitNative("file-has-changes", [repoPath, filePath]);
-  if (!result.ok)
-    return null;
-  if ("has_changes" in result && typeof result.has_changes === "boolean")
-    return result.has_changes;
-  return null;
+function buildTaskRunLifecycleComment(input) {
+  const lines = [
+    "<!-- rig:status-comment -->",
+    `### Rig status: ${input.status}`,
+    "",
+    input.summary,
+    "",
+    `- Run: ${input.runId}`,
+    `- Status: ${input.status}`
+  ];
+  if (input.errorText?.trim()) {
+    lines.push(`- Error: ${input.errorText.trim()}`);
+  }
+  if (input.runtimeWorkspace?.trim()) {
+    lines.push(`- Runtime workspace: ${input.runtimeWorkspace.trim()}`);
+  }
+  if (input.logsDir?.trim()) {
+    lines.push(`- Logs: ${input.logsDir.trim()}`);
+  }
+  if (input.sessionDir?.trim()) {
+    lines.push(`- Session: ${input.sessionDir.trim()}`);
+  }
+  return lines.join(`
+`);
 }
+
+// packages/runtime/src/control-plane/native/task-state.ts
+import { existsSync as existsSync13, readFileSync as readFileSync10, readdirSync as readdirSync3, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
+import { basename as basename5, resolve as resolve14 } 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/state-sync/reconcile.ts
 var STALE_CLAIM_MS = 24 * 60 * 60 * 1000;
 // packages/runtime/src/control-plane/native/task-state.ts
@@ -6904,20 +6905,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();
@@ -6968,6 +6956,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"],