@herbertgao/pi-extensions 2026.8.7 → 2026.8.9

package/node_modules/@herbertgao/pi-rename/README.md

@@ -10,17 +10,13 @@ Generate session names for pi and Herdr.
 pi install npm:@herbertgao/pi-rename
 ```
 
-For local development:
-
-```bash
-pi install /absolute/path/to/pi-extensions/packages/pi-rename
-```
+This package requires Pi 0.84.2 or newer.
 
 ## How it works
 
-Run `/rename` to generate a fresh hyphen-separated session name. The extension applies the name to the pi session and, when pi is running inside Herdr, to the current Herdr tab.
+Run `/rename` to generate a fresh hyphen-separated session name. The extension applies the name to the pi session and, when pi is running inside Herdr, to the current pane and tab when it is the tab's only pane, or to the current pane in a split tab.
 
-When a named session starts or resumes in Herdr, the extension also applies the saved pi session name to the current tab if the tab still has its default Herdr label.
+When a named session starts or resumes in Herdr, the extension applies the saved pi session name when the target still has its default label or the temporary `herdr-wrap` label.
 
 `/rename` builds naming context from the first user message plus up to three latest user messages. It ignores assistant replies, tool output, and attachments. Before sending context to the rename model, it redacts common secrets.
 
@@ -43,7 +39,7 @@ Run `/rename config` to choose a different model.
 
 After you choose a model, `pi-rename` uses only that model. Choose `Use default` in `/rename config` to return to the default.
 
-You can also edit `~/.config/pi/extensions/pi-rename.json` manually:
+You can also edit `$PI_CODING_AGENT_DIR/extensions/pi-rename.json` manually:
 
 ```json
 {
@@ -53,14 +49,20 @@ You can also edit `~/.config/pi/extensions/pi-rename.json` manually:
 
 ## Herdr behavior
 
-The extension uses `HERDR_PANE_ID` to find the current Herdr pane, then renames that pane's tab.
+Herdr tab renaming requires the `herdr` CLI. If it is unavailable, the extension still renames the pi session.
 
-On session startup or resume, it only auto-renames tabs that still have the default Herdr label, such as the tab number. It does not overwrite custom Herdr tab labels.
+The extension uses `HERDR_PANE_ID` to find the current Herdr pane. With one pane in the tab, it renames both the pane and tab. With sibling panes, it renames only the current pane.
 
-On quit, the Herdr tab keeps the last session name.
+On session startup or resume, it does not overwrite custom Herdr labels. It recognizes the temporary label from the Nushell `herdr-wrap` wrapper so saved session names still apply.
+
+On quit, the target keeps the last session name.
 
 If pi is not running inside Herdr, only the pi session name is updated.
 
+## Release notes
+
+See [CHANGELOG.md](CHANGELOG.md).
+
 ## License
 
 [MIT](LICENSE)

package/node_modules/@herbertgao/pi-rename/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-rename",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Generate pi session names and rename the current Herdr tab.",
   "keywords": [
     "herdr",
@@ -26,6 +26,7 @@
   "files": [
     "src/**/*.ts",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "type": "module",
@@ -36,6 +37,15 @@
     "access": "public",
     "provenance": true
   },
+  "scripts": {
+    "test": "node --experimental-strip-types --test tests/**/*.test.ts"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": ">=0.84.2",
+    "@earendil-works/pi-ai": ">=0.84.2",
+    "@earendil-works/pi-coding-agent": ">=0.84.2",
+    "@earendil-works/pi-tui": ">=0.84.2"
+  },
   "engines": {
     "node": ">=20"
   },
@@ -46,8 +56,8 @@
   },
   "x-upstream": {
     "package": "@tifan/pi-rename",
-    "version": "0.4.2",
+    "version": "0.5.0",
     "repository": "https://github.com/tifandotme/pi-extensions",
-    "commit": "460d580"
+    "commit": "3f6b5e628e31817960a02cfae9bcb4a3f4bcd79b"
   }
 }

package/node_modules/@herbertgao/pi-rename/src/index.ts

@@ -1,7 +1,11 @@
 import { execFile } from "node:child_process"
+import path from "node:path"
 import { promisify } from "node:util"
 import type { AgentMessage } from "@earendil-works/pi-agent-core"
