@h-rig/cli 0.0.6-alpha.42 → 0.0.6-alpha.44

package/dist/src/index.js

@@ -3205,6 +3205,10 @@ async function getRunPiCommandsViaServer(context, runId) {
   const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/commands`);
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { commands: [] };
 }
+async function getRunPiCapabilitiesViaServer(context, runId) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/capabilities`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { capabilities: null };
+}
 async function sendRunPiPromptViaServer(context, runId, text2, streamingBehavior) {
   const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/prompt`, {
     method: "POST",
@@ -4444,7 +4448,7 @@ function formatSubmittedRun(input) {
     ...formatNextSteps([
       `Attach: \`rig run attach ${input.runId} --follow\``,
       `Inspect: \`rig run show ${input.runId}\``,
-      input.detached ? "Submitted detached; attach when you are ready." : "Interactive mode opens the native bundled Pi frontend."
+      input.detached ? "Submitted detached; attach when you are ready." : "Interactive mode opens the enriched bundled Pi (native UI + Rig layers, worker brain)."
     ])
   ].join(`
 `);
@@ -7386,7 +7390,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 
 // packages/cli/src/commands/_pi-remote-session.ts
-import { AgentSession as PiAgentSession } from "@earendil-works/pi-coding-agent";
+import { AgentSession as PiAgentSession, expandPromptTemplate } from "@earendil-works/pi-coding-agent";
 var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
 function defaultTransport() {
   return {
@@ -7394,6 +7398,7 @@ function defaultTransport() {
     getMessages: getRunPiMessagesViaServer,
     getStatus: getRunPiStatusViaServer,
     getCommands: getRunPiCommandsViaServer,
+    getCapabilities: getRunPiCapabilitiesViaServer,
     sendPrompt: sendRunPiPromptViaServer,
     sendShell: sendRunPiShellViaServer,
     runCommand: runRunPiCommandViaServer,
@@ -7481,16 +7486,18 @@ class RigRemoteSessionController {
         this.hooks.onStatusText?.("worker Pi WebSocket disconnected");
     };
     try {
-      const [messagesPayload, statusPayload, commandsPayload] = await Promise.all([
+      const [messagesPayload, statusPayload, commandsPayload, capabilitiesPayload] = await Promise.all([
         this.transport.getMessages(this.context, this.runId),
         this.transport.getStatus(this.context, this.runId),
-        this.transport.getCommands(this.context, this.runId)
+        this.transport.getCommands(this.context, this.runId),
+        this.transport.getCapabilities(this.context, this.runId).catch(() => ({ capabilities: null }))
       ]);
       const messages = Array.isArray(messagesPayload.messages) ? messagesPayload.messages : [];
       this.applyStatusPayload(statusPayload);
       this.session?.replaceRemoteMessages(messages);
       const commands = Array.isArray(commandsPayload.commands) ? commandsPayload.commands : [];
-      this.hooks.onCatchUp?.(messages, commands);
+      const capabilities = capabilitiesPayload.capabilities && typeof capabilitiesPayload.capabilities === "object" && !Array.isArray(capabilitiesPayload.capabilities) ? capabilitiesPayload.capabilities : null;
+      this.hooks.onCatchUp?.(messages, commands, capabilities);
       catchupDone = true;
       for (const payload of buffered.splice(0))
         this.applyEnvelope(payload);
@@ -7667,6 +7674,20 @@ class RigRemoteAgentSession extends PiAgentSession {
   replaceRemoteMessages(messages) {
     this.agent.state.messages = messages;
   }
+  async expandLocalInput(text2) {
+    let current = text2;
+    const runner = this.extensionRunner;
+    if (runner.hasHandlers("input")) {
+      const result = await runner.emitInput(current, undefined, "interactive");
+      if (result.action === "handled")
+        return null;
+      if (result.action === "transform")
+        current = result.text;
+    }
+    current = this._expandSkillCommand(current);
+    current = expandPromptTemplate(current, [...this.promptTemplates]);
+    return current;
+  }
   async prompt(text2, options) {
     const trimmed = text2.trim();
     if (!trimmed)
@@ -7674,6 +7695,15 @@ class RigRemoteAgentSession extends PiAgentSession {
     if (trimmed.startsWith("/")) {
       if (await this._tryExecuteExtensionCommand(trimmed))
         return;
+      const expanded2 = await this.expandLocalInput(trimmed);
+      if (expanded2 === null)
+        return;
+      if (expanded2 !== trimmed) {
+        const behavior2 = options?.streamingBehavior ?? (this.isStreaming || this.isCompacting ? "steer" : undefined);
+        options?.preflightResult?.(true);
+        await this.remote.sendPrompt(expanded2, behavior2);
+        return;
+      }
       await this.remote.sendCommand(trimmed);
       return;
     }
@@ -7681,21 +7711,30 @@ class RigRemoteAgentSession extends PiAgentSession {
       await this.remote.sendShell(trimmed);
       return;
     }
+    const expanded = await this.expandLocalInput(trimmed);
+    if (expanded === null)
+      return;
     const behavior = options?.streamingBehavior ?? (this.isStreaming || this.isCompacting ? "steer" : undefined);
     options?.preflightResult?.(true);
-    await this.remote.sendPrompt(trimmed, behavior);
+    await this.remote.sendPrompt(expanded, behavior);
   }
   async steer(text2) {
     const trimmed = text2.trim();
     if (trimmed.startsWith("/") && await this._tryExecuteExtensionCommand(trimmed))
       return;
-    await this.remote.sendPrompt(trimmed, "steer");
+    const expanded = await this.expandLocalInput(trimmed);
+    if (expanded === null)
+      return;
+    await this.remote.sendPrompt(expanded, "steer");
   }
   async followUp(text2) {
     const trimmed = text2.trim();
     if (trimmed.startsWith("/") && await this._tryExecuteExtensionCommand(trimmed))
       return;
-    await this.remote.sendPrompt(trimmed, "followUp");
+    const expanded = await this.expandLocalInput(trimmed);
+    if (expanded === null)
+      return;
+    await this.remote.sendPrompt(expanded, "followUp");
   }
   async abort() {
     await this.remote.abort();
@@ -7808,6 +7847,9 @@ function createRemoteBashOperations(controller, excludeFromContext) {
   };
 }
 
+// packages/cli/src/commands/_spinner.ts
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+
 // packages/cli/src/commands/_pi-worker-bridge-extension.ts
 function recordOf2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -7825,6 +7867,50 @@ function asText(value) {
     return String(value);
   }
 }
+function names(value, key = "name") {
+  if (!Array.isArray(value))
+    return [];
+  return value.flatMap((entry) => {
+    if (typeof entry === "string")
+      return [entry];
+    const record = recordOf2(entry);
+    const name = record?.[key];
+    return typeof name === "string" ? [name] : [];
+  });
+}
+function renderWorkerCapabilities(capabilities) {
+  const lines = ["Worker session capabilities (in effect for this run)"];
+  const tools = Array.isArray(capabilities.tools) ? capabilities.tools : [];
+  const activeTools = tools.flatMap((tool) => {
+    const record = recordOf2(tool);
+    return record && record.active === true && typeof record.name === "string" ? [record.name] : [];
+  });
+  const inactiveCount = tools.length - activeTools.length;
+  lines.push(`  tools       ${activeTools.join(", ") || "(none)"}${inactiveCount > 0 ? `  (+${inactiveCount} inactive)` : ""}`);
+  const extensions = Array.isArray(capabilities.extensions) ? capabilities.extensions : [];
+  const extensionLabels = extensions.flatMap((entry) => {
+    const record = recordOf2(entry);
+    if (!record)
+      return [];
+    const path = typeof record.path === "string" ? record.path : "";
+    const short = path.split("/").filter(Boolean).slice(-2).join("/") || path || "extension";
+    return [short];
+  });
+  lines.push(`  extensions  ${extensionLabels.join(", ") || "(none)"}`);
+  const hookEvents = names(capabilities.hookEvents);
+  const hookList = Array.isArray(capabilities.hookEvents) ? capabilities.hookEvents.map(asText).filter(Boolean) : hookEvents;
+  lines.push(`  hooks       ${hookList.join(", ") || "(none)"}`);
+  lines.push(`  skills      ${names(capabilities.skills).join(", ") || "(none)"}`);
+  lines.push(`  prompts     ${names(capabilities.prompts).join(", ") || "(none)"}`);
+  const model = typeof capabilities.model === "string" ? capabilities.model : "(unknown)";
+  const thinking = typeof capabilities.thinkingLevel === "string" ? capabilities.thinkingLevel : "";
+  const cwd = typeof capabilities.cwd === "string" ? capabilities.cwd : "";
+  lines.push(`  model       ${model}${thinking ? ` \xB7 ${thinking}` : ""}`);
+  if (cwd)
+    lines.push(`  cwd         ${cwd}`);
+  lines.push("  (worker commands are in your palette as [worker \u2026] \xB7 /worker shows this again)");
+  return lines;
+}
 async function answerExtensionUiRequest(options, ctx, request) {
   const requestId = String(request.requestId ?? request.id ?? `ui-${Date.now()}`);
   const method = String(request.method ?? request.type ?? "input");
@@ -7851,7 +7937,7 @@ async function answerExtensionUiRequest(options, ctx, request) {
     ctx.ui.notify(`Failed to answer worker UI request: ${error instanceof Error ? error.message : String(error)}`, "error");
   }
 }
-var LOCALLY_OWNED_COMMANDS = new Set(["detach", "quit", "q", "stop", "settings", "model", "thinking", "compact", "session", "name", "reload"]);
+var LOCALLY_OWNED_COMMANDS = new Set(["detach", "quit", "q", "stop", "worker", "settings", "model", "thinking", "compact", "session", "name", "reload"]);
 function registerDaemonCommands(pi, options, ctx, commands, registered) {
   for (const command of commands) {
     const record = recordOf2(command);
@@ -7879,6 +7965,21 @@ function registerDaemonCommands(pi, options, ctx, commands, registered) {
 function createRigWorkerPiBridgeExtension(options) {
   return (pi) => {
     const registeredDaemonCommands = new Set;
+    let capabilityLines = null;
+    let statusText = "connecting to worker session";
+    let busy = true;
+    let connected = false;
+    let frame = 0;
+    let spinnerTimer = null;
+    const renderStatus = (ctx) => {
+      const prefix = busy ? `${SPINNER_FRAMES[frame]} ` : connected ? "\u25CF " : "\u25CB ";
+      ctx.ui.setStatus("rig-worker-pi", `${prefix}${statusText}`);
+    };
+    const setStatus = (ctx, text2, isBusy) => {
+      statusText = text2;
+      busy = isBusy;
+      renderStatus(ctx);
+    };
     pi.registerCommand("detach", {
       description: "Detach from this run; the worker keeps going",
       handler: async (_args, ctx) => {
@@ -7894,31 +7995,57 @@ function createRigWorkerPiBridgeExtension(options) {
         ctx.shutdown();
       }
     });
+    pi.registerCommand("worker", {
+      description: "Show the worker session's real capabilities (tools, extensions, hooks, skills)",
+      handler: async (_args, ctx) => {
+        if (capabilityLines)
+          ctx.ui.setWidget("rig-worker-capabilities", capabilityLines, { placement: "aboveEditor" });
+        else
+          ctx.ui.notify("Worker capabilities are not available yet (still connecting).", "info");
+      }
+    });
     pi.on("user_bash", (event) => ({
       operations: createRemoteBashOperations(options.controller, event.excludeFromContext === true)
     }));
     pi.on("session_start", async (_event, ctx) => {
-      ctx.ui.setTitle("Rig \xB7 worker session");
-      ctx.ui.setStatus("rig-worker-pi", "connecting to worker session");
-      ctx.ui.notify(`Attached to Rig run ${options.runId}. Native Pi, remote brain \u2014 /detach exits, /stop cancels the run.`, "info");
+      ctx.ui.setTitle("Rig \xB7 enriched bundled Pi");
+      setStatus(ctx, "waiting for worker Pi daemon", true);
+      spinnerTimer = setInterval(() => {
+        frame = (frame + 1) % SPINNER_FRAMES.length;
+        if (busy)
+          renderStatus(ctx);
+      }, 150);
+      ctx.ui.notify(`Enriched bundled Pi \u2014 native UI + Rig layers, worker brain. Attached to run ${options.runId}. /worker shows live capabilities \xB7 /detach exits \xB7 /stop cancels.`, "info");
       if (options.initialMessageSent)
         ctx.ui.notify("Initial message sent to the worker Pi daemon.", "info");
       const nativeUi = ctx.ui;
       options.controller.setUiHooks({
-        onStatusText: (text2) => ctx.ui.setStatus("rig-worker-pi", text2),
-        onActivity: (label, detail) => ctx.ui.setStatus("rig-worker-pi", [label, detail].filter(Boolean).join(" \u2014 ")),
-        onConnectionChange: (connected) => ctx.ui.setStatus("rig-worker-pi", connected ? "worker session live" : "worker session disconnected"),
+        onStatusText: (text2) => setStatus(ctx, text2, !connected),
+        onActivity: (label, detail) => {
+          const active = label !== "idle" && !/complete|ready/i.test(label);
+          setStatus(ctx, [label, detail].filter(Boolean).join(" \u2014 "), active);
+          if (/agent running|tool:/.test(label))
+            ctx.ui.setWidget("rig-worker-capabilities", undefined);
+        },
+        onConnectionChange: (nextConnected) => {
+          connected = nextConnected;
+          setStatus(ctx, nextConnected ? "worker session live" : "worker session disconnected", false);
+        },
         onError: (message2) => ctx.ui.notify(message2, "error"),
         onExtensionUiRequest: (request) => {
           answerExtensionUiRequest(options, ctx, request);
         },
-        onCatchUp: (messages, commands) => {
+        onCatchUp: (messages, commands, capabilities) => {
           if (nativeUi.appendSessionMessages)
             nativeUi.appendSessionMessages(messages);
           const cwd = options.controller.status.cwd;
           if (nativeUi.setDisplayCwd && cwd)
             nativeUi.setDisplayCwd(cwd);
           registerDaemonCommands(pi, options, ctx, commands, registeredDaemonCommands);
+          if (capabilities) {
+            capabilityLines = renderWorkerCapabilities(capabilities);
+            ctx.ui.setWidget("rig-worker-capabilities", capabilityLines, { placement: "aboveEditor" });
+          }
         }
       });
       options.controller.connect().catch((error) => {
@@ -7926,6 +8053,8 @@ function createRigWorkerPiBridgeExtension(options) {
       });
     });
     pi.on("session_shutdown", () => {
+      if (spinnerTimer)
+        clearInterval(spinnerTimer);
       options.controller.close();
     });
   };
@@ -7951,7 +8080,8 @@ async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join2(tmpdir(), "rig-pi-frontend-sessions-"));
   const restoreEnv = setTemporaryEnv({
     PI_CODING_AGENT_SESSION_DIR: tempSessionDir,
-    PI_SKIP_VERSION_CHECK: "1"
+    PI_SKIP_VERSION_CHECK: "1",
+    PI_HIDDEN_COMMANDS: "import,fork,clone,tree,new,resume,trust"
   });
   const controller = new RigRemoteSessionController({ context, runId: input.runId });
   const createRemoteRuntime = async ({ cwd, agentDir, sessionManager, sessionStartEvent }) => {
@@ -7967,6 +8097,9 @@ async function attachRunBundledPiFrontend(context, input) {
             initialMessageSent: input.steered === true
           })
         ],
+        noExtensions: true,
+        noSkills: true,
+        noPromptTemplates: true,
         noContextFiles: true
       }
     });
@@ -8001,7 +8134,7 @@ async function attachRunBundledPiFrontend(context, input) {
     timelineCursor: null,
     steered: input.steered === true,
     detached,
-    rendered: "native bundled Pi frontend with remote worker session runtime"
+    rendered: "enriched bundled Pi frontend with remote worker session runtime"
   };
 }
 
@@ -8798,7 +8931,7 @@ var PRIMARY_GROUPS = [
       { command: "list", description: "List recent runs from the selected server or local state.", primary: true },
       { command: "status", description: "Render active and recent run groups.", primary: true },
       { 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: "attach <run-id>|--run <id> [--follow]", description: "Attach to the run; --follow opens the enriched bundled Pi (worker brain).", 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." },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.42",
+  "version": "0.0.6-alpha.44",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,11 +23,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.42",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.42",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.42",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.42",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.42",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.44",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.44",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.44",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.44",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.44",
     "picocolors": "^1.1.1"
   }
 }