diff --git a/ui/src/components/IssueProperties.test.tsx b/ui/src/components/IssueProperties.test.tsx
index 0427bfb6bce..16db503871d 100644
--- a/ui/src/components/IssueProperties.test.tsx
+++ b/ui/src/components/IssueProperties.test.tsx
@@ -278,7 +278,6 @@ function createRuntimeService(overrides: Partial<WorkspaceRuntimeService> = {}):
     scopeType: "execution_workspace",
     scopeId: "workspace-1",
     serviceName: "web",
-    status: "running",
     lifecycle: "shared",
     reuseKey: null,
     command: "pnpm dev",
@@ -297,6 +296,10 @@ function createRuntimeService(overrides: Partial<WorkspaceRuntimeService> = {}):
     createdAt: new Date("2026-04-06T12:02:00.000Z"),
     updatedAt: new Date("2026-04-06T12:03:00.000Z"),
     ...overrides,
+    status: overrides.status ?? "running",
+    actualState: overrides.actualState ?? overrides.status ?? "running",
+    desiredState: overrides.desiredState ?? null,
+    latestFailure: overrides.latestFailure ?? null,
   };
 }
 
@@ -330,6 +333,7 @@ function createExecutionWorkspace(overrides: Partial<ExecutionWorkspace> = {}):
     createdAt: new Date("2026-04-06T12:01:00.000Z"),
     updatedAt: new Date("2026-04-06T12:04:00.000Z"),
     ...overrides,
+    effectiveRuntimeConfig: overrides.effectiveRuntimeConfig ?? null,
   };
 }
 
diff --git a/ui/src/components/IssueWorkspaceCard.test.tsx b/ui/src/components/IssueWorkspaceCard.test.tsx
index 3e744ebef6a..dddaeb36189 100644
--- a/ui/src/components/IssueWorkspaceCard.test.tsx
+++ b/ui/src/components/IssueWorkspaceCard.test.tsx
@@ -75,6 +75,7 @@ function createExecutionWorkspace(overrides: Partial<ExecutionWorkspace> = {}):
     createdAt: new Date("2026-04-16T04:59:00.000Z"),
     updatedAt: new Date("2026-04-16T05:00:00.000Z"),
     ...overrides,
+    effectiveRuntimeConfig: overrides.effectiveRuntimeConfig ?? null,
   };
 }
 
diff --git a/ui/src/components/RoutineRunVariablesDialog.test.tsx b/ui/src/components/RoutineRunVariablesDialog.test.tsx
index d6e7b747c1c..c781f1ba2d1 100644
--- a/ui/src/components/RoutineRunVariablesDialog.test.tsx
+++ b/ui/src/components/RoutineRunVariablesDialog.test.tsx
@@ -167,6 +167,7 @@ function createExecutionWorkspace(): ExecutionWorkspace {
       workspaceRuntime: null,
       desiredState: null,
     },
+    effectiveRuntimeConfig: null,
     metadata: null,
     runtimeServices: [],
     createdAt: new Date("2026-04-02T00:00:00.000Z"),
diff --git a/ui/src/components/WorkspaceRuntimeControls.test.tsx b/ui/src/components/WorkspaceRuntimeControls.test.tsx
index 1bc5a8ac571..21ab0447693 100644
--- a/ui/src/components/WorkspaceRuntimeControls.test.tsx
+++ b/ui/src/components/WorkspaceRuntimeControls.test.tsx
@@ -32,6 +32,8 @@ function createRuntimeService(overrides: Partial<WorkspaceRuntimeService> = {}):
     scopeId: overrides.scopeId ?? "workspace-1",
     serviceName: overrides.serviceName ?? "web",
     status: overrides.status ?? "stopped",
+    actualState: overrides.actualState ?? overrides.status ?? "stopped",
+    desiredState: overrides.desiredState ?? null,
     lifecycle: overrides.lifecycle ?? "shared",
     reuseKey: overrides.reuseKey ?? null,
     command: overrides.command ?? "pnpm dev",
@@ -48,6 +50,7 @@ function createRuntimeService(overrides: Partial<WorkspaceRuntimeService> = {}):
     stopPolicy: overrides.stopPolicy ?? null,
     healthStatus: overrides.healthStatus ?? "unknown",
     configIndex: overrides.configIndex ?? null,
+    latestFailure: overrides.latestFailure ?? null,
     createdAt: overrides.createdAt ?? new Date("2026-04-12T00:00:00.000Z"),
     updatedAt: overrides.updatedAt ?? new Date("2026-04-12T00:00:00.000Z"),
   };
diff --git a/ui/src/lib/inbox.test.ts b/ui/src/lib/inbox.test.ts
index 3fdf2ef02a9..21d6cea7765 100644
--- a/ui/src/lib/inbox.test.ts
+++ b/ui/src/lib/inbox.test.ts
@@ -279,6 +279,7 @@ function makeExecutionWorkspace(overrides: Partial<ExecutionWorkspace> = {}): Ex
     createdAt: new Date("2026-03-11T00:00:00.000Z"),
     updatedAt: new Date("2026-03-11T00:00:00.000Z"),
     ...overrides,
+    effectiveRuntimeConfig: overrides.effectiveRuntimeConfig ?? null,
   };
 }
 
