diff --git a/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts b/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts
index 1cb859d..8630616 100644
--- a/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts
+++ b/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import type { ExtractContext, ExtractFn } from "@uncaged/workflow";
+import type { ExtractContext, ExtractFn } from "@uncaged/workflow-runtime";
 import type * as z from "zod/v4";
 import { createCursorAgent, validateCursorAgentConfig } from "../src/index.js";
 
diff --git a/packages/workflow-agent-cursor/package.json b/packages/workflow-agent-cursor/package.json
index dcd9e24..acb4ee6 100644
--- a/packages/workflow-agent-cursor/package.json
+++ b/packages/workflow-agent-cursor/package.json
@@ -8,7 +8,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@uncaged/workflow": "workspace:*",
+    "@uncaged/workflow-runtime": "workspace:*",
     "@uncaged/workflow-util-agent": "workspace:*",
     "zod": "^4.0.0"
   }
diff --git a/packages/workflow-agent-cursor/src/index.ts b/packages/workflow-agent-cursor/src/index.ts
index 5e03087..0dfbeb6 100644
--- a/packages/workflow-agent-cursor/src/index.ts
+++ b/packages/workflow-agent-cursor/src/index.ts
@@ -1,4 +1,4 @@
-import type { AgentFn, ExtractContext } from "@uncaged/workflow";
+import type { AgentFn, ExtractContext } from "@uncaged/workflow-runtime";
 import { buildAgentPrompt, type SpawnCliError, spawnCli } from "@uncaged/workflow-util-agent";
 import * as z from "zod/v4";
 
diff --git a/packages/workflow-agent-cursor/src/types.ts b/packages/workflow-agent-cursor/src/types.ts
index dfed660..86eaabe 100644
--- a/packages/workflow-agent-cursor/src/types.ts
+++ b/packages/workflow-agent-cursor/src/types.ts
@@ -1,4 +1,4 @@
-import type { ExtractFn } from "@uncaged/workflow";
+import type { ExtractFn } from "@uncaged/workflow-runtime";
 
 export type CursorAgentConfig = {
   model: string | null;
diff --git a/packages/workflow-agent-cursor/src/validate-config.ts b/packages/workflow-agent-cursor/src/validate-config.ts
index b633098..82175a9 100644
--- a/packages/workflow-agent-cursor/src/validate-config.ts
+++ b/packages/workflow-agent-cursor/src/validate-config.ts
@@ -1,4 +1,4 @@
-import { err, ok, type Result } from "@uncaged/workflow";
+import { err, ok, type Result } from "@uncaged/workflow-runtime";
 
 import type { CursorAgentConfig } from "./types.js";
 
diff --git a/packages/workflow-agent-hermes/package.json b/packages/workflow-agent-hermes/package.json
index f3647a6..4fe819c 100644
--- a/packages/workflow-agent-hermes/package.json
+++ b/packages/workflow-agent-hermes/package.json
@@ -8,7 +8,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@uncaged/workflow": "workspace:*",
+    "@uncaged/workflow-runtime": "workspace:*",
     "@uncaged/workflow-util-agent": "workspace:*"
   }
 }
diff --git a/packages/workflow-agent-hermes/src/index.ts b/packages/workflow-agent-hermes/src/index.ts
index 6953a70..8ea65fc 100644
--- a/packages/workflow-agent-hermes/src/index.ts
+++ b/packages/workflow-agent-hermes/src/index.ts
@@ -1,4 +1,4 @@
-import type { AgentFn } from "@uncaged/workflow";
+import type { AgentFn } from "@uncaged/workflow-runtime";
 import { buildAgentPrompt, type SpawnCliError, spawnCli } from "@uncaged/workflow-util-agent";
 
 import type { HermesAgentConfig } from "./types.js";
