pi-cc-extensions 0.8.72 → 0.9.0

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/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;
 }
 

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.0",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",