From 33f4da33c141ac399feee620fae7d484a341fd5b Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Fri, 27 Mar 2026 15:32:06 -0400
Subject: [PATCH] Clean up resolved settings interfaces

---
 apps/fabro-web/app/routes.ts                  |   2 +-
 apps/fabro-web/app/routes/run-graph.tsx       |   4 +-
 apps/fabro-web/app/routes/run-overview.tsx    |   4 +-
 ...run-configuration.tsx => run-settings.tsx} |  20 +-
 apps/fabro-web/app/routes/run-stages.tsx      |   4 +-
 apps/fabro-web/app/routes/settings.tsx        |  10 +-
 .../app/routes/workflow-definition.tsx        |   4 +-
 apps/fabro-web/app/routes/workflow-detail.tsx |  14 +-
 docs/api-reference/fabro-api.yaml             | 132 ++--
 lib/crates/fabro-api/src/demo/mod.rs          |  22 +-
 lib/crates/fabro-api/src/serve.rs             |  13 +-
 lib/crates/fabro-api/src/server.rs            |  18 +-
 .../fabro-api/tests/openapi_conformance.rs    |  12 +-
 lib/crates/fabro-cli/src/cli_config.rs        |   2 +-
 lib/crates/fabro-cli/src/commands/asset/cp.rs |   2 +-
 .../fabro-cli/src/commands/asset/list.rs      |   2 +-
 lib/crates/fabro-cli/src/commands/doctor.rs   |   6 +-
 lib/crates/fabro-cli/src/commands/exec.rs     |   2 +-
 lib/crates/fabro-cli/src/commands/llm/mod.rs  |   2 +-
 lib/crates/fabro-cli/src/commands/model.rs    |   2 +-
 lib/crates/fabro-cli/src/commands/pr/close.rs |   2 +-
 .../fabro-cli/src/commands/pr/create.rs       |   2 +-
 lib/crates/fabro-cli/src/commands/pr/list.rs  |   2 +-
 lib/crates/fabro-cli/src/commands/pr/merge.rs |   2 +-
 lib/crates/fabro-cli/src/commands/pr/mod.rs   |   2 +-
 lib/crates/fabro-cli/src/commands/pr/view.rs  |   2 +-
 .../fabro-cli/src/commands/preflight.rs       |  12 +-
 .../fabro-cli/src/commands/repo/init.rs       |   2 +-
 .../fabro-cli/src/commands/run/attach.rs      |   2 +-
 lib/crates/fabro-cli/src/commands/run/cp.rs   |   2 +-
 .../fabro-cli/src/commands/run/create.rs      |  14 +-
 .../fabro-cli/src/commands/run/detached.rs    |  14 +-
 lib/crates/fabro-cli/src/commands/run/diff.rs |   2 +-
 .../fabro-cli/src/commands/run/execute.rs     | 691 ++++--------------
 lib/crates/fabro-cli/src/commands/run/logs.rs |   2 +-
 lib/crates/fabro-cli/src/commands/run/mod.rs  |  10 +-
 .../fabro-cli/src/commands/run/preview.rs     |   2 +-
 .../fabro-cli/src/commands/run/resume.rs      |   2 +-
 lib/crates/fabro-cli/src/commands/run/ssh.rs  |   2 +-
 .../fabro-cli/src/commands/run/start.rs       |   2 +-
 lib/crates/fabro-cli/src/commands/run/wait.rs |   2 +-
 .../fabro-cli/src/commands/runs/inspect.rs    |   2 +-
 .../fabro-cli/src/commands/runs/list.rs       |   2 +-
 lib/crates/fabro-cli/src/commands/runs/rm.rs  |   2 +-
 .../fabro-cli/src/commands/system/df.rs       |   2 +-
 .../fabro-cli/src/commands/system/prune.rs    |   2 +-
 lib/crates/fabro-cli/src/main.rs              |  20 +-
 lib/crates/fabro-cli/tests/cli.rs             |  10 +-
 lib/crates/fabro-config/src/server.rs         |   4 +
 lib/crates/fabro-config/src/settings.rs       |  36 +
 .../src/handler/manager_loop.rs               |   3 +-
 .../fabro-workflows/src/lifecycle/git.rs      |   2 +-
 .../fabro-workflows/src/operations/create.rs  |  48 +-
 .../fabro-workflows/src/operations/start.rs   |  15 +-
 .../fabro-workflows/src/pipeline/execute.rs   |   2 +-
 .../src/pipeline/execute/tests.rs             |   5 +-
 .../fabro-workflows/src/pipeline/finalize.rs  |   3 +-
 .../src/pipeline/initialize.rs                |   7 +-
 .../fabro-workflows/src/pipeline/persist.rs   |   2 +-
 .../src/pipeline/pull_request.rs              |   2 +-
 .../fabro-workflows/src/pipeline/retro.rs     |   5 +-
 lib/crates/fabro-workflows/src/records/run.rs |   4 +-
 lib/crates/fabro-workflows/src/run_options.rs |  13 +-
 .../fabro-workflows/src/test_support.rs       |   2 +-
 .../tests/daytona_integration.rs              |  18 +-
 .../fabro-workflows/tests/integration.rs      | 342 +++------
 .../src/api/run-internals-api.ts              |  39 +-
 .../fabro-api-client/src/api/settings-api.ts  |  35 +-
 .../fabro-api-client/src/api/workflows-api.ts |   9 +-
 .../src/models/api-configuration.ts           |  12 +-
 .../src/models/assets-configuration.ts        |   2 +-
 .../src/models/auth-configuration.ts          |   8 +-
 .../src/models/checkpoint-configuration.ts    |   2 +-
 .../daytona-configuration-network-one-of.ts   |   2 +-
 .../models/daytona-configuration-network.ts   |   6 +-
 .../src/models/daytona-configuration.ts       |  10 +-
 .../models/daytona-snapshot-configuration.ts  |   2 +-
 .../src/models/exe-configuration.ts           |   2 +-
 .../src/models/git-author-configuration.ts    |   2 +-
 .../src/models/git-configuration.ts           |  16 +-
 .../src/models/git-hub-configuration.ts       |   2 +-
 .../src/models/llm-configuration.ts           |   2 +-
 .../src/models/local-sandbox-configuration.ts |   8 +-
 .../src/models/log-configuration.ts           |   2 +-
 .../src/models/pull-request-configuration.ts  |   2 +-
 .../src/models/run-configuration.ts           |  19 +-
 .../src/models/sandbox-configuration.ts       |  18 +-
 .../src/models/server-configuration.ts        |  49 +-
 .../src/models/setup-configuration.ts         |   2 +-
 .../src/models/ssh-configuration.ts           |   2 +-
 .../src/models/tls-configuration.ts           |   2 +-
 .../src/models/web-configuration.ts           |   6 +-
 .../src/models/webhook-configuration.ts       |   8 +-
 .../src/models/workflow-detail.ts             |   7 +-
 94 files changed, 691 insertions(+), 1188 deletions(-)
 rename apps/fabro-web/app/routes/{run-configuration.tsx => run-settings.tsx} (84%)

