pi-one-ui 0.2.2 → 0.3.1

package/extensions/app/config/store.ts

@@ -19,20 +19,12 @@ export type ConfigRecord = Record<string, unknown>;
 
 export type ConfigStorePaths = {
   canonical: string;
-  legacyUnified: string;
-  legacyShell: string;
-  legacyRenderer: string;
 };
 
-/**
- * Returns canonical and legacy configuration locations for an agent directory.
- */
+/** Returns the canonical configuration location for an agent directory. */
 export function configPaths(agentDir = getAgentDir()): ConfigStorePaths {
   return {
     canonical: join(agentDir, "pi-one-ui.json"),
-    legacyUnified: join(agentDir, "pi-mine-ui.json"),
-    legacyShell: join(agentDir, "zentui.json"),
-    legacyRenderer: join(agentDir, "claude-code-style.json"),
   };
 }
 
@@ -138,7 +130,7 @@ function configReadError(path: string, error: unknown): Error {
 }
 
 /**
- * Builds the compatibility error used when a config write is unsafe.
+ * Builds the safety error used when a config write is unsafe.
  */
 function configWriteError(path: string, label: string, error: unknown): Error {
   const detail = error instanceof Error ? ` (${error.message})` : "";
@@ -147,79 +139,15 @@ function configWriteError(path: string, label: string, error: unknown): Error {
   );
 }
 
