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

package/dist/src/commands/pi.js

@@ -0,0 +1,168 @@
+// @bun
+// packages/cli/src/commands/pi.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { dirname, resolve } from "path";
+
+// packages/cli/src/runner.ts
+import { EventBus } from "@rig/runtime/control-plane/runtime/events";
+import { CliError } from "@rig/runtime/control-plane/errors";
+import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
+import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
+import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
+function requireNoExtraArgs(args, usage) {
+  if (args.length > 0) {
+    throw new CliError(`Unexpected arguments: ${args.join(" ")}
+Usage: ${usage}`);
+  }
+}
+
+// packages/cli/src/commands/pi.ts
+function settingsPath(root) {
+  return resolve(root, ".pi", "settings.json");
+}
+function userSettingsPath() {
+  return resolve(homedir(), ".pi", "agent", "settings.json");
+}
+function readJson(path, fallback) {
+  if (!existsSync(path))
+    return fallback;
+  try {
+    return JSON.parse(readFileSync(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) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(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 = resolve(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.`);
+  }
+}
+export {
+  executePi
+};

package/dist/src/commands/run.js

@@ -880,7 +880,38 @@ function parseWsPayload(message) {
     return JSON.parse(message.data);
   return JSON.parse(Buffer.from(message.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 text = `/${name}${args ? ` ${args}` : ""}`;
+          appendTranscript(state, "You", text);
+          try {
+            const result = await runRunPiCommandViaServer(options.context, options.runId, text);
+            const message = typeof result.message === "string" ? result.message : "worker command accepted";
+            appendTranscript(state, "System", message);
+            if (state.nativeStream)
+              ctx.ui.notify(message, "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;
@@ -935,6 +966,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);
@@ -1062,6 +1094,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);
@@ -1094,7 +1127,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);
       });
@@ -1141,8 +1174,6 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-tools",
       "--no-builtin-tools",
       "--no-skills",
-      "--no-prompt-templates",
-      "--no-themes",
       "--no-context-files",
       "--no-approve"
     ], {
@@ -1810,6 +1841,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 message = messageOption.value ?? shortMessageOption.value;
+      if (!runId) {
+        throw new CliError2("run steer requires a run id (positional or --run <id>).", 2);
+      }
+      if (!message?.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(message)}`);
+        }
+        return { ok: true, group: "run", command, details: { runId, dryRun: true } };
+      }
+      await steerRunViaServer(context, runId, message.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;

package/dist/src/commands/server.js

@@ -32,6 +32,9 @@ Usage: ${usage}`);
   }
 }
 
+// packages/cli/src/commands/server.ts
+import { resolveRigServerCommand } from "@rig/runtime/local-server";
+
 // packages/cli/src/commands/_authority-runs.ts
 import {
   readAuthorityRun,
@@ -483,7 +486,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);
       }
@@ -506,7 +510,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);
       }

package/dist/src/commands/task.js

@@ -1283,7 +1283,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 text = `/${name}${args ? ` ${args}` : ""}`;
+          appendTranscript(state, "You", text);
+          try {
+            const result = await runRunPiCommandViaServer(options.context, options.runId, text);
+            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;
@@ -1338,6 +1369,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);
@@ -1465,6 +1497,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);
@@ -1497,7 +1530,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);
       });
@@ -1544,8 +1577,6 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-tools",
       "--no-builtin-tools",
       "--no-skills",
-      "--no-prompt-templates",
-      "--no-themes",
       "--no-context-files",
       "--no-approve"
     ], {
@@ -1951,6 +1982,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." },
@@ -2052,6 +2084,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.",