pi-one-ui 0.7.2 → 0.8.0

package/extensions/layouts/working-line/working-line.ts

@@ -2,9 +2,9 @@ import { visibleWidth } from "@earendil-works/pi-tui";
 import type {
   ColorSpec,
   PolishedTuiColors,
+  PolishedTuiConfig,
   WorkingLineComponentConfig,
   WorkingLineTextAnimation,
-  ZentuiConfig,
 } from "../../app/config/shell.ts";
 import { PI_WORKING_LINE_MESSAGES } from "../../app/config/working-line-messages.ts";
 import { formatCount } from "../../shared/format.ts";
@@ -1048,7 +1048,7 @@ export class WorkingLineController {
   private stopElapsedUpdates: (() => void) | undefined;
 
   constructor(
-    private readonly getConfig: () => ZentuiConfig,
+    private readonly getConfig: () => PolishedTuiConfig,
     private readonly getTheme: () => ThemeLike,
     private readonly durationClock: AgentDurationClock = new AgentDurationClock(),
     private readonly random: () => number = Math.random,
@@ -1214,7 +1214,7 @@ export class WorkingLineController {
   }
 
   private makeFrameKey(
-    rootConfig: ZentuiConfig,
+    rootConfig: PolishedTuiConfig,
     selectedMessage: string | undefined,
   ): string {
     const config = rootConfig.components.workingLine;
@@ -1253,7 +1253,7 @@ export class WorkingLineController {
 
   private applyIndicator(
     ui: WorkingLineUi,
-    rootConfig: ZentuiConfig,
+    rootConfig: PolishedTuiConfig,
     selectedMessage = this.selectedMessage,
     force = false,
     rebase = false,

package/extensions/services/package-data.ts

@@ -6,7 +6,7 @@
  * same top-level entries the runtime detector sees, then hands back a
  * silent null when no manifest is present or any parser fails.
  *
- * Supported manifest sources (intersected with runtimes Zentui detects):
+ * Supported manifest sources (intersected with runtimes pi-one-ui detects):
  *   bun / nodejs → package.json
  *   deno         → deno.json / deno.jsonc
  *   maven        → pom.xml

package/extensions/shared/style.ts

@@ -71,28 +71,9 @@ const terminalStyleModifiers = new Map([
 ]);
 
 /**
- * ANSI 色名到主题语义 token 的映射：theme 语义下写 `red` 得到主题错误色，
- * 写 `green` 得到主题成功色，保证默认值与主题观感一致。
+ * Theme token modifiers are handled by the active Pi theme. Terminal-only
+ * modifiers such as `dimmed` are accepted with explicit terminal colors.
  */
-const themeColorNameMap = new Map([
-  ["red", "error"],
-  ["bright-red", "error"],
-  ["green", "success"],
-  ["bright-green", "success"],
-  ["yellow", "warning"],
-  ["bright-yellow", "warning"],
-  ["blue", "syntaxFunction"],
-  ["bright-blue", "syntaxFunction"],
-  ["cyan", "syntaxFunction"],
-  ["bright-cyan", "syntaxFunction"],
-  ["purple", "syntaxKeyword"],
-  ["bright-purple", "syntaxKeyword"],
-  ["black", "muted"],
-  ["bright-black", "muted"],
-  ["white", "text"],
-  ["bright-white", "text"],
-]);
-
 const themeStyleModifiers = new Set(["bold", "italic", "underline"]);
 
 const themeColorTokens = new Set<ThemeColor>([
@@ -107,6 +88,9 @@ const themeColorTokens = new Set<ThemeColor>([
   "dim",
   "text",
   "thinkingText",
+  "scrollbarTrack",
+  "scrollbarThumb",
+  "searchMatchText",
   "userMessageText",
   "customMessageText",
   "customMessageLabel",
@@ -175,24 +159,51 @@ function isExplicitTerminalColorToken(token: string): boolean {
   );
 }
 
-function isSupportedStyleToken(token: string): boolean {
+function isExplicitTerminalStyleToken(token: string): boolean {
   const normalized = token.toLowerCase();
-  if (terminalStyleModifiers.has(normalized)) return true;
-  if (terminalColorToAnsi(normalized) !== undefined) return true;
+  return (
+    terminalStyleModifiers.has(normalized) ||
+    isExplicitTerminalColorToken(token)
+  );
+}
 
+function isTerminalColorToken(token: string): boolean {
+  const normalized = token.toLowerCase();
   const isForeground = normalized.startsWith("fg:");
   const isBackground = normalized.startsWith("bg:");
-  if (isForeground || isBackground) {
-    return terminalColorToAnsi(normalized.slice(3), isBackground) !== undefined;
-  }
+  const colorName =
+    isForeground || isBackground ? normalized.slice(3) : normalized;
+  return terminalColorToAnsi(colorName, isBackground) !== undefined;
+}
 
+function isThemeColorToken(token: string): boolean {
+  if (isTerminalColorToken(token)) return false;
   return themeColorTokens.has(token as ThemeColor);
 }
 
 export function isSupportedColorSpec(style: ColorSpec): boolean {
   const trimmed = style.trim();
   if (trimmed === "") return true;
-  return trimmed.split(/\s+/).every(isSupportedStyleToken);
+
+  const tokens = trimmed.split(/\s+/).filter(Boolean);
+  const hasExplicitTerminalColor = tokens.some(isExplicitTerminalColorToken);
+  if (hasExplicitTerminalColor) {
+    return (
+      tokens.every(isExplicitTerminalStyleToken) &&
+      tokens.filter(isExplicitTerminalColorToken).length === 1
+    );
+  }
+
+  const colorTokens = tokens.filter((token) => {
+    const normalized = token.toLowerCase();
+    return !themeStyleModifiers.has(normalized) && normalized !== "dimmed";
+  });
+  if (colorTokens.length === 0) {
+    return tokens.every((token) =>
+      terminalStyleModifiers.has(token.toLowerCase()),
+    );
+  }
+  return colorTokens.length === 1 && isThemeColorToken(colorTokens[0]);
 }
 
 function applyThemeModifiers(
@@ -225,20 +236,12 @@ export function safeThemeFg(
 }
 
 function mapThemeColor(styleTokens: string[]): string | undefined {
-  let fallback: string | undefined;
   for (const token of styleTokens) {
-    const normalized = token.toLowerCase();
-    if (themeStyleModifiers.has(normalized)) continue;
-    if (normalized === "dim" || normalized === "dimmed") {
-      fallback = "muted";
-      continue;
-    }
-
-    const mapped = themeColorNameMap.get(normalized);
-    if (mapped) return mapped;
+    if (themeStyleModifiers.has(token.toLowerCase())) continue;
+    if (isTerminalColorToken(token)) continue;
     return token;
   }
-  return fallback;
+  return undefined;
 }
 
 /**
@@ -303,7 +306,7 @@ function isSafeSgrParameters(parameters: string): boolean {
   return true;
 }
 
-/** Accept only the bounded SGR subset emitted by Zentui's supported style tokens. */
+/** Accept only the bounded SGR subset emitted by pi-one-ui's supported style tokens. */
 export function isSafeSgrStylePrefix(value: unknown): value is string {
   if (
     typeof value !== "string" ||
@@ -351,8 +354,7 @@ export function renderTerminalStyle(style: string, text: string): string {
 /**
  * 单模式颜色渲染：配置值按 theme 语义解释。
  * - 含显式终端 token（hex/数字/fg:/bg:）→ 直接输出固定终端色；
- * - 其余按主题 token 解析（ANSI 色名映射到语义 token，如 red→error），
- *   修饰符通过主题的 bold/italic/underline 应用；
+ * - 其余按官方主题 token 解析，修饰符通过主题的 bold/italic/underline 应用；
  * - 空值原样返回。
  */
 export function renderThemeStyle(
@@ -364,8 +366,9 @@ export function renderThemeStyle(
   if (trimmed === "") return text;
 
   const tokens = trimmed.split(/\s+/).filter(Boolean);
-  if (tokens.some(isExplicitTerminalColorToken))
+  if (tokens.some(isTerminalColorToken)) {
     return renderTerminalStyle(style, text);
+  }
 
   const color = mapThemeColor(tokens) ?? "text";
   return safeThemeFg(theme, color, applyThemeModifiers(theme, tokens, text));
@@ -379,8 +382,9 @@ function renderThemeStyleStrict(
   const trimmed = style.trim();
   if (trimmed === "") return text;
   const tokens = trimmed.split(/\s+/).filter(Boolean);
-  if (tokens.some(isExplicitTerminalColorToken))
+  if (tokens.some(isTerminalColorToken)) {
     return renderTerminalStyle(style, text);
+  }
   const color = mapThemeColor(tokens) ?? "text";
   return theme.fg(color, applyThemeModifiers(theme, tokens, text));
 }
@@ -407,21 +411,27 @@ export function renderThemeStyleOrFallbackStrict(
 }
 
 /**
- * 主题画板存在性探测：pi Theme 暴露 fgColors Map；测试或其他实现可
- * 提供 hasThemeToken 回调，缺失时保守按"无该 token"处理。
+ * 主题画板存在性探测：识别 Pi 当前 Theme 暴露的 fgAnsi Map 和解析完成的
+ * colors 记录；测试或其他实现可提供 hasThemeToken 回调，缺失时保守按
+ * "无该 token"处理。
  */
 function themeHasToken(theme: ThemeLike, token: string): boolean {
-  if (
-    typeof (theme as { hasThemeToken?: (t: string) => boolean })
-      .hasThemeToken === "function"
-  ) {
-    return (
-      theme as unknown as { hasThemeToken(t: string): boolean }
-    ).hasThemeToken(token);
+  const probe = theme as unknown as {
+    hasThemeToken?: (t: string) => boolean;
+    fgAnsi?: Map<string, string>;
+    colors?: Record<string, unknown>;
+  };
+  if (typeof probe.hasThemeToken === "function") {
+    return probe.hasThemeToken(token);
+  }
+  if (probe.fgAnsi instanceof Map && probe.fgAnsi.has(token)) {
+    return true;
   }
-  const fgColors = (theme as unknown as { fgColors?: Map<string, string> })
-    .fgColors;
-  return fgColors instanceof Map && fgColors.has(token);
+  return (
+    typeof probe.colors === "object" &&
+    probe.colors !== null &&
+    token in probe.colors
+  );
 }
 
 /**

package/extensions/tools/patch-keys.ts

@@ -1,5 +1,5 @@
 /**
- * ccstyle 补丁所有权与跨模块协调键的单一来源（single source of truth）。
+ * pi-one-ui 补丁所有权与跨模块协调键的单一来源（single source of truth）。
  *
  * 全部使用 Symbol.for（全局注册表）：/reload 后新模块实例拿到的是同一个 symbol，
  * 这是跨 reload 识别/让渡补丁所有权的关键。切勿把这些 Symbol.for 改成模块局部 Symbol。
@@ -14,25 +14,25 @@
 
 // ── compact / compact-thinking 协调 ──
 export const COMPACT_MODE_PATCH_KEY = Symbol.for(
-  "pi.ccstyle.compact-mode-patch",
+  "pi-one-ui.compact-mode-patch",
 );
 export const COMPACT_THINKING_PATCH_KEY = Symbol.for(
-  "pi.ccstyle.compact-thinking-update",
+  "pi-one-ui.compact-thinking-update",
 );
 export const PROTOTYPE_ORIGINAL_KEY = Symbol.for(
-  "pi.ccstyle.prototype-original",
+  "pi-one-ui.prototype-original",
 );
 export const COMPACT_THINKING_OWNER = Symbol.for(
-  "pi.ccstyle.compact-thinking-owner",
+  "pi-one-ui.compact-thinking-owner",
 );
 
 // ── assistant 展开状态（实例标记；description 供旧模块按 symbol.description 清理） ──
 export const ASSISTANT_SET_EXPANDED_DESCRIPTION =
-  "pi.ccstyle.compact-assistant-set-expanded";
+  "pi-one-ui.compact-assistant-set-expanded";
 export const ASSISTANT_TOGGLE_ROUND_DESCRIPTION =
-  "pi.ccstyle.compact-assistant-toggle-round";
+  "pi-one-ui.compact-assistant-toggle-round";
 export const ASSISTANT_REENTRY_DESCRIPTION =
-  "pi.ccstyle.compact-assistant-reentry";
+  "pi-one-ui.compact-assistant-reentry";
 export const ASSISTANT_SET_EXPANDED_KEY = Symbol.for(
   ASSISTANT_SET_EXPANDED_DESCRIPTION,
 );
@@ -43,54 +43,54 @@ export const ASSISTANT_REENTRY_KEY = Symbol.for(ASSISTANT_REENTRY_DESCRIPTION);
 
 // ── 工具渲染补丁 ──
 export const GLOBAL_TOOL_RENDER_PATCH = Symbol.for(
-  "pi.ccstyle.global-tool-render-patch",
+  "pi-one-ui.global-tool-render-patch",
 );
 export const COMPONENT_TOOL_RENDER_MODE = Symbol.for(
-  "pi.ccstyle.component-tool-render-mode",
+  "pi-one-ui.component-tool-render-mode",
 );
 export const TOOL_EXPANDED_BACKGROUND_PATCH = Symbol.for(
-  "pi.ccstyle.tool-expanded-background-patch",
+  "pi-one-ui.tool-expanded-background-patch",
 );
 
 // ── 工具 updateDisplay 跨 toggle 重建缓存 ──
 export const TOGGLE_RENDER_CACHE_PATCH = Symbol.for(
-  "pi.ccstyle.toggle-render-cache-patch",
+  "pi-one-ui.toggle-render-cache-patch",
 );
 
 // ── 消息组件补丁 ──
 export const MESSAGE_DISPLAY_PATCH = Symbol.for(
-  "pi.ccstyle.message-display-patch",
+  "pi-one-ui.message-display-patch",
 );
 
 // ── 压缩渲染补丁（/reload 残留 deactivate 用） ──
 export const GLOBAL_COMPACTION_RENDER_PATCH = Symbol.for(
-  "pi.ccstyle.compaction-render-patch",
+  "pi-one-ui.compaction-render-patch",
 );
 
 // ── 工具分组 ──
 export const TOOL_GROUPING_PATCH_KEY = Symbol.for(
-  "pi.ccstyle.tool-grouping-patch",
+  "pi-one-ui.tool-grouping-patch",
 );
 export const TOOL_GROUPING_PARENT_KEY = Symbol.for(
-  "pi.ccstyle.tool-grouping-parent",
+  "pi-one-ui.tool-grouping-parent",
 );
 export const TOOL_GROUPING_GENERATION_KEY = Symbol.for(
-  "pi.ccstyle.tool-grouping-generation",
+  "pi-one-ui.tool-grouping-generation",
 );
 
 // ── 鼠标交互 ──
-export const TOOL_MOUSE_OWNER_KEY = Symbol.for("pi.ccstyle.tool-mouse-owner");
-export const TOOL_MOUSE_TUI_SLOT = Symbol.for("pi.ccstyle.tool-mouse-tui");
+export const TOOL_MOUSE_OWNER_KEY = Symbol.for("pi-one-ui.tool-mouse-owner");
+export const TOOL_MOUSE_TUI_SLOT = Symbol.for("pi-one-ui.tool-mouse-tui");
 export const SCROLL_BUTTON_STATE_SLOT = Symbol.for(
-  "pi.ccstyle.scroll-button-state",
+  "pi-one-ui.scroll-button-state",
 );
 export const FLUSH_DOCKED_BASH_PATCH = Symbol.for(
-  "pi.ccstyle.flush-docked-bash-patch",
+  "pi-one-ui.flush-docked-bash-patch",
 );
-export const TOOL_HOVER_STATE_KEY = Symbol.for("pi.ccstyle.tool-hover-state");
+export const TOOL_HOVER_STATE_KEY = Symbol.for("pi-one-ui.tool-hover-state");
 
 // ── rich diff 组件标记 ──
-export const RICH_DIFF_COMPONENT = Symbol.for("pi.ccstyle.rich-diff-component");
+export const RICH_DIFF_COMPONENT = Symbol.for("pi-one-ui.rich-diff-component");
 
 // ── PatchRegistry：所有权生命周期统一收口 ──
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-one-ui",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "A single, customizable Pi UI package with layout-oriented Context and Shell rendering for Pi.",
   "type": "module",
   "license": "MIT",
@@ -44,9 +44,9 @@
     "jiti": "^2.7.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": ">=0.84.0",
-    "@earendil-works/pi-coding-agent": ">=0.84.0",
-    "@earendil-works/pi-tui": ">=0.84.0"
+    "@earendil-works/pi-ai": ">=0.99.0",
+    "@earendil-works/pi-coding-agent": ">=0.99.0",
+    "@earendil-works/pi-tui": ">=0.99.0"
   },
   "engines": {
     "node": ">=22.19.0"
@@ -62,9 +62,9 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.5",
-    "@earendil-works/pi-ai": "^0.84.0",
-    "@earendil-works/pi-coding-agent": "^0.84.0",
-    "@earendil-works/pi-tui": "^0.84.0",
+    "@earendil-works/pi-ai": "^0.99.1",
+    "@earendil-works/pi-coding-agent": "^0.99.1",
+    "@earendil-works/pi-tui": "^0.99.1",
     "@types/node": "^26.1.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.11"