-import type { AutocompleteItem } from "@earendil-works/pi-tui"
+import {
+  CancellableLoader,
+  type AutocompleteItem,
+} from "@earendil-works/pi-tui"
 import type {
   ExtensionAPI,
   ExtensionContext,
@@ -61,10 +65,17 @@ function asRecord(value: unknown): Record<string, unknown> | undefined {
   return value as Record<string, unknown>
 }
 
+interface HerdrPaneInfo {
+  readonly id: string
+  readonly label?: string
+  readonly tabId: string
+}
+
 interface HerdrTabInfo {
   readonly id: string
   readonly label?: string
   readonly number?: number
+  readonly paneCount?: number
 }
 
 function parseRecord(value: string): Record<string, unknown> | undefined {
@@ -75,12 +86,33 @@ function parseRecord(value: string): Record<string, unknown> | undefined {
   }
 }
 
-function extractTabId(stdout: string): string | undefined {
+interface HerdrContext {
+  readonly pane: HerdrPaneInfo
+  readonly tab: HerdrTabInfo
+}
+
+function extractPaneInfo(stdout: string): HerdrPaneInfo | undefined {
   const parsed = parseRecord(stdout)
   const result = asRecord(parsed?.["result"])
   const pane = asRecord(result?.["pane"])
+  const paneId = pane?.["pane_id"]
   const tabId = pane?.["tab_id"]
-  return typeof tabId === "string" && tabId.trim() ? tabId : undefined
+
+  if (
+    typeof paneId !== "string" ||
+    !paneId.trim() ||
+    typeof tabId !== "string" ||
+    !tabId.trim()
+  ) {
+    return undefined
+  }
+
+  const label = pane?.["label"]
+  return {
+    id: paneId,
+    tabId,
+    ...(typeof label === "string" ? { label } : {}),
+  }
 }
 
 function extractTabInfo(stdout: string): HerdrTabInfo | undefined {
@@ -93,28 +125,35 @@ function extractTabInfo(stdout: string): HerdrTabInfo | undefined {
 
   const label = tab?.["label"]
   const number = tab?.["number"]
+  const paneCount = tab?.["pane_count"]
 
   return {
     id: tabId,
     ...(typeof label === "string" ? { label } : {}),
     ...(typeof number === "number" ? { number } : {}),
+    ...(typeof paneCount === "number" ? { paneCount } : {}),
   }
 }
 
-async function getCurrentHerdrTabId(): Promise<string | undefined> {
+async function getCurrentHerdrContext(): Promise<HerdrContext | undefined> {
   const paneId = process.env["HERDR_PANE_ID"]?.trim()
   if (!paneId) return undefined
 
-  const { stdout } = await execFileAsync("herdr", ["pane", "get", paneId])
-  return extractTabId(stdout)
-}
-
-async function getCurrentHerdrTabInfo(): Promise<HerdrTabInfo | undefined> {
-  const tabId = await getCurrentHerdrTabId()
-  if (!tabId) return undefined
-
-  const { stdout } = await execFileAsync("herdr", ["tab", "get", tabId])
-  return extractTabInfo(stdout)
+  const { stdout: paneStdout } = await execFileAsync("herdr", [
+    "pane",
+    "get",
+    paneId,
+  ])
+  const pane = extractPaneInfo(paneStdout)
+  if (!pane) return undefined
+
+  const { stdout: tabStdout } = await execFileAsync("herdr", [
+    "tab",
+    "get",
+    pane.tabId,
+  ])
+  const tab = extractTabInfo(tabStdout)
+  return tab ? { pane, tab } : undefined
 }
 
 function isDefaultHerdrTabLabel(tab: HerdrTabInfo): boolean {
@@ -124,22 +163,49 @@ function isDefaultHerdrTabLabel(tab: HerdrTabInfo): boolean {
   return typeof tab.number === "number" && label === String(tab.number)
 }
 
-async function renameCurrentHerdrTab(name: string): Promise<boolean> {
-  const tabId = await getCurrentHerdrTabId()
-  if (!tabId) return false
+function isPiWrapperLabel(label: string | undefined): boolean {
+  return label?.trim() === `${path.basename(process.cwd())} (pi)`
+}
+
+function canRenameSessionStart(context: HerdrContext): boolean {
+  const singlePane = context.tab.paneCount === 1
+  const label = singlePane ? context.tab.label : context.pane.label
+  return (
+    (singlePane ? isDefaultHerdrTabLabel(context.tab) : !label?.trim()) ||
+    isPiWrapperLabel(label)
+  )
+}
 
-  await execFileAsync("herdr", ["tab", "rename", tabId, name])
+async function renameHerdrTarget(
+  context: HerdrContext,
+  name: string,
+): Promise<boolean> {
+  await execFileAsync("herdr", ["pane", "rename", context.pane.id, name])
+  if (context.tab.paneCount === 1) {
+    await execFileAsync("herdr", ["tab", "rename", context.tab.id, name])
+  }
   return true
 }
 
-async function renameCurrentHerdrTabIfDefault(name: string): Promise<boolean> {
-  const tab = await getCurrentHerdrTabInfo()
-  if (!tab || tab.label?.trim() === name || !isDefaultHerdrTabLabel(tab)) {
+async function renameCurrentHerdrTarget(name: string): Promise<boolean> {
+  const context = await getCurrentHerdrContext()
+  return context ? renameHerdrTarget(context, name) : false
+}
+
+async function renameCurrentHerdrTargetIfDefault(
+  name: string,
+): Promise<boolean> {
+  const context = await getCurrentHerdrContext()
+  if (
+    !context ||
+    !canRenameSessionStart(context) ||
+    context.tab.label?.trim() === name ||
+    context.pane.label?.trim() === name
+  ) {
     return false
   }
 
-  await execFileAsync("herdr", ["tab", "rename", tab.id, name])
-  return true
+  return renameHerdrTarget(context, name)
 }
 
 function hasSessionContextReader(
@@ -166,7 +232,7 @@ function getCurrentSessionMessages(ctx: ExtensionContext): AgentMessage[] {
 
 async function applyRename(pi: ExtensionAPI, name: string): Promise<boolean> {
   pi.setSessionName(name)
-  return renameCurrentHerdrTab(name)
+  return renameCurrentHerdrTarget(name)
 }
 
 async function runRenameCommand(
@@ -180,47 +246,57 @@ async function runRenameCommand(
     return
   }
 
-  const result = await generateRename(ctx, state.modelConfig, context)
-  if (!result) {
-    ctx.ui.notify("Could not generate a session name.", "error")
-    return
+  if (ctx.mode === "tui") {
+    ctx.ui.setWidget("pi-rename", (tui, theme) => {
+      const color = (text: string) => theme.fg("dim", text)
+      return new CancellableLoader(tui, color, color, "renaming session...")
+    })
   }
+  try {
+    const result = await generateRename(ctx, state.modelConfig, context)
+    if (!result) {
+      ctx.ui.notify("Could not generate a session name.", "error")
+      return
+    }
 
-  let renamedHerdr = false
-  let herdrError: string | undefined
+    let renamedHerdr = false
+    let herdrError: string | undefined
 
-  try {
-    renamedHerdr = await applyRename(pi, result.name)
-  } catch (error) {
-    herdrError = error instanceof Error ? error.message : String(error)
-  }
+    try {
+      renamedHerdr = await applyRename(pi, result.name)
+    } catch (error) {
+      herdrError = error instanceof Error ? error.message : String(error)
+    }
 
-  if (result.source === "fallback") {
-    ctx.ui.notify(
-      [
-        `Session renamed with fallback: ${result.name}`,
-        `Could not use rename model: ${result.reason}`,
-        ...(herdrError ? [`Herdr tab rename failed: ${herdrError}`] : []),
-      ].join("\n"),
-      "warning",
-    )
-    return
-  }
+    if (result.source === "fallback") {
+      ctx.ui.notify(
+        [
+          `Session renamed with fallback: ${result.name}`,
+          `Could not use rename model: ${result.reason}`,
+          ...(herdrError ? [`Herdr label rename failed: ${herdrError}`] : []),
+        ].join("\n"),
+        "warning",
+      )
+      return
+    }
+
+    if (herdrError) {
+      ctx.ui.notify(
+        `Session renamed, but Herdr label rename failed: ${herdrError}`,
+        "warning",
+      )
+      return
+    }
 
-  if (herdrError) {
     ctx.ui.notify(
-      `Session renamed, but Herdr tab rename failed: ${herdrError}`,
-      "warning",
+      renamedHerdr
+        ? `Session and Herdr label renamed: ${result.name}`
+        : `Session renamed: ${result.name}`,
+      "info",
     )
-    return
+  } finally {
+    if (ctx.mode === "tui") ctx.ui.setWidget("pi-rename", undefined)
   }
-
-  ctx.ui.notify(
-    renamedHerdr
-      ? `Session and Herdr tab renamed: ${result.name}`
-      : `Session renamed: ${result.name}`,
-    "info",
-  )
 }
 
 function getRenameArgumentCompletions(
@@ -293,7 +369,7 @@ async function notifyRenameStatus(
   }
 
   const context = getUserMessageContext(getCurrentSessionMessages(ctx))
-  const herdrLine = `herdr tab: ${process.env["HERDR_PANE_ID"]?.trim() ? "available" : "unavailable"}`
+  const herdrLine = `herdr: ${process.env["HERDR_PANE_ID"]?.trim() ? "available" : "unavailable"}`
   const contextLine = `context: ${context?.count ?? 0} user messages`
 
   ctx.ui.notify(
@@ -361,7 +437,7 @@ export default function (pi: ExtensionAPI): void {
     if (!sessionName) return
 
     try {
-      await renameCurrentHerdrTabIfDefault(sessionName)
+      await renameCurrentHerdrTargetIfDefault(sessionName)
     } catch {
       // Keep session startup quiet if Herdr is unavailable or rejects the rename.
     }

package/node_modules/@herbertgao/pi-rename/src/models.ts

@@ -6,7 +6,7 @@ import {
   writeFileSync,
 } from "node:fs"
 import path from "node:path"
-import type { Api, Model, ProviderHeaders } from "@earendil-works/pi-ai"
+import type { Api, Model } from "@earendil-works/pi-ai"
 import {
   getAgentDir,
   type ExtensionContext,
@@ -22,8 +22,6 @@ export interface RenameModelPreference {
 
 export interface RenameModelAuth {
   readonly model: Model<Api>
-  readonly apiKey: string
-  readonly headers: ProviderHeaders | undefined
 }
 
 export type RenameModelConfig =
@@ -134,14 +132,8 @@ async function getModelAuth(
   )
   if (!model) return undefined
 
-  const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model)
-  return auth.ok && auth.apiKey
-    ? {
-        model,
-        apiKey: auth.apiKey,
-        headers: auth.headers,
-      }
-    : undefined
+  const auth = await ctx.modelRegistry.getProviderAuth(model.provider)
+  return auth?.auth.apiKey ? { model } : undefined
 }
 
 export async function getRenameModelAuth(
@@ -181,8 +173,8 @@ export async function getAuthenticatedTextModelPreferences(
     .filter((model) => model.input.includes("text"))
   const authenticatedModels = await Promise.all(
     models.map(async (model) => {
-      const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model)
-      return auth.ok && auth.apiKey ? toModelPreference(model) : undefined
+      const auth = await ctx.modelRegistry.getProviderAuth(model.provider)
+      return auth?.auth.apiKey ? toModelPreference(model) : undefined
     }),
   )
 

package/node_modules/@herbertgao/pi-rename/src/naming.ts

@@ -1,5 +1,5 @@
 import type { AgentMessage } from "@earendil-works/pi-agent-core"
-import { complete, type Message } from "@earendil-works/pi-ai/compat"
+import type { Message } from "@earendil-works/pi-ai"
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent"
 import {
   formatRenameModelKey,
@@ -123,17 +123,13 @@ export async function generateRename(
     const modelAuth = await getRenameModelAuth(ctx, modelConfig)
 
     if (modelAuth.status === "ok") {
-      const response = await complete(
+      const response = await ctx.modelRegistry.complete(
         modelAuth.auth.model,
         {
           systemPrompt: RENAME_SYSTEM_PROMPT,
           messages: [buildRenamePrompt(context)],
         },
         {
-          apiKey: modelAuth.auth.apiKey,
-          ...(modelAuth.auth.headers
-            ? { headers: modelAuth.auth.headers }
-            : {}),
           maxTokens: RENAME_MAX_TOKENS,
           maxRetries: 0,
           cacheRetention: "none",

package/node_modules/@herbertgao/pi-stash/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-stash",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Stash one pi draft and restore it after the next message.",
   "keywords": [
     "pi",
@@ -44,8 +44,8 @@
   },
   "x-upstream": {
     "package": "@tifan/pi-stash",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "repository": "https://github.com/tifandotme/pi-extensions",
-    "commit": "460d580"
+    "commit": "b39d1e6359c78718cbf8fe5c74c82b89065e9a0b"
   }
 }

package/node_modules/@herbertgao/pi-subagents/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.16.1
+
+### Patch Changes
+
+- [#116](https://github.com/HerbertGao/pi-extensions/pull/116) [`ecda398`](https://github.com/HerbertGao/pi-extensions/commit/ecda398b9a95212c512d53325c617e485e6ded8d) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Port Ctrl+C conversation-viewer dismissal and cross-extension consumption of settled subagent results while preserving local spawn and ownership safeguards.
+
 ## 0.16.0
 
 ### Minor Changes
@@ -49,6 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- **Ctrl+C closes the conversation viewer** when it is not composing a steering message.
+- **Cross-extension callers can consume settled RPC-spawned results** with `subagents:rpc:consume`, suppressing a duplicate completion notification after another extension has already shown the result.
 - **One malformed agent file no longer aborts extension activation** ([#212](https://github.com/tintinweb/pi-subagents/issues/212) — thanks [@daromaj](https://github.com/daromaj)). Unreadable and unparseable files are skipped with a path-specific warning, including the earlier source that remains active when a broken file was an override.
 
 ## [0.15.1] - 2026-08-10

package/node_modules/@herbertgao/pi-subagents/README.md

@@ -32,7 +32,7 @@ Spawn specialized agents that run in isolated sessions — each with its own too
 - **Tool denylist** — block specific tools via `disallowed_tools` frontmatter
 - **Styled completion notifications** — background agent results render as themed, compact notification boxes (icon, stats, result preview) instead of raw XML. Expandable to show full output. Group completions render each agent individually
 - **Event bus** — lifecycle events (`subagents:created`, `started`, `completed`, `failed`, `steered`, `compacted`) emitted via `pi.events`, enabling other extensions to react to sub-agent activity
-- **Cross-extension RPC** — other pi extensions can spawn and stop subagents via the `pi.events` event bus (`subagents:rpc:ping`, `subagents:rpc:spawn`, `subagents:rpc:stop`). Standardized reply envelopes with protocol versioning. Emits `subagents:ready` on session start
+- **Cross-extension RPC** — other pi extensions can spawn, stop, and consume subagent results via the `pi.events` event bus (`subagents:rpc:ping`, `subagents:rpc:spawn`, `subagents:rpc:stop`, `subagents:rpc:consume`). Standardized reply envelopes with protocol versioning. Emits `subagents:ready` on session start
 - **Schedule subagents** — pass `schedule` to the `Agent` tool to fire on cron / interval / one-shot. Session-scoped jobs with PID-locked persistence; results land via the same `subagent-notification` followUp path as manual background completions; manage via `/agents → Scheduled jobs`
 - **Model scope enforcement** — opt-in validation that subagent model choices stay within your pi `enabledModels` allowlist (sourced from `/scoped-models`, with both global and project-local pi settings honored). Caller-supplied out-of-scope → hard error to orchestrator; frontmatter-pinned out-of-scope → warning + runs anyway (frontmatter authoritative). Toggle via `/agents → Settings → Scope models`
 
@@ -520,7 +520,7 @@ Listen for `subagents:ready` to know when RPC handlers are available:
 
 ```typescript
 pi.events.on("subagents:ready", () => {
-  // RPC handlers are registered — safe to call ping/spawn/stop
+  // RPC handlers are registered — safe to call ping/spawn/stop/consume
 })
 ```
 
@@ -581,6 +581,19 @@ const unsub = pi.events.on(`subagents:rpc:stop:reply:${requestId}`, (reply) => {
 pi.events.emit("subagents:rpc:stop", { requestId, agentId: "agent-id-here" })
 ```
 
+### Consume
+
+Mark a settled agent result as already shown so its completion notification is suppressed:
+
+```typescript
+pi.events.emit("subagents:rpc:consume", {
+  requestId: crypto.randomUUID(),
+  agentId: "agent-id-here",
+})
+```
+
+This is the event-bus equivalent of `get_subagent_result` consuming a result. Running, queued, unknown, and nested agents are refused; the channel is additive and remains outside the protocol-version handshake.
+
 Reply channels are scoped per `requestId`, so concurrent requests don't interfere.
 
 ## Persistent Agent Memory
@@ -677,7 +690,7 @@ src/
   agent-color.ts      # Claude Code/Agency Agents name color parsing and badge rendering
   agent-runner.ts     # Session creation, execution, graceful max_turns, steer/resume
   agent-manager.ts    # Agent lifecycle, concurrency queue, completion notifications
-  cross-extension-rpc.ts # RPC handlers for cross-extension spawn/ping via pi.events
+  cross-extension-rpc.ts # RPC handlers for cross-extension spawn/stop/consume via pi.events
   group-join.ts       # Group join manager: batched completion notifications with timeout
   custom-agents.ts    # Load user-defined agents from .pi/agents/, .agents/agents/, and global agents
   memory.ts           # Persistent agent memory (resolve, read, build prompt blocks)

package/node_modules/@herbertgao/pi-subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-subagents",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Claude Code-style autonomous subagents for Pi, with HerbertGao-maintained UI extensions.",
   "keywords": [
     "agent",

package/node_modules/@herbertgao/pi-subagents/src/cross-extension-rpc.ts

@@ -1,7 +1,7 @@
 /**
  * Cross-extension RPC handlers for the subagents extension.
  *
- * Exposes ping, spawn, and stop RPCs over the pi.events event bus,
+ * Exposes ping, spawn, stop, and consume RPCs over the pi.events event bus,
  * using per-request scoped reply channels.
  *
  * Reply envelope follows pi-mono convention:
@@ -25,7 +25,7 @@ export type RpcReply<T = void> =
 /** RPC protocol version — bumped when the envelope or method contracts change. */
 export const PROTOCOL_VERSION = 2
 
-/** Minimal AgentManager interface needed by the spawn/stop RPCs. */
+/** Minimal AgentManager interface needed by the spawn/stop/consume RPCs. */
 export interface SpawnCapable {
   spawn(
     pi: unknown,
@@ -35,6 +35,7 @@ export interface SpawnCapable {
     options: any,
   ): string
   abort(id: string): boolean
+  consumeResult(id: string): boolean
 }
 
 export interface RpcDeps {
@@ -48,6 +49,7 @@ export interface RpcHandle {
   unsubPing: () => void
   unsubSpawn: () => void
   unsubStop: () => void
+  unsubConsume: () => void
 }
 
 /**
@@ -76,7 +78,7 @@ function handleRpc<P extends { requestId: string }>(
 }
 
 /**
- * Register ping, spawn, and stop RPC handlers on the event bus.
+ * Register ping, spawn, stop, and consume RPC handlers on the event bus.
  * Returns unsub functions for cleanup.
  */
 export function registerRpcHandlers(deps: RpcDeps): RpcHandle {
@@ -130,5 +132,14 @@ export function registerRpcHandlers(deps: RpcDeps): RpcHandle {
     },
   )
 
-  return { unsubPing, unsubSpawn, unsubStop }
+  const unsubConsume = handleRpc<{
+    requestId: string
+    agentId: string
+  }>(events, "subagents:rpc:consume", ({ agentId }) => {
+    if (!manager.consumeResult(agentId)) {
+      throw new Error("Agent not found or still running")
+    }
+  })
+
+  return { unsubPing, unsubSpawn, unsubStop, unsubConsume }
 }

package/node_modules/@herbertgao/pi-subagents/src/index.ts

@@ -890,6 +890,20 @@ export default function (pi: ExtensionAPI) {
             const record = manager.getRecord(id)
             return !record?.parentAgentId && manager.abort(id)
           },
+          consumeResult: (id) => {
+            const record = manager.getRecord(id)
+            if (
+              !record ||
+              record.parentAgentId ||
+              record.status === "running" ||
+              record.status === "queued"
+            ) {
+              return false
+            }
+            record.resultConsumed = true
+            cancelNudge(record.id)
+            return true
+          },
         },
       })
       // Broadcast readiness so extensions loaded alongside us can discover us.
@@ -911,6 +925,7 @@ export default function (pi: ExtensionAPI) {
     rpcHandle?.unsubSpawn()
     rpcHandle?.unsubStop()
     rpcHandle?.unsubPing()
+    rpcHandle?.unsubConsume()
     rpcHandle = undefined
     currentCtx = undefined
     // Only release the global slot if this activation claimed it — a child
@@ -1068,6 +1083,7 @@ export default function (pi: ExtensionAPI) {
   // Grab UI context from first tool execution + clear lingering widget on new turn
   pi.on("tool_execution_start", async (_event, ctx) => {
     widget.setUICtx(ctx.ui as UICtx)
+    // SAFETY: both UI adapters receive the same Pi ExtensionContext UI surface.
     fleet.setUICtx(ctx.ui as unknown as FleetUICtx)
     widget.onTurnStart()
   })

package/node_modules/@herbertgao/pi-subagents/src/ui/conversation-viewer.ts

@@ -94,7 +94,11 @@ export class ConversationViewer implements Component {
       return
     }
 
-    if (matchesKey(data, "escape") || matchesKey(data, "q")) {
+    if (
+      matchesKey(data, "escape") ||
+      matchesKey(data, "ctrl+c") ||
+      matchesKey(data, "q")
+    ) {
       this.closed = true
       this.done(undefined)
       return