@zhushanwen/pi-subagent-workflow 8.8.0 → 8.8.1

package/src/interface/list-view.ts

@@ -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 };
 }
 

package/src/interface/subagent-actions.ts

@@ -21,7 +21,6 @@ import {
   isGuiCapable,
 } from "@xyz-agent/extension-protocol";
 
-import type { SubagentToolResult } from "@zhushanwen/subagent-core/execution/types.ts";
 import type {
   CancelHandlerResult,
   CloseHandlerResult,
@@ -29,11 +28,12 @@ import type {
   ListHandlerResult,
   MessageHandlerResult,
   StartHandlerResult,
-} from "@zhushanwen/subagent-core/execution/subagent-actions-core.ts";
+  SubagentToolResult,
+} from "@zhushanwen/subagent-core";
 import { mapRunIcon, mapRunStatus } from "./gui-mappers.ts";
 
 // ============================================================
-// core 领域内核 re-export（pi 消费面符号与收缩前一致，deep path 直连 core 源码）
+// core 领域内核 re-export（pi 消费面符号与收缩前一致，经 core barrel 统一消费）
 // ============================================================
 
 export {
@@ -46,7 +46,7 @@ export {
   messageHandler,
   recordToListItem,
   startHandler,
-} from "@zhushanwen/subagent-core/execution/subagent-actions-core.ts";
+} from "@zhushanwen/subagent-core";
 
 export type {
   CancelHandlerInput,
@@ -61,7 +61,7 @@ export type {
   MessageHandlerResult,
   StartHandlerInput,
   StartHandlerResult,
-} from "@zhushanwen/subagent-core/execution/subagent-actions-core.ts";
+} from "@zhushanwen/subagent-core";
 
 // ============================================================
 // 渲染层常量 / 类型（pi TUI 渲染族，按设计留壳）

package/src/interface/subagent-tool-schema.ts

@@ -12,16 +12,17 @@
 // 编译本 schema 并断言 required/description/enum/pattern 存活——SW 自身测试环境
 // 把 typebox alias 到 mock（丢 options），SO 侧测试以真实构造为对照基准。
 //
-// 层归属：Interface（工具 schema 的家）。SLUG_MAX_LENGTH 权威定义回归 core 侧
-// execution/execute-options-mapper.ts（subagent-core 包抽离 u1-move：core 切面不得
-// 反向 import 壳侧 interface，常量随之内化）——此处 re-export 保持既有 import 路径。
+// 层归属：Interface（工具 schema 的家）。SLUG_MAX_LENGTH 权威定义在 core 侧
+// orchestration/models/types.ts（[D6 合流迁址] 原 execution/execute-options-mapper.ts
+// 已随 mapper 删除，常量迁至 AgentCallOpts.description 字段同文件；core 切面不得
+// 反向 import 壳侧 interface 的约束不变）——此处 re-export 保持既有 import 路径。
 
 import { StringEnum } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 
-import { THINKING_ORDER } from "@zhushanwen/subagent-core/shared/model-ref.ts";
+import { THINKING_ORDER } from "@zhushanwen/subagent-core";
 
-import { SLUG_MAX_LENGTH } from "@zhushanwen/subagent-core/execution/execute-options-mapper.ts";
+import { SLUG_MAX_LENGTH } from "@zhushanwen/subagent-core";
 
 export { SLUG_MAX_LENGTH };
 

package/src/interface/subagent-tool.ts

@@ -16,13 +16,14 @@ import type { AgentToolResult, ExtensionAPI, ExtensionContext, Theme } from "@ea
 import { getLogger } from "@zhushanwen/pi-extension-logger";
 import type { Static } from "typebox";
 
-import { getSubagentService } from "@zhushanwen/subagent-core/execution/subagent-service.ts";
-import type { SubagentToolResult } from "@zhushanwen/subagent-core/execution/types.ts";
+import { getSubagentService } from "@zhushanwen/subagent-core";
+import type { SubagentToolResult } from "@zhushanwen/subagent-core";
 import { extractAgentName } from "./format.ts";
 import { toGuiCtx } from "./gui-mappers.ts";
 import { adapter, cancelHandler, closeHandler, forkFromHandler, listHandler, messageHandler, startHandler } from "./subagent-actions.ts";
 import { SubagentParams } from "./subagent-tool-schema.ts";
 import { type RenderContext,renderSubagentCall, renderSubagentResult } from "./tool-render.ts";
+import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 
 // ============================================================
 // 回调类型（抽 alias 绕 registerTool(unknown) 的 TS2307 误报）
