pi-one-ui 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+## [0.3.1] - 2026-08-31
+
+### Changed
+
+- Unified the test suite on Vitest and reorganized tests into domain-oriented directories.
+
+### Fixed
+
+- Keep `/oneui` open and focused during in-place Editor changes, restore effective values after persistence failures, and position the panel closer to the top.
+- Reduced global tool expansion latency and preserved pi-subagents' dedicated live progress renderer instead of wrapping and grouping it as a generic tool.
+
 ## [0.3.0] - 2026-08-30
 
 ### Added
@@ -34,6 +45,7 @@ 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.3.0...HEAD
+[Unreleased]: https://github.com/kerolt/pi-one-ui/compare/v0.3.1...HEAD
+[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
 [0.2.2]: https://github.com/kerolt/pi-one-ui/compare/v0.2.1...v0.2.2

package/README.en.md

@@ -39,6 +39,7 @@ Header → Context → WorkingLine → Editor → Footer
 | Session reference | Searches previous Pi sessions or SubAgents and injects their useful context | `@` completion |
 | Subagent autocomplete | Completes SubAgent names and delegation hints | `@` completion |
 | Tool / Diff renderer | Provides unified rendering for tool calls, results, collapsed content, and Edit/Write diffs | Automatic |
+| Subagent live renderer | Preserves pi-subagents' dedicated progress cards and keeps them out of generic tool groups | Automatic |
 | Markdown enhancement | Adds Mermaid, admonitions, URL linking, and related rendering improvements | Automatic |
 | Built-in themes | Provides CC Dark and CC Light themes | `/theme` |
 | Compatibility aliases | Optionally provides common command aliases | `/clear`, `/exit` |
@@ -82,7 +83,7 @@ The configuration file is located at:
 ~/.pi/agent/pi-one-ui.json
 ```
 
-Using the `/oneui` settings panel is recommended. The current configuration uses the v1 structure, for example:
+Using the `/oneui` settings panel is recommended. The panel uses a top-centered layout, stays open while Editor enablement or style changes are applied, restores focus after Editor replacement, and restores the effective list value when persistence fails. The current configuration uses the v1 structure, for example:
 
 ```json
 {
@@ -181,14 +182,12 @@ After changing the source, run the following command in Pi:
 | --- | --- |
 | `npm install` | Install dependencies |
 | `npm run format` | Format source, tests, and configuration files |
-| `npm run format:check` | Check formatting without modifying files |
-| `npm run lint` | Run Biome checks |
+| `npm run check` | Check formatting and import organization |
+| `npm run fix` | Fix formatting and organize imports |
 | `npm run typecheck` | Run TypeScript type checking |
-| `npm test` | Run all tests |
-| `npm run test:node` | Run Node.js test runner tests |
-| `npm run test:vitest` | Run Vitest tests |
+| `npm test` | Run all tests with Vitest |
 | `npm run pack:check` | Preview the npm package contents |
-| `npm run verify` | Run formatting, lint, type checking, and all tests |
+| `npm run verify` | Run Biome checks, type checking, and all tests |
 
 Before submitting changes, run at least:
 
@@ -199,14 +198,15 @@ npm run pack:check
 
 ### Test organization
 
-Tests are grouped by domain:
+All tests run through Vitest and are organized into domain directories:
 
-- `tests/context-*`: Context content, tools, diffs, thinking, and mouse interaction.
-- `tests/working-line-*`: WorkingLine and turn summaries.
-- `tests/editor-*`: Editor, completion, metadata, transfer, and Accent Rail.
-- `tests/footer-*`: Footer rendering, formatting, layout, and status.
-- `tests/services-*`: Git, runtime, project, session, and telemetry data.
-- `tests/shell-*`: Remaining layout lifecycle glue and standalone compatibility.
+- `tests/config/`: canonical configuration, storage, and compatibility boundaries.
+- `tests/context/`: Context content, tools, diffs, thinking, and mouse interaction.
+- `tests/header/`, `tests/working-line/`, `tests/editor/`, and `tests/footer/`: Layout behavior and lifecycle coverage.
+- `tests/runtime/`, `tests/overlay/`, and `tests/integration/`: runtime infrastructure, overlays, and the composed entry point.
+- `tests/services/`: Git, runtime, project, session, and telemetry data.
+- `tests/shell/`: remaining layout lifecycle glue and standalone compatibility.
+- `tests/support/` and `tests/fixtures/`: shared test helpers and fixtures.
 
 Changes involving the TUI lifecycle should specifically cover reloads, session tree rebuilds, compaction, regular/fullscreen TUI modes, headless mode, overlays, and third-party patch ownership.
 

package/README.md

@@ -39,6 +39,7 @@ Header → Context → WorkingLine → Editor → Footer
 | Session reference     | 搜索并注入历史 Pi session 或 SubAgent 的有效上下文                     | `@` 补全          |
 | Subagent autocomplete | 提供 SubAgent 名称补全和委派提示                                       | `@` 补全          |
 | Tool / Diff renderer  | 工具调用、结果、折叠内容和 Edit/Write diff 的统一展示                  | 自动生效          |
+| Subagent live renderer | 保留 pi-subagents 专用进度卡，并避免纳入通用工具分组                    | 自动生效          |
 | Markdown enhancement  | 支持 Mermaid、提示框和 URL 链接化等增强渲染                            | 自动生效          |
 | Built-in themes       | 提供 CC Dark 和 CC Light 主题                                          | `/theme`          |
 | Compatibility aliases | 可选提供常用命令别名                                                   | `/clear`、`/exit` |
@@ -82,7 +83,7 @@ pi install git:github.com/kerolt/pi-one-ui
 ~/.pi/agent/pi-one-ui.json
 ```
 
-推荐通过 `/oneui` 设置面板修改配置。当前配置仍使用 v1 结构，例如：
+推荐通过 `/oneui` 设置面板修改配置。面板采用更靠近顶部的居中布局；切换 Editor 启用状态或样式时会保持打开并在 Editor 替换后恢复焦点，持久化失败时则恢复列表中的有效旧值。当前配置仍使用 v1 结构，例如：
 
 ```json
 {
@@ -181,14 +182,12 @@ npm run pi:install-local
 | ---------------------- | ---------------------------------- |
 | `npm install`          | 安装依赖                           |
 | `npm run format`       | 格式化源码、测试和配置文件         |
-| `npm run format:check` | 检查格式但不修改文件               |
-| `npm run lint`         | 运行 Biome 检查                    |
+| `npm run check`        | 检查格式和 import organization     |
+| `npm run fix`          | 修复格式并整理 imports             |
 | `npm run typecheck`    | 执行 TypeScript 类型检查           |
-| `npm test`             | 运行全部测试                       |
-| `npm run test:node`    | 运行 Node.js test runner 测试      |
-| `npm run test:vitest`  | 运行 Vitest 测试                   |
+| `npm test`             | 使用 Vitest 运行全部测试           |
 | `npm run pack:check`   | 预览 npm 实际打包内容              |
-| `npm run verify`       | 执行格式、lint、类型检查和全部测试 |
+| `npm run verify`       | 执行 Biome check、类型检查和全部测试 |
 
 提交修改前建议至少运行：
 
@@ -199,14 +198,15 @@ npm run pack:check
 
 ### 测试组织
 
-测试按照功能领域划分：
+所有测试统一由 Vitest 执行，并按照功能领域组织在子目录中：
 
-- `tests/context-*`：Context 内容区、Tool、Diff、Thinking 和鼠标交互。
-- `tests/working-line-*`：WorkingLine 和 turn summary。
-- `tests/editor-*`：Editor、completion、metadata、transfer 和 Accent Rail。
-- `tests/footer-*`：Footer、Footer format/layout/status。
-- `tests/services-*`：Git、runtime、project、session 和 telemetry。
-- `tests/shell-*`：剩余布局生命周期 glue 和 standalone compatibility。
+- `tests/config/`：canonical 配置、存储和兼容性边界。
+- `tests/context/`：Context 内容区、Tool、Diff、Thinking 和鼠标交互。
+- `tests/header/`、`tests/working-line/`、`tests/editor/`、`tests/footer/`：各 Layout 的行为和生命周期。
+- `tests/runtime/`、`tests/overlay/`、`tests/integration/`：运行时基础设施、Overlay 和组合入口。
+- `tests/services/`：Git、runtime、project、session 和 telemetry。
+- `tests/shell/`：剩余布局生命周期 glue 和 standalone compatibility。
+- `tests/support/`、`tests/fixtures/`：共享测试工具和 fixtures。
 
 涉及 TUI 生命周期的修改，应特别覆盖 reload、session tree rebuild、compact、regular/fullscreen TUI、headless mode、overlay 和第三方 patch ownership 等场景。
 

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

@@ -1,12 +1,12 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { renderUserMessageStyle } from "../../layouts/context/message/user-message-styles.ts";
 import { renderAccentRailEditorFrame } from "../../layouts/editor/accent-rail-editor.ts";
-import type { PolishedTuiConfig } from "../config/shell.ts";
 import { sanitizeEditorMetadataText } from "../../layouts/editor/editor-metadata-format.ts";
 import { renderMinimalistFrame } from "../../layouts/editor/minimalist-editor.ts";
-import { safeThemeFg } from "../../shared/style.ts";
 import { renderPolishedEditorFrame } from "../../layouts/editor/ui.ts";
-import { renderUserMessageStyle } from "../../layouts/context/message/user-message-styles.ts";
+import { safeThemeFg } from "../../shared/style.ts";
+import type { PolishedTuiConfig } from "../config/shell.ts";
 
 export const SETTINGS_PREVIEW_MAX_WIDTH = 72;
 export const SETTINGS_PREVIEW_MAX_ROWS = 10;

package/extensions/app/config/renderer.ts

@@ -1,5 +1,5 @@
 import type { CompactThinkingConfig } from "../../layouts/context/thinking/compact-thinking.ts";
-import { configStore, type ConfigRecord } from "./store.ts";
+import { type ConfigRecord, configStore } from "./store.ts";
 
 export type CompactStyleMode = "on" | "compact" | "off";
 
@@ -371,17 +371,18 @@ function loadConfig(): Config {
 /**
  * Persists the in-memory renderer projection through the shared store.
  */
-export function saveConfig() {
+export function saveConfig(next: Config = config) {
   configStore.update((record) => {
     record.version = 1;
-    record.renderer = config;
+    record.renderer = next;
   });
 }
 
-/** 运行时配置写入的唯一入口：合并 + 规范化 + 持久化。 */
+/** 运行时配置写入的唯一入口：规范化并持久化成功后再提交到活动配置。 */
 export function updateConfig(partial: Partial<Config>): void {
-  Object.assign(config, normalizeConfig({ ...config, ...partial }));
-  saveConfig();
+  const next = normalizeConfig({ ...config, ...partial });
+  saveConfig(next);
+  Object.assign(config, next);
 }
 
 /** 整体替换配置（default export 的 configOverride 注入路径；就地覆盖，不持久化）。 */

package/extensions/app/config/shell.ts

@@ -1,3 +1,5 @@
+import { normalizeWorkingLineMessages } from "../../layouts/working-line/working-line.ts";
+import { PI_WORKING_LINE_MESSAGES } from "../../layouts/working-line/working-line-messages.ts";
 import {
   ICON_GLYPH_KEYS,
   type IconGlyphs,
@@ -8,13 +10,11 @@ import {
   resolveConfiguredIcons,
 } from "../../shared/icons.ts";
 import { isSupportedColorSpec } from "../../shared/style.ts";
-import { normalizeWorkingLineMessages } from "../../layouts/working-line/working-line.ts";
-import { PI_WORKING_LINE_MESSAGES } from "../../layouts/working-line/working-line-messages.ts";
 import {
-  configPath as defaultConfigPath,
+  type ConfigRecord,
   configStore,
+  configPath as defaultConfigPath,
   mutateConfigFile,
-  type ConfigRecord,
 } from "./store.ts";
 
 export type ColorSpec = string;

package/extensions/app/overlay/selector-border.ts

@@ -3,16 +3,16 @@ import {
   SettingsSelectorComponent,
   type Theme,
 } from "@earendil-works/pi-coding-agent";
-import type { ZentuiConfig } from "../config/shell.ts";
-import {
-  installPrototypePatch,
-  removePrototypePatch,
-} from "../ownership/prototype-patch-registry.ts";
 import {
   EDITOR_BORDER_STYLE,
   renderChromeBorder,
   renderEditorBorder,
 } from "../../shared/style.ts";
+import type { ZentuiConfig } from "../config/shell.ts";
+import {
+  installPrototypePatch,
+  removePrototypePatch,
+} from "../ownership/prototype-patch-registry.ts";
 
 type PatchableSelectorPrototype = {
   render: (width: number) => string[];

package/extensions/app/ownership.ts

@@ -26,7 +26,7 @@ export function ownerFor(slot: UiSlot): UiOwner {
 
 export {
   LAYOUT_OWNERSHIP,
-  LayoutRegistry,
   type LayoutId,
   type LayoutOwner,
+  LayoutRegistry,
 } from "./ownership/layout-registry.ts";

package/extensions/app/panel.ts

@@ -413,6 +413,13 @@ function saveNotice(ctx: any, label: string, value: string): void {
   );
 }
 
+function notifyUpdateError(ctx: any, error: unknown): void {
+  ctx.ui?.notify?.(
+    `Could not update /oneui setting: ${error instanceof Error ? error.message : String(error)}`,
+    "error",
+  );
+}
+
 /**
  * Persists one panel setting and reconciles its owning runtime layout.
  *
@@ -605,27 +612,19 @@ export async function showOneUiPanel(
               10,
               getSettingsListTheme(),
               (id, value) => {
-                // Replacing Pi's editor synchronously moves focus away from
-                // this overlay. Restore the overlay handle after the editor
-                // has been reconciled so the panel remains interactive.
-                if (id === "editorEnabled") {
-                  try {
-                    updateSetting(id, value, ctx, deps);
-                    list.updateValue(id, value);
-                  } catch (error) {
-                    ctx.ui?.notify?.(
-                      `Could not update Editor setting: ${error instanceof Error ? error.message : String(error)}`,
-                      "error",
-                    );
-                  } finally {
+                try {
+                  updateSetting(id, value, ctx, deps);
+                  list.updateValue(id, value);
+                } catch (error) {
+                  notifyUpdateError(ctx, error);
+                  createList();
+                  list.selectItem(id);
+                } finally {
+                  if (id === "editorEnabled" || id === "editorStyle") {
                     panelHandle?.focus();
-                    tui.requestRender();
                   }
-                  return;
+                  tui.requestRender();
                 }
-                updateSetting(id, value, ctx, deps);
-                list.updateValue(id, value);
-                tui.requestRender();
               },
               () => done(undefined),
             );
@@ -687,7 +686,7 @@ export async function showOneUiPanel(
             width: "85%",
             maxHeight: "90%",
             margin: {
-              top: 10,
+              top: 6,
               right: 1,
               bottom: 1,
               left: 1,

package/extensions/app/runtime/tui-runtime.ts

@@ -3,56 +3,56 @@ import type {
   ExtensionContext,
   Theme,
 } from "@earendil-works/pi-coding-agent";
-import { showOneUiPanel, type TuiPanelRuntime } from "../panel.ts";
-import {
-  createPiExtensionPort,
-  type PiExtensionPort,
-} from "../host/pi-extension-port.ts";
-import { createPiUiPort, type PiUiPort } from "../host/pi-ui-port.ts";
-import { LayoutRegistry } from "../ownership/layout-registry.ts";
-import registerHeaderLayout from "../../layouts/header/index.ts";
-import { EventCoordinator } from "./event-coordinator.ts";
-import { RenderScheduler } from "./render-scheduler.ts";
-import { RuntimeStateStore } from "./runtime-state.ts";
+import registerContext, {
+  type ContextExtensionOptions,
+  type ContextRuntimeController,
+} from "../../layouts/context/index.ts";
+import type { AccentRailLayoutPatchDiagnostic } from "../../layouts/editor/accent-rail-layout-patch.ts";
 import { EditorLayoutController } from "../../layouts/editor/controller.ts";
 import { FooterLayoutController } from "../../layouts/footer/controller.ts";
+import registerHeaderLayout from "../../layouts/header/index.ts";
 import {
   WorkingLineLayoutController,
   type WorkingLineMessage,
   type WorkingLineMessageEnd,
 } from "../../layouts/working-line/controller.ts";
-import registerContext, {
-  type ContextExtensionOptions,
-  type ContextRuntimeController,
-} from "../../layouts/context/index.ts";
-import type { AccentRailLayoutPatchDiagnostic } from "../../layouts/editor/accent-rail-layout-patch.ts";
+import {
+  renderTurnSummaryEntry,
+  TURN_SUMMARY_ENTRY_TYPE,
+} from "../../layouts/working-line/interaction-summary.ts";
+import { LiveContextController } from "../../services/live-context.ts";
+import {
+  ProjectRefreshService,
+  type ScheduleProjectRefreshOptions,
+} from "../../services/project-refresh.ts";
+import {
+  SessionStateService,
+  syncState,
+} from "../../services/session-state.ts";
+import { resolveFooterTelemetry } from "../../services/telemetry.ts";
 import {
   ensureConfigExists,
   hasUnsupportedComponentStyle,
   loadConfig,
   mergeConfig,
+  type PolishedTuiConfig,
   saveEditorComponentPatch,
   saveFooterComponentPatch,
   saveWorkingLineComponentPatch,
-  type PolishedTuiConfig,
 } from "../config/shell.ts";
-import { configStore, type ConfigRecord } from "../config/store.ts";
-import {
-  SessionStateService,
-  syncState,
-} from "../../services/session-state.ts";
-import {
-  renderTurnSummaryEntry,
-  TURN_SUMMARY_ENTRY_TYPE,
-} from "../../layouts/working-line/interaction-summary.ts";
-import { LiveContextController } from "../../services/live-context.ts";
+import { type ConfigRecord, configStore } from "../config/store.ts";
 import {
-  ProjectRefreshService,
-  type ScheduleProjectRefreshOptions,
-} from "../../services/project-refresh.ts";
+  createPiExtensionPort,
+  type PiExtensionPort,
+} from "../host/pi-extension-port.ts";
+import { createPiUiPort, type PiUiPort } from "../host/pi-ui-port.ts";
 import { SelectorController } from "../overlay/selector-controller.ts";
+import { LayoutRegistry } from "../ownership/layout-registry.ts";
+import { showOneUiPanel, type TuiPanelRuntime } from "../panel.ts";
+import { EventCoordinator } from "./event-coordinator.ts";
+import { RenderScheduler } from "./render-scheduler.ts";
+import { RuntimeStateStore } from "./runtime-state.ts";
 import { SessionLifecycle } from "./session-lifecycle.ts";
-import { resolveFooterTelemetry } from "../../services/telemetry.ts";
 
 export type TuiRuntimeContext = {
   readonly extensions: PiExtensionPort;

package/extensions/features/context-inspector/index.ts

@@ -2,10 +2,10 @@ import {
   type BuildSystemPromptOptions,
   type ExtensionAPI,
   type ExtensionCommandContext,
-  type ToolInfo,
   estimateTokens,
   formatSkillsForPrompt,
   getMarkdownTheme,
+  type ToolInfo,
 } from "@earendil-works/pi-coding-agent";
 import {
   Key,
@@ -13,9 +13,9 @@ import {
   matchesKey,
   visibleWidth,
 } from "@earendil-works/pi-tui";
-import { mouseBaseButton, parseSgrMousePacket } from "../../tools/sgr-mouse.ts";
-import { padLine } from "../../tools/format.ts";
 import { overlayManager } from "../../app/overlay/overlay-manager.ts";
+import { padLine } from "../../tools/format.ts";
+import { mouseBaseButton, parseSgrMousePacket } from "../../tools/sgr-mouse.ts";
 
 export type ContextPart = {
   label: string;

package/extensions/features/session-reference/index.ts

@@ -1,25 +1,25 @@
 import { resolve } from "node:path";
 import {
-  SessionManager,
   type ExtensionAPI,
   type SessionInfo,
+  SessionManager,
 } from "@earendil-works/pi-coding-agent";
 import {
-  Text,
   type AutocompleteItem,
   type AutocompleteProvider,
   type AutocompleteSuggestions,
   fuzzyFilter,
+  Text,
 } from "@earendil-works/pi-tui";
 import {
-  SESSION_REFERENCE_CUSTOM_TYPE,
-  SESSION_REFERENCE_PREFIX,
   buildReferenceContentFromSections,
   extractSessionReferenceIds,
   formatReferenceSession,
-  sessionTitle,
   type ReferenceSessionInfo,
   type ReferenceSource,
+  SESSION_REFERENCE_CUSTOM_TYPE,
+  SESSION_REFERENCE_PREFIX,
+  sessionTitle,
 } from "./session.ts";
 
 const MAX_SESSION_SUGGESTIONS = 3;

package/extensions/features/subagent-autocomplete.ts

@@ -1,6 +1,6 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { join } from "node:path";
 import { homedir } from "node:os";
+import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
   type AutocompleteItem,

package/extensions/layouts/context/index.ts

@@ -4,7 +4,6 @@ import type {
   Theme,
 } from "@earendil-works/pi-coding-agent";
 import { config } from "../../app/config/renderer.ts";
-import { configStore, type ConfigRecord } from "../../app/config/store.ts";
 import {
   hasUnsupportedComponentStyle,
   loadConfig,
@@ -13,27 +12,25 @@ import {
   type UserMessagesComponentConfig,
   type ZentuiConfig,
 } from "../../app/config/shell.ts";
-import {
-  installUserMessageStyle,
-  removeUserMessageStyle,
-} from "./message/user-message.ts";
-
+import { type ConfigRecord, configStore } from "../../app/config/store.ts";
 // shell
 import piAliases from "../../features/aliases.ts";
+import context from "../../features/context-inspector/index.ts";
 import { installFlushDockedBash } from "../../features/flush-docked-bash.ts";
-
+import sessionReference from "../../features/session-reference/index.ts";
 // feature
 import agentAutocomplete from "../../features/subagent-autocomplete.ts";
-import agentSummary from "./summary/index.ts";
-import context from "../../features/context-inspector/index.ts";
-import sessionReference from "../../features/session-reference/index.ts";
-import { installCompactThinking } from "./thinking/compact-thinking.ts";
-
+import {
+  installUserMessageStyle,
+  removeUserMessageStyle,
+} from "./message/user-message.ts";
 // renderer
 import registerContextRenderer, {
   getCompactThinkingConfig,
 } from "./renderer/index.ts";
 import markdownEnhance from "./renderer/markdown-enhance.ts";
+import agentSummary from "./summary/index.ts";
+import { installCompactThinking } from "./thinking/compact-thinking.ts";
 
 export type ContextRuntimeController = {
   setMode: (mode: "on" | "compact" | "off", ctx: ExtensionContext) => void;

package/extensions/layouts/context/renderer/compact-mode.ts

@@ -17,41 +17,22 @@
  */
 import {
   AssistantMessageComponent,
-  ToolExecutionComponent,
   type Theme,
+  ToolExecutionComponent,
 } from "@earendil-works/pi-coding-agent";
 import {
-  truncateToWidth,
-  visibleWidth,
   Box,
   Spacer,
+  truncateToWidth,
+  visibleWidth,
 } from "@earendil-works/pi-tui";
 import { config, getToolDisplayConfig } from "../../../app/config/renderer.ts";
-import { toolLoadingIcon } from "../../../tools/tool-loading-icon.ts";
-import { sanitizeToolResultText } from "../../../tools/tool-result-sanitize.ts";
-import { refreshContextComponent } from "./context-refresh.ts";
-import { getMessageDisplayTheme } from "./tool/message-display.ts";
-import { showMoreHintText } from "./tool/show-more-hint.ts";
-import {
-  countEditDiffStats,
-  countWriteDiffStats,
-  isRichDiffComponent,
-} from "./tool/diff/diff-renderer.ts";
-import { renderRichToolResult } from "./tool/diff/index.ts";
-import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
-import { isToolCallHovered } from "./mouse/hover.ts";
-import {
-  insetComponent,
-  renderExpandedToolResult,
-  scheduleAnimation,
-} from "./tool/result.ts";
-import { oneLine } from "../../../tools/format.ts";
-import { paddedBackgroundRow } from "./tool/grouping.ts";
 import {
   hasVisibleText,
   stripBackgroundAnsi,
 } from "../../../tools/ansi-text.ts";
 import { walkComponentTree } from "../../../tools/component-tree.ts";
+import { oneLine } from "../../../tools/format.ts";
 import {
   ASSISTANT_REENTRY_DESCRIPTION,
   ASSISTANT_REENTRY_KEY,
@@ -61,9 +42,28 @@ import {
   ASSISTANT_TOGGLE_ROUND_KEY,
   COMPACT_MODE_PATCH_KEY,
   COMPACT_THINKING_PATCH_KEY,
-  patchRegistry,
   PROTOTYPE_ORIGINAL_KEY,
+  patchRegistry,
 } from "../../../tools/patch-keys.ts";
+import { toolLoadingIcon } from "../../../tools/tool-loading-icon.ts";
+import { sanitizeToolResultText } from "../../../tools/tool-result-sanitize.ts";
+import { refreshContextComponent } from "./context-refresh.ts";
+import { isToolCallHovered } from "./mouse/hover.ts";
+import {
+  countEditDiffStats,
+  countWriteDiffStats,
+  isRichDiffComponent,
+} from "./tool/diff/diff-renderer.ts";
+import { renderRichToolResult } from "./tool/diff/index.ts";
+import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
+import { paddedBackgroundRow } from "./tool/grouping.ts";
+import { getMessageDisplayTheme } from "./tool/message-display.ts";
+import {
+  insetComponent,
+  renderExpandedToolResult,
+  scheduleAnimation,
+} from "./tool/result.ts";
+import { showMoreHintText } from "./tool/show-more-hint.ts";
 
 /** compact 渲染层对 compact-thinking 的只读查询面（不建第二套计时器）。 */
 export type CompactThinkingQuery = {