@zhushanwen/subagent-core 0.4.0 → 0.6.0

package/src/execution/ui-request-handler-factory.ts

@@ -184,83 +184,111 @@ function sdkTimeoutArg(req: UiRequest): [] | [{ timeout: number }] {
   return isValidDialogTimeout(req.timeout) ? [{ timeout: req.timeout }] : [];
 }
 
+/** 各 method 的默认转发器（表驱动分发；dialog 类 await SDK，fire-and-forget 类同步调用后回 ack）。
+ *  落空（未知 method）语义留在 defaultDialogForward，与原 default 分支逐字节一致。 */
+type DialogMethodForwarder = (req: UiRequest, ui: HostUIChannel) => Promise<UiResponse>;
+
+async function forwardSelect(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  const selected = await ui.select(req.title ?? "", req.options ?? [], ...sdkTimeoutArg(req));
+  return selected === undefined ? { cancelled: true } : { value: selected };
+}
+
+async function forwardConfirm(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  // SDK confirm 必传 message（req.message 缺失时降级空串，不报错阻塞）
+  const confirmed = await ui.confirm(req.title ?? "", req.message ?? "", ...sdkTimeoutArg(req));
+  return { confirmed };
+}
+
+async function forwardInput(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  const text = await ui.input(req.title ?? "", req.placeholder, ...sdkTimeoutArg(req));
+  return text === undefined ? { cancelled: true } : { value: text };
+}
+
+async function forwardEditor(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  // SDK editor 必填，但部分 host 运行时未实现——try/catch 降级 cancelled + warn（不卡队列）。
+  // 不用 typeof 守卫：editor 在类型上必填，typeof 检查会被 TS2367 拒（条件永假）。
+  try {
+    const text = await ui.editor(req.title ?? "", req.prefill);
+    return text === undefined ? { cancelled: true } : { value: text };
+  } catch (err) {
+    logger.warn(
+      "[subagents] ctx.ui.editor unavailable/threw, returning cancelled",
+      { detail: { id: req.id, error: err instanceof Error ? err.message : String(err) } },
+    );
+    return { cancelled: true };
+  }
+}
+
+// ── fire-and-forget 类（§3.2 映射表：GUI 模式下由 createUiRequestHandlerForMode 直接转发）
+// 子进程 rpc-mode 发出的 fire-and-forget method，channel miss 后落到此处。
+// 全部回 {ack:true}（fire-and-forget 语义：子进程不等响应）。
+
+async function forwardNotify(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  // notifyType 运行时收窄：UiRequest.notifyType 是宽 string，ctx.ui.notify 要字面量联合。
+  // 非法值 fallback "info"（pi 侧也会静默降级 info，此处显式 fallback 避免类型不安全）。
+  const rawType = req.notifyType;
+  const notifyType = rawType === "info" || rawType === "warning" || rawType === "error"
+    ? rawType
+    : "info";
+  ui.notify(req.message ?? "", notifyType);
+  return { ack: true };
+}
+
+async function forwardSetStatus(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  ui.setStatus(req.statusKey ?? "", req.statusText);
+  return { ack: true };
+}
+
+async function forwardSetWidget(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  // setWidget channel-miss 语义（§3.2 D1）：
+  //   req.channel === "gui_widget"（带 marker 但 channel 未注册）→ 不转发（marker 行无渲染意义）
+  //   req.channel === undefined（普通 widget）→ 转发文本行到主 agent
+  // channel 命中 registry 时由 createRealHandler 优先走 channel handler，不进这里。
+  if (req.channel === "gui_widget") {
+    return { ack: true };
+  }
+  ui.setWidget(req.widgetKey ?? "", req.widgetLines, { placement: req.widgetPlacement });
+  return { ack: true };
+}
+
+async function forwardSetTitle(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  ui.setTitle(req.title ?? "");
+  return { ack: true };
+}
+
+async function forwardSetEditorText(req: UiRequest, ui: HostUIChannel): Promise<UiResponse> {
+  ui.setEditorText(req.text ?? "");
+  return { ack: true };
+}
+
+/** method → 转发器路由表（key 与原 switch case 标签一一对应；值可选表达落空语义）。 */
+const DIALOG_METHOD_FORWARDERS: Readonly<
+  Record<string, DialogMethodForwarder | undefined>
+> = {
+  select: forwardSelect,
+  confirm: forwardConfirm,
+  input: forwardInput,
+  editor: forwardEditor,
+  notify: forwardNotify,
+  setStatus: forwardSetStatus,
+  setWidget: forwardSetWidget,
+  setTitle: forwardSetTitle,
+  set_editor_text: forwardSetEditorText,
+};
+
 async function defaultDialogForward(
   req: UiRequest,
   ctx: HostUIContext,
 ): Promise<UiResponse> {
-  const ui = ctx.ui;
-  switch (req.method) {
-    case "select": {
-      const selected = await ui.select(req.title ?? "", req.options ?? [], ...sdkTimeoutArg(req));
-      return selected === undefined ? { cancelled: true } : { value: selected };
-    }
-    case "confirm": {
-      // SDK confirm 必传 message（req.message 缺失时降级空串，不报错阻塞）
-      const confirmed = await ui.confirm(req.title ?? "", req.message ?? "", ...sdkTimeoutArg(req));
-      return { confirmed };
-    }
-    case "input": {
-      const text = await ui.input(req.title ?? "", req.placeholder, ...sdkTimeoutArg(req));
-      return text === undefined ? { cancelled: true } : { value: text };
-    }
-    case "editor": {
-      // SDK editor 必填，但部分 host 运行时未实现——try/catch 降级 cancelled + warn（不卡队列）。
-      // 不用 typeof 守卫：editor 在类型上必填，typeof 检查会被 TS2367 拒（条件永假）。
-      try {
-        const text = await ui.editor(req.title ?? "", req.prefill);
-        return text === undefined ? { cancelled: true } : { value: text };
-      } catch (err) {
-        logger.warn(
-          "[subagents] ctx.ui.editor unavailable/threw, returning cancelled",
-          { detail: { id: req.id, error: err instanceof Error ? err.message : String(err) } },
-        );
-        return { cancelled: true };
-      }
-    }
-    // ── fire-and-forget 类（§3.2 映射表：GUI 模式下由 createUiRequestHandlerForMode 直接转发）
-    // 子进程 rpc-mode 发出的 fire-and-forget method，channel miss 后落到此处。
-    // 全部回 {ack:true}（fire-and-forget 语义：子进程不等响应）。
-    case "notify": {
-      // notifyType 运行时收窄：UiRequest.notifyType 是宽 string，ctx.ui.notify 要字面量联合。
-      // 非法值 fallback "info"（pi 侧也会静默降级 info，此处显式 fallback 避免类型不安全）。
-      const rawType = req.notifyType;
-      const notifyType = rawType === "info" || rawType === "warning" || rawType === "error"
-        ? rawType
-        : "info";
-      ui.notify(req.message ?? "", notifyType);
-      return { ack: true };
-    }
-    case "setStatus": {
-      ui.setStatus(req.statusKey ?? "", req.statusText);
-      return { ack: true };
-    }
-    case "setWidget": {
-      // setWidget channel-miss 语义（§3.2 D1）：
-      //   req.channel === "gui_widget"（带 marker 但 channel 未注册）→ 不转发（marker 行无渲染意义）
-      //   req.channel === undefined（普通 widget）→ 转发文本行到主 agent
-      // channel 命中 registry 时由 createRealHandler 优先走 channel handler，不进这里。
-      if (req.channel === "gui_widget") {
-        return { ack: true };
-      }
-      ui.setWidget(req.widgetKey ?? "", req.widgetLines, { placement: req.widgetPlacement });
-      return { ack: true };
-    }
-    case "setTitle": {
-      ui.setTitle(req.title ?? "");
-      return { ack: true };
-    }
-    case "set_editor_text": {
-      ui.setEditorText(req.text ?? "");
-      return { ack: true };
-    }
-    default: {
-      // 未知 method（非 dialog 非 fire-and-forget）——保留 warn（协议演进信号，P3 限流兜底），
-      // 回 ack（落到 default 的一定不是 dialog，fire-and-forget 正确应答是 ack，与 TUI 分支先例一致）。
-      logger.warn(
-        "[subagents] defaultDialogForward: unknown method",
-        { detail: { method: req.method, id: req.id } },
-      );
-      return { ack: true };
-    }
+  const forwarder = DIALOG_METHOD_FORWARDERS[req.method];
+  if (!forwarder) {
+    // 未知 method（非 dialog 非 fire-and-forget）——保留 warn（协议演进信号，P3 限流兜底），
+    // 回 ack（落到 default 的一定不是 dialog，fire-and-forget 正确应答是 ack，与 TUI 分支先例一致）。
+    logger.warn(
+      "[subagents] defaultDialogForward: unknown method",
+      { detail: { method: req.method, id: req.id } },
+    );
+    return { ack: true };
   }
+  return forwarder(req, ctx.ui);
 }

package/src/execution/ui-request-queue.ts

@@ -19,11 +19,12 @@ import type { UiRequest } from "./dialog-queue.ts";
 // 类型再导出：dialog-queue.ts 是 UiRequest/UiResponse/UiRequestHandler 的规范来源，
 // 本模块再导出供测试 import（避免测试直接依赖 dialog-queue 内部实现）。
 export type { UiRequest, UiRequestHandler, UiResponse } from "./dialog-queue.ts";
-import type { SessionRunnerContext } from "./session-runner.ts";
-import type { ExtensionUiRequest } from "./spawn-event-adapter.ts";
-import { respond } from "./stdin-writer.ts";
+import type { SessionRunnerContext } from "./engine/engines/pi/session-runner.ts";
+import type { ExtensionUiRequest } from "./engine/engines/pi/spawn-event-adapter.ts";
+import { respond } from "./engine/engines/pi/stdin-writer.ts";
 import { parseChannel } from "./ui-channels.ts";
 import { notifyMissingHandlerGlobal } from "./ui-request-observability.ts";
+import { toErrorMessage } from "../core/error-message.ts";
 
 const logger = getLogger("subagents");
 
@@ -62,7 +63,7 @@ export function createUiRequestQueue(
     // .finally 照常释放 processing 推进队列（单个请求失败不阻塞后续 UI 请求）。
     handleUiRequest(child, id, request, ctx, signal)
       .catch((err: unknown) => {
-        const m = err instanceof Error ? err.message : String(err);
+        const m = toErrorMessage(err);
         logger.error(`[subagents] ui request ${id} (${request.method}) failed unexpectedly: ${m}`);
       })
       .finally(() => {
@@ -157,28 +158,58 @@ async function handleUiRequest(
     // [R3] 子进程已退出，跳过写入
     if (signal?.aborted) return;
     logger.error("[subagents] uiRequestHandler threw", {
-      detail: err instanceof Error ? err.message : String(err),
+      detail: toErrorMessage(err),
     });
     respond(child, id, { cancelled: true }, signal);
   }
 }
 
+/** method-specific 字段值守卫（与原 inline 判定 1:1：`typeof === "string"` / `"number"` / `Array.isArray`）。 */
+function isStringValue(value: unknown): boolean {
+  return typeof value === "string";
+}
+
+function isNumberValue(value: unknown): boolean {
+  return typeof value === "number";
+}
+
+function isArrayValue(value: unknown): boolean {
+  return Array.isArray(value);
+}
+
+/** extractMethodFields 字段复制规格表（与 Pi rpc-types.ts 1:1，序 = 原复制序）。
+ *  guard = in 命中后的值类型守卫（验不过不复制）；null = 仅 in 检查直赋
+ *（原 statusText/widgetLines/widgetPlacement 无类型守卫的形态）。 */
+const METHOD_FIELD_COPY_SPECS: ReadonlyArray<{
+  key: string;
+  guard: ((value: unknown) => boolean) | null;
+}> = [
+  { key: "title", guard: isStringValue },
+  { key: "options", guard: isArrayValue },
+  { key: "message", guard: isStringValue },
+  { key: "placeholder", guard: isStringValue },
+  { key: "prefill", guard: isStringValue },
+  { key: "notifyType", guard: isStringValue },
+  { key: "statusKey", guard: isStringValue },
+  { key: "statusText", guard: null },
+  { key: "widgetKey", guard: isStringValue },
+  { key: "widgetLines", guard: null },
+  { key: "widgetPlacement", guard: null },
+  { key: "text", guard: isStringValue },
+  { key: "timeout", guard: isNumberValue },
+];
+
 /** 从 ExtensionUiRequest 提取 method-specific 字段到 UiRequest（与 Pi rpc-types.ts 1:1）。
- *  按 method 变体类型安全地复制对应字段；缺失字段不复制（保持 UiRequest 可选）。 */
+ *  按 method 变体类型安全地复制对应字段；缺失字段不复制（保持 UiRequest 可选）。
+ *  断言说明：source/out 的 Record 断言仅为动态 key 索引，复制经 in 检查 + guard 运行时守卫。 */
 function extractMethodFields(req: ExtensionUiRequest): Partial<UiRequest> {
   const out: Partial<UiRequest> = {};
-  if ("title" in req && typeof req.title === "string") out.title = req.title;
-  if ("options" in req && Array.isArray(req.options)) out.options = req.options;
-  if ("message" in req && typeof req.message === "string") out.message = req.message;
-  if ("placeholder" in req && typeof req.placeholder === "string") out.placeholder = req.placeholder;
-  if ("prefill" in req && typeof req.prefill === "string") out.prefill = req.prefill;
-  if ("notifyType" in req && typeof req.notifyType === "string") out.notifyType = req.notifyType;
-  if ("statusKey" in req && typeof req.statusKey === "string") out.statusKey = req.statusKey;
-  if ("statusText" in req) out.statusText = req.statusText;
-  if ("widgetKey" in req && typeof req.widgetKey === "string") out.widgetKey = req.widgetKey;
-  if ("widgetLines" in req) out.widgetLines = req.widgetLines;
-  if ("widgetPlacement" in req) out.widgetPlacement = req.widgetPlacement;
-  if ("text" in req && typeof req.text === "string") out.text = req.text;
-  if ("timeout" in req && typeof req.timeout === "number") out.timeout = req.timeout;
+  const source: Record<string, unknown> = req;
+  for (const { key, guard } of METHOD_FIELD_COPY_SPECS) {
+    if (!(key in source)) continue;
+    const value = source[key];
+    if (guard !== null && !guard(value)) continue;
+    (out as Record<string, unknown>)[key] = value;
+  }
   return out;
 }