pi-one-ui 0.7.0 → 0.7.1

package/extensions/layouts/context/index.ts

@@ -3,187 +3,84 @@ import type {
   ExtensionContext,
   Theme,
 } from "@earendil-works/pi-coding-agent";
-import { config } from "../../app/config/renderer.ts";
+import { type Config, config } from "../../app/config/renderer.ts";
 import {
   hasUnsupportedComponentStyle,
-  loadConfig,
-  mergeConfig,
-  saveUserMessagesComponentPatch,
-  type UserMessagesComponentConfig,
   type ZentuiConfig,
 } from "../../app/config/shell.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 effortCommand from "../../features/effort-command.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 {
-  installUserMessageStyle,
-  removeUserMessageStyle,
-} from "./message/user-message.ts";
-// renderer
+import { installUserMessageStyle } from "./message/user-message.ts";
 import registerContextRenderer, {
   getCompactThinkingConfig,
+  type RendererExtensionOptions,
+  type RendererRuntimeController,
 } 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;
-  updateConfig: (
-    partial: Partial<typeof config>,
-    ctx: ExtensionContext,
-  ) => void;
-  setUserMessagesComponent: (
-    patch: Partial<UserMessagesComponentConfig>,
-    ctx: ExtensionContext,
-  ) => void;
+export type ContextRuntimeController = RendererRuntimeController & {
+  applyConfig(ctx: ExtensionContext, previous: Config): void;
 };
-
 export type ContextExtensionOptions = {
-  /**
-   * Exposes live context refresh to the unified settings panel.
-   */
-  onRuntimeController?: (controller: ContextRuntimeController) => void;
+  readonly getConfig: () => ZentuiConfig;
+  readonly services?: RendererExtensionOptions["services"];
 };
 
