@herbertgao/pi-extensions 2026.8.2 → 2026.8.3

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-grouping.ts → tool/grouping.ts}

@@ -6,9 +6,9 @@ import {
 	visibleWidth,
 	type Component,
 } from "@earendil-works/pi-tui";
-import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../utils/tool-loading-icon.ts";
-import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
-import { showMoreHintText } from "./show-more-hint.ts";
+import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
+import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 
 const PATCH_KEY = Symbol.for("pi.ccstyle.tool-grouping-patch");
 const PARENT_KEY = Symbol.for("pi.ccstyle.tool-grouping-parent");
@@ -101,7 +101,7 @@ function stripLeadingStatusIcon(line: string): string {
 	);
 }
 
-function stripBackgroundAnsi(line: string): string {
+export function stripBackgroundAnsi(line: string): string {
 	return line.replace(/\x1b\[(?:4[0-9]|10[0-7]|48(?:(?:;|:)[0-9]+)+|49)m/g, "");
 }
 
@@ -126,15 +126,25 @@ function stripLeadingSpaces(line: string, count: number): string {
 	return ansi + line.slice(offset);
 }
 
-function paddedBackgroundRow(theme: any, slot: string, content: string, width: number): string {
+/** 生成一行铺满 width 的 slot 背景行；bgAnsiOverride 可替换背景 ANSI（用于提亮等）。 */
+export function paddedBackgroundRow(
+	theme: any,
+	slot: string,
+	content: string,
+	width: number,
+	bgAnsiOverride?: string,
+): string {
 	const innerWidth = Math.max(0, width - 2);
 	const clipped = truncateToWidth(stripBackgroundAnsi(content), innerWidth, "");
 	const row = ` ${clipped}${" ".repeat(Math.max(0, innerWidth - visibleWidth(clipped)))} `;
-	if (typeof theme?.bg !== "function") return row;
 	const bgAnsi =
-		theme.getBgAnsi?.(slot) ?? theme.bg(slot, "").match(/^\x1b\[[0-?]*[ -/]*[@-~]/)?.[0] ?? "";
+		bgAnsiOverride ||
+		(typeof theme?.bg === "function"
+			? theme.getBgAnsi?.(slot) || theme.bg(slot, "").match(/^\x1b\[[0-?]*[ -/]*[@-~]/)?.[0] || ""
+			: "");
 	const stable = bgAnsi ? row.replace(/\x1b\[(?:0)?m/g, (reset) => reset + bgAnsi) : row;
-	return theme.bg(slot, stable);
+	if (!bgAnsi) return typeof theme?.bg === "function" ? theme.bg(slot, stable) : row;
+	return `${bgAnsi}${stable}\x1b[49m`;
 }
 
 function oneLine(value: unknown, max = 96): string {

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-result.ts → tool/result.ts}

@@ -1,9 +1,9 @@
 import { Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { inspect } from "node:util";
-import { config } from "../config/config.ts";
-import { showMoreHintText } from "./show-more-hint.ts";
-import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../utils/tool-loading-icon.ts";
-import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
+import { config } from "../../config/config.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
+import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
+import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
 
 const TOOL_VIEWPORT_WIDTH_RATIO = 0.8;
 
@@ -677,15 +677,6 @@ export function renderExpandedToolResult(
 	return new Text(theme.fg(color, renderCollapsedToolResult("Done")), 0, 0);
 }
 
-export function formatExpandHint(lineCount: number): string {
-	return ` (${lineCount} more line${lineCount === 1 ? "" : "s"} / click)`;
-}
-
-function expandHint(theme: any, lineCount: number, hovered = false): string {
-	// Keep interaction guidance neutral; it should not inherit success/error
-	// coloring from the tool result surrounding it.
-	return theme.fg(hovered ? "text" : "muted", formatExpandHint(lineCount));
-}
 const toolViewMarker = (id: number, section: ToolIoSection) =>
 	`_cc:v${id}:${section === "input" ? "i" : "o"}`;
 

package/node_modules/@herbertgao/pi-cc-extensions/extensions/utils/fullscreen-detect.ts

@@ -1,7 +1,3 @@
-// fullscreen 模式探测：官方 fullscreen TUI（TuiAltScreen）由官方独占布局，
-// 插件渲染层应让位。检测方式是瞬时 setWidget 拿 tui 实例检查 mode。
-const PROBE_KEY = "cc-fullscreen-probe";
-
 /**
  * 官方 0.84+ 的 tui 引用是惰性 Proxy（createInteractiveTuiReference）：
  * 函数属性每次 get 都返回新包装，执行时才解析到当前实现。
@@ -13,26 +9,3 @@ export function isLazyProxyTui(tui: any): boolean {
 	const probe = tui.requestRender;
 	return typeof probe === "function" && probe !== tui.requestRender;
 }
-
-/**
- * 探测当前会话的 TUI 是否运行在官方 fullscreen 模式。
- * 无 setWidget 的环境（测试 mock）视为 regular。
- */
-export function isFullscreenUi(ctx: { ui?: any }): boolean {
-	if (typeof ctx?.ui?.setWidget !== "function") return false;
-	let fullscreen = false;
-	try {
-		ctx.ui.setWidget(PROBE_KEY, (tui: any) => {
-			fullscreen = tui?.mode === "fullscreen";
-			return { render: () => 0, invalidate() {} };
-		});
-	} catch {
-		// 探测失败按 regular 处理，避免误伤
-	}
-	try {
-		ctx.ui.setWidget(PROBE_KEY, undefined);
-	} catch {
-		// 忽略
-	}
-	return fullscreen;
-}

package/node_modules/@herbertgao/pi-cc-extensions/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@herbertgao/pi-cc-extensions",
-	"version": "0.8.52",
+	"version": "0.8.53",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",
@@ -69,8 +69,8 @@
 	},
 	"x-upstream": {
 		"package": "pi-cc-extensions",
-		"version": "0.8.53",
+		"version": "0.8.54",
 		"repository": "https://github.com/minuque/pi-cc-extensions",
-		"commit": "a7aaf6d4136af44a1ef7ac4993d5754fe084c921"
+		"commit": "8372ecaff7f079ab4452db47328c3238620a4885"
 	}
 }

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

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.15.3
+
+### Patch Changes
+
+- [#27](https://github.com/HerbertGao/pi-extensions/pull/27) [`32bb76c`](https://github.com/HerbertGao/pi-extensions/commit/32bb76c117971de27db9c2b521d19df3ba9ea322) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Keep worktree-isolated agents inside their copy, preserve real Agent tool startup errors, and render unknown or failed Agent results without misleading completion status.
+
 ## 0.15.2
 
 ### Patch Changes

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

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-subagents",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Claude Code-style autonomous subagents for Pi, with HerbertGao-maintained UI extensions.",
   "keywords": [
     "agent",
@@ -66,6 +66,6 @@
     "package": "@tintinweb/pi-subagents",
     "version": "0.15.0",
     "repository": "https://github.com/tintinweb/pi-subagents",
-    "commit": "140324c"
+    "commit": "c83dd82"
   }
 }

package/node_modules/@herbertgao/pi-subagents/src/agent-manager.ts

@@ -321,6 +321,7 @@ export class AgentManager {
       // stay undefined otherwise so plain worktree runs keep resolving config
       // (incl. relative extension paths and memory) inside the worktree copy.
       cwd: worktreeCwd ?? customCwd,
+      worktreeBase: worktreeCwd ? baseCwd : undefined,
       configCwd:
         options.configCwd ?? (customCwd !== undefined ? ctx.cwd : undefined),
       signal: record.abortController!.signal,

package/node_modules/@herbertgao/pi-subagents/src/agent-runner.ts

@@ -414,6 +414,8 @@ export interface RunOptions {
   thinkingLevel?: ThinkingLevel
   /** Override working directory (e.g. for worktree isolation). */
   cwd?: string
+  /** Original checkout path when cwd is an isolated worktree copy. */
+  worktreeBase?: string
   /**
    * Where .pi config is discovered (project extensions, skills, pi settings,
    * agent memory). Default: same as the working directory. The manager sets
@@ -602,7 +604,7 @@ export async function runAgent(
   const parentSystemPrompt = ctx.getSystemPrompt()
 
   // Build prompt extras (memory, skill preloading)
-  const extras: PromptExtras = {}
+  const extras: PromptExtras = { worktreeBase: options.worktreeBase }
 
   // Resolve extensions/skills: isolated overrides to false
   const extensions = options.isolated ? false : config.extensions

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

@@ -1241,12 +1241,12 @@ Terse command-style prompts produce shallow, generic work.
         )
       },
 
-      renderResult(result, { expanded, isPartial }, theme) {
+      renderResult(result, { expanded, isPartial }, theme, renderContext) {
+        const resultText =
+          result.content[0]?.type === "text" ? result.content[0].text : ""
         const details = result.details as AgentDetails | undefined
-        if (!details) {
-          const text =
-            result.content[0]?.type === "text" ? result.content[0].text : ""
-          return new Text(text, 0, 0)
+        if (renderContext?.isError || !details?.status) {
+          return new Text(resultText, 0, 0)
         }
 
         // Helper: build "haiku · thinking: high · ↻5≤30 · 3 tool uses · 33.8k tokens" stats string
@@ -1301,8 +1301,6 @@ Terse command-style prompts produce shallow, generic work.
           line += " " + theme.fg("dim", "·") + " " + theme.fg("dim", duration)
 
           if (expanded) {
-            const resultText =
-              result.content[0]?.type === "text" ? result.content[0].text : ""
             if (resultText) {
               const lines = resultText.split("\n").slice(0, 50)
               for (const l of lines) {
@@ -1332,6 +1330,10 @@ Terse command-style prompts produce shallow, generic work.
           return new Text(line, 0, 0)
         }
 
+        if (details.status !== "error" && details.status !== "aborted") {
+          return new Text(resultText, 0, 0)
+        }
+
         // ---- Error / Aborted (hard max_turns) ----
         const s = stats(details)
         let line = theme.fg("error", "✗") + (s ? " " + s : "")
@@ -1598,23 +1600,22 @@ Terse command-style prompts produce shallow, generic work.
             }
           }
 
-          try {
-            id = manager.spawn(pi, ctx, subagentType, params.prompt, {
-              description: params.description,
-              model,
-              maxTurns: effectiveMaxTurns,
-              isolated,
-              inheritContext,
-              thinkingLevel: thinking,
-              isBackground: true,
-              isolation,
-              invocation: agentInvocation,
-              rootSessionId: ctx.sessionManager.getSessionId(),
-              ...bgCallbacks,
-            })
-          } catch (err) {
-            return textResult(err instanceof Error ? err.message : String(err))
-          }
+          // A throw here means the agent never started. Let it out: Pi marks a
+          // tool call failed only when execute throws, while a returned message
+          // reads to the model as a subagent that ran and reported this.
+          id = manager.spawn(pi, ctx, subagentType, params.prompt, {
+            description: params.description,
+            model,
+            maxTurns: effectiveMaxTurns,
+            isolated,
+            inheritContext,
+            thinkingLevel: thinking,
+            isBackground: true,
+            isolation,
+            invocation: agentInvocation,
+            rootSessionId: ctx.sessionManager.getSessionId(),
+            ...bgCallbacks,
+          })
 
           // Set output file + join mode synchronously after spawn, before the
           // event loop yields — onSessionCreated is async so this is safe.
@@ -1774,18 +1775,15 @@ Terse command-style prompts produce shallow, generic work.
             },
           )
           record = fgResult.record
-        } catch (err) {
+        } finally {
+          // A startup throw propagates as a failed tool call without leaving
+          // the spinner running or a finished agent in the widget.
           clearInterval(spinnerInterval)
-          return textResult(err instanceof Error ? err.message : String(err))
-        }
-
-        clearInterval(spinnerInterval)
-
-        // Clean up foreground agent from widget
-        if (fgId) {
-          agentActivity.delete(fgId)
-          widget.markFinished(fgId)
-          fleet.onAgentFinished(fgId)
+          if (fgId) {
+            agentActivity.delete(fgId)
+            widget.markFinished(fgId)
+            fleet.onAgentFinished(fgId)
+          }
         }
 
         // Get final token count

package/node_modules/@herbertgao/pi-subagents/src/nested-tools.ts

@@ -399,47 +399,38 @@ export function createNestedSubagentTools(
       // one earlier would silently give a grandchild the wrong worktree base, the
       // wrong conversation under inherit_context, and the wrong inherited model.
       //
-      // spawn() throws on strict worktree-isolation failure and cwd validation —
-      // report it as a tool error, like the top-level Agent tool does, instead of
-      // letting it escape into the child's turn.
-      try {
-        if (invocation.runInBackground) {
-          const id = context.manager.spawn(
-            context.pi,
-            ctx,
-            resolvedType,
-            params.prompt,
-            {
-              ...options,
-              isBackground: true,
-            },
-          )
-          // Synchronous, before the event loop yields — onSessionCreated fires
-          // asynchronously inside runAgent, so the file is attached in time.
-          attachTranscript(id)
-          return textResult(
-            `Nested agent started in background. Agent ID: ${id}`,
-          )
-        }
-
-        const { record } = await context.manager.spawnAndWait(
+      // Startup throws mean no child ran. Let them propagate so Pi marks the
+      // nested Agent tool call failed instead of presenting the message as a
+      // successful child result.
+      if (invocation.runInBackground) {
+        const id = context.manager.spawn(
           context.pi,
           ctx,
           resolvedType,
           params.prompt,
-          { ...options, signal },
-          attachTranscript,
-        )
-        return textResult(
-          formatRecord(record, "inline"),
-          record.status === "error",
-        )
-      } catch (err) {
-        return textResult(
-          err instanceof Error ? err.message : String(err),
-          true,
+          {
+            ...options,
+            isBackground: true,
+          },
         )
+        // Synchronous, before the event loop yields — onSessionCreated fires
+        // asynchronously inside runAgent, so the file is attached in time.
+        attachTranscript(id)
+        return textResult(`Nested agent started in background. Agent ID: ${id}`)
       }
+
+      const { record } = await context.manager.spawnAndWait(
+        context.pi,
+        ctx,
+        resolvedType,
+        params.prompt,
+        { ...options, signal },
+        attachTranscript,
+      )
+      return textResult(
+        formatRecord(record, "inline"),
+        record.status === "error",
+      )
     },
   })
 

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

@@ -10,6 +10,8 @@ export interface PromptExtras {
   memoryBlock?: string
   /** Preloaded skill contents to inject. */
   skillBlocks?: { name: string; content: string }[]
+  /** Original checkout path when cwd is an isolated worktree copy. */
+  worktreeBase?: string
 }
 
 /**
@@ -55,6 +57,12 @@ Platform: ${env.platform}`
   }
   const extrasSuffix =
     extraSections.length > 0 ? "\n\n" + extraSections.join("\n") : ""
+  const worktreeSection = extras?.worktreeBase
+    ? `\n\n<worktree_isolation>
+Your working directory is an isolated git worktree copy of ${extras.worktreeBase}.
+Work only inside it — never in ${extras.worktreeBase}, even if other instructions name that path as your working directory.
+</worktree_isolation>`
+    : ""
 
   if (config.promptMode === "append") {
     const identity = parentSystemPrompt || genericBase
@@ -88,6 +96,7 @@ You are operating as a sub-agent invoked to handle a specific task.
       "\n\n" +
       activeAgentTag +
       envBlock +
+      worktreeSection +
       customSection +
       extrasSuffix
     )
@@ -100,7 +109,12 @@ You have been invoked to handle a specific task autonomously.
 ${envBlock}`
 
   return (
-    activeAgentTag + replaceHeader + "\n\n" + config.systemPrompt + extrasSuffix
+    activeAgentTag +
+    replaceHeader +
+    worktreeSection +
+    "\n\n" +
+    config.systemPrompt +
+    extrasSuffix
   )
 }
 

package/node_modules/pi-mcp-adapter/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.23.0] - 2026-08-11
+
+### Added
+- Added interactive callback URL pasting to `/mcp-auth` for OAuth flows running on remote or headless machines. Thanks @trevorleibert-mixpanel for PR #330.
+
+### Fixed
+- Stopped load-time MCP initialization from printing a TUI startup error when Pi action methods are not bound yet. Thanks @21307369 for issue #327.
+- Kept interactive OAuth authorization URLs clickable as a single terminal hyperlink. Thanks @rfccg for PR #329.
+
+## [2.22.0] - 2026-08-11
+
+### Added
+- Added the `pi-mcp-adapter/oauth` subpath for URL-bound OAuth token reuse by cooperating Pi extensions. Thanks @ThePhoenixCoding for issue #323.
+- Added `oauth.logoUri` for OAuth Dynamic Client Registration, with validation that requires an absolute HTTP(S) URL. Thanks @grinich for PR #321.
+
+### Fixed
+- Materialized binary MCP resources as private temporary files before model-facing output, with bounded per-session cleanup. Thanks @zenworr and @shaworr for PR #324.
+- Named OAuth callback pages and dynamic client registrations after rebranded Pi hosts, while preserving stock Pi defaults and avoiding guessed client homepages. Thanks @grinich for PR #320.
+
 ## [2.21.2] - 2026-08-09
 
 ### Fixed

package/node_modules/pi-mcp-adapter/README.md

@@ -153,6 +153,17 @@ A supplied `config` is a complete, isolated snapshot. It is not merged with file
 
 With `configPath` and no `config`, the adapter keeps normal file merge behavior, and that path takes precedence over argv and `--mcp-config`. The default export keeps the normal file-based behavior. OAuth credentials are stored in the operating system credential store and keyed by the configured server name; URL binding prevents credentials from being accepted for a different server URL. `settings.oauthDir` and `MCP_OAUTH_DIR` are used only as legacy plaintext import locations for older `tokens.json` files, not as credential namespaces. CSRF state and PKCE verifiers are flow-local, so concurrent authorization flows do not share transient secrets.
 
+Cooperating Pi extensions can use `pi-mcp-adapter/oauth` to reuse URL-bound OAuth tokens without deep-importing private files:
+
+```ts
+import { getMcpOAuthTokensForUrl, updateMcpOAuthTokensForUrl } from "pi-mcp-adapter/oauth";
+
+const tokens = await getMcpOAuthTokensForUrl("jira", "https://jira.example.com/mcp");
+updateMcpOAuthTokensForUrl("jira", "https://jira.example.com/mcp", { accessToken: "..." });
+```
+
+The public subpath exposes only token read/update helpers plus a status helper. The async read path uses the adapter's refresh logic before it returns tokens. The helpers keep secure-store storage, URL binding, refresh persistence, chunk handling, legacy import, and fail-closed credential-store errors. They do not expose client registration secrets, PKCE verifiers, or OAuth state.
+
 ### Runtime status snapshots
 
 Extensions can subscribe to the adapter's versioned shared event-bus channel instead of parsing `/mcp` or `mcp({})` output:
@@ -203,7 +214,8 @@ In the configuration examples below, `30000` is illustrative only. If `requestTi
 | `oauth.scope` | Requested OAuth scopes |
 | `oauth.redirectUri` | Exact localhost redirect URI for browser OAuth, including port and path, for providers that pre-register callbacks |
 | `oauth.clientName` | Client display name advertised during Dynamic Client Registration fallback |
-| `oauth.clientUri` | Client homepage URI advertised during Dynamic Client Registration fallback |
+| `oauth.clientUri` | Client homepage URI advertised during Dynamic Client Registration fallback. Defaults to `piConfig.clientUri` from the host's manifest when set, and is omitted rather than guessed under a rebranded host |
+| `oauth.logoUri` | Client logo URL advertised during Dynamic Client Registration fallback (RFC 7591 `logo_uri`). Must be an absolute `http(s)` URL — consent screens fetch it server-side, so local paths render nothing. Omitted from the registration request when unset |
 | `oauth.skipIssuerMetadataValidation` | `true` disables the OAuth authorization-server metadata issuer check for this server. This weakens OAuth mix-up protection and should only be used for known-misconfigured internal servers while their metadata is being fixed. |
 | `bearerToken` / `bearerTokenEnv` | Token or env var name; `bearerToken` supports `${VAR}` and `$env:VAR` interpolation. A leading `!` in `bearerToken` runs a command when the HTTP server connects; use `!!` for a literal leading `!`. |
 | `lifecycle` | `"lazy"` (default), `"eager"`, `"keep-alive"`, or `"lazy-keep-alive"` |
@@ -253,7 +265,9 @@ The adapter owns only its client socket and closes that connection when the Pi r
 
 ### Remote/headless OAuth
 
-If Pi is running on a remote server and cannot open a local browser, start OAuth through the proxy tool. Persistent OAuth still requires an available OS credential store; on headless Linux that usually means an unlocked Secret Service/libsecret keyring. The adapter fails closed instead of falling back to plaintext credentials when the secure store is unavailable.
+If Pi is running on a remote server, `/mcp-auth <server>` prints the authorization URL and opens a callback input. Open the URL in your local browser. After approval, the browser may fail to load the localhost callback page because localhost refers to your workstation; copy the full URL from its address bar and paste it into Pi. The input closes automatically instead when the browser can reach Pi's callback directly.
+
+The same flow is available through the proxy tool for non-interactive clients. Persistent OAuth still requires an available OS credential store; on headless Linux that usually means an unlocked Secret Service/libsecret keyring. The adapter fails closed instead of falling back to plaintext credentials when the secure store is unavailable.
 
 On Linux, if credential access fails because Pi inherited a revoked session keyring, the adapter uses a best-effort recovery path through `keyctl session - node <packaged helper>` so explicit re-authentication can write fresh credentials without killing a long-lived tmux server. This path requires `keyctl` and `node` on `PATH`; missing, locked, or otherwise unavailable credential stores still fail closed.
 
@@ -372,9 +386,10 @@ Oversized MCP tool/resource results are guarded by default so a single huge resp
 
 - Inline text output is capped at **50 KiB / 2,000 lines** (matching Pi's built-in `bash` guard). Larger output is truncated to a head preview and the full text is saved to a temp file whose path is included in the result, so the agent can `read`/`grep` it.
 - **Image content blocks pass through unchanged** — only text output is guarded. Images are delivered to the provider as native image content.
+- Binary resource blobs up to **10 MiB** are decoded to private temp files and replaced with file references. Each session is limited to **100 MiB** and **10,000 files**. The files are removed at session teardown.
 - In proxy mode, `details.mcpResult` is kept raw when its JSON is **≤ 16 KiB**; larger results are replaced with a compact summary (block counts, sizes, key previews) and the raw JSON is saved to a temp file. Direct tools keep their lean details and never carry `mcpResult`.
 
-Tune the limits with the object form:
+Tune the text and details limits with the object form:
 
 ```json
 {
@@ -384,7 +399,7 @@ Tune the limits with the object form:
 }
 ```
 
-Set `"outputGuard": false` — or the env kill switch `MCP_OUTPUT_GUARD=0` — to disable the guard and restore raw output behavior. Saved temp files are created with mode `0600` under the system temp directory and are not cleaned up automatically; note that spilled MCP output may contain sensitive data.
+Set `"outputGuard": false` — or the env kill switch `MCP_OUTPUT_GUARD=0` — to disable text and details guarding. Binary resource materialization and its safety limits remain active. Output-guard spill files are created with mode `0600` under the system temp directory and are not cleaned up automatically; note that spilled MCP output may contain sensitive data.
 
 ### MCP Scripting
 

package/node_modules/pi-mcp-adapter/agent-dir.ts

@@ -1,3 +1,4 @@
+import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 
@@ -18,3 +19,42 @@ export function getAgentDir(): string {
 export function getAgentPath(...segments: string[]): string {
   return join(getAgentDir(), ...segments);
 }
+
+/**
+ * What the host calls itself.
+ *
+ * pi supports rebranding through `piConfig.name` in the package.json that its
+ * `getPackageDir()` resolves, and distributions built on pi (arc, tau, …) point
+ * `PI_PACKAGE_DIR` at their own manifest. Read that manifest directly rather
+ * than importing pi: this package deliberately depends on pi-ai and pi-tui
+ * only, and `getAgentDir()` above reads its env var the same self-contained way.
+ *
+ * Falls back to "pi", which is what pi's own APP_NAME resolves to.
+ */
+function readPiConfig(): { name?: unknown; clientUri?: unknown } | undefined {
+  const dir = process.env.PI_PACKAGE_DIR?.trim()
+  if (!dir) return undefined
+  try {
+    const manifest = JSON.parse(readFileSync(join(resolve(dir), "package.json"), "utf8")) as {
+      piConfig?: { name?: unknown; clientUri?: unknown }
+    }
+    return manifest.piConfig
+  } catch {
+    return undefined
+  }
+}
+
+export function getAppName(): string {
+  const name = readPiConfig()?.name
+  return typeof name === "string" && name.trim() ? name.trim() : "pi"
+}
+
+/**
+ * Home page the host declares for itself, via `piConfig.clientUri` in the same
+ * manifest that carries `piConfig.name`. Only the distribution knows its own
+ * URL, so this is the one place it can come from without guessing.
+ */
+export function getAppClientUri(): string | undefined {
+  const uri = readPiConfig()?.clientUri
+  return typeof uri === "string" && uri.trim() ? uri.trim() : undefined
+}

package/node_modules/pi-mcp-adapter/commands.ts

@@ -25,6 +25,10 @@ import { loadOnboardingState, markSetupCompleted as persistSetupCompleted, markS
 import { openPath, resolveServerUrl, sanitizeTerminalText } from "./utils.ts";
 import { isAbortError } from "./runtime-owner.ts";
 
+function terminalHyperlink(label: string, url: string): string {
+  return `\u001B]8;;${sanitizeTerminalText(url)}\u001B\\${sanitizeTerminalText(label)}\u001B]8;;\u001B\\`;
+}
+
 export async function showStatus(state: McpExtensionState, ctx: ExtensionContext): Promise<void> {
   if (!ctx.hasUI) return;
 
@@ -273,11 +277,17 @@ export async function authenticateServer(
       ...(authStorageOptions.baseDir ? { authStorageOptions } : {}),
       onAuthorizationUrl: (authorizationUrl) => {
         ui.notify(
-          `Open this URL to authenticate ${serverName}:\n\n${authorizationUrl}\n\n` +
-          "After approving, return to Pi; the local callback will complete automatically.",
+          `Open this URL to authenticate ${serverName}:\n\n${terminalHyperlink(authorizationUrl, authorizationUrl)}\n\n` +
+          "After approving, Pi will complete automatically if the browser can reach its localhost callback. " +
+          "On a remote machine, copy the full localhost URL from the browser address bar and paste it into Pi.",
           "info"
         );
       },
+      onAuthorizationInput: (_authorizationUrl, inputSignal) => ui.input(
+        `Complete ${serverName} OAuth`,
+        "Paste the full callback URL, or wait for automatic completion",
+        { signal: inputSignal },
+      ),
       ...(signal ? { signal } : {}),
       ...(runtime ? { runtime } : {}),
     });

package/node_modules/pi-mcp-adapter/direct-tools.ts

@@ -8,7 +8,7 @@ import { abortable, throwIfAborted } from "./abort.ts";
 import { isServerCacheValid, parseDirectToolSelectors } from "./metadata-cache.ts";
 export { getMissingConfiguredDirectToolServers } from "./metadata-cache.ts";
 import { formatSchema } from "./tool-metadata.ts";
-import { resolveMcpResultContent, transformMcpContent } from "./tool-registrar.ts";
+import { resolveMcpResultContent, transformMcpContent, transformMcpResourceContents } from "./tool-registrar.ts";
 import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.ts";
 import { maybeStartUiSession, summarizeUiSessionResult, type UiSessionRuntime } from "./ui-session.ts";
 import { formatToolName, isServerDisabled, isToolAllowed, resolveToolPrefix } from "./types.ts";
@@ -20,6 +20,7 @@ import { combineAbortSignals, isAbortError } from "./runtime-owner.ts";
 import { ensureToolCallApproved } from "./tool-approval.ts";
 
 type ClientCallToolResult = Awaited<ReturnType<Client["callTool"]>>;
+type ClientReadResourceResult = Awaited<ReturnType<Client["readResource"]>>;
 
 const BUILTIN_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
 const INSTRUCTIONS_SNIPPET_LENGTH = 150;
@@ -435,7 +436,7 @@ export function createDirectToolExecutor(
       state.manager.incrementInFlight(spec.serverName);
 
       if (spec.resourceUri) {
-        const result = await withSessionRecovery(
+        const result = await withSessionRecovery<ClientReadResourceResult>(
           {
             manager: state.manager,
             config: state.config,
@@ -445,10 +446,7 @@ export function createDirectToolExecutor(
           spec.serverName,
           (conn) => conn.client.readResource({ uri: spec.resourceUri! }, requestOptions),
         );
-        const content = (result.contents ?? []).map(c => ({
-          type: "text" as const,
-          text: "text" in c ? c.text : ("blob" in c ? `[Binary data: ${(c as { mimeType?: string }).mimeType ?? "unknown"}]` : JSON.stringify(c)),
-        }));
+        const content = transformMcpResourceContents(result.contents ?? [], state.owner?.signal);
         const guarded = await guardMcpOutput(content.length > 0 ? content : [{ type: "text" as const, text: "(empty resource)" }], outputGuardOptions);
         return {
           content: guarded.content,
@@ -487,7 +485,7 @@ export function createDirectToolExecutor(
 
       if (result.isError) {
         const mcpContent = (result.content ?? []) as McpContent[];
-        const content = transformMcpContent(mcpContent);
+        const content = transformMcpContent(mcpContent, state.owner?.signal);
         const outputContent = content.length > 0 ? content : [{ type: "text" as const, text: "(empty result)" }];
         const schemaText = spec.inputSchema ? `\n\nExpected parameters:\n${formatSchema(spec.inputSchema)}` : "";
         const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, prefix: "Error: ", suffix: schemaText, emptyTextFallback: "Tool execution failed" });
@@ -497,7 +495,7 @@ export function createDirectToolExecutor(
         };
       }
 
-      const content = resolveMcpResultContent(result as Record<string, unknown>);
+      const content = resolveMcpResultContent(result as Record<string, unknown>, state.owner?.signal);
       const outputContent = content.length > 0 ? content : [{ type: "text" as const, text: "(empty result)" }];
       if (hasUi) {
         const uiSummary = summarizeUiSessionResult(uiSession);