pi-cc-extensions 0.5.5 → 0.6.0

package/README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
   <a href="#安装"><img alt="Pi package" src="https://img.shields.io/badge/Pi-package-58B7FF?style=flat-square"></a>
-  <a href="./package.json"><img alt="Version 0.2.0" src="https://img.shields.io/badge/version-0.2.0-66E3C4?style=flat-square"></a>
+  <a href="./package.json"><img alt="Version 0.5.6" src="https://img.shields.io/badge/version-0.5.6-66E3C4?style=flat-square"></a>
   <a href="#兼容性"><img alt="Node.js 22.19 or newer" src="https://img.shields.io/badge/Node.js-%E2%89%A522.19-66E3C4?style=flat-square"></a>
   <a href="./extensions"><img alt="TypeScript extensions" src="https://img.shields.io/badge/TypeScript-extensions-3178C6?style=flat-square"></a>
 </p>
@@ -15,10 +15,15 @@
 
 ---
 
-## 截图
+## 界面预览
 
 <table>
   <tr>
+    <td width="50%" align="center">
+      <img src="./assets/readme/fixed-editor-navigation.webp" width="100%" alt="Pi fixed-editor 中的工具结果、回到底部按钮与 Ctrl+End 快捷键">
+      <br>
+      <sub><b>固定编辑器工作流</b><br>工具结果摘要、折叠展开与键盘导航</sub>
+    </td>
     <td width="50%" align="center">
       <img src="./assets/readme/session-reference.webp" width="100%" alt="在 Pi 中通过 @ 补全选择历史 Session">
       <br>
@@ -55,9 +60,9 @@
 
 ```text
 /ccstyle             # 切换开关
+/ccstyle on          # 开启
+/ccstyle off         # 关闭
 /ccstyle status      # 查看状态
-/ccstyle compact     # 紧凑摘要
-/ccstyle minimal     # 最小化输出
 ```
 
 ### 上下文窗口查看
@@ -82,6 +87,16 @@
 
 Session 模糊查询默认显示 5 个候选；若已加载 `pi-subagents`，也可直接引用现有 SubAgent。一次提示词可以引用多个 Session；扩展会自动去重，并限制注入规模以避免上下文无限膨胀。更多细节见 [`extensions/session-reference/README.md`](./extensions/session-reference/README.md)。
 
+### SubAgent `@` 补全
+
+`extensions/agent-autocomplete.ts` 将 `~/.pi/agent/agents/*.md` 中定义的 SubAgent 接入 `@` 补全：
+
+1. 在提示词中输入 `@agent-name`。
+2. 从补全列表中选择 SubAgent。
+3. 提交后自动注入委托指令；提示词中提到的每个 SubAgent 都会分别交由 Agent 工具处理。
+
+该补全不会占用 `@session:` 的历史 Session 引用语法；修改 SubAgent 定义后执行 `/reload` 即可重新加载。
+
 ## 安装
 
 从 npm 安装（推荐）：
@@ -100,7 +115,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 
 ```text
 /context
-/ccstyle status
+/ccstyle on
 ```
 
 ## 本地开发
@@ -126,20 +141,3 @@ pi install /absolute/path/to/pi-cc-extensions
 
 - Node.js `>=22.19.0`
 - 作为 Pi package 加载，入口由根目录 `package.json` 的 `pi.extensions` 显式声明
-
-## 发布
-
-发布前检查：
-
-```bash
-npm test
-npm pack --dry-run
-```
-
-使用 npm 发布。未指定 tag 时使用 `latest`：
-
-```bash
-npm run release
-npm run release -- --tag next
-npm run release -- --tag beta
-```

package/extensions/claude-code-style.ts

@@ -30,18 +30,13 @@ import { join, resolve } from "node:path";
  *   /ccstyle on           enable
  *   /ccstyle off          disable
  *   /ccstyle status       show current state
- *   /ccstyle minimal      hide most tool output in collapsed view
- *   /ccstyle compact      show short summaries in collapsed view
  *
  * Shortcut:
  *   ctrl+shift+o          toggle on/off
  */
 
-type StyleMode = "compact" | "minimal";
-
 type Config = {
 	enabled: boolean;
-	mode: StyleMode;
 };
 
 const CONFIG_PATH = join(homedir(), ".pi", "agent", "claude-code-style.json");