@@ -261,7 +262,7 @@ const subagentRenderCall: SubagentRenderCallCb = (args, theme, ctx) => {
     // streaming 中间态（partial JSON）或 service 未就绪 → 降级不显示 model（renderCall 不应崩）。
     // 不阻断渲染，不污染 TUI。开发期开 XYZ_AGENT_DEBUG=1 可写文件日志排查。
     renderCallLogger.debug("renderCall model resolution failed, degrading", {
-      reason: err instanceof Error ? err.message : String(err),
+      reason: toErrorMessage(err),
     });
   }
   return renderSubagentCall(args, theme, ctx, resolved);

package/src/interface/subagents.ts

@@ -9,14 +9,15 @@
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 
-import { getSubagentService } from "@zhushanwen/subagent-core/execution/subagent-service.ts";
-import type { SubagentService } from "@zhushanwen/subagent-core/execution/subagent-service.ts";
-import { displayAgentName } from "@zhushanwen/subagent-core/shared/agent-ref.ts";
+import { getSubagentService } from "@zhushanwen/subagent-core";
+import type { SubagentService } from "@zhushanwen/subagent-core";
+import { displayAgentName } from "@zhushanwen/subagent-core";
 import { messageHandler, startHandler } from "./subagent-actions.ts";
 import { parseSubagentRpcCommand } from "./command-actions.ts";
 import type { SubagentRpcAction } from "./command-actions.ts";
 import { LIST_LIMIT } from "./list-shared.ts";
 import { createSubagentsView } from "./list-view.ts";