diff --git a/packages/workflow-agent-hermes/src/validate-config.ts b/packages/workflow-agent-hermes/src/validate-config.ts
index d3de272..1d79add 100644
--- a/packages/workflow-agent-hermes/src/validate-config.ts
+++ b/packages/workflow-agent-hermes/src/validate-config.ts
@@ -1,4 +1,4 @@
-import { err, ok, type Result } from "@uncaged/workflow";
+import { err, ok, type Result } from "@uncaged/workflow-runtime";
 
 import type { HermesAgentConfig } from "./types.js";
 
diff --git a/packages/workflow-agent-llm/__tests__/create-llm-adapter.test.ts b/packages/workflow-agent-llm/__tests__/create-llm-adapter.test.ts
index 39f50b8..6459909 100644
--- a/packages/workflow-agent-llm/__tests__/create-llm-adapter.test.ts
+++ b/packages/workflow-agent-llm/__tests__/create-llm-adapter.test.ts
@@ -2,7 +2,8 @@ import { describe, expect, test } from "bun:test";
 import { mkdtempSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { createCasStore, START, type ThreadContext } from "@uncaged/workflow";
+import { createCasStore } from "@uncaged/workflow";
+import { START, type ThreadContext } from "@uncaged/workflow-runtime";
 
 import { createLlmAdapter } from "../src/create-llm-adapter.js";
 
diff --git a/packages/workflow-agent-llm/package.json b/packages/workflow-agent-llm/package.json
index 1ff29ca..3a791b1 100644
--- a/packages/workflow-agent-llm/package.json
+++ b/packages/workflow-agent-llm/package.json
@@ -8,6 +8,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@uncaged/workflow": "workspace:*"
+    "@uncaged/workflow": "workspace:*",
+    "@uncaged/workflow-runtime": "workspace:*"
   }
 }
diff --git a/packages/workflow-agent-llm/src/create-llm-adapter.ts b/packages/workflow-agent-llm/src/create-llm-adapter.ts
index ac614d1..508030e 100644
--- a/packages/workflow-agent-llm/src/create-llm-adapter.ts
+++ b/packages/workflow-agent-llm/src/create-llm-adapter.ts
@@ -5,7 +5,7 @@ import {
   type LlmProvider,
   ok,
   type Result,
-} from "@uncaged/workflow";
+} from "@uncaged/workflow-runtime";
 
 /** OpenAI chat completion message shape (passed to `/chat/completions`). */
 export type LlmMessage = { role: "system" | "user" | "assistant"; content: string };
diff --git a/packages/workflow-runtime/src/engine/create-workflow.ts b/packages/workflow-runtime/src/engine/create-workflow.ts
index 14c8c8c..27db1fb 100644
--- a/packages/workflow-runtime/src/engine/create-workflow.ts
+++ b/packages/workflow-runtime/src/engine/create-workflow.ts
@@ -1,4 +1,4 @@
-import type { CasStore } from "../cas/index.js";
+import type { CasStore } from "../cas/types.js";
 import {
   type AgentBinding,
   type AgentContext,
@@ -131,7 +131,7 @@ async function advanceOneRound<M extends RoleMeta>(
 
 /**
  * Binds pure role definitions + moderator to runtime agents.
- * Assign with `export const run = createWorkflow(def, binding)` via `@uncaged/workflow`,
+ * Assign with `export const run = createWorkflow(def, binding)` via `@uncaged/workflow-runtime`,
  * which supplies {@link ResolveRoleMetaFn}.
  */
 export function createWorkflow<M extends RoleMeta>(
diff --git a/packages/workflow-template-develop/__tests__/develop-template.test.ts b/packages/workflow-template-develop/__tests__/develop-template.test.ts
index 6003626..0b9ff36 100644
--- a/packages/workflow-template-develop/__tests__/develop-template.test.ts
+++ b/packages/workflow-template-develop/__tests__/develop-template.test.ts
@@ -5,7 +5,7 @@ import {
   type RoleStep,
   START,
   validateWorkflowDescriptor,
-} from "@uncaged/workflow";
+} from "@uncaged/workflow-runtime";
 import { buildDevelopDescriptor } from "../src/descriptor.js";
 import { developModerator } from "../src/index.js";
 import type { CommitterMeta, PlannerMeta } from "../src/roles/index.js";
diff --git a/packages/workflow-template-develop/package.json b/packages/workflow-template-develop/package.json
index 7b2b2ef..19e9d46 100644
--- a/packages/workflow-template-develop/package.json
+++ b/packages/workflow-template-develop/package.json
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@uncaged/workflow": "workspace:*",
+    "@uncaged/workflow-runtime": "workspace:*",
     "zod": "^4.0.0"
   }
 }
