@herbertgao/pi-extensions 2026.10.1 → 2026.10.3

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

@@ -0,0 +1,441 @@
+import { createHash } from "node:crypto"
+import {
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  realpathSync,
+  writeFileSync,
+} from "node:fs"
+import { homedir } from "node:os"
+import { basename, isAbsolute, join, relative, sep } from "node:path"
+import { Type } from "@earendil-works/pi-ai"
+import {
+  defineTool,
+  parseFrontmatter,
+  type ExtensionAPI,
+} from "@earendil-works/pi-coding-agent"
+
+export const CATALOG_ROOT = join(homedir(), ".agency-agents")
+
+// Top-level catalog directories that hold no source personas.
+const NON_PERSONA_DIRS = new Set([
+  "examples",
+  "integrations",
+  "scripts",
+  "strategy",
+])
+
+export type Card = { path: string; name: string; description: string }
+export type ScoredCard = Card & { score: number }
+
+function realRoot(root: string): string {
+  try {
+    return realpathSync(root)
+  } catch {
+    throw new Error(
+      `Agency Agents catalog not found at ${root}; clone https://github.com/msitarzewski/agency-agents there`,
+    )
+  }
+}
+
+/** Every `<division>/**\/*.md` with `name` and `description` frontmatter, sorted by path. */
+export function loadCatalog(root: string): Card[] {
+  const base = realRoot(root)
+  const cards: Card[] = []
+  const walk = (dir: string): void => {
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      const path = join(dir, entry.name)
+      if (entry.name.startsWith(".")) continue
+      if (entry.isDirectory()) {
+        if (dir !== base || !NON_PERSONA_DIRS.has(entry.name)) walk(path)
+      } else if (dir !== base && entry.isFile() && path.endsWith(".md")) {
+        try {
+          const { name, description } = parseFrontmatter(
+            readFileSync(path, "utf8"),
+          ).frontmatter
+          if (typeof name === "string" && typeof description === "string") {
+            const relativePath = relative(base, path).split(sep).join("/")
+            cards.push({ path: relativePath, name, description })
+          }
+        } catch {
+          // Malformed YAML frontmatter: not a usable persona.
+        }
+      }
+    }
+  }
+  walk(base)
+  return cards.toSorted((a, b) => a.path.localeCompare(b.path))
+}
+
+const STOP_WORDS = new Set(
+  "a an and are as at be by for from in is it of on or that the this to with".split(
+    " ",
+  ),
+)
+
+export function tokenize(text: string): string[] {
+  return text
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .toLowerCase()
+    .split(/[^\p{L}\p{N}]+/u)
+    .filter((token) => token && !STOP_WORDS.has(token))
+    .map((token) =>
+      token.length > 3 && token.endsWith("s") && !token.endsWith("ss")
+        ? token.slice(0, -1)
+        : token,
+    )
+}
+
+/** Okapi BM25 over name, path and description, keeping at most `perDivision` cards per division. */
+export function searchCatalog(
+  cards: Card[],
+  query: string,
+  limit = 6,
+  perDivision = 2,
+): ScoredCard[] {
+  const terms = [...new Set(tokenize(query))]
+  const docs = cards.map((card) =>
+    tokenize(`${card.name} ${card.path} ${card.description}`),
+  )
+  const avgLength =
+    docs.reduce((sum, doc) => sum + doc.length, 0) / (docs.length || 1)
+  const idf = terms.map((term) => {
+    const df = docs.filter((doc) => doc.includes(term)).length
+    return Math.log(1 + (docs.length - df + 0.5) / (df + 0.5))
+  })
+  const taken = new Map<string, number>()
+  return cards
+    .map((card, i) => {
+      const doc = docs[i]
+      let score = 0
+      terms.forEach((term, t) => {
+        const tf = doc.filter((token) => token === term).length
+        if (tf)
+          score +=
+            (idf[t] * tf * 2.2) /
+            (tf + 1.2 * (0.25 + (0.75 * doc.length) / avgLength))
+      })
+      return { ...card, score: Math.round(score * 100) / 100 }
+    })
+    .filter((card) => card.score > 0)
+    .toSorted((a, b) => b.score - a.score)
+    .filter((card) => {
+      const division = card.path.split("/")[0]
+      const count = (taken.get(division) ?? 0) + 1
+      taken.set(division, count)
+      return count <= perDivision
+    })
+    .slice(0, limit)
+}
+
+/** A catalog persona's body without frontmatter. */
+export function loadPersona(root: string, persona: string): string {
+  const base = realRoot(root)
+  const file = realpathSync(isAbsolute(persona) ? persona : join(base, persona))
+  if (!file.startsWith(base + sep) || !file.endsWith(".md")) {
+    throw new Error(`${persona} is not a persona file inside ${root}`)
+  }
+  const { frontmatter, body } = parseFrontmatter(readFileSync(file, "utf8"))
+  if (typeof frontmatter.name !== "string") {
+    throw new Error(`${persona} has no persona frontmatter`)
+  }
+  if (/<\/?persona>/i.test(body)) {
+    throw new Error(`${persona} contains a reserved <persona> delimiter`)
+  }
+  return body
+}
+
+/** Fills `{{persona}}` and `{{shared}}` in one pass, so inserted text is never rescanned or `$`-expanded. */
+export function fillPrompt(
+  template: string,
+  values: { persona?: string; shared?: string },
+): string {
+  for (const key of ["persona", "shared"] as const) {
+    const count = template.split(`{{${key}}}`).length - 1
+    if (values[key] === undefined && count > 0) {
+      throw new Error(`prompt contains {{${key}}} but no ${key} was given`)
+    }
+    if (values[key] !== undefined && count !== 1) {
+      throw new Error(`prompt must contain {{${key}}} exactly once`)
+    }
+  }
+  return template.replace(
+    /\{\{(persona|shared)\}\}/g,
+    (_match, key: "persona" | "shared") => values[key] ?? "",
+  )
+}
+
+const sha256 = (text: string) => createHash("sha256").update(text).digest("hex")
+const NullableString = Type.Union([Type.String(), Type.Null()])
+
+/** Some models fill every optional parameter with "" or 0; every such value here means omitted. */
+export function dropPlaceholders(args: unknown): any {
+  return JSON.parse(
+    JSON.stringify(args ?? {}),
+    function (this: unknown, _key: string, value: unknown) {
+      return !Array.isArray(this) && (value === "" || value === 0)
+        ? undefined
+        : value
+    },
+  )
+}
+
+export function agencyTools(root = CATALOG_ROOT) {
+  const search = defineTool({
+    name: "agency_search",
+    label: "Agency Search",
+    description:
+      "Search the local Agency Agents catalog (~/.agency-agents) without listing or reading it into context. Each query (one per review axis or touchpoint) returns up to `limit` cards (catalog path, name, description) ranked by BM25 over name, path and description, with at most `per_division` cards per top-level division. Pick personas from the cards; read a persona file only if its card is not enough.",
+    promptSnippet: "Shortlist Agency Agents personas by query",
+    prepareArguments: dropPlaceholders,
+    parameters: Type.Object({
+      queries: Type.Array(Type.String(), {
+        minItems: 1,
+        description: "One query per axis or touchpoint.",
+      }),
+      limit: Type.Optional(
+        Type.Integer({
+          minimum: 1,
+          description: "Cards per query. Default 6.",
+        }),
+      ),
+      per_division: Type.Optional(
+        Type.Integer({
+          minimum: 1,
+          description: "Cards per division and query. Default 2.",
+        }),
+      ),
+    }),
+    outputSchema: Type.Object({
+      catalog: Type.String(),
+      personas: Type.Integer(),
+      results: Type.Array(
+        Type.Object({
+          query: Type.String(),
+          cards: Type.Array(
+            Type.Object({
+              path: Type.String(),
+              name: Type.String(),
+              description: Type.String(),
+              score: Type.Number(),
+            }),
+          ),
+        }),
+      ),
+    }),
+    async execute(_toolCallId, params) {
+      const cards = loadCatalog(root)
+      const results = params.queries.map((query) => ({
+        query,
+        cards: searchCatalog(cards, query, params.limit, params.per_division),
+      }))
+      const text = results
+        .map(
+          (result) =>
+            `## ${result.query}\n` +
+            (result.cards
+              .map(
+                (card) => `- ${card.path} — ${card.name}: ${card.description}`,
+              )
+              .join("\n") || "(no match)"),
+        )
+        .join("\n\n")
+      return {
+        content: [
+          {
+            type: "text",
+            text: `${cards.length} personas in ${root}\n\n${text}`,
+          },
+        ],
+        details: {},
+        structuredContent: { catalog: root, personas: cards.length, results },
+      }
+    },
+  })
+
+  const dispatch = defineTool({
+    name: "agency_dispatch",
+    label: "Agency Dispatch",
+    description:
+      "Run subagents in parallel through pi-subagents' Agent tool and return all results together. Runs are foreground, so no completion notifications follow. Each run's prompt is sent as written after `{{persona}}` is replaced by the persona file's body (frontmatter removed) and `{{shared}}` by `shared` or the text of `shared_file`, so persona text never passes through your context. Personas outside the catalog or containing <persona> delimiters are rejected. Results include the SHA-256 of each sent prompt; `record_dir` also saves <id>.prompt.txt and <id>.return.txt and never overwrites. Defaults: subagent_type general-purpose, isolated true (built-in tools only).",
+    promptSnippet:
+      "Dispatch catalog personas to parallel subagents without reading them",
+    prepareArguments: dropPlaceholders,
+    promptGuidelines: [
+      "For Agency Agents personas, use agency_search and agency_dispatch instead of listing the catalog or reading persona files into context.",
+    ],
+    parameters: Type.Object({
+      runs: Type.Array(
+        Type.Object({
+          prompt: Type.String({
+            description:
+              "Sent as written. Contains {{persona}} exactly once when persona is set, and {{shared}} exactly once when shared or shared_file is set.",
+          }),
+          persona: Type.Optional(
+            Type.String({
+              description:
+                "Persona file relative to the catalog, e.g. security/security-architect.md, or an absolute path inside it.",
+            }),
+          ),
+          id: Type.Optional(
+            Type.String({
+              description:
+                "Record file stem: letters, digits, dot, dash or underscore. Default: 1-based run index.",
+            }),
+          ),
+          description: Type.Optional(
+            Type.String({ description: "3-5 word label shown in the UI." }),
+          ),
+        }),
+        { minItems: 1 },
+      ),
+      shared: Type.Optional(
+        Type.String({ description: "Text for {{shared}} in every prompt." }),
+      ),
+      shared_file: Type.Optional(
+        Type.String({ description: "File whose text fills {{shared}}." }),
+      ),
+      subagent_type: Type.Optional(Type.String()),
+      isolated: Type.Optional(Type.Boolean()),
+      model: Type.Optional(Type.String()),
+      thinking: Type.Optional(Type.String()),
+      max_turns: Type.Optional(Type.Integer({ minimum: 1 })),
+      record_dir: Type.Optional(
+        Type.String({
+          description:
+            "Absolute directory for <id>.prompt.txt and <id>.return.txt (mode 0600).",
+        }),
+      ),
+    }),
+    outputSchema: Type.Object({
+      results: Type.Array(
+        Type.Object({
+          id: Type.String(),
+          persona: NullableString,
+          promptSha256: Type.String(),
+          status: Type.String(),
+          agentId: NullableString,
+          model: NullableString,
+          output: Type.String(),
+        }),
+      ),
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      if (!ctx?.tools?.some((tool) => tool.name === "Agent")) {
+        throw new Error(
+          "agency_dispatch needs the Agent tool from pi-subagents",
+        )
+      }
+      if (params.shared !== undefined && params.shared_file !== undefined) {
+        throw new Error("Give shared or shared_file, not both")
+      }
+      const shared =
+        params.shared_file === undefined
+          ? params.shared
+          : readFileSync(params.shared_file, "utf8")
+      const runs = params.runs.map((run, index) => {
+        const id = run.id ?? String(index + 1)
+        if (!/^[\w.-]+$/.test(id)) throw new Error(`Invalid run id: ${id}`)
+        const prompt = fillPrompt(run.prompt, {
+          persona:
+            run.persona === undefined
+              ? undefined
+              : loadPersona(root, run.persona),
+          shared,
+        })
+        return { ...run, id, prompt }
+      })
+      if (new Set(runs.map((run) => run.id)).size !== runs.length) {
+        throw new Error("Run ids must be unique")
+      }
+
+      const recordDir = params.record_dir
+      const record = (name: string, text: string) =>
+        recordDir &&
+        writeFileSync(join(recordDir, name), text, { flag: "wx", mode: 0o600 })
+      if (recordDir !== undefined) {
+        if (!isAbsolute(recordDir)) {
+          throw new Error("record_dir must be an absolute path")
+        }
+        mkdirSync(recordDir, { recursive: true, mode: 0o700 })
+        const existing = runs
+          .flatMap((run) => [`${run.id}.prompt.txt`, `${run.id}.return.txt`])
+          .map((name) => join(recordDir, name))
+          .find((path) => existsSync(path))
+        if (existing) throw new Error(`${existing} already exists`)
+        for (const run of runs) record(`${run.id}.prompt.txt`, run.prompt)
+      }
+
+      const options = Object.fromEntries(
+        Object.entries({
+          model: params.model,
+          thinking: params.thinking,
+          max_turns: params.max_turns,
+        }).filter(([, value]) => value !== undefined),
+      )
+      const outcomes = await Promise.all(
+        runs.map((run) =>
+          ctx.executeTool("Agent", {
+            subagent_type: params.subagent_type ?? "general-purpose",
+            description:
+              run.description ??
+              (run.persona ? basename(run.persona, ".md") : `agency ${run.id}`),
+            prompt: run.prompt,
+            run_in_background: false,
+            isolated: params.isolated ?? true,
+            ...options,
+          }),
+        ),
+      )
+
+      const results = outcomes.map(({ result, isError }, i) => {
+        const run = runs[i]
+        const text = result.content
+          .map((part) => (part.type === "text" ? part.text : ""))
+          .join("")
+        const details = (result.details ?? {}) as {
+          status?: string
+          agentId?: string
+          modelName?: string
+        }
+        // pi-subagents prefixes foreground output with "Agent completed in …\n\n".
+        const header = /^(?:[\s\S]*?\n)?Agent completed in [^\n]*\n\n/.exec(
+          text,
+        )
+        const output = header ? text.slice(header[0].length) : text
+        record(`${run.id}.return.txt`, output)
+        return {
+          id: run.id,
+          persona: run.persona ?? null,
+          promptSha256: sha256(run.prompt),
+          status: isError
+            ? "error"
+            : (details.status ?? (header ? "completed" : "unknown")),
+          agentId: details.agentId ?? null,
+          model: details.modelName ?? null,
+          output,
+        }
+      })
+      const text = results
+        .map(
+          (run) =>
+            `## ${run.id}${run.persona ? ` ${run.persona}` : ""}: ${run.status}\nsha256 ${run.promptSha256}\n\n${run.output}`,
+        )
+        .join("\n\n")
+      return {
+        content: [{ type: "text", text }],
+        details: {},
+        structuredContent: { results },
+      }
+    },
+  })
+
+  return { search, dispatch }
+}
+
+export default function piAgency(pi: ExtensionAPI): void {
+  const { search, dispatch } = agencyTools()
+  pi.registerTool(search)
+  pi.registerTool(dispatch)
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/compact-thinking.ts

@@ -324,7 +324,7 @@ function hiddenPreviewHint(
 	return undefined;
 }
 
-const expandedThinking = new Set<number>();
+const expandedThinking = new Set<string>();
 
 /** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、展开卡单击整块收起（拖动选择文本时不收起）。 */
 export class ThinkingPreviewBlock implements Component {
@@ -335,7 +335,6 @@ export class ThinkingPreviewBlock implements Component {
 	readonly runStartIndex: number;
 	private style: (text: string) => string;
 	private theme: Theme | undefined;
-	private _expanded: boolean;
 	private hintHovered = false;
 	private collapsedMemo:
 		| {
@@ -363,7 +362,6 @@ export class ThinkingPreviewBlock implements Component {
 		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
-		this._expanded = expandedThinking.has(messageTimestamp);
 	}
 
 	private paint(color: string, text: string): string {
@@ -372,18 +370,20 @@ export class ThinkingPreviewBlock implements Component {
 			: text;
 	}
 
+	/** 展开态按消息时间戳 + run 序号共享：面板重排/内容重建换掉实例后，
+	 *  布局里的旧实例与 render 的新实例同键，点谁都能展开。 */
 	get expanded(): boolean {
-		return this._expanded;
+		return expandedThinking.has(`${this.messageTimestamp}:${this.runStartIndex}`);
 	}
 
 	setExpanded(expanded: boolean): void {
-		if (this._expanded !== expanded) this.collapsedMemo = undefined;
-		this._expanded = expanded;
-		if (expanded) expandedThinking.add(this.messageTimestamp);
+		const key = `${this.messageTimestamp}:${this.runStartIndex}`;
+		if (expanded) expandedThinking.add(key);
 		else {
-			expandedThinking.delete(this.messageTimestamp);
+			expandedThinking.delete(key);
 			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
 		}
+		this.collapsedMemo = undefined;
 	}
 
 	setHintHovered(hovered: boolean): void {
@@ -392,7 +392,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private headingLines(width: number, hiddenLines: number, padding: number): string[] {
-		const hint = this._expanded
+		const hint = this.expanded
 			? undefined
 			: hiddenPreviewHint(hiddenLines, Boolean(this.text) && config.previewLines <= 0);
 		if (!hint) return new Text(this.heading, padding, 0).render(width);
@@ -412,10 +412,10 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private bodyLines(width: number, padding: number): { lines: string[]; hiddenLines: number } {
-		if (!this.text || (config.previewLines <= 0 && !this._expanded)) {
+		if (!this.text || (config.previewLines <= 0 && !this.expanded)) {
 			return { lines: [], hiddenLines: 0 };
 		}
-		if (this._expanded) {
+		if (this.expanded) {
 			return {
 				lines: wrapExpandedThinking(this.messageTimestamp, this.runStartIndex, this.text, width),
 				hiddenLines: 0,
@@ -426,7 +426,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	render(width: number) {
-		if (this._expanded) {
+		if (this.expanded) {
 			const innerWidth = Math.max(1, width - 2);
 			const body = this.bodyLines(innerWidth, 0);
 			const heading = this.headingLines(innerWidth, 0, 0);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/compact-mode.ts

@@ -535,6 +535,12 @@ function isToolComponent(value: any): boolean {
 	return value instanceof ToolExecutionComponent;
 }
 
+/** 成员离开回合后不再算外层面板，避免点别的卡时被跳过收起。 */
+function clearRoundAnchor(component: any): void {
+	if (!component || Object.getOwnPropertyDescriptor(component, "roundAnchor")?.get) return;
+	delete component.roundAnchor;
+}
+
 function detachAssistantExpansion(component: any): void {
 	if (
 		typeof component?.[ASSISTANT_SET_EXPANDED_KEY] !== "function" ||
@@ -546,6 +552,7 @@ function detachAssistantExpansion(component: any): void {
 	delete component[ASSISTANT_SET_EXPANDED_KEY];
 	delete component[ASSISTANT_TOGGLE_ROUND_KEY];
 	delete component[ASSISTANT_REENTRY_KEY];
+	clearRoundAnchor(component);
 }
 
 /** 供 mouse-interaction 识别可点击的 compact assistant 行（仅 compact 模式下生效）。 */
@@ -703,8 +710,9 @@ function compactEditWriteLine(
 	// 展开卡 Box(1,1) 已 pad；折叠行自己留 1 格前导空格
 	const iconPart = `${options.flushLeft ? "" : " "}${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
-	const hintText =
-		options.hint !== false && component.expanded !== true ? ` · ${showMoreHintText()}` : "";
+	const clickable = options.hint !== false && component.expanded !== true;
+	const clickText = clickable ? showMoreHintText() : "";
+	const hintText = clickable ? ` · ${clickText}` : "";
 	const fixedWidth =
 		visibleWidth(iconPart) +
 		visibleWidth(namePart) +
@@ -713,7 +721,11 @@ function compactEditWriteLine(
 	const pathWidth = Math.max(0, width - fixedWidth - (path ? 1 : 0));
 	const pathPart =
 		pathWidth > 0 && path ? ` ${formatDisplayPath(path, component.cwd, pathWidth)}` : "";
-	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintText ? theme.fg("dim", hintText) : ""}`;
+	// 圆点保持 dim；hover 只高亮可点击文字，与 compact 摘要行一致
+	const hintPart = clickable
+		? `${theme.fg("dim", " · ")}${theme.fg(isToolCallHovered(component.toolCallId) ? "text" : "dim", clickText)}`
+		: "";
+	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintPart}`;
 	return ["", truncateToWidth(line, width, "")];
 }
 
@@ -949,8 +961,11 @@ function compactAssistantLineComponent(
 					text = `${styleCompactThinkingText(heading, theme)}${plain(tools)}`;
 				}
 			}
-			const hintColor = hover ? "text" : "dim";
-			const line = `${text}${hintText ? theme.fg(hintColor, hintText) : ""}`;
+			// 圆点保持 dim；hover 只高亮可点击文字。
+			const hintPart = hint
+				? `${theme.fg("dim", " · ")}${theme.fg(hover ? "text" : "dim", showMoreHintText())}`
+				: "";
+			const line = `${text}${hintPart}`;
 			const rendered = `${" ".repeat(pad)}${truncateToWidth(line, available, "")}`;
 			const lines = leadingBlank ? ["", rendered] : [rendered];
 			paint = {
@@ -1695,6 +1710,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		for (const [component, message] of round.messages) {
 			component.lastMessage = message;
 			ensureAssistantSetExpanded(component);
+			// 尾行用 getter 指向 anchor；成员用同名属性，点内部工具时能认出同一回合。
+			if (!Object.getOwnPropertyDescriptor(component, "roundAnchor")?.get) {
+				component.roundAnchor = round.anchor;
+			}
 			component[ASSISTANT_TOGGLE_ROUND_KEY] = (expanded: boolean) => {
 				const wasExpanded = round.anchor.expanded === true;
 				if (expanded && !wasExpanded) capturePanelViewport(round.anchor);
@@ -1946,7 +1965,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (hasToolCalls) {
 			let round = roundByComponent.get(this);
 			if (hasText && (!round || round.anchor !== this)) {
-				if (round) round.messages.delete(this);
+				if (round) {
+					round.messages.delete(this);
+					clearRoundAnchor(this);
+				}
 				if (activeRound) finishRound(activeRound);
 				round = createRound(this, message);
 				roundByComponent.set(this, round);
@@ -1966,6 +1988,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 最终回答开始后，当前组件恢复原生文本；它已完成的 thinking
 				// 留在上一轮摘要中，避免再次生成独立 Thought 行。
 				round.messages.delete(this);
+				clearRoundAnchor(this);
 				round.detachedMessages.push(previousMessage);
 				roundByComponent.delete(this);
 				finishRound(round);
@@ -1975,6 +1998,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 围观态下 anchor 还挂着槽位卡，必须重绘才能收回。
 				endRound(round, true);
 				roundByComponent.delete(this);
+				clearRoundAnchor(this);
 				return passThroughAssistant(this, message);
 			}
 			if (activeRound) finishRound(activeRound);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/default-mode.ts

@@ -85,8 +85,8 @@ type GlobalToolRenderPatch = {
 	prototype: any;
 	active: boolean;
 	mode: () => CompactStyleMode;
-	wrap: (tool: any) => any;
-	byDefinition: WeakMap<object, any>;
+	wrap: (tool: any, toolName: string) => any;
+	byDefinition: WeakMap<object, Map<string, any>>;
 	byName: Map<string, any>;
 	downstream: ToolRenderMethods;
 	installed: ToolRenderMethods;
@@ -217,8 +217,8 @@ function renderExpandedTaskResult(
 function createCcstyleTool(
 	originalTool: any,
 	writeExecutionMetadata: WriteExecutionMetadataStore,
+	toolName: string,
 ): any {
-	const toolName = originalTool.name;
 	const label = originalTool.label || toolName;
 	const defaultTitle = label === toolName ? humanizeToolLabel(label) : label;
 	// MCP 工具直接用 adapter 暴露的真实工具名，不做人性化
@@ -459,19 +459,24 @@ function shouldGloballyStyleTool(component: any, patch: GlobalToolRenderPatch):
 
 function getGloballyStyledTool(component: any, patch: GlobalToolRenderPatch): any {
 	const definition = component.toolDefinition ?? component.builtInToolDefinition;
+	const name = String(component.toolName || definition?.name || "tool");
 	if (definition && typeof definition === "object") {
-		let wrapped = patch.byDefinition.get(definition);
+		let byName = patch.byDefinition.get(definition);
+		if (!byName) {
+			byName = new Map();
+			patch.byDefinition.set(definition, byName);
+		}
+		let wrapped = byName.get(name);
 		if (!wrapped) {
-			wrapped = patch.wrap(definition);
-			patch.byDefinition.set(definition, wrapped);
+			wrapped = patch.wrap(definition, name);
+			byName.set(name, wrapped);
 		}
 		return wrapped;
 	}
 
-	const name = String(component.toolName || "tool");
 	let wrapped = patch.byName.get(name);
 	if (!wrapped) {
-		wrapped = patch.wrap({ name, label: name });
+		wrapped = patch.wrap({ name, label: name }, name);
 		patch.byName.set(name, wrapped);
 	}
 	return wrapped;
@@ -568,7 +573,8 @@ function installGlobalToolRendering(
 		prototype,
 		active: true,
 		mode: () => config.mode,
-		wrap: (tool: any) => createCcstyleTool(tool, writeExecutionMetadata),
+		wrap: (tool: any, toolName: string) =>
+			createCcstyleTool(tool, writeExecutionMetadata, toolName),
 		byDefinition: new WeakMap(),
 		byName: new Map(),
 		downstream,