-type SelectedConfig = {
-  record: ConfigRecord;
-  writePath: string;
-  mode?: number;
-  materialize: boolean;
-};
-
-/**
- * Reads an optional config source and turns corruption into an explicit error.
- */
-function optionalConfig(
-  path: string,
-): { record: ConfigRecord; writePath: string; mode: number } | undefined {
-  const state = readConfigFileState(path);
-  if (state.kind === "missing") return undefined;
-  if (state.kind === "corrupt") throw configReadError(path, state.error);
-  return state;
-}
-
-/**
- * Selects the active source and the destination used by a later update.
- */
-function selectUnifiedConfig(paths: ConfigStorePaths): SelectedConfig {
-  const canonical = optionalConfig(paths.canonical);
-  if (canonical) return { ...canonical, materialize: false };
-
-  const legacyUnified = optionalConfig(paths.legacyUnified);
-  if (legacyUnified)
-    return {
-      ...legacyUnified,
-      writePath: paths.canonical,
-      materialize: true,
-    };
-
-  const shell = optionalConfig(paths.legacyShell);
-  const renderer = optionalConfig(paths.legacyRenderer);
-  if (!shell && !renderer) {
-    return {
-      record: {},
-      writePath: paths.canonical,
-      materialize: false,
-    };
-  }
-
-  return {
-    record: {
-      ...(shell?.record ?? {}),
-      version: 1,
-      renderer: renderer?.record ?? {},
-    },
-    writePath: paths.canonical,
-    mode: shell?.mode ?? renderer?.mode,
-    materialize: true,
-  };
-}
-
-/**
- * Read the one raw unified record used by all configuration domains.
- * Legacy sources are best-effort materialized through the same atomic writer;
- * the in-memory record remains usable if the agent directory is read-only.
- */
+/** Reads the raw canonical record used by every configuration domain. */
 export function readUnifiedConfigRecord(
   paths: ConfigStorePaths = defaultConfigPaths,
 ): ConfigRecord {
-  const selected = selectUnifiedConfig(paths);
-  if (selected.materialize) {
-    try {
-      writeConfigAtomically(selected.writePath, selected.record, selected.mode);
-    } catch {
-      // Keep using the selected legacy record in memory when migration cannot be written.
-    }
-  }
-  return selected.record;
+  const state = readConfigFileState(paths.canonical);
+  if (state.kind === "missing") return {};
+  if (state.kind === "corrupt")
+    throw configReadError(paths.canonical, state.error);
+  return state.record;
 }
 
 /**
@@ -247,22 +175,18 @@ export type ConfigStoreListener = (record: ConfigRecord) => void;
 
 /**
  * Process-wide raw configuration store. Domain config modules own parsing and
- * selectors; this module owns source selection, migration and persistence.
+ * selectors; this module owns canonical persistence.
  */
 export class ConfigStore {
   readonly paths: ConfigStorePaths;
   private readonly listeners = new Set<ConfigStoreListener>();
 
-  /**
-   * Creates a store for canonical and legacy paths.
-   */
+  /** Creates a store for the canonical path. */
   constructor(paths: ConfigStorePaths = defaultConfigPaths) {
     this.paths = paths;
   }
 
-  /**
-   * Reads the current canonical or legacy-backed raw configuration record.
-   */
+  /** Reads the current canonical raw configuration record. */
   read(): ConfigRecord {
     return readUnifiedConfigRecord(this.paths);
   }
@@ -271,11 +195,18 @@ export class ConfigStore {
    * Mutates and atomically persists the active raw configuration record.
    */
   update(mutate: (record: ConfigRecord) => void): ConfigRecord {
-    const selected = selectUnifiedConfig(this.paths);
-    mutate(selected.record);
-    writeConfigAtomically(selected.writePath, selected.record, selected.mode);
-    for (const listener of this.listeners) listener(selected.record);
-    return selected.record;
+    const state = readConfigFileState(this.paths.canonical);
+    if (state.kind === "corrupt")
+      throw configReadError(this.paths.canonical, state.error);
+
+    mutate(state.record);
+    writeConfigAtomically(
+      state.writePath,
+      state.record,
+      state.kind === "valid" ? state.mode : undefined,
+    );
+    for (const listener of this.listeners) listener(state.record);
+    return state.record;
   }
 
   /**

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/presets.ts

@@ -21,7 +21,7 @@ export function applyPreset(preset: Preset): void {
     saveUserMessagesComponentPatch({ enabled: false });
     saveWorkingLineComponentPatch({ enabled: false });
     saveFooterComponentPatch({ style: "native" });
-    updateRendererConfig({ mode: "off", enableWorkingMessage: false });
+    updateRendererConfig({ mode: "off" });
     return;
   }
 
@@ -31,6 +31,5 @@ export function applyPreset(preset: Preset): void {
   saveFooterComponentPatch({ style: "starship" });
   updateRendererConfig({
     mode: preset === "compact" ? "compact" : "on",
-    enableWorkingMessage: false,
   });
 }

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 = {

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

@@ -7,10 +7,11 @@
 import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
 import { Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import {
+  type CompactStyleMode,
   config,
   getToolDisplayConfig,
-  type CompactStyleMode,
 } from "../../../app/config/renderer.ts";
+import { oneLine } from "../../../tools/format.ts";
 import {
   COMPONENT_TOOL_RENDER_MODE,
   GLOBAL_TOOL_RENDER_PATCH,
@@ -18,6 +19,13 @@ import {
   TOOL_EXPANDED_BACKGROUND_PATCH,
 } from "../../../tools/patch-keys.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
+import { countWriteDiffStats } from "./tool/diff/diff-renderer.ts";
+import {
+  renderRichToolResult,
+  type WriteExecutionMetadataStore,
+} from "./tool/diff/index.ts";
+import { getMessageDisplayTheme } from "./tool/message-display.ts";
+import { humanizeToolLabel, toolCallSummary } from "./tool/names.ts";
 import {
   countLines,
   hasExpandableDetail,
@@ -30,28 +38,20 @@ import {
   renderExpandedToolResult,
   resolveToolVisualState,
   scheduleAnimation,
-  settledIcon,
   setToolVisualState,
+  settledIcon,
   textFromResult,
   toolIconColor,
   toolViewportWidth,
 } from "./tool/result.ts";
-import { oneLine } from "../../../tools/format.ts";
 import { showMoreHintText } from "./tool/show-more-hint.ts";
-import { countWriteDiffStats } from "./tool/diff/diff-renderer.ts";
-import {
-  renderRichToolResult,
-  type WriteExecutionMetadataStore,
-} from "./tool/diff/index.ts";
-import { getMessageDisplayTheme } from "./tool/message-display.ts";
-import { humanizeToolLabel, toolCallSummary } from "./tool/names.ts";
 
 // 成功勾：亮绿 truecolor（与 message-display 一致）
 const BRIGHT_GREEN = "\x1b[38;2;80;220;100m";
 const ANSI_FG_RESET = "\x1b[39m";
 
-// pi-subagents 等扩展为 Agent 提供专用渲染器，ccstyle 必须保留。
-const DEDICATED_RENDERER_TOOLS = new Set(["Agent"]);
+// Preserve rich renderers owned by legacy Agent tools and modern pi-subagents.
+const DEDICATED_RENDERER_TOOLS = new Set(["Agent", "subagent"]);
 
 export type DefaultModeHooks = {
   /** 本安装是否仍持有全局工具渲染补丁。 */
@@ -148,14 +148,14 @@ function renderDefault(
   tool: any,
   slot: "renderCall" | "renderResult",
   args: any[],
-  fallback = "",
+  fallback: string | (() => string) = "",
 ) {
   try {
     if (typeof tool?.[slot] === "function") return tool[slot](...args);
   } catch {
     // Fall through to raw fallback.
   }
-  return new Text(fallback, 0, 0);
+  return new Text(typeof fallback === "function" ? fallback() : fallback, 0, 0);
 }
 
 type ParsedTask = { id: string; status: string; subject: string };
@@ -320,7 +320,7 @@ function createCcstyleTool(
           originalTool,
           "renderResult",
           [result, options, theme, context],
-          textFromResult(result),
+          () => textFromResult(result),
         );
       }
 
@@ -421,7 +421,12 @@ function createCcstyleTool(
             isToolCallHovered(toolCallId) ? cachedHoveredLine! : cachedLine,
           ];
         },
-        invalidate() {},
+        invalidate() {
+          cachedWidth = undefined;
+          cachedLine = undefined;
+          cachedHoveredLine = undefined;
+          context?.state?.ccstyleExpandedIoView?.invalidate?.();
+        },
       };
     },
   };