@zhushanwen/pi-subagent-workflow 8.7.0 → 8.8.1

package/src/interface/list-shared.ts

@@ -1,4 +1,4 @@
-// src/tui/list-shared.ts
+// src/interface/list-shared.ts
 //
 // list-view 与 list-component 共享的类型/常量/纯函数，避免两者循环依赖。
 // 原循环：list-view import 组件类 SubagentsListComponent；组件 import key 处理 + 状态类型。
@@ -6,8 +6,8 @@
 // 按键处理 processKey 仍留 list-view，由 list-view factory 注入给组件（KeyHandler 类型在此），
 // 故 list-component 无需 import list-view，循环消除。
 
-import type { SubagentService } from "@zhushanwen/subagent-core/execution/subagent-service.ts";
-import type { SubagentRecord } from "@zhushanwen/subagent-core/execution/types.ts";
+import type { SubagentService } from "@zhushanwen/subagent-core";
+import type { SubagentRecord } from "@zhushanwen/subagent-core";
 
 // ============================================================
 // 常量

package/src/interface/list-view.ts

@@ -1,4 +1,4 @@
-// src/tui/list-view.ts
+// src/interface/list-view.ts
 //
 // /subagents list 全屏带框左右分屏 overlay。
 //   左列：record 列表（状态图标 + agent + mode + 绝对时长）
@@ -35,8 +35,8 @@
 import { matchesKey } from "@earendil-works/pi-tui";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import type { SubagentService } from "@zhushanwen/subagent-core/execution/subagent-service.ts";
