pi-one-ui 0.1.1 → 0.2.0

package/README.md

@@ -1,11 +1,6 @@
 # pi-one-ui
 
-`pi-one-ui` 是一个单一 Pi 插件包，将两个 UI 扩展合并为一个可自定义的源码仓库：
-
-- **Zentui**：Editor、User message、Working line、Selector border、Footer
-- **CC Style**：Tool renderer、Rich diff、Thinking、Compact transcript、鼠标交互和辅助功能
-
-安装后只需要启用这个包，不需要再单独安装 `pi-zentui` 或 `pi-cc-extensions`。
+`pi-one-ui` 是一个统一的 Pi TUI 插件包，将 Zentui 的终端外壳能力与 Claude Code 风格的对话内容渲染合并到一个插件中。
 
 ## 安装
 
@@ -23,23 +18,37 @@ pi install git:github.com/<your-account>/pi-one-ui
 /oneui
 ```
 
-`/oneui` 是唯一的公开管理命令，执行后直接打开融合后的交互面板。面板按 `Tab` / `Shift+Tab` 切换 Shell、Renderer、Features、Presets 分区。Shell 分区会显示 Editor 和 User Message 的实时样式预览；修改会立即写入统一配置，活动会话支持的样式也会自动重绘。
+`/oneui` 是唯一的公开管理命令。设置面板按照 TUI 的视觉 Layout 划分：
 
 ```text
