pi-cc-extensions 0.9.4 → 0.9.6

package/README.en.md

@@ -29,7 +29,7 @@ Run `/reload` after installation.
 | --------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------- |
 | Claude Code UI              | Tool summaries, expand/collapse, rich edit/write diffs, and `on` / `compact` / `off` modes | `/ccstyle`                                      |
 | Markdown enhancements       | Mermaid diagrams, admonitions, URL linking, and more                                      | Automatic                                       |
-| Fullscreen mode             | Tool card/group expand and collapse, previews, hover highlight, and a back-to-bottom button | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
+| Fullscreen mode             | Tool card/group expand and collapse on click, previews, hover highlight, and a back-to-bottom button | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
 | Settings panel              | `Style / Features / UI / Diff / Thinking / Footer` tabs                                   | `/ccstyle`                                      |
 | Context inspection          | Usage breakdown and previews for the system prompt, memory, skills, tools definition, and messages | `/context`                                      |
 | Session/Subagent references | Search and inject effective context from previous Sessions or existing SubAgents          | `@`                                             |
@@ -50,7 +50,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 
   // features
   "enableSessionReference": true,          // @ session references
-  "enableSubagentAutocomplete": true,      // @ subagent completion and delegation hints
+  "enableSubagentAutocomplete": true,      // @subagent:[name] completion and delegation hints
   "enableContextCommand": true,            // /context usage check
   "enableAgentSummary": true,              // per-turn tool summary
   "enableWorkingMessage": true,            // Working... bottom token/elapsed
@@ -59,7 +59,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   // ui
   "expandedInputMaxLines": 5,              // expanded tool Input lines; overflow shows a footer hint
   "expandedOutputMaxLines": 10,            // expanded tool Output lines; overflow shows a footer hint
-  "expandedPreviewMaxLines": 40,           // max lines for expanded diff/TaskList bodies
+  "expandedPreviewMaxLines": 40,           // max lines for expanded TaskList bodies (expanded diffs always show all)
   "inputClip": 100,                        // tool summary path/command clip length
   "showStartupHeader": true,               // startup header (logo + tips) toggle
   "scrollStepLines": 3,                    // fullscreen wheel scroll step
@@ -89,7 +89,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ```
 
 > [!TIP]
-> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. When expanded Input/Output exceeds the line cap, the footer `… +N more lines • click to show more` opens a full preview. Double-click an expanded panel to collapse it.
+> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. An expanded diff always shows every line; when expanded Input/Output exceeds the line cap, the footer `… +N more lines • click to show more` opens a full preview. Click to collapse (dragging inside the card selects text).
 
 > [!NOTE]
 > **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or the Mermaid diagrams option in `/settings`. Default `streaming` redraws per frame; `final` renders once at completion.

package/README.md

@@ -29,7 +29,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 | --------------------- | ------------------------------------------------------------------------------- | ----------------------------------------------- |
 | Claude Code UI        | 工具摘要、折叠展开、rich edit/write diff，以及`on` / `compact` / `off` 三种模式 | `/ccstyle`                                      |
 | Markdown 增强         | Mermaid 图、提示框、URL 链接化等                                                        | 自动生效                                        |
-| Fullscreen mode       | 工具卡/group 单击展开、双击收起、预览、hover 高亮、回到底部按钮                 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
+| Fullscreen mode       | 工具卡/group 单击展开与收起、预览、hover 高亮、回到底部按钮                 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
 | 配置面板              | `Style / Features / UI / Diff / Thinking / Footer` 六页签                       | `/ccstyle`                                      |
 | 上下文检查            | 查看上下文占用，并预览 System prompt、Memory、Skills、Tools definition 和消息内容 | `/context`                                      |
 | Session/Subagent 引用 | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                             | `@`                                             |
@@ -50,7 +50,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 
   // features
   "enableSessionReference": true,          // @ session 引用
-  "enableSubagentAutocomplete": true,      // @ subagent 补全与委派提示
+  "enableSubagentAutocomplete": true,      // @subagent:[name] 补全与委派提示
   "enableContextCommand": true,            // /context 上下文检查
   "enableAgentSummary": true,              // 每回合工具摘要
   "enableWorkingMessage": true,            // Working... 底部 token/耗时
@@ -59,7 +59,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   // ui
   "expandedInputMaxLines": 5,              // 展开工具卡 Input 可见行数，超出在末行显示展开提示
   "expandedOutputMaxLines": 10,            // 展开工具卡 Output 可见行数，超出在末行显示展开提示
-  "expandedPreviewMaxLines": 40,           // 展开 diff/TaskList 正文最大行数
+  "expandedPreviewMaxLines": 40,           // 展开 TaskList 正文最大行数（展开 diff 始终全量）
   "inputClip": 100,                        // 工具摘要 path/command 折叠字符数
   "showStartupHeader": true,               // 启动头（logo + tips）开关
   "scrollStepLines": 3,                    // fullscreen 滚轮步进
@@ -89,7 +89,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 ```
 
 > [!TIP]
-> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；展开后 Input/Output 超行时，末行 `… +N more lines • click to show more` 打开全量预览，双击展开面板收起。
+> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；工具卡展开态 diff 全量显示，Input/Output 超行时末行 `… +N more lines • click to show more` 打开全量预览，单击收起（卡内拖动为选中文本）。
 
 > [!NOTE]
 > **Mermaid 渲染**：建议把 `markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。

package/extensions/config/config.ts

@@ -37,9 +37,8 @@ export const DEFAULT_TOOL_DISPLAY_CONFIG: ToolDisplayConfig = {
 	writeDiffCollapsedLines: 0,
 	diffWordWrap: true,
 	/**
-	 * Expanded tool/diff body cap. 40 ≈ one screen of content after title,
-	 * Input section, editor, and status — keeps the TUI compact.
-	 * Raise via /ccstyle → Diff → Expanded max lines when reviewing large dumps.
+	 * Expanded TaskList body cap. Tool Input/Output and diffs use their own settings;
+	 * an expanded diff always renders every line.
 	 */
 	expandedPreviewMaxLines: 40,
 };

package/extensions/config/panel.ts

@@ -485,8 +485,7 @@ export async function showCcstylePanel(
 		const expandedMaxSetting = {
 			id: "expandedPreviewMaxLines",
 			label: "Expanded max lines",
-			description:
-				"Max diff/TaskList body lines when expanded. Tool Input/Output use the two settings above.",
+			description: "Max TaskList body lines when expanded. Expanded diffs show every line.",
 			currentValue: String(config.expandedPreviewMaxLines),
 			values: [...EXPANDED_PREVIEW_MAX_LINES_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
@@ -556,7 +555,7 @@ export async function showCcstylePanel(
 		const subagentAutocompleteToggle = featureToggleSetting(
 			"enableSubagentAutocomplete",
 			"Subagent autocomplete",
-			"@ subagent mentions suggest agents and inject delegation instructions. Next restart applies.",
+			"@subagent:[name] mentions suggest agents and inject delegation instructions. Next restart applies.",
 			"Subagent autocomplete disabled.",
 			config.enableSubagentAutocomplete,
 		);

package/extensions/feature/compact-thinking.ts

@@ -323,7 +323,7 @@ function hiddenPreviewHint(
 
 const expandedThinking = new Set<number>();
 
-/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、双击整块收起，对齐工具卡。 */
+/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、展开卡单击整块收起（拖动选择文本时不收起）。 */
 export class ThinkingPreviewBlock implements Component {
 	private heading: string;
 	private text: string;

package/extensions/feature/reference/index.ts

@@ -14,6 +14,7 @@ import {
 import {
 	SESSION_REFERENCE_CUSTOM_TYPE,
 	SESSION_REFERENCE_PREFIX,
+	assignReferenceTokens,
 	buildReferenceContentFromSections,
 	extractSessionReferenceIds,
 	formatReferenceSession,
@@ -123,7 +124,7 @@ function formatDate(date: Date): string {
 const sessionSearchTextCache = new WeakMap<SessionReference, string>();
 const sessionItemCache = new WeakMap<
 	SessionReference,
-	{ cwd: string; named?: AutocompleteItem; stable?: AutocompleteItem }
+	{ cwd: string; token: string; item: AutocompleteItem }
 >();
 
 function sessionSearchText(reference: SessionReference): string {
@@ -138,30 +139,24 @@ function sessionSearchText(reference: SessionReference): string {
 function sessionItem(
 	reference: SessionReference,
 	currentCwd: string,
-	useStableId: boolean,
+	token: string,
 ): AutocompleteItem {
-	let cached = sessionItemCache.get(reference);
-	const variant = useStableId ? "stable" : "named";
-	if (cached?.cwd === currentCwd && cached[variant]) return cached[variant];
+	const cached = sessionItemCache.get(reference);
+	if (cached?.cwd === currentCwd && cached.token === token) return cached.item;
 
 	const session = reference.info;
 	const workspace = samePath(session.cwd, currentCwd)
 		? "current workspace"
 		: session.cwd || "unknown workspace";
-	const label = reference.kind === "subagent" ? "[SubAgent]" : "[Session]";
-	// 唯一名称保持短格式；同名或无名称时使用稳定 ID，避免引用歧义。
-	const sessionName = session.name?.trim();
-	const referenceId = useStableId
-		? reference.referenceIds[0]
-		: (sessionName ?? reference.referenceIds[0]);
+	const kindLabel = reference.kind === "subagent" ? "[SubAgent]" : "[Session]";
+	// 消歧后的 token 会带上日期；回落到 ID 时下拉仍显示可读标题。
+	const title = token === (reference.referenceIds[0] ?? session.id) ? sessionTitle(session) : token;
 	const item: AutocompleteItem = {
-		value: `${SESSION_REFERENCE_PREFIX}[${referenceId}]`,
-		label: `${label} ${sessionTitle(session)}`,
+		value: `${SESSION_REFERENCE_PREFIX}[${token}]`,
+		label: `${kindLabel} ${title}`,
 		description: `${workspace} · ${session.messageCount} messages · ${formatDate(session.modified)}`,
 	};
-	if (cached?.cwd !== currentCwd) cached = { cwd: currentCwd };
-	cached[variant] = item;
-	sessionItemCache.set(reference, cached);
+	sessionItemCache.set(reference, { cwd: currentCwd, token, item });
 	return item;
 }
 
@@ -197,11 +192,7 @@ function filterSessions(
 	if (query.startsWith("session:")) return [];
 
 	const ordered = orderSessionReferences(references, currentCwd);
-	const nameCounts = new Map<string, number>();
-	for (const reference of ordered) {
-		const name = reference.info.name?.trim();
-		if (name) nameCounts.set(name, (nameCounts.get(name) ?? 0) + 1);
-	}
+	const tokens = assignReferenceTokens(ordered);
 	const trimmed = query.trim();
 	// 模糊匹配只接受有 session name 的会话；subagent 按 agent name 匹配。
 	const searchable = ordered.filter(
@@ -211,10 +202,11 @@ function filterSessions(
 	const matches = trimmed
 		? fuzzyFilter(searchable, trimmed, sessionSearchText)
 		: ordered.slice(0, MAX_SESSION_SUGGESTIONS);
-	return matches.slice(0, MAX_SESSION_SUGGESTIONS).map((reference) => {
-		const name = reference.info.name?.trim();
-		return sessionItem(reference, currentCwd, Boolean(name && (nameCounts.get(name) ?? 0) > 1));
-	});
+	return matches
+		.slice(0, MAX_SESSION_SUGGESTIONS)
+		.map((reference) =>
+			sessionItem(reference, currentCwd, tokens.get(reference) ?? reference.info.id),
+		);
 }
 
 function isPathLikeQuery(query: string): boolean {
@@ -452,22 +444,17 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 				),
 			));
 		const referencesById = new Map<string, SessionReference>();
-		const referencesByName = new Map<string, SessionReference>();
-		const ambiguousNames = new Set<string>();
+		const referencesByToken = new Map<string, SessionReference>();
 		for (const reference of references) {
 			for (const id of reference.referenceIds) referencesById.set(id, reference);
-			const name = reference.info.name?.trim();
-			if (!name || ambiguousNames.has(name)) continue;
-			if (referencesByName.has(name)) {
-				referencesByName.delete(name);
-				ambiguousNames.add(name);
-			} else {
-				referencesByName.set(name, reference);
-			}
+		}
+		// 同位重名的会话用带日期的 token 区分，解析端与补全端用同一套分配。
+		for (const [reference, token] of assignReferenceTokens(references)) {
+			referencesByToken.set(token, reference);
 		}
 		const seenReferences = new Set<SessionReference>();
 		const matchingReferences = referenceIds
-			.map((id) => referencesById.get(id) ?? referencesByName.get(id))
+			.map((id) => referencesById.get(id) ?? referencesByToken.get(id))
 			.filter((reference): reference is SessionReference => {
 				if (!reference || reference.info.id === currentSessionId || seenReferences.has(reference))
 					return false;

package/extensions/feature/reference/session.ts

@@ -1,3 +1,6 @@
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import { stripTerminalSequences } from "../../utils/ansi-text.ts";
+
 export const SESSION_REFERENCE_CUSTOM_TYPE = "session-reference";
 export const SESSION_REFERENCE_PREFIX = "@session:";
 
@@ -45,13 +48,104 @@ export function extractSessionReferenceIds(text: string): string[] {
 	return ids;
 }
 
+const EMPTY_SESSION_TITLE = "(no messages)";
+
 export function sessionTitle(info: ReferenceSessionInfo, maxLength = 80): string {
-	const source = info.name?.trim() || info.firstMessage || "(no messages)";
+	const source = info.name?.trim() || info.firstMessage || EMPTY_SESSION_TITLE;
 	const normalized = source.replace(CONTROL_CHARACTERS, " ").replace(/\s+/g, " ").trim();
 	if (normalized.length <= maxLength) return normalized;
 	return `${normalized.slice(0, Math.max(1, maxLength - 1)).trimEnd()}…`;
 }
 
+/**
+ * 编辑器里的 `@session:[…]` 是行内文本，token 按显示宽度收口，
+ * 不让首条消息整段挤进输入行。同名会话靠后缀消歧，不受它影响。
+ */
+export const REFERENCE_TOKEN_MAX_WIDTH = 32;
+
+/** Editor `@session:[…]` text: the readable title, never a placeholder or brackets. */
+export function sessionReferenceLabel(
+	info: ReferenceSessionInfo,
+	maxWidth = REFERENCE_TOKEN_MAX_WIDTH,
+): string {
+	const title = sessionTitle(info).replace(/[[\]]/g, "").trim();
+	if (!title || title === EMPTY_SESSION_TITLE) return "";
+	// truncateToWidth 会在省略号前后补 ANSI reset，token 是明文，去掉。
+	return stripTerminalSequences(truncateToWidth(title, maxWidth, "…")).trim();
+}
+
+export interface ReferenceTokenSource {
+	referenceIds: string[];
+	info: ReferenceSessionInfo;
+}
+
+/** UTC keeps the disambiguator identical across timezones (same-day drift is harmless). */
+function referenceTokenDate(date: Date): string {
+	const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+	const day = String(date.getUTCDate()).padStart(2, "0");
+	return `${month}-${day}`;
+}
+
+function referenceTokenTime(date: Date): string {
+	const hours = String(date.getUTCHours()).padStart(2, "0");
+	const minutes = String(date.getUTCMinutes()).padStart(2, "0");
+	return `${hours}:${minutes}`;
+}
+
+/** Title first; date then time widen the disambiguation before the ID fallback. */
+function referenceTokenCandidates(reference: ReferenceTokenSource): string[] {
+	const title = sessionReferenceLabel(reference.info);
+	const stableId = reference.referenceIds[0] ?? reference.info.id;
+	if (!title) return [stableId];
+	const date = referenceTokenDate(reference.info.modified);
+	return [
+		title,
+		`${title} ${date}`,
+		`${title} ${date} ${referenceTokenTime(reference.info.modified)}`,
+		stableId,
+	];
+}
+
+/**
+ * Assign each reference a unique editor token. Same-named sessions keep a readable
+ * title plus a date/time suffix; the stable ID is only the last resort.
+ */
+export function assignReferenceTokens<T extends ReferenceTokenSource>(
+	references: T[],
+): Map<T, string> {
+	const candidates = new Map<T, string[]>();
+	let levels = 0;
+	for (const reference of references) {
+		const options = referenceTokenCandidates(reference);
+		levels = Math.max(levels, options.length);
+		candidates.set(reference, options);
+	}
+
+	const tokens = new Map<T, string>();
+	const taken = new Set<string>();
+	for (let level = 0; level < levels && tokens.size < references.length; level++) {
+		const counts = new Map<string, number>();
+		for (const [reference, options] of candidates) {
+			const candidate = tokens.has(reference) ? undefined : options[level];
+			if (candidate) counts.set(candidate, (counts.get(candidate) ?? 0) + 1);
+		}
+		for (const [reference, options] of candidates) {
+			if (tokens.has(reference)) continue;
+			const candidate = options[level];
+			if (candidate && counts.get(candidate) === 1 && !taken.has(candidate)) {
+				tokens.set(reference, candidate);
+				taken.add(candidate);
+			}
+		}
+	}
+	for (const reference of references) {
+		if (!tokens.has(reference)) {
+			tokens.set(reference, reference.referenceIds[0] ?? reference.info.id);
+		}
+	}
+	return tokens;
+}
+
 function byteLength(text: string): number {
 	return Buffer.byteLength(text, "utf8");
 }

package/extensions/feature/reference/subagent.ts

@@ -18,9 +18,12 @@ type AgentInfo = {
 	filePath: string;
 };
 
+export const SUBAGENT_DELEGATION_CUSTOM_TYPE = "subagent-delegation";
+export const SUBAGENT_REFERENCE_PREFIX = "@subagent:";
+
 const MAX_SUGGESTIONS = 2;
-// Match `@name` but NOT `@session:` (reserved by session-reference extension).
-const AGENT_NAME_PATTERN = /(?:^|[\t ])@((?:[^\s:@][^\s:]*)?)$/;
+const MENTION_PATTERN = /(?:^|[\t ])@([^\s@]*)$/;
+const SUBAGENT_REFERENCE_PATTERN = /(?:^|\s)@subagent:\[([^\]]+)](?![\w-])/g;
 
 function getAgentDir(): string {
 	const override = process.env.PI_CODING_AGENT_DIR;
@@ -60,6 +63,36 @@ function loadAgents(): AgentInfo[] {
 		});
 }
 
+function extractMentionQuery(textBeforeCursor: string): string | undefined {
+	return textBeforeCursor.match(MENTION_PATTERN)?.[1];
+}
+
+/** Filter text for agent names, or null when this provider should not claim the @ query. */
+function agentSearchQuery(raw: string): string | null {
+	if (raw.startsWith("session:")) return null;
+	if (raw === "subagent") return "";
+	const prefixed = raw.match(/^subagent:\[?([^\]]*)$/);
+	if (prefixed) return prefixed[1] ?? "";
+	return raw;
+}
+
+export function extractSubagentReferenceNames(text: string): string[] {
+	const names: string[] = [];
+	const seen = new Set<string>();
+	for (const match of text.matchAll(SUBAGENT_REFERENCE_PATTERN)) {
+		const name = match[1]?.trim();
+		if (name && !seen.has(name)) {
+			seen.add(name);
+			names.push(name);
+		}
+	}
+	return names;
+}
+
+export function subagentReferenceValue(name: string): string {
+	return `${SUBAGENT_REFERENCE_PREFIX}[${name}]`;
+}
+
 export function createAgentAutocompleteProvider(
 	current: AutocompleteProvider,
 	getAgents: () => AgentInfo[],
@@ -74,13 +107,16 @@ export function createAgentAutocompleteProvider(
 		): Promise<AutocompleteSuggestions | null> {
 			const currentLine = lines[cursorLine] ?? "";
 			const textBeforeCursor = currentLine.slice(0, cursorCol);
-			const match = textBeforeCursor.match(AGENT_NAME_PATTERN);
+			const rawQuery = extractMentionQuery(textBeforeCursor);
+			if (rawQuery === undefined) {
+				return current.getSuggestions(lines, cursorLine, cursorCol, options);
+			}
 
-			if (!match) {
+			const search = agentSearchQuery(rawQuery);
+			if (search === null) {
 				return current.getSuggestions(lines, cursorLine, cursorCol, options);
 			}
 
-			const query = match[1]!;
 			const agents = getAgents();
 
 			if (options.signal.aborted || agents.length === 0) {
@@ -89,17 +125,20 @@ export function createAgentAutocompleteProvider(
 
 			const [baseSuggestions, matches] = await Promise.all([
 				current.getSuggestions(lines, cursorLine, cursorCol, options),
-				Promise.resolve(query.trim() ? fuzzyFilter(agents, query, (a) => a.name) : agents),
+				Promise.resolve(search.trim() ? fuzzyFilter(agents, search, (a) => a.name) : agents),
 			]);
 			if (options.signal.aborted) return null;
 
 			const agentItems: AutocompleteItem[] = matches.slice(0, MAX_SUGGESTIONS).map((agent) => ({
-				value: `@${agent.name}`,
+				value: subagentReferenceValue(agent.name),
 				label: `[SubAgent] ${agent.displayName}`,
 				description: `${agent.model ?? "?"} · ${agent.thinking ?? "?"}`,
 			}));
-			const hasCompatibleBaseSuggestions = baseSuggestions?.prefix === `@${query}`;
-			const agentValues = new Set(agents.map((agent) => `@${agent.name}`));
+			const prefix = `@${rawQuery}`;
+			const hasCompatibleBaseSuggestions = baseSuggestions?.prefix === prefix;
+			const agentValues = new Set(
+				agents.flatMap((agent) => [`@${agent.name}`, subagentReferenceValue(agent.name)]),
+			);
 			const baseItems = hasCompatibleBaseSuggestions
 				? baseSuggestions.items.filter((item) => !agentValues.has(item.value))
 				: [];
@@ -112,7 +151,7 @@ export function createAgentAutocompleteProvider(
 			});
 
 			if (items.length === 0 && !hasCompatibleBaseSuggestions) return baseSuggestions;
-			return { items, prefix: `@${query}` };
+			return { items, prefix };
 		},
 
 		applyCompletion(
@@ -166,16 +205,13 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 		sessionGeneration++;
 	});
 
-	// Inject instruction when user types @agent-name (not @session:) in prompt.
-	// Supports multiple different subagents in a single prompt.
-	const AGENT_PROMPT_PATTERN = /(?:^|[\s])@([^\s:@][^\s:]*)/g;
+	// Inject as a request message, not systemPrompt, so the cached prefix stays stable.
 	pi.on("before_agent_start", async (event, _ctx) => {
 		const agents = getAgents();
 		if (agents.length === 0) return;
 
 		const mentions: string[] = [];
-		for (const m of event.prompt.matchAll(AGENT_PROMPT_PATTERN)) {
-			const name = m[1]!;
+		for (const name of extractSubagentReferenceNames(event.prompt)) {
 			if (agents.some((a) => a.name === name) && !mentions.includes(name)) {
 				mentions.push(name);
 			}
@@ -186,12 +222,15 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 		const agentList = mentions.map((n) => `"${n}" (${agentMap.get(n)!.displayName})`).join(", ");
 
 		return {
-			systemPrompt:
-				event.systemPrompt +
-				`\n\nThe user's prompt references these subagent types: ${agentList}. ` +
-				`You MUST use the Agent tool for EACH mentioned subagent to delegate the relevant parts of the request. ` +
-				`Handle different subagents separately — do NOT merge their tasks into a single Agent call. ` +
-				`For example, if the user mentions @coder and @explore, make two separate Agent tool calls, one with subagent_type="coder" and another with subagent_type="explore".`,
+			message: {
+				customType: SUBAGENT_DELEGATION_CUSTOM_TYPE,
+				content:
+					`The user's prompt references these subagent types: ${agentList}. ` +
+					`You MUST use the Agent tool for EACH mentioned subagent to delegate the relevant parts of the request. ` +
+					`Handle different subagents separately — do NOT merge their tasks into a single Agent call. ` +
+					`For example, if the user mentions @subagent:[coder] and @subagent:[explore], make two separate Agent tool calls, one with subagent_type="coder" and another with subagent_type="explore".`,
+				display: false,
+			},
 		};
 	});
 }