@h-rig/cli 0.0.6-alpha.34 → 0.0.6-alpha.36

package/dist/src/commands.js

@@ -337,9 +337,9 @@ var init_plugin = __esm(() => {
 // packages/cli/src/commands.ts
 init_runner();
 import {
-  existsSync as existsSync14
+  existsSync as existsSync15
 } from "fs";
-import { resolve as resolve23 } from "path";
+import { resolve as resolve24 } from "path";
 import { readBuildConfig } from "@rig/runtime/build-time-config";
 
 // packages/cli/src/commands/browser.ts
@@ -2450,6 +2450,157 @@ async function executeHarness(context, args) {
 // packages/cli/src/commands.ts
 init_plugin();
 
+// packages/cli/src/commands/pi.ts
+init_runner();
+import { existsSync as existsSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
+import { homedir as homedir2 } from "os";
+import { dirname, resolve as resolve8 } from "path";
+function settingsPath(root) {
+  return resolve8(root, ".pi", "settings.json");
+}
+function userSettingsPath() {
+  return resolve8(homedir2(), ".pi", "agent", "settings.json");
+}
+function readJson(path, fallback) {
+  if (!existsSync4(path))
+    return fallback;
+  try {
+    return JSON.parse(readFileSync2(path, "utf-8"));
+  } catch {
+    return fallback;
+  }
+}
+function packageKey(entry) {
+  if (typeof entry === "string")
+    return entry;
+  if (entry && typeof entry === "object" && typeof entry.source === "string") {
+    return entry.source;
+  }
+  return JSON.stringify(entry);
+}
+function writeSettings(path, settings) {
+  mkdirSync4(dirname(path), { recursive: true });
+  writeFileSync3(path, `${JSON.stringify(settings, null, 2)}
+`, "utf-8");
+}
+async function searchNpmForPiExtensions(term) {
+  const query = encodeURIComponent(term ? `${term} pi extension` : "pi extension");
+  const url = `https://registry.npmjs.org/-/v1/search?text=${query}&size=20`;
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new CliError2(`npm registry search failed (${response.status}).`, 2);
+  }
+  const payload = await response.json();
+  const results = [];
+  for (const entry of payload.objects ?? []) {
+    const pkg = entry.package;
+    if (!pkg?.name)
+      continue;
+    const keywords = (pkg.keywords ?? []).map((k) => k.toLowerCase());
+    const piLike = pkg.name.startsWith("pi-") || pkg.name.includes("-pi") || keywords.includes("pi") || keywords.includes("pi-extension") || (pkg.description ?? "").toLowerCase().includes("pi extension") || (pkg.description ?? "").toLowerCase().includes("pi coding agent");
+    if (!piLike)
+      continue;
+    results.push({ name: pkg.name, version: pkg.version ?? "", description: pkg.description ?? "" });
+  }
+  return results;
+}
+async function executePi(context, args) {
+  const [command = "list", ...rest] = args;
+  const projectSettingsPath = settingsPath(context.projectRoot);
+  const managedRecordPath = resolve8(context.projectRoot, ".rig", "state", "pi-managed-packages.json");
+  switch (command) {
+    case "list": {
+      requireNoExtraArgs(rest, "rig pi list");
+      const project = readJson(projectSettingsPath, {});
+      const managed = new Set(readJson(managedRecordPath, []));
+      const user = readJson(userSettingsPath(), {});
+      const projectPackages = (Array.isArray(project.packages) ? project.packages : []).map((entry) => ({
+        source: packageKey(entry),
+        managedByRigConfig: managed.has(packageKey(entry))
+      }));
+      const userPackages = (Array.isArray(user.packages) ? user.packages : []).map(packageKey);
+      if (context.outputMode === "text") {
+        console.log("Project Pi packages (.pi/settings.json):");
+        if (projectPackages.length === 0)
+          console.log("  (none)");
+        for (const pkg of projectPackages) {
+          console.log(`  ${pkg.source}${pkg.managedByRigConfig ? "  [from rig.config runtime.pi.packages]" : ""}`);
+        }
+        console.log("User Pi packages (~/.pi/agent/settings.json):");
+        if (userPackages.length === 0)
+          console.log("  (none)");
+        for (const pkg of userPackages)
+          console.log(`  ${pkg}`);
+        console.log("Add more: `rig pi add <npm-package>` \xB7 discover: `rig pi search <term>`");
+      }
+      return { ok: true, group: "pi", command, details: { projectPackages, userPackages } };
+    }
+    case "add": {
+      const [source, ...extra] = rest;
+      requireNoExtraArgs(extra, "rig pi add <package-source>");
+      if (!source) {
+        throw new CliError2("Usage: rig pi add <package-source> (npm name, name@version, or git URL)", 2);
+      }
+      const settings = readJson(projectSettingsPath, {});
+      const packages = Array.isArray(settings.packages) ? settings.packages : [];
+      if (packages.some((entry) => packageKey(entry) === source)) {
+        throw new CliError2(`"${source}" is already in ${projectSettingsPath}.`, 2);
+      }
+      writeSettings(projectSettingsPath, { ...settings, packages: [...packages, source] });
+      if (context.outputMode === "text") {
+        console.log(`Added ${source} to ${projectSettingsPath}.`);
+        console.log("Pi installs missing packages automatically at the next session start (local and worker).");
+      }
+      return { ok: true, group: "pi", command, details: { source, settingsPath: projectSettingsPath } };
+    }
+    case "remove": {
+      const [source, ...extra] = rest;
+      requireNoExtraArgs(extra, "rig pi remove <package-source>");
+      if (!source) {
+        throw new CliError2("Usage: rig pi remove <package-source>", 2);
+      }
+      const managed = new Set(readJson(managedRecordPath, []));
+      if (managed.has(source)) {
+        throw new CliError2(`"${source}" is managed by rig.config.ts (runtime.pi.packages); remove it there instead.`, 2);
+      }
+      const settings = readJson(projectSettingsPath, {});
+      const packages = Array.isArray(settings.packages) ? settings.packages : [];
+      const next = packages.filter((entry) => packageKey(entry) !== source);
+      if (next.length === packages.length) {
+        throw new CliError2(`"${source}" is not in ${projectSettingsPath}.`, 2);
+      }
+      const nextSettings = { ...settings };
+      if (next.length > 0)
+        nextSettings.packages = next;
+      else
+        delete nextSettings.packages;
+      writeSettings(projectSettingsPath, nextSettings);
+      if (context.outputMode === "text") {
+        console.log(`Removed ${source} from ${projectSettingsPath}.`);
+      }
+      return { ok: true, group: "pi", command, details: { source } };
+    }
+    case "search": {
+      const term = rest.join(" ").trim();
+      const results = await searchNpmForPiExtensions(term);
+      if (context.outputMode === "text") {
+        if (results.length === 0) {
+          console.log(`No Pi extension packages found on npm${term ? ` for "${term}"` : ""}.`);
+        } else {
+          console.log(`Pi extension packages on npm${term ? ` matching "${term}"` : ""}:`);
+          for (const pkg of results) {
+            console.log(`  ${pkg.name}@${pkg.version}  ${pkg.description.slice(0, 80)}`);
+          }
+          console.log("Install one: `rig pi add <name>`");
+        }
+      }
+      return { ok: true, group: "pi", command, details: { term, results } };
+    }
+    default:
+      throw new CliError2(`Unknown pi command: ${command}. Use list|add|remove|search.`);
+  }
+}
+
 // packages/cli/src/commands/queue.ts
 init_runner();
 init__parsers();
@@ -2461,33 +2612,33 @@ import { ensureProjectMainFreshBeforeRun } from "@rig/runtime/control-plane/proj
 
 // packages/cli/src/commands/_connection-state.ts
 init_runner();
-import { existsSync as existsSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir2 } from "os";
-import { dirname, resolve as resolve8 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname2, resolve as resolve9 } from "path";
 function resolveGlobalConnectionsPath(env = process.env) {
   const explicit = env.RIG_CONNECTIONS_FILE?.trim();
   if (explicit)
-    return resolve8(explicit);
+    return resolve9(explicit);
   const stateDir = env.RIG_GLOBAL_STATE_DIR?.trim();
   if (stateDir)
-    return resolve8(stateDir, "connections.json");
-  return resolve8(homedir2(), ".rig", "connections.json");
+    return resolve9(stateDir, "connections.json");
+  return resolve9(homedir3(), ".rig", "connections.json");
 }
 function resolveRepoConnectionPath(projectRoot) {
-  return resolve8(projectRoot, ".rig", "state", "connection.json");
+  return resolve9(projectRoot, ".rig", "state", "connection.json");
 }
 function readJsonFile2(path) {
-  if (!existsSync4(path))
+  if (!existsSync5(path))
     return null;
   try {
-    return JSON.parse(readFileSync2(path, "utf8"));
+    return JSON.parse(readFileSync3(path, "utf8"));
   } catch (error) {
     throw new CliError2(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1);
   }
 }
 function writeJsonFile2(path, value) {
-  mkdirSync4(dirname(path), { recursive: true });
-  writeFileSync3(path, `${JSON.stringify(value, null, 2)}
+  mkdirSync5(dirname2(path), { recursive: true });
+  writeFileSync4(path, `${JSON.stringify(value, null, 2)}
 `, "utf8");
 }
 function normalizeConnection(value) {
@@ -2564,8 +2715,8 @@ function resolveSelectedConnection(projectRoot, options = {}) {
 
 // packages/cli/src/commands/_server-client.ts
 init_runner();
-import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
-import { resolve as resolve9 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
+import { resolve as resolve10 } from "path";
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
 var scopedGitHubBearerTokens = new Map;
 function cleanToken(value) {
@@ -2573,22 +2724,22 @@ function cleanToken(value) {
   return trimmed ? trimmed : null;
 }
 function setGitHubBearerTokenForCurrentProcess(token, projectRoot) {
-  const scopedKey = resolve9(projectRoot ?? process.cwd());
+  const scopedKey = resolve10(projectRoot ?? process.cwd());
   scopedGitHubBearerTokens.set(scopedKey, cleanToken(token ?? undefined));
 }
 function readPrivateRemoteSessionToken(projectRoot) {
-  const path = resolve9(projectRoot, ".rig", "state", "github-auth.json");
-  if (!existsSync5(path))
+  const path = resolve10(projectRoot, ".rig", "state", "github-auth.json");
+  if (!existsSync6(path))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync3(path, "utf8"));
+    const parsed = JSON.parse(readFileSync4(path, "utf8"));
     return cleanToken(typeof parsed.apiSessionToken === "string" ? parsed.apiSessionToken : typeof parsed.sessionToken === "string" ? parsed.sessionToken : undefined);
   } catch {
     return null;
   }
 }
 function readGitHubBearerTokenForRemote(projectRoot) {
-  const scopedKey = resolve9(projectRoot);
+  const scopedKey = resolve10(projectRoot);
   if (scopedGitHubBearerTokens.has(scopedKey))
     return scopedGitHubBearerTokens.get(scopedKey) ?? null;
   const privateSession = readPrivateRemoteSessionToken(projectRoot);
@@ -2730,7 +2881,7 @@ async function registerProjectViaServer(context, input) {
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
 }
 function sleep(ms) {
-  return new Promise((resolve10) => setTimeout(resolve10, ms));
+  return new Promise((resolve11) => setTimeout(resolve11, ms));
 }
 function isRetryableProjectRootSwitchError(error) {
   if (!(error instanceof Error))
@@ -3213,7 +3364,7 @@ async function executeQueue(context, args) {
 
 // packages/cli/src/commands/agent.ts
 init_runner();
-import { resolve as resolve11 } from "path";
+import { resolve as resolve12 } from "path";
 import {
   agentId,
   cleanupAgentRuntime,
@@ -3223,8 +3374,8 @@ import {
 } from "@rig/runtime/control-plane/runtime/isolation";
 
 // packages/cli/src/commands/_authority-runs.ts
-import { existsSync as existsSync6 } from "fs";
-import { resolve as resolve10 } from "path";
+import { existsSync as existsSync7 } from "fs";
+import { resolve as resolve11 } from "path";
 import {
   readAuthorityRun,
   readJsonlFile as readJsonlFile2,
@@ -3246,8 +3397,8 @@ function normalizeRuntimeAdapter(value) {
   return "claude-code";
 }
 function readLatestBeadRecord(projectRoot, taskId) {
-  const issuesPath = resolve10(resolveControlPlaneMonorepoRoot(projectRoot), ".beads", "issues.jsonl");
-  if (!existsSync6(issuesPath)) {
+  const issuesPath = resolve11(resolveControlPlaneMonorepoRoot(projectRoot), ".beads", "issues.jsonl");
+  if (!existsSync7(issuesPath)) {
     return null;
   }
   let latest = null;
@@ -3315,7 +3466,7 @@ function upsertAgentAuthorityRun(projectRoot, input) {
   } else if ("errorText" in next) {
     delete next.errorText;
   }
-  writeJsonFile3(resolve10(resolveAuthorityRunDir(projectRoot, input.runId), "run.json"), next);
+  writeJsonFile3(resolve11(resolveAuthorityRunDir(projectRoot, input.runId), "run.json"), next);
   return next;
 }
 
@@ -3437,10 +3588,10 @@ async function executeAgent(context, args) {
           status: "running",
           startedAt: createdAt,
           worktreePath: runtime.workspaceDir,
-          artifactRoot: resolve11(runtime.workspaceDir, "artifacts", taskId),
+          artifactRoot: resolve12(runtime.workspaceDir, "artifacts", taskId),
           logRoot: runtime.logsDir,
-          sessionPath: resolve11(runtime.sessionDir, "session.json"),
-          sessionLogPath: resolve11(runtime.logsDir, "agent-stdout.log"),
+          sessionPath: resolve12(runtime.sessionDir, "session.json"),
+          sessionLogPath: resolve12(runtime.logsDir, "agent-stdout.log"),
           pid: process.pid
         });
         const result = await runInAgentRuntime({
@@ -3460,10 +3611,10 @@ async function executeAgent(context, args) {
             startedAt: createdAt,
             completedAt: failedAt,
             worktreePath: runtime.workspaceDir,
-            artifactRoot: resolve11(runtime.workspaceDir, "artifacts", taskId),
+            artifactRoot: resolve12(runtime.workspaceDir, "artifacts", taskId),
             logRoot: runtime.logsDir,
-            sessionPath: resolve11(runtime.sessionDir, "session.json"),
-            sessionLogPath: resolve11(runtime.logsDir, "agent-stdout.log"),
+            sessionPath: resolve12(runtime.sessionDir, "session.json"),
+            sessionLogPath: resolve12(runtime.logsDir, "agent-stdout.log"),
             pid: process.pid,
             errorText: result.stderr ? result.stderr.trim() : `Agent runtime command failed (${result.exitCode})`
           });
@@ -3480,10 +3631,10 @@ ${result.stderr.trim()}` : ""}`, result.exitCode);
           startedAt: createdAt,
           completedAt,
           worktreePath: runtime.workspaceDir,
-          artifactRoot: resolve11(runtime.workspaceDir, "artifacts", taskId),
+          artifactRoot: resolve12(runtime.workspaceDir, "artifacts", taskId),
           logRoot: runtime.logsDir,
-          sessionPath: resolve11(runtime.sessionDir, "session.json"),
-          sessionLogPath: resolve11(runtime.logsDir, "agent-stdout.log"),
+          sessionPath: resolve12(runtime.sessionDir, "session.json"),
+          sessionLogPath: resolve12(runtime.logsDir, "agent-stdout.log"),
           pid: process.pid
         });
         return {
@@ -3559,8 +3710,8 @@ init__parsers();
 import {
   chmodSync,
   copyFileSync as copyFileSync2,
-  existsSync as existsSync7,
-  mkdirSync as mkdirSync5,
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync6,
   readdirSync,
   readlinkSync,
   rmSync as rmSync3,
@@ -3568,8 +3719,8 @@ import {
   symlinkSync,
   unlinkSync
 } from "fs";
-import { homedir as homedir3 } from "os";
-import { resolve as resolve12 } from "path";
+import { homedir as homedir4 } from "os";
+import { resolve as resolve13 } from "path";
 import { buildBinary as buildBinary2 } from "@rig/runtime/control-plane/runtime/isolation";
 import {
   computeRuntimeImageFingerprint,
@@ -3588,13 +3739,13 @@ async function runQuietBinaryProbe(binaryPath, args, cwd) {
 
 // packages/cli/src/commands/dist.ts
 function collectRigValidatorBuildTargets(input) {
-  const validatorsRoot = resolve12(input.hostProjectRoot, "packages/runtime/src/control-plane/validators");
-  if (!existsSync7(validatorsRoot))
+  const validatorsRoot = resolve13(input.hostProjectRoot, "packages/runtime/src/control-plane/validators");
+  if (!existsSync8(validatorsRoot))
     return [];
   const targets = [];
   const categories = readdirSync(validatorsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
   for (const category of categories) {
-    const categoryDir = resolve12(validatorsRoot, category.name);
+    const categoryDir = resolve13(validatorsRoot, category.name);
     for (const entry of readdirSync(categoryDir, { withFileTypes: true })) {
       if (!entry.isFile() || !entry.name.endsWith(".ts"))
         continue;
@@ -3603,7 +3754,7 @@ function collectRigValidatorBuildTargets(input) {
         continue;
       targets.push({
         source: `packages/runtime/src/control-plane/validators/${category.name}/${entry.name}`,
-        dest: resolve12(input.imageDir, `bin/validators/${category.name}-${check}`),
+        dest: resolve13(input.imageDir, `bin/validators/${category.name}-${check}`),
         cwd: input.hostProjectRoot
       });
     }
@@ -3612,16 +3763,16 @@ function collectRigValidatorBuildTargets(input) {
 }
 async function findLatestDistBinary(projectRoot) {
   const distRoot = resolveControlPlaneHostDistDir(projectRoot);
-  if (!existsSync7(distRoot)) {
+  if (!existsSync8(distRoot)) {
     return null;
   }
   const entries = readdirSync(distRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.startsWith("rig-")).map((entry) => ({
     name: entry.name,
-    mtimeMs: statSync(resolve12(distRoot, entry.name)).mtimeMs
+    mtimeMs: statSync(resolve13(distRoot, entry.name)).mtimeMs
   })).sort((a, b) => b.mtimeMs - a.mtimeMs || b.name.localeCompare(a.name));
   for (const { name } of entries) {
-    const candidate = resolve12(distRoot, name, "bin", "rig");
-    if (existsSync7(candidate) && await isRunnableRigBinary(candidate, projectRoot)) {
+    const candidate = resolve13(distRoot, name, "bin", "rig");
+    if (existsSync8(candidate) && await isRunnableRigBinary(candidate, projectRoot)) {
       return candidate;
     }
   }
@@ -3633,7 +3784,7 @@ async function isRunnableRigBinary(binaryPath, projectRoot) {
 async function runDistDoctor(projectRoot) {
   const bunPath = Bun.which("bun");
   const rigPath = Bun.which("rig");
-  const userBinDir = resolve12(homedir3(), ".local/bin");
+  const userBinDir = resolve13(homedir4(), ".local/bin");
   const userBinInPath = (process.env.PATH || "").split(":").filter(Boolean).includes(userBinDir);
   let rigRunnable = false;
   if (rigPath) {
@@ -3677,19 +3828,19 @@ async function executeDist(context, args) {
       requireNoExtraArgs(pending, "rig dist install [--scope user|system] [--path <dir>]");
       const scope = parseInstallScope(scopeResult.value);
       const installDir = resolveInstallDir(scope, pathResult.value);
-      mkdirSync5(installDir, { recursive: true });
+      mkdirSync6(installDir, { recursive: true });
       let source = await findLatestDistBinary(context.projectRoot);
       let buildDir = null;
       if (!source) {
-        buildDir = resolve12(resolveControlPlaneHostDistDir(context.projectRoot), `rig-install-${Date.now()}`);
+        buildDir = resolve13(resolveControlPlaneHostDistDir(context.projectRoot), `rig-install-${Date.now()}`);
         await context.runCommand(["bun", "run", "packages/cli/bin/build-rig-binaries.ts", "--output-dir", buildDir]);
-        source = resolve12(buildDir, "bin", "rig");
+        source = resolve13(buildDir, "bin", "rig");
       }
-      if (!existsSync7(source)) {
+      if (!existsSync8(source)) {
         throw new CliError2(`Unable to locate rig binary at ${source}.`, 2);
       }
-      const installedPath = resolve12(installDir, "rig");
-      if (existsSync7(installedPath)) {
+      const installedPath = resolve13(installDir, "rig");
+      if (existsSync8(installedPath)) {
         unlinkSync(installedPath);
       }
       copyFileSync2(source, installedPath);
@@ -3731,22 +3882,22 @@ async function executeDist(context, args) {
       requireNoExtraArgs(rest, "rig dist rebuild-agent");
       const fp = await computeRuntimeImageFingerprint(context.projectRoot);
       const currentId = computeRuntimeImageId(fp);
-      const imagesDir = resolve12(resolveControlPlaneMonorepoRuntimeDir(context.projectRoot), "images");
-      mkdirSync5(imagesDir, { recursive: true });
+      const imagesDir = resolve13(resolveControlPlaneMonorepoRuntimeDir(context.projectRoot), "images");
+      mkdirSync6(imagesDir, { recursive: true });
       let pruned = 0;
       for (const entry of readdirSync(imagesDir, { withFileTypes: true })) {
         if (entry.isDirectory() && entry.name !== currentId) {
-          rmSync3(resolve12(imagesDir, entry.name), { recursive: true, force: true });
+          rmSync3(resolve13(imagesDir, entry.name), { recursive: true, force: true });
           pruned++;
         }
       }
       if (pruned > 0 && context.outputMode === "text") {
         console.log(`Pruned ${pruned} stale image(s).`);
       }
-      const imageDir = resolve12(imagesDir, currentId);
-      mkdirSync5(resolve12(imageDir, "bin/hooks"), { recursive: true });
-      mkdirSync5(resolve12(imageDir, "bin/plugins"), { recursive: true });
-      mkdirSync5(resolve12(imageDir, "bin/validators"), { recursive: true });
+      const imageDir = resolve13(imagesDir, currentId);
+      mkdirSync6(resolve13(imageDir, "bin/hooks"), { recursive: true });
+      mkdirSync6(resolve13(imageDir, "bin/plugins"), { recursive: true });
+      mkdirSync6(resolve13(imageDir, "bin/validators"), { recursive: true });
       const hookNames = [
         "scope-guard",
         "import-guard",
@@ -3760,25 +3911,25 @@ async function executeDist(context, args) {
       ];
       const targets = [];
       const hostProjectRoot = process.env.RIG_HOST_PROJECT_ROOT?.trim() || context.projectRoot;
-      targets.push({ source: "packages/runtime/bin/rig-agent.ts", dest: resolve12(imageDir, "bin/rig-agent"), cwd: hostProjectRoot });
-      targets.push({ source: "packages/runtime/bin/rig-agent-dispatch.ts", dest: resolve12(resolveControlPlaneHostBinDir(context.projectRoot), "rig-agent"), cwd: hostProjectRoot });
+      targets.push({ source: "packages/runtime/bin/rig-agent.ts", dest: resolve13(imageDir, "bin/rig-agent"), cwd: hostProjectRoot });
+      targets.push({ source: "packages/runtime/bin/rig-agent-dispatch.ts", dest: resolve13(resolveControlPlaneHostBinDir(context.projectRoot), "rig-agent"), cwd: hostProjectRoot });
       for (const hookName of hookNames) {
         const src = `packages/runtime/src/control-plane/hooks/${hookName}.ts`;
-        targets.push({ source: src, dest: resolve12(imageDir, `bin/hooks/${hookName}`), cwd: hostProjectRoot });
-        targets.push({ source: src, dest: resolve12(resolveControlPlaneHostBinDir(context.projectRoot), `hooks/${hookName}`), cwd: hostProjectRoot });
-      }
-      const pluginsDir = resolve12(context.projectRoot, "rig/plugins");
-      const binPluginsDir = resolve12(resolveControlPlaneHostBinDir(context.projectRoot), "plugins");
-      const validatorsRoot = resolve12(hostProjectRoot, "packages/runtime/src/control-plane/validators");
-      const binValidatorsDir = resolve12(resolveControlPlaneHostBinDir(context.projectRoot), "validators");
-      mkdirSync5(binPluginsDir, { recursive: true });
-      mkdirSync5(binValidatorsDir, { recursive: true });
-      if (existsSync7(pluginsDir)) {
+        targets.push({ source: src, dest: resolve13(imageDir, `bin/hooks/${hookName}`), cwd: hostProjectRoot });
+        targets.push({ source: src, dest: resolve13(resolveControlPlaneHostBinDir(context.projectRoot), `hooks/${hookName}`), cwd: hostProjectRoot });
+      }
+      const pluginsDir = resolve13(context.projectRoot, "rig/plugins");
+      const binPluginsDir = resolve13(resolveControlPlaneHostBinDir(context.projectRoot), "plugins");
+      const validatorsRoot = resolve13(hostProjectRoot, "packages/runtime/src/control-plane/validators");
+      const binValidatorsDir = resolve13(resolveControlPlaneHostBinDir(context.projectRoot), "validators");
+      mkdirSync6(binPluginsDir, { recursive: true });
+      mkdirSync6(binValidatorsDir, { recursive: true });
+      if (existsSync8(pluginsDir)) {
         for (const entry of readdirSync(pluginsDir, { withFileTypes: true })) {
           const m = entry.name.match(/^(.+)\.plugin\.(ts|js|mjs|cjs)$/);
           if (!m)
             continue;
-          targets.push({ source: `rig/plugins/${entry.name}`, dest: resolve12(imageDir, `bin/plugins/${m[1]}`), cwd: context.projectRoot });
+          targets.push({ source: `rig/plugins/${entry.name}`, dest: resolve13(imageDir, `bin/plugins/${m[1]}`), cwd: context.projectRoot });
         }
       }
       targets.push(...collectRigValidatorBuildTargets({ contextProjectRoot: context.projectRoot, hostProjectRoot, imageDir }));
@@ -3789,17 +3940,17 @@ async function executeDist(context, args) {
         const isValidator = dest.includes("/bin/validators/");
         await buildBinary2(source, dest, cwd, isValidator ? { AGENT_BUN_PATH: Bun.which("bun") || "bun" } : { AGENT_PROJECT_ROOT: context.projectRoot });
       }
-      if (existsSync7(pluginsDir)) {
+      if (existsSync8(pluginsDir)) {
         for (const entry of readdirSync(pluginsDir, { withFileTypes: true })) {
           const m = entry.name.match(/^(.+)\.plugin\.(ts|js|mjs|cjs)$/);
           if (!m)
             continue;
           const pluginName = m[1];
-          const imageBin = resolve12(imageDir, `bin/plugins/${pluginName}`);
+          const imageBin = resolve13(imageDir, `bin/plugins/${pluginName}`);
           if (!pluginName)
             continue;
-          const symlinkPath = resolve12(binPluginsDir, pluginName);
-          if (existsSync7(imageBin)) {
+          const symlinkPath = resolve13(binPluginsDir, pluginName);
+          if (existsSync8(imageBin)) {
             try {
               unlinkSync(symlinkPath);
             } catch {}
@@ -3807,10 +3958,10 @@ async function executeDist(context, args) {
           }
         }
       }
-      if (existsSync7(validatorsRoot)) {
+      if (existsSync8(validatorsRoot)) {
         const categories = readdirSync(validatorsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
         for (const category of categories) {
-          const categoryDir = resolve12(validatorsRoot, category.name);
+          const categoryDir = resolve13(validatorsRoot, category.name);
           for (const entry of readdirSync(categoryDir, { withFileTypes: true })) {
             if (!entry.isFile() || !entry.name.endsWith(".ts"))
               continue;
@@ -3818,9 +3969,9 @@ async function executeDist(context, args) {
             if (!check || check === "index" || check === "shared")
               continue;
             const validatorName = `${category.name}-${check}`;
-            const imageBin = resolve12(imageDir, `bin/validators/${validatorName}`);
-            const symlinkPath = resolve12(binValidatorsDir, validatorName);
-            if (existsSync7(imageBin)) {
+            const imageBin = resolve13(imageDir, `bin/validators/${validatorName}`);
+            const symlinkPath = resolve13(binValidatorsDir, validatorName);
+            if (existsSync8(imageBin)) {
               try {
                 unlinkSync(symlinkPath);
               } catch {}
@@ -3829,18 +3980,18 @@ async function executeDist(context, args) {
           }
         }
       }
-      const agentsDir = resolve12(resolveControlPlaneMonorepoRuntimeDir(context.projectRoot), "agents");
-      if (existsSync7(agentsDir)) {
+      const agentsDir = resolve13(resolveControlPlaneMonorepoRuntimeDir(context.projectRoot), "agents");
+      if (existsSync8(agentsDir)) {
         let relinkCount = 0;
         for (const agentEntry of readdirSync(agentsDir, { withFileTypes: true })) {
           if (!agentEntry.isDirectory())
             continue;
-          const agentBinDir = resolve12(agentsDir, agentEntry.name, "worktree", ".rig", "bin");
-          if (!existsSync7(agentBinDir))
+          const agentBinDir = resolve13(agentsDir, agentEntry.name, "worktree", ".rig", "bin");
+          if (!existsSync8(agentBinDir))
             continue;
           const walkDir = (dir) => {
             for (const entry of readdirSync(dir, { withFileTypes: true })) {
-              const fullPath = resolve12(dir, entry.name);
+              const fullPath = resolve13(dir, entry.name);
               if (entry.isDirectory()) {
                 walkDir(fullPath);
               } else if (entry.isSymbolicLink()) {
@@ -3874,8 +4025,8 @@ async function executeDist(context, args) {
 
 // packages/cli/src/commands/inbox.ts
 init_runner();
-import { writeFileSync as writeFileSync4 } from "fs";
-import { resolve as resolve13 } from "path";
+import { writeFileSync as writeFileSync5 } from "fs";
+import { resolve as resolve14 } from "path";
 import {
   listAuthorityRuns,
   readJsonlFile as readJsonlFile3,
@@ -4277,7 +4428,7 @@ async function listRemoteInboxRecords(context, kind, filters) {
 function listLocalInboxRecords(context, kind, filters) {
   const fileName = kind === "approvals" ? "approvals.jsonl" : "user-input.jsonl";
   const runs = listAuthorityRuns(context.projectRoot).filter((entry) => (!filters.run || entry.runId === filters.run) && (!filters.task || entry.taskId === filters.task));
-  return runs.flatMap((entry) => readJsonlFile3(resolve13(resolveAuthorityRunDir2(context.projectRoot, entry.runId), fileName)).map((record) => ({
+  return runs.flatMap((entry) => readJsonlFile3(resolve14(resolveAuthorityRunDir2(context.projectRoot, entry.runId), fileName)).map((record) => ({
     runId: entry.runId,
     taskId: entry.taskId ?? undefined,
     record
@@ -4325,11 +4476,11 @@ async function executeInbox(context, args) {
       if (isRemoteConnectionSelected(context.projectRoot)) {
         throw new CliError2("Remote approval resolution is not available from this CLI yet; use the server UI/API or switch to local state for direct JSONL edits.", 2);
       }
-      const approvalsPath = resolve13(resolveAuthorityRunDir2(context.projectRoot, run.value), "approvals.jsonl");
+      const approvalsPath = resolve14(resolveAuthorityRunDir2(context.projectRoot, run.value), "approvals.jsonl");
       const approvals = readJsonlFile3(approvalsPath);
       const resolvedAt = new Date().toISOString();
       const next = approvals.map((entry) => entry.requestId === request.value || entry.id === request.value ? { ...entry, status: "resolved", decision: decision.value, note: note4.value ?? null, resolvedAt } : entry);
-      writeFileSync4(approvalsPath, `${next.map((entry) => JSON.stringify(entry)).join(`
+      writeFileSync5(approvalsPath, `${next.map((entry) => JSON.stringify(entry)).join(`
 `)}
 `, "utf8");
       return { ok: true, group: "inbox", command, details: { runId: run.value, requestId: request.value, decision: decision.value } };
@@ -4381,11 +4532,11 @@ async function executeInbox(context, args) {
         const [key, ...restValue] = entry.split("=");
         return [key, restValue.join("=")];
       }));
-      const requestsPath = resolve13(resolveAuthorityRunDir2(context.projectRoot, run.value), "user-input.jsonl");
+      const requestsPath = resolve14(resolveAuthorityRunDir2(context.projectRoot, run.value), "user-input.jsonl");
       const requests = readJsonlFile3(requestsPath);
       const resolvedAt = new Date().toISOString();
       const next = requests.map((entry) => entry.requestId === request.value || entry.id === request.value ? { ...entry, status: "resolved", answers: parsedAnswers, respondedAt: resolvedAt, resolvedAt } : entry);
-      writeFileSync4(requestsPath, `${next.map((entry) => JSON.stringify(entry)).join(`
+      writeFileSync5(requestsPath, `${next.map((entry) => JSON.stringify(entry)).join(`
 `)}
 `, "utf8");
       return { ok: true, group: "inbox", command, details: { runId: run.value, requestId: request.value, answers: parsedAnswers } };
@@ -4397,16 +4548,16 @@ async function executeInbox(context, args) {
 
 // packages/cli/src/commands/init.ts
 init_runner();
-import { appendFileSync as appendFileSync2, existsSync as existsSync10, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
 import { spawnSync } from "child_process";
-import { resolve as resolve17 } from "path";
+import { resolve as resolve18 } from "path";
 import { buildRigInitConfigSource } from "@rig/core";
 import { listGitHubProjects as listGitHubProjectsDirect, resolveProjectStatusField as resolveProjectStatusFieldDirect } from "@rig/server";
 
 // packages/cli/src/commands/_pi-install.ts
-import { existsSync as existsSync8, readFileSync as readFileSync4, rmSync as rmSync4 } from "fs";
-import { homedir as homedir4 } from "os";
-import { resolve as resolve14 } from "path";
+import { existsSync as existsSync9, readFileSync as readFileSync5, rmSync as rmSync4 } from "fs";
+import { homedir as homedir5 } from "os";
+import { resolve as resolve15 } from "path";
 var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
 var LEGACY_PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
 var LEGACY_PI_RIG_MARKER = `// Managed by Rig. Source package: @rig/pi-rig.
@@ -4422,16 +4573,16 @@ async function defaultCommandRunner(command, options = {}) {
   return { exitCode, stdout, stderr };
 }
 function resolvePiRigExtensionPath(homeDir) {
-  return resolve14(homeDir, ".pi", "agent", "extensions", "pi-rig");
+  return resolve15(homeDir, ".pi", "agent", "extensions", "pi-rig");
 }
-function resolvePiRigPackageSource(projectRoot, exists = existsSync8) {
-  const localPackage = resolve14(projectRoot, "packages", "pi-rig");
-  if (exists(resolve14(localPackage, "package.json")))
+function resolvePiRigPackageSource(projectRoot, exists = existsSync9) {
+  const localPackage = resolve15(projectRoot, "packages", "pi-rig");
+  if (exists(resolve15(localPackage, "package.json")))
     return localPackage;
   return `npm:${PI_RIG_PACKAGE_NAME}`;
 }
 function resolvePiHomeDir(inputHomeDir) {
-  return inputHomeDir ?? process.env.RIG_PI_HOME_DIR?.trim() ?? homedir4();
+  return inputHomeDir ?? process.env.RIG_PI_HOME_DIR?.trim() ?? homedir5();
 }
 function piListContainsPiRig(output) {
   return output.split(/\r?\n/).some((line) => {
@@ -4477,13 +4628,13 @@ async function ensurePiBinaryAvailable(input) {
     ...next.exitCode === 0 ? {} : { error: (next.stderr || next.stdout).trim() || "pi --version failed after install" }
   };
 }
-function removeManagedLegacyPiRigBridge(homeDir, exists = existsSync8) {
+function removeManagedLegacyPiRigBridge(homeDir, exists = existsSync9) {
   const extensionPath = resolvePiRigExtensionPath(homeDir);
-  const indexPath = resolve14(extensionPath, "index.ts");
+  const indexPath = resolve15(extensionPath, "index.ts");
   if (!exists(indexPath))
     return;
   try {
-    const content = readFileSync4(indexPath, "utf8");
+    const content = readFileSync5(indexPath, "utf8");
     if (content === LEGACY_PI_RIG_MARKER || content.includes("Managed by Rig. Source package: @rig/pi-rig")) {
       rmSync4(extensionPath, { recursive: true, force: true });
     }
@@ -4499,13 +4650,13 @@ async function checkPiRigInstall(input = {}) {
       piRig: { ok: true, label: "pi-rig global extension", detail: extensionPath }
     };
   }
-  const exists = input.exists ?? existsSync8;
+  const exists = input.exists ?? existsSync9;
   const runner = input.commandRunner ?? defaultCommandRunner;
   const piResult = await safeRun(runner, ["pi", "--version"]);
   const piListResult = piResult.exitCode === 0 ? await safeRun(runner, ["pi", "list"]) : { exitCode: 1, stdout: "", stderr: "" };
   const listedPiRig = piListResult.exitCode === 0 && piListContainsPiRig(`${piListResult.stdout}
 ${piListResult.stderr}`);
-  const legacyBridge = exists(resolve14(extensionPath, "index.ts"));
+  const legacyBridge = exists(resolve15(extensionPath, "index.ts"));
   const hasPiRig = listedPiRig;
   return {
     extensionPath,
@@ -4582,7 +4733,7 @@ async function buildPiSetupChecks(input = {}) {
 
 // packages/cli/src/commands/_snapshot-upload.ts
 import { mkdir, readdir, readFile, writeFile } from "fs/promises";
-import { dirname as dirname2, resolve as resolve15, relative, sep } from "path";
+import { dirname as dirname3, resolve as resolve16, relative, sep } from "path";
 var SNAPSHOT_ARCHIVE_VERSION = 1;
 var SNAPSHOT_ARCHIVE_CONTENT_TYPE = "application/vnd.rig.snapshot+json";
 var DEFAULT_EXCLUDED_DIRECTORIES = new Set([
@@ -4604,15 +4755,15 @@ function assertManifestPath(root, relativePath) {
   if (!relativePath || relativePath.startsWith("/") || relativePath.includes("\x00")) {
     throw new Error(`Invalid snapshot path: ${relativePath}`);
   }
-  const resolved = resolve15(root, relativePath);
+  const resolved = resolve16(root, relativePath);
   const relativeToRoot = relative(root, resolved);
-  if (relativeToRoot.startsWith("..") || relativeToRoot === ".." || resolve15(relativeToRoot) === resolved) {
+  if (relativeToRoot.startsWith("..") || relativeToRoot === ".." || resolve16(relativeToRoot) === resolved) {
     throw new Error(`Snapshot path escapes project root: ${relativePath}`);
   }
   return resolved;
 }
 async function buildSnapshotUploadManifest(projectRoot, options = {}) {
-  const root = resolve15(projectRoot);
+  const root = resolve16(projectRoot);
   const excludedDirectories = [...new Set([
     ...DEFAULT_EXCLUDED_DIRECTORIES,
     ...options.excludedDirectories ?? []
@@ -4624,7 +4775,7 @@ async function buildSnapshotUploadManifest(projectRoot, options = {}) {
     for (const entry of entries) {
       if (entry.isDirectory() && excludedSet.has(entry.name))
         continue;
-      const fullPath = resolve15(dir, entry.name);
+      const fullPath = resolve16(dir, entry.name);
       if (entry.isDirectory()) {
         await visit(fullPath);
         continue;
@@ -4673,8 +4824,8 @@ async function uploadSnapshotArchiveViaServer(context, input) {
 
 // packages/cli/src/commands/_doctor-checks.ts
 init_runner();
-import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
-import { resolve as resolve16 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
+import { resolve as resolve17 } from "path";
 import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/runtime/control-plane/setup-version";
 init__parsers();
 function check(id, label, status, detail, remediation) {
@@ -4715,11 +4866,11 @@ function repoSlugFromConfig(config) {
 function loadFallbackConfig(projectRoot) {
   const candidates = ["rig.config.ts", "rig.config.mts", "rig.config.json"];
   for (const name of candidates) {
-    const path = resolve16(projectRoot, name);
-    if (!existsSync9(path))
+    const path = resolve17(projectRoot, name);
+    if (!existsSync10(path))
       continue;
     try {
-      const source = readFileSync5(path, "utf8");
+      const source = readFileSync6(path, "utf8");
       if (name.endsWith(".json"))
         return JSON.parse(source);
       const owner = source.match(/owner\s*:\s*["']([^"']+)["']/)?.[1];
@@ -4798,7 +4949,7 @@ async function runRigDoctorChecks(options) {
   checks.push(check("bun", `bun >= ${MIN_SUPPORTED_BUN_VERSION}`, isSupportedBunVersion(bunVersion) ? "pass" : "fail", `found ${bunVersion}`, `Install Bun ${MIN_SUPPORTED_BUN_VERSION} or newer.`), check("git", "git", which("git") ? "pass" : "fail", which("git") ?? undefined, "Install git and ensure it is on PATH."), check("jq", "jq", which("jq") ? "pass" : "warn", which("jq") ?? undefined, "Install jq (for example `brew install jq`)."));
   const loadedConfig = await loadConfig(projectRoot).catch(() => null);
   const config = loadedConfig ?? loadFallbackConfig(projectRoot);
-  const hasConfigFile = ["rig.config.ts", "rig.config.mts", "rig.config.json"].some((name) => existsSync9(resolve16(projectRoot, name)));
+  const hasConfigFile = ["rig.config.ts", "rig.config.mts", "rig.config.json"].some((name) => existsSync10(resolve17(projectRoot, name)));
   checks.push(config ? check("config", "rig.config loadable", "pass") : check("config", "rig.config loadable", hasConfigFile ? "fail" : "fail", hasConfigFile ? "config file exists but failed to load" : "missing rig.config.ts/json", "Run `rig init` or fix the config error."));
   const taskSourceKind = config?.taskSource?.kind;
   checks.push(taskSourceKind ? check("task-source", "task source configured", "pass", taskSourceKind) : check("task-source", "task source configured", "fail", "missing taskSource", "Configure taskSource in rig.config.ts."));
@@ -4917,20 +5068,20 @@ function parseRepoSlug(value) {
   return { owner: match[1], repo: match[2], slug: `${match[1]}/${match[2]}` };
 }
 function ensureRigPrivateDirs(projectRoot) {
-  const rigDir = resolve17(projectRoot, ".rig");
-  mkdirSync6(resolve17(rigDir, "state"), { recursive: true });
-  mkdirSync6(resolve17(rigDir, "logs"), { recursive: true });
-  mkdirSync6(resolve17(rigDir, "runs"), { recursive: true });
-  mkdirSync6(resolve17(rigDir, "tmp"), { recursive: true });
-  mkdirSync6(resolve17(projectRoot, "artifacts"), { recursive: true });
-  const taskConfigPath = resolve17(rigDir, "task-config.json");
-  if (!existsSync10(taskConfigPath))
-    writeFileSync5(taskConfigPath, `{}
+  const rigDir = resolve18(projectRoot, ".rig");
+  mkdirSync7(resolve18(rigDir, "state"), { recursive: true });
+  mkdirSync7(resolve18(rigDir, "logs"), { recursive: true });
+  mkdirSync7(resolve18(rigDir, "runs"), { recursive: true });
+  mkdirSync7(resolve18(rigDir, "tmp"), { recursive: true });
+  mkdirSync7(resolve18(projectRoot, "artifacts"), { recursive: true });
+  const taskConfigPath = resolve18(rigDir, "task-config.json");
+  if (!existsSync11(taskConfigPath))
+    writeFileSync6(taskConfigPath, `{}
 `, "utf-8");
 }
 function ensureGitignoreEntries(projectRoot) {
-  const path = resolve17(projectRoot, ".gitignore");
-  const existing = existsSync10(path) ? readFileSync6(path, "utf8") : "";
+  const path = resolve18(projectRoot, ".gitignore");
+  const existing = existsSync11(path) ? readFileSync7(path, "utf8") : "";
   const entries = [".rig/state/", ".rig/logs/", ".rig/runs/", ".rig/tmp/"];
   const missing = entries.filter((entry) => !existing.split(/\r?\n/).includes(entry));
   if (missing.length === 0)
@@ -4943,17 +5094,17 @@ function ensureGitignoreEntries(projectRoot) {
 `, "utf8");
 }
 function ensureRigConfigPackageDependencies(projectRoot) {
-  const path = resolve17(projectRoot, "package.json");
-  const existing = existsSync10(path) ? JSON.parse(readFileSync6(path, "utf8")) : {};
+  const path = resolve18(projectRoot, "package.json");
+  const existing = existsSync11(path) ? JSON.parse(readFileSync7(path, "utf8")) : {};
   const devDependencies = existing.devDependencies && typeof existing.devDependencies === "object" && !Array.isArray(existing.devDependencies) ? { ...existing.devDependencies } : {};
   for (const [name, spec] of Object.entries(RIG_CONFIG_DEV_DEPENDENCIES)) {
     devDependencies[name] = spec;
   }
   const next = {
-    ...existsSync10(path) ? existing : { name: "rig-project", private: true },
+    ...existsSync11(path) ? existing : { name: "rig-project", private: true },
     devDependencies
   };
-  writeFileSync5(path, `${JSON.stringify(next, null, 2)}
+  writeFileSync6(path, `${JSON.stringify(next, null, 2)}
 `, "utf8");
 }
 function applyGitHubProjectConfig(source, options) {
@@ -5202,7 +5353,7 @@ async function promptGitHubProjectConfig(context, prompts, repoSlug, githubToken
   };
 }
 function sleep2(ms) {
-  return new Promise((resolve18) => setTimeout(resolve18, ms));
+  return new Promise((resolve19) => setTimeout(resolve19, ms));
 }
 function positiveIntFromEnv(name, fallback) {
   const value = Number.parseInt(process.env[name] ?? "", 10);
@@ -5231,7 +5382,7 @@ function remoteGitHubAuthMetadata(payload) {
   };
 }
 function writeRemoteGitHubAuthState(projectRoot, input) {
-  writeFileSync5(resolve17(projectRoot, ".rig", "state", "github-auth.json"), `${JSON.stringify({
+  writeFileSync6(resolve18(projectRoot, ".rig", "state", "github-auth.json"), `${JSON.stringify({
     authenticated: true,
     source: input.source,
     storedOnServer: true,
@@ -5288,9 +5439,9 @@ async function runControlPlaneInit(context, options) {
   });
   ensureRigPrivateDirs(projectRoot);
   ensureGitignoreEntries(projectRoot);
-  const configTsPath = resolve17(projectRoot, "rig.config.ts");
-  const configJsonPath = resolve17(projectRoot, "rig.config.json");
-  const configExists = existsSync10(configTsPath) || existsSync10(configJsonPath);
+  const configTsPath = resolve18(projectRoot, "rig.config.ts");
+  const configJsonPath = resolve18(projectRoot, "rig.config.json");
+  const configExists = existsSync11(configTsPath) || existsSync11(configJsonPath);
   if (!options.privateStateOnly) {
     if (configExists && !options.repair) {
       if (context.outputMode !== "json")
@@ -5302,11 +5453,11 @@ async function runControlPlaneInit(context, options) {
         taskSource: { kind: "github-issues", owner: repo.owner, repo: repo.repo },
         useStandardPlugin: true
       }), options);
-      writeFileSync5(configTsPath, source, "utf-8");
+      writeFileSync6(configTsPath, source, "utf-8");
     }
     ensureRigConfigPackageDependencies(projectRoot);
   }
-  writeFileSync5(resolve17(projectRoot, ".rig", "state", "project-link.json"), `${JSON.stringify({ repoSlug: repo.slug, connection: connectionAlias, linkedAt: new Date().toISOString() }, null, 2)}
+  writeFileSync6(resolve18(projectRoot, ".rig", "state", "project-link.json"), `${JSON.stringify({ repoSlug: repo.slug, connection: connectionAlias, linkedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
   const checkout = checkoutForInit(projectRoot, serverKind, options.remoteCheckout);
   let uploadedSnapshot = null;
@@ -5502,7 +5653,7 @@ function parseInitOptions(args) {
 async function runInteractiveControlPlaneInit(context, prompts) {
   prompts.intro?.("Initialize a Rig control-plane project");
   const projectRoot = context.projectRoot;
-  const existingConfig = existsSync10(resolve17(projectRoot, "rig.config.ts")) || existsSync10(resolve17(projectRoot, "rig.config.json"));
+  const existingConfig = existsSync11(resolve18(projectRoot, "rig.config.ts")) || existsSync11(resolve18(projectRoot, "rig.config.json"));
   let repair = false;
   let privateStateOnly = false;
   if (existingConfig) {
@@ -5805,8 +5956,8 @@ async function executeDoctor(context, args) {
 
 // packages/cli/src/commands/_run-driver-helpers.ts
 init_runner();
-import { readFileSync as readFileSync7 } from "fs";
-import { resolve as resolve18 } from "path";
+import { readFileSync as readFileSync8 } from "fs";
+import { resolve as resolve19 } from "path";
 import {
   appendJsonlRecord as appendJsonlRecord2,
   readAuthorityRun as readAuthorityRun2,
@@ -5826,7 +5977,7 @@ function patchAuthorityRun(projectRoot, runId, patch) {
     ...patch,
     updatedAt: new Date().toISOString()
   };
-  writeJsonFile4(resolve18(resolveAuthorityRunDir3(projectRoot, runId), "run.json"), next);
+  writeJsonFile4(resolve19(resolveAuthorityRunDir3(projectRoot, runId), "run.json"), next);
   return next;
 }
 function touchAuthorityRun(projectRoot, runId) {
@@ -5834,21 +5985,21 @@ function touchAuthorityRun(projectRoot, runId) {
   if (!current) {
     return;
   }
-  writeJsonFile4(resolve18(resolveAuthorityRunDir3(projectRoot, runId), "run.json"), {
+  writeJsonFile4(resolve19(resolveAuthorityRunDir3(projectRoot, runId), "run.json"), {
     ...current,
     updatedAt: new Date().toISOString()
   });
 }
 function appendRunTimeline(projectRoot, runId, value) {
-  appendJsonlRecord2(resolve18(resolveAuthorityRunDir3(projectRoot, runId), "timeline.jsonl"), value);
+  appendJsonlRecord2(resolve19(resolveAuthorityRunDir3(projectRoot, runId), "timeline.jsonl"), value);
   touchAuthorityRun(projectRoot, runId);
 }
 function appendRunLog(projectRoot, runId, value) {
-  appendJsonlRecord2(resolve18(resolveAuthorityRunDir3(projectRoot, runId), "logs.jsonl"), value);
+  appendJsonlRecord2(resolve19(resolveAuthorityRunDir3(projectRoot, runId), "logs.jsonl"), value);
   touchAuthorityRun(projectRoot, runId);
 }
 function appendRunAction(projectRoot, runId, value) {
-  appendJsonlRecord2(resolve18(resolveAuthorityRunDir3(projectRoot, runId), "timeline.jsonl"), {
+  appendJsonlRecord2(resolve19(resolveAuthorityRunDir3(projectRoot, runId), "timeline.jsonl"), {
     id: value.id,
     type: "action",
     actionType: value.actionType,
@@ -5919,7 +6070,7 @@ function buildRunPrompt(input) {
   })();
   const scopeText = (() => {
     try {
-      const parsed = JSON.parse(readFileSync7(resolveControlPlaneTaskConfigPath(input.projectRoot), "utf8"));
+      const parsed = JSON.parse(readFileSync8(resolveControlPlaneTaskConfigPath(input.projectRoot), "utf8"));
       const entry = parsed[input.taskId] ?? {};
       const scope = Array.isArray(entry.scope) ? entry.scope.filter((item) => typeof item === "string") : [];
       const validation = Array.isArray(entry.validation) ? entry.validation.filter((item) => typeof item === "string") : [];
@@ -6033,8 +6184,8 @@ function renderSourceScopeValidation(task, validation) {
 
 // packages/cli/src/commands/inspect.ts
 init_runner();
-import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
-import { resolve as resolve19 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
+import { resolve as resolve20 } from "path";
 import {
   listAuthorityRuns as listAuthorityRuns2,
   readAuthorityRun as readAuthorityRun3,
@@ -6053,10 +6204,27 @@ async function executeInspect(context, args) {
       const requiredTask = requireTask(task, "rig inspect logs --task <task-id>");
       const latestRun = listAuthorityRuns2(context.projectRoot).map((entry) => readAuthorityRun3(context.projectRoot, entry.runId)).filter((run) => Boolean(run)).filter((run) => run.taskId === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
       if (!latestRun) {
-        throw new CliError2(`No runs found for ${requiredTask}.`);
+        const serverRuns = await listRunsViaServer(context, { limit: 200 }).catch(() => []);
+        const serverRun = serverRuns.filter((run) => String(run.taskId ?? "") === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
+        if (!serverRun || typeof serverRun.runId !== "string") {
+          throw new CliError2(`No runs found for ${requiredTask} (local or on the selected server).`);
+        }
+        const page = await getRunLogsViaServer(context, serverRun.runId, { limit: 500 });
+        const entries = Array.isArray(page.entries) ? page.entries : [];
+        if (context.outputMode === "text") {
+          for (const entry of entries) {
+            const record = entry && typeof entry === "object" ? entry : {};
+            const title = String(record.title ?? "");
+            const detail = String(record.detail ?? "");
+            console.log([title, detail].filter(Boolean).join(" \u2014 "));
+          }
+          if (entries.length === 0)
+            console.log(`(no log entries for run ${serverRun.runId})`);
+        }
+        return { ok: true, group: "inspect", command, details: { task: requiredTask, runId: serverRun.runId, source: "server", entries } };
       }
-      const logsPath = resolve19(resolveAuthorityRunDir4(context.projectRoot, latestRun.runId), "logs.jsonl");
-      if (!existsSync11(logsPath)) {
+      const logsPath = resolve20(resolveAuthorityRunDir4(context.projectRoot, latestRun.runId), "logs.jsonl");
+      if (!existsSync12(logsPath)) {
         throw new CliError2(`No logs found for run ${latestRun.runId}.`);
       }
       await context.runCommand(["cat", logsPath]);
@@ -6066,7 +6234,7 @@ async function executeInspect(context, args) {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
       requireNoExtraArgs(remaining, "rig inspect artifacts --task <task-id>");
       const requiredTask = requireTask(task, "rig inspect artifacts --task <task-id>");
-      const artifactRoot = resolveTaskArtifactDirs(context.projectRoot, requiredTask).find((path) => existsSync11(path));
+      const artifactRoot = resolveTaskArtifactDirs(context.projectRoot, requiredTask).find((path) => existsSync12(path));
       if (!artifactRoot) {
         throw new CliError2(`No artifacts found for ${requiredTask}.`);
       }
@@ -6123,10 +6291,10 @@ async function executeInspect(context, args) {
     case "failures": {
       requireNoExtraArgs(rest, "rig inspect failures");
       const failed = resolveHarnessPaths2(context.projectRoot).failedApproachesPath;
-      if (!existsSync11(failed)) {
+      if (!existsSync12(failed)) {
         console.log("No failures recorded.");
       } else {
-        process.stdout.write(readFileSync8(failed, "utf-8"));
+        process.stdout.write(readFileSync9(failed, "utf-8"));
       }
       return { ok: true, group: "inspect", command };
     }
@@ -6143,11 +6311,11 @@ async function executeInspect(context, args) {
       return { ok: true, group: "inspect", command };
     case "audit": {
       requireNoExtraArgs(rest, "rig inspect audit");
-      const auditPath = resolve19(resolveHarnessPaths2(context.projectRoot).logsDir, "audit.jsonl");
-      if (!existsSync11(auditPath)) {
+      const auditPath = resolve20(resolveHarnessPaths2(context.projectRoot).logsDir, "audit.jsonl");
+      if (!existsSync12(auditPath)) {
         console.log("No audit log found.");
       } else {
-        const lines = readFileSync8(auditPath, "utf-8").split(/\r?\n/).filter(Boolean).slice(-20);
+        const lines = readFileSync9(auditPath, "utf-8").split(/\r?\n/).filter(Boolean).slice(-20);
         for (const line of lines) {
           console.log(line);
         }
@@ -7338,7 +7506,38 @@ function parseWsPayload(message2) {
     return JSON.parse(message2.data);
   return JSON.parse(Buffer.from(message2.data).toString("utf8"));
 }
-async function connectWorkerStream(options, ctx, state) {
+var BRIDGE_LOCAL_COMMANDS = new Set(["detach", "quit", "q", "stop"]);
+function registerDaemonCommandsNatively(pi, options, ctx, state, commands, registered) {
+  for (const command of commands) {
+    const record = recordOf(command);
+    const name = typeof record?.name === "string" ? record.name : "";
+    if (!name || registered.has(name) || BRIDGE_LOCAL_COMMANDS.has(name))
+      continue;
+    registered.add(name);
+    const description = typeof record?.description === "string" ? record.description : undefined;
+    const source = typeof record?.source === "string" ? record.source : "worker";
+    try {
+      pi.registerCommand(name, {
+        description: `[worker ${source}] ${description ?? ""}`.trim(),
+        handler: async (args) => {
+          const text2 = `/${name}${args ? ` ${args}` : ""}`;
+          appendTranscript(state, "You", text2);
+          try {
+            const result = await runRunPiCommandViaServer(options.context, options.runId, text2);
+            const message2 = typeof result.message === "string" ? result.message : "worker command accepted";
+            appendTranscript(state, "System", message2);
+            if (state.nativeStream)
+              ctx.ui.notify(message2, "info");
+          } catch (error) {
+            reportBridgeError(ctx, state, error instanceof Error ? error.message : String(error));
+          }
+          updatePiUi(ctx, state);
+        }
+      });
+    } catch {}
+  }
+}
+async function connectWorkerStream(options, pi, ctx, state, registeredDaemonCommands) {
   const ready = await waitForWorkerReady(options, ctx, state);
   if (!ready)
     return;
@@ -7346,7 +7545,7 @@ async function connectWorkerStream(options, ctx, state) {
   const buffered = [];
   const wsUrl = await buildRunPiEventsWebSocketUrl(options.context, options.runId);
   const socket = new WebSocket(wsUrl);
-  const closePromise = new Promise((resolve20) => {
+  const closePromise = new Promise((resolve21) => {
     socket.onopen = () => {
       state.wsConnected = true;
       state.status = "live worker Pi WebSocket connected";
@@ -7371,7 +7570,7 @@ async function connectWorkerStream(options, ctx, state) {
       state.wsConnected = false;
       state.status = "worker Pi WebSocket disconnected";
       updatePiUi(ctx, state);
-      resolve20();
+      resolve21();
     };
   });
   try {
@@ -7393,6 +7592,7 @@ async function connectWorkerStream(options, ctx, state) {
       const record = recordOf(command);
       return typeof record?.name === "string" ? [`/${record.name}`] : [];
     });
+    registerDaemonCommandsNatively(pi, options, ctx, state, commands, registeredDaemonCommands);
     catchupDone = true;
     for (const payload of buffered.splice(0))
       applyEnvelope(ctx, state, payload);
@@ -7407,11 +7607,11 @@ async function connectWorkerStream(options, ctx, state) {
 function createRemoteBashOperations(options, state, excludeFromContext) {
   return {
     exec(command, _cwd, execOptions) {
-      return new Promise((resolve20, reject) => {
+      return new Promise((resolve21, reject) => {
         const pending = {
           command,
           onData: execOptions.onData,
-          resolve: resolve20,
+          resolve: resolve21,
           reject,
           sawChunk: false
         };
@@ -7520,6 +7720,7 @@ function createRigWorkerPiBridgeExtension(options) {
     };
     if (options.initialMessageSent)
       appendTranscript(state, "System", "Initial message sent to worker Pi daemon.");
+    const registeredDaemonCommands = new Set;
     let nativePiUiContextAvailable = false;
     pi.on("user_bash", (event) => {
       state.nativeStream = Boolean(state.nativeStream || nativePiUiContextAvailable);
@@ -7552,7 +7753,7 @@ function createRigWorkerPiBridgeExtension(options) {
         });
         return { consume: true };
       });
-      connectWorkerStream(options, ctx, state).catch((error) => {
+      connectWorkerStream(options, pi, ctx, state, registeredDaemonCommands).catch((error) => {
         appendTranscript(state, "Error", error instanceof Error ? error.message : String(error));
         updatePiUi(ctx, state);
       });
@@ -7599,8 +7800,6 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-tools",
       "--no-builtin-tools",
       "--no-skills",
-      "--no-prompt-templates",
-      "--no-themes",
       "--no-context-files",
       "--no-approve"
     ], {
@@ -8074,6 +8273,33 @@ async function executeRun(context, args) {
       }
       return { ok: true, group: "run", command, details: restarted };
     }
+    case "steer": {
+      const runOption = takeOption(rest, "--run");
+      const messageOption = takeOption(runOption.rest, "--message");
+      const shortMessageOption = takeOption(messageOption.rest, "-m");
+      const positionalRunId = shortMessageOption.rest.length > 0 ? shortMessageOption.rest[0] : undefined;
+      const extra = positionalRunId ? shortMessageOption.rest.slice(1) : shortMessageOption.rest;
+      requireNoExtraArgs(extra, "rig run steer [<run-id>|--run <id>] --message <text>");
+      const runId = runOption.value ?? positionalRunId;
+      const message2 = messageOption.value ?? shortMessageOption.value;
+      if (!runId) {
+        throw new CliError2("run steer requires a run id (positional or --run <id>).", 2);
+      }
+      if (!message2?.trim()) {
+        throw new CliError2("run steer requires --message <text>.", 2);
+      }
+      if (context.dryRun) {
+        if (context.outputMode === "text") {
+          console.log(`[dry-run] rig run steer ${runId} --message ${JSON.stringify(message2)}`);
+        }
+        return { ok: true, group: "run", command, details: { runId, dryRun: true } };
+      }
+      await steerRunViaServer(context, runId, message2.trim());
+      if (context.outputMode === "text") {
+        console.log(`Steering message queued for ${runId}.`);
+      }
+      return { ok: true, group: "run", command, details: { runId, queued: true } };
+    }
     case "stop": {
       const runOption = takeOption(rest, "--run");
       const positionalRunId = runOption.rest.length > 0 ? runOption.rest[0] : undefined;
@@ -8118,6 +8344,7 @@ async function executeRun(context, args) {
 
 // packages/cli/src/commands/server.ts
 init_runner();
+import { resolveRigServerCommand } from "@rig/runtime/local-server";
 async function executeServer(context, args, options) {
   const [command = "status", ...rest] = args;
   if (["status", "list", "add", "use"].includes(command)) {
@@ -8135,7 +8362,8 @@ async function executeServer(context, args, options) {
       const authTokenResult = takeOption(pending, "--auth-token");
       pending = authTokenResult.rest;
       requireNoExtraArgs(pending, "rig server start [--host <host>] [--port <n>] [--poll-ms <n>] [--auth-token <token>]");
-      const commandParts = ["rig-server", "start"];
+      const serverCommand = resolveRigServerCommand(context.projectRoot);
+      const commandParts = [serverCommand.command, ...serverCommand.commandArgs, "start"];
       if (hostResult.value) {
         commandParts.push("--host", hostResult.value);
       }
@@ -8158,7 +8386,8 @@ async function executeServer(context, args, options) {
       const eventResult = takeOption(pending, "--event");
       pending = eventResult.rest;
       requireNoExtraArgs(pending, "rig server notify-test [--event <type>]");
-      const commandParts = ["rig-server", "notify-test"];
+      const serverCommand = resolveRigServerCommand(context.projectRoot);
+      const commandParts = [serverCommand.command, ...serverCommand.commandArgs, "notify-test"];
       if (eventResult.value) {
         commandParts.push("--event", eventResult.value);
       }
@@ -8220,9 +8449,9 @@ async function executeServer(context, args, options) {
 
 // packages/cli/src/commands/task.ts
 init_runner();
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync10 } from "fs";
 import { spawnSync as spawnSync3 } from "child_process";
-import { resolve as resolve20 } from "path";
+import { resolve as resolve21 } from "path";
 import { cancel as cancel4, confirm as confirm2, isCancel as isCancel4 } from "@clack/prompts";
 import {
   taskArtifactDir,
@@ -8400,6 +8629,7 @@ var PRIMARY_GROUPS = [
       { command: "show <id>|--run <id> [--raw]", description: "Show a human run summary; --raw prints the full payload.", primary: true },
       { command: "attach <run-id>|--run <id> [--follow]", description: "Attach to the run; --follow launches native bundled Pi for live Pi runs.", primary: true },
       { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
+      { command: "steer <run-id> --message <text>", description: "Queue a steering message into a live worker without attaching." },
       { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events." },
       { command: "resume", description: "Resume the most recent interrupted local run." },
       { command: "restart", description: "Restart the most recent local run from a clean runtime." },
@@ -8501,6 +8731,19 @@ var ADVANCED_GROUPS = [
       { command: "hp-next <dev|check|e2e|reset>", description: "Drive the hp-next browser test harness." }
     ]
   },
+  {
+    name: "pi",
+    summary: "Manage Pi extension packages for this project (community extensions from npm/git).",
+    usage: ["rig pi <list|add|remove|search> [args]"],
+    commands: [
+      { command: "list", description: "Show project and user Pi extension packages." },
+      { command: "add <source>", description: "Add an npm/git Pi extension to .pi/settings.json (auto-installs at next session)." },
+      { command: "remove <source>", description: "Remove an operator-added Pi extension." },
+      { command: "search [term]", description: "Discover Pi extension packages on the npm registry." }
+    ],
+    examples: ["rig pi search subagents", "rig pi add pi-subagents", "rig pi list"],
+    next: ["Config-managed extensions: declare `runtime: { pi: { packages: [...] } }` in rig.config.ts \u2014 workers pick them up automatically."]
+  },
   {
     name: "plugin",
     summary: "Plugin listing, validation, and plugin-contributed commands.",
@@ -8931,7 +9174,7 @@ async function executeTask(context, args, options) {
       const fileFlag = takeOption(rest.slice(1), "--file");
       let content;
       if (fileFlag.value) {
-        content = readFileSync9(resolve20(context.projectRoot, fileFlag.value), "utf-8");
+        content = readFileSync10(resolve21(context.projectRoot, fileFlag.value), "utf-8");
       } else {
         content = await readStdin();
       }
@@ -9165,8 +9408,8 @@ async function executeTask(context, args, options) {
 
 // packages/cli/src/commands/task-run-driver.ts
 init_runner();
-import { copyFileSync as copyFileSync3, existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
-import { resolve as resolve21 } from "path";
+import { copyFileSync as copyFileSync3, existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
+import { resolve as resolve22 } from "path";
 import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
 import { loadConfig as loadConfig2 } from "@rig/core/load-config";
@@ -9249,12 +9492,12 @@ function copyUntrackedDirtyFiles(sourceRoot, targetRoot) {
     return 0;
   let copied = 0;
   for (const relativePath of listed.stdout.split("\x00").filter(Boolean)) {
-    const sourcePath = resolve21(sourceRoot, relativePath);
-    const targetPath = resolve21(targetRoot, relativePath);
+    const sourcePath = resolve22(sourceRoot, relativePath);
+    const targetPath = resolve22(targetRoot, relativePath);
     try {
       if (!statSync2(sourcePath).isFile())
         continue;
-      mkdirSync7(resolve21(targetPath, ".."), { recursive: true });
+      mkdirSync8(resolve22(targetPath, ".."), { recursive: true });
       copyFileSync3(sourcePath, targetPath);
       copied += 1;
     } catch {}
@@ -9293,7 +9536,7 @@ function buildDirtyBaselineHandshakeEnv(input) {
     return { RIG_BASELINE_MODE: input.baselineMode ?? "head" };
   return {
     RIG_BASELINE_MODE: "dirty-snapshot",
-    RIG_DIRTY_BASELINE_READY_FILE: resolve21(input.projectRoot, ".rig", "runs", input.runId, "dirty-baseline.ready.json")
+    RIG_DIRTY_BASELINE_READY_FILE: resolve22(input.projectRoot, ".rig", "runs", input.runId, "dirty-baseline.ready.json")
   };
 }
 function positiveInt(value, fallback) {
@@ -9404,9 +9647,9 @@ function createCommandRunner(binary) {
     const stderrChunks = [];
     child.stdout.on("data", (chunk) => stdoutChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk))));
     child.stderr.on("data", (chunk) => stderrChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk))));
-    return await new Promise((resolve22) => {
-      child.once("error", (error) => resolve22({ exitCode: 1, stderr: error.message }));
-      child.once("close", (code) => resolve22({
+    return await new Promise((resolve23) => {
+      child.once("error", (error) => resolve23({ exitCode: 1, stderr: error.message }));
+      child.once("close", (code) => resolve23({
         exitCode: code ?? 1,
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr: Buffer.concat(stderrChunks).toString("utf8")
@@ -9480,7 +9723,7 @@ async function runTaskRunPostValidationLifecycle(input) {
     config,
     sourceTask: input.sourceTask,
     uploadedSnapshot: input.uploadedSnapshot,
-    artifactRoot: resolve21(input.projectRoot, "artifacts", taskId3),
+    artifactRoot: resolve22(input.projectRoot, "artifacts", taskId3),
     command: ghCommand,
     gitCommand,
     steerPi,
@@ -9610,7 +9853,7 @@ function summarizeValidationFailure(projectRoot, taskId3) {
     return null;
   }
   for (const artifactDir of resolveTaskArtifactDirs2(projectRoot, taskId3)) {
-    const summary = readJsonFile3(resolve21(artifactDir, "validation-summary.json"), null);
+    const summary = readJsonFile3(resolve22(artifactDir, "validation-summary.json"), null);
     if (!summary || summary.status !== "fail") {
       continue;
     }
@@ -9691,9 +9934,9 @@ function readTaskRunAcceptedArtifactState(input) {
   if (!input.taskId || !input.workspaceDir) {
     return { accepted: false, reason: null };
   }
-  const artifactDir = resolve21(input.workspaceDir, "artifacts", input.taskId);
-  const reviewStatusPath = resolve21(artifactDir, "review-status.txt");
-  const taskResultPath = resolve21(artifactDir, "task-result.json");
+  const artifactDir = resolve22(input.workspaceDir, "artifacts", input.taskId);
+  const reviewStatusPath = resolve22(artifactDir, "review-status.txt");
+  const taskResultPath = resolve22(artifactDir, "task-result.json");
   const reviewStatus = readTaskRunReviewStatus(reviewStatusPath);
   if (reviewStatus !== "APPROVED") {
     return { accepted: false, reason: null };
@@ -9730,12 +9973,12 @@ function resolveTaskRunRetryContext(input) {
   if (!input.taskId || !input.workspaceDir) {
     return { shouldRetry: false, failureDetail: null, nextPrompt: null };
   }
-  const artifactDir = resolve21(input.workspaceDir, "artifacts", input.taskId);
-  const reviewStatePath = resolve21(artifactDir, "review-state.json");
-  const reviewFeedbackPath = resolve21(artifactDir, "review-feedback.md");
-  const reviewStatusPath = resolve21(artifactDir, "review-status.txt");
-  const failedApproachesPath = resolve21(input.workspaceDir, ".rig", "state", "failed_approaches.md");
-  const validationSummaryPath = resolve21(artifactDir, "validation-summary.json");
+  const artifactDir = resolve22(input.workspaceDir, "artifacts", input.taskId);
+  const reviewStatePath = resolve22(artifactDir, "review-state.json");
+  const reviewFeedbackPath = resolve22(artifactDir, "review-feedback.md");
+  const reviewStatusPath = resolve22(artifactDir, "review-status.txt");
+  const failedApproachesPath = resolve22(input.workspaceDir, ".rig", "state", "failed_approaches.md");
+  const validationSummaryPath = resolve22(artifactDir, "validation-summary.json");
   const reviewState = readJsonFile3(reviewStatePath, null);
   const reviewStatus = readTaskRunReviewStatus(reviewStatusPath);
   const reviewRejected = isTaskRunReviewRejected(reviewState);
@@ -9921,11 +10164,11 @@ function appendToolTimelineFromLog(input) {
   });
 }
 function readTaskRunReviewStatus(reviewStatusPath) {
-  if (!existsSync12(reviewStatusPath)) {
+  if (!existsSync13(reviewStatusPath)) {
     return null;
   }
   try {
-    const status = readFileSync10(reviewStatusPath, "utf8").trim().toUpperCase();
+    const status = readFileSync11(reviewStatusPath, "utf8").trim().toUpperCase();
     return status === "APPROVED" || status === "REJECTED" ? status : null;
   } catch {
     return null;
@@ -10139,15 +10382,15 @@ async function executeRigOwnedTaskRun(context, input) {
   const loadedAutomationConfig = await loadTaskRunAutomationConfig(context.projectRoot);
   const automationConfig = input.prMode ? { ...loadedAutomationConfig ?? {}, pr: { ...loadedAutomationConfig?.pr ?? {}, mode: input.prMode } } : loadedAutomationConfig;
   const planningClassification = classifyPlanningNeed({ config: automationConfig, sourceTask });
-  const planningArtifactPath = resolve21("artifacts", runtimeTaskId, "implementation-plan.md");
+  const planningArtifactPath = resolve22("artifacts", runtimeTaskId, "implementation-plan.md");
   const persistedPlanning = {
     ...planningClassification,
     classifier: input.runtimeAdapter === "pi" ? "pi-rig-structured-policy" : "rig-structured-policy",
     artifactPath: planningClassification.planningRequired ? planningArtifactPath : null,
     classifiedAt: new Date().toISOString()
   };
-  mkdirSync7(resolve21(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
-  writeFileSync6(resolve21(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
+  mkdirSync8(resolve22(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
+  writeFileSync7(resolve22(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
 `, "utf8");
   patchAuthorityRun(context.projectRoot, input.runId, { planning: persistedPlanning });
   prompt = `${prompt}
@@ -10197,7 +10440,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
   let verificationStarted = false;
   let reviewStarted = false;
   let latestRuntimeWorkspace = resumeMode && typeof existingRunRecord?.worktreePath === "string" ? existingRunRecord.worktreePath : null;
-  let latestSessionDir = resumeMode && typeof existingRunRecord?.sessionPath === "string" ? resolve21(existingRunRecord.sessionPath, "..") : null;
+  let latestSessionDir = resumeMode && typeof existingRunRecord?.sessionPath === "string" ? resolve22(existingRunRecord.sessionPath, "..") : null;
   let latestLogsDir = resumeMode && typeof existingRunRecord?.logRoot === "string" ? existingRunRecord.logRoot : null;
   let latestProviderCommand = null;
   let latestRuntimeBranch = resumeMode && typeof existingRunRecord?.branch === "string" ? existingRunRecord.branch : null;
@@ -10283,10 +10526,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       patchAuthorityRun(context.projectRoot, input.runId, {
         status: "running",
         worktreePath: latestRuntimeWorkspace,
-        artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve21(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
+        artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve22(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
         logRoot: latestLogsDir,
-        sessionPath: latestSessionDir ? resolve21(latestSessionDir, "session.json") : null,
-        sessionLogPath: latestLogsDir ? resolve21(latestLogsDir, "agent-stdout.log") : null,
+        sessionPath: latestSessionDir ? resolve22(latestSessionDir, "session.json") : null,
+        sessionLogPath: latestLogsDir ? resolve22(latestLogsDir, "agent-stdout.log") : null,
         branch: runtimeId
       });
       if (!dirtyBaselineApplied && input.baselineMode === "dirty-snapshot" && latestRuntimeWorkspace) {
@@ -10294,8 +10537,8 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         const dirty = applyDirtyBaselineSnapshot({ sourceRoot: context.projectRoot, targetRoot: latestRuntimeWorkspace });
         const readyFile = childEnv.RIG_DIRTY_BASELINE_READY_FILE;
         if (readyFile) {
-          mkdirSync7(resolve21(readyFile, ".."), { recursive: true });
-          writeFileSync6(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
+          mkdirSync8(resolve22(readyFile, ".."), { recursive: true });
+          writeFileSync7(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
         }
         appendRunLog(context.projectRoot, input.runId, {
@@ -10679,7 +10922,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     let acceptedArtifactObservedAt = null;
     let acceptedArtifactPollTimer = null;
     let acceptedArtifactKillTimer = null;
-    const attemptExit = await new Promise((resolve22) => {
+    const attemptExit = await new Promise((resolve23) => {
       let settled = false;
       const settle = (result) => {
         if (settled)
@@ -10687,7 +10930,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         settled = true;
         if (acceptedArtifactPollTimer)
           clearInterval(acceptedArtifactPollTimer);
-        resolve22(result);
+        resolve23(result);
       };
       const pollAcceptedArtifacts = () => {
         const artifactState = readTaskRunAcceptedArtifactState({
@@ -10889,8 +11132,8 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
   }
   if (planningClassification.planningRequired) {
     const planWorkspace = latestRuntimeWorkspace ?? context.projectRoot;
-    const expectedPlanPath = resolve21(planWorkspace, planningArtifactPath);
-    if (!existsSync12(expectedPlanPath)) {
+    const expectedPlanPath = resolve22(planWorkspace, planningArtifactPath);
+    if (!existsSync13(expectedPlanPath)) {
       const failedAt = new Date().toISOString();
       const failureDetail = `Planning was required (${planningClassification.reason}) but ${planningArtifactPath} was not written before implementation completed.`;
       patchAuthorityRun(context.projectRoot, input.runId, {
@@ -11060,9 +11303,9 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       });
       emitServerRunEvent({ type: "log", runId: input.runId, title: "Pi PR feedback fix stderr" });
     });
-    const exitCode = await new Promise((resolve22) => {
-      child.once("error", () => resolve22(1));
-      child.once("close", (code) => resolve22(code ?? 1));
+    const exitCode = await new Promise((resolve23) => {
+      child.once("error", () => resolve23(1));
+      child.once("close", (code) => resolve23(code ?? 1));
     });
     for (const pendingLog of flushPendingClaudeToolUseLogs({
       runId: input.runId,
@@ -11204,8 +11447,8 @@ async function executeTest(context, args) {
 
 // packages/cli/src/commands/setup.ts
 init_runner();
-import { existsSync as existsSync13, mkdirSync as mkdirSync8, readdirSync as readdirSync2, writeFileSync as writeFileSync7 } from "fs";
-import { resolve as resolve22 } from "path";
+import { existsSync as existsSync14, mkdirSync as mkdirSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync8 } from "fs";
+import { resolve as resolve23 } from "path";
 import { createPluginHost } from "@rig/core";
 import {
   isSupportedBunVersion as isSupportedBunVersion2,
@@ -11260,12 +11503,12 @@ function runSetupInit(projectRoot) {
   const stateDir = resolveControlPlaneHostStateDir(projectRoot);
   const logsDir = resolveControlPlaneHostLogsDir(projectRoot);
   const artifactsDir = resolveControlPlaneArtifactsDir(projectRoot);
-  mkdirSync8(stateDir, { recursive: true });
-  mkdirSync8(logsDir, { recursive: true });
-  mkdirSync8(artifactsDir, { recursive: true });
-  const failuresPath = resolve22(stateDir, "failed_approaches.md");
-  if (!existsSync13(failuresPath)) {
-    writeFileSync7(failuresPath, `# Failed Approaches
+  mkdirSync9(stateDir, { recursive: true });
+  mkdirSync9(logsDir, { recursive: true });
+  mkdirSync9(artifactsDir, { recursive: true });
+  const failuresPath = resolve23(stateDir, "failed_approaches.md");
+  if (!existsSync14(failuresPath)) {
+    writeFileSync8(failuresPath, `# Failed Approaches
 
 `, "utf-8");
   }
@@ -11282,18 +11525,18 @@ async function runSetupCheck(projectRoot) {
 }
 async function runSetupPreflight(projectRoot) {
   await runSetupCheck(projectRoot);
-  const validationRoot = resolve22(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
-  if (existsSync13(validationRoot)) {
+  const validationRoot = resolve23(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
+  if (existsSync14(validationRoot)) {
     const validators = readdirSync2(validationRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
     for (const validator of validators) {
-      const script = resolve22(validationRoot, validator.name, "validate.sh");
-      if (existsSync13(script)) {
+      const script = resolve23(validationRoot, validator.name, "validate.sh");
+      if (existsSync14(script)) {
         console.log(`OK: validator script ${script}`);
       }
     }
   }
-  const hooksRoot = resolve22(resolveControlPlaneDefinitionRoot(projectRoot), "hooks");
-  if (existsSync13(hooksRoot)) {
+  const hooksRoot = resolve23(resolveControlPlaneDefinitionRoot(projectRoot), "hooks");
+  if (existsSync14(hooksRoot)) {
     const hooks = readdirSync2(hooksRoot).filter((name) => name.endsWith(".sh"));
     for (const hook of hooks) {
       console.log(`OK: hook ${hook}`);
@@ -11438,7 +11681,7 @@ var PROJECT_REQUIRED_GROUPS = new Set([
 ]);
 var RIG_CONFIG_FILENAMES = ["rig.config.ts", "rig.config.mts", "rig.config.json"];
 function hasInitializedRigProject(projectRoot) {
-  return RIG_CONFIG_FILENAMES.some((name) => existsSync14(resolve23(projectRoot, name))) || existsSync14(resolve23(projectRoot, ".rig"));
+  return RIG_CONFIG_FILENAMES.some((name) => existsSync15(resolve24(projectRoot, name))) || existsSync15(resolve24(projectRoot, ".rig"));
 }
 function requireInitializedRigProject(context, group) {
   if (hasInitializedRigProject(context.projectRoot)) {
@@ -11464,6 +11707,7 @@ var GROUPS = new Set([
   "review",
   "git",
   "harness",
+  "pi",
   "plugin",
   "queue",
   "agent",
@@ -11609,6 +11853,8 @@ async function executeGroup(context, group, args) {
       return executeGit(context, args);
     case "harness":
       return executeHarness(context, args);
+    case "pi":
+      return executePi(context, args);
     case "plugin":
       return executePlugin(context, args);
     case "queue":