@herbertgao/pi-extensions 2026.8.1 → 2026.8.3

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/renderer/transcript-refresh.ts

@@ -0,0 +1,91 @@
+import type { AssistantMessage } from "@earendil-works/pi-ai";
+import { AssistantMessageComponent, ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
+
+// pi-coding-agent 类型声明中 AssistantMessageComponent 仅能以 value 形式使用，
+// updateContent/lastMessage 用结构化类型访问。
+type TranscriptComponentInternals = {
+	lastMessage?: AssistantMessage;
+	updateContent(message: AssistantMessage): void;
+	invalidate?(): void;
+};
+
+/**
+ * 重绘单个已构造的组件：assistant 用最新消息重渲染（compact thinking），
+ * tool 强制 updateDisplay（其内容可能仍在旧 shell 容器中）。
+ * 不吞异常——由调用方决定如何处理失败。
+ */
+export function refreshTranscriptComponent(value: unknown): boolean {
+	if (!value || typeof value !== "object") return false;
+	if (value instanceof AssistantMessageComponent) {
+		const self = value as unknown as TranscriptComponentInternals;
+		if (self.lastMessage) self.updateContent(self.lastMessage);
+		else self.invalidate?.();
+		return true;
+	}
+	if (value instanceof ToolExecutionComponent) {
+		// updateDisplay 是私有方法，但它是 resume 后让内容回到正确
+		// shell 容器的唯一入口（原型链已含全局工具渲染补丁）。
+		(value as unknown as { updateDisplay(): void }).updateDisplay();
+		return true;
+	}
+	return false;
+}
+
+/**
+ * 扫描挂载树，重绘所有已构造的 assistant/tool 组件。
+ * 用于 reload/resume/compaction 后"pi 用原始原型重建、补丁事后才装"的场景。
+ * 遍历 value.children 与 value.getMountedRoots?.()（seen 集合防环），
+ * 单个组件失败用 try/catch 隔离，不影响其余组件。
+ */
+// compact-mode 把补丁暴露在此 Symbol 上（见 compact-mode.ts），避免循环依赖。
+const COMPACT_MODE_PATCH_KEY = Symbol.for("pi.ccstyle.compact-mode-patch");
+
+/**
+ * 补丁链序不变量：compact 模式下 compact-mode 必须位于 compact-thinking
+ * 外层（round 摘要才能聚合工具统计）。resume/reload 后若无新消息，
+ * message_update 触发的重新认领不会执行，这里在任何重绘前先断言一次。
+ * 断言幂等：链序已正确时无操作；mode=on 时也安全（外层走 pass-through）。
+ */
+function assertCompactModeOutermost(): void {
+	try {
+		const patch = (globalThis as any)[COMPACT_MODE_PATCH_KEY];
+		if (typeof patch?.assertAssistantOwnership === "function") {
+			patch.assertAssistantOwnership();
+		}
+	} catch {
+		// 无 compact-mode 补丁或断言失败时跳过，扫描仍会执行。
+	}
+}
+
+export function refreshMountedTranscript(tui?: unknown): void {
+	if (!tui || typeof (tui as any).getMountedRoots !== "function") return;
+	// 先修正链序再重绘：扫描触发 updateContent 时 compact-mode 已在外层。
+	assertCompactModeOutermost();
+	const seen = new Set<object>();
+	const visit = (value: any): void => {
+		if (!value || typeof value !== "object" || seen.has(value)) return;
+		seen.add(value);
+		if (Array.isArray(value)) {
+			for (const child of value) visit(child);
+			return;
+		}
+		try {
+			refreshTranscriptComponent(value);
+		} catch {
+			// 单个组件失败不阻断其余组件；后续 session_tree/重绘再试。
+		}
+		const children = value.children;
+		if (Array.isArray(children)) {
+			for (const child of children) visit(child);
+		}
+		try {
+			const mounted = value.getMountedRoots?.();
+			if (Array.isArray(mounted)) {
+				for (const root of mounted) visit(root);
+			}
+		} catch {
+			// 惰性 Proxy / 未挂载容器没有 mounted roots。
+		}
+	};
+	visit(tui);
+}

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.51",
+	"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.51",
+		"version": "0.8.54",
 		"repository": "https://github.com/minuque/pi-cc-extensions",
-		"commit": "b94bb6b2be2c32fc0857e6c7f8048faad3580835"
+		"commit": "8372ecaff7f079ab4452db47328c3238620a4885"
 	}
 }

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

