diff --git a/scripts/deadcode-exports.baseline.mjs b/scripts/deadcode-exports.baseline.mjs
index 61bd291939b8..2075ff588792 100644
--- a/scripts/deadcode-exports.baseline.mjs
+++ b/scripts/deadcode-exports.baseline.mjs
@@ -4787,13 +4787,6 @@ export const KNIP_UNUSED_EXPORT_BASELINE = [
   "src/plugins/runtime/runtime-taskflow.types.ts: BoundTaskFlowTaskRunResult",
   "src/plugins/runtime/runtime-taskflow.types.ts: ManagedTaskFlowCreateParams",
   "src/plugins/runtime/runtime-taskflow.types.ts: ManagedTaskFlowMutationErrorCode",
-  "src/plugins/runtime/runtime-tasks.ts: BoundTaskFlowsRuntime",
-  "src/plugins/runtime/runtime-tasks.ts: BoundTaskRunsRuntime",
-  "src/plugins/runtime/runtime-tasks.ts: createRuntimeTaskFlows",
-  "src/plugins/runtime/runtime-tasks.ts: createRuntimeTaskRuns",
-  "src/plugins/runtime/runtime-tasks.ts: PluginRuntimeTaskFlows",
-  "src/plugins/runtime/runtime-tasks.ts: PluginRuntimeTaskRuns",
-  "src/plugins/runtime/runtime-tasks.ts: PluginRuntimeTasks",
   "src/plugins/runtime/runtime-tasks.types.ts: TaskFlowView",
   "src/plugins/runtime/runtime-tasks.types.ts: TaskRunAggregateSummary",
   "src/plugins/runtime/runtime-tasks.types.ts: TaskRunDetail",
diff --git a/src/plugins/runtime/runtime-tasks.test.ts b/src/plugins/runtime/runtime-tasks.test.ts
index 70565a1344e7..0ff42d1369d4 100644
--- a/src/plugins/runtime/runtime-tasks.test.ts
+++ b/src/plugins/runtime/runtime-tasks.test.ts
@@ -10,7 +10,7 @@ import {
   resetRuntimeTaskTestState,
 } from "./runtime-task-test-harness.js";
 import { createRuntimeTaskFlow } from "./runtime-taskflow.js";
-import { createRuntimeTaskFlows, createRuntimeTaskRuns } from "./runtime-tasks.js";
+import { createRuntimeTasks } from "./runtime-tasks.js";
 
 const runtimeTaskMocks = getRuntimeTaskMocks();
 
@@ -48,23 +48,26 @@ describe("runtime tasks", () => {
   });
 
   it("exposes canonical task and TaskFlow DTOs without leaking raw registry fields", () => {
-    const legacyTaskFlow = createRuntimeTaskFlow().bindSession({
+    const runtimeTasks = createRuntimeTasks({
+      legacyTaskFlow: createRuntimeTaskFlow(),
+    });
+    const legacyTaskFlow = runtimeTasks.managedFlows.bindSession({
       sessionKey: "agent:main:main",
       requesterOrigin: {
         channel: "telegram",
         to: "telegram:123",
       },
     });
-    const taskFlows = createRuntimeTaskFlows().bindSession({
+    const taskFlows = runtimeTasks.flows.bindSession({
       sessionKey: "agent:main:main",
     });
-    const taskRuns = createRuntimeTaskRuns().bindSession({
+    const taskRuns = runtimeTasks.runs.bindSession({
       sessionKey: "agent:main:main",
     });
-    const otherTaskFlows = createRuntimeTaskFlows().bindSession({
+    const otherTaskFlows = runtimeTasks.flows.bindSession({
       sessionKey: "agent:main:other",
     });
-    const otherTaskRuns = createRuntimeTaskRuns().bindSession({
+    const otherTaskRuns = runtimeTasks.runs.bindSession({
       sessionKey: "agent:main:other",
     });
 
@@ -145,10 +148,13 @@ describe("runtime tasks", () => {
   });
 
   it("maps task cancellation results onto canonical task DTOs", async () => {
-    const legacyTaskFlow = createRuntimeTaskFlow().bindSession({
+    const runtimeTasks = createRuntimeTasks({
+      legacyTaskFlow: createRuntimeTaskFlow(),
+    });
+    const legacyTaskFlow = runtimeTasks.managedFlows.bindSession({
       sessionKey: "agent:main:main",
     });
-    const taskRuns = createRuntimeTaskRuns().bindSession({
+    const taskRuns = runtimeTasks.runs.bindSession({
       sessionKey: "agent:main:main",
     });
 
@@ -191,10 +197,13 @@ describe("runtime tasks", () => {
   });
 
   it("routes runtime task cancellation through the detached task runtime seam", async () => {
-    const legacyTaskFlow = createRuntimeTaskFlow().bindSession({
+    const runtimeTasks = createRuntimeTasks({
+      legacyTaskFlow: createRuntimeTaskFlow(),
+    });
+    const legacyTaskFlow = runtimeTasks.managedFlows.bindSession({
       sessionKey: "agent:main:main",
     });
-    const taskRuns = createRuntimeTaskRuns().bindSession({
+    const taskRuns = runtimeTasks.runs.bindSession({
       sessionKey: "agent:main:main",
     });
 
@@ -240,10 +249,13 @@ describe("runtime tasks", () => {
   });
 
   it("does not allow cross-owner task cancellation or leak task details", async () => {
-    const legacyTaskFlow = createRuntimeTaskFlow().bindSession({
+    const runtimeTasks = createRuntimeTasks({
+      legacyTaskFlow: createRuntimeTaskFlow(),
+    });
+    const legacyTaskFlow = runtimeTasks.managedFlows.bindSession({
       sessionKey: "agent:main:main",
     });
-    const otherTaskRuns = createRuntimeTaskRuns().bindSession({
+    const otherTaskRuns = runtimeTasks.runs.bindSession({
       sessionKey: "agent:main:other",
     });
 
diff --git a/src/plugins/runtime/runtime-tasks.ts b/src/plugins/runtime/runtime-tasks.ts
index c6eab5c4b54b..ace94235b74a 100644
--- a/src/plugins/runtime/runtime-tasks.ts
+++ b/src/plugins/runtime/runtime-tasks.ts
@@ -31,13 +31,6 @@ import type {
   TaskFlowDetail,
   TaskRunCancelResult,
 } from "./runtime-tasks.types.js";
-export type {
-  BoundTaskFlowsRuntime,
-  BoundTaskRunsRuntime,
-  PluginRuntimeTaskFlows,
-  PluginRuntimeTaskRuns,
-  PluginRuntimeTasks,
-} from "./runtime-tasks.types.js";
 
 function assertSessionKey(sessionKey: string | undefined, errorMessage: string): string {
   const normalized = sessionKey?.trim();
@@ -176,7 +169,7 @@ function createBoundTaskFlowsRuntime(params: {
   };
 }
 
-export function createRuntimeTaskRuns(): PluginRuntimeTaskRuns {
+function createRuntimeTaskRuns(): PluginRuntimeTaskRuns {
   return {
     bindSession: (params) =>
       createBoundTaskRunsRuntime({
@@ -194,7 +187,7 @@ export function createRuntimeTaskRuns(): PluginRuntimeTaskRuns {
   };
 }
 
-export function createRuntimeTaskFlows(): PluginRuntimeTaskFlows {
+function createRuntimeTaskFlows(): PluginRuntimeTaskFlows {
   return {
     bindSession: (params) =>
       createBoundTaskFlowsRuntime({