pi-cc-extensions 1.0.4 → 1.0.6

package/extensions/renderer/tool/result.ts

@@ -33,6 +33,30 @@ export function insetComponent(component: any): any {
 	return wrapped;
 }
 
+/**
+ * 展开卡内嵌组件：`↳` 行右移 2 格（Box pad 1 + 2 = 标题文字列），其余行贴左。
+ * 与折叠态 insetComponent 的 `   ↳` 同一视觉列。
+ */
+export function expandedBodyComponent(component: any): any {
+	const wrapped: Record<string, unknown> = {
+		render: (width: number) =>
+			component
+				.render(width)
+				.map((line: string) =>
+					truncateToWidth(
+						line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳"),
+						Math.max(0, width),
+						"",
+					),
+				),
+		invalidate: () => component.invalidate?.(),
+	};
+	if (typeof component.isCollapsedHintLine === "function") {
+		wrapped.isCollapsedHintLine = (line: string) => component.isCollapsedHintLine(line);
+	}
+	return wrapped;
+}
+
 function rawTextFromResult(result: any): string {
 	return Array.isArray(result?.content)
 		? result.content

package/extensions/renderer/tool/tool-state.ts

@@ -1,3 +1,4 @@
+import type { ThemeBg } from "@earendil-works/pi-coding-agent";
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 
@@ -93,6 +94,54 @@ export function pendingIcon(_name: string): string {
 
 type ToolVisualState = "pending" | "success" | "error";
 
+/** 展开卡底色槽位：与工具状态一一对应，不再读配置。 */
+export const TOOL_CARD_BG_SLOT: Record<ToolVisualState, ThemeBg> = {
+	pending: "toolPendingBg",
+	success: "toolSuccessBg",
+	error: "toolErrorBg",
+};
+
+/** 单张工具卡的状态。有失败取失败，没有结果或仍在输出取进行中，其余取成功。 */
+export function toolCardStatus(tool: any): ToolVisualState {
+	if (tool?.result?.isError === true || tool?.isError === true) return "error";
+	if (tool?.isPartial === true || (tool?.executionStarted && !tool?.result) || !tool?.result) {
+		return "pending";
+	}
+	return "success";
+}
+
+/**
+ * 一张卡里多个工具的汇总状态。
+ * 有一个失败取失败；没有失败但还有进行中取进行中；全部成功取成功。
+ */
+export function aggregateToolCardStatus(tools: readonly any[]): ToolVisualState {
+	let pending = false;
+	for (const tool of tools) {
+		const value = toolCardStatus(tool);
+		if (value === "error") return "error";
+		if (value === "pending") pending = true;
+	}
+	return pending ? "pending" : "success";
+}
+
+/**
+ * 单张工具卡的底色。
+ * edit/write 的新增行底色由 toolSuccessBg 混出，成功卡不能再用同一块绿，否则两层叠在一起。
+ * 成功的 edit/write 改用中性的 toolPendingBg；失败卡仍用 toolErrorBg。
+ */
+export function toolCardBgSlot(tool: any): ThemeBg {
+	const status = toolCardStatus(tool);
+	const name = String(tool?.toolName ?? "");
+	if ((name === "edit" || name === "write") && status !== "error") {
+		return TOOL_CARD_BG_SLOT.pending;
+	}
+	return TOOL_CARD_BG_SLOT[status];
+}
+
+export function aggregateToolCardBgSlot(tools: readonly any[]): string {
+	return TOOL_CARD_BG_SLOT[aggregateToolCardStatus(tools)];
+}
+
 export function settledIcon(name: string, state: ToolVisualState | undefined): string {
 	if (state === "success") return "✓";
 	if (state === "error") return "✗";
@@ -124,11 +173,11 @@ export function resolveToolVisualState(context: any): ToolVisualState | undefine
 	return settledState;
 }
 
-export function toolIconColor(context: any): "accent" | "error" | "success" | "muted" {
+export function toolIconColor(context: any): "dim" | "error" | "success" | "muted" {
 	const visualState = getToolVisualState(context);
 	if (context?.isError || visualState === "error") return "error";
 	if (visualState === "success") return "success";
-	if (context?.isPartial || context?.executionStarted || visualState === "pending") return "accent";
+	if (context?.isPartial || context?.executionStarted || visualState === "pending") return "dim";
 	return "muted";
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "1.0.4",
+	"version": "1.0.6",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",

package/themes/cc-dark.json

@@ -1,91 +1,92 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "cc-dark",
+	"appearance": "dark",
 	"vars": {
-		"bg": "#131217",
-		"panel": "#1b1922",
-		"surface": "#211e2b",
-		"surfaceRaised": "#292533",
-		"border": "#36313f",
-		"borderMuted": "#292631",
-		"accent": "#5e9cff",
-		"accentBright": "#8ab4ff",
-		"purple": "#c084fc",
-		"pink": "#f472b6",
-		"cyan": "#67e8f9",
-		"blue": "#60a5fa",
-		"green": "#4ade80",
-		"red": "#fb7185",
-		"yellow": "#facc15",
-		"orange": "#fb923c",
-		"text": "#e4e4e7",
-		"muted": "#a1a1aa",
-		"dim": "#71717a",
-		"selectedBg": "#252035",
-		"userMessageBg": "#1e1e2e",
-		"toolPendingBg": "#1b1924",
-		"toolSuccessBg": "#1e1e2e",
-		"toolErrorBg": "#2a1b22",
-		"customMessageBg": "#211c30"
+		"fg": "#d6dde3",
+		"fgMuted": "#929eab",
+		"fgSubtle": "#768494",
+		"canvas": "#0d1117",
+		"canvasSubtle": "#1c2033",
+		"canvasInset": "#161a2b",
+		"border": "#1c2d44",
+		"borderMuted": "#16233a",
+		"blue": "#4f9eff",
+		"blueBright": "#79c0ff",
+		"green": "#37b34a",
+		"red": "#ff6e62",
+		"redSoft": "#ff7b72",
+		"yellow": "#cb9214",
+		"orange": "#f0883e",
+		"orangeSoft": "#ffa657",
+		"purple": "#be8fff",
+		"pink": "#f778ba",
+		"cyan": "#39c5cf",
+		"selection": "#1a4480",
+		"diffAddBg": "#0f2a24",
+		"diffDelBg": "#261418"
 	},
 	"colors": {
-		"accent": "accent",
+		"accent": "blue",
 		"border": "border",
-		"borderAccent": "accent",
+		"borderAccent": "blue",
 		"borderMuted": "borderMuted",
 		"success": "green",
 		"error": "red",
 		"warning": "yellow",
-		"muted": "muted",
-		"dim": "dim",
-		"text": "text",
-		"thinkingText": "muted",
-		"selectedBg": "selectedBg",
-		"scrollbarThumb": "selectedBg",
-		"userMessageBg": "userMessageBg",
-		"userMessageText": "text",
-		"customMessageBg": "customMessageBg",
-		"customMessageText": "text",
-		"customMessageLabel": "purple",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
-		"toolTitle": "accentBright",
-		"toolOutput": "muted",
-		"mdHeading": "accentBright",
-		"mdLink": "cyan",
-		"mdLinkUrl": "muted",
-		"mdCode": "accentBright",
-		"mdCodeBlock": "text",
+		"muted": "fgMuted",
+		"dim": "#71717a",
+		"text": "fg",
+		"thinkingText": "fgMuted",
+		"selectedBg": "selection",
+		"scrollbarTrack": "borderMuted",
+		"scrollbarThumb": "#3a5274",
+		"searchMatchBg": "#1e1800",
+		"searchMatchText": "fg",
+		"userMessageBg": "canvasSubtle",
+		"userMessageText": "fg",
+		"customMessageBg": "borderMuted",
+		"customMessageText": "fgMuted",
+		"customMessageLabel": "blue",
+		"toolPendingBg": "canvasSubtle",
+		"toolSuccessBg": "diffAddBg",
+		"toolErrorBg": "diffDelBg",
+		"toolTitle": "fg",
+		"toolOutput": "fgMuted",
+		"mdHeading": "blueBright",
+		"mdLink": "blue",
+		"mdLinkUrl": "fgMuted",
+		"mdCode": "#a5d6ff",
+		"mdCodeBlock": "fg",
 		"mdCodeBlockBorder": "border",
-		"mdQuote": "muted",
-		"mdQuoteBorder": "accent",
-		"mdHr": "borderMuted",
-		"mdListBullet": "accent",
+		"mdQuote": "fgMuted",
+		"mdQuoteBorder": "#2a4060",
+		"mdHr": "border",
+		"mdListBullet": "blueBright",
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
-		"toolDiffContext": "muted",
-		"syntaxComment": "#6b7280",
-		"syntaxKeyword": "pink",
-		"syntaxFunction": "accentBright",
-		"syntaxVariable": "blue",
-		"syntaxString": "green",
-		"syntaxNumber": "orange",
-		"syntaxType": "cyan",
-		"syntaxOperator": "text",
-		"syntaxPunctuation": "muted",
-		"thinkingOff": "muted",
-		"thinkingMinimal": "dim",
+		"toolDiffContext": "fgMuted",
+		"syntaxComment": "fgMuted",
+		"syntaxKeyword": "redSoft",
+		"syntaxFunction": "purple",
+		"syntaxVariable": "orangeSoft",
+		"syntaxString": "#a5d6ff",
+		"syntaxNumber": "blueBright",
+		"syntaxType": "orange",
+		"syntaxOperator": "redSoft",
+		"syntaxPunctuation": "fg",
+		"thinkingOff": "fgMuted",
+		"thinkingMinimal": "fgSubtle",
 		"thinkingLow": "blue",
-		"thinkingMedium": "accent",
-		"thinkingHigh": "accentBright",
-		"thinkingXhigh": "#4db9cd",
+		"thinkingMedium": "blue",
+		"thinkingHigh": "blueBright",
+		"thinkingXhigh": "cyan",
 		"thinkingMax": "cyan",
 		"bashMode": "green"
 	},
 	"export": {
-		"pageBg": "bg",
-		"cardBg": "panel",
-		"infoBg": "surface"
+		"pageBg": "#0a1424",
+		"cardBg": "canvasSubtle",
+		"infoBg": "#122544"
 	}
 }

package/themes/cc-light.json

@@ -1,91 +1,92 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "cc-light",
+	"appearance": "light",
 	"vars": {
-		"bg": "#f7f7f8",
-		"panel": "#ffffff",
-		"surface": "#f3f1f7",
-		"surfaceRaised": "#ebe8f0",
-		"border": "#d4d0db",
-		"borderMuted": "#e5e2e9",
-		"accent": "#2563eb",
-		"accentBright": "#1d4ed8",
-		"purple": "#7e22ce",
-		"pink": "#be185d",
-		"cyan": "#0e7490",
-		"blue": "#2563eb",
-		"green": "#15803d",
-		"red": "#dc2626",
-		"yellow": "#a16207",
-		"orange": "#c2410c",
-		"text": "#282530",
-		"muted": "#625f68",
-		"dim": "#76717d",
-		"selectedBg": "#e3e8f5",
-		"userMessageBg": "#f0eef4",
-		"toolPendingBg": "#f1f3f9",
-		"toolSuccessBg": "#edf7f0",
-		"toolErrorBg": "#fceff1",
-		"customMessageBg": "#f4effa"
+		"fg": "#1e252a",
+		"fgMuted": "#3e4a56",
+		"fgSubtle": "#46525e",
+		"canvas": "#ffffff",
+		"canvasSubtle": "#d6e1f1",
+		"canvasInset": "#e3ebf5",
+		"border": "#7391c2",
+		"borderMuted": "#a8bdd9",
+		"blue": "#0058ad",
+		"blueBright": "#004776",
+		"green": "#005a16",
+		"red": "#a81417",
+		"redSoft": "#9b1b1f",
+		"yellow": "#765300",
+		"orange": "#843f00",
+		"orangeSoft": "#663600",
+		"purple": "#65339c",
+		"pink": "#931662",
+		"cyan": "#005359",
+		"selection": "#c5d6ee",
+		"diffAddBg": "#c3dcd0",
+		"diffDelBg": "#f0d5d8"
 	},
 	"colors": {
-		"accent": "accent",
+		"accent": "blue",
 		"border": "border",
-		"borderAccent": "accent",
+		"borderAccent": "blue",
 		"borderMuted": "borderMuted",
 		"success": "green",
 		"error": "red",
 		"warning": "yellow",
-		"muted": "muted",
-		"dim": "dim",
-		"text": "text",
-		"thinkingText": "muted",
-		"selectedBg": "selectedBg",
-		"scrollbarThumb": "selectedBg",
-		"userMessageBg": "userMessageBg",
-		"userMessageText": "text",
-		"customMessageBg": "customMessageBg",
-		"customMessageText": "text",
-		"customMessageLabel": "purple",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
-		"toolTitle": "accentBright",
-		"toolOutput": "muted",
-		"mdHeading": "accentBright",
-		"mdLink": "cyan",
-		"mdLinkUrl": "muted",
-		"mdCode": "accentBright",
-		"mdCodeBlock": "text",
+		"muted": "fgMuted",
+		"dim": "#4e5966",
+		"text": "fg",
+		"thinkingText": "fgMuted",
+		"selectedBg": "selection",
+		"scrollbarTrack": "borderMuted",
+		"scrollbarThumb": "#5d84b8",
+		"searchMatchBg": "#f3e4b0",
+		"searchMatchText": "fg",
+		"userMessageBg": "canvasSubtle",
+		"userMessageText": "fg",
+		"customMessageBg": "#c5d3e6",
+		"customMessageText": "fgMuted",
+		"customMessageLabel": "blue",
+		"toolPendingBg": "canvasSubtle",
+		"toolSuccessBg": "diffAddBg",
+		"toolErrorBg": "diffDelBg",
+		"toolTitle": "fg",
+		"toolOutput": "fgMuted",
+		"mdHeading": "blueBright",
+		"mdLink": "blue",
+		"mdLinkUrl": "fgMuted",
+		"mdCode": "#053859",
+		"mdCodeBlock": "fg",
 		"mdCodeBlockBorder": "border",
-		"mdQuote": "muted",
-		"mdQuoteBorder": "accent",
-		"mdHr": "borderMuted",
-		"mdListBullet": "accent",
+		"mdQuote": "fgMuted",
+		"mdQuoteBorder": "#6d8dbe",
+		"mdHr": "border",
+		"mdListBullet": "blueBright",
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
-		"toolDiffContext": "muted",
-		"syntaxComment": "#6b7280",
-		"syntaxKeyword": "pink",
-		"syntaxFunction": "accentBright",
-		"syntaxVariable": "blue",
-		"syntaxString": "green",
-		"syntaxNumber": "orange",
-		"syntaxType": "cyan",
-		"syntaxOperator": "text",
-		"syntaxPunctuation": "muted",
-		"thinkingOff": "muted",
-		"thinkingMinimal": "dim",
+		"toolDiffContext": "fgMuted",
+		"syntaxComment": "fgMuted",
+		"syntaxKeyword": "redSoft",
+		"syntaxFunction": "purple",
+		"syntaxVariable": "orangeSoft",
+		"syntaxString": "#053859",
+		"syntaxNumber": "blueBright",
+		"syntaxType": "orange",
+		"syntaxOperator": "redSoft",
+		"syntaxPunctuation": "fg",
+		"thinkingOff": "fgMuted",
+		"thinkingMinimal": "fgSubtle",
 		"thinkingLow": "blue",
-		"thinkingMedium": "accent",
-		"thinkingHigh": "accentBright",
-		"thinkingXhigh": "#0e7490",
+		"thinkingMedium": "blue",
+		"thinkingHigh": "blueBright",
+		"thinkingXhigh": "cyan",
 		"thinkingMax": "cyan",
 		"bashMode": "green"
 	},
 	"export": {
-		"pageBg": "bg",
-		"cardBg": "panel",
-		"infoBg": "surface"
+		"pageBg": "#f4f7fb",
+		"cardBg": "canvasSubtle",
+		"infoBg": "#d0dff2"
 	}
 }