@@ -41,6 +41,7 @@
 		"text": "text",
 		"thinkingText": "muted",
 		"selectedBg": "selectedBg",
+		"scrollbarThumb": "selectedBg",
 		"userMessageBg": "userMessageBg",
 		"userMessageText": "text",
 		"customMessageBg": "customMessageBg",

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

@@ -53,9 +53,9 @@
 		"toolTitle": "accentBright",
 		"toolOutput": "muted",
 		"mdHeading": "accentBright",
-		"mdLink": "blue",
+		"mdLink": "cyan",
 		"mdLinkUrl": "muted",
-		"mdCode": "purple",
+		"mdCode": "accentBright",
 		"mdCodeBlock": "text",
 		"mdCodeBlockBorder": "border",
 		"mdQuote": "muted",

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

@@ -12,20 +12,20 @@ pi install npm:@herbertgao/pi-stash
 
 ## Keybinding
 
-pi-stash overrides Pi's built-in `Ctrl+S` shortcuts. Remap them in `$PI_CODING_AGENT_DIR/keybindings.json` (default: `~/.pi/agent/keybindings.json`), then run `/reload`:
+pi-stash uses `Alt+S`, which does not conflict with Pi's built-in shortcuts.
 
-```json
-{
-  "app.models.save": ["ctrl+shift+s"],
-  "app.session.toggleSort": ["ctrl+shift+s"]
-}
-```
+### macOS
+
+On macOS, press `Option+S` (`Option` is the `Alt` key). If that inserts `ß` instead of triggering pi-stash, configure the terminal to send `Option` as Meta/Escape:
+
+- Terminal.app: **Settings → Profiles → Keyboard → Use Option as Meta key**.
+- iTerm2: **Settings → Profiles → Keys → Left Option key** (or **Right Option key**) → **Esc+**.
 
 ## Usage
 
-Press `Ctrl+S` with text in the editor to stash it. Pi clears the editor so you can send another message, then restores the draft as soon as that message is submitted.
+Press `Alt+S` with text in the editor to stash it. Pi clears the editor so you can send another message, then restores the draft as soon as that message is submitted.
 