diff --git a/ui/src/lib/issue-properties-panel-key.test.ts b/ui/src/lib/issue-properties-panel-key.test.ts
index 6c4631c7f89..7b5887cee02 100644
--- a/ui/src/lib/issue-properties-panel-key.test.ts
+++ b/ui/src/lib/issue-properties-panel-key.test.ts
@@ -108,6 +108,7 @@ describe("buildIssuePropertiesPanelKey", () => {
           cleanupEligibleAt: null,
           cleanupReason: null,
           config: null,
+          effectiveRuntimeConfig: null,
           metadata: null,
           runtimeServices: [],
           createdAt: new Date("2026-04-12T12:01:00.000Z"),
diff --git a/ui/src/lib/optimistic-issue-comments.test.ts b/ui/src/lib/optimistic-issue-comments.test.ts
index e3527976ae4..7b204ed2159 100644
--- a/ui/src/lib/optimistic-issue-comments.test.ts
+++ b/ui/src/lib/optimistic-issue-comments.test.ts
@@ -642,6 +642,7 @@ describe("optimistic issue comments", () => {
           cleanupEligibleAt: null,
           cleanupReason: null,
           config: null,
+          effectiveRuntimeConfig: null,
           metadata: null,
           createdAt: new Date("2026-03-28T14:00:00.000Z"),
           updatedAt: new Date("2026-03-28T14:00:00.000Z"),
diff --git a/ui/src/lib/project-workspaces-tab.test.ts b/ui/src/lib/project-workspaces-tab.test.ts
index 6bf3632ce94..03ec22e4b7a 100644
--- a/ui/src/lib/project-workspaces-tab.test.ts
+++ b/ui/src/lib/project-workspaces-tab.test.ts
@@ -90,6 +90,7 @@ function createExecutionWorkspace(overrides: Partial<ExecutionWorkspace>): Execu
     cleanupEligibleAt: overrides.cleanupEligibleAt ?? null,
     cleanupReason: overrides.cleanupReason ?? null,
     config: overrides.config ?? null,
+    effectiveRuntimeConfig: overrides.effectiveRuntimeConfig ?? null,
     metadata: overrides.metadata ?? null,
     runtimeServices: overrides.runtimeServices ?? [],
     createdAt: overrides.createdAt ?? new Date("2026-03-26T09:00:00Z"),
@@ -109,6 +110,8 @@ function createRuntimeService(overrides: Partial<WorkspaceRuntimeService> = {}):
     scopeId: overrides.scopeId ?? null,
     serviceName: overrides.serviceName ?? "preview",
     status: overrides.status ?? "running",
+    actualState: overrides.actualState ?? overrides.status ?? "running",
+    desiredState: overrides.desiredState ?? null,
     lifecycle: overrides.lifecycle ?? "ephemeral",
     reuseKey: overrides.reuseKey ?? null,
     command: overrides.command ?? null,
@@ -125,6 +128,7 @@ function createRuntimeService(overrides: Partial<WorkspaceRuntimeService> = {}):
     stopPolicy: overrides.stopPolicy ?? null,
     healthStatus: overrides.healthStatus ?? "healthy",
     configIndex: overrides.configIndex ?? null,
+    latestFailure: overrides.latestFailure ?? null,
     createdAt: overrides.createdAt ?? new Date("2026-03-26T09:00:00Z"),
     updatedAt: overrides.updatedAt ?? new Date("2026-03-26T09:30:00Z"),
   };
diff --git a/ui/src/lib/subIssueDefaults.test.ts b/ui/src/lib/subIssueDefaults.test.ts
index a29402d19d8..18ec46bb2e5 100644
--- a/ui/src/lib/subIssueDefaults.test.ts
+++ b/ui/src/lib/subIssueDefaults.test.ts
@@ -26,6 +26,7 @@ function makeExecutionWorkspace(overrides: Partial<ExecutionWorkspace> = {}): Ex
     cleanupEligibleAt: null,
     cleanupReason: null,
     config: null,
+    effectiveRuntimeConfig: null,
     metadata: null,
     lastUsedAt: new Date("2026-04-07T00:00:00.000Z"),
     createdAt: new Date("2026-04-07T00:00:00.000Z"),
diff --git a/ui/storybook/fixtures/paperclipData.ts b/ui/storybook/fixtures/paperclipData.ts
index ee9d4a35341..eecd7c0ee6b 100644
--- a/ui/storybook/fixtures/paperclipData.ts
+++ b/ui/storybook/fixtures/paperclipData.ts
@@ -328,6 +328,8 @@ function createRuntimeService(
     scopeId: overrides.scopeId ?? "execution-workspace-storybook",
     serviceName: overrides.serviceName ?? "storybook",
     status: overrides.status ?? "running",
+    actualState: overrides.actualState ?? overrides.status ?? "running",
+    desiredState: overrides.desiredState ?? null,
     lifecycle: overrides.lifecycle ?? "ephemeral",
     reuseKey: overrides.reuseKey ?? "storybook",
     command: overrides.command ?? "pnpm storybook",
@@ -344,6 +346,7 @@ function createRuntimeService(
     stopPolicy: overrides.stopPolicy ?? null,
     healthStatus: overrides.healthStatus ?? "healthy",
     configIndex: overrides.configIndex ?? 0,
+    latestFailure: overrides.latestFailure ?? null,
     createdAt: overrides.createdAt ?? recent(16),
     updatedAt: overrides.updatedAt ?? recent(4),
   };
@@ -522,6 +525,7 @@ export const storybookExecutionWorkspaces: ExecutionWorkspace[] = [
     cleanupEligibleAt: null,
     cleanupReason: null,
     config: null,
+    effectiveRuntimeConfig: null,
     metadata: null,
     runtimeServices: storybookProjectWorkspaces[0]!.runtimeServices,
     createdAt: recent(90),
@@ -558,6 +562,7 @@ export const storybookExecutionWorkspaces: ExecutionWorkspace[] = [
       desiredState: "stopped",
       serviceStates: { storybook: "stopped" },
     },
+    effectiveRuntimeConfig: null,
     metadata: { dirtyEntryCount: 3 },
     runtimeServices: [
       createRuntimeService({