+import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 
 /**
  * subagent-directive custom_message 的 customType。
@@ -84,7 +85,7 @@ async function rpcCancel(
     );
   } catch (err) {
     // service.cancel 内部 assertReady 在 session_shutdown 并发 dispose 时会抛
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     ctx.ui.notify(`Failed to cancel subagent ${recordId}: ${msg}`, "warning");
   }
 }
@@ -115,7 +116,7 @@ async function rpcMessage(
     );
     ctx.ui.notify(`Message delivered to subagent ${result.slug} (${result.subagentId})`, "info");
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     ctx.ui.notify(`Failed to message subagent ${recordId}: ${msg}`, "warning");
   }
 }
@@ -149,7 +150,7 @@ async function rpcStart(
     );
     ctx.ui.notify(`Started subagent ${result.slug} (${result.subagentId})`, "info");
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     ctx.ui.notify(`Failed to start subagent ${slug}: ${msg}`, "warning");
   }
 }
@@ -230,7 +231,7 @@ export function registerSubagentsCommand(pi: ExtensionAPI): void {
           if (!service) return null;
           // collectRecords 合并内存(running) + 磁盘重建 record，按 rootSessionId 过滤。
           // cancel 只对 running 有效，但全部列出便于用户辨认（终态 record 会被 service 拒绝）。
-          const records = service.collectRecords(LIST_LIMIT);
+          const records = service.queries.collectRecords(LIST_LIMIT);
           if (records.length === 0) return null;
           return records.map((r) => ({
             label: r.id,

package/src/interface/tool-render.ts

@@ -24,8 +24,8 @@ import type { AgentToolResult, Theme } from "@earendil-works/pi-coding-agent";
 import type {
   ListResponse,
   SubagentToolResult,
-} from "@zhushanwen/subagent-core/execution/types.ts";
-import { displayAgentName } from "@zhushanwen/subagent-core/shared/agent-ref.ts";
+} from "@zhushanwen/subagent-core";
+import { displayAgentName } from "@zhushanwen/subagent-core";
 import {
   extractAgentName,
   firstLineSanitized,

package/src/interface/tool-workflow-script.ts

@@ -27,23 +27,24 @@ import { Text } from "@earendil-works/pi-tui";
 import { type Static, Type } from "typebox";
 
 import {
-	guiComponent,
-	type GuiContext,
-	type GuiRenderResult,
-	guiResult,
-	isGuiCapable,
+  guiComponent,
+  type GuiContext,
+  type GuiRenderResult,
+  guiResult,
+  isGuiCapable,
 } from "@xyz-agent/extension-protocol";
 // C5②/C5⑦：创作闭环统一走 core barrel（generateWorkflowScript/saveWorkflow/
 // deleteWorkflow/lintScript 均为 barrel 导出面；深路径在 npm/vendored 形态不可达）
 import {
-	deleteWorkflow,
-	generateWorkflowScript,
-	lintScript,
-	saveWorkflow,
+  deleteWorkflow,
+  generateWorkflowScript,
+  lintScript,
+  saveWorkflow,
 } from "@zhushanwen/subagent-core";
-import type { WorkflowScriptRegistry } from "@zhushanwen/subagent-core/orchestration/models/workflow-script-registry.ts";
+import type { WorkflowScriptRegistry } from "@zhushanwen/subagent-core";
 import { toGuiCtx } from "./gui-mappers.ts";
-import { renderTextFallback } from "./views/format.ts";
+import { renderTextFallback } from "./format.ts";
+import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 
 // ── Parameter schema ─────────────────────────────────────────
 
@@ -351,7 +352,7 @@ async function actionSave(params: ScriptParams): Promise<TextContent> {
   } catch (err: unknown) {
     // throw（W4）：pi 只对 execute throw 置 isError:true（返回值里的 isError 被
     // agent-loop 丢弃，agent-loop.js:453-483）——文案原样进 toolResult。
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     throw new Error(`Save failed: ${msg}`);
   }
 }
@@ -378,7 +379,7 @@ function actionDelete(
     };
   } catch (err: unknown) {
     // throw（W4）：同 save——pi 契约只有 throw 才置 isError:true。
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     throw new Error(`Delete failed: ${msg}`);
   }
 }
@@ -401,7 +402,7 @@ async function actionList(registry: WorkflowScriptRegistry): Promise<TextContent
     };
   } catch (err: unknown) {
     // throw（W4b）：list 失败改 throw（原 return isError 被 pi 丢弃），文案保持
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     throw new Error(`List failed: ${msg}`);
   }
 }

package/src/interface/tool-workflow.ts

@@ -31,18 +31,20 @@ import {
 } from "@xyz-agent/extension-protocol";
 import { type Static, Type } from "typebox";
 
-import { SLUG_MAX_LENGTH } from "@zhushanwen/subagent-core/execution/execute-options-mapper.ts";
-import { THINKING_ORDER } from "@zhushanwen/subagent-core/execution/model-resolver.ts";
-import { MAX_TIMER_DELAY_MS } from "@zhushanwen/subagent-core/shared/timer-delay.ts";
+import { SLUG_MAX_LENGTH } from "@zhushanwen/subagent-core";
+import { THINKING_ORDER } from "@zhushanwen/subagent-core";
+import type { LauncherDeps } from "@zhushanwen/subagent-core";
+import { abortRun, runWorkflow } from "@zhushanwen/subagent-core";
+import type { RunStore } from "@zhushanwen/subagent-core";
+import type { WorkflowRun } from "@zhushanwen/subagent-core";
+// D9 closure：core args-meta 消费（reservedKeys 注入见下方 ARGS_META_OPTIONS）
+// MAX_TIMER_DELAY_MS：OR-1 消费（barrel 导出，深路径经 u-2c 删通配后 tsc 不可解析）
 import {
   argKeysFromMeta,
   findFlattenedArgKeys,
-} from "@zhushanwen/subagent-core/orchestration/args-meta.ts";
-import type { LauncherDeps } from "@zhushanwen/subagent-core/orchestration/launcher.ts";
-import { abortRun, runWorkflow } from "@zhushanwen/subagent-core/orchestration/lifecycle.ts";
-import type { RunStore } from "@zhushanwen/subagent-core/orchestration/models/ports.ts";
-import type { WorkflowRun } from "@zhushanwen/subagent-core/orchestration/models/workflow-run.ts";
-import { runSummary } from "@zhushanwen/subagent-core/orchestration/workflow-run-summary.ts";
+  MAX_TIMER_DELAY_MS,
+} from "@zhushanwen/subagent-core";
+import { runSummary } from "@zhushanwen/subagent-core";
 import { mapRunIcon, mapRunStatus, toGuiCtx } from "./gui-mappers.ts";
 import {
   acquireReentryGuard,
@@ -50,7 +52,8 @@ import {
   type ReentryGuardRef,
   releaseReentryGuard,
 } from "./reentry-guard.ts";
-import { formatElapsed, renderTextFallback } from "./views/format.ts";
+import { formatElapsed, renderTextFallback } from "./format.ts";
+import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 
 // ── Parameter schema ─────────────────────────────────────────
 
@@ -531,7 +534,7 @@ async function actionLifecycle(
     };
   } catch (err) {
     // throw（W4b）：abortRun 失败改 throw（原 return isError 被 pi 丢弃），"Error: " 前缀保持
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = toErrorMessage(err);
     throw new Error(`Error: ${msg}`);
   }
 }