@@ -54,13 +49,12 @@ function loadConfig(): Config {
 			const parsed = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<Config>;
 			return {
 				enabled: parsed.enabled ?? true,
-				mode: parsed.mode === "minimal" ? "minimal" : "compact",
 			};
 		}
 	} catch {
 		// Ignore bad config and fall back to defaults.
 	}
-	return { enabled: true, mode: "compact" };
+	return { enabled: true };
 }
 
 function saveConfig() {
@@ -318,6 +312,8 @@ const TOOL_MOUSE_WIDGET_KEY = "ccstyle-tool-mouse";
 const TOOL_MOUSE_ENABLE = "\x1b[?1000h\x1b[?1006h";
 const TOOL_MOUSE_DISABLE = "\x1b[?1006l\x1b[?1000l";
 const ZENTUI_PAGE_UP_INPUT = /^\x1b\[5;9(?::[12])?~$|^\x1b\[57421;9(?::[12])?u$|^\x1b\[1;6A$/;
+const ZENTUI_PAGE_DOWN_INPUT = /^\x1b\[6;9(?::[12])?~$|^\x1b\[57422;9(?::[12])?u$|^\x1b\[1;6B$/;
+const SCROLL_BOTTOM_SHORTCUT = "ctrl+end";
 let toolMouseTui: any = null;
 let toolMouseUi: any = null;
 let toolMouseInputUnsubscribe: (() => void) | null = null;
@@ -326,6 +322,9 @@ let toolMouseInputPatchOriginalHandle: ((...args: any[]) => any) | null = null;
 let toolMouseInputPatchWrapper: ((...args: any[]) => any) | null = null;
 let scrollButtonVisible = false;
 let scrollButtonWidget: any = null;
+let pendingScrollMessages = 0;
+let assistantMessageActive = false;
+let scrollButtonSyncScheduled = false;
 
 function parseSgrMousePackets(data: string): SgrMousePacket[] | null {
 	const pattern = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g;
@@ -520,6 +519,96 @@ function isFixedEditorTui(tui: any): boolean {
 	return typeof ownRows?.get === "function" && ownRows.get !== inheritedRows?.get;
 }
 
+function formatShortcut(shortcut: string): string {
+	return shortcut
+		.split("+")
+		.map((part) => part.length <= 1 ? part.toUpperCase() : `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}`)
+		.join("+");
+}
+
+function isScrollBottomInput(data: string): boolean {
+	return matchesKey(data, SCROLL_BOTTOM_SHORTCUT);
+}
+
+function isScrollNavigationInput(data: string): boolean {
+	if (
+		matchesKey(data, "pageUp")
+		|| matchesKey(data, "pageDown")
+		|| ZENTUI_PAGE_UP_INPUT.test(data)
+		|| ZENTUI_PAGE_DOWN_INPUT.test(data)
+	) {
+		return true;
+	}
+	const packets = parseSgrMousePackets(data);
+	return Boolean(packets?.some((packet) => {
+		const baseButton = packet.code & ~(4 | 8 | 16 | 32);
+		return packet.final === "M" && (baseButton === 64 || baseButton === 65);
+	}));
+}
+
+function directRenderLines(component: any, width: number): string[] {
+	try {
+		const lines = component?.render?.(width);
+		return Array.isArray(lines) ? lines : [];
+	} catch {
+		return [];
+	}
+}
+
+/** Render only the transcript portion that fixed-editor leaves scrollable. */
+function renderFixedScrollableRoot(tui: any, width: number): string[] {
+	const children = Array.isArray(tui?.children) ? tui.children : [];
+	const editorIndex = children.findIndex((child: any) =>
+		containsEditorLike(child, tui.focusedComponent),
+	);
+	const end = editorIndex >= 2 ? editorIndex - 2 : children.length;
+	return children.slice(0, end).flatMap((child: any) => directRenderLines(child, width));
+}
+
+function isFixedEditorAtBottom(tui: any): boolean {
+	if (!isFixedEditorTui(tui)) return true;
+	const visibleLines = Array.isArray(tui?.previousLines) ? tui.previousLines : [];
+	if (visibleLines.length === 0) return true;
+	const width = Math.max(1, Number(tui?.terminal?.columns) || 80);
+	const rootLines = renderFixedScrollableRoot(tui, width);
+	if (rootLines.length <= visibleLines.length) return true;
+	const tail = rootLines.slice(-visibleLines.length);
+	return tail.every((line, index) =>
+		stripTerminalSequences(String(line)) === stripTerminalSequences(String(visibleLines[index] ?? "")),
+	);
+}
+
+function hideScrollButton(tui: any): void {
+	const changed = scrollButtonVisible || pendingScrollMessages > 0;
+	scrollButtonVisible = false;
+	pendingScrollMessages = 0;
+	if (changed) tui.requestRender?.();
+}
+
+function scheduleScrollButtonSync(tui: any, data: string): void {
+	if (!scrollButtonVisible || !isScrollNavigationInput(data) || scrollButtonSyncScheduled) return;
+	scrollButtonSyncScheduled = true;
+	const previousLines = tui.previousLines;
+	const check = (attempt: number) => {
+		scrollButtonSyncScheduled = false;
+		if (toolMouseTui !== tui || !scrollButtonVisible) return;
+		// Pi renders on its own frame timer. Do not inspect the old visible window
+		// before Zentui has applied the new scroll offset, or PageUp at bottom would
+		// immediately hide the button it just requested.
+		const rendered = tui.previousLines !== previousLines;
+		if (!rendered && attempt < 4) {
+			scrollButtonSyncScheduled = true;
+			const timer = setTimeout(() => check(attempt + 1), 16);
+			if (typeof timer === "object" && timer !== null && "unref" in timer) {
+				(timer as { unref: () => void }).unref();
+			}
+			return;
+		}
+		if (isFixedEditorAtBottom(tui)) hideScrollButton(tui);
+	};
+	process.nextTick(() => check(0));
+}
+
 function updateScrollButtonFromInput(tui: any, data: string): void {
 	if (!isFixedEditorTui(tui)) return;
 
@@ -532,8 +621,15 @@ function updateScrollButtonFromInput(tui: any, data: string): void {
 		});
 	}
 
-	const jumpedBottom = matchesKey(data, "enter") || matchesKey(data, "return");
-	const nextVisible = jumpedBottom ? false : movedUp ? true : scrollButtonVisible;
+	const jumpedBottom =
+		matchesKey(data, "enter")
+		|| matchesKey(data, "return")
+		|| isScrollBottomInput(data);
+	if (jumpedBottom) {
+		hideScrollButton(tui);
+		return;
+	}
+	const nextVisible = movedUp ? true : scrollButtonVisible;
 	if (nextVisible !== scrollButtonVisible) {
 		scrollButtonVisible = nextVisible;
 		tui.requestRender?.();
@@ -692,8 +788,7 @@ function jumpToBottomWithoutSubmit(tui: any): boolean {
 	} finally {
 		tui.focusedComponent = focused;
 	}
-	scrollButtonVisible = false;
-	tui.requestRender?.();
+	hideScrollButton(tui);
 	return true;
 }
 
@@ -715,7 +810,11 @@ function toggleToolAtMouseClick(tui: any, packet: SgrMousePacket): boolean {
 
 function renderScrollButton(width: number, theme: any): string[] {
 	if (!scrollButtonVisible || !isFixedEditorTui(toolMouseTui)) return [];
-	const label = theme.fg("accent", "[ ↓ Back to bottom · click ]");
+	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
+	const messageText = pendingScrollMessages > 0
+		? `${pendingScrollMessages} new message${pendingScrollMessages === 1 ? "" : "s"}`
+		: "Back to bottom";
+	const label = theme.fg("accent", `[ ↓ ${messageText} · ${shortcut} · click ]`);
 	const leftPad = Math.max(0, Math.floor((width - visibleWidth(label)) / 2));
 	return [`${" ".repeat(leftPad)}${truncateToWidth(label, width, "…")}`];
 }
@@ -737,6 +836,7 @@ function patchToolMouseInputCapture(tui: any): void {
 		const data = args[0];
 		if (typeof data === "string") {
 			updateScrollButtonFromInput(this, data);
+			if (isFixedEditorTui(this) && isScrollBottomInput(data) && jumpToBottomWithoutSubmit(this)) return;
 			const packets = parseSgrMousePackets(data);
 			if (packets) {
 				for (const packet of packets) {
@@ -745,7 +845,9 @@ function patchToolMouseInputCapture(tui: any): void {
 				}
 			}
 		}
-		return Reflect.apply(originalHandle, this, args);
+		const result = Reflect.apply(originalHandle, this, args);
+		if (typeof data === "string") scheduleScrollButtonSync(this, data);
+		return result;
 	};
 
 	try {
@@ -774,8 +876,14 @@ function restoreToolMouseInputCapture(): void {
 function handleToolMouseInput(data: string): { consume: true } | undefined {
 	if (!toolMouseTui) return undefined;
 	updateScrollButtonFromInput(toolMouseTui, data);
+	if (isFixedEditorTui(toolMouseTui) && isScrollBottomInput(data) && jumpToBottomWithoutSubmit(toolMouseTui)) {
+		return { consume: true };
+	}
 	const packets = parseSgrMousePackets(data);
-	if (!packets) return undefined;
+	if (!packets) {
+		scheduleScrollButtonSync(toolMouseTui, data);
+		return undefined;
+	}
 
 	let consumed = false;
 	for (const packet of packets) {
@@ -787,6 +895,7 @@ function handleToolMouseInput(data: string): { consume: true } | undefined {
 
 	// Let scrolling, motion, release, and clicks outside tool results reach the
 	// normal TUI input chain (including other extensions such as pi-zentui).
+	scheduleScrollButtonSync(toolMouseTui, data);
 	return consumed ? { consume: true } : undefined;
 }
 
@@ -806,6 +915,9 @@ function teardownToolMouseInteraction(): void {
 	restoreToolMouseInputCapture();
 	scrollButtonVisible = false;
 	scrollButtonWidget = null;
+	pendingScrollMessages = 0;
+	assistantMessageActive = false;
+	scrollButtonSyncScheduled = false;
 	toolMouseTui = null;
 	toolMouseUi = null;
 }
@@ -979,7 +1091,7 @@ function renderFileDiffPreview(_toolName: string, _args: any, theme: any, contex
 }
 
 function statusText() {
-	return config.enabled ? `CC ${config.mode}` : "CC off";
+	return config.enabled ? "CC on" : "CC off";
 }
 
 function updateStatus(ctx: any) {
@@ -1089,14 +1201,7 @@ function createCcstyleTool(originalTool: any): any {
 			const expanded = isToolExpanded(options, context);
 
 			const text = textFromResult(result);
-			let rendered = "";
-			if (config.mode === "minimal" && !expanded) {
-				rendered = "";
-			} else if (!expanded) {
-				rendered = text ? oneLine(text, 96) : "Done";
-			} else {
-				rendered = text;
-			}
+			const rendered = !expanded ? (text ? oneLine(text, 96) : "Done") : text;
 
 			const hint = !expanded && hasExpandableResult(text) ? expandHint(theme) : "";
 			if (expanded) return renderExpandedToolResult(rendered, theme, isError);
@@ -1369,6 +1474,18 @@ function registerWrappedTool(pi: ExtensionAPI, name: keyof ReturnType<typeof cre
 	});
 }
 
+function notePendingScrollMessage(role: unknown): void {
+	if (!toolMouseTui || !isFixedEditorTui(toolMouseTui) || !scrollButtonVisible) return;
+	if (role === "assistant") {
+		if (assistantMessageActive) return;
+		assistantMessageActive = true;
+	} else if (role !== "toolResult") {
+		return;
+	}
+	pendingScrollMessages += 1;
+	toolMouseTui.requestRender?.();
+}
+
 export default function (pi: ExtensionAPI) {
 	installGlobalToolRendering();
 	deactivateLegacyCompactionRendering();
@@ -1379,35 +1496,27 @@ export default function (pi: ExtensionAPI) {
 			const topLevel = [
 				{ value: "on", label: "on", description: "Enable Claude Code style" },
 				{ value: "off", label: "off", description: "Disable Claude Code style" },
-				{ value: "status", label: "status", description: "Show current toggle and mode" },
-				{ value: "minimal", label: "minimal", description: "Hide most tool output in collapsed view" },
-				{ value: "compact", label: "compact", description: "Show short summaries in collapsed view" },
+				{ value: "status", label: "status", description: "Show current state" },
 			];
 			return topLevel.filter((item) => item.value.startsWith(prefix));
 		},
 		handler: async (args, ctx) => {
 			const arg = args.trim().toLowerCase();
-			if (arg === "on" || arg === "enable") config.enabled = true;
-			else if (arg === "off" || arg === "disable") config.enabled = false;
-			else if (arg === "minimal") {
-				config.enabled = true;
-				config.mode = "minimal";
-			} else if (arg === "compact") {
-				config.enabled = true;
-				config.mode = "compact";
-			} else if (arg === "status") {
+			if (arg === "on") config.enabled = true;
+			else if (arg === "off") config.enabled = false;
+			else if (arg === "status") {
 				updateStatus(ctx);
-				ctx.ui.notify(
-					`Claude Code style: ${config.enabled ? "on" : "off"}, mode=${config.mode}`,
-					"info",
-				);
+				ctx.ui.notify(`Claude Code style: ${config.enabled ? "on" : "off"}`, "info");
 				return;
-			} else {
+			} else if (!arg) {
 				config.enabled = !config.enabled;
+			} else {
+				ctx.ui.notify("Usage: /ccstyle [on|off|status]", "warning");
+				return;
 			}
 			saveConfig();
 			updateStatus(ctx);
-			ctx.ui.notify(`Claude Code style: ${config.enabled ? "on" : "off"}, mode=${config.mode}`, "info");
+			ctx.ui.notify(`Claude Code style: ${config.enabled ? "on" : "off"}`, "info");
 		},
 	});
 
@@ -1423,10 +1532,24 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		diffPreviewByCall.clear();
+		pendingScrollMessages = 0;
+		assistantMessageActive = false;
 		updateStatus(ctx);
 		installToolMouseInteraction(ctx);
 	});
 
+	pi.on("message_start", async (event) => {
+		notePendingScrollMessage(event?.message?.role);
+	});
+
+	pi.on("message_update", async (event) => {
+		if (event?.message?.role === "assistant") notePendingScrollMessage("assistant");
+	});
+
+	pi.on("message_end", async (event) => {
+		if (event?.message?.role === "assistant") assistantMessageActive = false;
+	});
+
 	pi.on("session_shutdown", async () => {
 		teardownToolMouseInteraction();
 		deactivateGlobalToolRendering();
@@ -1440,7 +1563,6 @@ export default function (pi: ExtensionAPI) {
 		call: (args) => fileAction(args, "Read"),
 		result: (result, { expanded }) => {
 			const text = textFromResult(result);
-			if (config.mode === "minimal" && !expanded) return "";
 			if (!expanded) return `${countLines(text)} lines read`;
 			return text;
 		},
@@ -1450,7 +1572,6 @@ export default function (pi: ExtensionAPI) {
 		call: (args) => `Bash(${oneLine(args?.command, 86) || "..."})`,
 		result: (result, { expanded }) => {
 			const text = textFromResult(result).trim();
-			if (config.mode === "minimal" && !expanded) return "";
 			if (!expanded) return summarizeBash(text);
 			return text;
 		},
@@ -1462,7 +1583,6 @@ export default function (pi: ExtensionAPI) {
 		diffAfterResult: true,
 		result: (result, { expanded }, _theme, context) => {
 			const text = textFromResult(result).trim();
-			if (config.mode === "minimal" && !expanded) return "";
 			return summarizeDiffStats(context?.state?.ccstyleDiffPreview) ?? summarizeEdit(text);
 		},
 	});
@@ -1477,7 +1597,6 @@ export default function (pi: ExtensionAPI) {
 		diffAfterResult: true,
 		result: (result, { expanded }, _theme, context) => {
 			const text = textFromResult(result).trim();
-			if (config.mode === "minimal" && !expanded) return "";
 			return summarizeDiffStats(context?.state?.ccstyleDiffPreview) ?? (text ? oneLine(text, 96) : "Written");
 		},
 	});
@@ -1486,7 +1605,6 @@ export default function (pi: ExtensionAPI) {
 		call: (args) => `Find(${args?.pattern || "..."}${args?.path ? ` in ${shortenPath(args.path)}` : ""})`,
 		result: (result, { expanded }) => {
 			const text = textFromResult(result).trim();
-			if (config.mode === "minimal" && !expanded) return "";
 			if (!expanded) return `${countLines(text)} files`;
 			return text;
 		},
@@ -1496,7 +1614,6 @@ export default function (pi: ExtensionAPI) {
 		call: (args) => `Grep(${args?.pattern ? `/${oneLine(args.pattern, 48)}/` : "..."})`,
 		result: (result, { expanded }) => {
 			const text = textFromResult(result).trim();
-			if (config.mode === "minimal" && !expanded) return "";
 			if (!expanded) {
 				const matches = countLines(text);
 				const files = parsePathCount(text);
@@ -1510,7 +1627,6 @@ export default function (pi: ExtensionAPI) {
 		call: (args) => `List(${shortenPath(args?.path || ".")})`,
 		result: (result, { expanded }) => {
 			const text = textFromResult(result).trim();
-			if (config.mode === "minimal" && !expanded) return "";
 			if (!expanded) return `${countLines(text)} entries`;
 			return text;
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cc-extensions",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "Personal extensions for the Pi coding agent",
   "type": "module",
   "keywords": [