pi-one-ui 0.4.0 → 0.5.0

package/CHANGELOG.md

@@ -6,6 +6,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+## [0.5.0] - 2026-09-05
+
+### Changed
+
+- Reduced the Editor to the single `minimalist` style with an `on`/`off` switch: `off` restores Pi's native editor, and the retired `opencode` style is removed (`enabled` merges into `style`, legacy values migrate automatically).
+- Added `/oneui` panel settings for the Editor component: style (`on`/`off`), color source (`theme`/`terminal`), and border color mode (`static`/`adaptive`), each with an inline description.
+- In `off` mode, an explicitly configured `colors.editorBorder` is applied to the native editor border through `colorSource` (theme tokens or fixed terminal colors); without it the native effort/theme coloring is preserved.
+
+### Performance
+
+- Cached `ToolExecutionComponent` render widgets across expand/collapse toggles: repeated Ctrl+O toggles and identical result updates now skip the full native rebuild, cutting batch expansion of many tools (e.g. 30 × 1000-line outputs) from ~130ms to under 0.2ms while keeping expanded and collapsed render slots independent.
+
+### Removed
+
+- Removed the `opencode` Editor style along with its polished renderer, completion-menu module, and `styles.opencode` configuration; the `enabled` field is gone.
+
+### Migration
+
+- `components.editor.enabled: false` becomes `components.editor.style: "off"`; `style: "opencode"`/`"minimalist"` become `"on"`. The `styles.opencode` block and `opencode-copy-friendly`/`accent-rail` selections are ignored.
+
+### Fixed
+
+- Toggling the Editor style between `on`/`off` no longer replaces the editor factory: the existing instance (and Pi's overlay focus target) stays valid, so the `/oneui` panel restores keyboard focus to the input editor after closing.
+- Unconfigured `cwd`, model-label, and static border colors now prefer the theme's `cwd`/`editorModel`/`editorBorder` tokens (which may reference `vars` variables or hex), falling back to Pi's native defaults when the theme does not define them.
+
 ## [0.4.0] - 2026-09-03
 
 ### Changed
@@ -62,7 +87,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 - Reduced rendering lag when expanding settled tool groups by reusing cached child output.
 
-[Unreleased]: https://github.com/kerolt/pi-one-ui/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/kerolt/pi-one-ui/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/kerolt/pi-one-ui/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/kerolt/pi-one-ui/compare/v0.3.1...v0.4.0
 [0.3.1]: https://github.com/kerolt/pi-one-ui/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/kerolt/pi-one-ui/compare/v0.2.2...v0.3.0

package/README.en.md

@@ -26,7 +26,7 @@ Header → Context → WorkingLine → Editor → Footer
 - **Header**: startup information, logo, and shortcut hints.
 - **Context**: the conversation area, including user messages, assistant messages, thinking, tools, diffs, Markdown, and summaries.
 - **WorkingLine**: working state, spinner, token/thought/elapsed information, live output rate, and turn summaries.
-- **Editor**: input editor, completion, metadata, and the Opencode and Minimalist styles.
+- **Editor**: input editor, completion, metadata, and the Minimalist style (Pi native is one toggle away).
 - **Footer**: current directory, Git, runtime, token, cost, and extension status information.
 - **Overlay**: temporary interfaces such as the settings panel and Context Inspector, managed by a shared OverlayManager.
 
@@ -90,8 +90,9 @@ Using the `/oneui` settings panel is recommended. The panel uses a top-centered
   "version": 1,
   "components": {
     "editor": {
-      "enabled": true,
-      "style": "opencode"
+      "style": "on",
+      "colorSource": "theme",
+      "borderColorMode": "static"
     },
     "userMessages": {
       "enabled": true,
@@ -111,7 +112,7 @@ Using the `/oneui` settings panel is recommended. The panel uses a top-centered
 }
 ```
 
-The Editor now supports only the `opencode` and `minimalist` styles. `minimalist` no longer duplicates context-usage information; context percentage, token totals, thresholds, gauges, and related presentation are configured through Footer. Existing configurations that select the removed `opencode-copy-friendly` or `accent-rail` styles safely fall back to the default `opencode`, and their old nested style settings are ignored.
+The Editor keeps a single `minimalist` decoration style controlled by `style`: `on` enables the Minimalist decoration, `off` restores Pi's native editor (the border follows the theme and effort coloring by default; when `colors.editorBorder` is explicitly configured, the off mode applies that color through `colorSource`, overriding the native effort coloring). Legacy configurations migrate automatically: `enabled: false` becomes `style: "off"`, and `opencode`/`minimalist` become `style: "on"`; the `styles.opencode` block and the retired `opencode-copy-friendly`/`accent-rail` styles are ignored. `borderColorMode` supports `static` (fixed `colors.editorBorder`) and `adaptive` (border shifts with the effort level); `colorSource` supports `theme` (colors resolved through the active Pi theme tokens) and `terminal` (fixed terminal colors). When `cwd`, the model label, or the static border are not explicitly configured, the theme's `cwd`/`editorModel`/`editorBorder` tokens are used first (they may point to `vars` variables or hex values), falling back to Pi's native defaults when the theme does not define them; the terminal source falls back to Pi's native colors as well when unconfigured (only an explicit terminal color name or hex is rendered fixed). Context-usage information is presented by Footer.
 
 The WorkingLine token segment appends live output throughput, such as `⚡12 tok/s`, after a model response has run for at least 500ms. Throughput is calculated independently for the current response and resets on the next `turn_start`; disabling the token segment hides it as well.
 

package/README.md

@@ -26,7 +26,7 @@ Header → Context → WorkingLine → Editor → Footer
 - **Header**：启动信息、Logo 和快捷键提示。
 - **Context**：对话内容区，包含用户消息、Assistant 消息、Thinking、Tool、Diff、Markdown 和 Summary。
 - **WorkingLine**：工作状态、spinner、token/thought/elapsed、实时输出速率和回合摘要。
-- **Editor**：输入编辑器、completion、metadata，以及 Opencode 和 Minimalist 样式。
+- **Editor**：输入编辑器、completion、metadata，以及 Minimalist 样式（可切换 Pi 原生）。
 - **Footer**：目录、Git、runtime、token、cost 和扩展状态等信息。
 - **Overlay**：设置面板、Context Inspector 等临时浮层由统一的 OverlayManager 管理。
 
@@ -83,15 +83,17 @@ pi install git:github.com/kerolt/pi-one-ui
 ~/.pi/agent/pi-one-ui.json
 ```
 
-推荐通过 `/oneui` 设置面板修改配置。面板采用更靠近顶部的居中布局；切换 Editor 启用状态或样式时会保持打开并在 Editor 替换后恢复焦点，持久化失败时则恢复列表中的有效旧值。当前配置仍使用 v1 结构，例如：
+
+推荐通过 `/oneui` 设置面板修改配置。面板采用更靠近顶部的居中布局；切换 Editor 开关、颜色源或边框模式时会保持打开并在 Editor 替换后恢复焦点，持久化失败时则恢复列表中的有效旧值。当前配置仍使用 v1 结构，例如：
 
 ```json
 {
   "version": 1,
   "components": {
     "editor": {
-      "enabled": true,
-      "style": "opencode"
+      "style": "on",
+      "colorSource": "theme",
+      "borderColorMode": "static"
     },
     "userMessages": {
       "enabled": true,
@@ -111,7 +113,7 @@ pi install git:github.com/kerolt/pi-one-ui
 }
 ```
 
-Editor 当前只支持 `opencode` 和 `minimalist` 两种样式。`minimalist` 不再重复显示上下文占用信息；上下文百分比、token 总量、阈值和 gauge 等展示统一由 Footer 配置。已有配置若选择了已移除的 `opencode-copy-friendly` 或 `accent-rail`，运行时会安全回退到默认的 `opencode`，相应的旧嵌套样式配置会被忽略。
+Editor 只保留 `minimalist` 一种装饰样式，通过 `style` 开关控制：`on` 启用 Minimalist 装饰，`off` 恢复 Pi 原生编辑器（边框默认跟随主题与 effort 变色；若显式配置了 `colors.editorBorder`，off 模式下也会按 `colorSource` 应用该颜色，覆盖原生 effort 变色）。旧配置的 `enabled: false` 会迁移为 `style: "off"`，`opencode`/`minimalist` 会迁移为 `style: "on"`，`styles.opencode` 嵌套配置与 `opencode-copy-friendly`、`accent-rail` 一并失效。`borderColorMode` 支持 `static`（固定 `colors.editorBorder`）与 `adaptive`（边框随 effort 档位变化）；`colorSource` 支持 `theme`（颜色取当前主题 token）与 `terminal`（固定终端色）。cwd、模型名与边框（static）未显式配置时优先使用主题的 `cwd`/`editorModel`/`editorBorder` token（可指向 vars 变量或 hex），主题未定义则回落 Pi 原生默认；terminal 源未配置时同样回落 Pi 原生颜色（配置了终端色名/hex 才固定渲染）。上下文占用相关信息由 Footer 统一展示。
 
 WorkingLine 的 token segment 会在一次模型响应持续至少 500ms 后追加实时输出速率，例如 `⚡12 tok/s`。速率按当前响应独立计算，在下一次 `turn_start` 时重置；关闭 token segment 时也会一并隐藏。
 

package/extensions/app/commands/settings-previews.ts

@@ -3,7 +3,6 @@ import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { renderUserMessageStyle } from "../../layouts/context/message/user-message-styles.ts";
 import { sanitizeEditorMetadataText } from "../../layouts/editor/editor-metadata-format.ts";
 import { renderMinimalistFrame } from "../../layouts/editor/minimalist-editor.ts";
-import { renderPolishedEditorFrame } from "../../layouts/editor/ui.ts";
 import { safeThemeFg } from "../../shared/style.ts";
 import type { PolishedTuiConfig } from "../config/shell.ts";
 
@@ -59,50 +58,30 @@ export function renderEditorSettingsPreview(
   const viewport = editor.viewportIndicators
     ? { above: "2", below: "3" }
     : undefined;
-  let frame: string[];
-  if (editor.style === "minimalist") {
-    frame = renderMinimalistFrame({
-      width: previewWidth,
-      editorLines,
-      viewport,
-      inputText: EDITOR_PREVIEW_INPUT,
-      metadata: {
-        cwd: "/workspace/zentui/src",
-        projectRoot: "/workspace/zentui",
-        branch: "feat/settings-previews",
-        dirty: true,
-        ahead: 2,
-        behind: 1,
-        costLabel: "$.12",
-        modelLabel,
-        thinkingLevel: "high",
-        sessionName: "Preview",
-        agentDurationMs: 12_000,
-        agentActive: true,
-      },
-      uiTheme: theme,
-      config: safeConfig,
-      borderColor,
-    });
-  } else {
-    frame = renderPolishedEditorFrame({
-      width: previewWidth,
-      editorLines,
-      autocompleteLines,
-      viewport,
-      uiTheme: theme,
-      config: safeConfig,
-      modelMeta: {
-        modelLabel,
-        modelId: "sonnet-4",
-        modelName: "Sonnet 4",
-        providerLabel: "Anthropic",
-        sessionName: "Preview",
-      },
+  const frame = renderMinimalistFrame({
+    width: previewWidth,
+    editorLines,
+    autocompleteLines,
+    viewport,
+    inputText: EDITOR_PREVIEW_INPUT,
+    metadata: {
+      cwd: "/workspace/zentui/src",
+      projectRoot: "/workspace/zentui",
+      branch: "feat/settings-previews",
+      dirty: true,
+      ahead: 2,
+      behind: 1,
+      costLabel: "$.12",
+      modelLabel,
       thinkingLevel: "high",
-      borderColor,
-    });
-  }
+      sessionName: "Preview",
+      agentDurationMs: 12_000,
+      agentActive: true,
+    },
+    uiTheme: theme,
+    config: safeConfig,
+    borderColor,
+  });
   return boundedRows(frame, previewWidth);
 }
 

package/extensions/app/config/shell.ts

@@ -24,7 +24,7 @@ export type { IconMode } from "../../shared/icons.ts";
 export type ContextStyle = "text" | "gauge" | "text+gauge";
 export type SeparatorStyle = "pipe" | "dot" | "chevron" | "none";
 export type ModelLabelSource = "id" | "name";
-export type EditorStyle = "opencode" | "minimalist";
+export type EditorStyle = "on" | "off";
 export type UserMessageStyle =
   | "framed"
   | "framed-copy-friendly"
@@ -46,7 +46,6 @@ export type ComponentStyleOwner =
   | "footer";
 export type MinimalistPathDisplayMode = "compact" | "project" | "full";
 export type EditorBorderColorMode = "static" | "adaptive";
-export type CompletionMenuStyle = "native" | "palette";
 export type CompactFooterMaxLines = 1 | 2 | 3 | "unlimited";
 
 export const DEFAULT_COMPACT_FOOTER_FORMAT =
@@ -103,11 +102,6 @@ export type FooterSegmentsConfig = {
   packageVersion: boolean;
 };
 
-export type PolishedEditorStyleConfig = {
-  metadataFormat: string;
-  completionMenu: CompletionMenuStyle;
-};
-
 export type MinimalistEditorStyleConfig = {
   pathDisplay: MinimalistPathDisplayMode;
   showSessionName: boolean;
@@ -124,14 +118,12 @@ export type EditorStylesConfig = {
 };
 
 export type EditorComponentConfig = {
-  enabled: boolean;
   style: EditorStyle;
   colorSource: ColorSource;
   borderColorMode: EditorBorderColorMode;
   modelLabel: ModelLabelSource;
   viewportIndicators: boolean;
   styles: {
-    opencode: PolishedEditorStyleConfig;
     minimalist: MinimalistEditorStyleConfig;
   };
 };
@@ -281,7 +273,7 @@ export type ZentuiConfig = {
 };
 
 export type PolishedTuiColors = {
-  cwd: ColorSpec;
+  cwd?: ColorSpec;
   sessionName: ColorSpec;
   gitBranch: ColorSpec;
   gitStatus: ColorSpec;
@@ -414,8 +406,6 @@ const defaultFooterSegments: FooterSegmentsConfig = {
   packageVersion: false,
 };
 
-const DEFAULT_COMPLETION_MENU: CompletionMenuStyle = "palette";
-
 const defaultMinimalistStyle: MinimalistEditorStyleConfig = {
   pathDisplay: "compact",
   showSessionName: true,
@@ -446,17 +436,12 @@ const defaultStarshipStyle: StarshipFooterStyleConfig = {
 
 const defaultComponents: ComponentsConfig = {
   editor: {
-    enabled: true,
-    style: "opencode",
+    style: "on",
     colorSource: "theme",
     borderColorMode: "static",
     modelLabel: "id",
     viewportIndicators: true,
     styles: {
-      opencode: {
-        metadataFormat: DEFAULT_EDITOR_METADATA_FORMAT,
-        completionMenu: DEFAULT_COMPLETION_MENU,
-      },
       minimalist: defaultMinimalistStyle,
     },
   },
@@ -496,7 +481,6 @@ export const defaultConfig: PolishedTuiConfig = {
   projectRefreshIntervalMs: DEFAULT_PROJECT_REFRESH_INTERVAL_MS,
   icons: { mode: "auto", ...NERD_DEFAULT_ICONS },
   colors: {
-    cwd: "bold cyan",
     sessionName: "bold green",
     gitBranch: "bold purple",
     gitStatus: "bold red",
@@ -578,7 +562,9 @@ function parseEditorModelLabel(
 }
 
 function parseEditorStyle(value: unknown): EditorStyle {
-  if (value === "opencode" || value === "minimalist") return value;
+  if (value === "on" || value === "off") return value;
+  // 迁移：旧 opencode / minimalist 样式统一收敛为 on（minimalist）。
+  if (value === "opencode" || value === "minimalist") return "on";
   return defaultComponents.editor.style;
 }
 
@@ -587,12 +573,6 @@ function parseEditorBorderColorMode(value: unknown): EditorBorderColorMode {
   return defaultConfig.editorBorderColorMode;
 }
 
-function parseCompletionMenuStyle(value: unknown): CompletionMenuStyle {
-  return value === "native" || value === "palette"
-    ? value
-    : DEFAULT_COMPLETION_MENU;
-}
-
 export function isSeparatorStyle(value: unknown): value is SeparatorStyle {
   return (
     value === "pipe" ||
@@ -1027,7 +1007,6 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
   const components = recordValue(config.components);
   const editor = recordValue(components.editor);
   const editorStyles = recordValue(editor.styles);
-  const opencode = recordValue(editorStyles.opencode);
   const minimalist = recordValue(editorStyles.minimalist);
   const userMessages = recordValue(components.userMessages);
   const workingLine = recordValue(components.workingLine);
@@ -1040,8 +1019,12 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 
   return {
     editor: {
-      enabled: parseBoolean(editor.enabled, defaultComponents.editor.enabled),
-      style: parseEditorStyle(editor.style),
+      // 迁移：旧 enabled:false 收敛为 style:"off"（enabled 字段已移除）。
+      style:
+        hasOwn(editor, "enabled") &&
+        parseBoolean(editor.enabled, true) === false
+          ? "off"
+          : parseEditorStyle(editor.style),
       colorSource: parseColorSource(
         editor.colorSource,
         defaultComponents.editor.colorSource,
@@ -1056,13 +1039,6 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
         defaultComponents.editor.viewportIndicators,
       ),
       styles: {
-        opencode: {
-          metadataFormat: parseNonEmptyString(
-            opencode.metadataFormat,
-            DEFAULT_EDITOR_METADATA_FORMAT,
-          ),
-          completionMenu: parseCompletionMenuStyle(opencode.completionMenu),
-        },
         minimalist: {
           pathDisplay:
             minimalist.pathDisplay === "compact" ||
@@ -1241,8 +1217,7 @@ function derivedRuntimeView(config: ZentuiConfig): PolishedTuiConfig {
     extensionStatuses: starship.extensionStatuses,
     editorStyle: config.components.editor.style,
     editorStyles: { minimalist },
-    editorMetadataFormat:
-      config.components.editor.styles.opencode.metadataFormat,
+    editorMetadataFormat: DEFAULT_EDITOR_METADATA_FORMAT,
     editorBorderColorMode: config.components.editor.borderColorMode,
     editorModelLabel: config.components.editor.modelLabel,
     colorSources: {
@@ -1251,7 +1226,7 @@ function derivedRuntimeView(config: ZentuiConfig): PolishedTuiConfig {
       userMessages: config.components.userMessages.colorSource,
     },
     features: {
-      editor: config.components.editor.enabled,
+      editor: config.components.editor.style === "on",
       statusLine: config.components.footer.style === "starship",
       viewportIndicators: config.components.editor.viewportIndicators,
     },
@@ -1263,8 +1238,10 @@ const unsupportedComponentStyles = new WeakMap<
   ReadonlySet<ComponentStyleOwner>
 >();
 
-// Retired selections migrate to Opencode instead of disabling the custom Editor.
+// Retired selections migrate to the sole "on" (minimalist) style instead of
+// disabling the custom Editor. opencode itself is retired along with its variants.
 const retiredEditorStyleIds: ReadonlySet<string> = new Set([
+  "opencode",
   "opencode-copy-friendly",
   "accent-rail",
 ]);
@@ -1273,7 +1250,7 @@ const knownComponentStyleIds: Record<
   ComponentStyleOwner,
   ReadonlySet<string>
 > = {
-  editor: new Set(["opencode", "minimalist"]),
+  editor: new Set(["on", "off"]),
   userMessages: new Set([
     "framed",
     "framed-copy-friendly",
@@ -1441,7 +1418,6 @@ function applyEditorComponentPatch(
   patch: Partial<
     Pick<
       EditorComponentConfig,
-      | "enabled"
       | "style"
       | "colorSource"
       | "borderColorMode"
@@ -1450,7 +1426,6 @@ function applyEditorComponentPatch(
     >
   >,
 ): void {
-  if (patch.enabled !== undefined) component.enabled = patch.enabled;
   if (patch.style !== undefined) component.style = patch.style;
   if (patch.colorSource !== undefined)
     component.colorSource = patch.colorSource;
@@ -1466,7 +1441,6 @@ export function saveEditorComponentPatch(
   patch: Partial<
     Pick<
       EditorComponentConfig,
-      | "enabled"
       | "style"
       | "colorSource"
       | "borderColorMode"
@@ -1483,19 +1457,6 @@ export function saveEditorComponentPatch(
   );
 }
 
-export function savePolishedEditorStylePatch(
-  patch: Partial<PolishedEditorStyleConfig>,
-  path = configPath,
-): PolishedTuiConfig {
-  return saveComponentsMutation((components) => {
-    const style = components.editor.styles.opencode;
-    if (patch.metadataFormat !== undefined)
-      style.metadataFormat = patch.metadataFormat;
-    if (patch.completionMenu !== undefined)
-      style.completionMenu = patch.completionMenu;
-  }, path);
-}
-
 function applyMinimalistStylePatch(
   style: MinimalistEditorStyleConfig,
   patch: Partial<MinimalistEditorStyleConfig>,
@@ -1695,7 +1656,7 @@ export function saveUiFeaturesPatch(
   return saveComponentsMutation(
     (components) => {
       if (valid.editor !== undefined) {
-        components.editor.enabled = valid.editor;
+        components.editor.style = valid.editor ? "on" : "off";
         components.userMessages.enabled = valid.editor;
         components.selectorBorders.enabled = valid.editor;
       }

package/extensions/app/panel.ts

@@ -23,10 +23,11 @@ import {
 } from "./config/renderer.ts";
 import {
   type EditorComponentConfig,
-  type EditorStyle,
   type FooterComponentConfig,
   type FooterStyle,
   loadConfig as loadShellConfig,
+  saveColorSourcesPatch,
+  saveEditorBorderColorMode,
   saveEditorComponentPatch,
   saveFooterComponentPatch,
   saveUserMessagesComponentPatch,
@@ -40,7 +41,6 @@ import { overlayManager } from "./overlay/overlay-manager.ts";
 import { ownerFor } from "./ownership.ts";
 import { applyPreset, PRESET_VALUES, type Preset } from "./presets.ts";
 
-const EDITOR_STYLES: EditorStyle[] = ["opencode", "minimalist"];
 const MESSAGE_STYLES: UserMessageStyle[] = [
   "framed",
   "framed-copy-friendly",
@@ -126,18 +126,28 @@ function editorItems(): SettingItem[] {
   const config = loadShellConfig();
   return [
     {
-      id: "editorEnabled",
+      id: "editorStyle",
       label: "Editor",
-      description: "Enable the custom input editor.",
-      currentValue: onOff(config.components.editor.enabled),
+      description:
+        "on applies the Minimalist decoration; off restores Pi's native editor.",
+      currentValue: config.components.editor.style,
       values: ["on", "off"],
     },
     {
-      id: "editorStyle",
-      label: "Editor style",
-      description: "Choose the input editor treatment.",
-      currentValue: config.components.editor.style,
-      values: EDITOR_STYLES,
+      id: "editorColorSource",
+      label: "Color source",
+      description:
+        "theme resolves colors through the active Pi theme; terminal uses fixed terminal colors.",
+      currentValue: config.components.editor.colorSource,
+      values: ["theme", "terminal"],
+    },
+    {
+      id: "editorBorderColorMode",
+      label: "Border color",
+      description:
+        "static keeps one border color; adaptive shifts the border with the effort level.",
+      currentValue: config.components.editor.borderColorMode,
+      values: ["static", "adaptive"],
     },
   ];
 }
@@ -429,18 +439,31 @@ function updateSetting(
   ctx: any,
   deps: UnifiedPanelDeps,
 ): void {
-  if (id === "editorEnabled") {
-    if (deps.runtime)
-      deps.runtime.setEditorComponent({ enabled: isOn(value) }, ctx);
-    else saveEditorComponentPatch({ enabled: isOn(value) });
+  if (id === "editorStyle" && (value === "on" || value === "off")) {
+    if (deps.runtime) deps.runtime.setEditorComponent({ style: value }, ctx);
+    else saveEditorComponentPatch({ style: value });
     saveNotice(ctx, "Editor", value);
     return;
   }
-  if (id === "editorStyle" && EDITOR_STYLES.includes(value as EditorStyle)) {
+  if (
+    id === "editorColorSource" &&
+    (value === "theme" || value === "terminal")
+  ) {
     if (deps.runtime)
-      deps.runtime.setEditorComponent({ style: value as EditorStyle }, ctx);
-    else saveEditorComponentPatch({ style: value as EditorStyle });
-    saveNotice(ctx, "Editor style", value);
+      deps.runtime.setEditorComponent({ colorSource: value }, ctx);
+    else saveColorSourcesPatch({ editor: value });
+    saveNotice(ctx, "Color source", value);
+    return;
+  }
+  if (id === "editorBorderColorMode") {
+    const valid =
+      value === "static" || value === "adaptive" ? value : undefined;
+    if (valid) {
+      if (deps.runtime)
+        deps.runtime.setEditorComponent({ borderColorMode: valid }, ctx);
+      else saveEditorBorderColorMode(valid);
+      saveNotice(ctx, "Border color", value);
+    }
     return;
   }
   if (id === "userMessagesEnabled") {
@@ -615,7 +638,7 @@ export async function showOneUiPanel(
                   createList();
                   list.selectItem(id);
                 } finally {
-                  if (id === "editorEnabled" || id === "editorStyle") {
+                  if (id === "editorStyle") {
                     panelHandle?.focus();
                   }
                   tui.requestRender();

package/extensions/app/presets.ts

@@ -17,7 +17,7 @@ export function isPreset(value: string): value is Preset {
 /** Apply only ownership-related values; detailed options remain user-editable. */
 export function applyPreset(preset: Preset): void {
   if (preset === "native") {
-    saveEditorComponentPatch({ enabled: false });
+    saveEditorComponentPatch({ style: "off" });
     saveUserMessagesComponentPatch({ enabled: false });
     saveWorkingLineComponentPatch({ enabled: false });
     saveFooterComponentPatch({ style: "native" });
@@ -25,7 +25,7 @@ export function applyPreset(preset: Preset): void {
     return;
   }
 
-  saveEditorComponentPatch({ enabled: true });
+  saveEditorComponentPatch({ style: "on" });
   saveUserMessagesComponentPatch({ enabled: true });
   saveWorkingLineComponentPatch({ enabled: true });
   saveFooterComponentPatch({ style: "starship" });

package/extensions/layouts/context/renderer/index.ts

@@ -47,6 +47,10 @@ import {
   setMessageDisplayTheme,
 } from "./tool/message-display.ts";
 import { clearAllAnimations } from "./tool/result.ts";
+import {
+  installToggleRenderCache,
+  type ToggleRenderCacheHooks,
+} from "./tool/toggle-render-cache.ts";
 
 /**
  * Claude Code Style for pi — 装配入口。
@@ -143,6 +147,7 @@ export default function (
     | {
         defaultMode: DefaultModeHooks;
         toolGrouping: ToolGroupingHooks;
+        toggleRenderCache: ToggleRenderCacheHooks;
         compactMode: CompactModeHooks;
         disposeMessageDisplay: () => void;
         disposeToolExpandedBackground: () => void;
@@ -162,12 +167,15 @@ export default function (
     });
     compactModeHooks = compactMode;
     const disposeMessageDisplay = installMessageDisplayRendering();
+    // 跨 toggle 重建缓存必须在展开背景 patch 之下（背景后装外层，shutdown 先拆）。
+    const toggleRenderCache = installToggleRenderCache();
     // 展开背景必须在 compact-mode 之后装，shutdown 时先于 compact 释放。
     const disposeToolExpandedBackground = installToolExpandedBackground();
     deactivateLegacyCompactionRendering();
     installation = {
       defaultMode,
       toolGrouping,
+      toggleRenderCache,
       compactMode,
       disposeMessageDisplay,
       disposeToolExpandedBackground,
@@ -180,6 +188,9 @@ export default function (
       applyStyleMode(mode, ctx, installation?.toolGrouping),
     updateConfig: (partial, ctx) => {
       updateConfig(partial);
+      // 配置（如 expandedPreviewMaxLines / excludeRenderers）变化可能改变
+      // 渲染结果：丢弃工具卡跨 toggle 缓存，下次 updateDisplay 重建。
+      installation?.toggleRenderCache.clear();
       refreshCurrentContext(ctx, installation?.toolGrouping);
     },
   });
@@ -213,6 +224,7 @@ export default function (
       installToolMouseInteraction(ctx, mouseOwner);
     if (!hooks) return;
     hooks.toolGrouping.setTheme(ctx.ui.theme);
+    hooks.toggleRenderCache.setTheme(ctx.ui.theme);
     setMessageDisplayTheme(ctx.ui.theme);
     ctx.ui.setStatus("ccstyle", undefined);
     // Collect the resumed context before syncing compact patches and expansion state.
@@ -231,6 +243,7 @@ export default function (
       installToolMouseInteraction(ctx, mouseOwner);
     if (!hooks) return;
     hooks.toolGrouping.setTheme(ctx.ui.theme);
+    hooks.toggleRenderCache.setTheme(ctx.ui.theme);
     setMessageDisplayTheme(ctx.ui.theme);
     syncCompactMode(ctx);
     scheduleSessionRender(() => {
@@ -248,6 +261,7 @@ export default function (
 
   pi.on("tool_execution_start", async (_event, ctx) => {
     installation?.toolGrouping.setTheme(ctx.ui.theme);
+    installation?.toggleRenderCache.setTheme(ctx.ui.theme);
   });
 
   pi.on("session_shutdown", async () => {
@@ -260,6 +274,7 @@ export default function (
     current.defaultMode.shutdown();
     current.toolGrouping.shutdown();
     current.disposeToolExpandedBackground();
+    current.toggleRenderCache.shutdown();
     current.compactMode.shutdown();
     compactModeHooks = undefined;
     current.disposeMessageDisplay();