diff --git a/packages/workflow-template-develop/src/index.ts b/packages/workflow-template-develop/src/index.ts
index b7a91ee..1f307f7 100644
--- a/packages/workflow-template-develop/src/index.ts
+++ b/packages/workflow-template-develop/src/index.ts
@@ -1,9 +1,5 @@
-import {
-  type AgentBinding,
-  createWorkflow,
-  type WorkflowDefinition,
-  type WorkflowFn,
-} from "@uncaged/workflow";
+import { createWorkflow } from "@uncaged/workflow";
+import type { AgentBinding, WorkflowDefinition, WorkflowFn } from "@uncaged/workflow-runtime";
 
 import { developModerator } from "./moderator.js";
 import { DEVELOP_WORKFLOW_DESCRIPTION, type DevelopMeta, developRoles } from "./roles.js";
diff --git a/packages/workflow-template-develop/src/moderator.ts b/packages/workflow-template-develop/src/moderator.ts
index 69205cb..e2431c4 100644
--- a/packages/workflow-template-develop/src/moderator.ts
+++ b/packages/workflow-template-develop/src/moderator.ts
@@ -1,5 +1,5 @@
-import type { Moderator, ModeratorContext } from "@uncaged/workflow";
-import { END } from "@uncaged/workflow";
+import type { Moderator, ModeratorContext } from "@uncaged/workflow-runtime";
+import { END } from "@uncaged/workflow-runtime";
 
 import type { DevelopMeta } from "./roles.js";
 
diff --git a/packages/workflow-template-develop/src/roles.ts b/packages/workflow-template-develop/src/roles.ts
index c7a44a5..a606751 100644
--- a/packages/workflow-template-develop/src/roles.ts
+++ b/packages/workflow-template-develop/src/roles.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import { type CoderMeta, coderRole } from "./roles/coder.js";
 import { type CommitterMeta, committerRole } from "./roles/committer.js";
 import { type PlannerMeta, plannerRole } from "./roles/planner.js";