-Press `Ctrl+S` again while the editor is empty to restore the draft manually. If the editor contains new text, pi-stash keeps both drafts unchanged and refuses to overwrite either one.
+Press `Alt+S` again while the editor is empty to restore the draft manually. If the editor contains new text, pi-stash keeps both drafts unchanged and refuses to overwrite either one.
 
 The stash belongs to the current session and survives reloads and restarts. Slash commands and `!` shell commands do not consume it.
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-stash",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Stash one pi draft and restore it after the next message.",
   "keywords": [
     "pi",

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

@@ -6,6 +6,7 @@ import type {
 } from "@earendil-works/pi-coding-agent"
 
 export const STASH_ENTRY_TYPE = "pi-stash-state"
+export const STASH_SHORTCUT = "alt+s"
 
 interface StashState {
   draft: string | null
@@ -92,7 +93,7 @@ export default function stashExtension(pi: ExtensionAPI) {
     if (shouldAutoRestore(event.source, event.text)) restoreDraft(ctx)
   })
 
-  pi.registerShortcut("ctrl+s", {
+  pi.registerShortcut(STASH_SHORTCUT, {
     description: "Stash or restore the current draft",
     handler: (ctx) => {
       const action = getShortcutAction(ctx.ui.getEditorText(), pendingDraft)

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

@@ -1,5 +1,17 @@
 # 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
+
+- [#15](https://github.com/HerbertGao/pi-extensions/pull/15) [`bc083d2`](https://github.com/HerbertGao/pi-extensions/commit/bc083d27c974f6b5239561dbd2295b6dd53526c0) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Skip unreadable or malformed custom agent files by default, warn when an earlier same-named definition remains active, and add opt-in strict startup validation.
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
@@ -7,6 +19,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- **`strictAgentFiles` — fail startup on a broken agent file instead of skipping it.** Off by default and applied only during initial extension activation; later per-call reloads remain tolerant.
+
+### Fixed
+
+- **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
 
 ### Fixed

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

@@ -180,6 +180,8 @@ Agents are discovered from three locations (higher priority wins):
 
 Project-level agents override global ones with the same name, so you can customize a global agent for a specific project. If both project locations define the same name, **`.pi/agents/` wins** — `.pi` stays the project authority; `.agents/agents/` is an additional read location for projects that keep their agent assets in the `.agents` workspace. The global location follows the upstream `PI_CODING_AGENT_DIR` env var — set it to relocate all pi-coding-agent state (agents, skills, settings) to a custom directory.
 
+An unreadable or unparseable agent file is skipped by default, with a warning that names the file and error. If the skipped file was overriding a same-named agent, another warning names the earlier file that remains active. Set `strictAgentFiles: true` in `subagents.json` (or `/agents → Settings → Strict agent files`) to fail startup on a broken file instead; mid-session reloads remain tolerant.
+
 ### Example: `.pi/agents/auditor.md`
 
 ```markdown
@@ -430,12 +432,14 @@ When on, each subagent spawn's effective model is validated against pi's own `en
 
 ## Persistent Settings
 
-Runtime tuning values set via `/agents` → Settings (max concurrency, default max turns, grace turns, nested depth, fallback agent, default join mode, scheduling on/off, scope models on/off, disable defaults on/off, output transcript on/off, tool description full/compact/custom, widget all/background/off) persist across pi restarts. Two files, merged on load:
+Runtime tuning values set via `/agents` → Settings (max concurrency, default max turns, grace turns, nested depth, fallback agent, default join mode, scheduling on/off, scope models on/off, strict agent files on/off, disable defaults on/off, output transcript on/off, tool description full/compact/custom, widget all/background/off) persist across pi restarts. Two files, merged on load:
 
 - **Global:** `~/.pi/agent/subagents.json` — your machine-wide defaults. Edit by hand; the `/agents` menu never writes here.
 - **Project:** `<cwd>/.pi/subagents.json` — per-project overrides. Written by `/agents` → Settings.
 
-**Precedence:** project overrides global on any field present in both. Missing fields fall back to the hardcoded defaults (max concurrency `4`, default max turns unlimited, grace turns `5`, nested depth `2`, join mode `smart`, defaults enabled).
+**Precedence:** project overrides global on any field present in both. Missing fields fall back to the hardcoded defaults (max concurrency `4`, default max turns unlimited, grace turns `5`, nested depth `2`, join mode `smart`, strict agent files disabled, defaults enabled).
+
+**Strict agent files** (`strictAgentFiles`, default `false`): fail extension startup when any discovered agent file is unreadable or malformed. Enable via `/agents → Settings → Strict agent files` or set `true` in `subagents.json`. Strictness applies only to startup; reloads before later Agent calls remain tolerant so a file edited incorrectly mid-session is skipped with a warning instead of aborting the call.
 
 **Nested depth** (`maxSubagentDepth`, default `2`): the hard ceiling on [nested delegation](#nested-subagents), counted from the main session (main = 0, its subagents = 1). `0` or `1` disables nesting project-wide regardless of any agent's `allowed_subagents`. Read when a subagent session is built, so a change applies to agents started after it.
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-subagents",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Claude Code-style autonomous subagents for Pi, with HerbertGao-maintained UI extensions.",
   "keywords": [
     "agent",
@@ -64,8 +64,8 @@
   },
   "x-upstream": {
     "package": "@tintinweb/pi-subagents",
-    "version": "0.14.3",
+    "version": "0.15.0",
     "repository": "https://github.com/tintinweb/pi-subagents",
-    "commit": "2966cd5"
+    "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/custom-agents.ts

@@ -8,6 +8,13 @@ import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent"
 import { BUILTIN_TOOL_NAMES } from "./agent-types.js"
 import type { AgentConfig, MemoryScope, ThinkingLevel } from "./types.js"
 
+interface WarningState {
+  previous: Set<string>
+  current: Set<string>
+}
+
+const warningHistoryByCwd = new Map<string, Set<string>>()
+
 /**
  * Scan for custom agent .md files from multiple locations.
  * Discovery hierarchy (higher priority wins):
@@ -20,15 +27,36 @@ import type { AgentConfig, MemoryScope, ThinkingLevel } from "./types.js"
  * authority; .agents/agents is an additional read location.
  * Any name is allowed — names matching defaults (e.g. "Explore") override them.
  */
-export function loadCustomAgents(cwd: string): Map<string, AgentConfig> {
+export function loadCustomAgents(
+  cwd: string,
+  strict = false,
+): Map<string, AgentConfig> {
   const globalDir = join(getAgentDir(), "agents")
   const workspaceProjectDir = join(cwd, ".agents", "agents")
   const projectDir = join(cwd, ".pi", "agents")
 
   const agents = new Map<string, AgentConfig>()
-  loadFromDir(globalDir, agents, "global") // lowest priority
-  loadFromDir(workspaceProjectDir, agents, "project") // shared workspace
-  loadFromDir(projectDir, agents, "project") // highest priority (overwrites)
+  const skippedOverrides = new Set<string>()
+  const warnings: WarningState = {
+    previous: warningHistoryByCwd.get(cwd) ?? new Set(),
+    current: new Set(),
+  }
+
+  loadFromDir(globalDir, agents, "global", strict, warnings, skippedOverrides) // lowest priority
+  loadFromDir(
+    workspaceProjectDir,
+    agents,
+    "project",
+    strict,
+    warnings,
+    skippedOverrides,
+  ) // shared workspace
+  loadFromDir(projectDir, agents, "project", strict, warnings, skippedOverrides) // highest priority (overwrites)
+
+  for (const name of skippedOverrides) {
+    warnSkippedOverride(name, agents, warnings)
+  }
+  warningHistoryByCwd.set(cwd, warnings.current)
   return agents
 }
 
@@ -37,6 +65,9 @@ function loadFromDir(
   dir: string,
   agents: Map<string, AgentConfig>,
   source: "project" | "global",
+  strict: boolean,
+  warnings: WarningState,
+  skippedOverrides: Set<string>,
 ): void {
   if (!existsSync(dir)) return
 
@@ -49,16 +80,15 @@ function loadFromDir(
 
   for (const file of files) {
     const name = basename(file, ".md")
+    const path = join(dir, file)
 
-    let content: string
-    try {
-      content = readFileSync(join(dir, file), "utf-8")
-    } catch {
+    const parsed = readAgentFile(path, strict, warnings)
+    if (!parsed) {
+      skippedOverrides.add(name)
       continue
     }
-
-    const { frontmatter: fm, body } =
-      parseFrontmatter<Record<string, unknown>>(content)
+    skippedOverrides.delete(name)
+    const { frontmatter: fm, body } = parsed
 
     const { builtinToolNames, extSelectors } = parseToolsField(fm.tools)
 
@@ -97,10 +127,54 @@ function loadFromDir(
       isolation: fm.isolation === "worktree" ? "worktree" : undefined,
       enabled: fm.enabled !== false, // default true; explicitly false disables
       source,
+      sourcePath: path,
     })
   }
 }
 
+/**
+ * Read and parse one agent file, or warn and return undefined for the caller to
+ * skip. Under strict mode the same failure aborts startup while naming the file.
+ */
+function readAgentFile(
+  path: string,
+  strict: boolean,
+  warnings: WarningState,
+): { frontmatter: Record<string, unknown>; body: string } | undefined {
+  try {
+    return parseFrontmatter<Record<string, unknown>>(
+      readFileSync(path, "utf-8"),
+    )
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err)
+    if (strict) throw new Error(`${path}: ${reason}`)
+    warnIfNew(`Skipping agent file ${path}: ${reason}`, warnings)
+    return undefined
+  }
+}
+
+/** Warn when a broken higher-priority file exposes an earlier definition. */
+function warnSkippedOverride(
+  name: string,
+  agents: Map<string, AgentConfig>,
+  warnings: WarningState,
+): void {
+  const surviving = agents.get(name)
+  if (!surviving?.sourcePath || surviving.enabled === false) return
+  warnIfNew(
+    `Agent "${name}" now loads from ${surviving.sourcePath} instead`,
+    warnings,
+  )
+}
+
+/** Warn once while an error is unchanged, but report it again after recovery. */
+function warnIfNew(message: string, warnings: WarningState): void {
+  if (warnings.current.has(message)) return
+  warnings.current.add(message)
+  if (warnings.previous.has(message)) return
+  console.warn(`[pi-subagents] ${message}`)
+}
+
 // ---- Field parsers ----
 // All follow the same convention: omitted → default, "none"/empty → nothing, value → exact.