@zhushanwen/pi-subagent-workflow 8.7.0 → 8.8.0

package/src/interface/__tests__/tool-workflow-run-builtin-name.test.ts

@@ -0,0 +1,216 @@
+/**
+ * C5③：actionRun 放开内置 workflow 名（convergence D-4 pi 半边）。
+ *
+ * 解析序：registry.get(name)（内置/已保存 workflow 名，按 tmp>project>user>npm
+ * 优先级合并）→ 未命中 registry.getPath(name)（绝对路径 + ~/ 展开）→ 两者都 miss
+ * 走原 not_found 报错（文案不变）。严格超集：现有路径用法零变化。
+ *
+ * 三视角：
+ * - 使用者（黑盒）：run {"action":"run","name":"chain"} 直接可跑（内置名新能力）；
+ *   传路径仍可跑（现行为）；两者都 miss 的报错与改造前逐字一致。
+ * - 构建者（白盒）：解析序 get→getPath、get 未命中才穿透到 getPath。
+ * - 观察者（真 registry）：WorkflowScriptRegistryImpl + fixture 目录经真实
+ *   discoverWorkflows 按名命中（生产 lookup 链）。
+ *
+ * mock 策略：lifecycle 深路径 stub（runWorkflow/abortRun 为 vi.fn——不起真 Worker，
+ * 只验证 run 启动面的脚本解析与 spec 组装）。框架：vitest（禁 node:test）。
+ */
+import { mkdtempSync, readdirSync, rmSync, writeFileSync, mkdirSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+/** 桩化 lifecycle——runWorkflow/abortRun 为 vi.fn，不起真 Worker（只测解析面）。 */
+vi.mock("@zhushanwen/subagent-core/orchestration/lifecycle.ts", () => ({
+  runWorkflow: vi.fn(),
+  abortRun: vi.fn(),
+}));
+
+// 被 mock 的模块——import 路径与被测源文件（tool-workflow.ts 深路径 import）一致
+import { runWorkflow } from "@zhushanwen/subagent-core/orchestration/lifecycle.ts";
+import { actionRun } from "../tool-workflow.ts";
+import { WorkflowScriptRegistryImpl } from "@zhushanwen/subagent-core";
+
+// ── fixture：可用 workflow 脚本（@pi-meta 新格式，无参数声明） ──
+
+const CHAIN_META = `/* @pi-meta
+name: chain
+description: 内置名测试用三步链
+phases: [a, b]
+*/
+const agent = require("./agent");
+agent("w", { task: $ARGS.task });
+`;
+
+/** fake registry 的最小 WorkflowScript stub。 */
+function makeScript(name: string, path: string, parameters?: object) {
+  return {
+    name,
+    path,
+    available: true,
+    sourceCode: `// ${name}`,
+    meta: { description: `${name} workflow`, parameters },
+    toExecutable: () => `// ${name}`,
+  };
+}
+
+/** 最小 deps stub（runWorkflow 已 mock；store 只消费 stateFilePath）。 */
+function makeDeps(registry: Record<string, unknown>): Record<string, unknown> {
+  return {
+    runs: new Map(),
+    store: { stateFilePath: (id: string) => `/tmp/state/${id}.jsonl` },
+    registry,
+  };
+}
+
+beforeEach(() => {
+  vi.mocked(runWorkflow).mockReset();
+  vi.mocked(runWorkflow).mockResolvedValue("run-id-1");
+});
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+describe("C5③ run 内置名（fake registry）", () => {
+  it("run 传内置名 → registry.get 命中即启动（runWorkflow 收到该脚本，getPath 不被调用）", async () => {
+    const chain = makeScript("chain", "/builtin/workflows/chain.js");
+    const registry = {
+      get: vi.fn().mockResolvedValue(chain),
+      getPath: vi.fn().mockResolvedValue(undefined),
+      loadAll: vi.fn().mockResolvedValue([chain]),
+    };
+    const result = await actionRun(
+      { action: "run", name: "chain" } as never,
+      makeDeps(registry) as never,
+      undefined,
+    );
+
+    expect(registry.get).toHaveBeenCalledWith("chain");
+    expect(registry.getPath).not.toHaveBeenCalled();
+    expect(vi.mocked(runWorkflow)).toHaveBeenCalledTimes(1);
+    // spec 组装：scriptName/scriptPath 来自按名命中的脚本
+    const spec = vi.mocked(runWorkflow).mock.calls[0][0] as Record<string, unknown>;
+    expect(spec.scriptName).toBe("chain");
+    expect(spec.scriptPath).toBe("/builtin/workflows/chain.js");
+    expect(result.content[0]?.text).toContain("Started workflow 'chain'");
+    expect(result.details).toMatchObject({ action: "run", status: "running", name: "chain" });
+  });
+
+  it("严格超集：get 未命中的路径名 → 穿透 getPath（现有路径用法零变化）", async () => {
+    const byPath = makeScript("demo", "/abs/demo.js");
+    const registry = {
+      get: vi.fn().mockResolvedValue(undefined),
+      getPath: vi.fn().mockResolvedValue(byPath),
+      loadAll: vi.fn().mockResolvedValue([byPath]),
+    };
+    await actionRun(
+      { action: "run", name: "/abs/demo.js" } as never,
+      makeDeps(registry) as never,
+      undefined,
+    );
+
+    expect(registry.get).toHaveBeenCalledWith("/abs/demo.js");
+    expect(registry.getPath).toHaveBeenCalledWith("/abs/demo.js");
+    expect(vi.mocked(runWorkflow)).toHaveBeenCalledTimes(1);
+    const spec = vi.mocked(runWorkflow).mock.calls[0][0] as Record<string, unknown>;
+    expect(spec.scriptName).toBe("demo");
+  });
+
+  it("get 命中 available:false 的 stub → 不启动，走 not_found 报错（W4c 口径不回退）", async () => {
+    const ghost = { ...makeScript("ghost", "/builtin/ghost.js"), available: false };
+    const registry = {
+      get: vi.fn().mockResolvedValue(ghost),
+      getPath: vi.fn().mockResolvedValue(undefined),
+      loadAll: vi.fn().mockResolvedValue([]),
+    };
+    await expect(
+      actionRun(
+        { action: "run", name: "ghost" } as never,
+        makeDeps(registry) as never,
+        undefined,
+      ),
+    ).rejects.toThrow(/Workflow 'ghost' not found\./);
+    expect(vi.mocked(runWorkflow)).not.toHaveBeenCalled();
+  });
+
+  it("两者都 miss → 报错文案与改造前一致（含建议清单与 location 指引）", async () => {
+    const registry = {
+      get: vi.fn().mockResolvedValue(undefined),
+      getPath: vi.fn().mockResolvedValue(undefined),
+      loadAll: vi.fn().mockResolvedValue([makeScript("chain", "/builtin/workflows/chain.js")]),
+    };
+    await expect(
+      actionRun(
+        { action: "run", name: "no-such" } as never,
+        makeDeps(registry) as never,
+        undefined,
+      ),
+    ).rejects.toThrow(
+      "Workflow 'no-such' not found. Available:\n  - chain: chain workflow\nUse <location> from <available_workflows> for the absolute .js path.",
+    );
+  });
+});
+
+describe("C5③ run 内置名（真 registry：WorkflowScriptRegistryImpl + 真实发现链）", () => {
+  let fixtureDir: string;
+
+  beforeEach(() => {
+    fixtureDir = mkdtempSync(join(tmpdir(), "c5-run-builtin-"));
+    // WorkflowScanConfig 布局：projectDir = <fixture>/ws/.pi/workflows（反推 workspaceRoot）
+    const projectDir = join(fixtureDir, "ws", ".pi", "workflows");
+    mkdirSync(projectDir, { recursive: true });
+    writeFileSync(join(projectDir, "chain.js"), CHAIN_META, "utf-8");
+  });
+
+  afterEach(() => {
+    rmSync(fixtureDir, { recursive: true, force: true });
+  });
+
+  it("get('chain') 经真实 discoverWorkflows 命中 fixture 脚本 → actionRun 按名启动成功", async () => {
+    const registry = new WorkflowScriptRegistryImpl({
+      projectDir: join(fixtureDir, "ws", ".pi", "workflows"),
+      userDir: join(fixtureDir, "user", "workflows"),
+      tmpDir: join(fixtureDir, "ws", ".pi", "workflows", ".tmp"),
+      npmDirs: [],
+    });
+    // 前置自检：fixture 布局可被扫描（隔离 config 下 hostRoots 为空、仅 project 根命中）
+    const all = await registry.loadAll();
+    expect(all.filter((w) => w.available).map((w) => w.name)).toContain("chain");
+
+    const result = await actionRun(
+      { action: "run", name: "chain" } as never,
+      makeDeps(registry as unknown as Record<string, unknown>) as never,
+      undefined,
+    );
+
+    expect(vi.mocked(runWorkflow)).toHaveBeenCalledTimes(1);
+    const spec = vi.mocked(runWorkflow).mock.calls[0][0] as Record<string, unknown>;
+    expect(spec.scriptName).toBe("chain");
+    expect(String(spec.scriptPath)).toContain("chain.js");
+    expect(result.content[0]?.text).toContain("Started workflow 'chain'");
+  });
+
+  it("真 registry 下未知名（无路径形态）→ not_found（含 fixture 内可用清单）", async () => {
+    const registry = new WorkflowScriptRegistryImpl({
+      projectDir: join(fixtureDir, "ws", ".pi", "workflows"),
+      userDir: join(fixtureDir, "user", "workflows"),
+      tmpDir: join(fixtureDir, "ws", ".pi", "workflows", ".tmp"),
+      npmDirs: [],
+    });
+    await expect(
+      actionRun(
+        { action: "run", name: "not-a-workflow" } as never,
+        makeDeps(registry as unknown as Record<string, unknown>) as never,
+        undefined,
+      ),
+    ).rejects.toThrow(/Workflow 'not-a-workflow' not found\./);
+    expect(vi.mocked(runWorkflow)).not.toHaveBeenCalled();
+  });
+
+  it("fixture 卫生断言：fixture 目录无其他 .js 泄漏（避免 discoverWorkflows 误扫）", () => {
+    const projectDir = join(fixtureDir, "ws", ".pi", "workflows");
+    expect(readdirSync(projectDir).filter((f) => f.endsWith(".js"))).toEqual(["chain.js"]);
+  });
+});

package/src/interface/__tests__/tool-workflow-script-generate.test.ts

@@ -1,8 +1,13 @@
 /**
- * actionGenerate 行为测试（m0 wave / TC1-TC7 + [P-generate-roundtrip]）
+ * actionGenerate 行为测试（m0 wave / TC1-TC7 + [P-generate-roundtrip]；C5② 改接 core 管线）
  *
- * mock node:fs（mkdirSync/writeFileSync）避免真实落盘 .pi/workflows/.tmp/。
- * parseResourceMetaDetailed 真实调用（不 mock m1）——round-trip 探针必须用真实 IF2。
+ * C5② 起五道闸校验 + tmp 写盘在 core generateWorkflowScript（barrel import）——本测试
+ * 验证宿主契约层（结构化结果 → execute-throw 转换、signal aborted、成功文案）+ 经
+ * 真实 core 管线的校验行为回归。
+ *
+ * mock node:fs（mkdirSync/writeFileSync）避免真实落盘 .pi/workflows/.tmp/（builtin
+ * 模块 mock 对 core 管线内的写盘同样生效）。save/delete 走 barrel mock（importActual
+ * 展开覆写，其余 barrel 面（含 generateWorkflowScript）保持真实）。
  *
  * 框架：vitest（禁 node:test）。
  */
@@ -11,14 +16,20 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { actionGenerate, type ScriptParams, type TextContent, registerWorkflowScriptTool } from "../tool-workflow-script.ts";
-import { deleteWorkflow, saveWorkflow } from "@zhushanwen/subagent-core/orchestration/workflow-files.ts";
+import { deleteWorkflow, saveWorkflow } from "@zhushanwen/subagent-core";
 
-vi.mock("node:fs", () => ({
+// node:fs 只覆写两个写盘函数、其余保持真实——C5② 后被测链经 barrel 拉起完整 core
+// 依赖图（importActual），core 模块对 existsSync/statSync 等的消费不能被 2 函数工厂截断
+vi.mock("node:fs", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("node:fs")>()),
   mkdirSync: vi.fn(),
   writeFileSync: vi.fn(),
 }));
 
-vi.mock("@zhushanwen/subagent-core/orchestration/workflow-files.ts", () => ({
+// C5②：被测模块经 barrel 消费 save/delete/generateWorkflowScript——mock 挂 barrel，
+// importActual 展开保持 generateWorkflowScript 真实（校验管线是被测回归面）
+vi.mock("@zhushanwen/subagent-core", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@zhushanwen/subagent-core")>()),
   saveWorkflow: vi.fn(),
   deleteWorkflow: vi.fn(),
 }));

package/src/interface/__tests__/tool-workflow-throw-paths.test.ts

@@ -42,11 +42,13 @@ function captureTool(deps: unknown, reentryRef: ReentryGuardRef): CapturedTool {
   return tools[0];
 }
 
-/** 最小 LauncherDeps stub：被测路径只触 registry / runs。 */
+/** 最小 LauncherDeps stub：被测路径只触 registry / runs（C5③ 起 actionRun 先查
+ *  registry.get 再 registry.getPath——两查都须在 stub 面）。 */
 function makeDeps(overrides: Record<string, unknown> = {}): Record<string, unknown> {
   return {
     runs: new Map(),
     registry: {
+      get: vi.fn().mockResolvedValue(undefined),
       getPath: vi.fn().mockResolvedValue(undefined),
       loadAll: vi.fn().mockResolvedValue([]),
     },
@@ -84,6 +86,7 @@ describe("W4b: workflow tool 错误路径 throw 语义", () => {
     // （W4b verifier 探针实测复现）。registry 层真行为见 config-loader.ts:143-151。
     const deps = makeDeps({
       registry: {
+        get: vi.fn().mockResolvedValue(undefined),
         getPath: vi.fn().mockResolvedValue({
           name: "ghost-wf",
           path: "/tmp/no-such-workflow.js",
@@ -117,6 +120,7 @@ describe("W4b: workflow tool 错误路径 throw 语义", () => {
   it("平铺检测：args 子字段提到顶层 → throw 'Detected ... at top level'（含 Correct 正例）", async () => {
     const deps = makeDeps({
       registry: {
+        get: vi.fn().mockResolvedValue(undefined),
         getPath: vi.fn().mockResolvedValue(
           makeScript({
             type: "object",
@@ -143,6 +147,7 @@ describe("W4b: workflow tool 错误路径 throw 语义", () => {
   it("slug 护栏：slug 超 SLUG_MAX_LENGTH → throw 'slug exceeds ...'（运行时第二道）", async () => {
     const deps = makeDeps({
       registry: {
+        get: vi.fn().mockResolvedValue(undefined),
         getPath: vi.fn().mockResolvedValue(
           makeScript({
             type: "object",
@@ -167,6 +172,37 @@ describe("W4b: workflow tool 错误路径 throw 语义", () => {
     );
   });
 
+  it("OR-1 入口校验：time 超 setTimeout 上限 → throw 含上限 2147483647 与实际值，run 未启动", async () => {
+    const deps = makeDeps({
+      registry: {
+        get: vi.fn().mockResolvedValue(undefined),
+        getPath: vi.fn().mockResolvedValue(
+          makeScript({
+            type: "object",
+            properties: { task: { type: "string" } },
+            required: ["task"],
+          }),
+        ),
+      },
+    });
+    const tool = captureTool(deps, { isProcessing: false });
+    // LLM 对「跑久一点」完全可能生成 1e12——超 2^31-1 的典型形态（schema Type.Number
+    // 直通无上界，用户入口 fail-fast 不依赖 lifecycle 内层 assertSafeTimerDelay）
+    await expect(
+      tool.execute(
+        "id",
+        { action: "run", name: "/abs/demo-wf.js", args: { task: "do work" }, time: 1_000_000_000_000 },
+        undefined,
+        undefined,
+        {},
+      ),
+    ).rejects.toThrow(
+      "time budget 1000000000000 ms exceeds the maximum of 2147483647 ms (~24.8 days). Retry with a smaller \"time\", or omit it for unlimited.",
+    );
+    // fail-fast 于 runWorkflow 之前：runs 无条目（abortRun not found 语义保持）
+    expect((deps.runs as Map<string, unknown>).size).toBe(0);
+  });
+
   it("throw 后 reentry guard 经 finally 正常释放（成功路径回归）", async () => {
     // abort not_found throw 穿透 execute try/finally：guard 必须复位，否则后续命令全部 busy
     const guard: ReentryGuardRef = { isProcessing: false };

package/src/interface/bg-notify-render.ts

@@ -1,4 +1,4 @@
-// src/tui/bg-notify-render.ts
+// src/interface/bg-notify-render.ts
 //
 // background 完成通知的对话流渲染器。
 // pi.registerMessageRenderer("subagent-bg-notify", ...) 注册。
@@ -27,7 +27,7 @@ import { deriveOutcome } from "@zhushanwen/subagent-core/execution/execution-rec
 import { CLOSED_REASONS } from "@zhushanwen/subagent-core/execution/types.ts";
 import type { ClosedReason, ExecutionOutcome } from "@zhushanwen/subagent-core/execution/types.ts";
 import {
-  firstLine,
+  firstLineSanitized,
   padToVisible,
   shortId,
   statusGlyph,
@@ -66,8 +66,6 @@ interface BgNotifyRecord {
   model?: string;
   result?: string;
   error?: string;
-  /** 对话轮次计数（仅 idle 有意义）。 */
-  round?: number;
   /** [MF#1] worktree background 完成通知携带的 patch 文件路径。 */
   patchFile?: string;
 }
@@ -119,10 +117,8 @@ export function renderBgNotifyMessage(
  * 它是全局重置会清除背景色（背景框内省略号后失去背景的根因）。
  * 本组件在施加背景前，把行内全局 reset 替换为只重置前景/粗体/斜体/下划线
  * 的精确 reset（不含背景 `\x1b[49m`），确保背景不断裂。
- *
- * 导出以便其他 message renderer 复用边框样式。
  */
-export class BorderedBgBox implements Component {
+class BorderedBgBox implements Component {
   private lines: string[];
   private t: ThemeLike;
   private cache: { width: number; lines: string[] } | undefined;
@@ -319,13 +315,7 @@ function extractBgNotifyRecord(details: unknown): BgNotifyRecord | undefined {
     error: typeof d.error === "string" ? d.error : undefined,
     closedReason: toClosedReason(d.closedReason),
     outcome: toOutcome(d.outcome),
-    round: typeof d.round === "number" ? d.round : undefined,
     // [MF#1] 提取 patchFile（worktree background 完成通知携带）。
     patchFile: typeof d.patchFile === "string" ? d.patchFile : undefined,
   };
 }
-
-// firstLine 取首非空行（共享自 ./format.ts）；本文件额外压 \r\t 防多行展开。
-function firstLineSanitized(text: string): string {
-  return firstLine(text).replace(/[\r\t]+/g, " ");
-}

package/src/interface/command-actions.ts

@@ -22,21 +22,10 @@ export type SubagentRpcAction =
 /** /workflows RPC action 判别联合。 */
 export type WorkflowRpcAction =
   | { action: "abort"; runId: string }
-  | { action: "lifecycle-missing-id"; verb: LifecycleVerb }
+  | { action: "lifecycle-missing-id"; verb: "abort" }
   | { action: "lifecycle-removed"; verb: "pause" | "resume" }
   | { action: "noop" };
 
-/** workflow lifecycle verb 类型。 */
-type LifecycleVerb = "abort";
-
-/** workflow lifecycle verb 集合。 */
-const LIFECYCLE_VERBS: ReadonlySet<LifecycleVerb> = new Set(["abort"]);
-
-/** verb 是否为 lifecycle action（类型守卫，收窄到 LifecycleVerb）。 */
-function isLifecycleVerb(verb: string): verb is LifecycleVerb {
-  return LIFECYCLE_VERBS.has(verb as LifecycleVerb);
-}
-
 /**
  * 已移除的 lifecycle verb 集合（pause/resume——run 一次性生命周期化后删除，
  * 解析为 lifecycle-removed 提示，而非 unknown noop）。
@@ -152,9 +141,10 @@ export function parseWorkflowRpcCommand(argsStr: string): WorkflowRpcAction {
   if (isRemovedLifecycleVerb(verb)) {
     return { action: "lifecycle-removed", verb };
   }
-  if (isLifecycleVerb(verb)) {
-    if (!runId) return { action: "lifecycle-missing-id", verb };
-    return { action: verb, runId };
+  // abort 是 lifecycle verb 单成员（pause/resume 已移除，见上），直判即可，无需集合机件
+  if (verb === "abort") {
+    if (!runId) return { action: "lifecycle-missing-id", verb: "abort" };
+    return { action: "abort", runId };
   }
   return { action: "noop" };
 }

package/src/interface/commands.ts

@@ -207,7 +207,7 @@ function sortedRuns(runs: Map<string, WorkflowRun>): WorkflowRun[] {
  * 打开 WorkflowsView（三级导航 TUI），注入 lifecycle ViewActions。
  *
  * ViewActions 通过 deps 调 lifecycle（abort），与 view 解耦——
- * view 单测可注入 mock actions（见 workflows-view.test.ts）。
+ * view 单测可注入 mock actions（见 views/__tests__/WorkflowsView-signature.test.ts）。
  */
 async function openView(
   run: WorkflowRun,

package/src/interface/format.ts

@@ -1,4 +1,4 @@
-// src/tui/format.ts
+// src/interface/format.ts
 //
 // 纯格式化函数.零 Pi 依赖、零 runtime 依赖,可单测.
 //
@@ -217,9 +217,8 @@ export function sanitizeLabel(label: string): string {
 /**
  * 取文本首个非空行(多行压成首行).
  *
- * 仅做"取首行"——不 sanitize.三处调用方的 sanitize 末步不同
- * (tool-render 调 sanitizeLabel、bg-notify-render 压 \r\t、list-view 不处理),
- * 故共享此基础函数,各自按需 wrap.
+ * 仅做"取首行"——不 sanitize.需要压平残余 \r/\t 的调用方用 firstLineSanitized
+ * (下方);list-component 直接消费本函数(标题/错误行由外层 truncLine 再压平).
  *
  *   firstLine("a\nb\nc") → "a"
  *   firstLine("\n\nb") → "b"
@@ -230,6 +229,18 @@ export function firstLine(text?: string): string {
   return text.split("\n").find((l) => l.trim())?.trim() ?? "";
 }
 
+/**
+ * firstLine + sanitize 组合:取首个非空行后压平残余 \r/\t.
+ *
+ * tool-render(content 错误回显)与 bg-notify-render(结果/错误正文)共用,
+ * 取代两侧各自维护的 wrapper.tool-render 旧版走 sanitizeLabel(\t→两空格)、
+ * bg-notify-render 旧版压 \r\t 为单空格——差异无测试钉住,统一取
+ * sanitizeLabel 口径(与 eventLog 行处理一致).
+ */
+export function firstLineSanitized(text?: string): string {
+  return sanitizeLabel(firstLine(text));
+}
+
 /**
  * 从 renderCall/execute 的 unknown args 安全提取 agent 名.
  * 类型守卫窄化(替代 `as { agent?: string }` 全可选断言).

package/src/interface/gui-mappers.ts

@@ -28,6 +28,22 @@ export function toGuiCtx(ctx: { mode: GuiContext["mode"]; hasUI: boolean } | und
 /** TreeItem.status 枚举（协议三态）。 */
 type TreeStatus = NonNullable<TreeItem["status"]>;
 
+/**
+ * 状态字符串是否为失败态（mapRunStatus/mapRunIcon 共享谓词——两映射仅返回值形态不同，
+ * 关键词表必须同步演化，抽单点防双写漂移）。入参须已 toLowerCase。
+ */
+function isFailedStatus(s: string): boolean {
+  return (
+    s.includes("failed") ||
+    s.includes("abort") ||
+    s.includes("cancel") ||
+    s.includes("crash") ||
+    s.includes("error") ||
+    s.includes("budget") ||
+    s.includes("time_limited")
+  );
+}
+
 /**
  * 把 workflow/subagent 状态字符串映射到 list-tree 的三态 status。
  *
@@ -42,17 +58,7 @@ type TreeStatus = NonNullable<TreeItem["status"]>;
 export function mapRunStatus(status: string): TreeStatus {
   const s = status.toLowerCase();
   if (s.includes("running")) return "running";
-  if (
-    s.includes("failed") ||
-    s.includes("abort") ||
-    s.includes("cancel") ||
-    s.includes("crash") ||
-    s.includes("error") ||
-    s.includes("budget") ||
-    s.includes("time_limited")
-  ) {
-    return "failed";
-  }
+  if (isFailedStatus(s)) return "failed";
   return "done";
 }
 
@@ -66,16 +72,6 @@ export function mapRunStatus(status: string): TreeStatus {
 export function mapRunIcon(status: string): TreeItemIcon {
   const s = status.toLowerCase();
   if (s.includes("running")) return "circle";
-  if (
-    s.includes("failed") ||
-    s.includes("abort") ||
-    s.includes("cancel") ||
-    s.includes("crash") ||
-    s.includes("error") ||
-    s.includes("budget") ||
-    s.includes("time_limited")
-  ) {
-    return "cross";
-  }
+  if (isFailedStatus(s)) return "cross";
   return "check";
 }