-import type { SubagentRecord } from "@zhushanwen/subagent-core/execution/types.ts";
+import type { SubagentService } from "@zhushanwen/subagent-core";
+import type { SubagentRecord } from "@zhushanwen/subagent-core";
 import { type ThemeLike } from "./format.ts";
 import { SubagentsListComponent } from "./list-component.ts";
 import {
@@ -48,21 +48,21 @@ import {
   type TuiLike,
   type ViewState,
 } from "./list-shared.ts";
+import { PAGE_SCROLL_DEFAULT } from "./tui-kit.ts";
 
 // ============================================================
 // 常量
 // ============================================================
 
 // 布局/边框常量（LEFT_COL_RATIO、COL_*、BORDER_WIDTH、PAD_*、MIN_*、TITLE_*、
-// SPLIT_FIXED_LINES、TERM_ROWS_FALLBACK、DETAIL_LEN_PROBE_WIDTH、VERT_CENTER_DIVISOR、
-// SPINNER_FRAME_MS、PREVIEW_RECENT_LINES）已随 SubagentsListComponent 移至 list-component.ts。
+// SPLIT_FIXED_LINES、DETAIL_LEN_PROBE_WIDTH、VERT_CENTER_DIVISOR、
+// SPINNER_FRAME_MS、PREVIEW_RECENT_LINES）已随 SubagentsListComponent 移至 list-component.ts；
+// 终端兜底零件（终端行数兜底/termRows/边框家族）单定义在 ./tui-kit.ts（C4）。
 // 共享类型/常量/纯函数（LIST_LIMIT/ViewState/DetailKeyContext/TuiLike/NotifyFn/applyFilter/
 // KeyResult/KeyHandler）已移至 list-shared.ts（消除 list-view ↔ list-component 循环依赖）。
 
 /** 详情区 eventLog 翻屏步长（方向键单步）。 */
 const DETAIL_SCROLL_STEP = 1;
-/** 详情区 PgUp/PgDn 默认步长（无 viewport 信息时）。 */
-const PAGE_SCROLL_DEFAULT = 10;
 
 /** overlay 动画刷新间隔（spinner 换帧 + elapsed 跳动）。同 tool-render.ts SPINNER_INTERVAL_MS。 */
 const OVERLAY_REFRESH_MS = 250;
@@ -88,7 +88,7 @@ let activeView: { close: () => void } | null = null;
  *   ╔══════════════════════════════════════════════════════════════════╗
  *   ║  1. G-017 防叠加：activeView?.close()                              ║
  *   ║  2. ctx.ui.custom((tui, theme, kb, done) => {                      ║
- *   ║       unsubscribe = service.onChange(() => tui.requestRender())  ║
+ *   ║       unsubscribe = service.queries.onChange(() => tui.requestRender())  ║
  *   ║       activeView = { close: wrappedDone }                          ║
  *   ║       return new SubagentsListComponent(...)                       ║
  *   ║     }, { overlay:true, overlayOptions:{margin:0, width:"100%"}})   ║
@@ -112,7 +112,7 @@ export async function createSubagentsView(
 
   // directId 提示
   if (directId) {
-    const all = service.collectRecords(LIST_LIMIT);
+    const all = service.queries.collectRecords(LIST_LIMIT);
     if (!all.some((r) => r.id === directId)) {
       notify(`No record found for id "${directId}", showing all`, "warning");
     }
@@ -143,7 +143,7 @@ export async function createSubagentsView(
       // 易产生 cell 残留（视觉重影）。节流到 ONCHANGE_DEBOUNCE_MS，animTimer（250ms）
       // 兜底刷新。终态变化（record 完成）延迟可接受。
       let renderDebounce: ReturnType<typeof setTimeout> | undefined;
-      const unsubscribe = service.onChange(() => {
+      const unsubscribe = service.queries.onChange(() => {
         if (state.disposed) return;
         if (renderDebounce) clearTimeout(renderDebounce);
         renderDebounce = setTimeout(() => {
@@ -156,7 +156,7 @@ export async function createSubagentsView(
 
       // directId 命中 → 进详情模式（右侧就地展开，底部对齐）
       if (directId) {
-        const records = service.collectRecords(LIST_LIMIT);
+        const records = service.queries.collectRecords(LIST_LIMIT);
         const idx = records.findIndex((r) => r.id === directId);
         if (idx >= 0) {
           state.selectedIdx = idx;
@@ -218,27 +218,28 @@ export async function createSubagentsView(
 }
 
 // ============================================================
-// 按键处理（纯函数，可单测）
+// 按键处理（纯函数，可单测）——阶段化提取（形态 1）
 // ============================================================
 
 /**
- * 按键处理。两阶段焦点（detailMode 控制）：
+ * 按键处理入口。两阶段焦点（detailMode 控制），主函数只留阶段编排：
  *
  *   ╔══════════════════════════════════════════════════════════════════╗
-//   ║  阶段 1（list 焦点，detailMode=false）：                            ║
-//   ║    Esc 退出（有 filter 先清）/ ↑↓ 导航左列 / Enter 进阶段 2         ║
-//   ║    Backspace 删 filter / 可打印字符直接 filter                     ║
-//   ║                                                                    ║
-//   ║  阶段 2（detail 焦点，detailMode=true）：左侧锚定，滚右侧详情       ║
-//   ║    Esc 返回阶段 1 / ↑↓ PgUp/PgDn Home End 滚右侧 eventLog          ║
-//   ║    x 停止：background → service.cancel(id)（真正 abort）         ║
-//   ╚══════════════════════════════════════════════════════════════════╝
+ *   ║  阶段 1（list 焦点，detailMode=false）：                            ║
+ *   ║    Esc 退出（有 filter 先清）/ ↑↓ 导航左列 / Enter 进阶段 2         ║
+ *   ║    Backspace 删 filter / 可打印字符直接 filter                     ║
+ *   ║                                                                    ║
+ *   ║  阶段 2（detail 焦点，detailMode=true）：左侧锚定，滚右侧详情       ║
+ *   ║    Esc 返回阶段 1 / ↑↓ PgUp/PgDn Home End 滚右侧 eventLog          ║
+ *   ║    x 停止：background → service.cancel(id)（真正 abort）         ║
+ *   ╚══════════════════════════════════════════════════════════════════╝
  *
  * 返回 KeyResult：changed 表示状态变更需重绘；exit 表示调用方应关闭 overlay。
  * 二者正交——Esc 在阶段 1 无 filter 时 changed=false + exit=true。
  *
  * 注：KeyResult/KeyHandler 类型定义在 list-shared.ts（list-component 也用 KeyHandler 做构造
  * 参数类型，避免组件 import list-view）。本函数由 list-view factory 注入组件（依赖注入）。
+ * 各阶段子函数按原 if 链顺序匹配，命中短路返回（与原单函数版时序逐一对齐）。
  */
 export const processKey: KeyHandler = (
   data,
@@ -249,50 +250,118 @@ export const processKey: KeyHandler = (
   detailCtx,
   notify,
 ): KeyResult => {
-  // ── 阶段 2（detail 焦点，detailMode=true）：左侧锚定，滚右侧详情 ──
   if (state.detailMode) {
-    if (matchesKey(data, "escape")) {
-      state.detailMode = false;
-      state.scrollOffset = 0;
-      return { changed: true, exit: false };
-    }
-    if (matchesKey(data, "up")) {
-      state.scrollOffset = Math.max(0, state.scrollOffset - DETAIL_SCROLL_STEP);
-      return { changed: true, exit: false };
-    }
-    if (matchesKey(data, "down")) {
-      const max = detailScrollMax(detailCtx);
-      state.scrollOffset = Math.min(max, state.scrollOffset + DETAIL_SCROLL_STEP);
-      return { changed: true, exit: false };
-    }
-    if (matchesKey(data, "pageUp")) {
-      const step = detailCtx?.viewportHeight ?? PAGE_SCROLL_DEFAULT;
-      state.scrollOffset = Math.max(0, state.scrollOffset - step);
-      return { changed: true, exit: false };
-    }
-    if (matchesKey(data, "pageDown")) {
-      const step = detailCtx?.viewportHeight ?? PAGE_SCROLL_DEFAULT;
-      const max = detailScrollMax(detailCtx);
-      state.scrollOffset = Math.min(max, state.scrollOffset + step);
-      return { changed: true, exit: false };
-    }
-    if (matchesKey(data, "home")) {
-      state.scrollOffset = 0;
-      return { changed: true, exit: false };
-    }
-    if (matchesKey(data, "end")) {
-      state.scrollOffset = detailScrollMax(detailCtx);
+    return processDetailModeKey(data, state, selected, service, detailCtx, notify);
+  }
+  return processListModeKey(data, records, state, selected);
+};
+
+// ============================================================
+// 阶段 2（detail 焦点，detailMode=true）：左侧锚定，滚右侧详情
+// ============================================================
+
+/** 阶段 2 滚动/返回键（Esc/↑/↓/PgUp/PgDn/Home/End，匹配顺序同原 if 链）。未命中返回 undefined。 */
+function detailScrollKey(
+  data: string,
+  state: ViewState,
+  detailCtx: DetailKeyContext | undefined,
+): KeyResult | undefined {
+  if (matchesKey(data, "escape")) {
+    state.detailMode = false;
+    state.scrollOffset = 0;
+    return { changed: true, exit: false };
+  }
+  if (matchesKey(data, "up")) {
+    state.scrollOffset = Math.max(0, state.scrollOffset - DETAIL_SCROLL_STEP);
+    return { changed: true, exit: false };
+  }
+  if (matchesKey(data, "down")) {
+    const max = detailScrollMax(detailCtx);
+    state.scrollOffset = Math.min(max, state.scrollOffset + DETAIL_SCROLL_STEP);
+    return { changed: true, exit: false };
+  }
+  if (matchesKey(data, "pageUp")) {
+    const step = detailCtx?.viewportHeight ?? PAGE_SCROLL_DEFAULT;
+    state.scrollOffset = Math.max(0, state.scrollOffset - step);
+    return { changed: true, exit: false };
+  }
+  if (matchesKey(data, "pageDown")) {
+    const step = detailCtx?.viewportHeight ?? PAGE_SCROLL_DEFAULT;
+    const max = detailScrollMax(detailCtx);
+    state.scrollOffset = Math.min(max, state.scrollOffset + step);
+    return { changed: true, exit: false };
+  }
+  if (matchesKey(data, "home")) {
+    state.scrollOffset = 0;
+    return { changed: true, exit: false };
+  }
+  if (matchesKey(data, "end")) {
+    state.scrollOffset = detailScrollMax(detailCtx);
+    return { changed: true, exit: false };
+  }
+  return undefined;
+}
+
+/** 阶段 2 停止键（x）：background → service.cancel(id) 真正 abort。未命中返回 undefined。 */
+function detailStopKey(
+  data: string,
+  selected: SubagentRecord | null,
+  service: SubagentService | null,
+  notify: NotifyFn | undefined,
+): KeyResult | undefined {
+  if (data === "x" && selected) {
+    const changed = handleCancel(selected, service, notify);
+    return { changed, exit: false };
+  }
+  return undefined;
+}
+
+/** 阶段 2 编排：滚动/返回 → 停止 → 落空（与原阶段 2 if 链 + 兜底 return 逐一对齐）。 */
+function processDetailModeKey(
+  data: string,
+  state: ViewState,
+  selected: SubagentRecord | null,
+  service: SubagentService | null,
+  detailCtx: DetailKeyContext | undefined,
+  notify: NotifyFn | undefined,
+): KeyResult {
+  const scroll = detailScrollKey(data, state, detailCtx);
+  if (scroll) return scroll;
+  const stop = detailStopKey(data, selected, service, notify);
+  if (stop) return stop;
+  return { changed: false, exit: false };
+}
+
+// ============================================================
+// 阶段 1（list 焦点，detailMode=false）：↑↓ 导航左列 + filter 编辑
+// ============================================================
+
+/** 阶段 1 filter 编辑键（backspace 删末字符 / 可打印 ASCII 字符追加）。未命中返回 undefined。 */
+function listFilterKey(data: string, state: ViewState): KeyResult | undefined {
+  if (matchesKey(data, "backspace")) {
+    if (state.filterText.length > 0) {
+      state.filterText = state.filterText.slice(0, -1);
+      state.selectedIdx = 0;
       return { changed: true, exit: false };
     }
-    // x：停止当前 record
-    if (data === "x" && selected) {
-      const changed = handleCancel(selected, service, notify);
-      return { changed, exit: false };
-    }
     return { changed: false, exit: false };
   }
+  // 可打印字符 → filter（单字符 ASCII 可见区）
+  if (data.length === 1 && data >= " " && data <= "~") {
+    state.filterText += data;
+    state.selectedIdx = 0;
+    return { changed: true, exit: false };
+  }
+  return undefined;
+}
 
-  // ── 阶段 1（list 焦点，detailMode=false）：↑↓ 导航左列 ──
+/** 阶段 1 编排：Esc 清 filter/退出 → 导航 → 进详情 → filter 编辑 → 落空（匹配顺序同原 if 链）。 */
+function processListModeKey(
+  data: string,
+  records: SubagentRecord[],
+  state: ViewState,
+  selected: SubagentRecord | null,
+): KeyResult {
   if (matchesKey(data, "escape")) {
     // 有 filter 先清（changed）；无 filter → 退出 overlay（exit）
     if (state.filterText.length > 0) {
@@ -322,20 +391,8 @@ export const processKey: KeyHandler = (
     }
     return { changed: false, exit: false };
   }
-  if (matchesKey(data, "backspace")) {
-    if (state.filterText.length > 0) {
-      state.filterText = state.filterText.slice(0, -1);
-      state.selectedIdx = 0;
-      return { changed: true, exit: false };
-    }
-    return { changed: false, exit: false };
-  }
-  // 可打印字符 → filter（单字符 ASCII 可见区）
-  if (data.length === 1 && data >= " " && data <= "~") {
-    state.filterText += data;
-    state.selectedIdx = 0;
-    return { changed: true, exit: false };
-  }
+  const filter = listFilterKey(data, state);
+  if (filter) return filter;
   return { changed: false, exit: false };
 }