diff --git a/apps/fabro-web/app/routes.ts b/apps/fabro-web/app/routes.ts
index 8759b626f..780553f0b 100644
--- a/apps/fabro-web/app/routes.ts
+++ b/apps/fabro-web/app/routes.ts
@@ -25,7 +25,7 @@ export default [
     route("runs/:id", "routes/run-detail.tsx", [
       index("routes/run-overview.tsx"),
       route("stages/:stageId", "routes/run-stages.tsx"),
-      route("configuration", "routes/run-configuration.tsx"),
+      route("settings", "routes/run-settings.tsx"),
       route("graph", "routes/run-graph.tsx"),
       route("files", "routes/run-files.tsx"),
       route("verification", "routes/run-verification.tsx"),
diff --git a/apps/fabro-web/app/routes/run-graph.tsx b/apps/fabro-web/app/routes/run-graph.tsx
index ceab91895..9ad786fc4 100644
--- a/apps/fabro-web/app/routes/run-graph.tsx
+++ b/apps/fabro-web/app/routes/run-graph.tsx
@@ -305,11 +305,11 @@ export default function RunGraph({ loaderData }: Route.ComponentProps) {
           <ul className="mt-2 space-y-0.5">
             <li>
               <Link
-                to={`/runs/${id}/configuration`}
+                to={`/runs/${id}/settings`}
                 className="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-fg-3 transition-colors hover:bg-overlay hover:text-fg"
               >
                 <DocumentTextIcon className="size-4 shrink-0 text-fg-muted" />
-                Run Configuration
+                Run Settings
               </Link>
             </li>
             <li>
diff --git a/apps/fabro-web/app/routes/run-overview.tsx b/apps/fabro-web/app/routes/run-overview.tsx
index ef73f182d..fd1eee6a7 100644
--- a/apps/fabro-web/app/routes/run-overview.tsx
+++ b/apps/fabro-web/app/routes/run-overview.tsx
@@ -320,11 +320,11 @@ export default function RunOverview({ loaderData }: Route.ComponentProps) {
           <ul className="mt-2 space-y-0.5">
             <li>
               <Link
-                to={`/runs/${id}/configuration`}
+                to={`/runs/${id}/settings`}
                 className="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-fg-3 transition-colors hover:bg-overlay hover:text-fg"
               >
                 <DocumentTextIcon className="size-4 shrink-0 text-fg-muted" />
-                Run Configuration
+                Run Settings
               </Link>
             </li>
             <li>
diff --git a/apps/fabro-web/app/routes/run-configuration.tsx b/apps/fabro-web/app/routes/run-settings.tsx
similarity index 84%
rename from apps/fabro-web/app/routes/run-configuration.tsx
rename to apps/fabro-web/app/routes/run-settings.tsx
index 0b2dbad81..2a5cfba7e 100644
--- a/apps/fabro-web/app/routes/run-configuration.tsx
+++ b/apps/fabro-web/app/routes/run-settings.tsx
@@ -4,8 +4,8 @@ import { DocumentTextIcon, MapIcon } from "@heroicons/react/24/outline";
 import { CollapsibleFile } from "../components/collapsible-file";
 import { apiJson } from "../api-client";
 import { formatDurationSecs } from "../lib/format";
-import type { PaginatedRunStageList, RunConfiguration } from "@qltysh/fabro-api-client";
-import type { Route } from "./+types/run-configuration";
+import type { PaginatedRunStageList, RunSettings } from "@qltysh/fabro-api-client";
+import type { Route } from "./+types/run-settings";
 
 export const handle = { wide: true };
 
@@ -27,9 +27,9 @@ const statusConfig: Record<StageStatus, { icon: typeof CheckCircleIcon; color: s
 };
 
 export async function loader({ request, params }: Route.LoaderArgs) {
-  const [{ data: apiStages }, config] = await Promise.all([
+  const [{ data: apiStages }, settings] = await Promise.all([
     apiJson<PaginatedRunStageList>(`/runs/${params.id}/stages`, { request }),
-    apiJson<RunConfiguration>(`/runs/${params.id}/configuration`, { request }),
+    apiJson<RunSettings>(`/runs/${params.id}/settings`, { request }),
   ]);
   const stages: Stage[] = apiStages.map((s) => ({
     id: s.id,
@@ -37,12 +37,12 @@ export async function loader({ request, params }: Route.LoaderArgs) {
     status: s.status as StageStatus,
     duration: s.duration_secs != null ? formatDurationSecs(s.duration_secs) : "--",
   }));
-  return { stages, config };
+  return { stages, settings };
 }
 
-export default function RunConfiguration({ loaderData }: Route.ComponentProps) {
+export default function RunSettingsPage({ loaderData }: Route.ComponentProps) {
   const { id } = useParams();
-  const { stages, config } = loaderData;
+  const { stages, settings } = loaderData;
 
   return (
     <div className="flex gap-6">
@@ -74,11 +74,11 @@ export default function RunConfiguration({ loaderData }: Route.ComponentProps) {
           <ul className="mt-2 space-y-0.5">
             <li>
               <Link
-                to={`/runs/${id}/configuration`}
+                to={`/runs/${id}/settings`}
                 className="flex items-center gap-2 rounded-md bg-overlay px-2 py-1.5 text-sm text-fg transition-colors"
               >
                 <DocumentTextIcon className="size-4 shrink-0 text-fg-muted" />
-                Run Configuration
+                Run Settings
               </Link>
             </li>
             <li>
@@ -96,7 +96,7 @@ export default function RunConfiguration({ loaderData }: Route.ComponentProps) {
 
       <div className="min-w-0 flex-1">
         <CollapsibleFile
-          file={{ name: "run.json", contents: JSON.stringify(config, null, 2), lang: "json" }}
+          file={{ name: "run.json", contents: JSON.stringify(settings, null, 2), lang: "json" }}
         />
       </div>
     </div>
diff --git a/apps/fabro-web/app/routes/run-stages.tsx b/apps/fabro-web/app/routes/run-stages.tsx
index 4964df5f5..5df7394f0 100644
--- a/apps/fabro-web/app/routes/run-stages.tsx
+++ b/apps/fabro-web/app/routes/run-stages.tsx
@@ -144,11 +144,11 @@ export default function RunStages({ loaderData }: Route.ComponentProps) {
           <ul className="mt-2 space-y-0.5">
             <li>
               <Link
-                to={`/runs/${id}/configuration`}
+                to={`/runs/${id}/settings`}
                 className="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-fg-3 transition-colors hover:bg-overlay hover:text-fg"
               >
                 <DocumentTextIcon className="size-4 shrink-0 text-fg-muted" />
-                Run Configuration
+                Run Settings
               </Link>
             </li>
             <li>
diff --git a/apps/fabro-web/app/routes/settings.tsx b/apps/fabro-web/app/routes/settings.tsx
index 1a622bd5e..4103f2baa 100644
--- a/apps/fabro-web/app/routes/settings.tsx
+++ b/apps/fabro-web/app/routes/settings.tsx
@@ -1,6 +1,6 @@
 import { apiJson } from "../api-client";
 import { CollapsibleFile } from "../components/collapsible-file";
-import type { ServerConfiguration } from "@qltysh/fabro-api-client";
+import type { ServerSettings } from "@qltysh/fabro-api-client";
 import type { Route } from "./+types/settings";
 
 export function meta({}: Route.MetaArgs) {
@@ -10,17 +10,17 @@ export function meta({}: Route.MetaArgs) {
 export const handle = { hideHeader: true };
 
 export async function loader({ request }: Route.LoaderArgs) {
-  const config = await apiJson<ServerConfiguration>("/settings", { request });
-  return { config };
+  const settings = await apiJson<ServerSettings>("/settings", { request });
+  return { settings };
 }
 
 export default function Settings({ loaderData }: Route.ComponentProps) {
-  const { config } = loaderData;
+  const { settings } = loaderData;
 
   return (
     <div className="mx-auto max-w-4xl">
       <CollapsibleFile
-        file={{ name: "server.json", contents: JSON.stringify(config, null, 2), lang: "json" }}
+        file={{ name: "server.json", contents: JSON.stringify(settings, null, 2), lang: "json" }}
       />
     </div>
   );
diff --git a/apps/fabro-web/app/routes/workflow-definition.tsx b/apps/fabro-web/app/routes/workflow-definition.tsx
index 8499dfb92..353951ad4 100644
--- a/apps/fabro-web/app/routes/workflow-definition.tsx
+++ b/apps/fabro-web/app/routes/workflow-definition.tsx
@@ -21,13 +21,13 @@ export default function WorkflowDefinition() {
   }, []);
 
   if (workflow == null) {
-    return <p className="text-sm text-fg-muted">No configuration found.</p>;
+    return <p className="text-sm text-fg-muted">No settings found.</p>;
   }
 
   return (
     <div className="flex flex-col gap-6">
       <CollapsibleFile
-        file={{ name: "run.json", contents: JSON.stringify(workflow.config, null, 2), lang: "json" }}
+        file={{ name: "run.json", contents: JSON.stringify(workflow.settings, null, 2), lang: "json" }}
         defaultOpen={false}
       />
       {dotReady && (
diff --git a/apps/fabro-web/app/routes/workflow-detail.tsx b/apps/fabro-web/app/routes/workflow-detail.tsx
index 569c8da2c..12e5b81d1 100644
--- a/apps/fabro-web/app/routes/workflow-detail.tsx
+++ b/apps/fabro-web/app/routes/workflow-detail.tsx
@@ -1,7 +1,7 @@
 import { ChevronRightIcon } from "@heroicons/react/20/solid";
 import { Link, Outlet, useLocation, useParams } from "react-router";
 import { apiJson } from "../api-client";
-import type { WorkflowDetail as ApiWorkflowDetail, RunConfiguration } from "@qltysh/fabro-api-client";
+import type { WorkflowDetail as ApiWorkflowDetail, RunSettings } from "@qltysh/fabro-api-client";
 import type { Route } from "./+types/workflow-detail";
 
 export interface WorkflowEntry {
@@ -9,7 +9,7 @@ export interface WorkflowEntry {
   slug: string;
   description: string;
   filename: string;
-  config: RunConfiguration;
+  settings: RunSettings;
   graph: string;
 }
 
@@ -21,7 +21,7 @@ export const workflowData: Record<string, WorkflowEntry> = {
     slug: "fix_build",
     filename: "fix_build.fabro",
     description: "Automatically diagnoses and fixes CI build failures by analyzing error logs, identifying root causes, and applying targeted code changes.",
-    config: {
+    settings: {
       version: 1,
       goal: "Diagnose and fix CI build failures",
       graph: "fix_build.fabro",
@@ -62,7 +62,7 @@ export const workflowData: Record<string, WorkflowEntry> = {
     slug: "implement",
     filename: "implement.fabro",
     description: "Generates production-ready code from a technical blueprint, including tests, documentation, and a pull request ready for review.",
-    config: {
+    settings: {
       version: 1,
       goal: "Implement feature from technical blueprint",
       graph: "implement.fabro",
@@ -118,7 +118,7 @@ export const workflowData: Record<string, WorkflowEntry> = {
     slug: "sync_drift",
     filename: "sync_drift.fabro",
     description: "Detects configuration and code drift between environments, then generates reconciliation patches to bring everything back in sync.",
-    config: {
+    settings: {
       version: 1,
       goal: "Detect and reconcile configuration drift across environments",
       graph: "sync_drift.fabro",
@@ -163,7 +163,7 @@ export const workflowData: Record<string, WorkflowEntry> = {
     slug: "expand",
     filename: "expand.fabro",
     description: "Evolves the product by analyzing usage patterns and specifications to propose and implement incremental improvements.",
-    config: {
+    settings: {
       version: 1,
       goal: "Propose and implement incremental product improvements",
       graph: "expand.fabro",
@@ -216,7 +216,7 @@ export async function loader({ request, params }: Route.LoaderArgs) {
     slug: apiWorkflow.slug,
     description: apiWorkflow.description,
     filename: apiWorkflow.filename,
-    config: apiWorkflow.config,
+    settings: apiWorkflow.settings,
     graph: apiWorkflow.graph,
   };
   return { workflow };
diff --git a/docs/api-reference/fabro-api.yaml b/docs/api-reference/fabro-api.yaml
index 59d9b2dd7..00199ce10 100644
--- a/docs/api-reference/fabro-api.yaml
+++ b/docs/api-reference/fabro-api.yaml
@@ -563,21 +563,21 @@ paths:
               schema:
                 $ref: "#/components/schemas/ErrorResponse"
 
-  /runs/{id}/configuration:
+  /runs/{id}/settings:
     get:
-      operationId: retrieveRunConfiguration
+      operationId: retrieveRunSettings
       tags: [Run Internals]
-      summary: Retrieve Run Configuration
-      description: Returns the structured configuration used to launch this run.
+      summary: Retrieve Run Settings
+      description: Returns the structured settings used to launch this run.
       parameters:
         - $ref: "#/components/parameters/RunId"
       responses:
         "200":
-          description: Run configuration
+          description: Run settings
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/RunConfiguration"
+                $ref: "#/components/schemas/RunSettings"
         "404":
           description: Run not found
           content:
@@ -673,7 +673,7 @@ paths:
       operationId: retrieveWorkflow
       tags: [Workflows]
       summary: Retrieve Workflow
-      description: Returns the full detail of a workflow including its Graphviz graph, TOML config, and description.
+      description: Returns the full detail of a workflow including its Graphviz graph, resolved settings, and description.
       parameters:
         - $ref: "#/components/parameters/WorkflowName"
       responses:
@@ -1257,17 +1257,17 @@ paths:
 
   /settings:
     get:
-      operationId: retrieveServerConfiguration
+      operationId: retrieveServerSettings
       tags: [Settings]
-      summary: Retrieve Server Configuration
-      description: Returns the structured server configuration.
+      summary: Retrieve Server Settings
+      description: Returns the structured server settings.
       responses:
         "200":
-          description: Server configuration
+          description: Server settings
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ServerConfiguration"
+                $ref: "#/components/schemas/ServerSettings"
 
 components:
   securitySchemes:
@@ -2925,14 +2925,14 @@ components:
           $ref: "#/components/schemas/WorkflowSchedule"
 
     WorkflowDetail:
-      description: Full detail of a workflow definition including graph and configuration.
+      description: Full detail of a workflow definition including graph and resolved settings.
       type: object
       required:
         - name
         - slug
         - filename
         - description
-        - config
+        - settings
         - graph
       properties:
         name:
@@ -2951,8 +2951,8 @@ components:
           type: string
           description: Prose description of what the workflow does.
           example: Automatically diagnoses and fixes CI build failures.
-        config:
-          $ref: "#/components/schemas/RunConfiguration"
+        settings:
+          $ref: "#/components/schemas/RunSettings"
         graph:
           type: string
           description: Graphviz DOT language source defining the workflow graph.
@@ -3981,10 +3981,10 @@ components:
           description: Number of rows returned.
           example: 6
 
-    # ── Configuration Schemas ────────────────────────────────────────────
+    # ── Settings Schemas ─────────────────────────────────────────────────
 
-    RunConfiguration:
-      description: Structured run configuration mirroring FabroConfig.
+    RunSettings:
+      description: Structured run settings mirroring FabroSettings.
       type: object
       required:
         - version
@@ -3992,7 +3992,7 @@ components:
       properties:
         version:
           type: integer
-          description: Configuration schema version.
+          description: Settings schema version.
           example: 1
         goal:
           type: string
@@ -4006,11 +4006,11 @@ components:
           type: string
           description: Working directory for the run.
         llm:
-          $ref: "#/components/schemas/LlmConfiguration"
+          $ref: "#/components/schemas/LlmSettings"
         setup:
-          $ref: "#/components/schemas/SetupConfiguration"
+          $ref: "#/components/schemas/SetupSettings"
         sandbox:
-          $ref: "#/components/schemas/SandboxConfiguration"
+          $ref: "#/components/schemas/SandboxSettings"
         vars:
           type: object
           additionalProperties:
@@ -4021,7 +4021,7 @@ components:
           items:
             $ref: "#/components/schemas/HookDefinition"
 
-    LlmConfiguration:
+    LlmSettings:
       description: LLM provider and model settings.
       type: object
       properties:
@@ -4041,7 +4041,7 @@ components:
               type: string
           description: Provider fallback chains.
 
-    SetupConfiguration:
+    SetupSettings:
       description: Setup commands run before the workflow.
       type: object
       required:
@@ -4056,7 +4056,7 @@ components:
           type: integer
           description: Timeout per command in milliseconds.
 
-    SandboxConfiguration:
+    SandboxSettings:
       description: Sandbox execution environment settings.
       type: object
       properties:
@@ -4071,20 +4071,20 @@ components:
           type: boolean
           description: Whether to use a devcontainer for the sandbox.
         daytona:
-          $ref: "#/components/schemas/DaytonaConfiguration"
+          $ref: "#/components/schemas/DaytonaSettings"
         exe:
-          $ref: "#/components/schemas/ExeConfiguration"
+          $ref: "#/components/schemas/ExeSettings"
         ssh:
-          $ref: "#/components/schemas/SshConfiguration"
+          $ref: "#/components/schemas/SshSettings"
         local:
-          $ref: "#/components/schemas/LocalSandboxConfiguration"
+          $ref: "#/components/schemas/LocalSandboxSettings"
         env:
           type: object
           additionalProperties:
             type: string
           description: Environment variables injected into the sandbox.
 
-    LocalSandboxConfiguration:
+    LocalSandboxSettings:
       description: Local sandbox settings.
       type: object
       properties:
@@ -4094,7 +4094,7 @@ components:
           enum: [always, clean, dirty, never]
           default: clean
 
-    ExeConfiguration:
+    ExeSettings:
       description: exe.dev sandbox configuration.
       type: object
       properties:
@@ -4102,7 +4102,7 @@ components:
           type: string
           description: VM image to use for the exe.dev sandbox.
 
-    SshConfiguration:
+    SshSettings:
       description: SSH sandbox configuration for user-provided hosts.
       type: object
       required:
@@ -4119,7 +4119,7 @@ components:
           type: string
           description: Optional path to a custom SSH config file.
 
-    DaytonaConfiguration:
+    DaytonaSettings:
       description: Daytona-specific sandbox settings.
       type: object
       properties:
@@ -4132,7 +4132,7 @@ components:
             type: string
           description: Labels applied to the sandbox.
         snapshot:
-          $ref: "#/components/schemas/DaytonaSnapshotConfiguration"
+          $ref: "#/components/schemas/DaytonaSnapshotSettings"
         network:
           description: "Network access mode: \"block\", \"allow_all\", or {\"allow_list\": [...]}."
           oneOf:
@@ -4154,7 +4154,7 @@ components:
           default: false
           description: Skip git repo detection and cloning during initialization.
 
-    DaytonaSnapshotConfiguration:
+    DaytonaSnapshotSettings:
       description: Snapshot configuration for Daytona sandboxes.
       type: object
       required:
@@ -4255,8 +4255,8 @@ components:
           type: boolean
           description: Whether hook runs in sandbox.
 
-    ServerConfiguration:
-      description: Structured server configuration mirroring FabroConfig.
+    ServerSettings:
+      description: Structured server settings mirroring FabroSettings.
       type: object
       properties:
         storage_dir:
@@ -4266,48 +4266,48 @@ components:
           type: integer
           description: Maximum concurrent runs.
         web:
-          $ref: "#/components/schemas/WebConfiguration"
+          $ref: "#/components/schemas/WebSettings"
         api:
-          $ref: "#/components/schemas/ApiConfiguration"
+          $ref: "#/components/schemas/ApiSettings"
         git:
-          $ref: "#/components/schemas/GitConfiguration"
+          $ref: "#/components/schemas/GitSettings"
         features:
           $ref: "#/components/schemas/Features"
         log:
-          $ref: "#/components/schemas/LogConfiguration"
+          $ref: "#/components/schemas/LogSettings"
         work_dir:
           type: string
           description: Default working directory.
         llm:
-          $ref: "#/components/schemas/LlmConfiguration"
+          $ref: "#/components/schemas/LlmSettings"
         setup:
-          $ref: "#/components/schemas/SetupConfiguration"
+          $ref: "#/components/schemas/SetupSettings"
         sandbox:
-          $ref: "#/components/schemas/SandboxConfiguration"
+          $ref: "#/components/schemas/SandboxSettings"
         vars:
           type: object
           additionalProperties:
             type: string
           description: Default variable map.
         checkpoint:
-          $ref: "#/components/schemas/CheckpointConfiguration"
+          $ref: "#/components/schemas/CheckpointSettings"
         pull_request:
-          $ref: "#/components/schemas/PullRequestConfiguration"
+          $ref: "#/components/schemas/PullRequestSettings"
         hooks:
           type: array
           items:
             $ref: "#/components/schemas/HookDefinition"
         assets:
-          $ref: "#/components/schemas/AssetsConfiguration"
+          $ref: "#/components/schemas/AssetsSettings"
         mcp_servers:
           type: object
           additionalProperties:
             $ref: "#/components/schemas/McpServerEntry"
           description: Default MCP server configurations.
         github:
-          $ref: "#/components/schemas/GitHubConfiguration"
+          $ref: "#/components/schemas/GitHubSettings"
 
-    GitHubConfiguration:
+    GitHubSettings:
       description: GitHub App token injection configuration.
       type: object
       properties:
@@ -4349,7 +4349,7 @@ components:
           type: integer
           description: Tool call timeout in seconds.
 
-    AssetsConfiguration:
+    AssetsSettings:
       description: Asset collection configuration.
       type: object
       properties:
@@ -4359,7 +4359,7 @@ components:
             type: string
           description: Glob patterns for files to collect as run assets.
 
-    LogConfiguration:
+    LogSettings:
       description: Logging configuration.
       type: object
       properties:
@@ -4367,7 +4367,7 @@ components:
           type: string
           description: Log level (e.g. trace, debug, info).
 
-    CheckpointConfiguration:
+    CheckpointSettings:
       description: Checkpoint configuration for file exclusion.
       type: object
       properties:
@@ -4377,7 +4377,7 @@ components:
             type: string
           description: Glob patterns to exclude from checkpoints.
 
-    PullRequestConfiguration:
+    PullRequestSettings:
       description: Pull request creation configuration.
       type: object
       properties:
@@ -4395,7 +4395,7 @@ components:
           enum: [squash, merge, rebase]
           description: Merge strategy for auto-merge.
 
-    WebConfiguration:
+    WebSettings:
       description: Web UI configuration.
       type: object
       properties:
@@ -4403,9 +4403,9 @@ components:
           type: string
           description: Web UI URL.
         auth:
-          $ref: "#/components/schemas/AuthConfiguration"
+          $ref: "#/components/schemas/AuthSettings"
 
-    AuthConfiguration:
+    AuthSettings:
       description: Authentication configuration.
       type: object
       properties:
@@ -4421,7 +4421,7 @@ components:
             type: string
           description: Allowed usernames.
 
-    ApiConfiguration:
+    ApiSettings:
       description: API server configuration.
       type: object
       properties:
@@ -4437,9 +4437,9 @@ components:
               - mtls
           description: Authentication strategies.
         tls:
-          $ref: "#/components/schemas/TlsConfiguration"
+          $ref: "#/components/schemas/TlsSettings"
 
-    TlsConfiguration:
+    TlsSettings:
       description: TLS certificate configuration.
       type: object
       required:
@@ -4457,7 +4457,7 @@ components:
           type: string
           description: CA certificate file path.
 
-    GitConfiguration:
+    GitSettings:
       description: Git provider configuration.
       type: object
       properties:
@@ -4476,11 +4476,11 @@ components:
           type: string
           description: GitHub App slug.
         author:
-          $ref: "#/components/schemas/GitAuthorConfiguration"
+          $ref: "#/components/schemas/GitAuthorSettings"
         webhooks:
-          $ref: "#/components/schemas/WebhookConfiguration"
+          $ref: "#/components/schemas/WebhookSettings"
 
-    GitAuthorConfiguration:
+    GitAuthorSettings:
       description: Git commit author configuration.
       type: object
       properties:
@@ -4491,7 +4491,7 @@ components:
           type: string
           description: Author email for commits.
 
-    WebhookConfiguration:
+    WebhookSettings:
       description: Webhook delivery configuration.
       type: object
       required:
@@ -4566,4 +4566,4 @@ components:
         login:
           type: string
           description: User's login identifier (e.g. GitHub username).
-          example: octocat
\ No newline at end of file
+          example: octocat
diff --git a/lib/crates/fabro-api/src/demo/mod.rs b/lib/crates/fabro-api/src/demo/mod.rs
index e5aa519d4..ad1b5d86a 100644
--- a/lib/crates/fabro-api/src/demo/mod.rs
+++ b/lib/crates/fabro-api/src/demo/mod.rs
@@ -104,12 +104,12 @@ pub async fn get_run_verification(
     paginated_response(runs::verifications(), &pagination)
 }
 
-pub async fn get_run_configuration(
+pub async fn get_run_settings(
     _auth: AuthenticatedService,
     State(_state): State<Arc<AppState>>,
     Path(_id): Path<String>,
 ) -> Response {
-    (StatusCode::OK, Json(runs::configuration())).into_response()
+    (StatusCode::OK, Json(runs::settings())).into_response()
 }
 
 pub async fn steer_run_stub(
@@ -588,11 +588,11 @@ pub async fn list_models(
 
 // ── Settings ───────────────────────────────────────────────────────────
 
-pub async fn get_server_configuration(
+pub async fn get_server_settings(
     _auth: AuthenticatedService,
     State(_state): State<Arc<AppState>>,
 ) -> Response {
-    (StatusCode::OK, Json(settings::server_config())).into_response()
+    (StatusCode::OK, Json(settings::server_settings())).into_response()
 }
 
 // ── Usage ──────────────────────────────────────────────────────────────
@@ -1276,7 +1276,7 @@ mod runs {
         ]
     }
 
-    pub fn configuration() -> serde_json::Value {
+    pub fn settings() -> serde_json::Value {
         serde_json::to_value(fabro_config::FabroSettings {
             version: Some(1),
             goal: Some("Add rate limiting to auth endpoints".into()),
@@ -1431,7 +1431,7 @@ mod workflows {
         ]
     }
 
-    fn run_config_to_api(cfg: fabro_config::FabroSettings) -> RunConfiguration {
+    fn run_settings_to_api(cfg: fabro_config::FabroSettings) -> RunSettings {
         fn strip_nulls(val: serde_json::Value) -> serde_json::Value {
             match val {
                 serde_json::Value::Object(map) => serde_json::Value::Object(
@@ -1455,7 +1455,7 @@ mod workflows {
             WorkflowDetail {
                 name: "Fix Build".into(), slug: "fix_build".into(), filename: "fix_build.fabro".into(),
                 description: "Automatically diagnoses and fixes CI build failures by analyzing error logs, identifying root causes, and applying targeted code changes.".into(),
-                config: run_config_to_api(fabro_config::FabroSettings {
+                settings: run_settings_to_api(fabro_config::FabroSettings {
                     version: Some(1),
                     goal: Some("Diagnose and fix CI build failures".into()),
                     graph: Some("fix_build.fabro".into()),
@@ -1526,7 +1526,7 @@ mod workflows {
             WorkflowDetail {
                 name: "Implement Feature".into(), slug: "implement".into(), filename: "implement.fabro".into(),
                 description: "Generates production-ready code from a technical blueprint, including tests, documentation, and a pull request ready for review.".into(),
-                config: run_config_to_api(fabro_config::FabroSettings {
+                settings: run_settings_to_api(fabro_config::FabroSettings {
                     version: Some(1),
                     goal: Some("Implement feature from technical blueprint".into()),
                     graph: Some("implement.fabro".into()),
@@ -1615,7 +1615,7 @@ mod workflows {
             WorkflowDetail {
                 name: "Sync Drift".into(), slug: "sync_drift".into(), filename: "sync_drift.fabro".into(),
                 description: "Detects configuration and code drift between environments, then generates reconciliation patches to bring everything back in sync.".into(),
-                config: run_config_to_api(fabro_config::FabroSettings {
+                settings: run_settings_to_api(fabro_config::FabroSettings {
                     version: Some(1),
                     goal: Some("Detect and reconcile configuration drift across environments".into()),
                     graph: Some("sync_drift.fabro".into()),
@@ -1692,7 +1692,7 @@ mod workflows {
             WorkflowDetail {
                 name: "Expand Product".into(), slug: "expand".into(), filename: "expand.fabro".into(),
                 description: "Evolves the product by analyzing usage patterns and specifications to propose and implement incremental improvements.".into(),
-                config: run_config_to_api(fabro_config::FabroSettings {
+                settings: run_settings_to_api(fabro_config::FabroSettings {
                     version: Some(1),
                     goal: Some("Propose and implement incremental product improvements".into()),
                     graph: Some("expand.fabro".into()),
@@ -3244,7 +3244,7 @@ mod settings {
     use fabro_config::server::*;
     use fabro_config::FabroSettings;
 
-    pub fn server_config() -> serde_json::Value {
+    pub fn server_settings() -> serde_json::Value {
         serde_json::to_value(FabroSettings {
             storage_dir: Some("/home/fabro/.fabro".into()),
             max_concurrent_runs: Some(10),
diff --git a/lib/crates/fabro-api/src/serve.rs b/lib/crates/fabro-api/src/serve.rs
index df33aab0b..f6613b7fb 100644
--- a/lib/crates/fabro-api/src/serve.rs
+++ b/lib/crates/fabro-api/src/serve.rs
@@ -83,12 +83,11 @@ pub async fn serve_command(args: ServeArgs, styles: &'static Styles) -> anyhow::
 
     // Initialize data directory and SQLite database
     let config_path = args.config;
-    let server_config: FabroSettings =
-        fabro_config::server::load_server_config(config_path.as_deref())?.try_into()?;
-    let data_dir = fabro_config::server::resolve_storage_dir(&server_config);
+    let server_settings = fabro_config::server::load_server_settings(config_path.as_deref())?;
+    let data_dir = fabro_config::server::resolve_storage_dir(&server_settings);
 
     // Shared config for live reloading
-    let shared_config = Arc::new(RwLock::new(server_config));
+    let shared_config = Arc::new(RwLock::new(server_settings));
 
     // CLI overrides take precedence over config file values, even after reload
     let cli_model = args.model;
@@ -215,12 +214,8 @@ pub async fn serve_command(args: ServeArgs, styles: &'static Styles) -> anyhow::
         interval.tick().await; // skip first immediate tick
         loop {
             interval.tick().await;
-            match fabro_config::server::load_server_config(config_path_for_poll.as_deref()) {
+            match fabro_config::server::load_server_settings(config_path_for_poll.as_deref()) {
                 Ok(new_config) => {
-                    let Ok(new_config) = FabroSettings::try_from(new_config) else {
-                        warn!("Failed to finalize reloaded server config");
-                        continue;
-                    };
                     let changed = {
                         let cfg = config_for_poll.read().expect("config lock poisoned");
                         *cfg != new_config
diff --git a/lib/crates/fabro-api/src/server.rs b/lib/crates/fabro-api/src/server.rs
index b20aaeb7b..d747b9ee1 100644
--- a/lib/crates/fabro-api/src/server.rs
+++ b/lib/crates/fabro-api/src/server.rs
@@ -185,10 +185,7 @@ fn demo_routes() -> Router<Arc<AppState>> {
             "/runs/{id}/verification",
             get(crate::demo::get_run_verification),
         )
-        .route(
-            "/runs/{id}/configuration",
-            get(crate::demo::get_run_configuration),
-        )
+        .route("/runs/{id}/settings", get(crate::demo::get_run_settings))
         .route("/runs/{id}/steer", post(crate::demo::steer_run_stub))
         .route(
             "/runs/{id}/preview",
@@ -250,7 +247,7 @@ fn demo_routes() -> Router<Arc<AppState>> {
         .route("/models", get(crate::demo::list_models))
         .route("/models/{id}/test", post(test_model))
         .route("/completions", post(create_completion))
-        .route("/settings", get(crate::demo::get_server_configuration))
+        .route("/settings", get(crate::demo::get_server_settings))
         .route("/usage", get(crate::demo::get_aggregate_usage))
 }
 
@@ -273,7 +270,7 @@ fn real_routes() -> Router<Arc<AppState>> {
         .route("/runs/{id}/files", get(not_implemented))
         .route("/runs/{id}/usage", get(not_implemented))
         .route("/runs/{id}/verification", get(not_implemented))
-        .route("/runs/{id}/configuration", get(not_implemented))
+        .route("/runs/{id}/settings", get(not_implemented))
         .route("/runs/{id}/steer", post(not_implemented))
         .route("/runs/{id}/preview", post(not_implemented))
         .route("/workflows", get(not_implemented))
@@ -520,7 +517,7 @@ async fn start_run(
     let run_id = ulid::Ulid::new().to_string();
     info!(run_id = %run_id, "Run queued");
     let run_dir = std::env::temp_dir().join(format!("fabro-{}", uuid::Uuid::new_v4()));
-    let config = fabro_config::FabroSettings {
+    let settings = fabro_config::FabroSettings {
         dry_run: Some(state.dry_run),
         hooks: state.hooks.clone(),
         sandbox: Some(fabro_config::sandbox::SandboxSettings {
@@ -529,11 +526,11 @@ async fn start_run(
         }),
         ..Default::default()
     };
-    let run_labels = config.labels.clone();
+    let run_labels = settings.labels.clone();
     let persisted = match operations::create(
         &req.dot_source,
         RunCreateOptions {
-            config,
+            settings,
             run_dir: Some(run_dir.clone()),
             run_id: Some(run_id.clone()),
             workflow_slug: None,
@@ -701,10 +698,9 @@ async fn execute_run(state: Arc<AppState>, run_id: String) {
     };
     let run_record = persisted.run_record().clone();
     let run_options = RunOptions {
-        config: run_record.config,
+        settings: run_record.settings,
         run_dir: run_dir.clone(),
         cancel_token: Some(cancel_token),
-        dry_run: state.dry_run,
         run_id: run_id.clone(),
         labels: run_record.labels,
         git_author: state.git_author.clone(),
diff --git a/lib/crates/fabro-api/tests/openapi_conformance.rs b/lib/crates/fabro-api/tests/openapi_conformance.rs
index a28fbadee..57ba1f382 100644
--- a/lib/crates/fabro-api/tests/openapi_conformance.rs
+++ b/lib/crates/fabro-api/tests/openapi_conformance.rs
@@ -396,18 +396,18 @@ fn fully_populated_server_config() -> FabroSettings {
 }
 
 #[test]
-fn server_config_keys_match_openapi_spec() {
-    let config = fully_populated_server_config();
-    let json = serde_json::to_value(&config).expect("serialize ServerConfig");
+fn server_settings_keys_match_openapi_spec() {
+    let settings = fully_populated_server_config();
+    let json = serde_json::to_value(&settings).expect("serialize ServerSettings");
     let spec = load_spec_json();
-    let schema = &spec["components"]["schemas"]["ServerConfiguration"];
+    let schema = &spec["components"]["schemas"]["ServerSettings"];
 
     let mut errors = Vec::new();
-    compare_schema("ServerConfiguration", &json, schema, &spec, &mut errors);
+    compare_schema("ServerSettings", &json, schema, &spec, &mut errors);
 
     if !errors.is_empty() {
         panic!(
-            "ServerConfig ↔ OpenAPI schema drift:\n  {}",
+            "ServerSettings ↔ OpenAPI schema drift:\n  {}",
             errors.join("\n  ")
         );
     }
diff --git a/lib/crates/fabro-cli/src/cli_config.rs b/lib/crates/fabro-cli/src/cli_config.rs
index 676b45063..245694e62 100644
--- a/lib/crates/fabro-cli/src/cli_config.rs
+++ b/lib/crates/fabro-cli/src/cli_config.rs
@@ -8,7 +8,7 @@ use fabro_config::FabroSettings;
 #[cfg(feature = "server")]
 use tracing::debug;
 
-pub fn load_cli_config(path: Option<&Path>) -> anyhow::Result<FabroSettings> {
+pub fn load_cli_settings(path: Option<&Path>) -> anyhow::Result<FabroSettings> {
     fabro_config::cli::load_cli_config(path)?.try_into()
 }
 
diff --git a/lib/crates/fabro-cli/src/commands/asset/cp.rs b/lib/crates/fabro-cli/src/commands/asset/cp.rs
index 4976b2d9e..d21da42cf 100644
--- a/lib/crates/fabro-cli/src/commands/asset/cp.rs
+++ b/lib/crates/fabro-cli/src/commands/asset/cp.rs
@@ -6,7 +6,7 @@ use crate::args::AssetCpArgs;
 use crate::shared::split_run_path;
 
 pub fn cp_command(args: &AssetCpArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let (run_id, asset_path) = parse_source(&args.source);
     let run = fabro_workflows::run_lookup::resolve_run(&base, run_id)?;
diff --git a/lib/crates/fabro-cli/src/commands/asset/list.rs b/lib/crates/fabro-cli/src/commands/asset/list.rs
index 58a6309a4..4eb3c37d8 100644
--- a/lib/crates/fabro-cli/src/commands/asset/list.rs
+++ b/lib/crates/fabro-cli/src/commands/asset/list.rs
@@ -4,7 +4,7 @@ use crate::args::AssetListArgs;
 use crate::shared::format_size;
 
 pub fn list_command(args: &AssetListArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run = fabro_workflows::run_lookup::resolve_run(&base, &args.run_id)?;
     let entries = fabro_workflows::assets::scan_assets(&run.path, args.node.as_deref())?;
diff --git a/lib/crates/fabro-cli/src/commands/doctor.rs b/lib/crates/fabro-cli/src/commands/doctor.rs
index ea7f3c2d6..eae34fc28 100644
--- a/lib/crates/fabro-cli/src/commands/doctor.rs
+++ b/lib/crates/fabro-cli/src/commands/doctor.rs
@@ -928,7 +928,7 @@ pub async fn run_doctor(verbose: bool, live: bool) -> i32 {
     spinner.enable_steady_tick(std::time::Duration::from_millis(80));
 
     // Gather state
-    let cli_config = crate::cli_config::load_cli_config(None).unwrap_or_default();
+    let cli_config = crate::cli_config::load_cli_settings(None).unwrap_or_default();
 
     let config_path = dirs::home_dir().map(|h| h.join(".fabro").join("cli.toml"));
     let config_exists = config_path.as_ref().is_some_and(|p| p.exists());
@@ -943,9 +943,7 @@ pub async fn run_doctor(verbose: bool, live: bool) -> i32 {
     let daytona_configured = std::env::var("DAYTONA_API_KEY").is_ok();
 
     #[cfg(feature = "server")]
-    let server_config = fabro_config::server::load_server_config(None)
-        .and_then(fabro_config::FabroSettings::try_from)
-        .unwrap_or_default();
+    let server_config = fabro_config::server::load_server_settings(None).unwrap_or_default();
 
     #[cfg(feature = "server")]
     let api_status = {
diff --git a/lib/crates/fabro-cli/src/commands/exec.rs b/lib/crates/fabro-cli/src/commands/exec.rs
index c0c5abc02..3b607e2bb 100644
--- a/lib/crates/fabro-cli/src/commands/exec.rs
+++ b/lib/crates/fabro-cli/src/commands/exec.rs
@@ -4,7 +4,7 @@ use crate::args::GlobalArgs;
 use crate::cli_config;
 
 pub async fn execute(mut args: fabro_agent::cli::AgentArgs, globals: &GlobalArgs) -> Result<()> {
-    let cli_config = cli_config::load_cli_config(None)?;
+    let cli_config = cli_config::load_cli_settings(None)?;
     #[cfg(feature = "sleep_inhibitor")]
     let _sleep_guard = crate::sleep_inhibitor::guard(cli_config.prevent_idle_sleep_enabled());
     let exec_defaults = cli_config.exec.as_ref();
diff --git a/lib/crates/fabro-cli/src/commands/llm/mod.rs b/lib/crates/fabro-cli/src/commands/llm/mod.rs
index a4ebf8247..76ef04d0a 100644
--- a/lib/crates/fabro-cli/src/commands/llm/mod.rs
+++ b/lib/crates/fabro-cli/src/commands/llm/mod.rs
@@ -6,7 +6,7 @@ use anyhow::Result;
 use crate::args::{GlobalArgs, LlmCommand, LlmNamespace};
 
 pub async fn dispatch(ns: LlmNamespace, globals: &GlobalArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
 
     match ns.command {
         LlmCommand::Prompt(args) => prompt::execute(args, &cli_config, globals).await,
diff --git a/lib/crates/fabro-cli/src/commands/model.rs b/lib/crates/fabro-cli/src/commands/model.rs
index 61ff875b1..6c4250770 100644
--- a/lib/crates/fabro-cli/src/commands/model.rs
+++ b/lib/crates/fabro-cli/src/commands/model.rs
@@ -11,7 +11,7 @@ pub async fn execute(
     let server = {
         #[cfg(feature = "server")]
         {
-            let cli_config = cli_config::load_cli_config(None)?;
+            let cli_config = cli_config::load_cli_settings(None)?;
             let resolved = cli_config::resolve_mode(
                 globals.mode.clone(),
                 globals.server_url.as_deref(),
diff --git a/lib/crates/fabro-cli/src/commands/pr/close.rs b/lib/crates/fabro-cli/src/commands/pr/close.rs
index 6ca7be3c9..e45b9a136 100644
--- a/lib/crates/fabro-cli/src/commands/pr/close.rs
+++ b/lib/crates/fabro-cli/src/commands/pr/close.rs
@@ -9,7 +9,7 @@ pub async fn close_command(
     args: PrCloseArgs,
     github_app: Option<fabro_github::GitHubAppCredentials>,
 ) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     close_from(&base, args, github_app).await
 }
diff --git a/lib/crates/fabro-cli/src/commands/pr/create.rs b/lib/crates/fabro-cli/src/commands/pr/create.rs
index 82995b900..705ef6397 100644
--- a/lib/crates/fabro-cli/src/commands/pr/create.rs
+++ b/lib/crates/fabro-cli/src/commands/pr/create.rs
@@ -10,7 +10,7 @@ pub async fn create_command(
     args: PrCreateArgs,
     github_app: Option<fabro_github::GitHubAppCredentials>,
 ) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     create_from(&base, args, github_app).await
 }
diff --git a/lib/crates/fabro-cli/src/commands/pr/list.rs b/lib/crates/fabro-cli/src/commands/pr/list.rs
index dc34a04eb..840d77e26 100644
--- a/lib/crates/fabro-cli/src/commands/pr/list.rs
+++ b/lib/crates/fabro-cli/src/commands/pr/list.rs
@@ -9,7 +9,7 @@ pub async fn list_command(
     args: PrListArgs,
     github_app: Option<fabro_github::GitHubAppCredentials>,
 ) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     list_from(&base, args, github_app).await
 }
diff --git a/lib/crates/fabro-cli/src/commands/pr/merge.rs b/lib/crates/fabro-cli/src/commands/pr/merge.rs
index 7a257f63d..75430017d 100644
--- a/lib/crates/fabro-cli/src/commands/pr/merge.rs
+++ b/lib/crates/fabro-cli/src/commands/pr/merge.rs
@@ -9,7 +9,7 @@ pub async fn merge_command(
     args: PrMergeArgs,
     github_app: Option<fabro_github::GitHubAppCredentials>,
 ) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     merge_from(&base, args, github_app).await
 }
diff --git a/lib/crates/fabro-cli/src/commands/pr/mod.rs b/lib/crates/fabro-cli/src/commands/pr/mod.rs
index e199a5757..3936b05a6 100644
--- a/lib/crates/fabro-cli/src/commands/pr/mod.rs
+++ b/lib/crates/fabro-cli/src/commands/pr/mod.rs
@@ -11,7 +11,7 @@ use anyhow::{Context, Result};
 use crate::args::{PrCommand, PrNamespace};
 
 pub async fn dispatch(ns: PrNamespace) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let github_app = crate::shared::github::build_github_app_credentials(cli_config.app_id());
 
     match ns.command {
diff --git a/lib/crates/fabro-cli/src/commands/pr/view.rs b/lib/crates/fabro-cli/src/commands/pr/view.rs
index 04a29bcd6..720d0fed4 100644
--- a/lib/crates/fabro-cli/src/commands/pr/view.rs
+++ b/lib/crates/fabro-cli/src/commands/pr/view.rs
@@ -9,7 +9,7 @@ pub async fn view_command(
     args: PrViewArgs,
     github_app: Option<fabro_github::GitHubAppCredentials>,
 ) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     view_from(&base, args, github_app).await
 }
diff --git a/lib/crates/fabro-cli/src/commands/preflight.rs b/lib/crates/fabro-cli/src/commands/preflight.rs
index 8d515cafc..89d1f8c6b 100644
--- a/lib/crates/fabro-cli/src/commands/preflight.rs
+++ b/lib/crates/fabro-cli/src/commands/preflight.rs
@@ -29,11 +29,8 @@ pub async fn execute(mut args: PreflightArgs) -> anyhow::Result<()> {
     let git_status =
         fabro_workflows::git::sync_status(&original_cwd, "origin", detected_base_branch.as_deref());
 
-    let sandbox_provider = resolve_sandbox_provider(
-        args.sandbox.map(Into::into),
-        Some(&source_input.config),
-        &source_input.run_defaults,
-    )?;
+    let sandbox_provider =
+        resolve_sandbox_provider(args.sandbox.map(Into::into), &source_input.settings)?;
 
     let validated = fabro_workflows::operations::validate(
         &source_input.raw_source,
@@ -45,7 +42,7 @@ pub async fn execute(mut args: PreflightArgs) -> anyhow::Result<()> {
                     .unwrap_or(Path::new("."))
                     .to_path_buf(),
             ),
-            config: Some(source_input.config.clone()),
+            settings: Some(source_input.settings.clone()),
             goal_override: source_input.goal_override.clone(),
             ..Default::default()
         },
@@ -57,10 +54,9 @@ pub async fn execute(mut args: PreflightArgs) -> anyhow::Result<()> {
 
     run_preflight(
         validated.graph(),
-        &Some(source_input.config),
+        &source_input.settings,
         args.model.as_deref(),
         args.provider.as_deref(),
-        &source_input.run_defaults,
         git_status,
         sandbox_provider,
         styles,
diff --git a/lib/crates/fabro-cli/src/commands/repo/init.rs b/lib/crates/fabro-cli/src/commands/repo/init.rs
index a322666ca..9a3928f7d 100644
--- a/lib/crates/fabro-cli/src/commands/repo/init.rs
+++ b/lib/crates/fabro-cli/src/commands/repo/init.rs
@@ -150,7 +150,7 @@ async fn check_github_app_installation() {
     };
 
     // Load CLI config to get app_id and slug
-    let cli_config = match crate::cli_config::load_cli_config(None) {
+    let cli_config = match crate::cli_config::load_cli_settings(None) {
         Ok(c) => c,
         Err(_) => return,
     };
diff --git a/lib/crates/fabro-cli/src/commands/run/attach.rs b/lib/crates/fabro-cli/src/commands/run/attach.rs
index 34b2fd4c9..f8cd61091 100644
--- a/lib/crates/fabro-cli/src/commands/run/attach.rs
+++ b/lib/crates/fabro-cli/src/commands/run/attach.rs
@@ -42,7 +42,7 @@ pub async fn attach_run(
 
     let is_tty = std::io::stderr().is_terminal();
     let verbose = fabro_workflows::records::RunRecord::load(run_dir)
-        .map(|record| record.config.verbose_enabled())
+        .map(|record| record.settings.verbose_enabled())
         .unwrap_or(false);
     let mut progress_ui = run_progress::ProgressUI::new(is_tty, verbose);
 
diff --git a/lib/crates/fabro-cli/src/commands/run/cp.rs b/lib/crates/fabro-cli/src/commands/run/cp.rs
index 848cf6d6d..c19ff523e 100644
--- a/lib/crates/fabro-cli/src/commands/run/cp.rs
+++ b/lib/crates/fabro-cli/src/commands/run/cp.rs
@@ -21,7 +21,7 @@ enum CopyDirection {
 
 pub async fn cp_command(args: CpArgs) -> Result<()> {
     let direction = parse_direction(&args.src, &args.dst)?;
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
 
     match direction {
diff --git a/lib/crates/fabro-cli/src/commands/run/create.rs b/lib/crates/fabro-cli/src/commands/run/create.rs
index c45a03994..0ccf77a2d 100644
--- a/lib/crates/fabro-cli/src/commands/run/create.rs
+++ b/lib/crates/fabro-cli/src/commands/run/create.rs
@@ -33,7 +33,7 @@ pub async fn create_run(
     let run_dir = match args
         .storage_dir
         .clone()
-        .or_else(|| source_input.config.storage_dir.clone())
+        .or_else(|| source_input.settings.storage_dir.clone())
     {
         Some(sd) => make_run_dir(&sd.join("runs"), &run_id, args.dry_run),
         None => default_run_dir(&run_id, args.dry_run),
@@ -43,24 +43,20 @@ pub async fn create_run(
         .ok()
         .and_then(|(_, branch)| branch);
     if !args.dry_run {
-        let _ = resolve_sandbox_provider(
-            args.sandbox.map(Into::into),
-            Some(&source_input.config),
-            &source_input.run_defaults,
-        )?;
+        let _ = resolve_sandbox_provider(args.sandbox.map(Into::into), &source_input.settings)?;
     }
 
-    let config = source_input.config.clone();
+    let settings = source_input.settings.clone();
 
     let persisted = match fabro_workflows::operations::create(
         &source_input.raw_source,
         fabro_workflows::operations::RunCreateOptions {
-            config,
+            settings,
             run_dir: Some(run_dir.clone()),
             run_id: Some(run_id.clone()),
             workflow_slug: source_input.workflow_slug.clone(),
             labels: {
-                let mut labels = source_input.config.labels.clone();
+                let mut labels = source_input.settings.labels.clone();
                 labels.extend(parse_labels(&args.label));
                 labels
             },
diff --git a/lib/crates/fabro-cli/src/commands/run/detached.rs b/lib/crates/fabro-cli/src/commands/run/detached.rs
index 9f63f9bd4..fbf9be5dd 100644
--- a/lib/crates/fabro-cli/src/commands/run/detached.rs
+++ b/lib/crates/fabro-cli/src/commands/run/detached.rs
@@ -16,7 +16,7 @@ pub async fn execute(storage_dir: PathBuf, run_id: String, resume: bool) -> Resu
     let run_dir = fabro_workflows::run_lookup::find_run_by_prefix(&runs_base, &run_id)?;
     let styles: &'static fabro_util::terminal::Styles =
         Box::leak(Box::new(fabro_util::terminal::Styles::detect_stderr()));
-    let cli_config = cli_config::load_cli_config(None)?;
+    let cli_config = cli_config::load_cli_settings(None)?;
     let github_app = shared::github::build_github_app_credentials(cli_config.app_id());
     let git_author = fabro_workflows::git::GitAuthor::from_options(
         cli_config.git_author().and_then(|a| a.name.clone()),
@@ -54,22 +54,14 @@ pub async fn execute(storage_dir: PathBuf, run_id: String, resume: bool) -> Resu
         super::execute::resume_from_record(
             persisted,
             run_dir.clone(),
-            cli_config,
             styles,
             github_app,
             git_author,
         )
         .await
     } else {
-        super::execute::run_from_record(
-            persisted,
-            run_dir.clone(),
-            cli_config,
-            styles,
-            github_app,
-            git_author,
-        )
-        .await
+        super::execute::run_from_record(persisted, run_dir.clone(), styles, github_app, git_author)
+            .await
     };
 
     match result {
diff --git a/lib/crates/fabro-cli/src/commands/run/diff.rs b/lib/crates/fabro-cli/src/commands/run/diff.rs
index 043328db6..50afb41fc 100644
--- a/lib/crates/fabro-cli/src/commands/run/diff.rs
+++ b/lib/crates/fabro-cli/src/commands/run/diff.rs
@@ -8,7 +8,7 @@ use crate::args::DiffArgs;
 
 pub async fn run(args: DiffArgs) -> Result<()> {
     info!(run_id = %args.run, "Showing diff");
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run_dir = fabro_workflows::run_lookup::resolve_run(&base, &args.run)?.path;
 
diff --git a/lib/crates/fabro-cli/src/commands/run/execute.rs b/lib/crates/fabro-cli/src/commands/run/execute.rs
index b44a66907..7595a51ef 100644
--- a/lib/crates/fabro-cli/src/commands/run/execute.rs
+++ b/lib/crates/fabro-cli/src/commands/run/execute.rs
@@ -32,7 +32,7 @@ use tracing::debug;
 
 use super::detached::{DetachedRunBootstrapGuard, DetachedRunCompletionGuard};
 use super::run_progress;
-use crate::args::{CliSandboxProvider, GlobalArgs, PreflightArgs, RunArgs};
+use crate::args::{GlobalArgs, PreflightArgs, RunArgs};
 use crate::shared::{
     format_tokens_human, print_diagnostics, read_workflow_file, relative_path, tilde_path,
 };
@@ -149,45 +149,27 @@ pub(crate) fn workflow_slug_from_path(workflow_path: &Path) -> Option<String> {
     Some(file_stem.into_owned())
 }
 
-fn is_cached_run_restart(workflow_path: &Path, run_dir: &Path) -> bool {
-    workflow_path.starts_with(run_dir)
-        && workflow_path.file_name().is_some_and(|f| {
-            f == std::ffi::OsStr::new(RUN_CONFIG_FILE) || f == std::ffi::OsStr::new(RUN_GRAPH_FILE)
-        })
-}
-
-/// Resolve model and provider through the full precedence chain:
-/// CLI flag > TOML config > run defaults > DOT graph attrs > provider-specific defaults.
+/// Resolve model and provider from resolved settings, with graph attrs as fallback.
 /// Then resolve through the catalog for alias expansion.
 pub(crate) fn resolve_model_provider(
     cli_model: Option<&str>,
     cli_provider: Option<&str>,
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
+    settings: &FabroSettings,
     graph: &fabro_graphviz::graph::Graph,
 ) -> (String, Option<String>) {
-    let toml_model = run_cfg
-        .and_then(|c| c.llm.as_ref())
-        .and_then(|l| l.model.as_deref());
-    let toml_provider = run_cfg
-        .and_then(|c| c.llm.as_ref())
-        .and_then(|l| l.provider.as_deref());
-    let defaults_model = run_defaults.llm.as_ref().and_then(|l| l.model.as_deref());
-    let defaults_provider = run_defaults
+    let configured_model = settings.llm.as_ref().and_then(|llm| llm.model.as_deref());
+    let configured_provider = settings
         .llm
         .as_ref()
-        .and_then(|l| l.provider.as_deref());
+        .and_then(|llm| llm.provider.as_deref());
 
-    // Precedence: CLI flag > TOML > run defaults > DOT graph attrs > defaults
     let provider = cli_provider
-        .or(toml_provider)
-        .or(defaults_provider)
+        .or(configured_provider)
         .or_else(|| graph.attrs.get("default_provider").and_then(|v| v.as_str()))
         .map(String::from);
 
     let model = cli_model
-        .or(toml_model)
-        .or(defaults_model)
+        .or(configured_model)
         .or_else(|| graph.attrs.get("default_model").and_then(|v| v.as_str()))
         .map(String::from)
         .unwrap_or_else(|| {
@@ -210,89 +192,62 @@ pub(crate) fn resolve_model_provider(
     }
 }
 
-/// Parse sandbox provider from an optional `SandboxConfig`.
+/// Parse sandbox provider from resolved settings.
 pub(crate) fn parse_sandbox_provider(
-    sandbox: Option<&sandbox_config::SandboxSettings>,
+    settings: &FabroSettings,
 ) -> anyhow::Result<Option<SandboxProvider>> {
-    sandbox
+    settings
+        .sandbox_settings()
         .and_then(|s| s.provider.as_deref())
         .map(|s| s.parse::<SandboxProvider>())
         .transpose()
         .map_err(|e| anyhow::anyhow!("Invalid sandbox provider: {e}"))
 }
 
-/// Resolve sandbox provider: CLI flag > TOML config > run defaults > default.
+/// Resolve sandbox provider: CLI flag > settings > default.
 pub(crate) fn resolve_sandbox_provider(
     cli: Option<SandboxProvider>,
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
+    settings: &FabroSettings,
 ) -> anyhow::Result<SandboxProvider> {
-    let toml = parse_sandbox_provider(run_cfg.and_then(|c| c.sandbox.as_ref()))?;
-    let defaults = parse_sandbox_provider(run_defaults.sandbox.as_ref())?;
-    Ok(cli.or(toml).or(defaults).unwrap_or_default())
+    Ok(cli
+        .or(parse_sandbox_provider(settings)?)
+        .unwrap_or_default())
 }
 
-/// Resolve preserve-sandbox: CLI flag > TOML config > run defaults > false.
-pub(crate) fn resolve_preserve_sandbox(
-    cli: bool,
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
-) -> bool {
+/// Resolve preserve-sandbox: CLI flag > settings > false.
+pub(crate) fn resolve_preserve_sandbox(cli: bool, settings: &FabroSettings) -> bool {
     if cli {
         return true;
     }
-    run_cfg
-        .and_then(|c| c.sandbox.as_ref())
-        .and_then(|s| s.preserve)
-        .or_else(|| run_defaults.sandbox.as_ref().and_then(|s| s.preserve))
-        .unwrap_or(false)
+    settings.preserve_sandbox_enabled()
 }
 
-/// Resolve worktree mode: TOML config > run defaults > Clean.
-fn resolve_worktree_mode(
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
-) -> sandbox_config::WorktreeMode {
-    run_cfg
-        .and_then(|c| c.sandbox.as_ref())
+/// Resolve worktree mode from settings, defaulting to `Clean`.
+fn resolve_worktree_mode(settings: &FabroSettings) -> sandbox_config::WorktreeMode {
+    settings
+        .sandbox_settings()
         .and_then(|s| s.local.as_ref())
         .map(|l| l.worktree_mode)
-        .unwrap_or_else(|| {
-            run_defaults
-                .sandbox
-                .as_ref()
-                .and_then(|s| s.local.as_ref())
-                .map(|l| l.worktree_mode)
-                .unwrap_or_default()
-        })
+        .unwrap_or_default()
 }
 
-/// Resolve daytona config: TOML config > run defaults.
+/// Resolve Daytona config from settings.
 pub(crate) fn resolve_daytona_config(
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
+    settings: &FabroSettings,
 ) -> Option<fabro_sandbox::daytona::DaytonaConfig> {
-    run_cfg
-        .and_then(|c| c.sandbox.as_ref())
-        .and_then(|e| e.daytona.clone())
-        .or_else(|| {
-            run_defaults
-                .sandbox
-                .as_ref()
-                .and_then(|s| s.daytona.clone())
-        })
+    settings
+        .sandbox_settings()
+        .and_then(|sandbox| sandbox.daytona.clone())
 }
 
 #[cfg(feature = "exedev")]
-/// Resolve exe.dev config: TOML config > run defaults.
+/// Resolve exe.dev config from settings.
 pub(crate) fn resolve_exe_config(
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
+    settings: &FabroSettings,
 ) -> Option<fabro_sandbox::exe::ExeConfig> {
-    run_cfg
-        .and_then(|c| c.sandbox.as_ref())
-        .and_then(|e| e.exe.clone())
-        .or_else(|| run_defaults.sandbox.as_ref().and_then(|s| s.exe.clone()))
+    settings
+        .sandbox_settings()
+        .and_then(|sandbox| sandbox.exe.clone())
 }
 
 #[cfg(feature = "exedev")]
@@ -314,15 +269,13 @@ pub(crate) fn resolve_exe_clone_params(
     Some(fabro_sandbox::exe::GitCloneParams { url, branch })
 }
 
-/// Resolve SSH sandbox config: TOML config > run defaults.
+/// Resolve SSH sandbox config from settings.
 pub(crate) fn resolve_ssh_config(
-    run_cfg: Option<&FabroSettings>,
-    run_defaults: &FabroSettings,
+    settings: &FabroSettings,
 ) -> Option<fabro_sandbox::ssh::SshConfig> {
-    run_cfg
-        .and_then(|c| c.sandbox.as_ref())
-        .and_then(|e| e.ssh.clone())
-        .or_else(|| run_defaults.sandbox.as_ref().and_then(|s| s.ssh.clone()))
+    settings
+        .sandbox_settings()
+        .and_then(|sandbox| sandbox.ssh.clone())
 }
 
 /// Resolve SSH sandbox git clone parameters from the current repo.
@@ -347,11 +300,9 @@ pub(crate) fn resolve_ssh_clone_params(
 pub(crate) fn resolve_fallback_chain(
     provider: Provider,
     model: &str,
-    run_cfg: Option<&FabroSettings>,
+    settings: &FabroSettings,
 ) -> Vec<FallbackTarget> {
-    let fallbacks = run_cfg
-        .and_then(|c| c.llm.as_ref())
-        .and_then(|l| l.fallbacks.as_ref());
+    let fallbacks = settings.llm.as_ref().and_then(|l| l.fallbacks.as_ref());
 
     match fallbacks {
         Some(map) => Catalog::builtin().build_fallback_chain(provider, model, map),
@@ -516,20 +467,13 @@ pub(crate) fn print_diagnostics_from_error(
 
 pub(crate) struct WorkflowSourceInput {
     pub raw_source: String,
-    pub config: FabroSettings,
+    pub settings: FabroSettings,
     pub workflow_slug: Option<String>,
-    pub run_defaults: FabroSettings,
     pub workflow_toml_path: Option<PathBuf>,
     pub dot_path: PathBuf,
     pub goal_override: Option<String>,
 }
 
-#[allow(dead_code)]
-enum WorkflowState {
-    Source(Box<WorkflowSourceInput>),
-    Persisted(Box<Persisted>),
-}
-
 pub(crate) fn load_workflow_source_input(
     workflow: &Path,
     cli_args_config: FabroConfig,
@@ -548,21 +492,21 @@ pub(crate) fn load_workflow_source_input(
         None
     };
 
-    let config = cli_args_config
+    let settings = cli_args_config
         .combine(workflow_config.unwrap_or_default())
         .combine(project_config.unwrap_or_default())
         .combine(cli_defaults);
-    let config: FabroSettings = config.try_into()?;
+    let settings: FabroSettings = settings.try_into()?;
     let workflow_slug = workflow_slug_from_path(&resolved_workflow_path);
 
-    if let Some(dir) = config.work_dir.as_deref() {
+    if let Some(dir) = settings.work_dir.as_deref() {
         std::env::set_current_dir(dir)
             .map_err(|e| anyhow::anyhow!("Failed to set working directory to {dir}: {e}"))?;
     }
 
     let raw_source = read_workflow_file(&dot_path)?;
-    let goal_override = config.goal.clone().or_else(|| {
-        config
+    let goal_override = settings.goal.clone().or_else(|| {
+        settings
             .goal_file
             .as_ref()
             .and_then(|path| resolve_cli_goal(None, Some(path)).ok().flatten())
@@ -579,163 +523,36 @@ pub(crate) fn load_workflow_source_input(
 
     Ok(WorkflowSourceInput {
         raw_source,
-        config: config.clone(),
+        settings,
         workflow_slug,
-        run_defaults: config,
         workflow_toml_path,
         dot_path,
         goal_override,
     })
 }
 
-/// Pre-prepared run state, used to skip workflow preparation in `run_command_impl`.
-struct RecordBasedRun {
-    workflow: WorkflowState,
-    run_defaults: FabroSettings,
-}
-
 /// Execute a workflow run from a saved RunRecord, bypassing workflow preparation.
 ///
 /// Used by `run_engine_entrypoint` for detached runs that already have a RunRecord on disk.
 pub async fn run_from_record(
     persisted: Persisted,
     _run_dir: PathBuf,
-    run_defaults: FabroSettings,
     styles: &'static Styles,
     github_app: Option<fabro_github::GitHubAppCredentials>,
     git_author: fabro_workflows::git::GitAuthor,
 ) -> anyhow::Result<()> {
-    let record = persisted.run_record().clone();
-    let record_run = RecordBasedRun {
-        workflow: WorkflowState::Persisted(Box::new(persisted)),
-        run_defaults,
-    };
-
-    let sandbox_provider = record
-        .config
-        .sandbox
-        .as_ref()
-        .and_then(|s| s.provider.as_deref())
-        .unwrap_or("local")
-        .parse()
-        .unwrap_or(SandboxProvider::Local);
-    let model = record
-        .config
-        .llm
-        .as_ref()
-        .and_then(|l| l.model.clone())
-        .unwrap_or_default();
-    let provider = record
-        .config
-        .llm
-        .as_ref()
-        .and_then(|l| l.provider.clone())
-        .filter(|s| !s.is_empty());
-
-    let args = RunArgs {
-        workflow: None,
-        storage_dir: None,
-        dry_run: record.config.dry_run_enabled(),
-
-        auto_approve: record.config.auto_approve_enabled(),
-        goal: record.config.goal.clone(),
-        goal_file: None,
-        model: Some(model),
-        provider,
-        verbose: record.config.verbose_enabled(),
-        sandbox: Some(CliSandboxProvider::from(sandbox_provider)),
-        label: record
-            .labels
-            .iter()
-            .map(|(k, v)| format!("{k}={v}"))
-            .collect(),
-        no_retro: record.config.no_retro_enabled(),
-        preserve_sandbox: record
-            .config
-            .sandbox
-            .as_ref()
-            .and_then(|s| s.preserve)
-            .unwrap_or(false),
-        detach: false,
-        run_id: Some(record.run_id.clone()),
-    };
-
-    run_command_impl(
-        args,
-        styles,
-        github_app,
-        git_author,
-        Some(record_run),
-        false,
-    )
-    .await
+    execute_persisted_run(persisted, styles, github_app, git_author, false).await
 }
 
 /// Resume an existing workflow run from its persisted checkpoint.
 pub async fn resume_from_record(
     persisted: Persisted,
     _run_dir: PathBuf,
-    run_defaults: FabroSettings,
     styles: &'static Styles,
     github_app: Option<fabro_github::GitHubAppCredentials>,
     git_author: fabro_workflows::git::GitAuthor,
 ) -> anyhow::Result<()> {
-    let record = persisted.run_record().clone();
-    let record_run = RecordBasedRun {
-        workflow: WorkflowState::Persisted(Box::new(persisted)),
-        run_defaults,
-    };
-
-    let sandbox_provider = record
-        .config
-        .sandbox
-        .as_ref()
-        .and_then(|s| s.provider.as_deref())
-        .unwrap_or("local")
-        .parse()
-        .unwrap_or(SandboxProvider::Local);
-    let model = record
-        .config
-        .llm
-        .as_ref()
-        .and_then(|l| l.model.clone())
-        .unwrap_or_default();
-    let provider = record
-        .config
-        .llm
-        .as_ref()
-        .and_then(|l| l.provider.clone())
-        .filter(|s| !s.is_empty());
-
-    let args = RunArgs {
-        workflow: None,
-        storage_dir: None,
-        dry_run: record.config.dry_run_enabled(),
-
-        auto_approve: record.config.auto_approve_enabled(),
-        goal: record.config.goal.clone(),
-        goal_file: None,
-        model: Some(model),
-        provider,
-        verbose: record.config.verbose_enabled(),
-        sandbox: Some(CliSandboxProvider::from(sandbox_provider)),
-        label: record
-            .labels
-            .iter()
-            .map(|(k, v)| format!("{k}={v}"))
-            .collect(),
-        no_retro: record.config.no_retro_enabled(),
-        preserve_sandbox: record
-            .config
-            .sandbox
-            .as_ref()
-            .and_then(|s| s.preserve)
-            .unwrap_or(false),
-        detach: false,
-        run_id: Some(record.run_id.clone()),
-    };
-
-    run_command_impl(args, styles, github_app, git_author, Some(record_run), true).await
+    execute_persisted_run(persisted, styles, github_app, git_author, true).await
 }
 
 fn ensure_resume_target_is_not_already_successful(run_dir: &Path) -> anyhow::Result<()> {
@@ -797,21 +614,15 @@ pub async fn execute(mut args: RunArgs, _globals: &GlobalArgs) -> anyhow::Result
     Ok(())
 }
 
-async fn run_command_impl(
-    args: RunArgs,
+async fn execute_persisted_run(
+    persisted: Persisted,
     styles: &'static Styles,
     github_app: Option<fabro_github::GitHubAppCredentials>,
     git_author: fabro_workflows::git::GitAuthor,
-    record_run: Option<RecordBasedRun>,
     resume: bool,
 ) -> anyhow::Result<()> {
-    let (workflow, run_defaults) = match record_run {
-        Some(rr) => (rr.workflow, rr.run_defaults),
-        None => unreachable!("run_command_impl always receives a RecordBasedRun"),
-    };
-
-    // For record-based runs from run_from_record, the workflow has already been persisted.
-    let from_record = matches!(&workflow, WorkflowState::Persisted(_)) && args.workflow.is_none();
+    let run_record = persisted.run_record().clone();
+    let mut settings = run_record.settings.clone();
 
     // Pre-flight: check git cleanliness before creating any files
     let original_cwd = std::env::current_dir()?;
@@ -820,140 +631,29 @@ async fn run_command_impl(
             .map(|(url, branch)| (Some(url), branch))
             .unwrap_or((None, None));
 
-    // 3. Create logs directory
-    // Extract values from args before partial move
-    let dry_run_flag = args.dry_run;
-    let auto_approve_flag = args.auto_approve;
-    let no_retro_flag = args.no_retro;
-    let verbose_flag = args.verbose;
-    let label_vec = args.label.clone();
-    let run_id = args
-        .run_id
-        .clone()
-        .unwrap_or_else(|| ulid::Ulid::new().to_string());
-    let run_dir = match &workflow {
-        WorkflowState::Persisted(p) => p.run_dir().to_path_buf(),
-        _ => match &args.storage_dir {
-            Some(sd) => make_run_dir(&sd.join("runs"), &run_id, dry_run_flag),
-            None => default_run_dir(&run_id, dry_run_flag),
-        },
-    };
+    let dry_run_flag = settings.dry_run_enabled();
+    let auto_approve_flag = settings.auto_approve_enabled();
+    let no_retro_flag = settings.no_retro_enabled();
+    let verbose_flag = settings.verbose_enabled();
+    let run_id = run_record.run_id.clone();
+    let run_dir = persisted.run_dir().to_path_buf();
+
     if resume {
         ensure_resume_target_is_not_already_successful(&run_dir)?;
     }
-    let cached_run_restart = match &workflow {
-        WorkflowState::Source(_) if !from_record => {
-            let workflow_path = args.workflow.as_ref().unwrap();
-            is_cached_run_restart(workflow_path, &run_dir)
-        }
-        _ => false,
-    };
-
-    let (persisted, raw_source, workflow_toml_path) = match workflow {
-        WorkflowState::Persisted(persisted) => (*persisted, String::new(), None),
-        WorkflowState::Source(source_input) if cached_run_restart => (
-            Persisted::load(&run_dir)?,
-            source_input.raw_source,
-            source_input.workflow_toml_path,
-        ),
-        WorkflowState::Source(source_input) => {
-            let config = source_input.config.clone();
-
-            match fabro_workflows::operations::create(
-                &source_input.raw_source,
-                fabro_workflows::operations::RunCreateOptions {
-                    config,
-                    run_dir: Some(run_dir.clone()),
-                    run_id: Some(run_id.clone()),
-                    workflow_slug: source_input.workflow_slug.clone(),
-                    labels: {
-                        let mut labels = source_input.config.labels.clone();
-                        labels.extend(parse_labels(&label_vec));
-                        labels
-                    },
-                    base_branch: detected_base_branch.clone(),
-                    working_directory: Some(original_cwd.clone()),
-                    host_repo_path: Some(original_cwd.to_string_lossy().to_string()),
-                    goal_override: source_input.goal_override.clone(),
-                    base_dir: Some(
-                        source_input
-                            .dot_path
-                            .parent()
-                            .unwrap_or(Path::new("."))
-                            .to_path_buf(),
-                    ),
-                },
-            ) {
-                Ok(persisted) => {
-                    print_workflow_report_from_persisted(
-                        &persisted,
-                        &source_input.dot_path,
-                        styles,
-                    );
-                    (
-                        persisted,
-                        source_input.raw_source,
-                        source_input.workflow_toml_path,
-                    )
-                }
-                Err(fabro_workflows::error::FabroError::ValidationFailed { diagnostics }) => {
-                    print_diagnostics_from_error(&diagnostics, styles);
-                    bail!("Validation failed");
-                }
-                Err(err) => return Err(err.into()),
-            }
-        }
-    };
-    let mut run_cfg = Some(persisted.run_record().config.clone());
-    let sandbox_provider = run_cfg
-        .as_ref()
-        .and_then(|cfg| cfg.sandbox.as_ref())
-        .and_then(|sandbox| sandbox.provider.as_deref())
-        .unwrap_or("local")
-        .parse()
-        .unwrap_or(SandboxProvider::Local);
-    let model = run_cfg
-        .as_ref()
-        .and_then(|cfg| cfg.llm.as_ref())
-        .and_then(|llm| llm.model.clone())
-        .unwrap_or_default();
-    let provider = run_cfg
-        .as_ref()
-        .and_then(|cfg| cfg.llm.as_ref())
-        .and_then(|llm| llm.provider.clone())
-        .filter(|value| !value.is_empty());
-    let preserve_sandbox =
-        resolve_preserve_sandbox(args.preserve_sandbox, run_cfg.as_ref(), &run_defaults);
-    let setup_commands: Vec<String> = run_cfg
-        .as_ref()
-        .and_then(|c| c.setup.as_ref())
-        .or(run_defaults.setup.as_ref())
-        .map(|s| s.commands.clone())
-        .unwrap_or_default();
 
     tokio::fs::create_dir_all(&run_dir).await?;
     fabro_util::run_log::activate(&run_dir.join("cli.log"))
         .context("Failed to activate per-run log")?;
-    if !from_record && !raw_source.is_empty() {
-        tokio::fs::write(cached_graph_path(&run_dir), &raw_source).await?;
-    }
     let mut status_guard = DetachedRunBootstrapGuard::arm(&run_dir)?;
 
-    // Copy the original workflow TOML as a debug artifact.
-    // Skip for record-based runs (already exists) and cached restarts.
-    if !from_record && !cached_run_restart {
-        write_run_config_snapshot(&run_dir, workflow_toml_path.as_deref()).await?;
-    }
-
     // Now resolve ${env.VARNAME} references for runtime use.
-    if let Some(ref mut cfg) = run_cfg {
-        if let Some(env) = cfg
-            .sandbox
-            .as_mut()
-            .and_then(|sandbox| sandbox.env.as_mut())
-        {
-            run_config::resolve_env_refs(env)?;
-        }
+    if let Some(env) = settings
+        .sandbox
+        .as_mut()
+        .and_then(|sandbox| sandbox.env.as_mut())
+    {
+        run_config::resolve_env_refs(env)?;
     }
 
     // Create progress UI (used for both normal and verbose modes)
@@ -1010,12 +710,26 @@ async fn run_command_impl(
     };
 
     let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("."));
-    let daytona_config = resolve_daytona_config(run_cfg.as_ref(), &run_defaults);
+    let daytona_config = resolve_daytona_config(&settings);
     #[cfg(feature = "exedev")]
-    let exe_config = resolve_exe_config(run_cfg.as_ref(), &run_defaults);
-    let ssh_config = resolve_ssh_config(run_cfg.as_ref(), &run_defaults);
+    let exe_config = resolve_exe_config(&settings);
+    let ssh_config = resolve_ssh_config(&settings);
     let emitter = Arc::new(emitter);
 
+    let sandbox_provider = resolve_sandbox_provider(None, &settings)?;
+    let model = settings
+        .llm
+        .as_ref()
+        .and_then(|llm| llm.model.clone())
+        .unwrap_or_default();
+    let provider = settings
+        .llm
+        .as_ref()
+        .and_then(|llm| llm.provider.clone())
+        .filter(|value| !value.is_empty());
+    let preserve_sandbox = resolve_preserve_sandbox(false, &settings);
+    let setup_commands = settings.setup_commands().to_vec();
+
     // Parse provider string to enum (defaults to best available from env)
     let provider_enum: Provider = provider
         .as_deref()
@@ -1024,22 +738,13 @@ async fn run_command_impl(
         .map_err(|e| anyhow::anyhow!("{e}"))?
         .unwrap_or_else(Provider::default_from_env);
 
-    let fallback_chain = resolve_fallback_chain(provider_enum, &model, run_cfg.as_ref());
-    let mcp_servers: Vec<fabro_mcp::config::McpServerConfig> = {
-        let servers = run_cfg
-            .as_ref()
-            .map(|c| &c.mcp_servers)
-            .unwrap_or(&run_defaults.mcp_servers);
-        servers
-            .clone()
-            .into_iter()
-            .map(
-                |(name, entry): (String, fabro_config::mcp::McpServerEntry)| {
-                    entry.into_config(name)
-                },
-            )
-            .collect()
-    };
+    let fallback_chain = resolve_fallback_chain(provider_enum, &model, &settings);
+    let mcp_servers: Vec<fabro_mcp::config::McpServerConfig> = settings
+        .mcp_server_entries()
+        .clone()
+        .into_iter()
+        .map(|(name, entry): (String, fabro_config::mcp::McpServerEntry)| entry.into_config(name))
+        .collect();
     let sandbox_spec = match sandbox_provider {
         SandboxProvider::Local => SandboxSpec::Local {
             working_directory: cwd.clone(),
@@ -1078,35 +783,20 @@ async fn run_command_impl(
         },
     };
 
-    let toml_env = if let Some(mut env) = run_cfg
-        .as_ref()
-        .and_then(|c| c.sandbox.as_ref())
-        .or(run_defaults.sandbox.as_ref())
-        .and_then(|s| s.env.clone())
-    {
-        if run_cfg.is_none() {
-            run_config::resolve_env_refs(&mut env)?;
-        }
-        env
-    } else {
-        HashMap::new()
-    };
+    let toml_env = settings
+        .sandbox_settings()
+        .and_then(|sandbox| sandbox.env.clone())
+        .unwrap_or_default();
 
     let sandbox_env = SandboxEnvSpec {
         devcontainer_env: HashMap::new(),
         toml_env,
-        github_permissions: run_cfg
-            .as_ref()
-            .and_then(|c| c.github.as_ref())
-            .or(run_defaults.github.as_ref())
-            .and_then(|cfg| (!cfg.permissions.is_empty()).then(|| cfg.permissions.clone())),
+        github_permissions: settings.github_permissions().cloned(),
         origin_url: origin_url.clone(),
     };
 
-    let devcontainer_enabled = run_cfg
-        .as_ref()
-        .and_then(|c| c.sandbox.as_ref())
-        .or(run_defaults.sandbox.as_ref())
+    let devcontainer_enabled = settings
+        .sandbox_settings()
         .and_then(|s| s.devcontainer)
         .unwrap_or(false);
 
@@ -1118,10 +808,10 @@ async fn run_command_impl(
         dry_run: dry_run_flag,
     };
 
-    let worktree_mode = resolve_worktree_mode(run_cfg.as_ref(), &run_defaults);
+    let worktree_mode = resolve_worktree_mode(&settings);
     let lifecycle = LifecycleOptions {
         setup_commands,
-        setup_command_timeout_ms: 300_000,
+        setup_command_timeout_ms: settings.setup_timeout_ms().unwrap_or(300_000),
         devcontainer_phases: Vec::new(),
     };
 
@@ -1129,7 +819,7 @@ async fn run_command_impl(
     status_guard.defuse();
 
     let run_start = Instant::now();
-    let pr_config = persisted.run_record().config.pull_request.clone();
+    let pr_config = persisted.run_record().settings.pull_request.clone();
     let start_options = StartOptions {
         cancel_token: None,
         emitter: Arc::clone(&emitter),
@@ -1138,10 +828,7 @@ async fn run_command_impl(
         interviewer: interviewer.clone(),
         lifecycle,
         hooks: fabro_hooks::HookConfig {
-            hooks: run_cfg
-                .as_ref()
-                .map(|c| c.hooks.clone())
-                .unwrap_or_else(|| run_defaults.hooks.clone()),
+            hooks: settings.hooks.clone(),
         },
         sandbox_env,
         devcontainer: devcontainer_enabled.then(|| DevcontainerSpec {
@@ -1154,7 +841,6 @@ async fn run_command_impl(
         github_app: github_app.clone(),
         worktree_mode: Some(worktree_mode),
         registry_override: None,
-        dry_run: dry_run_flag,
         retro: StartRetroOptions {
             enabled: !no_retro_flag && project_config::is_retro_enabled(),
         },
@@ -1459,10 +1145,9 @@ pub(crate) fn print_assets(run_dir: &std::path::Path, styles: &Styles) {
 #[allow(clippy::too_many_arguments)]
 pub(crate) async fn run_preflight(
     graph: &fabro_graphviz::graph::Graph,
-    run_cfg: &Option<FabroSettings>,
+    settings: &FabroSettings,
     cli_model: Option<&str>,
     cli_provider: Option<&str>,
-    run_defaults: &FabroSettings,
     git_status: GitSyncStatus,
     sandbox_provider: SandboxProvider,
     styles: &'static Styles,
@@ -1485,10 +1170,7 @@ pub(crate) async fn run_preflight(
     let mut checks: Vec<CheckResult> = Vec::new();
 
     // 1. Repository metadata
-    let setup_command_count = run_cfg
-        .as_ref()
-        .and_then(|c| c.setup.as_ref())
-        .map_or(0, |s| s.commands.len());
+    let setup_command_count = settings.setup_commands().len();
 
     let repo_summary = origin_url
         .map(|url| {
@@ -1514,13 +1196,7 @@ pub(crate) async fn run_preflight(
     });
 
     // 2. Workflow metadata
-    let (model, provider) = resolve_model_provider(
-        cli_model,
-        cli_provider,
-        run_cfg.as_ref(),
-        run_defaults,
-        graph,
-    );
+    let (model, provider) = resolve_model_provider(cli_model, cli_provider, settings, graph);
 
     checks.push(CheckResult {
         name: "Workflow".into(),
@@ -1536,10 +1212,10 @@ pub(crate) async fn run_preflight(
 
     // 2. Sandbox boot check
     let original_cwd = std::env::current_dir()?;
-    let daytona_config = resolve_daytona_config(run_cfg.as_ref(), run_defaults);
+    let daytona_config = resolve_daytona_config(settings);
     #[cfg(feature = "exedev")]
-    let exe_config = resolve_exe_config(run_cfg.as_ref(), run_defaults);
-    let ssh_config = resolve_ssh_config(run_cfg.as_ref(), run_defaults);
+    let exe_config = resolve_exe_config(settings);
+    let ssh_config = resolve_ssh_config(settings);
 
     let sandbox_result: Result<Arc<dyn Sandbox>, String> = match sandbox_provider {
         SandboxProvider::Docker => {
@@ -1731,20 +1407,15 @@ pub(crate) async fn run_preflight(
     };
 
     // 5. GitHub token preflight
-    let github_permissions = run_cfg
-        .as_ref()
-        .and_then(|c| c.github.as_ref())
-        .or(run_defaults.github.as_ref());
-    if let Some(gh_cfg) = github_permissions {
-        if !gh_cfg.permissions.is_empty() {
-            let perm_details: Vec<CheckDetail> = gh_cfg
-                .permissions
+    if let Some(github_permissions) = settings.github_permissions() {
+        if !github_permissions.is_empty() {
+            let perm_details: Vec<CheckDetail> = github_permissions
                 .iter()
                 .map(|(k, v)| CheckDetail::new(format!("{k}: {v}")))
                 .collect();
             match (&github_app, origin_url) {
                 (Some(creds), Some(url)) => {
-                    match mint_github_token(creds, url, &gh_cfg.permissions).await {
+                    match mint_github_token(creds, url, github_permissions).await {
                         Ok(_) => {
                             checks.push(CheckResult {
                                 name: "GitHub Token".into(),
@@ -1949,7 +1620,7 @@ include = ["*.md"]
             &source_input.raw_source,
             fabro_workflows::operations::ValidateOptions {
                 base_dir: Some(dir.path().to_path_buf()),
-                config: Some(source_input.config.clone()),
+                settings: Some(source_input.settings.clone()),
                 goal_override: source_input.goal_override.clone(),
                 ..Default::default()
             },
@@ -1958,23 +1629,16 @@ include = ["*.md"]
 
         assert_eq!(validated.graph().name, "smoke");
         assert_eq!(validated.graph().goal(), "toml goal");
-        let (model, provider) = resolve_model_provider(
-            None,
-            None,
-            Some(&source_input.config),
-            &source_input.run_defaults,
-            validated.graph(),
-        );
+        let (model, provider) =
+            resolve_model_provider(None, None, &source_input.settings, validated.graph());
         assert_eq!(model, "gpt-5.2");
         assert_eq!(provider.as_deref(), Some("openai"));
-        let sandbox_provider =
-            resolve_sandbox_provider(None, Some(&source_input.config), &source_input.run_defaults)
-                .unwrap();
+        let sandbox_provider = resolve_sandbox_provider(None, &source_input.settings).unwrap();
         assert_eq!(sandbox_provider, SandboxProvider::Docker);
 
-        let run_cfg = &source_input.config;
+        let run_settings = &source_input.settings;
         assert_eq!(
-            run_cfg
+            run_settings
                 .setup
                 .as_ref()
                 .expect("setup config should be preserved")
@@ -1982,14 +1646,14 @@ include = ["*.md"]
             vec!["echo from toml".to_string()]
         );
         assert!(
-            run_cfg
+            run_settings
                 .pull_request
                 .as_ref()
                 .expect("pull request config should be preserved")
                 .enabled
         );
         assert_eq!(
-            run_cfg
+            run_settings
                 .assets
                 .as_ref()
                 .expect("assets config should be preserved")
@@ -2022,8 +1686,8 @@ include = ["*.md"]
     #[test]
     fn resolve_model_provider_defaults() {
         let graph = fabro_graphviz::graph::Graph::new("test");
-        let defaults = FabroSettings::default();
-        let (model, provider) = resolve_model_provider(None, None, None, &defaults, &graph);
+        let settings = FabroSettings::default();
+        let (model, provider) = resolve_model_provider(None, None, &settings, &graph);
         assert_eq!(model, "claude-sonnet-4-6");
         // Catalog resolves anthropic as the provider for claude-sonnet-4-6
         assert_eq!(provider, Some("anthropic".to_string()));
@@ -2032,8 +1696,7 @@ include = ["*.md"]
     #[test]
     fn resolve_model_provider_cli_overrides_toml() {
         let graph = fabro_graphviz::graph::Graph::new("test");
-        let defaults = FabroSettings::default();
-        let cfg = FabroSettings {
+        let settings = FabroSettings {
             version: Some(1),
             goal: Some("test".to_string()),
             graph: Some("test.fabro".to_string()),
@@ -2044,13 +1707,8 @@ include = ["*.md"]
             }),
             ..Default::default()
         };
-        let (model, provider) = resolve_model_provider(
-            Some("gpt-5.2"),
-            Some("openai"),
-            Some(&cfg),
-            &defaults,
-            &graph,
-        );
+        let (model, provider) =
+            resolve_model_provider(Some("gpt-5.2"), Some("openai"), &settings, &graph);
         assert_eq!(model, "gpt-5.2");
         assert_eq!(provider, Some("openai".to_string()));
     }
@@ -2068,8 +1726,7 @@ include = ["*.md"]
             AttrValue::String("gemini".to_string()),
         );
 
-        let defaults = FabroSettings::default();
-        let cfg = FabroSettings {
+        let settings = FabroSettings {
             version: Some(1),
             goal: Some("test".to_string()),
             graph: Some("test.fabro".to_string()),
@@ -2080,7 +1737,7 @@ include = ["*.md"]
             }),
             ..Default::default()
         };
-        let (model, provider) = resolve_model_provider(None, None, Some(&cfg), &defaults, &graph);
+        let (model, provider) = resolve_model_provider(None, None, &settings, &graph);
         assert_eq!(model, "toml-model");
         assert_eq!(provider, Some("openai".to_string()));
     }
@@ -2098,8 +1755,8 @@ include = ["*.md"]
             AttrValue::String("openai".to_string()),
         );
 
-        let defaults = FabroSettings::default();
-        let (model, provider) = resolve_model_provider(None, None, None, &defaults, &graph);
+        let settings = FabroSettings::default();
+        let (model, provider) = resolve_model_provider(None, None, &settings, &graph);
         assert_eq!(model, "gpt-5.2");
         assert_eq!(provider, Some("openai".to_string()));
     }
@@ -2107,16 +1764,16 @@ include = ["*.md"]
     #[test]
     fn resolve_model_provider_alias_expansion() {
         let graph = fabro_graphviz::graph::Graph::new("test");
-        let defaults = FabroSettings::default();
-        let (model, provider) = resolve_model_provider(Some("opus"), None, None, &defaults, &graph);
+        let settings = FabroSettings::default();
+        let (model, provider) = resolve_model_provider(Some("opus"), None, &settings, &graph);
         assert_eq!(model, "claude-opus-4-6");
         assert_eq!(provider, Some("anthropic".to_string()));
     }
 
     #[test]
-    fn resolve_model_provider_run_defaults_used() {
+    fn resolve_model_provider_settings_used() {
         let graph = fabro_graphviz::graph::Graph::new("test");
-        let defaults = FabroSettings {
+        let settings = FabroSettings {
             llm: Some(run_config::LlmSettings {
                 model: Some("default-model".to_string()),
                 provider: Some("openai".to_string()),
@@ -2124,15 +1781,15 @@ include = ["*.md"]
             }),
             ..FabroSettings::default()
         };
-        let (model, provider) = resolve_model_provider(None, None, None, &defaults, &graph);
+        let (model, provider) = resolve_model_provider(None, None, &settings, &graph);
         assert_eq!(model, "default-model");
         assert_eq!(provider, Some("openai".to_string()));
     }
 
     #[test]
-    fn resolve_model_provider_toml_overrides_run_defaults() {
+    fn resolve_model_provider_cli_overrides_settings() {
         let graph = fabro_graphviz::graph::Graph::new("test");
-        let defaults = FabroSettings {
+        let settings = FabroSettings {
             llm: Some(run_config::LlmSettings {
                 model: Some("default-model".to_string()),
                 provider: Some("anthropic".to_string()),
@@ -2140,25 +1797,15 @@ include = ["*.md"]
             }),
             ..FabroSettings::default()
         };
-        let cfg = FabroSettings {
-            version: Some(1),
-            goal: Some("test".to_string()),
-            graph: Some("test.fabro".to_string()),
-            llm: Some(run_config::LlmSettings {
-                model: Some("toml-model".to_string()),
-                provider: Some("openai".to_string()),
-                fallbacks: None,
-            }),
-            ..Default::default()
-        };
-        let (model, provider) = resolve_model_provider(None, None, Some(&cfg), &defaults, &graph);
+        let (model, provider) =
+            resolve_model_provider(Some("toml-model"), Some("openai"), &settings, &graph);
         assert_eq!(model, "toml-model");
         assert_eq!(provider, Some("openai".to_string()));
     }
 
     #[test]
     fn resolve_preserve_sandbox_cli_wins() {
-        let cfg = FabroSettings {
+        let settings = FabroSettings {
             sandbox: Some(sandbox_config::SandboxSettings {
                 provider: None,
                 preserve: Some(false),
@@ -2166,13 +1813,12 @@ include = ["*.md"]
             }),
             ..Default::default()
         };
-        let defaults = FabroSettings::default();
-        assert!(resolve_preserve_sandbox(true, Some(&cfg), &defaults));
+        assert!(resolve_preserve_sandbox(true, &settings));
     }
 
     #[test]
-    fn resolve_preserve_sandbox_toml_wins_over_defaults() {
-        let cfg = FabroSettings {
+    fn resolve_preserve_sandbox_settings_used() {
+        let settings = FabroSettings {
             sandbox: Some(sandbox_config::SandboxSettings {
                 provider: None,
                 preserve: Some(true),
@@ -2180,20 +1826,12 @@ include = ["*.md"]
             }),
             ..Default::default()
         };
-        let defaults = FabroSettings {
-            sandbox: Some(sandbox_config::SandboxSettings {
-                provider: None,
-                preserve: Some(false),
-                ..Default::default()
-            }),
-            ..FabroSettings::default()
-        };
-        assert!(resolve_preserve_sandbox(false, Some(&cfg), &defaults));
+        assert!(resolve_preserve_sandbox(false, &settings));
     }
 
     #[test]
     fn resolve_preserve_sandbox_defaults_used() {
-        let defaults = FabroSettings {
+        let settings = FabroSettings {
             sandbox: Some(sandbox_config::SandboxSettings {
                 provider: None,
                 preserve: Some(true),
@@ -2201,27 +1839,27 @@ include = ["*.md"]
             }),
             ..FabroSettings::default()
         };
-        assert!(resolve_preserve_sandbox(false, None, &defaults));
+        assert!(resolve_preserve_sandbox(false, &settings));
     }
 
     #[test]
     fn resolve_preserve_sandbox_defaults_to_false() {
-        let defaults = FabroSettings::default();
-        assert!(!resolve_preserve_sandbox(false, None, &defaults));
+        let settings = FabroSettings::default();
+        assert!(!resolve_preserve_sandbox(false, &settings));
     }
 
     #[test]
     fn resolve_worktree_mode_defaults_to_clean() {
-        let defaults = FabroSettings::default();
+        let settings = FabroSettings::default();
         assert_eq!(
-            resolve_worktree_mode(None, &defaults),
+            resolve_worktree_mode(&settings),
             sandbox_config::WorktreeMode::Clean
         );
     }
 
     #[test]
     fn resolve_worktree_mode_from_toml() {
-        let cfg = FabroSettings {
+        let settings = FabroSettings {
             sandbox: Some(sandbox_config::SandboxSettings {
                 local: Some(sandbox_config::LocalSandboxSettings {
                     worktree_mode: sandbox_config::WorktreeMode::Always,
@@ -2230,16 +1868,15 @@ include = ["*.md"]
             }),
             ..Default::default()
         };
-        let defaults = FabroSettings::default();
         assert_eq!(
-            resolve_worktree_mode(Some(&cfg), &defaults),
+            resolve_worktree_mode(&settings),
             sandbox_config::WorktreeMode::Always
         );
     }
 
     #[test]
-    fn resolve_worktree_mode_from_defaults() {
-        let defaults = FabroSettings {
+    fn resolve_worktree_mode_from_settings() {
+        let settings = FabroSettings {
             sandbox: Some(sandbox_config::SandboxSettings {
                 provider: None,
                 preserve: None,
@@ -2252,14 +1889,14 @@ include = ["*.md"]
             ..FabroSettings::default()
         };
         assert_eq!(
-            resolve_worktree_mode(None, &defaults),
+            resolve_worktree_mode(&settings),
             sandbox_config::WorktreeMode::Dirty
         );
     }
 
     #[test]
-    fn resolve_worktree_mode_toml_overrides_defaults() {
-        let cfg = FabroSettings {
+    fn resolve_worktree_mode_settings_used_over_default() {
+        let settings = FabroSettings {
             sandbox: Some(sandbox_config::SandboxSettings {
                 local: Some(sandbox_config::LocalSandboxSettings {
                     worktree_mode: sandbox_config::WorktreeMode::Never,
@@ -2268,20 +1905,8 @@ include = ["*.md"]
             }),
             ..Default::default()
         };
-        let defaults = FabroSettings {
-            sandbox: Some(sandbox_config::SandboxSettings {
-                provider: None,
-                preserve: None,
-                devcontainer: None,
-                local: Some(sandbox_config::LocalSandboxSettings {
-                    worktree_mode: sandbox_config::WorktreeMode::Dirty,
-                }),
-                ..Default::default()
-            }),
-            ..FabroSettings::default()
-        };
         assert_eq!(
-            resolve_worktree_mode(Some(&cfg), &defaults),
+            resolve_worktree_mode(&settings),
             sandbox_config::WorktreeMode::Never
         );
     }
diff --git a/lib/crates/fabro-cli/src/commands/run/logs.rs b/lib/crates/fabro-cli/src/commands/run/logs.rs
index 9fcc4ea52..d7ca315ac 100644
--- a/lib/crates/fabro-cli/src/commands/run/logs.rs
+++ b/lib/crates/fabro-cli/src/commands/run/logs.rs
@@ -9,7 +9,7 @@ use tracing::{debug, info};
 use crate::args::LogsArgs;
 
 pub fn run(args: LogsArgs, styles: &Styles) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run = fabro_workflows::run_lookup::resolve_run(&base, &args.run)?;
 
diff --git a/lib/crates/fabro-cli/src/commands/run/mod.rs b/lib/crates/fabro-cli/src/commands/run/mod.rs
index 990c7a863..50ffc57b1 100644
--- a/lib/crates/fabro-cli/src/commands/run/mod.rs
+++ b/lib/crates/fabro-cli/src/commands/run/mod.rs
@@ -24,13 +24,13 @@ pub async fn dispatch(cmd: RunCommands, globals: &GlobalArgs) -> Result<()> {
         RunCommands::Create(args) => {
             let styles: &'static fabro_util::terminal::Styles =
                 Box::leak(Box::new(fabro_util::terminal::Styles::detect_stderr()));
-            let cli_config = fabro_config::cli::load_cli_config(None)?;
-            let (run_id, _run_dir) = create::create_run(&args, cli_config, styles, true).await?;
+            let cli_defaults = fabro_config::cli::load_cli_config(None)?;
+            let (run_id, _run_dir) = create::create_run(&args, cli_defaults, styles, true).await?;
             println!("{run_id}");
             Ok(())
         }
         RunCommands::Start { run } => {
-            let cli_config = crate::cli_config::load_cli_config(None)?;
+            let cli_config = crate::cli_config::load_cli_settings(None)?;
             let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
             let run_info = fabro_workflows::run_lookup::resolve_run(&base, &run)?;
             let child = start::start_run(&run_info.path, false)?;
@@ -40,7 +40,7 @@ pub async fn dispatch(cmd: RunCommands, globals: &GlobalArgs) -> Result<()> {
         RunCommands::Attach { run } => {
             let styles: &'static fabro_util::terminal::Styles =
                 Box::leak(Box::new(fabro_util::terminal::Styles::detect_stderr()));
-            let cli_config = crate::cli_config::load_cli_config(None)?;
+            let cli_config = crate::cli_config::load_cli_settings(None)?;
             let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
             let run_info = fabro_workflows::run_lookup::resolve_run(&base, &run)?;
             let exit_code = attach::attach_run(&run_info.path, false, styles, None).await?;
@@ -67,7 +67,7 @@ pub async fn dispatch(cmd: RunCommands, globals: &GlobalArgs) -> Result<()> {
                 Box::leak(Box::new(fabro_util::terminal::Styles::detect_stderr()));
             #[cfg(feature = "sleep_inhibitor")]
             let _sleep_guard = {
-                let cli_config = crate::cli_config::load_cli_config(None)?;
+                let cli_config = crate::cli_config::load_cli_settings(None)?;
                 crate::sleep_inhibitor::guard(cli_config.prevent_idle_sleep_enabled())
             };
             resume::resume_command(args, styles).await
diff --git a/lib/crates/fabro-cli/src/commands/run/preview.rs b/lib/crates/fabro-cli/src/commands/run/preview.rs
index a15f3520e..7fb508dce 100644
--- a/lib/crates/fabro-cli/src/commands/run/preview.rs
+++ b/lib/crates/fabro-cli/src/commands/run/preview.rs
@@ -5,7 +5,7 @@ use crate::args::PreviewArgs;
 use crate::shared::validate_daytona_provider;
 
 pub async fn run(args: PreviewArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run_dir = fabro_workflows::run_lookup::resolve_run(&base, &args.run)?.path;
     let sandbox_json = run_dir.join("sandbox.json");
diff --git a/lib/crates/fabro-cli/src/commands/run/resume.rs b/lib/crates/fabro-cli/src/commands/run/resume.rs
index 95d48c3c9..63b03406e 100644
--- a/lib/crates/fabro-cli/src/commands/run/resume.rs
+++ b/lib/crates/fabro-cli/src/commands/run/resume.rs
@@ -11,7 +11,7 @@ use crate::args::ResumeArgs;
 /// artifacts from the previous execution, then spawns an engine subprocess
 /// (identical to `fabro run`'s create→start→attach flow).
 pub async fn resume_command(args: ResumeArgs, styles: &'static Styles) -> anyhow::Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run_dir = fabro_workflows::run_lookup::find_run_by_prefix(&base, &args.run)?;
 
diff --git a/lib/crates/fabro-cli/src/commands/run/ssh.rs b/lib/crates/fabro-cli/src/commands/run/ssh.rs
index 1da097475..652d08fc5 100644
--- a/lib/crates/fabro-cli/src/commands/run/ssh.rs
+++ b/lib/crates/fabro-cli/src/commands/run/ssh.rs
@@ -5,7 +5,7 @@ use crate::args::SshArgs;
 use crate::shared::validate_daytona_provider;
 
 pub async fn run(args: SshArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run_dir = fabro_workflows::run_lookup::resolve_run(&base, &args.run)?.path;
     let sandbox_json = run_dir.join("sandbox.json");
diff --git a/lib/crates/fabro-cli/src/commands/run/start.rs b/lib/crates/fabro-cli/src/commands/run/start.rs
index e0647518e..afaca45ed 100644
--- a/lib/crates/fabro-cli/src/commands/run/start.rs
+++ b/lib/crates/fabro-cli/src/commands/run/start.rs
@@ -130,7 +130,7 @@ mod tests {
         RunRecord {
             run_id: "run-test123".to_string(),
             created_at: Utc::now(),
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             graph: Graph {
                 name: "test".to_string(),
                 ..Default::default()
diff --git a/lib/crates/fabro-cli/src/commands/run/wait.rs b/lib/crates/fabro-cli/src/commands/run/wait.rs
index ac0bcf22a..328ac4e89 100644
--- a/lib/crates/fabro-cli/src/commands/run/wait.rs
+++ b/lib/crates/fabro-cli/src/commands/run/wait.rs
@@ -9,7 +9,7 @@ use crate::args::WaitArgs;
 use crate::shared::format_duration_ms;
 
 pub fn run(args: WaitArgs, styles: &Styles) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run_info = fabro_workflows::run_lookup::resolve_run(&base, &args.run)?;
 
diff --git a/lib/crates/fabro-cli/src/commands/runs/inspect.rs b/lib/crates/fabro-cli/src/commands/runs/inspect.rs
index 72b4a04c9..fc2e3374d 100644
--- a/lib/crates/fabro-cli/src/commands/runs/inspect.rs
+++ b/lib/crates/fabro-cli/src/commands/runs/inspect.rs
@@ -18,7 +18,7 @@ pub struct InspectOutput {
 }
 
 pub fn run(args: &InspectArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let run = fabro_workflows::run_lookup::resolve_run(&base, &args.run)?;
     let output = inspect_run_dir(&run.run_id, &run.path, run.status)?;
diff --git a/lib/crates/fabro-cli/src/commands/runs/list.rs b/lib/crates/fabro-cli/src/commands/runs/list.rs
index 11214bfa4..663cbc23d 100644
--- a/lib/crates/fabro-cli/src/commands/runs/list.rs
+++ b/lib/crates/fabro-cli/src/commands/runs/list.rs
@@ -12,7 +12,7 @@ use crate::shared::{color_if, format_duration_ms, tilde_path};
 use super::short_run_id;
 
 pub fn list_command(args: &RunsListArgs, styles: &Styles) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     let runs = fabro_workflows::run_lookup::scan_runs(&base)?;
     let label_filters = parse_label_filters(&args.filter.label);
diff --git a/lib/crates/fabro-cli/src/commands/runs/rm.rs b/lib/crates/fabro-cli/src/commands/runs/rm.rs
index 74da6195d..cb0d5645b 100644
--- a/lib/crates/fabro-cli/src/commands/runs/rm.rs
+++ b/lib/crates/fabro-cli/src/commands/runs/rm.rs
@@ -8,7 +8,7 @@ use crate::args::RunsRemoveArgs;
 use super::short_run_id;
 
 pub async fn remove_command(args: &RunsRemoveArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     remove_from(args, &base).await
 }
diff --git a/lib/crates/fabro-cli/src/commands/system/df.rs b/lib/crates/fabro-cli/src/commands/system/df.rs
index 1f15f1589..8c5e9e180 100644
--- a/lib/crates/fabro-cli/src/commands/system/df.rs
+++ b/lib/crates/fabro-cli/src/commands/system/df.rs
@@ -9,7 +9,7 @@ use crate::args::DfArgs;
 use crate::shared::format_size;
 
 pub fn df_command(args: &DfArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let data_dir = cli_config.storage_dir();
     let runs_base = fabro_workflows::run_lookup::runs_base(&data_dir);
     let logs_base = fabro_workflows::run_lookup::logs_base(&data_dir);
diff --git a/lib/crates/fabro-cli/src/commands/system/prune.rs b/lib/crates/fabro-cli/src/commands/system/prune.rs
index fcaa06597..159dabea7 100644
--- a/lib/crates/fabro-cli/src/commands/system/prune.rs
+++ b/lib/crates/fabro-cli/src/commands/system/prune.rs
@@ -8,7 +8,7 @@ use crate::args::RunsPruneArgs;
 use crate::shared::format_size;
 
 pub fn prune_command(args: &RunsPruneArgs) -> Result<()> {
-    let cli_config = crate::cli_config::load_cli_config(None)?;
+    let cli_config = crate::cli_config::load_cli_settings(None)?;
     let base = fabro_workflows::run_lookup::runs_base(&cli_config.storage_dir());
     prune_from(args, &base)
 }
diff --git a/lib/crates/fabro-cli/src/main.rs b/lib/crates/fabro-cli/src/main.rs
index 35fb745b5..c5a4b0874 100644
--- a/lib/crates/fabro-cli/src/main.rs
+++ b/lib/crates/fabro-cli/src/main.rs
@@ -99,19 +99,15 @@ async fn main_inner() -> (String, Result<()>) {
         #[cfg(feature = "server")]
         {
             if let Commands::Serve(args) = command.as_ref() {
-                match fabro_config::server::load_server_config(args.config.as_deref()) {
-                    Ok(server_config) => match fabro_config::FabroSettings::try_from(server_config)
-                    {
-                        Ok(server_settings) => (
-                            server_settings.log.as_ref().and_then(|l| l.level.clone()),
-                            false,
-                        ),
-                        Err(err) => return (command_name, Err(err)),
-                    },
+                match fabro_config::server::load_server_settings(args.config.as_deref()) {
+                    Ok(server_settings) => (
+                        server_settings.log.as_ref().and_then(|l| l.level.clone()),
+                        false,
+                    ),
                     Err(err) => return (command_name, Err(err)),
                 }
             } else {
-                match crate::cli_config::load_cli_config(None) {
+                match crate::cli_config::load_cli_settings(None) {
                     Ok(cli_config) => (
                         cli_config.log.as_ref().and_then(|l| l.level.clone()),
                         cli_config.upgrade_check_enabled(),
@@ -122,7 +118,7 @@ async fn main_inner() -> (String, Result<()>) {
         }
         #[cfg(not(feature = "server"))]
         {
-            match crate::cli_config::load_cli_config(None) {
+            match crate::cli_config::load_cli_settings(None) {
                 Ok(cli_config) => (
                     cli_config.log.as_ref().and_then(|l| l.level.clone()),
                     cli_config.upgrade_check_enabled(),
@@ -184,7 +180,7 @@ async fn main_inner() -> (String, Result<()>) {
                 fabro_api::serve::serve_command(args, styles).await?;
             }
             Commands::Doctor { verbose, dry_run } => {
-                let cli_config = cli_config::load_cli_config(None)?;
+                let cli_config = cli_config::load_cli_settings(None)?;
                 let verbose = verbose || cli_config.verbose_enabled();
                 let exit_code = commands::doctor::run_doctor(verbose, !dry_run).await;
                 std::process::exit(exit_code);
diff --git a/lib/crates/fabro-cli/tests/cli.rs b/lib/crates/fabro-cli/tests/cli.rs
index cef8d1e1b..1adc9f6a8 100644
--- a/lib/crates/fabro-cli/tests/cli.rs
+++ b/lib/crates/fabro-cli/tests/cli.rs
@@ -1637,21 +1637,21 @@ fn create_explicit_workflow_path_uses_project_config_relative_to_workflow() {
 
     let run_record: serde_json::Value =
         serde_json::from_str(&std::fs::read_to_string(run_dir.join("run.json")).unwrap()).unwrap();
-    assert_eq!(run_record["config"]["auto_approve"].as_bool(), Some(true));
+    assert_eq!(run_record["settings"]["auto_approve"].as_bool(), Some(true));
     assert_eq!(
-        run_record["config"]["storage_dir"].as_str(),
+        run_record["settings"]["storage_dir"].as_str(),
         Some(storage_dir.to_str().unwrap())
     );
     assert_eq!(
-        run_record["config"]["sandbox"]["preserve"].as_bool(),
+        run_record["settings"]["sandbox"]["preserve"].as_bool(),
         Some(true)
     );
     assert_eq!(
-        run_record["config"]["llm"]["model"].as_str(),
+        run_record["settings"]["llm"]["model"].as_str(),
         Some("gpt-5.2")
     );
     assert_eq!(
-        run_record["config"]["setup"]["commands"],
+        run_record["settings"]["setup"]["commands"],
         serde_json::json!(["workflow-setup", "project-setup", "cli-setup"])
     );
 }
diff --git a/lib/crates/fabro-config/src/server.rs b/lib/crates/fabro-config/src/server.rs
index 21b527793..a0472a4f8 100644
--- a/lib/crates/fabro-config/src/server.rs
+++ b/lib/crates/fabro-config/src/server.rs
@@ -296,6 +296,10 @@ pub fn load_server_config(path: Option<&Path>) -> anyhow::Result<FabroConfig> {
     crate::load_config_file(path, "server.toml")
 }
 
+pub fn load_server_settings(path: Option<&Path>) -> anyhow::Result<FabroSettings> {
+    load_server_config(path)?.try_into()
+}
+
 /// Resolve the storage directory: config value > default `~/.fabro`.
 pub fn resolve_storage_dir(config: &FabroSettings) -> PathBuf {
     config.storage_dir()
diff --git a/lib/crates/fabro-config/src/settings.rs b/lib/crates/fabro-config/src/settings.rs
index c180757fe..76c431492 100644
--- a/lib/crates/fabro-config/src/settings.rs
+++ b/lib/crates/fabro-config/src/settings.rs
@@ -199,6 +199,42 @@ impl FabroSettings {
         self.git.as_ref().map(|g| &g.author)
     }
 
+    pub fn sandbox_settings(&self) -> Option<&SandboxSettings> {
+        self.sandbox.as_ref()
+    }
+
+    pub fn setup_settings(&self) -> Option<&SetupSettings> {
+        self.setup.as_ref()
+    }
+
+    pub fn setup_commands(&self) -> &[String] {
+        self.setup
+            .as_ref()
+            .map(|setup| setup.commands.as_slice())
+            .unwrap_or(&[])
+    }
+
+    pub fn setup_timeout_ms(&self) -> Option<u64> {
+        self.setup.as_ref().and_then(|setup| setup.timeout_ms)
+    }
+
+    pub fn preserve_sandbox_enabled(&self) -> bool {
+        self.sandbox
+            .as_ref()
+            .and_then(|sandbox| sandbox.preserve)
+            .unwrap_or(false)
+    }
+
+    pub fn github_permissions(&self) -> Option<&HashMap<String, String>> {
+        self.github
+            .as_ref()
+            .and_then(|github| (!github.permissions.is_empty()).then_some(&github.permissions))
+    }
+
+    pub fn mcp_server_entries(&self) -> &HashMap<String, McpServerEntry> {
+        &self.mcp_servers
+    }
+
     pub fn verbose_enabled(&self) -> bool {
         self.verbose.unwrap_or(false)
     }
diff --git a/lib/crates/fabro-workflows/src/handler/manager_loop.rs b/lib/crates/fabro-workflows/src/handler/manager_loop.rs
index 8afd28d22..e97d17252 100644
--- a/lib/crates/fabro-workflows/src/handler/manager_loop.rs
+++ b/lib/crates/fabro-workflows/src/handler/manager_loop.rs
@@ -144,10 +144,9 @@ impl Handler for SubWorkflowHandler {
 
         let git_state = services.git_state();
         let child_run_options = RunOptions {
-            config: fabro_config::FabroSettings::default(),
+            settings: fabro_config::FabroSettings::default(),
             run_dir: child_logs,
             cancel_token: Some(cancel_token),
-            dry_run: services.dry_run,
             run_id: format!("{parent_run_id}_child_{}", node.id),
             labels: HashMap::new(),
             git_author: git_state
diff --git a/lib/crates/fabro-workflows/src/lifecycle/git.rs b/lib/crates/fabro-workflows/src/lifecycle/git.rs
index b01d5d15e..f984cd1bf 100644
--- a/lib/crates/fabro-workflows/src/lifecycle/git.rs
+++ b/lib/crates/fabro-workflows/src/lifecycle/git.rs
@@ -186,7 +186,7 @@ impl RunLifecycle<WorkflowGraph> for GitLifecycle {
                 }
 
                 // Push run branch (skip in dry-run mode)
-                if !self.run_options.dry_run {
+                if !self.run_options.dry_run_enabled() {
                     if let Some(branch) = self
                         .run_options
                         .git
diff --git a/lib/crates/fabro-workflows/src/operations/create.rs b/lib/crates/fabro-workflows/src/operations/create.rs
index 25b6ac422..6062f2bfc 100644
--- a/lib/crates/fabro-workflows/src/operations/create.rs
+++ b/lib/crates/fabro-workflows/src/operations/create.rs
@@ -16,12 +16,12 @@ use crate::transforms::{expand_vars, Transform};
 pub struct ValidateOptions {
     pub base_dir: Option<PathBuf>,
     pub custom_transforms: Vec<Box<dyn Transform>>,
-    pub config: Option<FabroSettings>,
+    pub settings: Option<FabroSettings>,
     pub goal_override: Option<String>,
 }
 
 pub struct RunCreateOptions {
-    pub config: FabroSettings,
+    pub settings: FabroSettings,
     pub run_dir: Option<PathBuf>,
     pub run_id: Option<String>,
     pub workflow_slug: Option<String>,
@@ -42,7 +42,7 @@ pub fn validate(dot_source: &str, options: ValidateOptions) -> Result<Validated,
         dot_source,
         options.base_dir,
         options.custom_transforms,
-        options.config.as_ref(),
+        options.settings.as_ref(),
         options.goal_override.as_deref(),
     )
 }
@@ -61,13 +61,13 @@ pub fn validate_from_file(path: &Path) -> Result<Validated, FabroError> {
     )
 }
 
-/// Parse, transform, validate, normalize config, and persist a run.
+/// Parse, transform, validate, resolve settings, and persist a run.
 pub fn create(dot_source: &str, options: RunCreateOptions) -> Result<Persisted, FabroError> {
     let validated = preprocess_and_validate(
         dot_source,
         options.base_dir.clone(),
         Vec::new(),
-        Some(&options.config),
+        Some(&options.settings),
         options.goal_override.as_deref(),
     )?;
 
@@ -96,10 +96,10 @@ fn preprocess_and_validate(
     dot_source: &str,
     base_dir: Option<PathBuf>,
     custom_transforms: Vec<Box<dyn Transform>>,
-    config: Option<&FabroSettings>,
+    settings: Option<&FabroSettings>,
     goal_override: Option<&str>,
 ) -> Result<Validated, FabroError> {
-    let source = match config.and_then(|cfg| cfg.vars.as_ref()) {
+    let source = match settings.and_then(|resolved| resolved.vars.as_ref()) {
         Some(vars) => {
             let mut vars = vars.clone();
             // `$goal` is resolved later from the graph goal after any goal override.
@@ -137,7 +137,7 @@ fn persist_validated(
     options: RunCreateOptions,
 ) -> Result<Persisted, FabroError> {
     let RunCreateOptions {
-        mut config,
+        settings,
         run_dir,
         run_id,
         workflow_slug,
@@ -149,17 +149,17 @@ fn persist_validated(
         base_dir: _,
     } = options;
 
-    finalize_settings(&mut config, validated.graph());
+    let settings = resolve_run_settings(settings, validated.graph());
 
     let run_id = run_id.unwrap_or_else(|| ulid::Ulid::new().to_string());
-    let run_dir = run_dir.unwrap_or_else(|| default_run_dir(&run_id, config.dry_run_enabled()));
+    let run_dir = run_dir.unwrap_or_else(|| default_run_dir(&run_id, settings.dry_run_enabled()));
     let working_directory = working_directory
         .unwrap_or_else(|| std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")));
 
     let run_record = RunRecord {
         run_id,
         created_at: Utc::now(),
-        config,
+        settings,
         graph: validated.graph().clone(),
         workflow_slug,
         working_directory,
@@ -177,8 +177,8 @@ fn persist_validated(
     )
 }
 
-pub(crate) fn finalize_settings(config: &mut FabroSettings, graph: &Graph) {
-    let llm_config = config.llm.as_ref();
+pub(crate) fn resolve_run_settings(mut settings: FabroSettings, graph: &Graph) -> FabroSettings {
+    let llm_config = settings.llm.as_ref();
     let configured_model = llm_config.and_then(|l| l.model.as_deref());
     let configured_provider = llm_config.and_then(|l| l.provider.as_deref());
     let graph_provider = graph.attrs.get("default_provider").and_then(|v| v.as_str());
@@ -208,16 +208,18 @@ pub(crate) fn finalize_settings(config: &mut FabroSettings, graph: &Graph) {
         None => (model, provider),
     };
 
-    let llm = config.llm.get_or_insert_default();
+    let llm = settings.llm.get_or_insert_default();
     llm.model = Some(resolved_model);
     llm.provider = resolved_provider;
 
     let goal = graph.goal().to_string();
-    config.goal = if goal.is_empty() { None } else { Some(goal) };
-    config.pull_request = config
+    settings.goal = if goal.is_empty() { None } else { Some(goal) };
+    settings.pull_request = settings
         .pull_request
         .take()
         .filter(|pull_request| pull_request.enabled);
+
+    settings
 }
 
 pub fn default_run_dir(run_id: &str, dry_run: bool) -> PathBuf {
@@ -308,7 +310,7 @@ mod tests {
         let validated = validate(
             dot,
             ValidateOptions {
-                config: Some(FabroSettings {
+                settings: Some(FabroSettings {
                     vars: Some(HashMap::from([("who".to_string(), "agent".to_string())])),
                     ..Default::default()
                 }),
@@ -407,7 +409,7 @@ mod tests {
         let err = create(
             dot,
             RunCreateOptions {
-                config: FabroSettings::default(),
+                settings: FabroSettings::default(),
                 run_dir: None,
                 run_id: None,
                 workflow_slug: None,
@@ -435,7 +437,7 @@ mod tests {
         let persisted = create(
             MINIMAL_DOT,
             RunCreateOptions {
-                config: FabroSettings {
+                settings: FabroSettings {
                     llm: Some(fabro_config::run::LlmSettings {
                         model: Some("sonnet".to_string()),
                         provider: None,
@@ -466,7 +468,7 @@ mod tests {
         assert_eq!(
             persisted
                 .run_record()
-                .config
+                .settings
                 .llm
                 .as_ref()
                 .and_then(|llm| llm.model.as_deref()),
@@ -475,17 +477,17 @@ mod tests {
         assert_eq!(
             persisted
                 .run_record()
-                .config
+                .settings
                 .llm
                 .as_ref()
                 .and_then(|llm| llm.provider.as_deref()),
             Some("anthropic")
         );
         assert_eq!(
-            persisted.run_record().config.goal.as_deref(),
+            persisted.run_record().settings.goal.as_deref(),
             Some("override goal")
         );
-        assert!(persisted.run_record().config.pull_request.is_none());
+        assert!(persisted.run_record().settings.pull_request.is_none());
         assert_eq!(
             persisted.run_record().workflow_slug.as_deref(),
             Some("slug")
diff --git a/lib/crates/fabro-workflows/src/operations/start.rs b/lib/crates/fabro-workflows/src/operations/start.rs
index d483f59ba..7507a136b 100644
--- a/lib/crates/fabro-workflows/src/operations/start.rs
+++ b/lib/crates/fabro-workflows/src/operations/start.rs
@@ -32,7 +32,7 @@ pub struct StartPullRequestConfig {
 /// Options for `start()` and `resume()`.
 ///
 /// Fields that are derivable from `RunRecord` (run_id, labels, base_branch,
-/// host_repo_path, config, workflow_slug) are read from disk by `run_engine()`.
+/// host_repo_path, settings, workflow_slug) are read from disk by `run_engine()`.
 /// Callers only provide truly external values.
 pub struct StartOptions {
     // Truly external (not derivable from RunRecord)
@@ -51,9 +51,6 @@ pub struct StartOptions {
     pub github_app: Option<fabro_github::GitHubAppCredentials>,
     pub worktree_mode: Option<WorktreeMode>,
     pub registry_override: Option<Arc<crate::handler::HandlerRegistry>>,
-
-    // Still external for now — could be derived from RunRecord.config in follow-up
-    pub dry_run: bool,
     pub retro: StartRetroOptions,
     pub finalize: StartFinalizeOptions,
     pub pull_request: StartPullRequestConfig,
@@ -116,13 +113,12 @@ async fn run_engine(
 ) -> Result<Started, FabroError> {
     let preserve_sandbox = options.finalize.preserve_sandbox;
 
-    // Build RunOptions from the persisted RunRecord + external caller options
+    // Build RunOptions from the persisted RunRecord + external caller options.
     let record = persisted.run_record();
     let run_options = RunOptions {
-        config: record.config.clone(),
+        settings: record.settings.clone(),
         run_dir: persisted.run_dir().to_path_buf(),
         cancel_token: options.cancel_token,
-        dry_run: options.dry_run,
         run_id: record.run_id.clone(),
         labels: record.labels.clone(),
         git_author: options.git_author,
@@ -161,7 +157,7 @@ async fn run_engine(
 
     let init_options = InitOptions {
         run_id: record.run_id.clone(),
-        dry_run: options.dry_run,
+        dry_run: run_options.dry_run_enabled(),
         emitter: options.emitter,
         sandbox: options.sandbox,
         llm: options.llm,
@@ -274,7 +270,7 @@ mod tests {
         crate::operations::create(
             dot,
             crate::operations::RunCreateOptions {
-                config: FabroSettings::default(),
+                settings: FabroSettings::default(),
                 run_dir: Some(run_dir.to_path_buf()),
                 run_id: Some("run-test".to_string()),
                 workflow_slug: Some("test".to_string()),
@@ -333,7 +329,6 @@ mod tests {
             github_app: None,
             worktree_mode: None,
             registry_override: Some(registry),
-            dry_run: false,
             retro: StartRetroOptions { enabled: false },
             finalize: StartFinalizeOptions { preserve_sandbox },
             pull_request: StartPullRequestConfig {
diff --git a/lib/crates/fabro-workflows/src/pipeline/execute.rs b/lib/crates/fabro-workflows/src/pipeline/execute.rs
index 989c17bd9..08a235f01 100644
--- a/lib/crates/fabro-workflows/src/pipeline/execute.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/execute.rs
@@ -199,7 +199,7 @@ pub async fn execute(init: Initialized) -> Executed {
     let graph_max = graph.max_node_visits();
     let max_node_visits = if graph_max > 0 {
         Some(graph_max as usize)
-    } else if run_options.dry_run {
+    } else if run_options.dry_run_enabled() {
         Some(10)
     } else {
         None
diff --git a/lib/crates/fabro-workflows/src/pipeline/execute/tests.rs b/lib/crates/fabro-workflows/src/pipeline/execute/tests.rs
index 05e26bb1f..e718da2f8 100644
--- a/lib/crates/fabro-workflows/src/pipeline/execute/tests.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/execute/tests.rs
@@ -69,9 +69,8 @@ fn test_run_options(run_dir: &Path, run_id: &str) -> RunOptions {
     RunOptions {
         run_dir: run_dir.to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: run_id.into(),
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         git: None,
         host_repo_path: None,
         labels: HashMap::new(),
@@ -115,7 +114,7 @@ fn persisted_workflow(graph: Graph, source: String, run_dir: &Path, run_id: &str
         RunRecord {
             run_id: run_id.to_string(),
             created_at: Utc::now(),
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             graph,
             workflow_slug: Some("test".to_string()),
             working_directory: std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")),
diff --git a/lib/crates/fabro-workflows/src/pipeline/finalize.rs b/lib/crates/fabro-workflows/src/pipeline/finalize.rs
index 1510bb102..833f4e4bd 100644
--- a/lib/crates/fabro-workflows/src/pipeline/finalize.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/finalize.rs
@@ -311,10 +311,9 @@ mod tests {
 
     fn test_run_options(run_dir: &std::path::Path) -> RunOptions {
         RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: run_dir.to_path_buf(),
             cancel_token: None,
-            dry_run: true,
             run_id: "run-test".to_string(),
             labels: HashMap::new(),
             git_author: crate::git::GitAuthor::default(),
diff --git a/lib/crates/fabro-workflows/src/pipeline/initialize.rs b/lib/crates/fabro-workflows/src/pipeline/initialize.rs
index 3859c4016..17723d2d6 100644
--- a/lib/crates/fabro-workflows/src/pipeline/initialize.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/initialize.rs
@@ -737,7 +737,7 @@ pub async fn initialize(
         };
     if effective_dry_run {
         options.dry_run = true;
-        options.run_options.dry_run = true;
+        options.run_options.settings.dry_run = Some(true);
     }
 
     let has_run_branch = options
@@ -900,10 +900,9 @@ mod tests {
 
     fn test_settings(run_dir: &std::path::Path) -> RunOptions {
         RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: run_dir.to_path_buf(),
             cancel_token: None,
-            dry_run: false,
             run_id: "run-test".to_string(),
             labels: HashMap::new(),
             git_author: crate::git::GitAuthor::default(),
@@ -925,7 +924,7 @@ mod tests {
             RunRecord {
                 run_id: "run-test".to_string(),
                 created_at: Utc::now(),
-                config: FabroSettings::default(),
+                settings: FabroSettings::default(),
                 graph,
                 workflow_slug: Some("test".to_string()),
                 working_directory: std::env::current_dir().unwrap(),
diff --git a/lib/crates/fabro-workflows/src/pipeline/persist.rs b/lib/crates/fabro-workflows/src/pipeline/persist.rs
index 2630da7e6..7e5370d5d 100644
--- a/lib/crates/fabro-workflows/src/pipeline/persist.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/persist.rs
@@ -110,7 +110,7 @@ mod tests {
         RunRecord {
             run_id: "run-123".to_string(),
             created_at: Utc::now(),
-            config: FabroSettings {
+            settings: FabroSettings {
                 dry_run: Some(true),
                 verbose: Some(true),
                 ..Default::default()
diff --git a/lib/crates/fabro-workflows/src/pipeline/pull_request.rs b/lib/crates/fabro-workflows/src/pipeline/pull_request.rs
index a694e69ec..ea95f9f01 100644
--- a/lib/crates/fabro-workflows/src/pipeline/pull_request.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/pull_request.rs
@@ -488,7 +488,7 @@ pub async fn pull_request(concluded: Concluded, options: &PullRequestOptions) ->
 
     let mut pr_url = None;
     if let Some(pr_cfg) = &options.pr_config {
-        if run_options.dry_run {
+        if run_options.dry_run_enabled() {
             tracing::debug!("Skipping PR creation: run is in dry-run mode");
         } else if let Err(ref e) = outcome {
             tracing::debug!(error = %e, "Skipping PR creation: engine returned an error");
diff --git a/lib/crates/fabro-workflows/src/pipeline/retro.rs b/lib/crates/fabro-workflows/src/pipeline/retro.rs
index 2c078e67a..cdc8948f1 100644
--- a/lib/crates/fabro-workflows/src/pipeline/retro.rs
+++ b/lib/crates/fabro-workflows/src/pipeline/retro.rs
@@ -127,7 +127,7 @@ pub async fn retro(executed: Executed, options: &RetroOptions) -> Retroed {
         provider: _,
     } = executed;
 
-    let dry_run = run_options.dry_run;
+    let dry_run = run_options.dry_run_enabled();
 
     let retro = if options.enabled {
         run_retro(options, dry_run).await
@@ -183,10 +183,9 @@ mod tests {
 
     fn test_run_options(run_dir: &std::path::Path) -> RunOptions {
         RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: run_dir.to_path_buf(),
             cancel_token: None,
-            dry_run: true,
             run_id: "run-test".to_string(),
             labels: HashMap::new(),
             git_author: crate::git::GitAuthor::default(),
diff --git a/lib/crates/fabro-workflows/src/records/run.rs b/lib/crates/fabro-workflows/src/records/run.rs
index 0e5235316..6f7ec732c 100644
--- a/lib/crates/fabro-workflows/src/records/run.rs
+++ b/lib/crates/fabro-workflows/src/records/run.rs
@@ -12,7 +12,7 @@ const FILE_NAME: &str = "run.json";
 pub struct RunRecord {
     pub run_id: String,
     pub created_at: DateTime<Utc>,
-    pub config: FabroSettings,
+    pub settings: FabroSettings,
     pub graph: Graph,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub workflow_slug: Option<String>,
@@ -73,7 +73,7 @@ mod tests {
         RunRecord {
             run_id: "run-abc123".to_string(),
             created_at: Utc::now(),
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             graph,
             workflow_slug: Some("smoke".to_string()),
             working_directory: PathBuf::from("/home/user/project"),
diff --git a/lib/crates/fabro-workflows/src/run_options.rs b/lib/crates/fabro-workflows/src/run_options.rs
index 98fd0f87f..401245f7f 100644
--- a/lib/crates/fabro-workflows/src/run_options.rs
+++ b/lib/crates/fabro-workflows/src/run_options.rs
@@ -19,10 +19,9 @@ pub struct GitCheckpointOptions {
 /// Options for a workflow run.
 #[derive(Clone)]
 pub struct RunOptions {
-    pub config: FabroSettings,
+    pub settings: FabroSettings,
     pub run_dir: PathBuf,
     pub cancel_token: Option<Arc<AtomicBool>>,
-    pub dry_run: bool,
     /// Unique identifier for this workflow run.
     pub run_id: String,
     /// User-defined key-value labels for this run.
@@ -44,17 +43,21 @@ pub struct RunOptions {
 }
 
 impl RunOptions {
+    pub fn dry_run_enabled(&self) -> bool {
+        self.settings.dry_run_enabled()
+    }
+
     pub fn checkpoint_exclude_globs(&self) -> &[String] {
-        &self.config.checkpoint.exclude_globs
+        &self.settings.checkpoint.exclude_globs
     }
 
     /// PR config (already normalized — disabled entries stripped at construction).
     pub fn pull_request(&self) -> Option<&PullRequestSettings> {
-        self.config.pull_request.as_ref()
+        self.settings.pull_request.as_ref()
     }
 
     pub fn asset_globs(&self) -> &[String] {
-        self.config
+        self.settings
             .assets
             .as_ref()
             .map(|a| a.include.as_slice())
diff --git a/lib/crates/fabro-workflows/src/test_support.rs b/lib/crates/fabro-workflows/src/test_support.rs
index f6f8384ec..928f92591 100644
--- a/lib/crates/fabro-workflows/src/test_support.rs
+++ b/lib/crates/fabro-workflows/src/test_support.rs
@@ -38,7 +38,7 @@ fn initialized(
         registry: Arc::new(registry),
         hook_runner: options.hook_runner,
         env: options.env,
-        dry_run: run_options.dry_run,
+        dry_run: run_options.dry_run_enabled(),
         llm_client: None,
         model: String::new(),
         provider: fabro_llm::Provider::Anthropic,
diff --git a/lib/crates/fabro-workflows/tests/daytona_integration.rs b/lib/crates/fabro-workflows/tests/daytona_integration.rs
index 05710fe60..ff681169b 100644
--- a/lib/crates/fabro-workflows/tests/daytona_integration.rs
+++ b/lib/crates/fabro-workflows/tests/daytona_integration.rs
@@ -389,10 +389,9 @@ async fn daytona_pipeline_artifact_offload_and_sync() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), env.clone());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -581,10 +580,9 @@ async fn daytona_git_checkpoint_remote_emits_events() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), env.clone());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "git-cp-test".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -768,10 +766,9 @@ async fn daytona_parallel_git_branching_e2e() {
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), Arc::clone(&env));
 
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: run_tmp.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: run_id.clone(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1145,10 +1142,9 @@ async fn daytona_git_checkpoint_with_shadow_branch() {
     let meta_branch = MetadataStore::branch_name(&run_id);
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), env.clone());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: run_id.clone(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1286,7 +1282,7 @@ async fn daytona_asset_collection() {
     graph.edges.push(Edge::new("create_assets", "exit"));
 
     let run_options = RunOptions {
-        config: FabroSettings {
+        settings: FabroSettings {
             assets: Some(fabro_config::run::AssetsSettings {
                 include: vec!["test-results/**".to_string()],
             }),
@@ -1294,7 +1290,6 @@ async fn daytona_asset_collection() {
         },
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "asset-test-daytona".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1543,10 +1538,9 @@ async fn daytona_git_push_run_branch_to_origin() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), env.clone());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: run_id.clone(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
diff --git a/lib/crates/fabro-workflows/tests/integration.rs b/lib/crates/fabro-workflows/tests/integration.rs
index 6a5430e8b..e31c30dfc 100644
--- a/lib/crates/fabro-workflows/tests/integration.rs
+++ b/lib/crates/fabro-workflows/tests/integration.rs
@@ -194,10 +194,9 @@ async fn end_to_end_linear_pipeline() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -334,10 +333,9 @@ async fn end_to_end_branching_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -455,10 +453,9 @@ async fn end_to_end_human_gate_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -552,10 +549,9 @@ async fn human_gate_aborted_input_fails_closed_without_fail_route() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -664,10 +660,9 @@ async fn human_gate_aborted_input_routes_via_outcome_fail_condition() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -778,10 +773,9 @@ async fn goal_gate_routes_to_retry_target_on_failure() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -900,10 +894,9 @@ async fn goal_gate_routes_to_retry_target_when_present() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1213,10 +1206,9 @@ async fn retry_on_failure_then_succeed() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1289,10 +1281,9 @@ async fn pipeline_with_many_nodes() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1612,10 +1603,9 @@ async fn smoke_test_with_mock_codergen_backend() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1714,10 +1704,9 @@ async fn end_to_end_parallel_fan_out_fan_in() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1828,10 +1817,9 @@ async fn resume_from_checkpoint_completes_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1928,10 +1916,9 @@ async fn resume_from_checkpoint_preserves_goal_gate_outcomes() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -1972,10 +1959,9 @@ async fn graph_goal_in_context() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2009,10 +1995,9 @@ async fn event_streaming_lifecycle() {
     let events = collect_events(&emitter);
     let engine = WorkflowRunner::new(make_linear_registry(), Arc::new(emitter), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2090,10 +2075,9 @@ async fn context_flow_between_stages() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2144,10 +2128,9 @@ async fn tool_handler_e2e() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2215,10 +2198,9 @@ async fn auto_approve_interviewer_e2e() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2253,10 +2235,9 @@ async fn codergen_without_backend_simulated() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2359,10 +2340,9 @@ async fn branching_loop_back_on_failure() {
     );
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2443,10 +2423,9 @@ async fn human_gate_loops_back() {
     registry.register("human", Box::new(HumanHandler::new(interviewer)));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2502,10 +2481,9 @@ async fn scenario_ship_a_feature() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2589,10 +2567,9 @@ async fn scenario_parallel_expert_review() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2674,10 +2651,9 @@ async fn scenario_node_retries_on_retry_status() {
     );
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2737,10 +2713,9 @@ async fn scenario_loop_restart_resets_context() {
     );
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2806,10 +2781,9 @@ async fn scenario_bug_triage_router() {
     registry.register("conditional", Box::new(ConditionalHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2866,10 +2840,9 @@ async fn scenario_crash_recovery() {
     registry.register("exit", Box::new(ExitHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -2976,10 +2949,9 @@ async fn manager_loop_stop_condition_satisfied_e2e() {
     registry.register("stack.manager_loop", Box::new(SubWorkflowHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3054,10 +3026,9 @@ async fn manager_loop_max_cycles_exceeded_e2e() {
     registry.register("stack.manager_loop", Box::new(SubWorkflowHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3191,10 +3162,9 @@ async fn conditional_branching_success_fail_paths() {
     registry.register("always_fail", Box::new(AlwaysFailHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3245,10 +3215,9 @@ async fn edge_selection_condition_match_wins_over_weight() {
     registry.register("exit", Box::new(ExitHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3293,10 +3262,9 @@ async fn edge_selection_weight_breaks_ties() {
     registry.register("exit", Box::new(ExitHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3333,10 +3301,9 @@ async fn edge_selection_lexical_tiebreak() {
     registry.register("exit", Box::new(ExitHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3392,10 +3359,9 @@ async fn context_updates_visible_across_nodes() {
     registry.register("context_setter", Box::new(ContextSetterHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3437,10 +3403,9 @@ async fn stylesheet_applies_model_override() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3494,10 +3459,9 @@ async fn custom_handler_registration_and_execution() {
     registry.register("my_custom", Box::new(CustomHandler));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3566,10 +3530,9 @@ async fn integration_smoke_plan_implement_review_done() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3671,10 +3634,9 @@ async fn manager_loop_runs_child_engine_e2e() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3806,10 +3768,9 @@ async fn manager_loop_context_flows_e2e() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3880,10 +3841,9 @@ async fn manager_loop_child_dotfile_e2e() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -3994,10 +3954,9 @@ async fn graph_merge_e2e_through_engine() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4145,10 +4104,9 @@ async fn fidelity_default_is_compact() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4203,10 +4161,9 @@ async fn fidelity_graph_default_applied() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4257,10 +4214,9 @@ async fn fidelity_node_overrides_graph_default() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4317,10 +4273,9 @@ async fn fidelity_edge_overrides_node_and_graph() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4367,10 +4322,9 @@ async fn fidelity_full_produces_empty_preamble() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4427,10 +4381,9 @@ async fn fidelity_truncate_preamble_minimal() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4500,10 +4453,9 @@ async fn fidelity_summary_low_mode() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4568,10 +4520,9 @@ async fn fidelity_summary_medium_mode() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4636,10 +4587,9 @@ async fn fidelity_summary_high_mode() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4697,10 +4647,9 @@ async fn fidelity_full_sets_thread_id_in_context() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4769,10 +4718,9 @@ async fn fidelity_full_nodes_share_thread_id() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4851,10 +4799,9 @@ async fn fidelity_resume_degrades_full_to_summary_high() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -4949,10 +4896,9 @@ async fn fidelity_resume_degrade_only_affects_first_hop() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5034,10 +4980,9 @@ async fn fidelity_resume_no_degrade_when_not_full() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5077,10 +5022,9 @@ async fn fidelity_stored_in_checkpoint_context() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5164,10 +5108,9 @@ async fn fidelity_precedence_multi_node_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5233,10 +5176,9 @@ async fn fidelity_compact_preamble_includes_completed_stages_and_context() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5309,10 +5251,9 @@ async fn fidelity_summary_low_excludes_context_values_in_pipeline() {
     );
     let engine_low = WorkflowRunner::new(registry_low, Arc::new(EventEmitter::new()), local_env());
     let run_options_low = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir_low.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5377,10 +5318,9 @@ async fn fidelity_summary_low_excludes_context_values_in_pipeline() {
     );
     let engine_med = WorkflowRunner::new(registry_med, Arc::new(EventEmitter::new()), local_env());
     let run_options_med = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir_med.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5449,10 +5389,9 @@ async fn fidelity_thread_id_fallback_to_previous_node_in_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5504,10 +5443,9 @@ async fn fidelity_thread_id_from_node_class_in_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5562,10 +5500,9 @@ async fn fidelity_edge_thread_id_override_in_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5621,10 +5558,9 @@ async fn fidelity_full_without_explicit_thread_id_uses_previous_node() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5690,10 +5626,9 @@ async fn fidelity_from_parsed_dot_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5739,10 +5674,9 @@ async fn fidelity_checkpoint_roundtrip_preserves_fidelity() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5810,10 +5744,9 @@ async fn fidelity_node_thread_id_overrides_edge_thread_id_in_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -5898,10 +5831,9 @@ async fn fidelity_resume_preserves_context_values_across_checkpoint() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6114,10 +6046,9 @@ mod real_llm {
 
         let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
         let run_options = RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: dir.path().to_path_buf(),
             cancel_token: None,
-            dry_run: false,
             run_id: "test-run".into(),
             labels: std::collections::HashMap::new(),
             git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6229,10 +6160,9 @@ mod real_llm {
 
         let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
         let run_options = RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: dir.path().to_path_buf(),
             cancel_token: None,
-            dry_run: false,
             run_id: "test-run".into(),
             labels: std::collections::HashMap::new(),
             git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6369,10 +6299,9 @@ mod real_llm {
 
         let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
         let run_options = RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: dir.path().to_path_buf(),
             cancel_token: None,
-            dry_run: false,
             run_id: "test-run".into(),
             labels: std::collections::HashMap::new(),
             git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6477,10 +6406,9 @@ mod real_llm {
 
         let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
         let run_options = RunOptions {
-            config: FabroSettings::default(),
+            settings: FabroSettings::default(),
             run_dir: dir.path().to_path_buf(),
             cancel_token: None,
-            dry_run: false,
             run_id: "test-run".into(),
             labels: std::collections::HashMap::new(),
             git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6574,10 +6502,9 @@ async fn human_gate_freeform_only_routes_text() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6705,10 +6632,9 @@ async fn human_gate_freeform_with_fixed_choice_match() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6821,10 +6747,9 @@ async fn human_gate_freeform_fallback_on_unmatched_text() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -6950,10 +6875,9 @@ async fn human_gate_freeform_sets_allow_freeform_on_question() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -7059,10 +6983,9 @@ async fn human_gate_without_freeform_sets_allow_freeform_false() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -7341,10 +7264,9 @@ fn engine_with_hooks_and_events(
 
 fn make_run_options(dir: &std::path::Path) -> RunOptions {
     RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "hook-test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -8446,10 +8368,9 @@ async fn arc_e2e_with_real_llm() {
     let run_dir = tempfile::tempdir().unwrap();
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -8575,10 +8496,9 @@ async fn run_fidelity_prompt_pipeline(fidelity: &str) -> String {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -8775,10 +8695,9 @@ async fn large_context_values_are_offloaded_to_artifact_store() {
     let events = collect_events(&emitter);
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -8995,10 +8914,9 @@ async fn artifact_pointers_rewritten_for_remote_sandbox() {
     let remote_env = Arc::new(RemoteMockEnv::new("/sandbox"));
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), remote_env.clone());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -9126,10 +9044,9 @@ async fn node_dir_uses_visit_count_on_revisit() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -10099,10 +10016,9 @@ async fn full_pipeline_with_cli_backend_node() {
     let dir = tempfile::tempdir().unwrap();
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), env);
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -10231,10 +10147,9 @@ async fn stylesheet_backend_property_routes_to_cli() {
     let dir = tempfile::tempdir().unwrap();
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), env);
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -10511,10 +10426,9 @@ async fn git_checkpoint_host_emits_events_and_diff_patch() {
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), env);
 
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-docker".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -10715,10 +10629,9 @@ async fn git_checkpoint_host_writes_shadow_branch() {
 
     let meta_branch = MetadataStore::branch_name(run_id);
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: run_id.into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -10914,10 +10827,9 @@ async fn parallel_git_branching_host_e2e() {
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), env);
 
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: run_id.into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11178,10 +11090,9 @@ async fn git_checkpoint_host_skips_empty_diff_patch() {
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), env);
 
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "empty-diff".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11561,10 +11472,9 @@ async fn e2e_circuit_breaker_deterministic_self_loop() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-circuit-breaker".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11609,10 +11519,9 @@ async fn e2e_circuit_breaker_custom_limit() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-custom-limit".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11650,10 +11559,9 @@ async fn e2e_circuit_breaker_ignores_transient_failures() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-transient-no-breaker".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11698,10 +11606,9 @@ async fn e2e_circuit_breaker_different_reasons_separate_counters() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-varying-reasons".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11739,10 +11646,9 @@ async fn e2e_circuit_breaker_loop_restart() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-breaker".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11802,10 +11708,9 @@ async fn e2e_failure_signature_persisted_in_context() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-sig-context".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11867,10 +11772,9 @@ async fn e2e_failure_signature_hint_overrides_reason_in_context() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-sig-hint".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -11924,10 +11828,9 @@ async fn e2e_signature_maps_persist_in_checkpoint() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-sig-persist".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12052,10 +11955,9 @@ async fn e2e_circuit_breaker_emits_events_before_abort() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-events".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12120,10 +12022,9 @@ async fn e2e_circuit_breaker_does_not_fire_below_limit() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-below-limit".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12217,10 +12118,9 @@ async fn e2e_circuit_breaker_multi_stage_impl_verify_cycle() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-impl-verify-cycle".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12315,10 +12215,9 @@ async fn e2e_loop_restart_blocked_for_deterministic_failure() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-blocked-det".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12356,10 +12255,9 @@ async fn e2e_loop_restart_blocked_for_structural_failure() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-blocked-struct".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12397,10 +12295,9 @@ async fn e2e_loop_restart_blocked_for_budget_exhausted_failure() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-blocked-budget".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12438,10 +12335,9 @@ async fn e2e_loop_restart_blocked_for_canceled_failure() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-blocked-canceled".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12476,10 +12372,9 @@ async fn e2e_loop_restart_blocked_for_compilation_loop_failure() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-blocked-comploop".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12518,10 +12413,9 @@ async fn e2e_loop_restart_allowed_for_transient_infra() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "e2e-restart-allowed-transient".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12623,10 +12517,9 @@ async fn e2e_stall_watchdog_triggers_from_dot_parsed_pipeline() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(emitter), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "stall-e2e".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12680,10 +12573,9 @@ async fn e2e_stall_watchdog_kept_alive_by_handler_events() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "stall-alive-e2e".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12727,10 +12619,9 @@ async fn e2e_stall_watchdog_disabled_with_zero_timeout() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "stall-disabled-e2e".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12793,10 +12684,9 @@ async fn e2e_stall_watchdog_with_explicit_timeout_override() {
 
     let engine = WorkflowRunner::new(registry, Arc::new(EventEmitter::new()), local_env());
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "stall-override-e2e".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -12925,7 +12815,7 @@ async fn asset_collection_local_sandbox_success() {
     graph.edges.push(Edge::new("create_assets", "exit"));
 
     let run_options = RunOptions {
-        config: FabroSettings {
+        settings: FabroSettings {
             assets: Some(fabro_config::run::AssetsSettings {
                 include: vec!["test-results/**".to_string()],
             }),
@@ -12933,7 +12823,6 @@ async fn asset_collection_local_sandbox_success() {
         },
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "asset-test-local".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -13040,7 +12929,7 @@ async fn asset_collection_local_sandbox_on_failure() {
     graph.edges.push(Edge::new("create_assets", "exit"));
 
     let run_options = RunOptions {
-        config: FabroSettings {
+        settings: FabroSettings {
             assets: Some(fabro_config::run::AssetsSettings {
                 include: vec!["test-results/**".to_string()],
             }),
@@ -13048,7 +12937,6 @@ async fn asset_collection_local_sandbox_on_failure() {
         },
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "asset-test-fail".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -13138,7 +13026,7 @@ async fn asset_collection_docker_sandbox() {
     graph.edges.push(Edge::new("create_assets", "exit"));
 
     let run_options = RunOptions {
-        config: FabroSettings {
+        settings: FabroSettings {
             assets: Some(fabro_config::run::AssetsSettings {
                 include: vec!["test-results/**".to_string()],
             }),
@@ -13146,7 +13034,6 @@ async fn asset_collection_docker_sandbox() {
         },
         run_dir: run_dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "asset-test-docker".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
@@ -13213,10 +13100,9 @@ async fn wait_timer_e2e() {
         local_env(),
     );
     let run_options = RunOptions {
-        config: FabroSettings::default(),
+        settings: FabroSettings::default(),
         run_dir: dir.path().to_path_buf(),
         cancel_token: None,
-        dry_run: false,
         run_id: "test-run".into(),
         labels: std::collections::HashMap::new(),
         git_author: fabro_workflows::git::GitAuthor::default(),
diff --git a/lib/packages/fabro-api-client/src/api/run-internals-api.ts b/lib/packages/fabro-api-client/src/api/run-internals-api.ts
index aecc80135..660e3a604 100644
--- a/lib/packages/fabro-api-client/src/api/run-internals-api.ts
+++ b/lib/packages/fabro-api-client/src/api/run-internals-api.ts
@@ -30,7 +30,7 @@ import type { PaginatedStageTurnList } from '../models';
 // @ts-ignore
 import type { RunCheckpoint } from '../models';
 // @ts-ignore
-import type { RunConfiguration } from '../models';
+import type { RunSettings } from '../models';
 /**
  * RunInternalsApi - axios parameter creator
  */
@@ -184,16 +184,16 @@ export const RunInternalsApiAxiosParamCreator = function (configuration?: Config
             };
         },
         /**
-         * Returns the structured configuration used to launch this run.
-         * @summary Retrieve Run Configuration
+         * Returns the structured settings used to launch this run.
+         * @summary Retrieve Run Settings
          * @param {string} id Unique run identifier (ULID).
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        retrieveRunConfiguration: async (id: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        retrieveRunSettings: async (id: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveRunConfiguration', 'id', id)
-            const localVarPath = `/runs/{id}/configuration`
+            assertParamExists('retrieveRunSettings', 'id', id)
+            const localVarPath = `/runs/{id}/settings`
                 .replace(`{${"id"}}`, encodeURIComponent(String(id)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -319,16 +319,16 @@ export const RunInternalsApiFp = function(configuration?: Configuration) {
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
-         * Returns the structured configuration used to launch this run.
-         * @summary Retrieve Run Configuration
+         * Returns the structured settings used to launch this run.
+         * @summary Retrieve Run Settings
          * @param {string} id Unique run identifier (ULID).
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async retrieveRunConfiguration(id: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RunConfiguration>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveRunConfiguration(id, options);
+        async retrieveRunSettings(id: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RunSettings>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveRunSettings(id, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RunInternalsApi.retrieveRunConfiguration']?.[localVarOperationServerIndex]?.url;
+            const localVarOperationServerBasePath = operationServerMap['RunInternalsApi.retrieveRunSettings']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
@@ -389,14 +389,14 @@ export const RunInternalsApiFactory = function (configuration?: Configuration, b
             return localVarFp.retrieveRunCheckpoint(id, options).then((request) => request(axios, basePath));
         },
         /**
-         * Returns the structured configuration used to launch this run.
-         * @summary Retrieve Run Configuration
+         * Returns the structured settings used to launch this run.
+         * @summary Retrieve Run Settings
          * @param {string} id Unique run identifier (ULID).
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        retrieveRunConfiguration(id: string, options?: RawAxiosRequestConfig): AxiosPromise<RunConfiguration> {
-            return localVarFp.retrieveRunConfiguration(id, options).then((request) => request(axios, basePath));
+        retrieveRunSettings(id: string, options?: RawAxiosRequestConfig): AxiosPromise<RunSettings> {
+            return localVarFp.retrieveRunSettings(id, options).then((request) => request(axios, basePath));
         },
         /**
          * Returns the key-value context map accumulated during the run. Empty if the run has not started.
@@ -454,14 +454,14 @@ export class RunInternalsApi extends BaseAPI {
     }
 
     /**
-     * Returns the structured configuration used to launch this run.
-     * @summary Retrieve Run Configuration
+     * Returns the structured settings used to launch this run.
+     * @summary Retrieve Run Settings
      * @param {string} id Unique run identifier (ULID).
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    public retrieveRunConfiguration(id: string, options?: RawAxiosRequestConfig) {
-        return RunInternalsApiFp(this.configuration).retrieveRunConfiguration(id, options).then((request) => request(this.axios, this.basePath));
+    public retrieveRunSettings(id: string, options?: RawAxiosRequestConfig) {
+        return RunInternalsApiFp(this.configuration).retrieveRunSettings(id, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -475,4 +475,3 @@ export class RunInternalsApi extends BaseAPI {
         return RunInternalsApiFp(this.configuration).retrieveRunContext(id, options).then((request) => request(this.axios, this.basePath));
     }
 }
-
diff --git a/lib/packages/fabro-api-client/src/api/settings-api.ts b/lib/packages/fabro-api-client/src/api/settings-api.ts
index 4e003011f..d148a1e23 100644
--- a/lib/packages/fabro-api-client/src/api/settings-api.ts
+++ b/lib/packages/fabro-api-client/src/api/settings-api.ts
@@ -22,19 +22,19 @@ import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObj
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore
-import type { ServerConfiguration } from '../models';
+import type { ServerSettings } from '../models';
 /**
  * SettingsApi - axios parameter creator
  */
 export const SettingsApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
-         * Returns the structured server configuration.
-         * @summary Retrieve Server Configuration
+         * Returns the structured server settings.
+         * @summary Retrieve Server Settings
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        retrieveServerConfiguration: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        retrieveServerSettings: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/settings`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -75,15 +75,15 @@ export const SettingsApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = SettingsApiAxiosParamCreator(configuration)
     return {
         /**
-         * Returns the structured server configuration.
-         * @summary Retrieve Server Configuration
+         * Returns the structured server settings.
+         * @summary Retrieve Server Settings
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async retrieveServerConfiguration(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ServerConfiguration>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveServerConfiguration(options);
+        async retrieveServerSettings(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ServerSettings>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveServerSettings(options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['SettingsApi.retrieveServerConfiguration']?.[localVarOperationServerIndex]?.url;
+            const localVarOperationServerBasePath = operationServerMap['SettingsApi.retrieveServerSettings']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
@@ -96,13 +96,13 @@ export const SettingsApiFactory = function (configuration?: Configuration, baseP
     const localVarFp = SettingsApiFp(configuration)
     return {
         /**
-         * Returns the structured server configuration.
-         * @summary Retrieve Server Configuration
+         * Returns the structured server settings.
+         * @summary Retrieve Server Settings
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        retrieveServerConfiguration(options?: RawAxiosRequestConfig): AxiosPromise<ServerConfiguration> {
-            return localVarFp.retrieveServerConfiguration(options).then((request) => request(axios, basePath));
+        retrieveServerSettings(options?: RawAxiosRequestConfig): AxiosPromise<ServerSettings> {
+            return localVarFp.retrieveServerSettings(options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -112,13 +112,12 @@ export const SettingsApiFactory = function (configuration?: Configuration, baseP
  */
 export class SettingsApi extends BaseAPI {
     /**
-     * Returns the structured server configuration.
-     * @summary Retrieve Server Configuration
+     * Returns the structured server settings.
+     * @summary Retrieve Server Settings
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    public retrieveServerConfiguration(options?: RawAxiosRequestConfig) {
-        return SettingsApiFp(this.configuration).retrieveServerConfiguration(options).then((request) => request(this.axios, this.basePath));
+    public retrieveServerSettings(options?: RawAxiosRequestConfig) {
+        return SettingsApiFp(this.configuration).retrieveServerSettings(options).then((request) => request(this.axios, this.basePath));
     }
 }
-
diff --git a/lib/packages/fabro-api-client/src/api/workflows-api.ts b/lib/packages/fabro-api-client/src/api/workflows-api.ts
index de4395fa1..41021f2f0 100644
--- a/lib/packages/fabro-api-client/src/api/workflows-api.ts
+++ b/lib/packages/fabro-api-client/src/api/workflows-api.ts
@@ -133,7 +133,7 @@ export const WorkflowsApiAxiosParamCreator = function (configuration?: Configura
             };
         },
         /**
-         * Returns the full detail of a workflow including its DOT graph, TOML config, and description.
+         * Returns the full detail of a workflow including its DOT graph, resolved settings, and description.
          * @summary Retrieve Workflow
          * @param {string} name URL-safe slug identifying a workflow definition.
          * @param {*} [options] Override http request option.
@@ -212,7 +212,7 @@ export const WorkflowsApiFp = function(configuration?: Configuration) {
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
-         * Returns the full detail of a workflow including its DOT graph, TOML config, and description.
+         * Returns the full detail of a workflow including its DOT graph, resolved settings, and description.
          * @summary Retrieve Workflow
          * @param {string} name URL-safe slug identifying a workflow definition.
          * @param {*} [options] Override http request option.
@@ -257,7 +257,7 @@ export const WorkflowsApiFactory = function (configuration?: Configuration, base
             return localVarFp.listWorkflows(pageLimit, pageOffset, options).then((request) => request(axios, basePath));
         },
         /**
-         * Returns the full detail of a workflow including its DOT graph, TOML config, and description.
+         * Returns the full detail of a workflow including its DOT graph, resolved settings, and description.
          * @summary Retrieve Workflow
          * @param {string} name URL-safe slug identifying a workflow definition.
          * @param {*} [options] Override http request option.
@@ -299,7 +299,7 @@ export class WorkflowsApi extends BaseAPI {
     }
 
     /**
-     * Returns the full detail of a workflow including its DOT graph, TOML config, and description.
+     * Returns the full detail of a workflow including its DOT graph, resolved settings, and description.
      * @summary Retrieve Workflow
      * @param {string} name URL-safe slug identifying a workflow definition.
      * @param {*} [options] Override http request option.
@@ -309,4 +309,3 @@ export class WorkflowsApi extends BaseAPI {
         return WorkflowsApiFp(this.configuration).retrieveWorkflow(name, options).then((request) => request(this.axios, this.basePath));
     }
 }
-
diff --git a/lib/packages/fabro-api-client/src/models/api-configuration.ts b/lib/packages/fabro-api-client/src/models/api-configuration.ts
index 5c4c5ac54..fea66e476 100644
--- a/lib/packages/fabro-api-client/src/models/api-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/api-configuration.ts
@@ -15,12 +15,12 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { TlsConfiguration } from './tls-configuration';
+import type { TlsSettings } from './tls-configuration';
 
 /**
  * API server configuration.
  */
-export interface ApiConfiguration {
+export interface ApiSettings {
     /**
      * API base URL.
      */
@@ -28,15 +28,15 @@ export interface ApiConfiguration {
     /**
      * Authentication strategies.
      */
-    'authentication_strategies'?: Array<ApiConfigurationAuthenticationStrategiesEnum>;
-    'tls'?: TlsConfiguration;
+    'authentication_strategies'?: Array<ApiSettingsAuthenticationStrategiesEnum>;
+    'tls'?: TlsSettings;
 }
 
-export const ApiConfigurationAuthenticationStrategiesEnum = {
+export const ApiSettingsAuthenticationStrategiesEnum = {
     JWT: 'jwt',
     MTLS: 'mtls'
 } as const;
 
-export type ApiConfigurationAuthenticationStrategiesEnum = typeof ApiConfigurationAuthenticationStrategiesEnum[keyof typeof ApiConfigurationAuthenticationStrategiesEnum];
+export type ApiSettingsAuthenticationStrategiesEnum = typeof ApiSettingsAuthenticationStrategiesEnum[keyof typeof ApiSettingsAuthenticationStrategiesEnum];
 
 
diff --git a/lib/packages/fabro-api-client/src/models/assets-configuration.ts b/lib/packages/fabro-api-client/src/models/assets-configuration.ts
index 6e27c050b..37a2b3d37 100644
--- a/lib/packages/fabro-api-client/src/models/assets-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/assets-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Asset collection configuration.
  */
-export interface AssetsConfiguration {
+export interface AssetsSettings {
     /**
      * Glob patterns for files to collect as run assets.
      */
diff --git a/lib/packages/fabro-api-client/src/models/auth-configuration.ts b/lib/packages/fabro-api-client/src/models/auth-configuration.ts
index d6c96ffbd..d7763c463 100644
--- a/lib/packages/fabro-api-client/src/models/auth-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/auth-configuration.ts
@@ -17,22 +17,22 @@
 /**
  * Authentication configuration.
  */
-export interface AuthConfiguration {
+export interface AuthSettings {
     /**
      * Auth provider.
      */
-    'provider'?: AuthConfigurationProviderEnum;
+    'provider'?: AuthSettingsProviderEnum;
     /**
      * Allowed usernames.
      */
     'allowed_usernames'?: Array<string>;
 }
 
-export const AuthConfigurationProviderEnum = {
+export const AuthSettingsProviderEnum = {
     GITHUB: 'github',
     INSECURE_DISABLED: 'insecure_disabled'
 } as const;
 
-export type AuthConfigurationProviderEnum = typeof AuthConfigurationProviderEnum[keyof typeof AuthConfigurationProviderEnum];
+export type AuthSettingsProviderEnum = typeof AuthSettingsProviderEnum[keyof typeof AuthSettingsProviderEnum];
 
 
diff --git a/lib/packages/fabro-api-client/src/models/checkpoint-configuration.ts b/lib/packages/fabro-api-client/src/models/checkpoint-configuration.ts
index 0c5c902de..b16f61b44 100644
--- a/lib/packages/fabro-api-client/src/models/checkpoint-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/checkpoint-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Checkpoint configuration for file exclusion.
  */
-export interface CheckpointConfiguration {
+export interface CheckpointSettings {
     /**
      * Glob patterns to exclude from checkpoints.
      */
diff --git a/lib/packages/fabro-api-client/src/models/daytona-configuration-network-one-of.ts b/lib/packages/fabro-api-client/src/models/daytona-configuration-network-one-of.ts
index 57bd7e16a..c19be5122 100644
--- a/lib/packages/fabro-api-client/src/models/daytona-configuration-network-one-of.ts
+++ b/lib/packages/fabro-api-client/src/models/daytona-configuration-network-one-of.ts
@@ -14,7 +14,7 @@
 
 
 
-export interface DaytonaConfigurationNetworkOneOf {
+export interface DaytonaSettingsNetworkOneOf {
     /**
      * CIDR allowlist for network access.
      */
diff --git a/lib/packages/fabro-api-client/src/models/daytona-configuration-network.ts b/lib/packages/fabro-api-client/src/models/daytona-configuration-network.ts
index cc7b20309..c6a63aac3 100644
--- a/lib/packages/fabro-api-client/src/models/daytona-configuration-network.ts
+++ b/lib/packages/fabro-api-client/src/models/daytona-configuration-network.ts
@@ -15,12 +15,12 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { DaytonaConfigurationNetworkOneOf } from './daytona-configuration-network-one-of';
+import type { DaytonaSettingsNetworkOneOf } from './daytona-configuration-network-one-of';
 
 /**
- * @type DaytonaConfigurationNetwork
+ * @type DaytonaSettingsNetwork
  * Network access mode: \"block\", \"allow_all\", or {\"allow_list\": [...]}.
  */
-export type DaytonaConfigurationNetwork = DaytonaConfigurationNetworkOneOf | string;
+export type DaytonaSettingsNetwork = DaytonaSettingsNetworkOneOf | string;
 
 
diff --git a/lib/packages/fabro-api-client/src/models/daytona-configuration.ts b/lib/packages/fabro-api-client/src/models/daytona-configuration.ts
index 941450a59..88253d4a6 100644
--- a/lib/packages/fabro-api-client/src/models/daytona-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/daytona-configuration.ts
@@ -15,15 +15,15 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { DaytonaConfigurationNetwork } from './daytona-configuration-network';
+import type { DaytonaSettingsNetwork } from './daytona-configuration-network';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { DaytonaSnapshotConfiguration } from './daytona-snapshot-configuration';
+import type { DaytonaSnapshotSettings } from './daytona-snapshot-configuration';
 
 /**
  * Daytona-specific sandbox settings.
  */
-export interface DaytonaConfiguration {
+export interface DaytonaSettings {
     /**
      * Auto-stop interval in seconds.
      */
@@ -32,7 +32,7 @@ export interface DaytonaConfiguration {
      * Labels applied to the sandbox.
      */
     'labels'?: { [key: string]: string; };
-    'snapshot'?: DaytonaSnapshotConfiguration;
-    'network'?: DaytonaConfigurationNetwork;
+    'snapshot'?: DaytonaSnapshotSettings;
+    'network'?: DaytonaSettingsNetwork;
 }
 
diff --git a/lib/packages/fabro-api-client/src/models/daytona-snapshot-configuration.ts b/lib/packages/fabro-api-client/src/models/daytona-snapshot-configuration.ts
index e83187738..afb9fc7e2 100644
--- a/lib/packages/fabro-api-client/src/models/daytona-snapshot-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/daytona-snapshot-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Snapshot configuration for Daytona sandboxes.
  */
-export interface DaytonaSnapshotConfiguration {
+export interface DaytonaSnapshotSettings {
     /**
      * Snapshot name.
      */
diff --git a/lib/packages/fabro-api-client/src/models/exe-configuration.ts b/lib/packages/fabro-api-client/src/models/exe-configuration.ts
index aa65b7a19..a214b0237 100644
--- a/lib/packages/fabro-api-client/src/models/exe-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/exe-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * exe.dev sandbox configuration.
  */
-export interface ExeConfiguration {
+export interface ExeSettings {
     /**
      * VM image to use for the exe.dev sandbox.
      */
diff --git a/lib/packages/fabro-api-client/src/models/git-author-configuration.ts b/lib/packages/fabro-api-client/src/models/git-author-configuration.ts
index 46818d2c9..aaae0960d 100644
--- a/lib/packages/fabro-api-client/src/models/git-author-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/git-author-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Git commit author configuration.
  */
-export interface GitAuthorConfiguration {
+export interface GitAuthorSettings {
     /**
      * Author name for commits.
      */
diff --git a/lib/packages/fabro-api-client/src/models/git-configuration.ts b/lib/packages/fabro-api-client/src/models/git-configuration.ts
index 137e6b0ff..ce47af29e 100644
--- a/lib/packages/fabro-api-client/src/models/git-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/git-configuration.ts
@@ -15,19 +15,19 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { GitAuthorConfiguration } from './git-author-configuration';
+import type { GitAuthorSettings } from './git-author-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { WebhookConfiguration } from './webhook-configuration';
+import type { WebhookSettings } from './webhook-configuration';
 
 /**
  * Git provider configuration.
  */
-export interface GitConfiguration {
+export interface GitSettings {
     /**
      * Git provider.
      */
-    'provider'?: GitConfigurationProviderEnum;
+    'provider'?: GitSettingsProviderEnum;
     /**
      * GitHub App ID.
      */
@@ -40,14 +40,14 @@ export interface GitConfiguration {
      * GitHub App slug.
      */
     'slug'?: string;
-    'author'?: GitAuthorConfiguration;
-    'webhooks'?: WebhookConfiguration;
+    'author'?: GitAuthorSettings;
+    'webhooks'?: WebhookSettings;
 }
 
-export const GitConfigurationProviderEnum = {
+export const GitSettingsProviderEnum = {
     GITHUB: 'github'
 } as const;
 
-export type GitConfigurationProviderEnum = typeof GitConfigurationProviderEnum[keyof typeof GitConfigurationProviderEnum];
+export type GitSettingsProviderEnum = typeof GitSettingsProviderEnum[keyof typeof GitSettingsProviderEnum];
 
 
diff --git a/lib/packages/fabro-api-client/src/models/git-hub-configuration.ts b/lib/packages/fabro-api-client/src/models/git-hub-configuration.ts
index 2b73d3c68..b0f56b6c9 100644
--- a/lib/packages/fabro-api-client/src/models/git-hub-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/git-hub-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * GitHub App token injection configuration.
  */
-export interface GitHubConfiguration {
+export interface GitHubSettings {
     /**
      * GitHub API permissions to request (e.g. contents = write).
      */
diff --git a/lib/packages/fabro-api-client/src/models/llm-configuration.ts b/lib/packages/fabro-api-client/src/models/llm-configuration.ts
index dcd8b59ff..e2ec24400 100644
--- a/lib/packages/fabro-api-client/src/models/llm-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/llm-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * LLM provider and model settings.
  */
-export interface LlmConfiguration {
+export interface LlmSettings {
     /**
      * Model identifier.
      */
diff --git a/lib/packages/fabro-api-client/src/models/local-sandbox-configuration.ts b/lib/packages/fabro-api-client/src/models/local-sandbox-configuration.ts
index d9cbabd58..dca9c61d4 100644
--- a/lib/packages/fabro-api-client/src/models/local-sandbox-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/local-sandbox-configuration.ts
@@ -17,20 +17,20 @@
 /**
  * Local sandbox settings.
  */
-export interface LocalSandboxConfiguration {
+export interface LocalSandboxSettings {
     /**
      * Git worktree mode for local sandbox.
      */
-    'worktree_mode'?: LocalSandboxConfigurationWorktreeModeEnum;
+    'worktree_mode'?: LocalSandboxSettingsWorktreeModeEnum;
 }
 
-export const LocalSandboxConfigurationWorktreeModeEnum = {
+export const LocalSandboxSettingsWorktreeModeEnum = {
     ALWAYS: 'always',
     CLEAN: 'clean',
     DIRTY: 'dirty',
     NEVER: 'never'
 } as const;
 
-export type LocalSandboxConfigurationWorktreeModeEnum = typeof LocalSandboxConfigurationWorktreeModeEnum[keyof typeof LocalSandboxConfigurationWorktreeModeEnum];
+export type LocalSandboxSettingsWorktreeModeEnum = typeof LocalSandboxSettingsWorktreeModeEnum[keyof typeof LocalSandboxSettingsWorktreeModeEnum];
 
 
diff --git a/lib/packages/fabro-api-client/src/models/log-configuration.ts b/lib/packages/fabro-api-client/src/models/log-configuration.ts
index 2b29b5ad2..f973459a3 100644
--- a/lib/packages/fabro-api-client/src/models/log-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/log-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Logging configuration.
  */
-export interface LogConfiguration {
+export interface LogSettings {
     /**
      * Log level (e.g. trace, debug, info).
      */
diff --git a/lib/packages/fabro-api-client/src/models/pull-request-configuration.ts b/lib/packages/fabro-api-client/src/models/pull-request-configuration.ts
index 29534712e..4d44d5718 100644
--- a/lib/packages/fabro-api-client/src/models/pull-request-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/pull-request-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Pull request creation configuration.
  */
-export interface PullRequestConfiguration {
+export interface PullRequestSettings {
     /**
      * Whether to create a pull request after a successful run.
      */
diff --git a/lib/packages/fabro-api-client/src/models/run-configuration.ts b/lib/packages/fabro-api-client/src/models/run-configuration.ts
index d361f9ba9..95be5f730 100644
--- a/lib/packages/fabro-api-client/src/models/run-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/run-configuration.ts
@@ -18,20 +18,20 @@
 import type { HookDefinition } from './hook-definition';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { LlmConfiguration } from './llm-configuration';
+import type { LlmSettings } from './llm-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { SandboxConfiguration } from './sandbox-configuration';
+import type { SandboxSettings } from './sandbox-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { SetupConfiguration } from './setup-configuration';
+import type { SetupSettings } from './setup-configuration';
 
 /**
- * Structured run configuration mirroring WorkflowRunConfig.
+ * Structured run settings mirroring FabroSettings.
  */
-export interface RunConfiguration {
+export interface RunSettings {
     /**
-     * Configuration schema version.
+     * Settings schema version.
      */
     'version': number;
     /**
@@ -46,13 +46,12 @@ export interface RunConfiguration {
      * Working directory for the run.
      */
     'work_dir'?: string;
-    'llm'?: LlmConfiguration;
-    'setup'?: SetupConfiguration;
-    'sandbox'?: SandboxConfiguration;
+    'llm'?: LlmSettings;
+    'setup'?: SetupSettings;
+    'sandbox'?: SandboxSettings;
     /**
      * Variable map for template expansion.
      */
     'vars'?: { [key: string]: string; };
     'hooks'?: Array<HookDefinition>;
 }
-
diff --git a/lib/packages/fabro-api-client/src/models/sandbox-configuration.ts b/lib/packages/fabro-api-client/src/models/sandbox-configuration.ts
index 237d2c7a7..89394cc02 100644
--- a/lib/packages/fabro-api-client/src/models/sandbox-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/sandbox-configuration.ts
@@ -15,21 +15,21 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { DaytonaConfiguration } from './daytona-configuration';
+import type { DaytonaSettings } from './daytona-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { ExeConfiguration } from './exe-configuration';
+import type { ExeSettings } from './exe-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { LocalSandboxConfiguration } from './local-sandbox-configuration';
+import type { LocalSandboxSettings } from './local-sandbox-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { SshConfiguration } from './ssh-configuration';
+import type { SshSettings } from './ssh-configuration';
 
 /**
  * Sandbox execution environment settings.
  */
-export interface SandboxConfiguration {
+export interface SandboxSettings {
     /**
      * Sandbox provider name.
      */
@@ -42,10 +42,10 @@ export interface SandboxConfiguration {
      * Whether to use a devcontainer for the sandbox.
      */
     'devcontainer'?: boolean;
-    'daytona'?: DaytonaConfiguration;
-    'exe'?: ExeConfiguration;
-    'ssh'?: SshConfiguration;
-    'local'?: LocalSandboxConfiguration;
+    'daytona'?: DaytonaSettings;
+    'exe'?: ExeSettings;
+    'ssh'?: SshSettings;
+    'local'?: LocalSandboxSettings;
     /**
      * Environment variables injected into the sandbox.
      */
diff --git a/lib/packages/fabro-api-client/src/models/server-configuration.ts b/lib/packages/fabro-api-client/src/models/server-configuration.ts
index 1728da819..bca30904b 100644
--- a/lib/packages/fabro-api-client/src/models/server-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/server-configuration.ts
@@ -15,51 +15,51 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { ApiConfiguration } from './api-configuration';
+import type { ApiSettings } from './api-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { AssetsConfiguration } from './assets-configuration';
+import type { AssetsSettings } from './assets-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { CheckpointConfiguration } from './checkpoint-configuration';
+import type { CheckpointSettings } from './checkpoint-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
 import type { Features } from './features';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { GitConfiguration } from './git-configuration';
+import type { GitSettings } from './git-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { GitHubConfiguration } from './git-hub-configuration';
+import type { GitHubSettings } from './git-hub-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
 import type { HookDefinition } from './hook-definition';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { LlmConfiguration } from './llm-configuration';
+import type { LlmSettings } from './llm-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { LogConfiguration } from './log-configuration';
+import type { LogSettings } from './log-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
 import type { McpServerEntry } from './mcp-server-entry';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { PullRequestConfiguration } from './pull-request-configuration';
+import type { PullRequestSettings } from './pull-request-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { SandboxConfiguration } from './sandbox-configuration';
+import type { SandboxSettings } from './sandbox-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { SetupConfiguration } from './setup-configuration';
+import type { SetupSettings } from './setup-configuration';
 // May contain unused imports in some cases
 // @ts-ignore
-import type { WebConfiguration } from './web-configuration';
+import type { WebSettings } from './web-configuration';
 
 /**
- * Structured server configuration mirroring ServerConfig.
+ * Structured server settings mirroring FabroSettings.
  */
-export interface ServerConfiguration {
+export interface ServerSettings {
     /**
      * Data directory path.
      */
@@ -68,30 +68,29 @@ export interface ServerConfiguration {
      * Maximum concurrent runs.
      */
     'max_concurrent_runs'?: number;
-    'web'?: WebConfiguration;
-    'api'?: ApiConfiguration;
-    'git'?: GitConfiguration;
+    'web'?: WebSettings;
+    'api'?: ApiSettings;
+    'git'?: GitSettings;
     'features'?: Features;
-    'log'?: LogConfiguration;
+    'log'?: LogSettings;
     /**
      * Default working directory.
      */
     'work_dir'?: string;
-    'llm'?: LlmConfiguration;
-    'setup'?: SetupConfiguration;
-    'sandbox'?: SandboxConfiguration;
+    'llm'?: LlmSettings;
+    'setup'?: SetupSettings;
+    'sandbox'?: SandboxSettings;
     /**
      * Default variable map.
      */
     'vars'?: { [key: string]: string; };
-    'checkpoint'?: CheckpointConfiguration;
-    'pull_request'?: PullRequestConfiguration;
+    'checkpoint'?: CheckpointSettings;
+    'pull_request'?: PullRequestSettings;
     'hooks'?: Array<HookDefinition>;
-    'assets'?: AssetsConfiguration;
+    'assets'?: AssetsSettings;
     /**
      * Default MCP server configurations.
      */
     'mcp_servers'?: { [key: string]: McpServerEntry; };
-    'github'?: GitHubConfiguration;
+    'github'?: GitHubSettings;
 }
-
diff --git a/lib/packages/fabro-api-client/src/models/setup-configuration.ts b/lib/packages/fabro-api-client/src/models/setup-configuration.ts
index e41288ac1..538cde1c0 100644
--- a/lib/packages/fabro-api-client/src/models/setup-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/setup-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * Setup commands run before the workflow.
  */
-export interface SetupConfiguration {
+export interface SetupSettings {
     /**
      * Shell commands to execute.
      */
diff --git a/lib/packages/fabro-api-client/src/models/ssh-configuration.ts b/lib/packages/fabro-api-client/src/models/ssh-configuration.ts
index c7cde25f9..37fef613a 100644
--- a/lib/packages/fabro-api-client/src/models/ssh-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/ssh-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * SSH sandbox configuration for user-provided hosts.
  */
-export interface SshConfiguration {
+export interface SshSettings {
     /**
      * SSH destination (e.g. user@host or an SSH alias).
      */
diff --git a/lib/packages/fabro-api-client/src/models/tls-configuration.ts b/lib/packages/fabro-api-client/src/models/tls-configuration.ts
index 163ed9afd..541cb1245 100644
--- a/lib/packages/fabro-api-client/src/models/tls-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/tls-configuration.ts
@@ -17,7 +17,7 @@
 /**
  * TLS certificate configuration.
  */
-export interface TlsConfiguration {
+export interface TlsSettings {
     /**
      * Certificate file path.
      */
diff --git a/lib/packages/fabro-api-client/src/models/web-configuration.ts b/lib/packages/fabro-api-client/src/models/web-configuration.ts
index 6cb106543..973e4af16 100644
--- a/lib/packages/fabro-api-client/src/models/web-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/web-configuration.ts
@@ -15,16 +15,16 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { AuthConfiguration } from './auth-configuration';
+import type { AuthSettings } from './auth-configuration';
 
 /**
  * Web UI configuration.
  */
-export interface WebConfiguration {
+export interface WebSettings {
     /**
      * Web UI URL.
      */
     'url'?: string;
-    'auth'?: AuthConfiguration;
+    'auth'?: AuthSettings;
 }
 
diff --git a/lib/packages/fabro-api-client/src/models/webhook-configuration.ts b/lib/packages/fabro-api-client/src/models/webhook-configuration.ts
index 33c4bb171..8bd2e9e39 100644
--- a/lib/packages/fabro-api-client/src/models/webhook-configuration.ts
+++ b/lib/packages/fabro-api-client/src/models/webhook-configuration.ts
@@ -17,17 +17,17 @@
 /**
  * Webhook delivery configuration.
  */
-export interface WebhookConfiguration {
+export interface WebhookSettings {
     /**
      * Webhook delivery strategy.
      */
-    'strategy': WebhookConfigurationStrategyEnum;
+    'strategy': WebhookSettingsStrategyEnum;
 }
 
-export const WebhookConfigurationStrategyEnum = {
+export const WebhookSettingsStrategyEnum = {
     TAILSCALE_FUNNEL: 'tailscale_funnel'
 } as const;
 
-export type WebhookConfigurationStrategyEnum = typeof WebhookConfigurationStrategyEnum[keyof typeof WebhookConfigurationStrategyEnum];
+export type WebhookSettingsStrategyEnum = typeof WebhookSettingsStrategyEnum[keyof typeof WebhookSettingsStrategyEnum];
 
 
diff --git a/lib/packages/fabro-api-client/src/models/workflow-detail.ts b/lib/packages/fabro-api-client/src/models/workflow-detail.ts
index d9f5ad144..b8faee159 100644
--- a/lib/packages/fabro-api-client/src/models/workflow-detail.ts
+++ b/lib/packages/fabro-api-client/src/models/workflow-detail.ts
@@ -15,10 +15,10 @@
 
 // May contain unused imports in some cases
 // @ts-ignore
-import type { RunConfiguration } from './run-configuration';
+import type { RunSettings } from './run-configuration';
 
 /**
- * Full detail of a workflow definition including graph and configuration.
+ * Full detail of a workflow definition including graph and resolved settings.
  */
 export interface WorkflowDetail {
     /**
@@ -37,10 +37,9 @@ export interface WorkflowDetail {
      * Prose description of what the workflow does.
      */
     'description': string;
-    'config': RunConfiguration;
+    'settings': RunSettings;
     /**
      * DOT language source defining the workflow graph.
      */
     'graph': string;
 }
-