-let contextConfig: ZentuiConfig = loadConfig();
-let activeTheme: Theme | undefined;
-let cleanupUserMessageStyle: () => void = () => {};
-let userMessageStyleInstalled = false;
-let unsubscribeConfig: () => void = () => {};
-
-/**
- * Reports whether a session context can safely install TUI-owned patches.
- */
-function isTuiContext(ctx: ExtensionContext): boolean {
-  return ctx.mode === "tui" && ctx.hasUI;
-}
-
-/**
- * Installs the Context-owned User Message renderer once for the active session.
- */
-function installContextUserMessages(): void {
-  if (userMessageStyleInstalled || !activeTheme) return;
-  try {
-    cleanupUserMessageStyle = installUserMessageStyle(
-      () => activeTheme,
-      () => contextConfig,
-    );
-    userMessageStyleInstalled = true;
-  } catch {
-    cleanupUserMessageStyle = () => {};
-    userMessageStyleInstalled = false;
-  }
-}
-
-/**
- * Removes the Context-owned User Message renderer and clears its patch state.
- */
-function uninstallContextUserMessages(): void {
-  try {
-    cleanupUserMessageStyle();
-  } finally {
-    cleanupUserMessageStyle = () => {};
-    userMessageStyleInstalled = false;
-    removeUserMessageStyle();
-  }
-}
-
-/**
- * Reconciles User Message ownership with the latest shell configuration.
- */
-function reconcileContextUserMessages(): void {
-  const enabled =
-    contextConfig.components.userMessages.enabled &&
-    !hasUnsupportedComponentStyle(contextConfig, "userMessages");
-  if (enabled) installContextUserMessages();
-  else uninstallContextUserMessages();
-}
+/** Context 仅组织自身内容组件，Feature 的启用由 app 决定。 */
+export default function registerContext(
+  pi: ExtensionAPI,
+  options: ContextExtensionOptions,
+): ContextRuntimeController {
+  let activeTheme: Theme | undefined;
+  let cleanupUserMessages: (() => void) | undefined;
+  const reconcile = (): void => {
+    const current = options.getConfig();
+    const enabled =
+      current.components.userMessages.enabled &&
+      !hasUnsupportedComponentStyle(current, "userMessages");
+    if (!enabled || !activeTheme) {
+      cleanupUserMessages?.();
+      cleanupUserMessages = undefined;
+      return;
+    }
+    if (!cleanupUserMessages) {
+      cleanupUserMessages = installUserMessageStyle(
+        () => activeTheme,
+        options.getConfig,
+      );
+    }
+  };
 
-/**
- * Starts the Context session binding and subscribes it to shared config updates.
- */
-function startContextSession(ctx: ExtensionContext): void {
-  if (!isTuiContext(ctx)) return;
-  activeTheme = ctx.ui.theme;
-  contextConfig = loadConfig();
-  unsubscribeConfig();
-  unsubscribeConfig = configStore.subscribe((record: ConfigRecord) => {
-    contextConfig = mergeConfig(record);
-    reconcileContextUserMessages();
+  markdownEnhance(pi);
+  const thinking = installCompactThinking(pi, getCompactThinkingConfig());
+  const renderer = registerContextRenderer(pi, undefined, thinking, {
+    services: options.services,
   });
-  reconcileContextUserMessages();
-}
-
-/**
- * Applies a User Message configuration patch owned by Context.
- *
- * @param patch User Message configuration changes.
- * @param _ctx Active Pi extension context.
- */
-function setContextUserMessages(
-  patch: Partial<UserMessagesComponentConfig>,
-  _ctx: ExtensionContext,
-): void {
-  contextConfig = saveUserMessagesComponentPatch(patch);
-  if (patch.enabled !== undefined || patch.style !== undefined)
-    reconcileContextUserMessages();
-}
-
-/**
- * Releases Context session bindings and restores the original User Message patch.
- */
-function stopContextSession(): void {
-  unsubscribeConfig();
-  unsubscribeConfig = () => {};
-  uninstallContextUserMessages();
-  activeTheme = undefined;
-}
-
-/**
- * Registers the Context layout, its renderer stack and its feature hooks.
- */
-export default function (
-  pi: ExtensionAPI,
-  options: ContextExtensionOptions = {},
-): void {
-  // shell chrome
-  if (config.enableAliases) piAliases(pi);
-  if (config.enableEffortCommand) {
-    effortCommand(pi);
+  if (config.enableAgentSummary) {
+    agentSummary(pi);
   }
-  installFlushDockedBash();
-  // The thinking controller is queried directly by the context render stack.
-  markdownEnhance(pi);
-  registerContextRenderer(
-    pi,
-    undefined,
-    installCompactThinking(pi, getCompactThinkingConfig()),
-    {
-      onRuntimeController: (controller) =>
-        options.onRuntimeController?.({
-          ...controller,
-          setUserMessagesComponent: setContextUserMessages,
-        }),
-    },
-  );
-
-  // features
-  if (config.enableContextCommand) context(pi);
-  if (config.enableSessionReference) sessionReference(pi);
-  if (config.enableSubagentAutocomplete) agentAutocomplete(pi);
-  if (config.enableAgentSummary) agentSummary(pi);
-
   pi.on("session_start", (_event, ctx) => {
-    startContextSession(ctx);
+    if (ctx.mode !== "tui" || !ctx.hasUI) {
+      return;
+    }
+    activeTheme = ctx.ui.theme;
+    reconcile();
   });
   pi.on("session_shutdown", () => {
-    stopContextSession();
+    cleanupUserMessages?.();
+    cleanupUserMessages = undefined;
+    activeTheme = undefined;
   });
+  return {
+    ...renderer,
+    applyConfig(ctx, previous) {
+      reconcile();
+      thinking.updateConfig(getCompactThinkingConfig());
+      if (config.mode !== previous.mode) {
+        renderer.setMode(config.mode, ctx);
+      } else {
+        renderer.updateConfig(config, ctx);
+      }
+    },
+  };
 }

package/extensions/layouts/context/message/user-message.ts

@@ -7,7 +7,7 @@ import type { ZentuiConfig } from "../../../app/config/shell.ts";
 import {
   installPrototypePatch,
   removePrototypePatch,
-} from "../../../app/ownership/prototype-patch-registry.ts";
+} from "../../../app/runtime/prototype-patch-registry.ts";
 import {
   sanitizeRenderedUserMessageLines,
   sanitizeRenderedUserMessageText,

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

@@ -5,7 +5,6 @@ import {
   config,
   normalizeConfig,
   setConfig,
-  updateConfig,
 } from "../../../app/config/renderer.ts";
 import { isLazyProxyTui } from "../../../tools/fullscreen-detect.ts";
 import {
@@ -30,6 +29,7 @@ import {
   resetToolHoverState,
   scheduleSessionRender,
   TOOL_MOUSE_DISABLE,
+  type ToolMouseServices,
   teardownToolMouseInteraction,
 } from "./mouse/interaction.ts";
 import { getToolMouseTui } from "./mouse/scroll.ts";
@@ -65,14 +65,19 @@ let compactModeHooks: CompactModeHooks | undefined;
 function refreshCurrentContext(
   ctx?: any,
   toolGrouping?: ToolGroupingHooks,
+  render?: ToolMouseServices["render"],
 ): void {
   const tui = getToolMouseTui();
   toolGrouping?.refresh(tui);
   refreshMessageDisplays(tui);
   refreshCompactModeComponents(tui);
   compactModeHooks?.refresh();
-  tui?.requestRender?.(true);
-  ctx?.ui?.requestRender?.(true);
+  if (render) {
+    render.request(true);
+  } else {
+    tui?.requestRender?.(true);
+    ctx?.ui?.requestRender?.(true);
+  }
 }
 
 function syncCompactMode(ctx: any): void {
@@ -84,8 +89,9 @@ function applyStyleMode(
   mode: CompactStyleMode,
   ctx: any,
   toolGrouping?: ToolGroupingHooks,
+  render?: ToolMouseServices["render"],
 ): void {
-  updateConfig({ mode });
+  setConfig(normalizeConfig({ ...config, mode }));
   if (mode === "off") {
     // Native rendering：清 hover/click，关闭鼠标上报以恢复终端默认滚轮。
     resetToolHoverState();
@@ -103,10 +109,10 @@ function applyStyleMode(
   }
   // Reshape immediately and once more after the panel/custom UI unmounts and
   // the main context is mounted again.
-  refreshCurrentContext(ctx, toolGrouping);
+  refreshCurrentContext(ctx, toolGrouping, render);
   scheduleSessionRender(() => {
     if (mode === "compact") syncCompactMode(ctx);
-    refreshCurrentContext(ctx, toolGrouping);
+    refreshCurrentContext(ctx, toolGrouping, render);
   });
   ctx.ui.notify(`Claude Code style: ${mode}`, "info");
 }
@@ -129,6 +135,7 @@ export type RendererRuntimeController = {
 };
 
 export type RendererExtensionOptions = {
+  services?: ToolMouseServices;
   onRuntimeController?: (controller: RendererRuntimeController) => void;
 };
 
@@ -183,17 +190,27 @@ export default function (
     return installation;
   };
 
-  options.onRuntimeController?.({
+  const controller: RendererRuntimeController = {
     setMode: (mode, ctx) =>
-      applyStyleMode(mode, ctx, installation?.toolGrouping),
+      applyStyleMode(
+        mode,
+        ctx,
+        installation?.toolGrouping,
+        options.services?.render,
+      ),
     updateConfig: (partial, ctx) => {
-      updateConfig(partial);
+      setConfig(normalizeConfig({ ...config, ...partial }));
       // 配置（如 expandedPreviewMaxLines / excludeRenderers）变化可能改变
       // 渲染结果：丢弃工具卡跨 toggle 缓存，下次 updateDisplay 重建。
       installation?.toggleRenderCache.clear();
-      refreshCurrentContext(ctx, installation?.toolGrouping);
+      refreshCurrentContext(
+        ctx,
+        installation?.toolGrouping,
+        options.services?.render,
+      );
     },
-  });
+  };
+  options.onRuntimeController?.(controller);
 
   pi.on("message_update", async (event) => {
     // compact-thinking 在 session_start 时于 compact 补丁之上再装一层；
@@ -221,7 +238,7 @@ export default function (
     // 鼠标交互独立于渲染层：fullscreen 渲染层让位（hooks undefined）但
     // 工具点击/回到底部适配仍需安装；保持在渲染层安装之后以维持原顺序。
     if (ctx?.mode === "tui" && ctx?.hasUI)
-      installToolMouseInteraction(ctx, mouseOwner);
+      installToolMouseInteraction(ctx, mouseOwner, options.services);
     if (!hooks) return;
     hooks.toolGrouping.setTheme(ctx.ui.theme);
     hooks.toggleRenderCache.setTheme(ctx.ui.theme);
@@ -240,7 +257,7 @@ export default function (
     // Compaction rebuilds the context without session_start. Rebind after
     // other TUI extensions may have replaced the root input dispatcher.
     if (ctx?.mode === "tui" && ctx?.hasUI)
-      installToolMouseInteraction(ctx, mouseOwner);
+      installToolMouseInteraction(ctx, mouseOwner, options.services);
     if (!hooks) return;
     hooks.toolGrouping.setTheme(ctx.ui.theme);
     hooks.toggleRenderCache.setTheme(ctx.ui.theme);
@@ -282,6 +299,7 @@ export default function (
     clearAllAnimations();
     installation = undefined;
   });
+  return controller;
 }
 
 // ---- 对外导出：入口/测试实际消费的符号 ----

package/extensions/layouts/context/renderer/mouse/interaction.ts

@@ -1,15 +1,19 @@
 import { config } from "../../../../app/config/renderer.ts";
-import { inputRouter } from "../../../../app/overlay/input-router.ts";
-import { overlayManager } from "../../../../app/overlay/overlay-manager.ts";
 import {
-  hasActiveTextPreview,
-  showTextPreview,
-} from "../../../../features/context-inspector/index.ts";
+  type InputRouter,
+  inputRouter,
+} from "../../../../app/overlay/input-router.ts";
+import {
+  type OverlayManager,
+  overlayManager,
+} from "../../../../app/overlay/overlay-manager.ts";
+import type { RenderScheduler } from "../../../../app/runtime/render-scheduler.ts";
 import { isLazyProxyTui } from "../../../../tools/fullscreen-detect.ts";
 import {
   patchRegistry,
   TOOL_MOUSE_OWNER_KEY,
 } from "../../../../tools/patch-keys.ts";
+import { showTextPreview } from "../../../overlay/context-inspector.ts";
 import { ThinkingPreviewBlock } from "../../thinking/compact-thinking.ts";
 import {
   isCompactAssistantComponent,
@@ -101,6 +105,7 @@ const DEFAULT_TOOL_MOUSE_OWNER = {};
 export const TOOL_MOUSE_DISABLE = "\x1b[?1006l\x1b[?1003l\x1b[?1000l";
 
 let toolMouseUi: any = null;
+let toolMouseOverlays = overlayManager;
 let toolMouseInputUnsubscribe: (() => void) | null = null;
 let toolMouseRenderPatchTui: any = null;
 let toolMouseRenderPatchOriginal: ((...args: any[]) => any) | null = null;
@@ -144,7 +149,7 @@ function tryOpenToolIoShowMore(region: InteractionRegion): boolean {
   const title = section === "input" ? "Tool Input" : "Tool Output";
   const content =
     section === "input" ? ioView.getInputBody() : ioView.getOutputBody();
-  void showTextPreview({ ui }, title, content || "(empty)");
+  void showTextPreview({ ui }, title, content || "(empty)", toolMouseOverlays);
   return true;
 }
 
@@ -498,7 +503,7 @@ function patchFullscreenViewportInput(tui: any): void {
       const packets = parseSgrMousePackets(data);
       // 官方 fullscreen 会消费全部鼠标；文本预览 overlay 活动时放行给 focused
       // custom component，使 [esc] 点击和滚轮可用。
-      if (packets && tui.hasOverlay?.() && hasActiveTextPreview())
+      if (packets && tui.hasOverlay?.() && toolMouseOverlays.hasActive())
         return undefined;
       if (packets && !tui.hasOverlay?.()) {
         for (const packet of packets) {
@@ -942,9 +947,19 @@ export function resetToolHoverState(): void {
  * @param ctx Active TUI extension context.
  * @param owner Ownership token used to make teardown safe across reloads.
  */
+export type ToolMouseServices = {
+  input: InputRouter;
+  overlays: OverlayManager;
+  render?: RenderScheduler;
+};
+
 export function installToolMouseInteraction(
   ctx: any,
   owner: object = DEFAULT_TOOL_MOUSE_OWNER,
+  services: ToolMouseServices = {
+    input: inputRouter,
+    overlays: overlayManager,
+  },
 ): void {
   teardownToolMouseInteraction(toolMouseInstallationOwner ?? owner);
   if (ctx?.mode !== "tui" || !ctx?.hasUI) return;
@@ -958,9 +973,11 @@ export function installToolMouseInteraction(
   patchRegistry.install(TOOL_MOUSE_OWNER_KEY, owner);
   setHoveredToolCallId(null);
   toolMouseUi = ctx.ui;
+  toolMouseOverlays = services.overlays;
   // 0.84+ 的 tui 是惰性 Proxy：regular 保留原生 scrollback；fullscreen
   // 由官方 LayoutFrame 命中，并由扩展补齐 hover 所需的 all-motion 上报。
   ctx.ui.setWidget(TOOL_MOUSE_WIDGET_KEY, (tui: any, theme: any) => {
+    services.render?.register(owner, (force) => tui.requestRender(force));
     setToolMouseTui(tui);
     setToolTuiFullscreen(fullscreenLazyTui(tui));
     if (isLazyProxyTui(tui)) {
@@ -987,17 +1004,15 @@ export function installToolMouseInteraction(
     setScrollButtonWidget(widget);
     return widget;
   });
-  const removeMouseRoute = inputRouter.register(
+  const removeInput = services.input.bind(
+    ctx.ui,
     (data) =>
-      overlayManager.hasActive() ? undefined : handleToolMouseInput(data),
+      services.overlays.hasActive() ? undefined : handleToolMouseInput(data),
     100,
   );
-  const removeHostInput = ctx.ui.onTerminalInput((data: string) =>
-    inputRouter.dispatch(data),
-  );
   toolMouseInputUnsubscribe = () => {
-    removeHostInput();
-    removeMouseRoute();
+    removeInput();
+    services.render?.register(owner, undefined);
   };
 }
 

package/extensions/layouts/editor/controller.ts

@@ -29,12 +29,9 @@ export type EditorChangeResult = { ok: true } | { ok: false; reason: string };
 
 export type EditorLayoutControllerContext = {
   readonly getConfig: () => PolishedTuiConfig;
-  readonly saveComponent: (
-    patch: Partial<PolishedTuiConfig["components"]["editor"]>,
-  ) => PolishedTuiConfig;
   readonly getState: () => FooterState;
   readonly sessionLifecycle: SessionLifecycle;
-  readonly render: Pick<RenderScheduler, "request">;
+  readonly render: Pick<RenderScheduler, "request" | "register">;
   readonly getThinkingLevel: () => ReturnType<ExtensionAPI["getThinkingLevel"]>;
   readonly getAgentDurationMs: () => number;
   readonly isAgentActive: () => boolean;
@@ -54,7 +51,6 @@ export class EditorLayoutController {
   private readonly context: EditorLayoutControllerContext;
   private readonly ownerToken = Symbol("pi-one-ui-editor-owner");
   private activeTuiContext: ExtensionContext | undefined;
-  private requestEditorRender: (() => void) | undefined;
   private editorInstalled = false;
   private editorInstallMode: EditorInstallMode = "none";
   private installedEditorFactory: EditorFactory | undefined;
@@ -131,17 +127,16 @@ export class EditorLayoutController {
   }
 
   /**
-   * Applies an Editor component configuration patch and reconciles the host.
+   * 应用 app 已提交的 Editor 配置并更新组件。
    *
-   * @param patch Editor configuration changes to persist.
-   * @param ctx Active Pi extension context.
-   * @returns Whether the runtime applied the requested replacement.
+   * @param patch 本次修改的 Editor 字段。
+   * @param ctx 当前 Pi session 的上下文。
+   * @returns 组件应用结果。
    */
-  setComponent(
+  applyConfig(
     patch: Partial<PolishedTuiConfig["components"]["editor"]>,
     ctx: ExtensionContext,
   ): { applied: boolean; reason?: string } {
-    this.context.saveComponent(patch);
     let result: EditorChangeResult | undefined;
     if (patch.style === "off") {
       // off 透传原生渲染：不替换工厂，既有编辑器实例与 overlay preFocus
@@ -298,7 +293,6 @@ export class EditorLayoutController {
    */
   cleanup(ctx?: ExtensionContext): void {
     this.resetAgentTimer();
-    this.context.sessionLifecycle.shutdown();
     if (ctx && this.isTuiContext(ctx)) {
       try {
         const currentFactory = ctx.ui.getEditorComponent();
@@ -413,7 +407,7 @@ export class EditorLayoutController {
    */
   private clearEditorOwnership(): void {
     this.setMinimalistDecorationActive(false);
-    this.requestEditorRender = undefined;
+    this.context.render.register(this, undefined);
     this.wrappedEditorFactory = undefined;
     this.installedEditorFactory = undefined;
     this.editorInstallMode = "none";
@@ -481,7 +475,7 @@ export class EditorLayoutController {
       isAgentActive: this.context.isAgentActive,
       getProjectRoot: this.context.getProjectRoot,
       onRender: (requestRender) => {
-        this.requestEditorRender = requestRender;
+        this.context.render.register(this, requestRender);
       },
       onDecorationActive: (active) =>
         this.setMinimalistDecorationActive(active),
@@ -532,11 +526,8 @@ export class EditorLayoutController {
     });
   }
 
-  /**
-   * Requests both the mounted editor redraw and the shared runtime redraw.
-   */
+  /** 向 app 提交共享 TUI 刷新请求。 */
   requestRender(): void {
-    this.requestEditorRender?.();
     this.context.render.request();
   }
 }

package/extensions/layouts/editor/factory.ts

@@ -24,7 +24,7 @@ export type EditorFactoryRuntime = {
   readonly getAgentDurationMs: () => number;
   readonly isAgentActive: () => boolean;
   readonly getProjectRoot: () => string | undefined;
-  readonly onRender: (requestRender: () => void) => void;
+  readonly onRender: (requestRender: (force: boolean) => void) => void;
   readonly onDecorationActive: (active: boolean) => void;
 };
 
@@ -44,7 +44,7 @@ export function createEditorFactory(
     theme: EditorTheme,
     keybindings: KeybindingsManager,
   ) => {
-    runtime.onRender(() => tui.requestRender());
+    runtime.onRender((force) => tui.requestRender(force));
     return new PolishedEditor(
       tui,
       theme,
@@ -78,7 +78,7 @@ export function createWrappedEditorFactory(
     theme: EditorTheme,
     keybindings: KeybindingsManager,
   ) => {
-    runtime.onRender(() => tui.requestRender());
+    runtime.onRender((force) => tui.requestRender(force));
     return new WrappedPolishedEditor(
       baseFactory(tui, theme, keybindings),
       runtime.sessionTheme,