diff --git a/packages/workflow-template-develop/src/roles/coder.ts b/packages/workflow-template-develop/src/roles/coder.ts
index 89b0786..a30bea1 100644
--- a/packages/workflow-template-develop/src/roles/coder.ts
+++ b/packages/workflow-template-develop/src/roles/coder.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const coderMetaSchema = z.object({
diff --git a/packages/workflow-template-develop/src/roles/committer.ts b/packages/workflow-template-develop/src/roles/committer.ts
index 62915b2..62c35d7 100644
--- a/packages/workflow-template-develop/src/roles/committer.ts
+++ b/packages/workflow-template-develop/src/roles/committer.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const committerMetaSchema = z.discriminatedUnion("status", [
diff --git a/packages/workflow-template-develop/src/roles/planner.ts b/packages/workflow-template-develop/src/roles/planner.ts
index 63b3a75..85119c0 100644
--- a/packages/workflow-template-develop/src/roles/planner.ts
+++ b/packages/workflow-template-develop/src/roles/planner.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const phaseSchema = z.object({
diff --git a/packages/workflow-template-develop/src/roles/reviewer.ts b/packages/workflow-template-develop/src/roles/reviewer.ts
index c52ed29..5d2d27e 100644
--- a/packages/workflow-template-develop/src/roles/reviewer.ts
+++ b/packages/workflow-template-develop/src/roles/reviewer.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const reviewerMetaSchema = z.discriminatedUnion("status", [
diff --git a/packages/workflow-template-develop/src/roles/tester.ts b/packages/workflow-template-develop/src/roles/tester.ts
index 82abd34..f912588 100644
--- a/packages/workflow-template-develop/src/roles/tester.ts
+++ b/packages/workflow-template-develop/src/roles/tester.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const testerMetaSchema = z.discriminatedUnion("status", [
diff --git a/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts b/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts
index c194609..c0a2c35 100644
--- a/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts
+++ b/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts
@@ -2,15 +2,14 @@ import { afterEach, describe, expect, test } from "bun:test";
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { createCasStore, createExtract } from "@uncaged/workflow";
 import {
-  createCasStore,
-  createExtract,
   END,
   type ModeratorContext,
   type RoleStep,
   START,
   validateWorkflowDescriptor,
-} from "@uncaged/workflow";
+} from "@uncaged/workflow-runtime";
 import { buildSolveIssueDescriptor } from "../src/descriptor.js";
 import type { DeveloperMeta } from "../src/developer.js";
 import { createSolveIssueRun, solveIssueModerator } from "../src/index.js";
diff --git a/packages/workflow-template-solve-issue/package.json b/packages/workflow-template-solve-issue/package.json
index 2383e7e..dd9d02e 100644
--- a/packages/workflow-template-solve-issue/package.json
+++ b/packages/workflow-template-solve-issue/package.json
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@uncaged/workflow": "workspace:*",
+    "@uncaged/workflow-runtime": "workspace:*",
     "zod": "^4.0.0"
   }
 }
diff --git a/packages/workflow-template-solve-issue/src/developer.ts b/packages/workflow-template-solve-issue/src/developer.ts
index 4a7801d..ae44087 100644
--- a/packages/workflow-template-solve-issue/src/developer.ts
+++ b/packages/workflow-template-solve-issue/src/developer.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const developerMetaSchema = z.object({
diff --git a/packages/workflow-template-solve-issue/src/index.ts b/packages/workflow-template-solve-issue/src/index.ts
index d345fb6..c7840b7 100644
--- a/packages/workflow-template-solve-issue/src/index.ts
+++ b/packages/workflow-template-solve-issue/src/index.ts
@@ -1,10 +1,5 @@
-import {
-  type AgentBinding,
-  createWorkflow,
-  type WorkflowDefinition,
-  type WorkflowFn,
-  workflowAsAgent,
-} from "@uncaged/workflow";
+import { createWorkflow, workflowAsAgent } from "@uncaged/workflow";
+import type { AgentBinding, WorkflowDefinition, WorkflowFn } from "@uncaged/workflow-runtime";
 
 import { solveIssueModerator } from "./moderator.js";
 import { SOLVE_ISSUE_WORKFLOW_DESCRIPTION, type SolveIssueMeta, solveIssueRoles } from "./roles.js";
diff --git a/packages/workflow-template-solve-issue/src/moderator.ts b/packages/workflow-template-solve-issue/src/moderator.ts
index fd27422..e846998 100644
--- a/packages/workflow-template-solve-issue/src/moderator.ts
+++ b/packages/workflow-template-solve-issue/src/moderator.ts
@@ -1,5 +1,5 @@
-import type { Moderator } from "@uncaged/workflow";
-import { END } from "@uncaged/workflow";
+import type { Moderator } from "@uncaged/workflow-runtime";
+import { END } from "@uncaged/workflow-runtime";
 
 import type { SolveIssueMeta } from "./roles.js";
 
diff --git a/packages/workflow-template-solve-issue/src/roles.ts b/packages/workflow-template-solve-issue/src/roles.ts
index 5ae6f7d..a2ffe4e 100644
--- a/packages/workflow-template-solve-issue/src/roles.ts
+++ b/packages/workflow-template-solve-issue/src/roles.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import { type DeveloperMeta, developerRole } from "./developer.js";
 import { type PreparerMeta, preparerRole } from "./roles/preparer.js";
 import { type SubmitterMeta, submitterRole } from "./roles/submitter.js";
diff --git a/packages/workflow-template-solve-issue/src/roles/preparer.ts b/packages/workflow-template-solve-issue/src/roles/preparer.ts
index 5b4a1fe..30c7e13 100644
--- a/packages/workflow-template-solve-issue/src/roles/preparer.ts
+++ b/packages/workflow-template-solve-issue/src/roles/preparer.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 const toolchainSchema = z.object({
diff --git a/packages/workflow-template-solve-issue/src/roles/submitter.ts b/packages/workflow-template-solve-issue/src/roles/submitter.ts
index 3e24977..cc5aad8 100644
--- a/packages/workflow-template-solve-issue/src/roles/submitter.ts
+++ b/packages/workflow-template-solve-issue/src/roles/submitter.ts
@@ -1,4 +1,4 @@
-import type { RoleDefinition } from "@uncaged/workflow";
+import type { RoleDefinition } from "@uncaged/workflow-runtime";
 import * as z from "zod/v4";
 
 export const submitterMetaSchema = z.discriminatedUnion("status", [
diff --git a/packages/workflow-util-agent/__tests__/build-agent-prompt.test.ts b/packages/workflow-util-agent/__tests__/build-agent-prompt.test.ts
index e7db229..b940551 100644
--- a/packages/workflow-util-agent/__tests__/build-agent-prompt.test.ts
+++ b/packages/workflow-util-agent/__tests__/build-agent-prompt.test.ts
@@ -2,7 +2,8 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { createCasStore, putContentMerkleNode, START, type ThreadContext } from "@uncaged/workflow";
+import { createCasStore, putContentMerkleNode } from "@uncaged/workflow";
+import { START, type ThreadContext } from "@uncaged/workflow-runtime";
 
 import { buildAgentPrompt } from "../src/index.js";
 
diff --git a/packages/workflow-util-agent/package.json b/packages/workflow-util-agent/package.json
index dd0d450..0f7e239 100644
--- a/packages/workflow-util-agent/package.json
+++ b/packages/workflow-util-agent/package.json
@@ -14,6 +14,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@uncaged/workflow": "workspace:*"
+    "@uncaged/workflow": "workspace:*",
+    "@uncaged/workflow-runtime": "workspace:*"
   }
 }
diff --git a/packages/workflow-util-agent/src/build-agent-prompt.ts b/packages/workflow-util-agent/src/build-agent-prompt.ts
index 559101d..f3ffd64 100644
--- a/packages/workflow-util-agent/src/build-agent-prompt.ts
+++ b/packages/workflow-util-agent/src/build-agent-prompt.ts
@@ -1,5 +1,5 @@
-import type { AgentContext } from "@uncaged/workflow";
 import { getContentMerklePayload } from "@uncaged/workflow";
+import type { AgentContext } from "@uncaged/workflow-runtime";
 
 async function resolveStepText(ctx: AgentContext, contentHash: string): Promise<string> {
   const text = await getContentMerklePayload(ctx.cas, contentHash);
diff --git a/packages/workflow-util-agent/src/spawn-cli.ts b/packages/workflow-util-agent/src/spawn-cli.ts
index a15f3e8..ace0ec4 100644
--- a/packages/workflow-util-agent/src/spawn-cli.ts
+++ b/packages/workflow-util-agent/src/spawn-cli.ts
@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 
-import { err, ok, type Result } from "@uncaged/workflow";
+import { err, ok, type Result } from "@uncaged/workflow-runtime";
 
 export type SpawnCliError =
   | { kind: "non_zero_exit"; exitCode: number | null; stdout: string; stderr: string }