diff --git a/src/commands/doctor-workspace-status.test.ts b/src/commands/doctor-workspace-status.test.ts
index 0072309d7a9..c933572fc6c 100644
--- a/src/commands/doctor-workspace-status.test.ts
+++ b/src/commands/doctor-workspace-status.test.ts
@@ -13,7 +13,7 @@ const mocks = vi.hoisted(() => ({
   buildWorkspaceSkillStatus: vi.fn(),
   buildPluginStatusReport: vi.fn(),
   buildPluginCompatibilityWarnings: vi.fn(),
-  listFlowRecords: vi.fn<() => unknown[]>(() => []),
+  listTaskFlowRecords: vi.fn<() => unknown[]>(() => []),
   listTasksForFlowId: vi.fn<(flowId: string) => unknown[]>((_flowId: string) => []),
 }));
 
@@ -32,8 +32,8 @@ vi.mock("../plugins/status.js", () => ({
     mocks.buildPluginCompatibilityWarnings(...args),
 }));
 
-vi.mock("../tasks/flow-runtime-internal.js", () => ({
-  listFlowRecords: () => mocks.listFlowRecords(),
+vi.mock("../tasks/task-flow-runtime-internal.js", () => ({
+  listTaskFlowRecords: () => mocks.listTaskFlowRecords(),
 }));
 
 vi.mock("../tasks/runtime-internal.js", () => ({
@@ -58,7 +58,7 @@ async function runNoteWorkspaceStatusForTest(
     ...loadResult,
   });
   mocks.buildPluginCompatibilityWarnings.mockReturnValue(compatibilityWarnings);
-  mocks.listFlowRecords.mockReturnValue(opts?.flows ?? []);
+  mocks.listTaskFlowRecords.mockReturnValue(opts?.flows ?? []);
   mocks.listTasksForFlowId.mockImplementation((flowId: string) =>
     opts?.tasksByFlowId ? opts.tasksByFlowId(flowId) : [],
   );
diff --git a/src/commands/doctor-workspace-status.ts b/src/commands/doctor-workspace-status.ts
index eb5f440c964..250a7742a40 100644
--- a/src/commands/doctor-workspace-status.ts
+++ b/src/commands/doctor-workspace-status.ts
@@ -3,13 +3,13 @@ import { buildWorkspaceSkillStatus } from "../agents/skills-status.js";
 import { formatCliCommand } from "../cli/command-format.js";
 import type { OpenClawConfig } from "../config/config.js";
 import { buildPluginCompatibilityWarnings, buildPluginStatusReport } from "../plugins/status.js";
-import { listFlowRecords } from "../tasks/flow-runtime-internal.js";
 import { listTasksForFlowId } from "../tasks/runtime-internal.js";
+import { listTaskFlowRecords } from "../tasks/task-flow-runtime-internal.js";
 import { note } from "../terminal/note.js";
 import { detectLegacyWorkspaceDirs, formatLegacyWorkspaceWarning } from "./doctor-workspace.js";
 
 function noteFlowRecoveryHints() {
-  const suspicious = listFlowRecords().flatMap((flow) => {
+  const suspicious = listTaskFlowRecords().flatMap((flow) => {
     const tasks = listTasksForFlowId(flow.flowId);
     const findings: string[] = [];
     if (
diff --git a/src/commands/flows.ts b/src/commands/flows.ts
index eb1ee0efb28..a01b3bde47b 100644
--- a/src/commands/flows.ts
+++ b/src/commands/flows.ts
@@ -1,14 +1,14 @@
 import { loadConfig } from "../config/config.js";
 import { info } from "../globals.js";
 import type { RuntimeEnv } from "../runtime.js";
-import type { FlowRecord, FlowStatus } from "../tasks/flow-registry.types.js";
-import {
-  getFlowById,
-  listFlowRecords,
-  resolveFlowForLookupToken,
-} from "../tasks/flow-runtime-internal.js";
 import { listTasksForFlowId } from "../tasks/runtime-internal.js";
 import { cancelFlowById, getFlowTaskSummary } from "../tasks/task-executor.js";
+import type { TaskFlowRecord, TaskFlowStatus } from "../tasks/task-flow-registry.types.js";
+import {
+  getTaskFlowById,
+  listTaskFlowRecords,
+  resolveTaskFlowForLookupToken,
+} from "../tasks/task-flow-runtime-internal.js";
 import { isRich, theme } from "../terminal/theme.js";
 
 const ID_PAD = 10;
@@ -35,7 +35,7 @@ function shortToken(value: string | undefined, maxChars = ID_PAD): string {
   return truncate(trimmed, maxChars);
 }
 
-function formatFlowStatusCell(status: FlowStatus, rich: boolean) {
+function formatFlowStatusCell(status: TaskFlowStatus, rich: boolean) {
   const padded = status.padEnd(STATUS_PAD);
   if (!rich) {
     return padded;
@@ -55,7 +55,7 @@ function formatFlowStatusCell(status: FlowStatus, rich: boolean) {
   return theme.muted(padded);
 }
 
-function formatFlowRows(flows: FlowRecord[], rich: boolean) {
+function formatFlowRows(flows: TaskFlowRecord[], rich: boolean) {
   const header = [
     "TaskFlow".padEnd(ID_PAD),
     "Mode".padEnd(MODE_PAD),
@@ -84,7 +84,7 @@ function formatFlowRows(flows: FlowRecord[], rich: boolean) {
   return lines;
 }
 
-function formatFlowListSummary(flows: FlowRecord[]) {
+function formatFlowListSummary(flows: TaskFlowRecord[]) {
   const active = flows.filter(
     (flow) => flow.status === "queued" || flow.status === "running",
   ).length;
@@ -93,7 +93,7 @@ function formatFlowListSummary(flows: FlowRecord[]) {
   return `${active} active · ${blocked} blocked · ${cancelRequested} cancel-requested · ${flows.length} total`;
 }
 
-function summarizeWait(flow: FlowRecord): string {
+function summarizeWait(flow: TaskFlowRecord): string {
   if (flow.waitJson == null) {
     return "n/a";
   }
@@ -115,7 +115,7 @@ export async function flowsListCommand(
   runtime: RuntimeEnv,
 ) {
   const statusFilter = opts.status?.trim();
-  const flows = listFlowRecords().filter((flow) => {
+  const flows = listTaskFlowRecords().filter((flow) => {
     if (statusFilter && flow.status !== statusFilter) {
       return false;
     }
@@ -160,7 +160,7 @@ export async function flowsShowCommand(
   opts: { json?: boolean; lookup: string },
   runtime: RuntimeEnv,
 ) {
-  const flow = resolveFlowForLookupToken(opts.lookup);
+  const flow = resolveTaskFlowForLookupToken(opts.lookup);
   if (!flow) {
     runtime.error(`TaskFlow not found: ${opts.lookup}`);
     runtime.exit(1);
@@ -222,7 +222,7 @@ export async function flowsShowCommand(
 }
 
 export async function flowsCancelCommand(opts: { lookup: string }, runtime: RuntimeEnv) {
-  const flow = resolveFlowForLookupToken(opts.lookup);
+  const flow = resolveTaskFlowForLookupToken(opts.lookup);
   if (!flow) {
     runtime.error(`Flow not found: ${opts.lookup}`);
     runtime.exit(1);
@@ -242,6 +242,6 @@ export async function flowsCancelCommand(opts: { lookup: string }, runtime: Runt
     runtime.exit(1);
     return;
   }
-  const updated = getFlowById(flow.flowId) ?? result.flow ?? flow;
+  const updated = getTaskFlowById(flow.flowId) ?? result.flow ?? flow;
   runtime.log(`Cancelled ${updated.flowId} (${updated.syncMode}) with status ${updated.status}.`);
 }