pi-one-ui 0.3.1 → 0.5.0

package/extensions/layouts/editor/ui.ts

@@ -12,18 +12,13 @@ import {
   truncateToWidth,
   visibleWidth,
 } from "@earendil-works/pi-tui";
-import type { EditorStyle, ZentuiConfig } from "../../app/config/shell.ts";
+import type { ZentuiConfig } from "../../app/config/shell.ts";
 import {
   EDITOR_ACCENT_FALLBACK,
   EDITOR_BORDER_FALLBACK,
   renderStyleForSourceOrFallback,
   safeThemeFg,
 } from "../../shared/style.ts";
-import {
-  ACCENT_RAIL_CHROME_WIDTH,
-  renderAccentRailEditorFrame,
-} from "./accent-rail-editor.ts";
-import { renderCompletionPalette } from "./completion-menu.ts";
 import { renderEditorMetadataFormat } from "./editor-metadata-format.ts";
 import {
   type MinimalistEditorMetadata,
@@ -95,50 +90,11 @@ export type EditorMeta = {
   sessionName?: string;
 };
 
-export type PolishedEditorFrameOptions = {
-  width: number;
-  editorLines: string[];
-  autocompleteLines?: string[];
-  viewport?: ViewportCounts;
-  uiTheme: Theme;
-  config: ZentuiConfig;
-  modelMeta: EditorMeta;
-  thinkingLevel?: string;
-  rightStatus?: string;
-  borderColor?: (text: string) => string;
-};
-
-type PolishedFrameOptions = {
-  width: number;
-  baseRendered: string[];
-  autocompleteSource: AutocompleteEditorInternals;
-  autocompleteCapture?: AutocompleteCapture;
-  uiTheme: Theme;
-  config: ZentuiConfig;
-  modelMeta: EditorMeta;
-  thinkingLevel: string | undefined;
-  rightStatus?: string;
-  ownedFrame?: PolishedFrameSplit;
-  trustedBaseFrame?: boolean;
-  borderColor?: (text: string) => string;
-};
-
 type PolishedFrameResult = {
   lines: string[];
   decorated: boolean;
 };
 
-type AccentRailFrameAdapterOptions = {
-  width: number;
-  baseRendered: string[];
-  autocompleteSource: AutocompleteEditorInternals;
-  autocompleteCapture?: AutocompleteCapture;
-  uiTheme: Theme;
-  config: ZentuiConfig;
-  ownedFrame?: PolishedFrameSplit;
-  trustedBaseFrame?: boolean;
-};
-
 type MinimalistFrameAdapterOptions = {
   width: number;
   baseRendered: string[];
@@ -331,6 +287,29 @@ export function renderWithAutocompleteCapture<T>(
   }
 }
 
+/**
+ * off 模式的原生边框覆盖：仅在 style=off 且用户显式配置了 colors.editorBorder
+ * 时返回按 colorSource 解释的边框渲染函数；未配置或 on 模式返回 undefined
+ * （保持 Pi 原生 effort/主题变色不动）。
+ */
+export function offEditorBorderColor(
+  config: ZentuiConfig,
+  uiTheme: Theme,
+): ((text: string) => string) | undefined {
+  const editor = config.components.editor;
+  if (editor.style !== "off") return undefined;
+  const spec = config.colors.editorBorder;
+  if (typeof spec !== "string" || spec.trim() === "") return undefined;
+  return (text) =>
+    renderStyleForSourceOrFallback(
+      uiTheme,
+      editor.colorSource,
+      spec,
+      EDITOR_BORDER_FALLBACK,
+      text,
+    );
+}
+
 function clampRenderedLines(lines: string[], width: number): string[] {
   const maxWidth = Math.max(0, width);
   return lines.map((line) => truncateToWidth(line, maxWidth, ""));
@@ -342,79 +321,19 @@ function fillLine(content: string, width: number): string {
   return `${truncated}${pad}`;
 }
 
-function isLowRailPolishedStyle(style: EditorStyle): boolean {
-  return style === "opencode-copy-friendly";
-}
-
-function selectedPolishedConfig(config: ZentuiConfig) {
-  switch (config.components.editor.style) {
-    case "opencode":
-      return config.components.editor.styles.opencode;
-    case "opencode-copy-friendly":
-      return config.components.editor.styles["opencode-copy-friendly"];
-    case "accent-rail":
-    case "minimalist":
-      return undefined;
-  }
-}
-
-function lowRailPrompt(
-  config: ZentuiConfig,
-  uiTheme: Theme,
-  reset: string,
-): string {
-  const promptIcon = config.icons.editorPrompt;
-  return promptIcon
-    ? `${renderStyleForSourceOrFallback(
-        uiTheme,
-        config.components.editor.colorSource,
-        config.colors.editorPrompt ?? config.colors.editorAccent,
-        EDITOR_ACCENT_FALLBACK,
-        promptIcon,
-      )}${reset} `
-    : "";
-}
-
 function getEditorChromeWidths(
   config: ZentuiConfig,
   uiTheme: Theme,
   reset: string,
 ) {
-  const lowRail = isLowRailPolishedStyle(config.components.editor.style);
-  const prompt = lowRailPrompt(config, uiTheme, reset);
-  const rail = lowRail
-    ? ""
-    : `${renderStyleForSourceOrFallback(
-        uiTheme,
-        config.components.editor.colorSource,
-        config.colors.editorAccent,
-        EDITOR_ACCENT_FALLBACK,
-        config.icons.rail,
-      )}${reset} `;
-  return {
-    prompt,
-    promptWidth: visibleWidth(prompt),
-    rail,
-    railWidth: lowRail ? visibleWidth(prompt) : visibleWidth(rail),
-  };
-}
-
-function composeMetadataLine(
-  left: string,
-  right: string | undefined,
-  width: number,
-): string {
-  if (!right) return left;
-  const maxWidth = Math.max(0, width);
-  const rightWidth = visibleWidth(right);
-  if (rightWidth >= maxWidth) return truncateToWidth(right, maxWidth, "");
-
-  const leftWidth = Math.max(0, maxWidth - rightWidth - 1);
-  const leftText = truncateToWidth(left, leftWidth, "");
-  const gap = " ".repeat(
-    Math.max(1, maxWidth - visibleWidth(leftText) - rightWidth),
-  );
-  return `${leftText}${gap}${right}`;
+  const rail = `${renderStyleForSourceOrFallback(
+    uiTheme,
+    config.components.editor.colorSource,
+    config.colors.editorAccent,
+    EDITOR_ACCENT_FALLBACK,
+    config.icons.rail,
+  )}${reset} `;
+  return { rail, railWidth: visibleWidth(rail) };
 }
 
 function ansiStrippedText(line: string): string {
@@ -439,17 +358,6 @@ function parseEditorBorder(
   return match?.[1] ? { count: match[1] } : undefined;
 }
 
-function renderEditorBorder(
-  width: number,
-  direction: keyof ViewportCounts,
-  count: string | undefined,
-): string {
-  if (!count) return "─".repeat(width);
-  const arrow = direction === "above" ? "↑" : "↓";
-  const indicator = `─── ${arrow} ${count} more `;
-  return `${indicator}${"─".repeat(Math.max(0, width - visibleWidth(indicator)))}`;
-}
-
 function unwrapPolishedFrameOnly(
   lines: string[],
   config: ZentuiConfig,
@@ -464,31 +372,6 @@ function unwrapPolishedFrameOnly(
   const interior = lines.slice(1, -1);
   if (interior.length < 3) return undefined;
 
-  if (isLowRailPolishedStyle(config.components.editor.style)) {
-    if (
-      plainRenderedText(interior[0] ?? "").trim() !== "" ||
-      plainRenderedText(interior.at(-2) ?? "").trim() !== "" ||
-      !(interior.at(-1) ?? "").startsWith(" ")
-    )
-      return undefined;
-
-    const { prompt, promptWidth } = getEditorChromeWidths(
-      config,
-      uiTheme,
-      "\x1b[0m",
-    );
-    const continuation = " ".repeat(promptWidth);
-    const content = interior.slice(1, -2);
-    const unwrapped: string[] = [];
-    for (let index = 0; index < content.length; index++) {
-      const prefix = index === 0 ? prompt : continuation;
-      const line = content[index] ?? "";
-      if (prefix && !line.startsWith(prefix)) return undefined;
-      unwrapped.push(prefix ? line.slice(prefix.length) : line);
-    }
-    return { editorLines: unwrapped, viewport };
-  }
-
   const { rail } = getEditorChromeWidths(config, uiTheme, "\x1b[0m");
   if (!rail || interior.some((line) => !line.startsWith(rail)))
     return undefined;
@@ -540,94 +423,6 @@ function inspectPolishedFrameProvenance(
   return { safe: !unsafe, ownedFrame };
 }
 
-function vimModeColor(mode: string): string {
-  switch (mode.toLowerCase()) {
-    case "insert":
-      return "success";
-    case "normal":
-      return "accent";
-    case "ex":
-      return "warning";
-    case "replace":
-      return "error";
-    case "visual":
-      return "syntaxKeyword";
-    default:
-      return "muted";
-  }
-}
-
-function readVimStatus(
-  editor: WrappedEditor,
-  uiTheme: Theme,
-): string | undefined {
-  const mode = editor.getMode?.();
-  if (typeof mode !== "string") return undefined;
-  const normalized = mode.trim();
-  if (!normalized) return undefined;
-  const label = `${normalized.toUpperCase()} `;
-  return safeThemeFg(uiTheme, vimModeColor(normalized), label);
-}
-
-function renderAccentRailFrameFromBase({
-  width,
-  baseRendered,
-  autocompleteSource,
-  autocompleteCapture,
-  uiTheme,
-  config,
-  ownedFrame,
-  trustedBaseFrame = false,
-}: AccentRailFrameAdapterOptions): PolishedFrameResult {
-  if (width < ACCENT_RAIL_CHROME_WIDTH + 1 || baseRendered.length < 2) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  if (ownedFrame && !isPolishedFrameSplit(ownedFrame, baseRendered.length)) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  const autocomplete = ownedFrame
-    ? { known: true as const, count: ownedFrame.trailingLines.length }
-    : autocompleteCount(autocompleteSource, autocompleteCapture, baseRendered);
-  if (!autocomplete.known) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  const editorFrame =
-    !ownedFrame && autocomplete.count > 0
-      ? baseRendered.slice(0, -autocomplete.count)
-      : baseRendered;
-  const autocompleteLines = ownedFrame
-    ? ownedFrame.trailingLines
-    : autocomplete.count > 0
-      ? baseRendered.slice(-autocomplete.count)
-      : [];
-  if (editorFrame.length < 2) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  const parsedTop = parseEditorBorder(editorFrame[0] ?? "", "above");
-  const parsedBottom = parseEditorBorder(editorFrame.at(-1) ?? "", "below");
-  if (!ownedFrame && !trustedBaseFrame && (!parsedTop || !parsedBottom)) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  const editorLines = ownedFrame?.editorLines ?? editorFrame.slice(1, -1);
-  const viewport = ownedFrame?.viewport ?? {
-    above: parsedTop?.count,
-    below: parsedBottom?.count,
-  };
-  const lines = renderAccentRailEditorFrame({
-    width,
-    editorLines,
-    autocompleteLines,
-    viewport,
-    uiTheme,
-    config,
-  });
-  POLISHED_FRAME_SPLITS.set(lines, {
-    rows: Object.freeze([...lines]),
-    split: { editorLines, trailingLines: autocompleteLines, viewport },
-  });
-  return { lines, decorated: true };
-}
-
 function renderMinimalistFrameFromBase({
   width,
   baseRendered,
@@ -692,196 +487,6 @@ function renderMinimalistFrameFromBase({
   };
 }
 
-function renderPolishedFrame({
-  width,
-  baseRendered,
-  autocompleteSource,
-  autocompleteCapture,
-  uiTheme,
-  config,
-  modelMeta,
-  thinkingLevel,
-  rightStatus,
-  ownedFrame,
-  trustedBaseFrame = false,
-  borderColor,
-}: PolishedFrameOptions): PolishedFrameResult {
-  if (width <= 2)
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-
-  if (baseRendered.length < 2) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  if (ownedFrame && !isPolishedFrameSplit(ownedFrame, baseRendered.length)) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-
-  const autocomplete = ownedFrame
-    ? { known: true, count: ownedFrame.trailingLines.length }
-    : autocompleteCount(autocompleteSource, autocompleteCapture, baseRendered);
-  if (!autocomplete.known) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  const editorFrame =
-    !ownedFrame && autocomplete.count > 0
-      ? baseRendered.slice(0, -autocomplete.count)
-      : baseRendered;
-  const autocompleteLines = ownedFrame
-    ? ownedFrame.trailingLines
-    : autocomplete.count > 0
-      ? baseRendered.slice(-autocomplete.count)
-      : [];
-  if (editorFrame.length < 2) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-
-  const parsedTop = parseEditorBorder(editorFrame[0] ?? "", "above");
-  const parsedBottom = parseEditorBorder(editorFrame.at(-1) ?? "", "below");
-  if (!ownedFrame && !trustedBaseFrame && (!parsedTop || !parsedBottom)) {
-    return { lines: clampRenderedLines(baseRendered, width), decorated: false };
-  }
-  const editorLines = ownedFrame?.editorLines ?? editorFrame.slice(1, -1);
-  const viewport = ownedFrame?.viewport ?? {
-    above: parsedTop?.count,
-    below: parsedBottom?.count,
-  };
-  const lines = renderPolishedEditorFrame({
-    width,
-    editorLines,
-    autocompleteLines,
-    viewport,
-    uiTheme,
-    config,
-    modelMeta,
-    thinkingLevel,
-    rightStatus,
-    borderColor,
-  });
-  POLISHED_FRAME_SPLITS.set(lines, {
-    rows: Object.freeze([...lines]),
-    split: {
-      editorLines,
-      trailingLines: autocompleteLines,
-      viewport,
-    },
-  });
-  return { lines, decorated: true };
-}
-
-/** Pure Opencode frame composition shared by the live editor and settings preview. */
-export function renderPolishedEditorFrame({
-  width,
-  editorLines,
-  autocompleteLines = [],
-  viewport = {},
-  uiTheme,
-  config,
-  modelMeta,
-  thinkingLevel,
-  rightStatus,
-  borderColor,
-}: PolishedEditorFrameOptions): string[] {
-  if (width <= 2) return clampRenderedLines(editorLines, width);
-  const reset = "\x1b[0m";
-  const colorSource = config.components.editor.colorSource;
-  const { prompt, promptWidth, rail, railWidth } = getEditorChromeWidths(
-    config,
-    uiTheme,
-    reset,
-  );
-  const innerWidth = Math.max(0, width - railWidth);
-  const lowRailContinuation = " ".repeat(promptWidth);
-  const meta = renderEditorMetadataFormat(
-    selectedPolishedConfig(config)?.metadataFormat ??
-      config.components.editor.styles.opencode.metadataFormat,
-    {
-      model: modelMeta.modelLabel,
-      modelId: modelMeta.modelId ?? "",
-      modelName: modelMeta.modelName ?? "",
-      provider: modelMeta.providerLabel,
-      thinking: thinkingLevel ?? "",
-      sessionName: modelMeta.sessionName ?? "",
-    },
-    uiTheme,
-    config,
-  );
-  const lowRailMeta = composeMetadataLine(
-    meta,
-    rightStatus,
-    Math.max(0, width - 1),
-  );
-  const railedMeta = composeMetadataLine(meta, rightStatus, innerWidth);
-
-  const renderStaticBorder = (text: string) =>
-    renderStyleForSourceOrFallback(
-      uiTheme,
-      colorSource,
-      config.colors.editorBorder,
-      EDITOR_BORDER_FALLBACK,
-      text,
-    );
-  const renderBorder = (text: string) => {
-    if (
-      config.components.editor.borderColorMode !== "adaptive" ||
-      typeof borderColor !== "function"
-    ) {
-      return renderStaticBorder(text);
-    }
-    try {
-      const rendered = borderColor(text);
-      return typeof rendered === "string" ? rendered : renderStaticBorder(text);
-    } catch {
-      return renderStaticBorder(text);
-    }
-  };
-  const top = renderBorder(
-    renderEditorBorder(
-      width,
-      "above",
-      config.components.editor.viewportIndicators ? viewport.above : undefined,
-    ),
-  );
-  const bottom = renderBorder(
-    renderEditorBorder(
-      width,
-      "below",
-      config.components.editor.viewportIndicators ? viewport.below : undefined,
-    ),
-  );
-  const completionLines =
-    selectedPolishedConfig(config)?.completionMenu === "palette"
-      ? renderCompletionPalette({
-          lines: autocompleteLines,
-          width,
-          theme: uiTheme,
-          renderSeparator: renderBorder,
-          ownedBackground: false,
-        })
-      : autocompleteLines;
-  const lines = ["", ...editorLines, "", railedMeta];
-  const renderedLines = isLowRailPolishedStyle(config.components.editor.style)
-    ? [
-        top,
-        "",
-        ...editorLines.map(
-          (line, index) =>
-            `${index === 0 ? prompt : lowRailContinuation}${fillLine(line, innerWidth)}`,
-        ),
-        "",
-        ` ${truncateToWidth(lowRailMeta, Math.max(0, width - 1), "")}`,
-        bottom,
-        ...completionLines,
-      ]
-    : [
-        top,
-        ...lines.map((line) => `${rail}${fillLine(line, innerWidth)}`),
-        bottom,
-        ...completionLines,
-      ];
-
-  return clampRenderedLines(renderedLines, width);
-}
-
 export class PolishedEditor extends CustomEditor {
   private readonly getModelMeta: () => EditorMeta;
   private readonly getThinkingLevel: () => string | undefined;
@@ -917,113 +522,45 @@ export class PolishedEditor extends CustomEditor {
 
   render(width: number): string[] {
     const config = this.getConfig();
-    if (!config.components.editor.enabled) {
+    if (config.components.editor.style === "off") {
+      const offBorder = offEditorBorderColor(config, this.uiTheme);
+      if (offBorder) this.borderColor = offBorder;
       this.reportMinimalistDecoration(false);
       return clampRenderedLines(super.render(width), width);
     }
-    if (config.components.editor.style === "accent-rail") {
+    if (width <= 4) {
       this.reportMinimalistDecoration(false);
-      if (width < ACCENT_RAIL_CHROME_WIDTH + 1) {
-        return clampRenderedLines(super.render(width), width);
-      }
-      let captured: { value: string[]; capture?: AutocompleteCapture };
-      try {
-        captured = renderWithAutocompleteCapture(
-          this as unknown as AutocompleteEditorInternals,
-          () => super.render(width - ACCENT_RAIL_CHROME_WIDTH),
-        );
-      } catch {
-        return clampRenderedLines(super.render(width), width);
-      }
-      try {
-        const result = renderAccentRailFrameFromBase({
-          width,
-          baseRendered: captured.value,
-          autocompleteSource: this as unknown as AutocompleteEditorInternals,
-          autocompleteCapture: captured.capture,
-          uiTheme: this.uiTheme,
-          config,
-          trustedBaseFrame: true,
-        });
-        if (result.decorated) return result.lines;
-      } catch {
-        // Decoration is optional; preserve the completed same-render rows below.
-      }
-      return clampRenderedLines(captured.value, width);
-    }
-    if (config.components.editor.style === "minimalist") {
-      if (width <= 4) {
-        this.reportMinimalistDecoration(false);
-        return clampRenderedLines(super.render(width), width);
-      }
-      let captured: { value: string[]; capture?: AutocompleteCapture };
-      try {
-        captured = renderWithAutocompleteCapture(
-          this as unknown as AutocompleteEditorInternals,
-          () => super.render(Math.max(0, width - 4)),
-        );
-      } catch {
-        this.reportMinimalistDecoration(false);
-        return clampRenderedLines(super.render(width), width);
-      }
-      try {
-        const result = renderMinimalistFrameFromBase({
-          width,
-          baseRendered: captured.value,
-          autocompleteSource: this as unknown as AutocompleteEditorInternals,
-          autocompleteCapture: captured.capture,
-          uiTheme: this.uiTheme,
-          config,
-          inputText: this.getText(),
-          metadata: this.getMinimalistMetadata(),
-          trustedBaseFrame: true,
-          borderColor: this.borderColor,
-        });
-        this.reportMinimalistDecoration(result.decorated);
-        return result.lines;
-      } catch {
-        this.reportMinimalistDecoration(false);
-        return clampRenderedLines(captured.value, width);
-      }
-    }
-    this.reportMinimalistDecoration(false);
-    if (width <= 2) {
       return clampRenderedLines(super.render(width), width);
     }
-
-    const { railWidth } = getEditorChromeWidths(
-      config,
-      this.uiTheme,
-      "\x1b[0m",
-    );
-    const innerWidth = Math.max(0, width - railWidth);
     let captured: { value: string[]; capture?: AutocompleteCapture };
     try {
       captured = renderWithAutocompleteCapture(
         this as unknown as AutocompleteEditorInternals,
-        () => super.render(innerWidth),
+        () => super.render(Math.max(0, width - 4)),
       );
     } catch {
+      this.reportMinimalistDecoration(false);
       return clampRenderedLines(super.render(width), width);
     }
     try {
-      const result = renderPolishedFrame({
+      const result = renderMinimalistFrameFromBase({
         width,
         baseRendered: captured.value,
         autocompleteSource: this as unknown as AutocompleteEditorInternals,
         autocompleteCapture: captured.capture,
         uiTheme: this.uiTheme,
         config,
-        modelMeta: this.getModelMeta(),
-        thinkingLevel: this.getThinkingLevel(),
+        inputText: this.getText(),
+        metadata: this.getMinimalistMetadata(),
         trustedBaseFrame: true,
         borderColor: this.borderColor,
       });
-      if (result.decorated) return result.lines;
+      this.reportMinimalistDecoration(result.decorated);
+      return result.lines;
     } catch {
-      // Decoration is optional; preserve the completed same-render rows below.
+      this.reportMinimalistDecoration(false);
+      return clampRenderedLines(captured.value, width);
     }
-    return clampRenderedLines(captured.value, width);
   }
 }
 
@@ -1151,110 +688,25 @@ export class WrappedPolishedEditor implements EditorComponent {
 
   render(width: number): string[] {
     const config = this.getConfig();
-    if (!config.components.editor.enabled) {
+    if (config.components.editor.style === "off") {
+      const offBorder = offEditorBorderColor(config, this.uiTheme);
+      if (offBorder) this.borderColor = offBorder;
       this.reportMinimalistDecoration(false);
       return clampRenderedLines(this.base.render(width), width);
     }
-    if (config.components.editor.style === "accent-rail") {
-      this.reportMinimalistDecoration(false);
-      if (width < ACCENT_RAIL_CHROME_WIDTH + 1) {
-        return clampRenderedLines(this.base.render(width), width);
-      }
-      let captured: { value: string[]; capture?: AutocompleteCapture };
-      try {
-        captured = renderWithAutocompleteCapture(this.base, () =>
-          this.base.render(width - ACCENT_RAIL_CHROME_WIDTH),
-        );
-      } catch {
-        return clampRenderedLines(this.base.render(width), width);
-      }
-      try {
-        const provenance = inspectPolishedFrameProvenance(
-          this.base,
-          captured.value,
-          config,
-          this.uiTheme,
-        );
-        if (provenance.safe) {
-          const result = renderAccentRailFrameFromBase({
-            width,
-            baseRendered: captured.value,
-            autocompleteSource: this.base,
-            autocompleteCapture: captured.capture,
-            uiTheme: this.uiTheme,
-            config,
-            ownedFrame: provenance.ownedFrame,
-          });
-          if (result.decorated) return result.lines;
-        }
-      } catch {
-        // Decoration is optional; preserve the completed same-render rows below.
-      }
-      return clampRenderedLines(captured.value, width);
-    }
-    if (config.components.editor.style === "minimalist") {
-      if (width <= 4) {
-        this.reportMinimalistDecoration(false);
-        return clampRenderedLines(this.base.render(width), width);
-      }
-      let captured: { value: string[]; capture?: AutocompleteCapture };
-      try {
-        captured = renderWithAutocompleteCapture(this.base, () =>
-          this.base.render(Math.max(0, width - 4)),
-        );
-      } catch {
-        this.reportMinimalistDecoration(false);
-        return clampRenderedLines(this.base.render(width), width);
-      }
-      try {
-        const provenance = inspectPolishedFrameProvenance(
-          this.base,
-          captured.value,
-          config,
-          this.uiTheme,
-        );
-        if (provenance.safe) {
-          const result = renderMinimalistFrameFromBase({
-            width,
-            baseRendered: captured.value,
-            autocompleteSource: this.base,
-            autocompleteCapture: captured.capture,
-            uiTheme: this.uiTheme,
-            config,
-            inputText: this.base.getText(),
-            metadata: this.getMinimalistMetadata(),
-            ownedFrame: provenance.ownedFrame,
-            borderColor: this.borderColor,
-          });
-          if (result.decorated) {
-            this.reportMinimalistDecoration(true);
-            return result.lines;
-          }
-        }
-      } catch {
-        // Decoration is optional; preserve the completed same-render rows below.
-      }
+    if (width <= 4) {
       this.reportMinimalistDecoration(false);
-      return clampRenderedLines(captured.value, width);
+      return clampRenderedLines(this.base.render(width), width);
     }
-    this.reportMinimalistDecoration(false);
-    if (width <= 2) return clampRenderedLines(this.base.render(width), width);
-
-    const { railWidth } = getEditorChromeWidths(
-      config,
-      this.uiTheme,
-      "\x1b[0m",
-    );
-    const innerWidth = Math.max(0, width - railWidth);
     let captured: { value: string[]; capture?: AutocompleteCapture };
     try {
       captured = renderWithAutocompleteCapture(this.base, () =>
-        this.base.render(innerWidth),
+        this.base.render(Math.max(0, width - 4)),
       );
     } catch {
+      this.reportMinimalistDecoration(false);
       return clampRenderedLines(this.base.render(width), width);
     }
-    let result: PolishedFrameResult | undefined;
     try {
       const provenance = inspectPolishedFrameProvenance(
         this.base,
@@ -1263,24 +715,27 @@ export class WrappedPolishedEditor implements EditorComponent {
         this.uiTheme,
       );
       if (provenance.safe) {
-        result = renderPolishedFrame({
+        const result = renderMinimalistFrameFromBase({
           width,
           baseRendered: captured.value,
           autocompleteSource: this.base,
           autocompleteCapture: captured.capture,
           uiTheme: this.uiTheme,
           config,
-          modelMeta: this.getModelMeta(),
-          thinkingLevel: this.getThinkingLevel(),
-          rightStatus: readVimStatus(this.base, this.uiTheme),
+          inputText: this.base.getText(),
+          metadata: this.getMinimalistMetadata(),
           ownedFrame: provenance.ownedFrame,
           borderColor: this.borderColor,
         });
+        if (result.decorated) {
+          this.reportMinimalistDecoration(true);
+          return result.lines;
+        }
       }
     } catch {
       // Decoration is optional; preserve the completed same-render rows below.
     }
-    if (result?.decorated) return result.lines;
+    this.reportMinimalistDecoration(false);
     return clampRenderedLines(captured.value, width);
   }