pi-cc-extensions 0.8.72 → 0.9.1

package/README.en.md

@@ -48,7 +48,7 @@ Run `/reload` after installation.
 
 ## Configuration
 
-`/ccstyle` behavior is configured through `~/.pi/agent/claude-code-style.json`:
+`/ccstyle` behavior is configured through `~/.pi/agent/pi-cc-extensions.json`:
 
 ```js
 {

package/README.md

@@ -48,7 +48,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 
 ## 配置
 
-`/ccstyle` 的行为由 `~/.pi/agent/claude-code-style.json` 配置：
+`/ccstyle` 的行为由 `~/.pi/agent/pi-cc-extensions.json` 配置：
 
 ```js
 {

package/extensions/config/config.ts

@@ -1,5 +1,5 @@
 import type { CompactThinkingConfig } from "../feature/compact-thinking.ts";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
@@ -68,7 +68,8 @@ export type Config = {
 };
 
 const AGENT_DIR = process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
-const CONFIG_PATH = join(AGENT_DIR, "claude-code-style.json");
+export const CONFIG_PATH = join(AGENT_DIR, "pi-cc-extensions.json");
+const LEGACY_CONFIG_PATH = join(AGENT_DIR, "claude-code-style.json");
 
 export const DIFF_VIEW_MODES: DiffViewMode[] = ["auto", "split", "unified"];
 export const DIFF_INDICATOR_MODES: DiffIndicatorMode[] = ["bars", "classic", "none"];
@@ -288,10 +289,21 @@ export const config: Config = loadConfig();
 
 function loadConfig(): Config {
 	try {
-		const source = existsSync(CONFIG_PATH)
-			? (JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Record<string, unknown>)
+		const fromLegacy = !existsSync(CONFIG_PATH) && existsSync(LEGACY_CONFIG_PATH);
+		const rawPath = existsSync(CONFIG_PATH) ? CONFIG_PATH : fromLegacy ? LEGACY_CONFIG_PATH : null;
+		const source = rawPath
+			? (JSON.parse(readFileSync(rawPath, "utf8")) as Record<string, unknown>)
 			: {};
-		return normalizeConfig(source);
+		const next = normalizeConfig(source);
+		if (fromLegacy) {
+			try {
+				writeFileSync(CONFIG_PATH, JSON.stringify(next, null, 2));
+				rmSync(LEGACY_CONFIG_PATH, { force: true });
+			} catch {
+				// 新路径写失败时仍使用已读到的旧配置，旧文件保留。
+			}
+		}
+		return next;
 	} catch {
 		// Ignore bad config and fall back to defaults.
 	}

package/extensions/config/panel.ts

@@ -7,8 +7,8 @@
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Input, SettingsList, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 import type { CompactThinkingController } from "../feature/compact-thinking.ts";
-import { applyCustomFooter } from "../feature/shell/footer.ts";
-import { applyStartupHeader } from "../feature/shell/startup-header.ts";
+import { applyCustomFooter, clearCustomFooter } from "../feature/shell/footer.ts";
+import { applyStartupHeader, clearStartupHeader } from "../feature/shell/startup-header.ts";
 import type { ToolGroupingHooks } from "../renderer/tool/grouping.ts";
 import {
 	config,
@@ -474,9 +474,11 @@ export async function showCcstylePanel(
 
 		const onSettingChange = (id: string, value: string) => {
 			if (id === "enableCustomFooter") {
-				updateConfig({ enableCustomFooter: value === "on" });
-				customFooterToggle.apply(value === "on");
-				applyCustomFooter(ctx);
+				const enabled = value === "on";
+				updateConfig({ enableCustomFooter: enabled });
+				customFooterToggle.apply(enabled);
+				if (enabled) applyCustomFooter(ctx);
+				else clearCustomFooter(ctx);
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
@@ -601,14 +603,16 @@ export async function showCcstylePanel(
 						? "Thinking text uses the theme's dim color."
 						: "Keep the default thinking text color.";
 					break;
-				case "showStartupHeader":
-					updateConfig({ showStartupHeader: value === "on" });
+				case "showStartupHeader": {
+					const enabled = value === "on";
+					updateConfig({ showStartupHeader: enabled });
 					startupHeaderSetting.description = config.showStartupHeader
 						? "Show the custom startup header (logo + tips) on new sessions."
 						: "Use Pi's native startup header instead.";
-					// 实时切换：on → 自定义 header；off → 官方默认 header。
-					applyStartupHeader(ctx);
+					if (enabled) applyStartupHeader(ctx);
+					else clearStartupHeader(ctx);
 					break;
+				}
 				case "scrollStepLines":
 					updateConfig({
 						scrollStepLines: pickPositiveInt(value, DEFAULT_CONFIG.scrollStepLines, 1, 50),

package/extensions/feature/shell/footer.ts

@@ -14,6 +14,10 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import { execFile } from "node:child_process";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { pathToFileURL } from "node:url";
 import { config } from "../../config/config.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
 
@@ -95,14 +99,26 @@ export function pickFooterUsageText(
 
 let piUsageMod: any | null | undefined;
 
+function piUsageImportSpecs(): string[] {
+	const agentDir = process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
+	const dist = join(agentDir, "npm", "node_modules", "@narumitw", "pi-usage", "dist", "index.ts");
+	const specs: string[] = [];
+	if (existsSync(dist)) specs.push(pathToFileURL(dist).href);
+	specs.push("@narumitw/pi-usage");
+	return specs;
+}
+
 async function getPiUsage(): Promise<any | null> {
 	if (piUsageMod !== undefined) return piUsageMod;
-	try {
-		const spec = "@narumitw/pi-usage";
-		piUsageMod = await import(spec);
-	} catch {
-		piUsageMod = null;
+	for (const spec of piUsageImportSpecs()) {
+		try {
+			piUsageMod = await import(spec);
+			return piUsageMod;
+		} catch {
+			// 下一候选：本机 Pi npm 目录，或包名（与本包同 node_modules 时）
+		}
 	}
+	piUsageMod = null;
 	return piUsageMod;
 }
 
@@ -379,16 +395,9 @@ const createCustomFooterFactory =
 		};
 	};
 
-/**
- * 按配置应用底栏：on → 自定义 footer；off → 恢复官方默认 footer。
- * 导出供 /ccstyle 面板在切换开关时实时重应用。
- */
+/** Apply the configured custom footer without disturbing another extension's footer when disabled. */
 export function applyCustomFooter(ctx: ExtensionContext): void {
-	if (!ctx?.hasUI || typeof ctx.ui?.setFooter !== "function") return;
-	if (!config.enableCustomFooter) {
-		ctx.ui.setFooter(undefined);
-		return;
-	}
+	if (!ctx?.hasUI || typeof ctx.ui?.setFooter !== "function" || !config.enableCustomFooter) return;
 	try {
 		ctx.ui.setFooter(createCustomFooterFactory(ctx));
 	} catch (err) {
@@ -396,6 +405,12 @@ export function applyCustomFooter(ctx: ExtensionContext): void {
 	}
 }
 
+/** Restore Pi's native footer when the user explicitly disables this extension's active footer. */
+export function clearCustomFooter(ctx: ExtensionContext): void {
+	if (!ctx?.hasUI || typeof ctx.ui?.setFooter !== "function") return;
+	ctx.ui.setFooter(undefined);
+}
+
 export default function (pi: ExtensionAPI) {
 	// 模型/思考级别变化时强制重渲染（自定义 footer 不会被内置 invalidate() 触达）
 	pi.on("model_select", () => {

package/extensions/feature/shell/startup-header.ts

@@ -279,15 +279,9 @@ export function renderHeaderLines(
 	);
 }
 
-/**
- * 按配置应用启动头：on → 自定义 header；off → 恢复官方默认 header。
- * 导出供 /ccstyle 面板在切换开关时实时重应用。
- */
+/** 按配置安装启动头。禁用时不碰槽位，避免清掉其他扩展的 header。 */
 export function applyStartupHeader(ctx: any): void {
-	if (!ctx?.hasUI || typeof ctx.ui?.setHeader !== "function") return;
-	if (!config.showStartupHeader) {
-		// 恢复官方内置 header（logo + 快捷键提示 + onboarding）。
-		ctx.ui.setHeader(undefined);
+	if (!ctx?.hasUI || typeof ctx.ui?.setHeader !== "function" || !config.showStartupHeader) {
 		return;
 	}
 	ctx.ui.setHeader((_tui: unknown, theme: any) => ({
@@ -298,6 +292,12 @@ export function applyStartupHeader(ctx: any): void {
 	}));
 }
 
+/** 用户从 /ccstyle 关掉本扩展启动头时，恢复官方 header。 */
+export function clearStartupHeader(ctx: any): void {
+	if (!ctx?.hasUI || typeof ctx.ui?.setHeader !== "function") return;
+	ctx.ui.setHeader(undefined);
+}
+
 export default function piStartupHeader(pi: ExtensionAPI) {
 	pi.on("session_start", async (_event, ctx) => {
 		applyStartupHeader(ctx);

package/extensions/renderer/tool/result.ts

@@ -11,11 +11,11 @@ export function toolViewportWidth(width: number): number {
 	return Math.max(1, Math.floor(width * TOOL_VIEWPORT_WIDTH_RATIO));
 }
 
-/** 与默认工具结果相同的一级缩进包装。 */
+/** 与默认工具结果相同的一级缩进包装。子组件只扣始终加上的 1 列；↳ 行多出的 2 列由 truncateToWidth 吃掉。 */
 export function insetComponent(component: any): any {
 	return {
 		render: (width: number) =>
-			component.render(Math.max(1, width - 3)).map((line: string) => {
+			component.render(Math.max(1, width - 1)).map((line: string) => {
 				const nestedMarker = line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳");
 				return truncateToWidth(` ${nestedMarker}`, Math.max(0, width), "");
 			}),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.72",
+	"version": "0.9.1",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",