pi-one-ui 0.5.1 → 0.6.1

package/extensions/layouts/editor/minimalist-editor.ts

@@ -1,7 +1,7 @@
 import { basename, isAbsolute, relative, sep } from "node:path";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import type { ZentuiConfig } from "../../app/config/shell.ts";
+import type { ColorSpec, ZentuiConfig } from "../../app/config/shell.ts";
 import { formatCwdLabel, formatElapsedDuration } from "../../shared/format.ts";
 import { sanitizeEditorMetadataText } from "./editor-metadata-format.ts";
 
@@ -11,32 +11,14 @@ import {
   EDITOR_ACCENT_FALLBACK,
   EDITOR_BORDER_FALLBACK,
   renderSourceColor,
-  renderStyleForSource,
-  renderStyleForSourceOrFallback,
+  renderThemeStyle,
+  renderThemeStyleOrFallback,
   safeThemeFg,
 } from "../../shared/style.ts";
 
-const MINIMALIST_MODEL_FALLBACK = {
-  theme: "syntaxKeyword",
-  terminal: "bold purple",
-};
-const MINIMALIST_THINKING_FALLBACK = {
-  theme: "warning",
-  terminal: "bold yellow",
-};
-const MINIMALIST_ADAPTIVE_TERMINAL_THINKING_FALLBACKS: Record<string, string> =
-  {
-    minimal: "bright-black",
-    low: "blue",
-    medium: "cyan",
-    high: "yellow",
-    xhigh: "red",
-    max: "bright-red",
-  };
-const MINIMALIST_BRANCH_FALLBACK = {
-  theme: "bold syntaxKeyword",
-  terminal: "bold blue",
-};
+const MINIMALIST_MODEL_FALLBACK: ColorSpec = "syntaxKeyword";
+const MINIMALIST_THINKING_FALLBACK: ColorSpec = "warning";
+const MINIMALIST_BRANCH_FALLBACK: ColorSpec = "bold syntaxKeyword";
 
 export type MinimalistEditorMetadata = {
   cwd: string;
@@ -139,7 +121,6 @@ function renderTopLeft(
   config: ZentuiConfig,
   includeSessionName = true,
 ): string {
-  const source = config.components.editor.colorSource;
   const trimmed = inputText.trimStart();
   const bashMode = trimmed.startsWith("!!")
     ? "no-context"
@@ -161,9 +142,8 @@ function renderTopLeft(
     const duration = formatElapsedDuration(metadata.agentDurationMs);
     parts.push(
       metadata.agentActive
-        ? renderStyleForSourceOrFallback(
+        ? renderThemeStyleOrFallback(
             uiTheme,
-            source,
             config.colors.sessionDuration,
             EDITOR_ACCENT_FALLBACK,
             duration,
@@ -179,12 +159,7 @@ function renderTopLeft(
     sessionName
   ) {
     parts.push(
-      renderStyleForSource(
-        uiTheme,
-        source,
-        config.colors.sessionName,
-        sessionName,
-      ),
+      renderThemeStyle(uiTheme, config.colors.sessionName, sessionName),
     );
   }
   return joinStyled(parts, safeThemeFg(uiTheme, "muted", " · "));
@@ -197,7 +172,6 @@ function renderTopRight(
   renderBorder: (text: string) => string,
   renderThinking: (text: string) => string,
 ): string {
-  const source = config.components.editor.colorSource;
   const parts: string[] = [];
   const joinParts = (values: string[]) =>
     values
@@ -209,17 +183,16 @@ function renderTopRight(
     ? sanitizeEditorMetadataText(metadata.costLabel ?? "")
     : "";
   if (cost) {
-    parts.push(renderStyleForSource(uiTheme, source, config.colors.cost, cost));
+    parts.push(renderThemeStyle(uiTheme, config.colors.cost, cost));
   }
   const model = sanitizeEditorMetadataText(metadata.modelLabel ?? "");
   if (model) {
     parts.push(
       renderSourceColor(
         uiTheme,
-        source,
         config.colors.editorModel,
         "editorModel",
-        MINIMALIST_MODEL_FALLBACK.theme,
+        MINIMALIST_MODEL_FALLBACK,
         model,
       ),
     );
@@ -237,13 +210,11 @@ function renderBottomLeft(
   config: ZentuiConfig,
 ): string {
   if (!config.components.editor.styles.minimalist.showGit) return "";
-  const source = config.components.editor.colorSource;
   const branch = sanitizeEditorMetadataText(metadata.branch ?? "");
   const parts = branch
     ? [
-        renderStyleForSourceOrFallback(
+        renderThemeStyleOrFallback(
           uiTheme,
-          source,
           config.colors.editorGitBranch,
           MINIMALIST_BRANCH_FALLBACK,
           branch,
@@ -251,9 +222,7 @@ function renderBottomLeft(
       ]
     : [];
   if (metadata.dirty) {
-    parts.push(
-      renderStyleForSource(uiTheme, source, config.colors.gitStatus, "*"),
-    );
+    parts.push(renderThemeStyle(uiTheme, config.colors.gitStatus, "*"));
   }
   if ((metadata.ahead ?? 0) > 0) {
     parts.push(safeThemeFg(uiTheme, "success", `↑${metadata.ahead}`));
@@ -295,14 +264,7 @@ function renderBottomRight(
 ): string {
   const cwd = sanitizeEditorMetadataText(minimalistCwdLabel(metadata, config));
   return cwd
-    ? renderSourceColor(
-        uiTheme,
-        config.components.editor.colorSource,
-        config.colors.cwd,
-        "cwd",
-        "bold cyan",
-        cwd,
-      )
+    ? renderSourceColor(uiTheme, config.colors.cwd, "cwd", "bold cyan", cwd)
     : "";
 }
 
@@ -384,7 +346,6 @@ export function renderMinimalistFrame({
 }: MinimalistFrameOptions): string[] {
   if (width <= 4) return clampLines(editorLines, width);
   const contentWidth = Math.max(0, width - 4);
-  const source = config.components.editor.colorSource;
   const adaptive = config.components.editor.borderColorMode === "adaptive";
   const thinking = sanitizeEditorMetadataText(metadata.thinkingLevel ?? "");
   const activeThinking =
@@ -392,31 +353,18 @@ export function renderMinimalistFrame({
   const renderStaticBorder = (text: string) =>
     renderSourceColor(
       uiTheme,
-      source,
       config.colors.editorBorder,
       "editorBorder",
-      EDITOR_BORDER_FALLBACK.theme,
+      EDITOR_BORDER_FALLBACK,
       text,
     );
-  const terminalAdaptiveThinkingStyle = activeThinking
-    ? (thinkingStyle(config, activeThinking) ??
-      MINIMALIST_ADAPTIVE_TERMINAL_THINKING_FALLBACKS[
-        activeThinking.toLowerCase()
-      ] ??
-      MINIMALIST_THINKING_FALLBACK.terminal)
-    : undefined;
+  // adaptive 边框三级链：用户分档配置（editorThinking*）→ Pi 原生 effort 边框 → 默认。
   const renderBorder = (text: string) => {
     if (!adaptive) return renderStaticBorder(text);
-    if (source === "terminal") {
-      return terminalAdaptiveThinkingStyle
-        ? renderStyleForSource(
-            uiTheme,
-            source,
-            terminalAdaptiveThinkingStyle,
-            text,
-          )
-        : renderStaticBorder(text);
-    }
+    const configured = activeThinking
+      ? thinkingStyle(config, activeThinking)
+      : undefined;
+    if (configured) return renderThemeStyle(uiTheme, configured, text);
     if (!borderColor) return renderStaticBorder(text);
     try {
       const rendered = borderColor(text);
@@ -426,9 +374,8 @@ export function renderMinimalistFrame({
     }
   };
   const renderStaticThinking = (text: string) =>
-    renderStyleForSourceOrFallback(
+    renderThemeStyleOrFallback(
       uiTheme,
-      source,
       thinkingStyle(config, text),
       MINIMALIST_THINKING_FALLBACK,
       text,

package/extensions/layouts/editor/ui.ts

@@ -16,7 +16,7 @@ import type { ZentuiConfig } from "../../app/config/shell.ts";
 import {
   EDITOR_ACCENT_FALLBACK,
   EDITOR_BORDER_FALLBACK,
-  renderStyleForSourceOrFallback,
+  renderThemeStyleOrFallback,
   safeThemeFg,
 } from "../../shared/style.ts";
 import { renderEditorMetadataFormat } from "./editor-metadata-format.ts";
@@ -289,7 +289,7 @@ export function renderWithAutocompleteCapture<T>(
 
 /**
  * off 模式的原生边框覆盖：仅在 style=off 且用户显式配置了 colors.editorBorder
- * 时返回按 colorSource 解释的边框渲染函数；未配置或 on 模式返回 undefined
+ * 时返回按 theme 语义解释的边框渲染函数；未配置或 on 模式返回 undefined
  * （保持 Pi 原生 effort/主题变色不动）。
  */
 export function offEditorBorderColor(
@@ -301,13 +301,7 @@ export function offEditorBorderColor(
   const spec = config.colors.editorBorder;
   if (typeof spec !== "string" || spec.trim() === "") return undefined;
   return (text) =>
-    renderStyleForSourceOrFallback(
-      uiTheme,
-      editor.colorSource,
-      spec,
-      EDITOR_BORDER_FALLBACK,
-      text,
-    );
+    renderThemeStyleOrFallback(uiTheme, spec, EDITOR_BORDER_FALLBACK, text);
 }
 
 function clampRenderedLines(lines: string[], width: number): string[] {
@@ -326,9 +320,8 @@ function getEditorChromeWidths(
   uiTheme: Theme,
   reset: string,
 ) {
-  const rail = `${renderStyleForSourceOrFallback(
+  const rail = `${renderThemeStyleOrFallback(
     uiTheme,
-    config.components.editor.colorSource,
     config.colors.editorAccent,
     EDITOR_ACCENT_FALLBACK,
     config.icons.rail,

package/extensions/layouts/footer/footer.ts

@@ -22,7 +22,7 @@ import {
   formatUsernameHostLabel,
 } from "../../shared/format.ts";
 import { resolveRuntimeSymbol } from "../../shared/icons.ts";
-import { renderSourceColor, renderStyleForSource } from "../../shared/style.ts";
+import { renderSourceColor, renderThemeStyle } from "../../shared/style.ts";
 import { sanitizeEditorMetadataText } from "../editor/editor-metadata-format.ts";
 import {
   collectExtensionStatusSegments,
@@ -277,7 +277,6 @@ export function installFooter(
           compactFormatTokens,
           FOOTER_FORMAT_ALIASES,
         );
-        const colorSource = config.components.footer.colorSource;
         const iconMode = config.icons.mode;
         const formattedCwd = sanitizeEditorMetadataText(
           formatCwdLabel(ctx.cwd, config.icons.cwd, {
@@ -315,16 +314,14 @@ export function installFooter(
               version: sanitizeEditorMetadataText(state.packageVersion.version),
             }
           : undefined;
-        const separator = renderStyleForSource(
+        const separator = renderThemeStyle(
           theme,
-          colorSource,
           config.colors.separator,
           separatorText[config.components.footer.styles.starship.separator],
         );
         const innerWidth = Math.max(1, width - 2);
         const cwdLabel = renderSourceColor(
           theme,
-          colorSource,
           config.colors.cwd,
           "cwd",
           "bold cyan",
@@ -341,12 +338,7 @@ export function installFooter(
             )
           : "";
         const sessionNameLabel = sessionName
-          ? renderStyleForSource(
-              theme,
-              colorSource,
-              config.colors.sessionName,
-              sessionName,
-            )
+          ? renderThemeStyle(theme, config.colors.sessionName, sessionName)
           : "";
         const builtInSessionNameLabel = sessionNameLabel
           ? `in ${sessionNameLabel}`
@@ -385,46 +377,21 @@ export function installFooter(
               ? config.colors.contextWarning
               : config.colors.contextNormal;
         const cacheReadLabel = state.cacheReadLabel
-          ? renderStyleForSource(
-              theme,
-              colorSource,
-              config.colors.tokens,
-              state.cacheReadLabel,
-            )
+          ? renderThemeStyle(theme, config.colors.tokens, state.cacheReadLabel)
           : "";
         const cacheWriteLabel = state.cacheWriteLabel
-          ? renderStyleForSource(
-              theme,
-              colorSource,
-              config.colors.tokens,
-              state.cacheWriteLabel,
-            )
+          ? renderThemeStyle(theme, config.colors.tokens, state.cacheWriteLabel)
           : "";
         const subscriptionLabel = state.subscription
-          ? renderStyleForSource(
-              theme,
-              colorSource,
-              config.colors.cost,
-              "(sub)",
-            )
+          ? renderThemeStyle(theme, config.colors.cost, "(sub)")
           : "";
         const autoCompactionLabel = state.autoCompaction
-          ? renderStyleForSource(theme, colorSource, contextColor, "(auto)")
+          ? renderThemeStyle(theme, contextColor, "(auto)")
           : "";
         const gitColor = (text: string) =>
-          renderStyleForSource(
-            theme,
-            colorSource,
-            config.colors.gitBranch,
-            text,
-          );
+          renderThemeStyle(theme, config.colors.gitBranch, text);
         const gitStatusColor = (text: string) =>
-          renderStyleForSource(
-            theme,
-            colorSource,
-            config.colors.gitStatus,
-            text,
-          );
+          renderThemeStyle(theme, config.colors.gitStatus, text);
         const gitIcon = config.icons.git ? gitColor(config.icons.git) : "";
         const gitCounts =
           config.components.footer.styles.starship.segments.gitCounts;
@@ -494,12 +461,7 @@ export function installFooter(
               const label = runtime.version
                 ? `${symbol} ${runtime.version}`
                 : symbol;
-              return renderStyleForSource(
-                theme,
-                colorSource,
-                runtime.style,
-                label,
-              );
+              return renderThemeStyle(theme, runtime.style, label);
             }
             case "model":
               return sanitizeExtensionStatusText(footerModelLabel);
@@ -507,45 +469,35 @@ export function installFooter(
               return sanitizeExtensionStatusText(state.providerLabel);
             case "session_duration":
               return state.sessionStartEpoch
-                ? renderStyleForSource(
+                ? renderThemeStyle(
                     theme,
-                    colorSource,
                     config.colors.sessionDuration,
                     buildSessionDurationLabel(state.sessionStartEpoch),
                   )
                 : "";
             case "username":
-              return renderStyleForSource(
+              return renderThemeStyle(
                 theme,
-                colorSource,
                 config.colors.username,
                 formatUsernameHostLabel(config.icons.username),
               );
             case "os":
-              return renderStyleForSource(
+              return renderThemeStyle(
                 theme,
-                colorSource,
                 config.colors.os,
                 formatOsLabel(config.icons.os, iconMode),
               );
             case "time":
-              return renderStyleForSource(
+              return renderThemeStyle(
                 theme,
-                colorSource,
                 config.colors.time,
                 formatTimeLabel(config.icons.time),
               );
             case "context":
-              return renderStyleForSource(
-                theme,
-                colorSource,
-                contextColor,
-                contextLabel,
-              );
+              return renderThemeStyle(theme, contextColor, contextLabel);
             case "tokens":
-              return renderStyleForSource(
+              return renderThemeStyle(
                 theme,
-                colorSource,
                 config.colors.tokens,
                 state.tokenLabel,
               );
@@ -554,9 +506,8 @@ export function installFooter(
             case "cache_write":
               return cacheWriteLabel;
             case "cost":
-              return renderStyleForSource(
+              return renderThemeStyle(
                 theme,
-                colorSource,
                 config.colors.cost,
                 state.costLabel,
               );
@@ -568,68 +519,52 @@ export function installFooter(
               return formatPackageVersionSegment(
                 theme,
                 packageVersion,
-                colorSource,
                 iconMode,
                 config.icons.package,
                 config.colors.packageVersion,
               );
             case "package_version":
               return packageVersion?.version
-                ? renderStyleForSource(
+                ? renderThemeStyle(
                     theme,
-                    colorSource,
                     config.colors.packageVersion,
                     packageVersion.version,
                   )
                 : "";
             case "sep":
-              return renderStyleForSource(
-                theme,
-                colorSource,
-                config.colors.separator,
-                " | ",
-              );
+              return renderThemeStyle(theme, config.colors.separator, " | ");
             case "git_commit":
               return formatGitCommitSegment(
                 theme,
                 commit,
                 config.components.footer.styles.starship.gitCommit,
-                colorSource,
                 config.colors.gitCommit,
               );
             case "git_tag":
               return config.components.footer.styles.starship.gitCommit
                 .showTag && commit?.tag
-                ? renderStyleForSource(
-                    theme,
-                    colorSource,
-                    config.colors.gitCommit,
-                    commit.tag,
-                  )
+                ? renderThemeStyle(theme, config.colors.gitCommit, commit.tag)
                 : "";
             case "git_metrics":
               return formatGitMetricsSegment(
                 theme,
                 state.metrics,
                 config.components.footer.styles.starship.gitMetrics,
-                colorSource,
                 config.colors.gitMetricsAdded,
                 config.colors.gitMetricsDeleted,
               );
             case "git_added":
               return state.metrics
-                ? renderStyleForSource(
+                ? renderThemeStyle(
                     theme,
-                    colorSource,
                     config.colors.gitMetricsAdded,
                     `+${state.metrics.added}`,
                   )
                 : "";
             case "git_deleted":
               return state.metrics
-                ? renderStyleForSource(
+                ? renderThemeStyle(
                     theme,
-                    colorSource,
                     config.colors.gitMetricsDeleted,
                     `−${state.metrics.deleted}`,
                   )
@@ -661,12 +596,7 @@ export function installFooter(
                   : "";
               const inner = [shortHash, tag].filter(Boolean).join(" ");
               branchParts.push(
-                renderStyleForSource(
-                  theme,
-                  colorSource,
-                  config.colors.gitCommit,
-                  `(${inner})`,
-                ),
+                renderThemeStyle(theme, config.colors.gitCommit, `(${inner})`),
               );
             }
           }
@@ -694,7 +624,6 @@ export function installFooter(
               theme,
               runtime,
               config.colors.runtimePrefix,
-              colorSource,
               iconMode,
             )
           : "";
@@ -703,7 +632,6 @@ export function installFooter(
           ? formatPackageVersionSegment(
               theme,
               packageVersion,
-              colorSource,
               iconMode,
               config.icons.package,
               config.colors.packageVersion,
@@ -721,7 +649,6 @@ export function installFooter(
                 theme,
                 commit,
                 config.components.footer.styles.starship.gitCommit,
-                colorSource,
                 config.colors.gitCommit,
               )
             : "";
@@ -731,7 +658,6 @@ export function installFooter(
               theme,
               state.metrics,
               config.components.footer.styles.starship.gitMetrics,
-              colorSource,
               config.colors.gitMetricsAdded,
               config.colors.gitMetricsDeleted,
             )
@@ -745,10 +671,9 @@ export function installFooter(
           )
             return "";
           const timeLabel = buildSessionDurationLabel(state.sessionStartEpoch);
-          const prefix = renderStyleForSource(theme, colorSource, "", "up for");
-          const time = renderStyleForSource(
+          const prefix = renderThemeStyle(theme, "", "up for");
+          const time = renderThemeStyle(
             theme,
-            colorSource,
             config.colors.sessionDuration,
             timeLabel,
           );
@@ -756,17 +681,15 @@ export function installFooter(
         })();
         const usernameSegment = config.components.footer.styles.starship
           .segments.username
-          ? renderStyleForSource(
+          ? renderThemeStyle(
               theme,
-              colorSource,
               config.colors.username,
               formatUsernameHostLabel(config.icons.username),
             )
           : "";
         const osSegment = config.components.footer.styles.starship.segments.os
-          ? renderStyleForSource(
+          ? renderThemeStyle(
               theme,
-              colorSource,
               config.colors.os,
               formatOsLabel(config.icons.os, iconMode),
             )
@@ -797,38 +720,27 @@ export function installFooter(
           : "";
         const timeSegment = config.components.footer.styles.starship.segments
           .time
-          ? renderStyleForSource(
+          ? renderThemeStyle(
               theme,
-              colorSource,
               config.colors.time,
               formatTimeLabel(config.icons.time),
             )
           : "";
         const builtInContextLabel = [
-          renderStyleForSource(theme, colorSource, contextColor, contextLabel),
+          renderThemeStyle(theme, contextColor, contextLabel),
           autoCompactionLabel,
         ]
           .filter(Boolean)
           .join(" ");
         const builtInTokenLabel = [
-          renderStyleForSource(
-            theme,
-            colorSource,
-            config.colors.tokens,
-            state.tokenLabel,
-          ),
+          renderThemeStyle(theme, config.colors.tokens, state.tokenLabel),
           cacheReadLabel,
           cacheWriteLabel,
         ]
           .filter(Boolean)
           .join(" ");
         const builtInCostLabel = [
-          renderStyleForSource(
-            theme,
-            colorSource,
-            config.colors.cost,
-            state.costLabel,
-          ),
+          renderThemeStyle(theme, config.colors.cost, state.costLabel),
           subscriptionLabel,
         ]
           .filter(Boolean)
@@ -870,9 +782,8 @@ export function installFooter(
         const renderExtensionStatus = (segment: ExtensionStatusSegment) =>
           segment.colorMode === "original"
             ? segment.text
-            : renderStyleForSource(
+            : renderThemeStyle(
                 theme,
-                colorSource,
                 config.colors.extensionStatus,
                 segment.text,
               );
@@ -936,7 +847,6 @@ export function installFooter(
         const compactCwdLabel = truncateToWidth(
           renderSourceColor(
             theme,
-            colorSource,
             config.colors.cwd,
             "cwd",
             "bold cyan",

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

@@ -215,7 +215,6 @@ export class WorkingLineLayoutController {
         ...settled.summary,
         stylePrefix: snapshotWorkingLineHighStyle(
           ctx.ui.theme,
-          config,
           this.context.getConfig().colors,
         ),
       });

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

@@ -4,7 +4,7 @@ import type {
 } from "@earendil-works/pi-ai";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-import type { ColorSource, ColorSpec } from "../../app/config/shell.ts";
+import type { ColorSpec } from "../../app/config/shell.ts";
 import { formatCount, formatElapsedDuration } from "../../shared/format.ts";
 import { isSafeSgrStylePrefix } from "../../shared/style.ts";
 import { renderWorkingLineHigh } from "./working-line.ts";
@@ -1218,13 +1218,11 @@ export function renderTurnSummaryEntry(
     return new Text(`${entry.data.stylePrefix}${text}${SGR_RESET}`, 0, 0);
   }
   const options = (themeOptions ?? {}) as {
-    colorSource?: ColorSource;
     workingLineHigh?: ColorSpec;
   };
   return new Text(
     `${renderWorkingLineHigh(
       theme,
-      options.colorSource === "terminal" ? "terminal" : "theme",
       options.workingLineHigh,
       text,
     )}${SGR_RESET}`,