-~/.pi/agent/pi-one-ui.json
+Header → Context → WorkingLine → Editor → Footer → Features → Presets
 ```
 
-面板中的详细配置仍可直接编辑 JSON，以便开发自定义字段。
+其中：
+
+- **Header**：启动信息、Logo、快捷键提示。
+- **Context**：对话内容区，包含 User Message、Assistant Message、Thinking、Tool、Diff、Summary 和鼠标交互。
+- **WorkingLine**：Pi 的工作状态行、spinner、token/thought/elapsed 信息。
+- **Editor**：输入编辑器、completion、metadata、Accent Rail 和 Minimalist 样式。
+- **Footer**：目录、Git、runtime、token、cost、extension status 等信息。
+- **Features**：Context Inspector、Session Reference、Subagent Autocomplete、Aliases 等行为能力。
+- **Overlay**：设置面板和 Context Inspector 等临时浮层由统一 OverlayManager 跟踪。
+
+## 配置
 
-## 配置结构
+配置文件：
+
+```text
+~/.pi/agent/pi-one-ui.json
+```
 
-Zentui 的配置保留在 JSON 根级，CC Style 的配置放在 `renderer` 下：
+当前仍兼容 v1 配置结构：
 
 ```json
 {
   "version": 1,
   "components": {
-    "editor": { "enabled": true, "style": "accent-rail" },
+    "editor": { "enabled": true, "style": "opencode" },
     "userMessages": { "enabled": true, "style": "framed" },
     "workingLine": { "enabled": true },
     "footer": { "style": "starship" }
@@ -52,34 +61,44 @@ Zentui 的配置保留在 JSON 根级，CC Style 的配置放在 `renderer` 下
 }
 ```
 
-完整字段可参考上游快照：
+所有读写已经经过统一 ConfigStore；旧的 `zentui.json`、`claude-code-style.json` 和 `pi-mine-ui.json` 会被兼容读取并保留。`enableWorkingMessage` 仍可被旧配置读取，但统一插件不会注册第二套 working-message 实现，WorkingLine 的唯一 owner 是本插件的 WorkingLine layout。
 
-- `vendor/pi-zentui/docs/configuration.md`
-- `vendor/pi-cc-extensions/README.md`
-
-Working line 的 owner 固定为 Zentui，因此默认关闭 CC Style 的 `enableWorkingMessage`，避免两个扩展争抢 Pi 的无 key working row。
-
-## 来源与目录结构
-
-本项目基于以下上游项目进行融合开发：
-
-- `pi-zentui`：提供 Shell chrome、Editor、Footer、Working line 等能力
-- `pi-cc-extensions`：提供 Tool renderer、Diff、Thinking 和 Transcript 能力
-
-上游源码快照保存在 `vendor/` 中，仅用于追踪和同步。`extensions/` 按 `pi-one-ui` 的产品能力组织，不保留上游项目的目录结构：
+## 源码结构
 
 ```text
 extensions/
-  index.ts                 # 唯一公开入口和 /oneui 命令
-  app/                     # 统一配置、面板、预设和应用装配
-  shell/                  # Editor、Footer、Working line 等终端外壳能力
-  transcript/             # Tool、Diff、Thinking 和消息渲染
-  features/               # Context、Session reference、Agent summary 等功能
-  tools/                  # Patch、ANSI、组件树和其他底层能力
-vendor/                    # 上游只读参考快照和版本记录
+  index.ts                         # 唯一插件入口，创建 TuiRuntime
+  app/
+    runtime/                       # TuiRuntime、state、事件和调度
+    host/                          # Pi API 的窄化 host ports
+    config/                        # ConfigStore 与配置领域解析
+    ownership/                     # Layout ownership
+    overlay/                       # OverlayManager、InputRouter、selector
+    commands/                      # /oneui and settings panel previews
+  layouts/
+    header/                        # Header layout
+    context/                       # 原 Transcript：对话内容区
+      message/                     # User Message
+      thinking/                    # Thinking
+      renderer/                    # Tool、Diff、Markdown、Mouse
+      summary/                     # Agent summary
+    working-line/                  # WorkingLine 与 interaction summary
+    editor/                        # Editor 及其样式实现
+    footer/                        # Footer 及其布局/format/status
+  features/
+    aliases.ts
+    context-inspector/             # /context，不是 Context 对话区
+    flush-docked-bash.ts
+    legacy/                        # standalone compatibility implementation
+    session-reference/
+    subagent-autocomplete.ts
+  services/                       # Git、runtime、package、project、session 数据
+  shared/                         # ANSI、format、style、icons 等共享实现
+  tools/                          # 底层组件树、patch 和 terminal helpers
+vendor/                           # 只读上游参考快照
 ```
 
-公共入口只有 `/oneui`。Shell 和 Transcript 的内部 owner 由应用装配层统一管理，避免不同模块争抢同一个 Pi UI 接缝。
+`TuiRuntime` 是唯一 composition root，并直接装配 Layout controllers、services 和 shared lifecycle effects。standalone compatibility harness 只位于 `tests/support/`，不进入安装包。
 
 ## 开发
 
@@ -90,12 +109,20 @@ npm test
 npm run pack:check
 ```
 
-`npm test` 会同时运行：
+完整检查：
+
+```bash
+npm run verify
+```
 
-- `node:test`：Transcript、工具渲染和融合入口测试
-- `Vitest`：Shell 及其生命周期、布局和配置测试
+测试按领域划分：
 
-测试文件按产品能力命名为 `tests/shell-*`、`tests/transcript-*` 和 `tests/one-ui-*`。
+- `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-*`：standalone compatibility tests for the remaining layout lifecycle glue。
 
 本地启动：
 
@@ -103,4 +130,4 @@ npm run pack:check
 npm run pi:dev
 ```
 
-上游快照版本记录在 `ARCHITECTURE.md`。更新上游时，先在 `vendor/` 中获取新快照，再将对应源码同步到 `extensions/`，不要直接修改 vendor 参考目录。
+上游快照保存在 `vendor/`，仅用于追踪和同步。不要直接修改 `vendor/` 或 `node_modules/`。

package/extensions/{shell → 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 { renderAccentRailEditorFrame } from "./accent-rail-editor.ts";
-import type { PolishedTuiConfig } from "../app/config/shell.ts";
-import { sanitizeEditorMetadataText } from "./editor-metadata-format.ts";
-import { renderMinimalistFrame } from "./minimalist-editor.ts";
-import { safeThemeFg } from "./style.ts";
-import { renderPolishedEditorFrame } from "./ui.ts";
-import { renderUserMessageStyle } from "./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";
 
 export const SETTINGS_PREVIEW_MAX_WIDTH = 72;
 export const SETTINGS_PREVIEW_MAX_ROWS = 10;

package/extensions/app/config/renderer.ts

@@ -1,7 +1,5 @@
-import type { CompactThinkingConfig } from "../../features/compact-thinking.ts";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
+import type { CompactThinkingConfig } from "../../layouts/context/thinking/compact-thinking.ts";
+import { configStore, type ConfigRecord } from "./store.ts";
 
 export type CompactStyleMode = "on" | "compact" | "off";
 
@@ -67,58 +65,6 @@ export type Config = {
   enableAliases: boolean;
 };
 
-const AGENT_DIR =
-  process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
-const CONFIG_PATH = join(AGENT_DIR, "pi-one-ui.json");
-const LEGACY_UNIFIED_CONFIG_PATH = join(AGENT_DIR, "pi-mine-ui.json");
-const LEGACY_CONFIG_PATH = join(AGENT_DIR, "claude-code-style.json");
-const LEGACY_ZENTUI_CONFIG_PATH = join(AGENT_DIR, "zentui.json");
-
-type ConfigRecord = Record<string, unknown>;
-
-function readJson(path: string): ConfigRecord | undefined {
-  try {
-    if (!existsSync(path)) return undefined;
-    const value = JSON.parse(readFileSync(path, "utf8"));
-    return value && typeof value === "object" && !Array.isArray(value)
-      ? (value as ConfigRecord)
-      : undefined;
-  } catch {
-    return undefined;
-  }
-}
-
-/**
- * Keep the two upstream configuration schemas under one portable file. Zentui
- * owns the root fields; the CC renderer owns `renderer`. Existing installations
- * are imported once without deleting their legacy files.
- */
-function readUnifiedConfig(): ConfigRecord {
-  const current = readJson(CONFIG_PATH) ?? readJson(LEGACY_UNIFIED_CONFIG_PATH);
-  if (current) {
-    if (!existsSync(CONFIG_PATH)) {
-      try {
-        writeFileSync(CONFIG_PATH, JSON.stringify(current, null, 2));
-      } catch {
-        // Keep using the legacy file in memory if migration cannot be written.
-      }
-    }
-    return current;
-  }
-
-  const shell = readJson(LEGACY_ZENTUI_CONFIG_PATH) ?? {};
-  const renderer = readJson(LEGACY_CONFIG_PATH);
-  if (!renderer && Object.keys(shell).length === 0) return {};
-
-  const migrated = { ...shell, version: 1, renderer: renderer ?? {} };
-  try {
-    writeFileSync(CONFIG_PATH, JSON.stringify(migrated, null, 2));
-  } catch {
-    // A read-only agent directory still uses the migrated in-memory value.
-  }
-  return migrated;
-}
-
 function rendererConfigFrom(record: ConfigRecord): ConfigRecord {
   const renderer = record.renderer;
   return renderer && typeof renderer === "object" && !Array.isArray(renderer)
@@ -422,22 +368,26 @@ export function formatConfigStatus(source: Config = config): string {
 /** 进程内唯一的活动配置对象。读取直接用 `config.xxx`；写入必须走 `updateConfig`。 */
 export const config: Config = loadConfig();
 
+/**
+ * Loads and normalizes the renderer projection from the shared store.
+ */
 function loadConfig(): Config {
   try {
-    const unified = readUnifiedConfig();
-    return normalizeConfig(rendererConfigFrom(unified));
+    return normalizeConfig(rendererConfigFrom(configStore.read()));
   } catch {
     // Ignore bad config and fall back to defaults.
   }
   return { ...DEFAULT_CONFIG };
 }
 
+/**
+ * Persists the in-memory renderer projection through the shared store.
+ */
 export function saveConfig() {
-  const unified = readUnifiedConfig();
-  writeFileSync(
-    CONFIG_PATH,
-    JSON.stringify({ ...unified, version: 1, renderer: config }, null, 2),
-  );
+  configStore.update((record) => {
+    record.version = 1;
+    record.renderer = config;
+  });
 }
 
 /** 运行时配置写入的唯一入口：合并 + 规范化 + 持久化。 */

package/extensions/app/config/shell.ts

@@ -1,20 +1,3 @@
-import { randomUUID } from "node:crypto";
-import {
-  closeSync,
-  existsSync,
-  fchmodSync,
-  fsyncSync,
-  lstatSync,
-  openSync,
-  readFileSync,
-  realpathSync,
-  renameSync,
-  statSync,
-  unlinkSync,
-  writeFileSync,
-} from "node:fs";
-import { basename, dirname, join } from "node:path";
-import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import {
   ICON_GLYPH_KEYS,
   type IconGlyphs,
@@ -23,14 +6,20 @@ import {
   normalizeIconMode,
   type ResolvedIcons,
   resolveConfiguredIcons,
-} from "../../shell/icons.ts";
-import { isSupportedColorSpec } from "../../shell/style.ts";
-import { normalizeWorkingLineMessages } from "../../shell/working-line.ts";
-import { PI_WORKING_LINE_MESSAGES } from "../../shell/working-line-messages.ts";
+} 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,
+  configStore,
+  mutateConfigFile,
+  type ConfigRecord,
+} from "./store.ts";
 
 export type ColorSpec = string;
 export type ColorSource = "theme" | "terminal";
-export type { IconMode } from "../../shell/icons.ts";
+export type { IconMode } from "../../shared/icons.ts";
 
 export type ContextStyle = "text" | "gauge" | "text+gauge";
 export type SeparatorStyle = "pipe" | "dot" | "chevron" | "none";
@@ -429,9 +418,7 @@ export const FOOTER_FORMAT_ALIASES: Record<string, string> = {
 };
 
 /** Shared configuration file used by the pi-one-ui package. */
-export const configPath = join(getAgentDir(), "pi-one-ui.json");
-const legacyConfigPath = join(getAgentDir(), "pi-mine-ui.json");
-const legacyZentuiConfigPath = join(getAgentDir(), "zentui.json");
+export const configPath = defaultConfigPath;
 
 const defaultFooterSegments: FooterSegmentsConfig = {
   cwd: true,
@@ -597,8 +584,6 @@ export const defaultConfig: PolishedTuiConfig = {
   extensionStatuses: defaultStarshipStyle.extensionStatuses,
 };
 
-type ConfigRecord = Record<string, unknown>;
-
 function isRecord(value: unknown): value is ConfigRecord {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -977,102 +962,18 @@ function validFooterSegmentEntries(
   ) as Partial<FooterSegmentsConfig>;
 }
 
-type ConfigFileState =
-  | { kind: "missing"; record: ConfigRecord; writePath: string }
-  | { kind: "valid"; record: ConfigRecord; writePath: string; mode: number }
-  | { kind: "corrupt"; error: unknown };
-
-function errorCode(error: unknown): string | undefined {
-  return typeof error === "object" && error !== null && "code" in error
-    ? String(error.code)
-    : undefined;
-}
-
-function readConfigFileState(path: string): ConfigFileState {
-  let writePath = path;
-  try {
-    const pathStat = lstatSync(path);
-    if (pathStat.isSymbolicLink()) writePath = realpathSync(path);
-    const targetStat = statSync(writePath);
-    const parsed = JSON.parse(readFileSync(writePath, "utf8"));
-    return isRecord(parsed)
-      ? {
-          kind: "valid",
-          record: parsed,
-          writePath,
-          mode: targetStat.mode & 0o7777,
-        }
-      : {
-          kind: "corrupt",
-          error: new Error("top-level value must be a JSON object"),
-        };
-  } catch (error) {
-    if (errorCode(error) === "ENOENT") {
-      try {
-        lstatSync(path);
-      } catch (pathError) {
-        if (errorCode(pathError) === "ENOENT")
-          return { kind: "missing", record: {}, writePath: path };
-      }
-    }
-    return { kind: "corrupt", error };
-  }
-}
-
-function writeConfigAtomically(
-  path: string,
-  record: ConfigRecord,
-  mode?: number,
-): void {
-  const tempPath = join(
-    dirname(path),
-    `.${basename(path)}.${process.pid}.${randomUUID()}.tmp`,
-  );
-  let file: number | undefined;
-  try {
-    file = openSync(tempPath, "wx", mode ?? 0o666);
-    if (mode !== undefined) fchmodSync(file, mode);
-    writeFileSync(file, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-    fsyncSync(file);
-    closeSync(file);
-    file = undefined;
-    renameSync(tempPath, path);
-  } catch (error) {
-    if (file !== undefined) {
-      try {
-        closeSync(file);
-      } catch {}
-    }
-    try {
-      unlinkSync(tempPath);
-    } catch (cleanupError) {
-      if (errorCode(cleanupError) !== "ENOENT") {
-        // Preserve the persistence failure; the best-effort cleanup error is secondary.
-      }
-    }
-    throw error;
-  }
-}
-
+/**
+ * Applies one compatibility mutation through the shared config writer.
+ */
 function mutateConfig(
   path: string,
   mutate: (record: ConfigRecord) => void,
 ): PolishedTuiConfig {
-  const state = readConfigFileState(path);
-  if (state.kind === "corrupt") {
-    const detail =
-      state.error instanceof Error ? ` (${state.error.message})` : "";
-    throw new Error(
-      `Refusing to save Zentui config because ${path} is corrupt or unreadable; fix or remove it first.${detail}`,
-    );
-  }
-  mutate(state.record);
-  writeConfigAtomically(
-    state.writePath,
-    state.record,
-    state.kind === "valid" ? state.mode : undefined,
-  );
-  return mergeConfig(state.record);
+  const record =
+    path === configPath
+      ? configStore.update(mutate)
+      : mutateConfigFile(path, mutate, "Zentui");
+  return mergeConfig(record);
 }
 
 export function ensureConfigExists(_path = configPath): void {
@@ -1807,27 +1708,12 @@ export function getExtensionStatusColorMode(
   return DEFAULT_EXTENSION_STATUS_COLOR_MODE;
 }
 
+/**
+ * Loads and normalizes the shared raw configuration for shell consumers.
+ */
 export function loadConfig(): PolishedTuiConfig {
   try {
-    let raw: string | undefined;
-    if (existsSync(configPath)) {
-      raw = readFileSync(configPath, "utf8");
-    } else if (existsSync(legacyConfigPath)) {
-      raw = readFileSync(legacyConfigPath, "utf8");
-      try {
-        writeFileSync(configPath, raw);
-      } catch {
-        // Keep using the legacy file in memory if migration cannot be written.
-      }
-    } else if (existsSync(legacyZentuiConfigPath)) {
-      raw = readFileSync(legacyZentuiConfigPath, "utf8");
-      try {
-        writeFileSync(configPath, raw);
-      } catch {
-        // Keep using the legacy file in memory if migration cannot be written.
-      }
-    }
-    return mergeConfig(raw ? JSON.parse(raw) : {});
+    return mergeConfig(configStore.read());
   } catch {
     return mergeConfig({});
   }