diff --git a/README.md b/README.md
index 615d591..98267a6 100644
--- a/README.md
+++ b/README.md
@@ -41,13 +41,15 @@ oneshot orchestrate "Build a full-stack Trello clone with auth, Postgres, and re
 
 If you use the launch scripts below, OneShot will auto-check/install most local requirements for you (Bun/Rust/Tauri deps/Temporal where possible).
 
-Manual setup requirements:
+Manual setup requirements (source/dev builds):
 - [Bun](https://bun.sh) ≥ 1.0
 - Rust + Cargo (for desktop/Tauri)
 - [Temporal Server](https://github.com/temporalio/temporal) reachable at `127.0.0.1:7233` (or set `TEMPORAL_ADDRESS`)
 - [Temporal CLI](https://github.com/temporalio/cli) (`temporal`) installed on your PATH
 
 > OneShot orchestration uses Temporal for durable workflow execution. The runtime starts a worker in-process and uses the `temporal` CLI to start/signal/query workflows.
+>
+> Desktop release bundles include both `oneshot-cli` and `temporal` sidecars and will auto-start local Temporal by default, so end users do not need a separate Temporal install.
 
 ---
 
diff --git a/packages/app/src/context/orchestrate.tsx b/packages/app/src/context/orchestrate.tsx
index a0e156c..b2bf381 100644
--- a/packages/app/src/context/orchestrate.tsx
+++ b/packages/app/src/context/orchestrate.tsx
@@ -2339,7 +2339,7 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
         ) {
           return "retrying"
         }
-        if (status === "completed") return "done"
+        if (status === "completed" || status === "skipped") return "done"
         if (status === "failed") return "failed"
         if (status === "in_progress") return "busy"
         if (status === "blocked") return "blocked"
@@ -2461,7 +2461,7 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       const runPaused = state.runStatus === "paused"
       const hasAnyInProgress = state.tasks.some((task) => task.status === "in_progress")
       const hasAnyBlocked = state.tasks.some((task) => task.status === "blocked")
-      const hasAnyCompleted = state.tasks.some((task) => task.status === "completed")
+      const hasAnyCompleted = state.tasks.some((task) => task.status === "completed" || task.status === "skipped")
       const hasAnyOutstanding = state.tasks.some((task) =>
         task.status === "pending" || task.status === "in_progress" || task.status === "blocked",
       )
@@ -2482,6 +2482,15 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
         state.phase === "researching" ||
         !!state.researchContext ||
         !!state.researchSessionId
+      const shouldShowPlannerNode =
+        !!state.planningSessionId
+        && (
+          state.phase === "researching"
+          || state.phase === "planning"
+          || state.tasks.length === 0
+          || runPaused
+          || runFailed
+        )
 
       const researchStatus: AgentNode["status"] =
         state.phase === "researching"
@@ -2491,6 +2500,14 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
           : state.phase === "failed" && !state.researchContext
             ? "failed"
             : "done"
+      const plannerStatus: AgentNode["status"] =
+        runFailed
+          ? "failed"
+          : runPaused
+            ? "paused"
+            : state.phase === "planning" || (state.runStatus === "active" && state.tasks.length === 0)
+              ? "busy"
+              : "done"
 
       // During planning phase, show the planner session; during execution, show the supervisor session
       const orchestratorSessionId = resolveMasterSessionId({
@@ -2532,6 +2549,15 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
             status: researchStatus,
             children: [],
           }] : []),
+          ...(shouldShowPlannerNode ? [{
+            id: "root-planner",
+            role: "task" as const,
+            label: "Root Planner",
+            sessionId: state.planningSessionId,
+            status: plannerStatus,
+            kind: "planning",
+            children: [],
+          }] : []),
           ...rootNodes,
           // Merge agent — uses distinct role for special UI rendering
           ...(shouldShowIngestNode ? [{
diff --git a/packages/app/src/pages/deploy.tsx b/packages/app/src/pages/deploy.tsx
index 6a184c6..a4f071d 100644
--- a/packages/app/src/pages/deploy.tsx
+++ b/packages/app/src/pages/deploy.tsx
@@ -2,6 +2,8 @@ import { For, Show, createEffect, createMemo, createSignal, onCleanup, type JSX
 import { Button } from "@oneshot-ai/ui/button"
 import { Icon } from "@oneshot-ai/ui/icon"
 import { showToast } from "@oneshot-ai/ui/toast"
+import { Terminal } from "@/components/terminal"
+import type { LocalPTY } from "@/context/terminal"
 import { useOrchestrate } from "@/context/orchestrate"
 import { usePlatform } from "@/context/platform"
 import { useSDK } from "@/context/sdk"
@@ -117,8 +119,10 @@ const DEFAULT_TOOL_DESCRIPTIONS: Record<DeployToolName, string> = {
   artifact_capture: "Capture screenshots, traces, and videos.",
 }
 
-const DEFAULT_TOOLS: DeployToolDescriptor[] = Object.entries(DEFAULT_TOOL_DESCRIPTIONS)
-  .map(([id, description]) => ({ id: id as DeployToolName, description }))
+const DEFAULT_TOOLS: DeployToolDescriptor[] = Object.entries(DEFAULT_TOOL_DESCRIPTIONS).map(([id, description]) => ({
+  id: id as DeployToolName,
+  description,
+}))
 
 const SESSION_STATUS_LABEL: Record<DeploySessionStatus, string> = {
   idle: "Idle",
@@ -255,10 +259,28 @@ function invocationDisplayTitle(invocation: DeployToolInvocation): string {
 function parseSession(payload: unknown): DeploySession | undefined {
   if (!payload || typeof payload !== "object") return undefined
   const maybe = payload as DeploySession
-  if (typeof maybe.id !== "string" || !Array.isArray(maybe.messages) || !Array.isArray(maybe.invocations)) return undefined
+  if (typeof maybe.id !== "string" || !Array.isArray(maybe.messages) || !Array.isArray(maybe.invocations))
+    return undefined
   return maybe
 }
 
+function invocationLivePty(invocation: DeployToolInvocation): LocalPTY | undefined {
+  const meta = invocation.output?.meta
+  if (!meta || typeof meta !== "object") return undefined
+  const record = meta as Record<string, unknown>
+  const id = typeof record.livePtyId === "string" ? record.livePtyId.trim() : ""
+  if (!id) return undefined
+  const title =
+    typeof record.livePtyTitle === "string" && record.livePtyTitle.trim()
+      ? record.livePtyTitle.trim()
+      : "Deploy App Terminal"
+  return {
+    id,
+    title,
+    titleNumber: 0,
+  }
+}
+
 type LaunchGuide = {
   status: "RUNNING" | "READY_FOR_MANUAL_START" | "UNKNOWN"
   summary?: string
@@ -317,44 +339,55 @@ function parseLaunchGuideFromAssistantMessage(message: DeployMessage): LaunchGui
 
 function parseTools(payload: unknown): DeployToolDescriptor[] {
   if (!Array.isArray(payload)) return []
-  return payload
-    .flatMap((item) => {
-      if (!item || typeof item !== "object") return []
-      const record = item as Record<string, unknown>
-      if (typeof record.id !== "string" || typeof record.description !== "string") return []
-      return [{ id: record.id as DeployToolName, description: record.description }]
-    })
+  return payload.flatMap((item) => {
+    if (!item || typeof item !== "object") return []
+    const record = item as Record<string, unknown>
+    if (typeof record.id !== "string" || typeof record.description !== "string") return []
+    return [{ id: record.id as DeployToolName, description: record.description }]
+  })
 }
 
 function InvocationWidget(props: {
   invocation: DeployToolInvocation
   onOpenUrl?: (url: string) => void
+  compact?: boolean
 }): JSX.Element {
+  const compact = !!props.compact
   const theme = TOOL_WIDGET_THEME[props.invocation.tool]
-  const logs = clampLogs(props.invocation.output?.logs)
+  const logs = clampLogs(props.invocation.output?.logs, compact ? 5 : 14)
   const table = props.invocation.output?.table
+  const livePty = createMemo(() => invocationLivePty(props.invocation))
+  const maxArtifacts = compact ? 2 : 6
 
   return (
     <div class={`relative overflow-hidden rounded-xl border ${theme.frame}`}>
-      <div class="relative flex flex-col gap-2 p-3">
+      <div class={`relative flex flex-col ${compact ? "gap-1.5 p-2" : "gap-2 p-3"}`}>
         <div class="flex flex-wrap items-start justify-between gap-2">
           <div>
-            <div class="text-11-medium uppercase tracking-wide text-text-weak">{theme.label}</div>
-            <div class="text-12-medium text-text-strong">{invocationDisplayTitle(props.invocation)}</div>
+            <div class={`${compact ? "text-[10px]" : "text-11-medium"} uppercase tracking-wide text-text-weak`}>
+              {theme.label}
+            </div>
+            <div class={`${compact ? "text-11-medium" : "text-12-medium"} text-text-strong`}>
+              {invocationDisplayTitle(props.invocation)}
+            </div>
           </div>
-          <span class={`inline-flex items-center rounded-md border px-2 py-0.5 text-10-medium ${INVOCATION_STATUS_CLASS[props.invocation.status]}`}>
+          <span
+            class={`inline-flex items-center rounded-md border ${compact ? "px-1.5 py-0.5 text-[9px]" : "px-2 py-0.5 text-10-medium"} ${INVOCATION_STATUS_CLASS[props.invocation.status]}`}
+          >
             {props.invocation.status.toUpperCase()}
           </span>
         </div>
 
         <Show when={props.invocation.summary}>
-          {(summary) => <p class="text-11-regular text-text-base">{summary()}</p>}
+          {(summary) => <p class={`${compact ? "text-[10px]" : "text-11-regular"} text-text-base`}>{summary()}</p>}
         </Show>
 
         <Show when={props.invocation.output?.command}>
           {(command) => (
-            <div class="rounded-md border border-border-weak-base/80 bg-background-base/70 px-2 py-1 font-mono text-11-regular text-text-base break-all">
-              {command()}
+            <div
+              class={`rounded-md border border-border-weak-base/80 bg-background-base/70 ${compact ? "px-1.5 py-1 text-[10px]" : "px-2 py-1 text-11-regular"} font-mono text-text-base break-all`}
+            >
+              {compact && command().length > 220 ? `${command().slice(0, 220)}...` : command()}
             </div>
           )}
         </Show>
@@ -363,68 +396,104 @@ function InvocationWidget(props: {
           {(url) => (
             <button
               type="button"
-              class="w-fit rounded-md border border-border-base/60 bg-background-base px-2 py-1 text-11-medium text-text-base hover:border-border-base"
+              class={`w-fit rounded-md border border-border-base/60 bg-background-base ${compact ? "px-1.5 py-0.5 text-[10px]" : "px-2 py-1 text-11-medium"} text-text-base hover:border-border-base`}
               onClick={() => props.onOpenUrl?.(url())}
             >
-              Open {url()}
+              {compact ? "Open URL" : `Open ${url()}`}
             </button>
           )}
         </Show>
 
+        <Show when={livePty()}>
+          {(pty) => (
+            <div class="overflow-hidden rounded-md border border-border-weak-base/80 bg-background-base/80">
+              <div class="flex items-center justify-between border-b border-border-weak-base/70 px-2 py-1">
+                <span class="text-[10px] uppercase tracking-wide text-text-weak">Live Terminal</span>
+                <span class="font-mono text-[10px] text-text-weak">{pty().id.slice(-6)}</span>
+              </div>
+              <div class={compact ? "h-36" : "h-72"}>
+                <Terminal pty={pty()} />
+              </div>
+            </div>
+          )}
+        </Show>
+
         <Show when={table && (table.columns.length > 0 || table.rows.length > 0)}>
-          <div class="overflow-auto rounded-md border border-border-weak-base/80 bg-background-base/70">
-            <table class="min-w-full text-left text-11-regular text-text-base">
-              <Show when={table && table.columns.length > 0}>
-                <thead class="border-b border-border-weak-base/70 bg-background-weak-base/30 text-text-weak">
-                  <tr>
-                    <For each={table?.columns ?? []}>{(column) => <th class="px-2 py-1 font-medium">{column}</th>}</For>
-                  </tr>
-                </thead>
-              </Show>
-              <tbody>
-                <For each={(table?.rows ?? []).slice(0, 10)}>
-                  {(row) => (
-                    <tr class="border-b border-border-weak-base/50 last:border-b-0">
-                      <For each={row}>{(cell) => <td class="px-2 py-1 align-top">{cell}</td>}</For>
+          <Show
+            when={!compact}
+            fallback={
+              <div class="rounded-md border border-border-weak-base/80 bg-background-base/80 px-2 py-1 text-[10px] text-text-weak">
+                Table output captured ({table?.rows.length ?? 0} rows). Open Flight Deck for full view.
+              </div>
+            }
+          >
+            <div class="overflow-auto rounded-md border border-border-weak-base/80 bg-background-base/70">
+              <table class="min-w-full text-left text-11-regular text-text-base">
+                <Show when={table && table.columns.length > 0}>
+                  <thead class="border-b border-border-weak-base/70 bg-background-weak-base/30 text-text-weak">
+                    <tr>
+                      <For each={table?.columns ?? []}>
+                        {(column) => <th class="px-2 py-1 font-medium">{column}</th>}
+                      </For>
                     </tr>
-                  )}
-                </For>
-              </tbody>
-            </table>
-          </div>
+                  </thead>
+                </Show>
+                <tbody>
+                  <For each={(table?.rows ?? []).slice(0, 10)}>
+                    {(row) => (
+                      <tr class="border-b border-border-weak-base/50 last:border-b-0">
+                        <For each={row}>{(cell) => <td class="px-2 py-1 align-top">{cell}</td>}</For>
+                      </tr>
+                    )}
+                  </For>
+                </tbody>
+              </table>
+            </div>
+          </Show>
         </Show>
 
-        <Show when={logs.length > 0}>
-          <pre class="max-h-48 overflow-auto rounded-md border border-border-weak-base/80 bg-background-base/80 px-2 py-2 font-mono text-[11px] leading-relaxed text-text-weak">
+        <Show when={!livePty() && logs.length > 0}>
+          <pre
+            class={`${compact ? "max-h-28 px-1.5 py-1.5 text-[10px]" : "max-h-48 px-2 py-2 text-[11px]"} overflow-auto rounded-md border border-border-weak-base/80 bg-background-base/80 font-mono leading-relaxed text-text-weak`}
+          >
             {logs.join("\n")}
           </pre>
         </Show>
 
-        <Show when={props.invocation.output?.text && logs.length === 0}>
+        <Show when={props.invocation.output?.text && logs.length === 0 && !livePty()}>
           {(text) => (
-            <pre class="max-h-48 overflow-auto rounded-md border border-border-weak-base/80 bg-background-base/80 px-2 py-2 font-mono text-[11px] leading-relaxed text-text-weak">
+            <pre
+              class={`${compact ? "max-h-28 px-1.5 py-1.5 text-[10px]" : "max-h-48 px-2 py-2 text-[11px]"} overflow-auto rounded-md border border-border-weak-base/80 bg-background-base/80 font-mono leading-relaxed text-text-weak`}
+            >
               {text()}
             </pre>
           )}
         </Show>
 
-        <Show when={props.invocation.artifacts.length > 0}>
+        <Show when={props.invocation.artifacts.length > 0 && !compact}>
           <div class="grid gap-2 md:grid-cols-2">
-            <For each={props.invocation.artifacts.slice(0, 6)}>
+            <For each={props.invocation.artifacts.slice(0, maxArtifacts)}>
               {(artifact) => (
                 <div class="overflow-hidden rounded-lg border border-border-weak-base/80 bg-background-base/70">
                   <Show
                     when={artifact.type === "image" && !!artifact.dataUrl}
-                    fallback={(
+                    fallback={
                       <div class="p-2 text-11-regular text-text-weak">
                         <div class="font-medium text-text-base">{artifact.label}</div>
                         <div class="mt-1 break-all">{artifact.relativePath}</div>
                       </div>
-                    )}
+                    }
                   >
                     <div class="flex flex-col">
-                      <img src={artifact.dataUrl} alt={artifact.label} class="h-32 w-full object-cover" loading="lazy" />
-                      <div class="border-t border-border-weak-base/80 px-2 py-1 text-10-regular text-text-weak">{artifact.label}</div>
+                      <img
+                        src={artifact.dataUrl}
+                        alt={artifact.label}
+                        class="h-32 w-full object-cover"
+                        loading="lazy"
+                      />
+                      <div class="border-t border-border-weak-base/80 px-2 py-1 text-10-regular text-text-weak">
+                        {artifact.label}
+                      </div>
                     </div>
                   </Show>
                 </div>
@@ -435,19 +504,26 @@ function InvocationWidget(props: {
 
         <Show when={props.invocation.routedToRun}>
           {(route) => (
-            <div class={`rounded-md border px-2 py-1.5 text-11-regular ${route().accepted ? "border-icon-success-base/30 bg-icon-success-base/10 text-icon-success-base" : "border-icon-warning-base/30 bg-icon-warning-base/10 text-icon-warning-base"}`}>
+            <div
+              class={`rounded-md border ${compact ? "px-1.5 py-1 text-[10px]" : "px-2 py-1.5 text-11-regular"} ${route().accepted ? "border-icon-success-base/30 bg-icon-success-base/10 text-icon-success-base" : "border-icon-warning-base/30 bg-icon-warning-base/10 text-icon-warning-base"}`}
+            >
               <div class="font-medium">
                 {route().accepted ? "Remediation queued for linked run" : "Remediation queueing was not accepted"}
               </div>
               <div class="mt-0.5 break-words">{route().message}</div>
-              <div class="mt-0.5 text-10-regular text-text-weak">Run: {route().runId} | {formatDate(route().at)}</div>
+              <div class="mt-0.5 text-[10px] text-text-weak">
+                Run: {route().runId} | {formatDate(route().at)}
+              </div>
             </div>
           )}
         </Show>
 
-        <div class="text-10-regular text-text-weak">
+        <div class={`${compact ? "text-[9px]" : "text-10-regular"} text-text-weak`}>
           Started {formatDate(props.invocation.startedAt)}
-          <Show when={props.invocation.completedAt}> | Duration {formatDuration(props.invocation.startedAt, props.invocation.completedAt)} </Show>
+          <Show when={props.invocation.completedAt}>
+            {" "}
+            | Duration {formatDuration(props.invocation.startedAt, props.invocation.completedAt)}{" "}
+          </Show>
         </div>
       </div>
     </div>
@@ -545,7 +621,10 @@ export default function DeployPage() {
     if (current.status === "passed") {
       const launchInvocation = [...current.invocations]
         .reverse()
-        .find((invocation) => invocation.tool === "terminal_exec" && invocation.status === "passed" && !!invocation.output?.command)
+        .find(
+          (invocation) =>
+            invocation.tool === "terminal_exec" && invocation.status === "passed" && !!invocation.output?.command,
+        )
 
       if (launchInvocation?.output?.command) {
         return {
@@ -596,13 +675,13 @@ export default function DeployPage() {
 
   const toolPaneOpen = createMemo(() => !paneDismissed() && !!activeInvocation())
 
-  const routedFailureCount = createMemo(() =>
-    (session()?.invocations ?? []).filter((invocation) => invocation.status === "failed" && invocation.routedToRun).length,
+  const routedFailureCount = createMemo(
+    () =>
+      (session()?.invocations ?? []).filter((invocation) => invocation.status === "failed" && invocation.routedToRun)
+        .length,
   )
 
-  const sortedSessions = createMemo(() =>
-    [...sessions()].sort((left, right) => right.updatedAt - left.updatedAt),
-  )
+  const sortedSessions = createMemo(() => [...sessions()].sort((left, right) => right.updatedAt - left.updatedAt))
 
   const workspaceKey = createMemo(() => `${sdk.url ?? ""}::${sdk.directory}`)
 
@@ -646,9 +725,7 @@ export default function DeployPage() {
       setSessions([])
       return
     }
-    const parsed = payload
-      .map((item) => parseSession(item))
-      .filter((item): item is DeploySession => !!item)
+    const parsed = payload.map((item) => parseSession(item)).filter((item): item is DeploySession => !!item)
     setSessions(parsed)
   }
 
@@ -816,9 +893,7 @@ export default function DeployPage() {
 
   const messageInvocationResolver = (message: DeployMessage): DeployToolInvocation[] => {
     const map = invocationById()
-    return message.invocationIds
-      .map((id) => map.get(id))
-      .filter((item): item is DeployToolInvocation => !!item)
+    return message.invocationIds.map((id) => map.get(id)).filter((item): item is DeployToolInvocation => !!item)
   }
 
   const latestMessageByInvocation = createMemo(() => {
@@ -864,7 +939,7 @@ export default function DeployPage() {
         method: "POST",
         body: JSON.stringify({}),
       })
-      const record = payload && typeof payload === "object" ? payload as Record<string, unknown> : undefined
+      const record = payload && typeof payload === "object" ? (payload as Record<string, unknown>) : undefined
       if (!record) throw new Error("Invalid open response")
 
       const nextSession = parseSession(record.session)
@@ -875,15 +950,18 @@ export default function DeployPage() {
       }
 
       const invocationRecord = record.invocation
-      const invocationId = invocationRecord && typeof invocationRecord === "object" && typeof (invocationRecord as { id?: unknown }).id === "string"
-        ? (invocationRecord as { id: string }).id
-        : undefined
+      const invocationId =
+        invocationRecord &&
+        typeof invocationRecord === "object" &&
+        typeof (invocationRecord as { id?: unknown }).id === "string"
+          ? (invocationRecord as { id: string }).id
+          : undefined
       if (invocationId) {
         setActiveInvocationId(invocationId)
         setPaneDismissed(false)
       }
 
-      const target = typeof record.target === "string" ? record.target as DeployOpenTarget : "terminal_view"
+      const target = typeof record.target === "string" ? (record.target as DeployOpenTarget) : "terminal_view"
       const openedUrl = typeof record.url === "string" && record.url.trim() ? record.url.trim() : undefined
       if (openedUrl && target === "web_view") {
         setBrowserReloadToken((token) => token + 1)
@@ -949,16 +1027,23 @@ export default function DeployPage() {
               <div>
                 <div class="text-20-medium text-text-strong">Deploy Agent</div>
                 <div class="mt-1 text-12-regular text-text-weak">
-                  Chat-first local deploy validation. Tool widgets render inline in chat and can expand into the right-side flight deck.
+                  Deploy checks can pass while UX is still broken. Report exact repro steps in chat; widgets stay
+                  compact inline and expand in the flight deck.
                 </div>
               </div>
 
               <div class="flex flex-wrap items-center gap-2">
-                <span class={`inline-flex items-center rounded-md border px-2 py-0.5 text-11-medium ${SESSION_STATUS_CLASS[session()?.status ?? "idle"]}`}>
+                <span
+                  class={`inline-flex items-center rounded-md border px-2 py-0.5 text-11-medium ${SESSION_STATUS_CLASS[session()?.status ?? "idle"]}`}
+                >
                   {SESSION_STATUS_LABEL[session()?.status ?? "idle"]}
                 </span>
                 <Show when={session()?.id}>
-                  {(id) => <span class="rounded-md border border-border-weak-base/70 bg-background-base/70 px-2 py-0.5 text-11-regular text-text-weak">{id()}</span>}
+                  {(id) => (
+                    <span class="rounded-md border border-border-weak-base/70 bg-background-base/70 px-2 py-0.5 text-11-regular text-text-weak">
+                      {id()}
+                    </span>
+                  )}
                 </Show>
                 <Show when={routedFailureCount() > 0}>
                   <span class="rounded-md border border-icon-success-base/30 bg-icon-success-base/10 px-2 py-0.5 text-11-medium text-icon-success-base">
@@ -1025,7 +1110,11 @@ export default function DeployPage() {
                 }}
               >
                 <For each={sortedSessions().slice(0, 30)}>
-                  {(item) => <option value={item.id}>{item.id} | {item.status}</option>}
+                  {(item) => (
+                    <option value={item.id}>
+                      {item.id} | {item.status}
+                    </option>
+                  )}
                 </For>
               </select>
               <Show when={session()?.detectedProjectTypes}>
@@ -1039,29 +1128,16 @@ export default function DeployPage() {
                   </For>
                 )}
               </Show>
-              <Button
-                size="small"
-                variant="ghost"
-                class="h-7 px-2.5"
-                disabled={!latestInvocation()}
-                onClick={() => {
-                  const latest = latestInvocation()
-                  if (latest) setActiveInvocationId(latest.id)
-                  setPaneDismissed(false)
-                }}
-              >
-                Open Tool Deck
-              </Button>
             </div>
 
             <Show when={launchGuide()}>
               {(guide) => (
-                <div
-                  class="mt-3 rounded-lg border border-border-weak-base/80 bg-background-base/70 px-3 py-2.5"
-                >
+                <div class="mt-3 rounded-lg border border-border-weak-base/80 bg-background-base/70 px-3 py-2.5">
                   <div class="flex flex-wrap items-center gap-2">
                     <div class="text-11-medium uppercase tracking-wider text-text-weak">Launch Guide</div>
-                    <span class={`inline-flex items-center rounded-md border px-2 py-0.5 text-10-medium ${launchGuideBadgeClass()}`}>
+                    <span
+                      class={`inline-flex items-center rounded-md border px-2 py-0.5 text-10-medium ${launchGuideBadgeClass()}`}
+                    >
                       {guide().status}
                     </span>
                     <span class="ml-auto text-10-regular text-text-weak">Source: {guide().source}</span>
@@ -1073,12 +1149,15 @@ export default function DeployPage() {
 
                   <Show when={guide().steps.length > 0}>
                     <ol class="mt-2 list-decimal space-y-1 pl-5 text-11-regular text-text-base">
-                      <For each={guide().steps}>
-                        {(step) => <li class="break-words">{step}</li>}
-                      </For>
+                      <For each={guide().steps}>{(step) => <li class="break-words">{step}</li>}</For>
                     </ol>
                   </Show>
 
+                  <div class="mt-2 rounded-md border border-icon-warning-base/25 bg-icon-warning-base/8 px-2 py-1.5 text-11-regular text-text-base">
+                    Manual review is still required. If a button or flow fails, post exact steps and expected behavior
+                    in chat so Deploy can rerun and patch.
+                  </div>
+
                   <div class="mt-2.5 flex flex-wrap gap-2">
                     <Button
                       size="small"
@@ -1103,7 +1182,8 @@ export default function DeployPage() {
                   <div class="border-b border-border-weak-base bg-background-weak-base px-4 py-3">
                     <div class="text-12-medium text-text-strong">Deploy Chat</div>
                     <div class="mt-0.5 text-11-regular text-text-weak">
-                      Describe the repo and ask for local deploy validation. Tool runs appear in chat; use the flight deck for expanded surfaces.
+                      Describe the failure and repro steps. Deploy reruns local checks, and inline widgets can be
+                      expanded into the flight deck.
                     </div>
                   </div>
 
@@ -1115,17 +1195,21 @@ export default function DeployPage() {
                       >
                         <Show
                           when={!initializing()}
-                          fallback={<div class="text-12-regular text-text-weak px-2 md:px-6">Initializing deploy session...</div>}
+                          fallback={
+                            <div class="text-12-regular text-text-weak px-2 md:px-6">
+                              Initializing deploy session...
+                            </div>
+                          }
                         >
                           <Show
                             when={session()?.messages.length}
-                            fallback={(
+                            fallback={
                               <div class="text-12-regular text-text-weak px-2 md:px-6 py-4 text-center">
                                 {session()
                                   ? "No messages yet. Ask the deploy agent to validate this repo."
                                   : "No deploy session selected. Click New Session to start manually."}
                               </div>
-                            )}
+                            }
                           >
                             <For each={session()?.messages ?? []}>
                               {(message) => {
@@ -1136,22 +1220,35 @@ export default function DeployPage() {
                                     <div class="text-13-regular leading-relaxed whitespace-pre-wrap break-words">
                                       <div class="flex items-center gap-1.5 mb-1">
                                         <span class={`size-1.5 rounded-full shrink-0 ${style.dot}`} />
-                                        <span class={`text-10-medium uppercase tracking-wider ${style.label}`}>{ROLE_LABEL[message.role]}</span>
-                                        <span class="text-10-regular text-text-weak ml-auto">{formatDate(message.createdAt)}</span>
+                                        <span class={`text-10-medium uppercase tracking-wider ${style.label}`}>
+                                          {ROLE_LABEL[message.role]}
+                                        </span>
+                                        <span class="text-10-regular text-text-weak ml-auto">
+                                          {formatDate(message.createdAt)}
+                                        </span>
                                       </div>
                                       <div class={`${style.body} break-words`}>{message.text}</div>
 
                                       <Show when={invocations.length > 0}>
                                         <div class="mt-2.5 flex flex-col gap-2">
-                                          <For each={invocations.filter((invocation) => latestMessageByInvocation().get(invocation.id) === message.id)}>
+                                          <For
+                                            each={invocations.filter(
+                                              (invocation) =>
+                                                latestMessageByInvocation().get(invocation.id) === message.id,
+                                            )}
+                                          >
                                             {(invocation) => (
                                               <div class="rounded-xl border border-border-weak-base/70 bg-background-weak-base/20 p-2">
                                                 <div class="mb-2 flex flex-wrap items-center justify-between gap-1.5">
-                                                  <span class={`inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-10-medium uppercase tracking-wide ${
-                                                    INVOCATION_STATUS_CLASS[invocation.status]
-                                                  }`}>
+                                                  <span
+                                                    class={`inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-10-medium uppercase tracking-wide ${
+                                                      INVOCATION_STATUS_CLASS[invocation.status]
+                                                    }`}
+                                                  >
                                                     <span>{TOOL_WIDGET_THEME[invocation.tool].label}</span>
-                                                    <span class="text-[9px] text-text-weak">{invocation.id.slice(-6)}</span>
+                                                    <span class="text-[9px] text-text-weak">
+                                                      {invocation.id.slice(-6)}
+                                                    </span>
                                                   </span>
                                                   <Button
                                                     size="small"
@@ -1167,6 +1264,7 @@ export default function DeployPage() {
                                                 </div>
                                                 <InvocationWidget
                                                   invocation={invocation}
+                                                  compact
                                                   onOpenUrl={(url) => window.open(url, "_blank", "noopener,noreferrer")}
                                                 />
                                               </div>
@@ -1183,11 +1281,17 @@ export default function DeployPage() {
 
                           <Show when={activeInvocation()}>
                             {(invocation) => (
-                              <Show when={invocation().status === "running" || !latestMessageByInvocation().has(invocation().id)}>
+                              <Show
+                                when={
+                                  invocation().status === "running" || !latestMessageByInvocation().has(invocation().id)
+                                }
+                              >
                                 <div class="mt-3 px-2 md:px-6">
                                   <div class="rounded-xl border border-icon-warning-base/25 bg-icon-warning-base/8 p-2">
                                     <div class="mb-2 flex items-center justify-between gap-2">
-                                      <span class="text-10-medium uppercase tracking-wider text-icon-warning-base">Running Now</span>
+                                      <span class="text-10-medium uppercase tracking-wider text-icon-warning-base">
+                                        Running Now
+                                      </span>
                                       <Button
                                         size="small"
                                         variant="ghost"
@@ -1202,6 +1306,7 @@ export default function DeployPage() {
                                     </div>
                                     <InvocationWidget
                                       invocation={invocation()}
+                                      compact
                                       onOpenUrl={(url) => window.open(url, "_blank", "noopener,noreferrer")}
                                     />
                                   </div>
@@ -1223,9 +1328,7 @@ export default function DeployPage() {
                         void sendMessage()
                       }}
                     >
-                      <div class="text-11-medium text-text-weak uppercase tracking-wider">
-                        Deploy Agent
-                      </div>
+                      <div class="text-11-medium text-text-weak uppercase tracking-wider">Deploy Agent</div>
                       <div class="flex items-end gap-2">
                         <textarea
                           class="flex-1 min-h-[44px] max-h-[110px] resize-y rounded-lg border border-border-weak-base bg-background-base px-2.5 py-2 text-12-regular text-text-strong focus:outline-none focus:border-border-base disabled:cursor-not-allowed disabled:opacity-60"
@@ -1251,9 +1354,7 @@ export default function DeployPage() {
                           {sendingMessage() ? "Running..." : "Send"}
                         </Button>
                       </div>
-                      <div class="text-11-regular text-text-weak">
-                        Linked run: {session()?.linkedRunId ?? "none"}.
-                      </div>
+                      <div class="text-11-regular text-text-weak">Linked run: {session()?.linkedRunId ?? "none"}.</div>
                     </form>
                   </div>
                 </div>
@@ -1261,13 +1362,13 @@ export default function DeployPage() {
 
               <div
                 class={`h-full min-h-0 shrink-0 overflow-hidden transition-[width,transform,opacity] duration-400 ease-out ${
-                  toolPaneOpen()
-                    ? "translate-x-0 opacity-100"
-                    : "pointer-events-none translate-x-full opacity-0"
+                  toolPaneOpen() ? "translate-x-0 opacity-100" : "pointer-events-none translate-x-full opacity-0"
                 }`}
                 style={{ width: toolPaneOpen() ? TOOL_PANE_WIDTH : "0px" }}
               >
-                <div class={`h-full min-h-0 bg-background-base ${toolPaneOpen() ? "border-l border-border-weak-base" : ""}`}>
+                <div
+                  class={`h-full min-h-0 bg-background-base ${toolPaneOpen() ? "border-l border-border-weak-base" : ""}`}
+                >
                   <div class="flex h-full min-h-0 flex-col">
                     <div class="border-b border-border-weak-base bg-background-weak-base px-4 py-3">
                       <div class="flex items-start justify-between gap-2">
@@ -1276,13 +1377,9 @@ export default function DeployPage() {
                           <div class="mt-0.5 text-11-regular text-text-weak">
                             Expanded view for active tools, web surface, and large command output.
                           </div>
+                          <div class="mt-1 text-[10px] text-text-weak">Configured tools: {tools().length}</div>
                         </div>
-                        <Button
-                          size="small"
-                          variant="ghost"
-                          class="h-7 px-2.5"
-                          onClick={() => setPaneDismissed(true)}
-                        >
+                        <Button size="small" variant="ghost" class="h-7 px-2.5" onClick={() => setPaneDismissed(true)}>
                           Close
                         </Button>
                       </div>
@@ -1322,16 +1419,6 @@ export default function DeployPage() {
                             Active
                           </Button>
                         </div>
-
-                        <div class="flex flex-wrap gap-1.5">
-                          <For each={tools()}>
-                            {(tool) => (
-                              <span class="rounded-md border border-border-weak-base/70 bg-background-weak-base/25 px-2 py-0.5 text-10-medium uppercase tracking-wide text-text-weak">
-                                {TOOL_WIDGET_THEME[tool.id].label}
-                              </span>
-                            )}
-                          </For>
-                        </div>
                       </div>
                     </div>
 
@@ -1339,7 +1426,11 @@ export default function DeployPage() {
                       <div class="flex min-h-full flex-col gap-3">
                         <Show
                           when={activeInvocation()}
-                          fallback={<div class="rounded-xl border border-border-weak-base/70 bg-background-weak-base/20 px-3 py-2 text-11-regular text-text-weak">No active tool yet. Ask the deploy agent in chat to run validation.</div>}
+                          fallback={
+                            <div class="rounded-xl border border-border-weak-base/70 bg-background-weak-base/20 px-3 py-2 text-11-regular text-text-weak">
+                              No active tool yet. Ask the deploy agent in chat to run validation.
+                            </div>
+                          }
                         >
                           {(invocation) => (
                             <div
@@ -1400,7 +1491,9 @@ export default function DeployPage() {
                             <div class="text-11-medium text-text-weak">Command Stream</div>
                             <Show when={activeInvocation()}>
                               {(invocation) => (
-                                <span class={`inline-flex items-center rounded-md border px-2 py-0.5 text-10-medium ${INVOCATION_STATUS_CLASS[invocation().status]}`}>
+                                <span
+                                  class={`inline-flex items-center rounded-md border px-2 py-0.5 text-10-medium ${INVOCATION_STATUS_CLASS[invocation().status]}`}
+                                >
                                   {invocation().status.toUpperCase()}
                                 </span>
                               )}
diff --git a/packages/app/src/pages/orchestrate.tsx b/packages/app/src/pages/orchestrate.tsx
index 30aeb1d..36282a1 100644
--- a/packages/app/src/pages/orchestrate.tsx
+++ b/packages/app/src/pages/orchestrate.tsx
@@ -4802,7 +4802,7 @@ export default function OrchestratePage() {
     ),
   )
 
-  // When planningSessionId becomes available, auto-select orchestrator to show planner stream
+  // When planningSessionId becomes available, auto-select planner stream
   createEffect(
     on(
       () => orch.state.planningSessionId,
@@ -4814,7 +4814,8 @@ export default function OrchestratePage() {
         if (panel.target?.sessionId) return
         const tree = orch.agentTree()
         if (!tree) return
-        selectAgent(tree) // select orchestrator node which shows planner session
+        const planner = findNodeById(tree, "root-planner")
+        selectAgent(planner ?? tree)
       },
     ),
   )
diff --git a/packages/desktop/.cache/temporal/temporal_cli_1.5.1_darwin_arm64.tar.gz b/packages/desktop/.cache/temporal/temporal_cli_1.5.1_darwin_arm64.tar.gz
new file mode 100644
index 0000000..616bb29
Binary files /dev/null and b/packages/desktop/.cache/temporal/temporal_cli_1.5.1_darwin_arm64.tar.gz differ
diff --git a/packages/desktop/scripts/predev.ts b/packages/desktop/scripts/predev.ts
index f66fedc..6619589 100644
--- a/packages/desktop/scripts/predev.ts
+++ b/packages/desktop/scripts/predev.ts
@@ -1,10 +1,14 @@
 import { $ } from "bun"
+import { copyFile, cp, mkdir, mkdtemp, rm } from "node:fs/promises"
+import path from "node:path"
+import { tmpdir } from "node:os"
 
 import { copyBinaryToSidecarFolder, getCurrentSidecar, windowsify } from "./utils"
 
 const RUST_TARGET = Bun.env.TAURI_ENV_TARGET_TRIPLE
 
 const sidecarConfig = getCurrentSidecar(RUST_TARGET)
+const TEMPORAL_CLI_VERSION = Bun.env.TEMPORAL_CLI_VERSION ?? "1.5.1"
 
 const binaryPath = windowsify(`../oneshot/dist/${sidecarConfig.ocBinary}/bin/oneshot`)
 
@@ -13,3 +17,82 @@ await (sidecarConfig.ocBinary.includes("-baseline")
   : $`cd ../oneshot && bun run build --single`)
 
 await copyBinaryToSidecarFolder(binaryPath, RUST_TARGET)
+
+const workflowSourcePath = path.resolve("../oneshot/src/orchestrator/runtime/workflow.ts")
+const modelConfigSourcePath = path.resolve("../oneshot/src/orchestrator/model-config.ts")
+const workflowResourcesDir = path.join(process.cwd(), "src-tauri", "resources", "orchestrator", "runtime")
+const modelConfigResourcesDir = path.join(process.cwd(), "src-tauri", "resources", "orchestrator")
+const workflowResourcePath = path.join(workflowResourcesDir, "workflow.ts")
+const modelConfigResourcePath = path.join(modelConfigResourcesDir, "model-config.ts")
+await mkdir(workflowResourcesDir, { recursive: true })
+await mkdir(modelConfigResourcesDir, { recursive: true })
+await copyFile(workflowSourcePath, workflowResourcePath)
+await copyFile(modelConfigSourcePath, modelConfigResourcePath)
+
+const oneshotPackage = await Bun.file(path.resolve("../oneshot/package.json")).json() as {
+  dependencies?: Record<string, string>
+}
+const temporalWorkflowVersion = oneshotPackage.dependencies?.["@temporalio/workflow"]
+const temporalWorkerVersion = oneshotPackage.dependencies?.["@temporalio/worker"]
+if (!temporalWorkflowVersion || !temporalWorkerVersion) {
+  throw new Error("Missing @temporalio/workflow or @temporalio/worker version in packages/oneshot/package.json")
+}
+
+const temporalModulesBuildDir = path.join(process.cwd(), "src-tauri", "resources", ".temporal-runtime")
+const bundledNodeModulesPath = path.join(process.cwd(), "src-tauri", "resources", "node_modules")
+await rm(temporalModulesBuildDir, { recursive: true, force: true })
+await rm(bundledNodeModulesPath, { recursive: true, force: true })
+await mkdir(temporalModulesBuildDir, { recursive: true })
+
+await Bun.write(
+  path.join(temporalModulesBuildDir, "package.json"),
+  JSON.stringify(
+    {
+      private: true,
+      name: "oneshot-desktop-temporal-runtime",
+      dependencies: {
+        "@temporalio/workflow": temporalWorkflowVersion,
+        "@temporalio/worker": temporalWorkerVersion,
+      },
+    },
+    null,
+    2,
+  ) + "\n",
+)
+await $`bun install --production`.cwd(temporalModulesBuildDir)
+await cp(path.join(temporalModulesBuildDir, "node_modules"), bundledNodeModulesPath, {
+  recursive: true,
+  dereference: true,
+  force: true,
+})
+await rm(temporalModulesBuildDir, { recursive: true, force: true })
+
+const temporalArchiveExt = sidecarConfig.temporalAsset.startsWith("windows_") ? "zip" : "tar.gz"
+const archiveName = `temporal_cli_${TEMPORAL_CLI_VERSION}_${sidecarConfig.temporalAsset}.${temporalArchiveExt}`
+const downloadURL = `https://github.com/temporalio/cli/releases/download/v${TEMPORAL_CLI_VERSION}/${archiveName}`
+const cacheDir = path.join(process.cwd(), ".cache", "temporal")
+const archivePath = path.join(cacheDir, archiveName)
+
+await mkdir(cacheDir, { recursive: true })
+
+const cachedArchive = Bun.file(archivePath)
+if (!(await cachedArchive.exists())) {
+  const response = await fetch(downloadURL)
+  if (!response.ok) {
+    throw new Error(`Failed to download Temporal CLI (${response.status}): ${downloadURL}`)
+  }
+
+  await Bun.write(archivePath, await response.arrayBuffer())
+}
+
+const extractDir = await mkdtemp(path.join(tmpdir(), "oneshot-temporal-"))
+if (temporalArchiveExt === "zip") {
+  await $`tar -xf ${archivePath} -C ${extractDir}`
+} else {
+  await $`tar -xzf ${archivePath} -C ${extractDir}`
+}
+
+const temporalBinary = windowsify(path.join(extractDir, "temporal"))
+await copyBinaryToSidecarFolder(temporalBinary, RUST_TARGET, "temporal")
+
+await rm(extractDir, { recursive: true, force: true })
diff --git a/packages/desktop/scripts/utils.ts b/packages/desktop/scripts/utils.ts
index 1dafbad..6d7bee4 100644
--- a/packages/desktop/scripts/utils.ts
+++ b/packages/desktop/scripts/utils.ts
@@ -1,30 +1,40 @@
 import { $ } from "bun"
 
-export const SIDECAR_BINARIES: Array<{ rustTarget: string; ocBinary: string; assetExt: string }> = [
+export const SIDECAR_BINARIES: Array<{
+  rustTarget: string
+  ocBinary: string
+  assetExt: string
+  temporalAsset: `${"darwin" | "linux" | "windows"}_${"amd64" | "arm64"}`
+}> = [
   {
     rustTarget: "aarch64-apple-darwin",
     ocBinary: "oneshot-darwin-arm64",
     assetExt: "zip",
+    temporalAsset: "darwin_arm64",
   },
   {
     rustTarget: "x86_64-apple-darwin",
     ocBinary: "oneshot-darwin-x64-baseline",
     assetExt: "zip",
+    temporalAsset: "darwin_amd64",
   },
   {
     rustTarget: "x86_64-pc-windows-msvc",
     ocBinary: "oneshot-windows-x64",
     assetExt: "zip",
+    temporalAsset: "windows_amd64",
   },
   {
     rustTarget: "x86_64-unknown-linux-gnu",
     ocBinary: "oneshot-linux-x64-baseline",
     assetExt: "tar.gz",
+    temporalAsset: "linux_amd64",
   },
   {
     rustTarget: "aarch64-unknown-linux-gnu",
     ocBinary: "oneshot-linux-arm64",
     assetExt: "tar.gz",
+    temporalAsset: "linux_arm64",
   },
 ]
 
@@ -39,9 +49,9 @@ export function getCurrentSidecar(target = RUST_TARGET) {
   return binaryConfig
 }
 
-export async function copyBinaryToSidecarFolder(source: string, target = RUST_TARGET) {
+export async function copyBinaryToSidecarFolder(source: string, target = RUST_TARGET, name = "oneshot-cli") {
   await $`mkdir -p src-tauri/sidecars`
-  const dest = windowsify(`src-tauri/sidecars/oneshot-cli-${target}`)
+  const dest = windowsify(`src-tauri/sidecars/${name}-${target}`)
   await $`cp ${source} ${dest}`
 
   console.log(`Copied ${source} to ${dest}`)
diff --git a/packages/desktop/src-tauri/.gitignore b/packages/desktop/src-tauri/.gitignore
index 67554e1..fe53c3f 100644
--- a/packages/desktop/src-tauri/.gitignore
+++ b/packages/desktop/src-tauri/.gitignore
@@ -7,3 +7,5 @@
 /gen/schemas
 
 sidecars
+resources/node_modules
+resources/orchestrator
diff --git a/packages/desktop/src-tauri/src/cli.rs b/packages/desktop/src-tauri/src/cli.rs
index 4f4f632..cf53afc 100644
--- a/packages/desktop/src-tauri/src/cli.rs
+++ b/packages/desktop/src-tauri/src/cli.rs
@@ -91,12 +91,33 @@ fn get_cli_install_path() -> Option<std::path::PathBuf> {
 }
 
 pub fn get_sidecar_path(app: &tauri::AppHandle) -> std::path::PathBuf {
+    get_sidecar_dir(app).join("oneshot-cli")
+}
+
+pub fn get_temporal_sidecar_path(app: &tauri::AppHandle) -> std::path::PathBuf {
+    get_sidecar_dir(app).join("temporal")
+}
+
+fn get_sidecar_dir(app: &tauri::AppHandle) -> std::path::PathBuf {
     // Get binary with symlinks support
     tauri::process::current_binary(&app.env())
         .expect("Failed to get current binary")
         .parent()
         .expect("Failed to get parent dir")
-        .join("oneshot-cli")
+        .to_path_buf()
+}
+
+fn get_workflow_resource_path(app: &tauri::AppHandle) -> Option<std::path::PathBuf> {
+    let resource_path = app
+        .path()
+        .resolve("orchestrator/runtime/workflow.ts", BaseDirectory::Resource)
+        .ok()?;
+    resource_path.exists().then_some(resource_path)
+}
+
+fn get_node_modules_resource_path(app: &tauri::AppHandle) -> Option<std::path::PathBuf> {
+    let resource_path = app.path().resolve("node_modules", BaseDirectory::Resource).ok()?;
+    resource_path.exists().then_some(resource_path)
 }
 
 /// Walk up from a given path to find a `node_modules` directory that contains
@@ -292,8 +313,33 @@ pub fn spawn_command(
             .map(|(key, value)| (key.to_string(), value.clone())),
     );
 
+    let use_wsl = cfg!(windows) && is_wsl_enabled(app);
+    if !use_wsl {
+        let temporal_sidecar = get_temporal_sidecar_path(app);
+        if temporal_sidecar.exists() {
+            envs.push((
+                "ONESHOT_TEMPORAL_CLI_PATH".to_string(),
+                temporal_sidecar.to_string_lossy().to_string(),
+            ));
+        }
+
+        if let Some(workflow_path) = get_workflow_resource_path(app) {
+            envs.push((
+                "ONESHOT_WORKFLOW_PATH".to_string(),
+                workflow_path.to_string_lossy().to_string(),
+            ));
+        }
+
+        if let Some(node_modules_path) = get_node_modules_resource_path(app) {
+            envs.push((
+                "ONESHOT_NODE_MODULES".to_string(),
+                node_modules_path.to_string_lossy().to_string(),
+            ));
+        }
+    }
+
     let mut cmd = if cfg!(windows) {
-        if is_wsl_enabled(app) {
+        if use_wsl {
             tracing::info!("WSL is enabled, spawning CLI server in WSL");
             let version = app.package_info().version.to_string();
             let mut script = vec![
diff --git a/packages/desktop/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs
index 9945fd5..63d60e9 100644
--- a/packages/desktop/src-tauri/src/lib.rs
+++ b/packages/desktop/src-tauri/src/lib.rs
@@ -7,6 +7,7 @@ pub mod linux_windowing;
 mod logging;
 mod markdown;
 mod server;
+mod temporal;
 mod window_customizer;
 mod windows;
 
@@ -35,6 +36,7 @@ use tokio::{
 use crate::cli::{sqlite_migration::SqliteMigrationProgress, sync_cli};
 use crate::constants::*;
 use crate::server::get_saved_server_url;
+use crate::temporal::TemporalState;
 use crate::windows::{LoadingWindow, MainWindow};
 
 #[derive(Clone, serde::Serialize, specta::Type, Debug)]
@@ -107,6 +109,17 @@ fn kill_sidecar(app: AppHandle) {
     tracing::info!("Killed server");
 }
 
+fn kill_temporal_server(app: AppHandle) {
+    let Some(temporal_state) = app.try_state::<TemporalState>() else {
+        tracing::info!("Temporal server not running");
+        return;
+    };
+
+    temporal_state.kill();
+
+    tracing::info!("Stopped bundled Temporal server");
+}
+
 fn get_logs() -> String {
     logging::tail()
 }
@@ -511,6 +524,7 @@ pub fn run() {
                 tracing::info!("Received Exit");
 
                 kill_sidecar(app.clone());
+                kill_temporal_server(app.clone());
             }
         });
 }
@@ -719,6 +733,7 @@ fn setup_app(app: &tauri::AppHandle, init_rx: watch::Receiver<InitStep>) {
     #[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
     app.deep_link().register_all().ok();
 
+    app.manage(TemporalState::new());
     app.manage(InitState { current: init_rx });
 }
 
@@ -754,6 +769,11 @@ async fn setup_server_connection(app: AppHandle) -> ServerConnection {
         return ServerConnection::Existing { url: url.clone() };
     }
 
+    let temporal_state = app.state::<TemporalState>().inner().clone();
+    if let Err(err) = temporal::ensure_local_temporal_server(app.clone(), temporal_state).await {
+        tracing::warn!("Failed to start bundled Temporal server: {err}");
+    }
+
     let local_port = get_sidecar_port();
     let hostname = "127.0.0.1";
     let local_url = format!("http://{hostname}:{local_port}");
diff --git a/packages/desktop/src-tauri/src/temporal.rs b/packages/desktop/src-tauri/src/temporal.rs
new file mode 100644
index 0000000..758dc9c
--- /dev/null
+++ b/packages/desktop/src-tauri/src/temporal.rs
@@ -0,0 +1,219 @@
+use std::{
+    env,
+    io::ErrorKind,
+    net::{IpAddr, SocketAddr, TcpStream, ToSocketAddrs},
+    process::{Child, Command, Stdio},
+    sync::{Arc, Mutex},
+    time::{Duration, Instant},
+};
+
+use tauri::{path::BaseDirectory, AppHandle, Manager};
+use tokio::time::sleep;
+
+use crate::cli::get_temporal_sidecar_path;
+
+#[derive(Clone)]
+pub struct TemporalState {
+    child: Arc<Mutex<Option<Child>>>,
+}
+
+impl TemporalState {
+    pub fn new() -> Self {
+        Self {
+            child: Arc::new(Mutex::new(None)),
+        }
+    }
+
+    pub fn set_child(&self, child: Option<Child>) {
+        *self.child.lock().unwrap() = child;
+    }
+
+    pub fn kill(&self) {
+        let Some(mut child) = self.child.lock().unwrap().take() else {
+            return;
+        };
+
+        if let Err(err) = child.kill() {
+            if err.kind() != ErrorKind::InvalidInput {
+                tracing::warn!(error = %err, "Failed to stop bundled Temporal server");
+            }
+        }
+
+        let _ = child.wait();
+    }
+}
+
+#[derive(Debug, Clone)]
+struct TemporalAddress {
+    host: String,
+    port: u16,
+}
+
+pub async fn ensure_local_temporal_server(app: AppHandle, state: TemporalState) -> Result<(), String> {
+    let address = parse_temporal_address();
+
+    if !is_loopback_host(&address.host) {
+        tracing::info!(
+            host = %address.host,
+            port = address.port,
+            "Using external Temporal address, skipping bundled Temporal startup"
+        );
+        return Ok(());
+    }
+
+    if is_port_open(&address.host, address.port) {
+        tracing::info!(host = %address.host, port = address.port, "Temporal already running");
+        return Ok(());
+    }
+
+    let temporal_sidecar = get_temporal_sidecar_path(&app);
+    if !temporal_sidecar.exists() {
+        return Err(format!(
+            "Bundled Temporal sidecar not found at {}",
+            temporal_sidecar.display()
+        ));
+    }
+
+    let state_dir = app
+        .path()
+        .resolve("", BaseDirectory::AppLocalData)
+        .map_err(|e| format!("Failed to resolve app local data dir: {e}"))?;
+    let temporal_dir = state_dir.join("temporal");
+    std::fs::create_dir_all(&temporal_dir)
+        .map_err(|e| format!("Failed to create Temporal state directory: {e}"))?;
+    let db_filename = temporal_dir.join("dev-server.db");
+
+    let bind_host = strip_ipv6_brackets(&address.host).to_string();
+    let port = address.port.to_string();
+    let db_filename = db_filename.to_string_lossy().to_string();
+
+    tracing::info!(
+        binary = %temporal_sidecar.display(),
+        host = %bind_host,
+        port = %port,
+        db = %db_filename,
+        "Starting bundled Temporal server"
+    );
+
+    let mut cmd = Command::new(&temporal_sidecar);
+    cmd.args([
+        "server",
+        "start-dev",
+        "--headless",
+        "--ip",
+        bind_host.as_str(),
+        "--port",
+        port.as_str(),
+        "--db-filename",
+        db_filename.as_str(),
+    ]);
+    cmd.stdin(Stdio::null());
+    cmd.stdout(Stdio::null());
+    cmd.stderr(Stdio::null());
+
+    #[cfg(windows)]
+    {
+        use std::os::windows::process::CommandExt;
+        cmd.creation_flags(0x0800_0000);
+    }
+
+    let mut child = cmd
+        .spawn()
+        .map_err(|e| format!("Failed to start bundled Temporal server: {e}"))?;
+
+    let start = Instant::now();
+    let timeout = Duration::from_secs(30);
+    loop {
+        if is_port_open(&address.host, address.port) {
+            state.set_child(Some(child));
+            tracing::info!(host = %address.host, port = address.port, elapsed = ?start.elapsed(), "Temporal is ready");
+            return Ok(());
+        }
+
+        match child.try_wait() {
+            Ok(Some(status)) => {
+                return Err(format!(
+                    "Bundled Temporal server exited before becoming ready (status: {status})",
+                ));
+            }
+            Ok(None) => {}
+            Err(err) => {
+                return Err(format!(
+                    "Failed while waiting for bundled Temporal server readiness: {err}",
+                ));
+            }
+        }
+
+        if start.elapsed() > timeout {
+            let _ = child.kill();
+            let _ = child.wait();
+            return Err(format!(
+                "Timed out waiting for bundled Temporal server at {}:{}",
+                address.host, address.port
+            ));
+        }
+
+        sleep(Duration::from_millis(200)).await;
+    }
+}
+
+fn parse_temporal_address() -> TemporalAddress {
+    let raw = env::var("TEMPORAL_ADDRESS").unwrap_or_else(|_| "127.0.0.1:7233".to_string());
+
+    if let Some((host, port)) = split_host_port(&raw) {
+        return TemporalAddress { host, port };
+    }
+
+    tracing::warn!(value = %raw, "Invalid TEMPORAL_ADDRESS, falling back to 127.0.0.1:7233");
+    TemporalAddress {
+        host: "127.0.0.1".to_string(),
+        port: 7233,
+    }
+}
+
+fn split_host_port(value: &str) -> Option<(String, u16)> {
+    if let Some(rest) = value.strip_prefix('[') {
+        let (host, remainder) = rest.split_once(']')?;
+        let port = remainder.strip_prefix(':')?.parse::<u16>().ok()?;
+        return Some((host.to_string(), port));
+    }
+
+    let (host, port) = value.rsplit_once(':')?;
+    Some((host.to_string(), port.parse::<u16>().ok()?))
+}
+
+fn strip_ipv6_brackets(host: &str) -> &str {
+    host.strip_prefix('[')
+        .and_then(|v| v.strip_suffix(']'))
+        .unwrap_or(host)
+}
+
+fn is_loopback_host(host: &str) -> bool {
+    let host = strip_ipv6_brackets(host);
+    if host.eq_ignore_ascii_case("localhost") {
+        return true;
+    }
+
+    host.parse::<IpAddr>()
+        .map(|ip| ip.is_loopback())
+        .unwrap_or(false)
+}
+
+fn is_port_open(host: &str, port: u16) -> bool {
+    let host = strip_ipv6_brackets(host);
+    let addresses = (host, port)
+        .to_socket_addrs()
+        .map(|addrs| addrs.collect::<Vec<SocketAddr>>());
+    let Ok(addresses) = addresses else {
+        return false;
+    };
+
+    addresses.into_iter().any(|addr| {
+        TcpStream::connect_timeout(&addr, Duration::from_millis(500))
+            .map(|stream| {
+                let _ = stream.shutdown(std::net::Shutdown::Both);
+                true
+            })
+            .unwrap_or(false)
+    })
+}
diff --git a/packages/desktop/src-tauri/tauri.conf.json b/packages/desktop/src-tauri/tauri.conf.json
index 724c50e..fea83cc 100644
--- a/packages/desktop/src-tauri/tauri.conf.json
+++ b/packages/desktop/src-tauri/tauri.conf.json
@@ -40,7 +40,8 @@
       "app"
     ],
     "externalBin": [
-      "sidecars/oneshot-cli"
+      "sidecars/oneshot-cli",
+      "sidecars/temporal"
     ],
     "linux": {
       "rpm": {
@@ -69,4 +70,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/desktop/src-tauri/tauri.prod.conf.json b/packages/desktop/src-tauri/tauri.prod.conf.json
index a9dae2d..0c7ff89 100644
--- a/packages/desktop/src-tauri/tauri.prod.conf.json
+++ b/packages/desktop/src-tauri/tauri.prod.conf.json
@@ -11,6 +11,15 @@
       "icons/prod/icon.icns",
       "icons/prod/icon.ico"
     ],
+    "externalBin": [
+      "sidecars/oneshot-cli",
+      "sidecars/temporal"
+    ],
+    "resources": [
+      "resources/orchestrator/runtime/workflow.ts",
+      "resources/orchestrator/model-config.ts",
+      "resources/node_modules"
+    ],
     "windows": {
       "nsis": {
         "installerIcon": "icons/prod/icon.ico"
diff --git a/packages/oneshot/src/deploy/session.ts b/packages/oneshot/src/deploy/session.ts
index a20afdb..be65253 100644
--- a/packages/oneshot/src/deploy/session.ts
+++ b/packages/oneshot/src/deploy/session.ts
@@ -6,6 +6,7 @@ import z from "zod"
 import { Instance } from "@/project/instance"
 import { Log } from "@/util/log"
 import { Provider } from "@/provider/provider"
+import { Pty } from "@/pty"
 import { getRun } from "@/orchestrator/runtime/store"
 import { registerLocalDeployFeedback } from "@/orchestrator/runtime/local-deploy"
 import { emitSupervisorThought } from "@/orchestrator/runtime/engine-events"
@@ -24,7 +25,6 @@ const DEFAULT_COMMAND_TIMEOUT_MS = Number(process.env.ONESHOT_DEPLOY_COMMAND_TIM
 const DEFAULT_LONG_COMMAND_TIMEOUT_MS = Number(process.env.ONESHOT_DEPLOY_LONG_COMMAND_TIMEOUT_MS ?? 180_000)
 const MAX_ARTIFACT_PREVIEW_BYTES = Number(process.env.ONESHOT_DEPLOY_ARTIFACT_PREVIEW_BYTES ?? 1_200_000)
 const OPEN_STARTUP_WAIT_MS = Number(process.env.ONESHOT_DEPLOY_OPEN_STARTUP_WAIT_MS ?? 12_000)
-const OPEN_PROCESS_REUSE_CHECK_MS = Number(process.env.ONESHOT_DEPLOY_OPEN_PROCESS_REUSE_CHECK_MS ?? 120)
 
 const sessions = new Map<string, DeploySessionInternal>()
 const byDirectory = new Map<string, string[]>()
@@ -166,7 +166,7 @@ type ActiveLaunchHandle = {
   sessionId: string
   invocationId: string
   command: string[]
-  process: Bun.Subprocess
+  ptyId: string
   startedAt: number
   target: z.infer<typeof DeployOpenTarget>
   url?: string
@@ -269,10 +269,7 @@ interface ParsedProjectSignals {
 }
 
 function makeSessionID(): string {
-  const hash = createHash("sha1")
-    .update(`${Date.now()}-${Math.random()}`)
-    .digest("hex")
-    .slice(0, 14)
+  const hash = createHash("sha1").update(`${Date.now()}-${Math.random()}`).digest("hex").slice(0, 14)
   return `deploy-${hash}`
 }
 
@@ -294,9 +291,7 @@ function truncate(input: string, max = MAX_OUTPUT_CHARS): string {
 }
 
 function compactLogs(lines: string[]): string[] {
-  const trimmed = lines
-    .map((line) => line.trimEnd())
-    .filter(Boolean)
+  const trimmed = lines.map((line) => line.trimEnd()).filter(Boolean)
   if (trimmed.length <= MAX_LOG_LINES_PER_INVOCATION) return trimmed
   return trimmed.slice(trimmed.length - MAX_LOG_LINES_PER_INVOCATION)
 }
@@ -305,23 +300,6 @@ function commandToString(command: string[]): string {
   return command.map((part) => (/\s/.test(part) ? JSON.stringify(part) : part)).join(" ")
 }
 
-function parseUrlsFromText(text: string): string[] {
-  const results = new Set<string>()
-  const urlRegex = /https?:\/\/[^\s"'`<>]+/gi
-  for (const match of text.matchAll(urlRegex)) {
-    const raw = match[0]?.trim()
-    if (!raw) continue
-    results.add(raw.replace(/[),.;]+$/, ""))
-  }
-  const localPortRegex = /(?:localhost|127\.0\.0\.1|0\.0\.0\.0):(\d{2,5})/gi
-  for (const match of text.matchAll(localPortRegex)) {
-    const port = Number(match[1])
-    if (!Number.isFinite(port)) continue
-    results.add(`http://127.0.0.1:${port}`)
-  }
-  return [...results]
-}
-
 function parsePortFromUrl(url: string): number | undefined {
   try {
     const parsed = new URL(url)
@@ -337,9 +315,7 @@ function parsePortFromUrl(url: string): number | undefined {
 function isLikelyLocalUrl(url: string): boolean {
   try {
     const parsed = new URL(url)
-    return parsed.hostname === "127.0.0.1"
-      || parsed.hostname === "localhost"
-      || parsed.hostname === "0.0.0.0"
+    return parsed.hostname === "127.0.0.1" || parsed.hostname === "localhost" || parsed.hostname === "0.0.0.0"
   } catch {
     return false
   }
@@ -366,22 +342,22 @@ async function probeUrl(url: string): Promise<boolean> {
 
 function likelyWebStartupCommand(command: string): boolean {
   const normalized = command.toLowerCase()
-  return /\bnpm\s+run\s+(dev|start|preview|serve)\b/.test(normalized)
-    || /\bpnpm\s+run\s+(dev|start|preview|serve)\b/.test(normalized)
-    || /\byarn\s+(dev|start|preview|serve)\b/.test(normalized)
-    || /\bbun\s+run\s+(dev|start|preview|serve)\b/.test(normalized)
-    || /\bnext\s+dev\b/.test(normalized)
-    || /\bvite\b/.test(normalized)
-    || /\bnuxt\b/.test(normalized)
+  return (
+    /\bnpm\s+run\s+(dev|start|preview|serve)\b/.test(normalized) ||
+    /\bpnpm\s+run\s+(dev|start|preview|serve)\b/.test(normalized) ||
+    /\byarn\s+(dev|start|preview|serve)\b/.test(normalized) ||
+    /\bbun\s+run\s+(dev|start|preview|serve)\b/.test(normalized) ||
+    /\bnext\s+dev\b/.test(normalized) ||
+    /\bvite\b/.test(normalized) ||
+    /\bnuxt\b/.test(normalized)
+  )
 }
 
 function isLaunchProbeCommandText(command: string): boolean {
   const normalized = command.toLowerCase()
   return (
-    (normalized.includes("set -euo pipefail")
-      && normalized.includes("pid=$!")
-      && normalized.includes("kill \"$pid\""))
-    || normalized.includes("launch command stayed active for")
+    (normalized.includes("set -euo pipefail") && normalized.includes("pid=$!") && normalized.includes('kill "$pid"')) ||
+    normalized.includes("launch command stayed active for")
   )
 }
 
@@ -390,13 +366,15 @@ function extractCommandFromLaunchProbeScript(script: string): string | undefined
     .split(/\r?\n/)
     .map((line) => line.trim())
     .filter(Boolean)
-  const launchLine = lines.find((line) =>
-    line.endsWith("&")
-    && !line.startsWith("if ")
-    && !line.startsWith("wait ")
-    && !line.startsWith("kill ")
-    && !line.startsWith("echo ")
-    && !line.startsWith("code="))
+  const launchLine = lines.find(
+    (line) =>
+      line.endsWith("&") &&
+      !line.startsWith("if ") &&
+      !line.startsWith("wait ") &&
+      !line.startsWith("kill ") &&
+      !line.startsWith("echo ") &&
+      !line.startsWith("code="),
+  )
   if (!launchLine) return undefined
   const withoutAmpersand = launchLine.replace(/\s*&$/, "").trim()
   return withoutAmpersand || undefined
@@ -413,9 +391,9 @@ function sanitizeSession(session: DeploySessionInternal): DeploySession {
     launchCommand: rest.launchCommand ? [...rest.launchCommand] : undefined,
     launchInstructions: rest.launchInstructions
       ? {
-        ...rest.launchInstructions,
-        steps: [...rest.launchInstructions.steps],
-      }
+          ...rest.launchInstructions,
+          steps: [...rest.launchInstructions.steps],
+        }
       : undefined,
   }
 }
@@ -446,11 +424,14 @@ async function withSessionLock<T>(sessionId: string, fn: () => Promise<T>): Prom
   return result
 }
 
-function pushMessage(session: DeploySessionInternal, input: {
-  role: "user" | "assistant" | "system"
-  text: string
-  invocationIds?: string[]
-}): DeployMessage {
+function pushMessage(
+  session: DeploySessionInternal,
+  input: {
+    role: "user" | "assistant" | "system"
+    text: string
+    invocationIds?: string[]
+  },
+): DeployMessage {
   const message: DeployMessage = {
     id: makeMessageID(),
     role: input.role,
@@ -466,11 +447,14 @@ function pushMessage(session: DeploySessionInternal, input: {
   return message
 }
 
-function pushInvocation(session: DeploySessionInternal, input: {
-  tool: DeployToolName
-  title: string
-  payload: Record<string, unknown>
-}): DeployToolInvocation {
+function pushInvocation(
+  session: DeploySessionInternal,
+  input: {
+    tool: DeployToolName
+    title: string
+    payload: Record<string, unknown>
+  },
+): DeployToolInvocation {
   const invocation: DeployToolInvocation = {
     id: makeInvocationID(),
     tool: input.tool,
@@ -569,7 +553,10 @@ function detectBlockedCommand(command: string): string | undefined {
   return undefined
 }
 
-async function readStreamLines(stream: ReadableStream<Uint8Array> | null, onLine: (line: string) => void): Promise<void> {
+async function readStreamLines(
+  stream: ReadableStream<Uint8Array> | null,
+  onLine: (line: string) => void,
+): Promise<void> {
   if (!stream) return
   const reader = stream.getReader()
   const decoder = new TextDecoder()
@@ -660,10 +647,7 @@ async function ensureArtifactDirectory(session: DeploySessionInternal): Promise<
   return dir
 }
 
-async function maybeDataUrlFromFile(input: {
-  absolutePath: string
-  mimeType?: string
-}): Promise<string | undefined> {
+async function maybeDataUrlFromFile(input: { absolutePath: string; mimeType?: string }): Promise<string | undefined> {
   try {
     const file = await Bun.file(input.absolutePath)
     const size = file.size
@@ -693,9 +677,10 @@ async function registerArtifact(input: {
     mimeType: input.mimeType,
     createdAt: Date.now(),
     sizeBytes: info?.size,
-    dataUrl: input.type === "image"
-      ? await maybeDataUrlFromFile({ absolutePath: input.absolutePath, mimeType: input.mimeType ?? "image/png" })
-      : undefined,
+    dataUrl:
+      input.type === "image"
+        ? await maybeDataUrlFromFile({ absolutePath: input.absolutePath, mimeType: input.mimeType ?? "image/png" })
+        : undefined,
   }
   return artifact
 }
@@ -777,19 +762,21 @@ async function runTerminalExecTool(input: {
     throw new Error("terminal_exec requires a non-empty command.")
   }
 
-  const timeoutMs = typeof input.payload.timeoutMs === "number" && input.payload.timeoutMs > 0
-    ? Math.min(input.payload.timeoutMs, 8 * 60_000)
-    : DEFAULT_COMMAND_TIMEOUT_MS
+  const timeoutMs =
+    typeof input.payload.timeoutMs === "number" && input.payload.timeoutMs > 0
+      ? Math.min(input.payload.timeoutMs, 8 * 60_000)
+      : DEFAULT_COMMAND_TIMEOUT_MS
 
   const envInput = input.payload.env
-  const env = typeof envInput === "object" && envInput !== null
-    ? Object.fromEntries(
-      Object.entries(envInput).flatMap(([key, value]) => {
-        if (typeof value !== "string") return []
-        return [[key, value]]
-      }),
-    )
-    : undefined
+  const env =
+    typeof envInput === "object" && envInput !== null
+      ? Object.fromEntries(
+          Object.entries(envInput).flatMap(([key, value]) => {
+            if (typeof value !== "string") return []
+            return [[key, value]]
+          }),
+        )
+      : undefined
 
   const result = await runCommand({
     command,
@@ -798,9 +785,10 @@ async function runTerminalExecTool(input: {
     timeoutMs,
   })
 
-  const summary = result.exitCode === 0
-    ? `Command succeeded: ${commandToString(command)}`
-    : `Command failed (${result.exitCode}): ${commandToString(command)}`
+  const summary =
+    result.exitCode === 0
+      ? `Command succeeded: ${commandToString(command)}`
+      : `Command failed (${result.exitCode}): ${commandToString(command)}`
 
   return {
     title: "Terminal Execution",
@@ -821,9 +809,10 @@ async function runBrowserAutomateTool(input: {
   session: DeploySessionInternal
   payload: Record<string, unknown>
 }): Promise<ToolExecutionResult> {
-  const baseUrl = typeof input.payload.baseUrl === "string" && input.payload.baseUrl.trim().length > 0
-    ? input.payload.baseUrl.trim()
-    : undefined
+  const baseUrl =
+    typeof input.payload.baseUrl === "string" && input.payload.baseUrl.trim().length > 0
+      ? input.payload.baseUrl.trim()
+      : undefined
   const actionsRaw = Array.isArray(input.payload.actions) ? input.payload.actions : []
 
   const parsedActions = actionsRaw
@@ -839,26 +828,29 @@ async function runBrowserAutomateTool(input: {
   }
 
   const dynamicImport = new Function("specifier", "return import(specifier)") as (specifier: string) => Promise<unknown>
-  const playwright = await dynamicImport("playwright").catch(() => undefined) as
+  const playwright = (await dynamicImport("playwright").catch(() => undefined)) as
     | {
-      chromium?: {
-        launch: (input: { headless: boolean }) => Promise<{
-          newPage: (input: { viewport: { width: number; height: number } }) => Promise<{
-            goto: (url: string, input?: { timeout?: number; waitUntil?: "commit" | "domcontentloaded" | "load" | "networkidle" }) => Promise<unknown>
-            click: (selector: string, input?: { timeout?: number }) => Promise<void>
-            fill: (selector: string, value: string, input?: { timeout?: number }) => Promise<void>
-            press: (selector: string, key: string, input?: { timeout?: number }) => Promise<void>
-            keyboard: { press: (key: string) => Promise<void> }
-            waitForTimeout: (ms: number) => Promise<void>
-            textContent: (selector: string, input?: { timeout?: number }) => Promise<string | null>
-            content: () => Promise<string>
-            url: () => string
-            screenshot: (input?: { path?: string; fullPage?: boolean }) => Promise<Buffer>
+        chromium?: {
+          launch: (input: { headless: boolean }) => Promise<{
+            newPage: (input: { viewport: { width: number; height: number } }) => Promise<{
+              goto: (
+                url: string,
+                input?: { timeout?: number; waitUntil?: "commit" | "domcontentloaded" | "load" | "networkidle" },
+              ) => Promise<unknown>
+              click: (selector: string, input?: { timeout?: number }) => Promise<void>
+              fill: (selector: string, value: string, input?: { timeout?: number }) => Promise<void>
+              press: (selector: string, key: string, input?: { timeout?: number }) => Promise<void>
+              keyboard: { press: (key: string) => Promise<void> }
+              waitForTimeout: (ms: number) => Promise<void>
+              textContent: (selector: string, input?: { timeout?: number }) => Promise<string | null>
+              content: () => Promise<string>
+              url: () => string
+              screenshot: (input?: { path?: string; fullPage?: boolean }) => Promise<Buffer>
+            }>
+            close: () => Promise<void>
           }>
-          close: () => Promise<void>
-        }>
+        }
       }
-    }
     | undefined
 
   if (!playwright?.chromium) {
@@ -931,7 +923,9 @@ async function runBrowserAutomateTool(input: {
         }
         case "assert_text": {
           const source = action.selector
-            ? await page.textContent(action.selector, { timeout: action.timeoutMs ?? 20_000 }).then((value) => value ?? "")
+            ? await page
+                .textContent(action.selector, { timeout: action.timeoutMs ?? 20_000 })
+                .then((value) => value ?? "")
             : await page.content()
           if (!matchesPattern(source, action.text)) {
             throw new Error(`assert_text failed at step ${step}: missing "${action.text}"`)
@@ -996,30 +990,28 @@ async function runBrowserAutomateTool(input: {
   }
 }
 
-async function runHttpProbeTool(input: {
-  payload: Record<string, unknown>
-}): Promise<ToolExecutionResult> {
+async function runHttpProbeTool(input: { payload: Record<string, unknown> }): Promise<ToolExecutionResult> {
   const url = typeof input.payload.url === "string" ? input.payload.url.trim() : ""
   if (!url) throw new Error("http_probe requires a url.")
 
-  const method = typeof input.payload.method === "string" && input.payload.method.trim()
-    ? input.payload.method.trim().toUpperCase()
-    : "GET"
-
-  const headers = typeof input.payload.headers === "object" && input.payload.headers
-    ? Object.fromEntries(
-      Object.entries(input.payload.headers).flatMap(([key, value]) => {
-        if (typeof value !== "string") return []
-        return [[key, value]]
-      }),
-    )
-    : {}
+  const method =
+    typeof input.payload.method === "string" && input.payload.method.trim()
+      ? input.payload.method.trim().toUpperCase()
+      : "GET"
+
+  const headers =
+    typeof input.payload.headers === "object" && input.payload.headers
+      ? Object.fromEntries(
+          Object.entries(input.payload.headers).flatMap(([key, value]) => {
+            if (typeof value !== "string") return []
+            return [[key, value]]
+          }),
+        )
+      : {}
 
   const body = typeof input.payload.body === "string" ? input.payload.body : undefined
   const expectedStatus = typeof input.payload.expectStatus === "number" ? input.payload.expectStatus : undefined
-  const expectContains = typeof input.payload.expectContains === "string"
-    ? input.payload.expectContains
-    : undefined
+  const expectContains = typeof input.payload.expectContains === "string" ? input.payload.expectContains : undefined
 
   const controller = new AbortController()
   const timeout = setTimeout(() => controller.abort(), 20_000)
@@ -1044,11 +1036,7 @@ async function runHttpProbeTool(input: {
       summary: `HTTP ${method} ${url} -> ${response.status}`,
       output: {
         text: truncate(text),
-        logs: [
-          `Method: ${method}`,
-          `Status: ${response.status}`,
-          `Bytes: ${text.length}`,
-        ],
+        logs: [`Method: ${method}`, `Status: ${response.status}`, `Bytes: ${text.length}`],
         meta: {
           status: response.status,
           headers: Object.fromEntries(response.headers.entries()),
@@ -1081,9 +1069,10 @@ async function runFileInspectTool(input: {
   const fileInfo = await stat(absolute).catch(() => undefined)
   if (!fileInfo || !fileInfo.isFile()) throw new Error(`File not found: ${rel}`)
 
-  const maxBytes = typeof input.payload.maxBytes === "number" && input.payload.maxBytes > 0
-    ? Math.min(input.payload.maxBytes, 200_000)
-    : 60_000
+  const maxBytes =
+    typeof input.payload.maxBytes === "number" && input.payload.maxBytes > 0
+      ? Math.min(input.payload.maxBytes, 200_000)
+      : 60_000
 
   const raw = await readFile(absolute)
   const sliced = raw.length > maxBytes ? raw.subarray(0, maxBytes) : raw
@@ -1220,9 +1209,10 @@ async function runDbQueryTool(input: {
   if (!query) throw new Error("db_query requires a SQL query.")
 
   if (engine === "sqlite") {
-    const file = typeof input.payload.file === "string" && input.payload.file.trim()
-      ? resolveWorkspacePath(input.session, input.payload.file.trim())
-      : path.join(input.session.directory, "dev.db")
+    const file =
+      typeof input.payload.file === "string" && input.payload.file.trim()
+        ? resolveWorkspacePath(input.session, input.payload.file.trim())
+        : path.join(input.session.directory, "dev.db")
 
     const sqlite = await import("bun:sqlite")
     const db = new sqlite.Database(file, { create: true })
@@ -1234,11 +1224,7 @@ async function runDbQueryTool(input: {
         title: "DB Query (SQLite)",
         summary: `SQLite query returned ${rows.length} row(s).`,
         output: {
-          logs: [
-            `Engine: sqlite`,
-            `Database: ${path.relative(input.session.directory, file)}`,
-            `Rows: ${rows.length}`,
-          ],
+          logs: [`Engine: sqlite`, `Database: ${path.relative(input.session.directory, file)}`, `Rows: ${rows.length}`],
           table: {
             columns,
             rows: normalizedRows,
@@ -1252,9 +1238,10 @@ async function runDbQueryTool(input: {
   }
 
   if (engine === "postgres") {
-    const connection = typeof input.payload.connection === "string" && input.payload.connection.trim()
-      ? input.payload.connection.trim()
-      : process.env.DATABASE_URL ?? ""
+    const connection =
+      typeof input.payload.connection === "string" && input.payload.connection.trim()
+        ? input.payload.connection.trim()
+        : (process.env.DATABASE_URL ?? "")
     if (!connection) throw new Error("db_query postgres requires a connection string.")
 
     const result = await runCommand({
@@ -1280,9 +1267,10 @@ async function runDbQueryTool(input: {
   }
 
   if (engine === "mysql") {
-    const connection = typeof input.payload.connection === "string" && input.payload.connection.trim()
-      ? input.payload.connection.trim()
-      : process.env.MYSQL_URL ?? ""
+    const connection =
+      typeof input.payload.connection === "string" && input.payload.connection.trim()
+        ? input.payload.connection.trim()
+        : (process.env.MYSQL_URL ?? "")
     if (!connection) throw new Error("db_query mysql requires a connection string.")
 
     const result = await runCommand({
@@ -1313,9 +1301,10 @@ async function runIosSimulatorTool(input: {
   const workspace = typeof input.payload.workspace === "string" ? input.payload.workspace.trim() : ""
   const project = typeof input.payload.project === "string" ? input.payload.project.trim() : ""
   const scheme = typeof input.payload.scheme === "string" ? input.payload.scheme.trim() : ""
-  const destination = typeof input.payload.destination === "string" && input.payload.destination.trim()
-    ? input.payload.destination.trim()
-    : "platform=iOS Simulator,name=iPhone 16"
+  const destination =
+    typeof input.payload.destination === "string" && input.payload.destination.trim()
+      ? input.payload.destination.trim()
+      : "platform=iOS Simulator,name=iPhone 16"
 
   const env = {
     ...process.env,
@@ -1409,14 +1398,16 @@ async function runAndroidToolingTool(input: {
     }
     command = ["adb", "shell", "am", "start", "-n", `${packageName}/${activity}`]
   } else if (action === "test") {
-    const task = typeof input.payload.gradleTask === "string" && input.payload.gradleTask.trim()
-      ? input.payload.gradleTask.trim()
-      : "test"
+    const task =
+      typeof input.payload.gradleTask === "string" && input.payload.gradleTask.trim()
+        ? input.payload.gradleTask.trim()
+        : "test"
     command = [...gradleBase, task]
   } else {
-    const task = typeof input.payload.gradleTask === "string" && input.payload.gradleTask.trim()
-      ? input.payload.gradleTask.trim()
-      : "assembleDebug"
+    const task =
+      typeof input.payload.gradleTask === "string" && input.payload.gradleTask.trim()
+        ? input.payload.gradleTask.trim()
+        : "assembleDebug"
     command = [...gradleBase, task]
   }
 
@@ -1476,9 +1467,10 @@ async function runDesktopAppRunnerTool(input: {
 
   let command = explicitCommand
   if (command.length === 0) {
-    const framework = typeof input.payload.framework === "string" && input.payload.framework.trim() !== "auto"
-      ? input.payload.framework.trim()
-      : await detectDesktopFramework(input.session.directory)
+    const framework =
+      typeof input.payload.framework === "string" && input.payload.framework.trim() !== "auto"
+        ? input.payload.framework.trim()
+        : await detectDesktopFramework(input.session.directory)
 
     if (framework === "tauri") {
       if (action === "build") command = ["bun", "run", "tauri", "build"]
@@ -1521,35 +1513,39 @@ async function runArtifactCaptureTool(input: {
   payload: Record<string, unknown>
 }): Promise<ToolExecutionResult> {
   const captureType = typeof input.payload.type === "string" ? input.payload.type : "screenshot"
-  const url = typeof input.payload.url === "string" && input.payload.url.trim()
-    ? input.payload.url.trim()
-    : "http://127.0.0.1:3000"
+  const url =
+    typeof input.payload.url === "string" && input.payload.url.trim()
+      ? input.payload.url.trim()
+      : "http://127.0.0.1:3000"
 
   const dynamicImport = new Function("specifier", "return import(specifier)") as (specifier: string) => Promise<unknown>
-  const playwright = await dynamicImport("playwright").catch(() => undefined) as
+  const playwright = (await dynamicImport("playwright").catch(() => undefined)) as
     | {
-      chromium?: {
-        launch: (input: { headless: boolean }) => Promise<{
-          newContext: (input?: {
-            viewport?: { width: number; height: number }
-            recordVideo?: { dir: string; size?: { width: number; height: number } }
-          }) => Promise<{
-            newPage: () => Promise<{
-              goto: (url: string, input?: { waitUntil?: "domcontentloaded" | "load" | "networkidle"; timeout?: number }) => Promise<unknown>
-              waitForTimeout: (ms: number) => Promise<void>
-              screenshot: (input?: { path?: string; fullPage?: boolean }) => Promise<Buffer>
-              video: () => { path: () => Promise<string> } | null
+        chromium?: {
+          launch: (input: { headless: boolean }) => Promise<{
+            newContext: (input?: {
+              viewport?: { width: number; height: number }
+              recordVideo?: { dir: string; size?: { width: number; height: number } }
+            }) => Promise<{
+              newPage: () => Promise<{
+                goto: (
+                  url: string,
+                  input?: { waitUntil?: "domcontentloaded" | "load" | "networkidle"; timeout?: number },
+                ) => Promise<unknown>
+                waitForTimeout: (ms: number) => Promise<void>
+                screenshot: (input?: { path?: string; fullPage?: boolean }) => Promise<Buffer>
+                video: () => { path: () => Promise<string> } | null
+              }>
+              tracing: {
+                start: (input: { screenshots?: boolean; snapshots?: boolean; sources?: boolean }) => Promise<void>
+                stop: (input: { path: string }) => Promise<void>
+              }
+              close: () => Promise<void>
             }>
-            tracing: {
-              start: (input: { screenshots?: boolean; snapshots?: boolean; sources?: boolean }) => Promise<void>
-              stop: (input: { path: string }) => Promise<void>
-            }
             close: () => Promise<void>
           }>
-          close: () => Promise<void>
-        }>
+        }
       }
-    }
     | undefined
 
   if (!playwright?.chromium) {
@@ -1583,32 +1579,29 @@ async function runArtifactCaptureTool(input: {
       })
       const page = await context.newPage()
       await page.goto(url, { waitUntil: "domcontentloaded", timeout: 25_000 })
-      const duration = typeof input.payload.seconds === "number" && input.payload.seconds > 0
-        ? Math.min(input.payload.seconds, 30)
-        : 8
+      const duration =
+        typeof input.payload.seconds === "number" && input.payload.seconds > 0 ? Math.min(input.payload.seconds, 30) : 8
       await page.waitForTimeout(duration * 1000)
       const videoPathPromise = page.video()?.path()
       await context.close()
       const videoPath = await videoPathPromise
       if (videoPath) {
-        artifacts.push(await registerArtifact({
-          session: input.session,
-          absolutePath: videoPath,
-          label: "Captured browser video",
-          type: "video",
-          mimeType: "video/webm",
-        }))
+        artifacts.push(
+          await registerArtifact({
+            session: input.session,
+            absolutePath: videoPath,
+            label: "Captured browser video",
+            type: "video",
+            mimeType: "video/webm",
+          }),
+        )
       }
       return {
         title: "Artifact Capture",
         summary: `Captured ${artifacts.length} video artifact(s).`,
         artifacts,
         output: {
-          logs: [
-            `Type: video`,
-            `URL: ${url}`,
-            `Artifacts: ${artifacts.length}`,
-          ],
+          logs: [`Type: video`, `URL: ${url}`, `Artifacts: ${artifacts.length}`],
           previewUrl: url,
           meta: {
             type: "video",
@@ -1627,24 +1620,28 @@ async function runArtifactCaptureTool(input: {
       await page.waitForTimeout(3_000)
       const traceFile = path.join(artifactsDir, `${Date.now()}-trace.zip`)
       await context.tracing.stop({ path: traceFile })
-      artifacts.push(await registerArtifact({
-        session: input.session,
-        absolutePath: traceFile,
-        label: "Playwright trace",
-        type: "trace",
-        mimeType: "application/zip",
-      }))
+      artifacts.push(
+        await registerArtifact({
+          session: input.session,
+          absolutePath: traceFile,
+          label: "Playwright trace",
+          type: "trace",
+          mimeType: "application/zip",
+        }),
+      )
     }
 
     const screenshotFile = path.join(artifactsDir, `${Date.now()}-capture.png`)
     await page.screenshot({ path: screenshotFile, fullPage: true })
-    artifacts.push(await registerArtifact({
-      session: input.session,
-      absolutePath: screenshotFile,
-      label: "Captured screenshot",
-      type: "image",
-      mimeType: "image/png",
-    }))
+    artifacts.push(
+      await registerArtifact({
+        session: input.session,
+        absolutePath: screenshotFile,
+        label: "Captured screenshot",
+        type: "image",
+        mimeType: "image/png",
+      }),
+    )
 
     await context.close()
 
@@ -1653,11 +1650,7 @@ async function runArtifactCaptureTool(input: {
       summary: `Captured ${artifacts.length} artifact(s) (${captureType}).`,
       artifacts,
       output: {
-        logs: [
-          `Type: ${captureType}`,
-          `URL: ${url}`,
-          `Artifacts: ${artifacts.length}`,
-        ],
+        logs: [`Type: ${captureType}`, `URL: ${url}`, `Artifacts: ${artifacts.length}`],
         previewUrl: url,
         meta: {
           type: captureType,
@@ -1729,19 +1722,19 @@ function buildLaunchProbeCommand(command: string[]): string[] {
     `${launch} &`,
     "pid=$!",
     "sleep 8",
-    "if ps -p \"$pid\" >/dev/null 2>&1; then",
+    'if ps -p "$pid" >/dev/null 2>&1; then',
     `  echo "Launch command stayed active for 8s: ${launch}"`,
-    "  kill \"$pid\" >/dev/null 2>&1 || true",
-    "  wait \"$pid\" >/dev/null 2>&1 || true",
+    '  kill "$pid" >/dev/null 2>&1 || true',
+    '  wait "$pid" >/dev/null 2>&1 || true',
     "  exit 0",
     "fi",
-    "if wait \"$pid\"; then",
+    'if wait "$pid"; then',
     `  echo "Launch command exited cleanly before 8s: ${launch}"`,
     "  exit 0",
     "fi",
     "code=$?",
     `echo "Launch command failed with exit $code: ${launch}" >&2`,
-    "exit \"$code\"",
+    'exit "$code"',
   ].join("\n")
   return ["bash", "-lc", script]
 }
@@ -1769,8 +1762,9 @@ function detectLikelyScriptLaunchCommand(input: {
   if (input.entries.includes("go.mod")) return ["go", "run", "."]
   if (input.entries.includes("Cargo.toml")) return ["cargo", "run"]
 
-  const shellEntry = input.entries.find((entry) =>
-    /\.sh$|\.command$/i.test(entry) && /(launch|start|run|main)/i.test(entry))
+  const shellEntry = input.entries.find(
+    (entry) => /\.sh$|\.command$/i.test(entry) && /(launch|start|run|main)/i.test(entry),
+  )
   if (shellEntry) return ["bash", shellEntry]
 
   return undefined
@@ -1782,7 +1776,8 @@ async function parseProjectSignals(directory: string): Promise<ParsedProjectSign
       entries
         .map((entry) => entry.trim())
         .filter(Boolean)
-        .slice(0, 200))
+        .slice(0, 200),
+    )
     .catch((): string[] => [])
 
   let scripts: string[] = []
@@ -1800,18 +1795,20 @@ async function parseProjectSignals(directory: string): Promise<ParsedProjectSign
 
   const hasDockerCompose = lines.some((line) => /docker-compose\.ya?ml|compose\.ya?ml/i.test(line))
   const hasReadme = lines.some((line) => /^readme/i.test(line))
-  const hasIOS = lines.some((line) => line.endsWith(".xcodeproj") || line.endsWith(".xcworkspace"))
-    || await pathExists(path.join(directory, "ios"))
-  const hasAndroid = await pathExists(path.join(directory, "android"))
-    || await pathExists(path.join(directory, "gradlew"))
-  const hasDesktop = await pathExists(path.join(directory, "src-tauri"))
-    || await pathExists(path.join(directory, "electron-builder.json"))
-  const hasWeb = scripts.some((script) => ["dev", "start", "preview", "serve"].includes(script))
-    || lines.includes("vite.config.ts")
-    || lines.includes("next.config.js")
-  const hasCli = scripts.some((script) => ["cli", "run"].includes(script))
-    || lines.includes("main.py")
-    || lines.includes("main.go")
+  const hasIOS =
+    lines.some((line) => line.endsWith(".xcodeproj") || line.endsWith(".xcworkspace")) ||
+    (await pathExists(path.join(directory, "ios")))
+  const hasAndroid =
+    (await pathExists(path.join(directory, "android"))) || (await pathExists(path.join(directory, "gradlew")))
+  const hasDesktop =
+    (await pathExists(path.join(directory, "src-tauri"))) ||
+    (await pathExists(path.join(directory, "electron-builder.json")))
+  const hasWeb =
+    scripts.some((script) => ["dev", "start", "preview", "serve"].includes(script)) ||
+    lines.includes("vite.config.ts") ||
+    lines.includes("next.config.js")
+  const hasCli =
+    scripts.some((script) => ["cli", "run"].includes(script)) || lines.includes("main.py") || lines.includes("main.go")
 
   const detected = [
     hasWeb ? "web" : "",
@@ -1845,24 +1842,14 @@ async function parseProjectSignals(directory: string): Promise<ParsedProjectSign
 
 function defaultInspectPath(signals: ParsedProjectSignals): string | undefined {
   if (signals.hasReadme) return "README.md"
-  const candidates = [
-    "package.json",
-    "pyproject.toml",
-    "requirements.txt",
-    "Cargo.toml",
-    "go.mod",
-    "Makefile",
-  ]
+  const candidates = ["package.json", "pyproject.toml", "requirements.txt", "Cargo.toml", "go.mod", "Makefile"]
   for (const file of candidates) {
     if (signals.entries.includes(file)) return file
   }
   return undefined
 }
 
-function sanitizePlannedCalls(input: {
-  calls: DeployToolCall[]
-  signals: ParsedProjectSignals
-}): DeployToolCall[] {
+function sanitizePlannedCalls(input: { calls: DeployToolCall[]; signals: ParsedProjectSignals }): DeployToolCall[] {
   const sanitized: DeployToolCall[] = []
   const seen = new Set<string>()
 
@@ -1878,7 +1865,9 @@ function sanitizePlannedCalls(input: {
         if (input.signals.scriptLaunchCommand) {
           command = buildLaunchProbeCommand(input.signals.scriptLaunchCommand)
         } else if (input.signals.isLikelyWeb && input.signals.entries.includes("package.json")) {
-          const preferredScript = ["dev", "start", "preview", "serve"].find((item) => input.signals.scripts.includes(item))
+          const preferredScript = ["dev", "start", "preview", "serve"].find((item) =>
+            input.signals.scripts.includes(item),
+          )
           if (preferredScript) {
             const manager = detectNodePackageManager(input.signals.entries)
             command = buildNodeRunCommand(manager, preferredScript)
@@ -1886,9 +1875,10 @@ function sanitizePlannedCalls(input: {
         }
       }
       if (command.length === 0) command = ["bash", "-lc", "pwd && ls -la"]
-      const timeoutMs = typeof call.input?.timeoutMs === "number" && call.input.timeoutMs > 0
-        ? Math.min(call.input.timeoutMs, 8 * 60_000)
-        : undefined
+      const timeoutMs =
+        typeof call.input?.timeoutMs === "number" && call.input.timeoutMs > 0
+          ? Math.min(call.input.timeoutMs, 8 * 60_000)
+          : undefined
       nextCall = {
         tool: "terminal_exec",
         input: {
@@ -2078,14 +2068,16 @@ function isLaunchInvocation(invocation: DeployToolInvocation): boolean {
   if (invocation.tool === "terminal_exec") {
     const command = (invocation.output?.command ?? "").toLowerCase()
     if (!command.trim()) return false
-    return /\bnpm\s+run\s+(dev|start|preview|serve|run|cli|main)\b/.test(command)
-      || /\bpnpm\s+run\s+(dev|start|preview|serve|run|cli|main)\b/.test(command)
-      || /\byarn\s+(dev|start|preview|serve|run|cli|main)\b/.test(command)
-      || /\bbun\s+run\s+(dev|start|preview|serve|run|cli|main)\b/.test(command)
-      || /\bpython3?\s+\S+\.py\b/.test(command)
-      || /\bgo\s+run\b/.test(command)
-      || /\bcargo\s+run\b/.test(command)
-      || /\bmake\s+run\b/.test(command)
+    return (
+      /\bnpm\s+run\s+(dev|start|preview|serve|run|cli|main)\b/.test(command) ||
+      /\bpnpm\s+run\s+(dev|start|preview|serve|run|cli|main)\b/.test(command) ||
+      /\byarn\s+(dev|start|preview|serve|run|cli|main)\b/.test(command) ||
+      /\bbun\s+run\s+(dev|start|preview|serve|run|cli|main)\b/.test(command) ||
+      /\bpython3?\s+\S+\.py\b/.test(command) ||
+      /\bgo\s+run\b/.test(command) ||
+      /\bcargo\s+run\b/.test(command) ||
+      /\bmake\s+run\b/.test(command)
+    )
   }
   return false
 }
@@ -2109,17 +2101,15 @@ function inferInstallCommand(signals: ParsedProjectSignals): string {
   return "Review README.md for install prerequisites."
 }
 
-function inferStartCommand(input: {
-  signals: ParsedProjectSignals
-  launchInvocation?: DeployToolInvocation
-}): string {
+function inferStartCommand(input: { signals: ParsedProjectSignals; launchInvocation?: DeployToolInvocation }): string {
   const parts = inferStartCommandParts(input)
   if (parts?.length) return commandToString(parts)
 
   if (input.signals.entries.includes("package.json")) {
     const manager = detectNodePackageManager(input.signals.entries)
-    const script = ["start", "dev", "preview", "serve", "run", "cli", "main"]
-      .find((item) => input.signals.scripts.includes(item))
+    const script = ["start", "dev", "preview", "serve", "run", "cli", "main"].find((item) =>
+      input.signals.scripts.includes(item),
+    )
     if (script) return commandToString(buildNodeRunCommand(manager, script))
   }
   if (input.signals.entries.includes("main.py")) return "python3 main.py"
@@ -2133,9 +2123,7 @@ function inferStartCommandParts(input: {
   signals: ParsedProjectSignals
   launchInvocation?: DeployToolInvocation
 }): string[] | undefined {
-  const launchCommand = input.launchInvocation
-    ? commandFromLaunchInvocation(input.launchInvocation)
-    : undefined
+  const launchCommand = input.launchInvocation ? commandFromLaunchInvocation(input.launchInvocation) : undefined
   if (launchCommand?.length) return launchCommand
 
   if (input.signals.scriptLaunchCommand?.length) {
@@ -2144,8 +2132,9 @@ function inferStartCommandParts(input: {
 
   if (input.signals.entries.includes("package.json")) {
     const manager = detectNodePackageManager(input.signals.entries)
-    const script = ["start", "dev", "preview", "serve", "run", "cli", "main"]
-      .find((item) => input.signals.scripts.includes(item))
+    const script = ["start", "dev", "preview", "serve", "run", "cli", "main"].find((item) =>
+      input.signals.scripts.includes(item),
+    )
     if (script) return buildNodeRunCommand(manager, script)
   }
   if (input.signals.entries.includes("main.py")) return ["python3", "main.py"]
@@ -2171,9 +2160,11 @@ function inferOpenTarget(input: {
 }): z.infer<typeof DeployOpenTarget> {
   if (input.preferredUrl?.trim()) return "web_view"
   if (input.launchInvocation) {
-    if (input.launchInvocation.tool === "ios_simulator"
-      || input.launchInvocation.tool === "android_tooling"
-      || input.launchInvocation.tool === "desktop_app_runner") {
+    if (
+      input.launchInvocation.tool === "ios_simulator" ||
+      input.launchInvocation.tool === "android_tooling" ||
+      input.launchInvocation.tool === "desktop_app_runner"
+    ) {
       return "external"
     }
     if (input.launchInvocation.tool === "browser_automate" || input.launchInvocation.tool === "http_probe") {
@@ -2193,8 +2184,9 @@ function inferOpenTarget(input: {
 }
 
 export function resolveDeploySessionOpenTarget(session: DeploySession): DeploySessionResolvedOpenTarget | undefined {
-  const launchUrl = session.launchUrl?.trim()
-    || session.invocations
+  const launchUrl =
+    session.launchUrl?.trim() ||
+    session.invocations
       .slice()
       .reverse()
       .map((invocation) => invocation.output?.previewUrl?.trim() || "")
@@ -2279,9 +2271,7 @@ async function buildOpenPlan(input: {
     }
   }
 
-  const launchInvocation = [...input.session.invocations]
-    .reverse()
-    .find((invocation) => isLaunchInvocation(invocation))
+  const launchInvocation = [...input.session.invocations].reverse().find((invocation) => isLaunchInvocation(invocation))
   const invocationCommand = launchInvocation ? commandFromLaunchInvocation(launchInvocation) : undefined
   if (invocationCommand) {
     return {
@@ -2387,7 +2377,7 @@ async function readKeyManifestSnippets(directory: string): Promise<string> {
   const snippets: string[] = []
   for (const rel of candidates) {
     const absolute = path.join(directory, rel)
-    if (!await pathExists(absolute)) continue
+    if (!(await pathExists(absolute))) continue
     const raw = await readFile(absolute, "utf8").catch(() => "")
     if (!raw.trim()) continue
     const clipped = raw.slice(0, 1_500)
@@ -2398,10 +2388,10 @@ async function readKeyManifestSnippets(directory: string): Promise<string> {
   return snippets.join("\n\n")
 }
 
-function fallbackToolPlan(input: {
-  text: string
-  signals: ParsedProjectSignals
-}): { assistantSummary: string; calls: DeployToolCall[] } {
+function fallbackToolPlan(input: { text: string; signals: ParsedProjectSignals }): {
+  assistantSummary: string
+  calls: DeployToolCall[]
+} {
   const calls: DeployToolCall[] = []
 
   if (input.signals.hasReadme) {
@@ -2464,7 +2454,8 @@ function fallbackToolPlan(input: {
       },
     })
     return {
-      assistantSummary: "Detected a likely web app. Attempting to launch with npm and validate via local probe and screenshot.",
+      assistantSummary:
+        "Detected a likely web app. Attempting to launch with npm and validate via local probe and screenshot.",
       calls,
     }
   }
@@ -2478,7 +2469,8 @@ function fallbackToolPlan(input: {
       },
     })
     return {
-      assistantSummary: "Detected a script/CLI entrypoint. Attempting a bounded local launch to verify startup behavior.",
+      assistantSummary:
+        "Detected a script/CLI entrypoint. Attempting a bounded local launch to verify startup behavior.",
       calls,
     }
   }
@@ -2534,7 +2526,7 @@ function fallbackToolPlan(input: {
           "elif [ -f Makefile ]; then",
           "  make test || make build",
           "else",
-          "  echo \"No known local build/test command found\" >&2",
+          '  echo "No known local build/test command found" >&2',
           "  exit 2",
           "fi",
         ].join("\n"),
@@ -2544,7 +2536,8 @@ function fallbackToolPlan(input: {
   })
 
   return {
-    assistantSummary: "Project type is unclear. Running diagnostics plus a bounded local build/test sweep to validate execution.",
+    assistantSummary:
+      "Project type is unclear. Running diagnostics plus a bounded local build/test sweep to validate execution.",
     calls,
   }
 }
@@ -2807,7 +2800,12 @@ async function buildToolPlanWithAgent(input: {
 async function buildToolPlan(input: {
   session: DeploySessionInternal
   userMessage: string
-}): Promise<{ assistantSummary: string; calls: DeployToolCall[]; detectedProjectTypes: string[]; signals: ParsedProjectSignals }> {
+}): Promise<{
+  assistantSummary: string
+  calls: DeployToolCall[]
+  detectedProjectTypes: string[]
+  signals: ParsedProjectSignals
+}> {
   const signals = await parseProjectSignals(input.session.directory)
   const modelPlan = await buildToolPlanWithAgent({
     session: input.session,
@@ -2850,16 +2848,17 @@ async function buildToolPlan(input: {
     calls: fallback.calls,
     signals,
   })
-  const fallbackCalls = sanitizedFallback.length > 0
-    ? sanitizedFallback
-    : [
-      {
-        tool: "terminal_exec" as const,
-        input: {
-          command: ["bash", "-lc", "pwd && ls -la"],
-        },
-      },
-    ]
+  const fallbackCalls =
+    sanitizedFallback.length > 0
+      ? sanitizedFallback
+      : [
+          {
+            tool: "terminal_exec" as const,
+            input: {
+              command: ["bash", "-lc", "pwd && ls -la"],
+            },
+          },
+        ]
 
   return {
     assistantSummary: fallback.assistantSummary,
@@ -2884,12 +2883,11 @@ async function routeDeployFailuresToRun(input: {
     }
   }
 
-  const failureLines = input.failedInvocations
-    .slice(0, 6)
-    .map((item) => {
-      const details = item.output?.logs?.slice(-6).join(" | ") || item.output?.text?.slice(0, 500) || item.summary || "Unknown failure"
-      return `- ${item.tool}: ${details}`
-    })
+  const failureLines = input.failedInvocations.slice(0, 6).map((item) => {
+    const details =
+      item.output?.logs?.slice(-6).join(" | ") || item.output?.text?.slice(0, 500) || item.summary || "Unknown failure"
+    return `- ${item.tool}: ${details}`
+  })
 
   const guidance = [
     `Deploy validation session ${input.session.id} reported failures.`,
@@ -2920,8 +2918,7 @@ async function routeDeployFailuresToRun(input: {
       emitSupervisorThought(runId, {
         action: "intervene",
         reasoning:
-          `Deploy session ${input.session.id} queued remediation request `
-          + `"${request.title}" for the Deploy Agent.`,
+          `Deploy session ${input.session.id} queued remediation request ` + `"${request.title}" for the Deploy Agent.`,
       })
     }
 
@@ -2972,7 +2969,11 @@ async function executeToolCall(input: {
       artifacts: mergedArtifacts,
     })
 
-    return getSessionInternal(input.session.directory, input.session.id).invocations.find((item) => item.id === invocation.id) ?? invocation
+    return (
+      getSessionInternal(input.session.directory, input.session.id).invocations.find(
+        (item) => item.id === invocation.id,
+      ) ?? invocation
+    )
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error)
     updateInvocation(input.session, invocation.id, {
@@ -2984,7 +2985,9 @@ async function executeToolCall(input: {
         logs: [message],
       },
     })
-    const failed = getSessionInternal(input.session.directory, input.session.id).invocations.find((item) => item.id === invocation.id)
+    const failed = getSessionInternal(input.session.directory, input.session.id).invocations.find(
+      (item) => item.id === invocation.id,
+    )
     if (failed) return failed
     return {
       ...invocation,
@@ -2999,13 +3002,15 @@ async function executeToolCall(input: {
   }
 }
 
-export async function createDeploySession(input: {
-  directory?: string
-  title?: string
-  linkedRunId?: string
-  autoStart?: boolean
-  prompt?: string
-} = {}): Promise<DeploySession> {
+export async function createDeploySession(
+  input: {
+    directory?: string
+    title?: string
+    linkedRunId?: string
+    autoStart?: boolean
+    prompt?: string
+  } = {},
+): Promise<DeploySession> {
   const directory = normalizeDirectory(input.directory ?? Instance.directory)
   const now = Date.now()
   const sessionId = makeSessionID()
@@ -3039,7 +3044,9 @@ export async function createDeploySession(input: {
   })
 
   if (input.autoStart) {
-    const prompt = input.prompt?.trim() || "Analyze this project and run a local deploy/test validation flow with visual artifacts. Do not stop at inspection: execute real local build/test/start checks."
+    const prompt =
+      input.prompt?.trim() ||
+      "Analyze this project and run a local deploy/test validation flow with visual artifacts. Do not stop at inspection: execute real local build/test/start checks."
     void sendDeploySessionMessage({
       sessionId: session.id,
       directory,
@@ -3055,9 +3062,11 @@ export async function createDeploySession(input: {
   return sanitizeSession(session)
 }
 
-export function listDeploySessions(input: {
-  directory?: string
-} = {}): DeploySession[] {
+export function listDeploySessions(
+  input: {
+    directory?: string
+  } = {},
+): DeploySession[] {
   const directory = input.directory ? normalizeDirectory(input.directory) : undefined
   const all = [...sessions.values()]
     .filter((session) => !directory || session.directory === directory)
@@ -3065,10 +3074,7 @@ export function listDeploySessions(input: {
   return all.map((session) => sanitizeSession(session))
 }
 
-export function getDeploySession(input: {
-  sessionId: string
-  directory?: string
-}): DeploySession | undefined {
+export function getDeploySession(input: { sessionId: string; directory?: string }): DeploySession | undefined {
   const session = sessions.get(input.sessionId)
   if (!session) return undefined
   if (input.directory && normalizeDirectory(input.directory) !== session.directory) return undefined
@@ -3156,9 +3162,7 @@ export async function invokeDeploySessionTool(input: {
       }
     } else {
       session.status = "passed"
-      const deterministicCommand = isLaunchInvocation(invocation)
-        ? commandFromLaunchInvocation(invocation)
-        : undefined
+      const deterministicCommand = isLaunchInvocation(invocation) ? commandFromLaunchInvocation(invocation) : undefined
       if (deterministicCommand?.length) {
         session.launchCommand = deterministicCommand
         session.appStatus = "ready_for_manual_start"
@@ -3290,14 +3294,10 @@ export async function sendDeploySessionMessage(input: {
         text: handoff.text,
         invocationIds: handoff.invocationIds,
       })
-      session.launchCommand = handoff.startCommand?.length
-        ? [...handoff.startCommand]
-        : undefined
+      session.launchCommand = handoff.startCommand?.length ? [...handoff.startCommand] : undefined
       const latestUrl = latestPreviewUrlFromSession(session)
       if (latestUrl) session.launchUrl = latestUrl
-      session.appStatus = session.launchCommand?.length || session.launchUrl
-        ? "ready_for_manual_start"
-        : "unknown"
+      session.appStatus = session.launchCommand?.length || session.launchUrl ? "ready_for_manual_start" : "unknown"
       session.launchInstructions = {
         summary: handoff.summary,
         steps: handoff.steps,
@@ -3313,14 +3313,11 @@ export async function sendDeploySessionMessage(input: {
   return sanitizeSession(session)
 }
 
-async function getReusableLaunchHandle(sessionId: string): Promise<ActiveLaunchHandle | undefined> {
+function getReusableLaunchHandle(sessionId: string): ActiveLaunchHandle | undefined {
   const existing = activeLaunches.get(sessionId)
   if (!existing) return undefined
-  const exited = await Promise.race([
-    existing.process.exited.then((code) => code).catch(() => 0),
-    new Promise<number | undefined>((resolve) => setTimeout(() => resolve(undefined), OPEN_PROCESS_REUSE_CHECK_MS)),
-  ])
-  if (exited === undefined) return existing
+  const pty = Pty.get(existing.ptyId)
+  if (pty?.status === "running") return existing
   activeLaunches.delete(sessionId)
   return undefined
 }
@@ -3344,12 +3341,11 @@ export async function openDeploySessionApp(input: {
   const session = getSessionInternal(directory, input.sessionId)
 
   return withSessionLock(session.id, async () => {
-    const reusable = await getReusableLaunchHandle(session.id)
+    let reusable = getReusableLaunchHandle(session.id)
     if (reusable && input.forceRestart) {
-      try {
-        reusable.process.kill()
-      } catch {}
+      await Pty.remove(reusable.ptyId).catch(() => undefined)
       activeLaunches.delete(session.id)
+      reusable = undefined
     }
 
     const plan = await buildOpenPlan({
@@ -3365,6 +3361,7 @@ export async function openDeploySessionApp(input: {
     }
 
     if (reusable && !input.forceRestart) {
+      const reusablePty = Pty.get(reusable.ptyId)
       const reusedUrl = reusable.url || preferredUrl
       if (reusedUrl) session.launchUrl = reusedUrl
       session.appStatus = "running"
@@ -3386,8 +3383,9 @@ export async function openDeploySessionApp(input: {
         summary: `App is already running from a previous Open command (${commandToString(reusable.command)}).`,
         output: {
           logs: compactLogs([
-            `Reused existing running process for session ${session.id}.`,
+            `Reused existing running terminal for session ${session.id}.`,
             `Command: ${commandToString(reusable.command)}`,
+            `Terminal: ${reusable.ptyId}`,
             reusable.url ? `URL: ${reusable.url}` : "No preview URL detected yet.",
           ]),
           command: commandToString(reusable.command),
@@ -3395,6 +3393,9 @@ export async function openDeploySessionApp(input: {
           meta: {
             openAction: true,
             reused: true,
+            livePtyId: reusable.ptyId,
+            livePtyTitle: reusablePty?.title,
+            keptRunning: true,
           },
         },
       })
@@ -3402,8 +3403,8 @@ export async function openDeploySessionApp(input: {
       pushMessage(session, {
         role: "assistant",
         text: reusedUrl
-          ? `Open reused an existing running app process. URL: ${reusedUrl}`
-          : "Open reused an existing running app process.",
+          ? `Open reused terminal ${reusable.ptyId}. URL: ${reusedUrl}`
+          : `Open reused terminal ${reusable.ptyId}.`,
         invocationIds: [updated.id],
       })
 
@@ -3415,8 +3416,8 @@ export async function openDeploySessionApp(input: {
         command: commandToString(reusable.command),
         reused: true,
         message: reusedUrl
-          ? `Reused a running app process at ${reusedUrl}.`
-          : "Reused an already running app process.",
+          ? `Reused terminal ${reusable.ptyId} at ${reusedUrl}.`
+          : `Reused running terminal ${reusable.ptyId}.`,
       }
     }
 
@@ -3461,9 +3462,7 @@ export async function openDeploySessionApp(input: {
 
       pushMessage(session, {
         role: "assistant",
-        text: preferredUrl
-          ? `Open routed to ${preferredUrl}.`
-          : "Open completed, but no launch URL was detected.",
+        text: preferredUrl ? `Open routed to ${preferredUrl}.` : "Open completed, but no launch URL was detected.",
         invocationIds: [updated.id],
       })
 
@@ -3513,26 +3512,28 @@ export async function openDeploySessionApp(input: {
     }
 
     const preferredPort = preferredUrl ? parsePortFromUrl(preferredUrl) : undefined
-    const logs: string[] = []
-    const discoveredUrls = new Set<string>()
-    const env: Record<string, string | undefined> = {
-      ...process.env,
-      BROWSER: "none",
-    }
-    if (Number.isFinite(preferredPort)) {
-      env.PORT = String(preferredPort)
-      env.HOST = "127.0.0.1"
-      env.HOSTNAME = "127.0.0.1"
-    }
+    const env = Object.fromEntries(
+      Object.entries({
+        ...process.env,
+        BROWSER: "none",
+        ...(Number.isFinite(preferredPort)
+          ? {
+              PORT: String(preferredPort),
+              HOST: "127.0.0.1",
+              HOSTNAME: "127.0.0.1",
+            }
+          : {}),
+      }).filter((entry): entry is [string, string] => typeof entry[1] === "string"),
+    )
 
-    let proc: Bun.Subprocess
+    let ptyInfo: Pty.Info
     try {
-      proc = Bun.spawn(command, {
+      ptyInfo = await Pty.create({
         cwd: session.directory,
-        env: env as Record<string, string>,
-        stdin: "ignore",
-        stdout: "pipe",
-        stderr: "pipe",
+        command: command[0],
+        args: command.slice(1),
+        title: `Deploy Open ${session.id.slice(-6)}`,
+        env,
       })
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error)
@@ -3567,19 +3568,7 @@ export async function openDeploySessionApp(input: {
       }
     }
 
-    const onLine = (line: string) => {
-      const trimmed = line.trim()
-      if (!trimmed) return
-      logs.push(trimmed)
-      if (logs.length > MAX_LOG_LINES_PER_INVOCATION) logs.shift()
-      for (const url of parseUrlsFromText(trimmed)) {
-        discoveredUrls.add(url)
-      }
-    }
-    void readStreamLines(proc.stdout as ReadableStream<Uint8Array> | null, onLine).catch(() => undefined)
-    void readStreamLines(proc.stderr as ReadableStream<Uint8Array> | null, onLine).catch(() => undefined)
-
-    let exitCode: number | undefined
+    const logs: string[] = [`Started live terminal ${ptyInfo.id} for Open.`, `Command: ${commandToString(command)}`]
     let detectedUrl = preferredUrl
     const webCandidates = [
       "http://127.0.0.1:3000",
@@ -3594,15 +3583,11 @@ export async function openDeploySessionApp(input: {
 
     const startedAt = Date.now()
     while (Date.now() - startedAt < OPEN_STARTUP_WAIT_MS) {
-      exitCode = await Promise.race([
-        proc.exited.then((code) => code).catch(() => 1),
-        new Promise<number | undefined>((resolve) => setTimeout(() => resolve(undefined), 320)),
-      ])
-      if (exitCode !== undefined) break
+      const live = Pty.get(ptyInfo.id)
+      if (!live || live.status !== "running") break
 
       const urls = new Set<string>()
       if (detectedUrl?.trim()) urls.add(detectedUrl.trim())
-      for (const discovered of discoveredUrls) urls.add(discovered)
       if (target === "web_view") {
         for (const candidate of webCandidates) urls.add(candidate)
       }
@@ -3618,42 +3603,44 @@ export async function openDeploySessionApp(input: {
         }
       }
       if (detectedUrl) break
+      await new Promise<void>((resolve) => setTimeout(resolve, 320))
     }
 
-    const keptRunning = exitCode === undefined
+    const keptRunning = Pty.get(ptyInfo.id)?.status === "running"
     if (keptRunning) {
       const handle: ActiveLaunchHandle = {
         sessionId: session.id,
         invocationId: invocation.id,
         command,
-        process: proc,
+        ptyId: ptyInfo.id,
         startedAt: Date.now(),
         target,
         url: detectedUrl,
       }
       activeLaunches.set(session.id, handle)
-      proc.exited
-        .then(() => {
-          const current = activeLaunches.get(session.id)
-          if (current && current.process === proc) {
-            activeLaunches.delete(session.id)
-          }
-        })
-        .catch(() => undefined)
+    } else {
+      activeLaunches.delete(session.id)
     }
 
-    if (detectedUrl) session.launchUrl = detectedUrl
-    session.appStatus = keptRunning ? "running" : "ready_for_manual_start"
-    session.status = exitCode !== undefined && exitCode !== 0 ? "failed" : "passed"
-    session.lastError = session.status === "failed"
-      ? `Open command exited with status ${exitCode}.`
-      : undefined
+    if (detectedUrl) logs.push(`Detected URL: ${detectedUrl}`)
+    if (!keptRunning) logs.push("Open terminal exited before staying alive.")
 
-    const summary = session.status === "failed"
-      ? `Open command failed with exit ${exitCode}: ${commandToString(command)}`
-      : keptRunning
-        ? `Launch command started and is still running: ${commandToString(command)}`
-        : `Launch command completed with exit 0: ${commandToString(command)}`
+    const openSucceeded = keptRunning || Boolean(detectedUrl)
+    if (detectedUrl) session.launchUrl = detectedUrl
+    session.appStatus = openSucceeded ? "running" : "ready_for_manual_start"
+    session.status = openSucceeded ? "passed" : "failed"
+    session.lastError = openSucceeded
+      ? undefined
+      : `Open command exited before the app became reachable: ${commandToString(command)}`
+
+    const summary =
+      session.status === "failed"
+        ? `Open command exited before app startup: ${commandToString(command)}`
+        : keptRunning
+          ? `Launch command started in live terminal ${ptyInfo.id} and is still running: ${commandToString(command)}`
+          : detectedUrl
+            ? `Launch command completed, and app is reachable at ${detectedUrl}.`
+            : `Launch command completed: ${commandToString(command)}`
 
     const updated = updateInvocationAndRequire(session, invocation, {
       status: session.status === "failed" ? "failed" : "passed",
@@ -3663,24 +3650,28 @@ export async function openDeploySessionApp(input: {
         text: truncate(logs.join("\n")),
         logs: compactLogs(logs),
         command: commandToString(command),
-        code: exitCode,
+        code: openSucceeded ? undefined : 1,
         previewUrl: detectedUrl,
         meta: {
           openAction: true,
           keptRunning,
           startupWindowMs: OPEN_STARTUP_WAIT_MS,
           sourceInvocationId: plan.launchInvocation?.id,
+          livePtyId: ptyInfo.id,
+          livePtyTitle: ptyInfo.title,
+          livePtyCwd: ptyInfo.cwd,
         },
       },
     })
 
     pushMessage(session, {
       role: "assistant",
-      text: session.status === "failed"
-        ? `Open failed for command ${commandToString(command)}.`
-        : detectedUrl
-          ? `Open started the app and detected ${detectedUrl}.`
-          : "Open started the app command and left it running.",
+      text:
+        session.status === "failed"
+          ? `Open failed to keep the app running in terminal ${ptyInfo.id}.`
+          : detectedUrl
+            ? `Open started terminal ${ptyInfo.id} and detected ${detectedUrl}.`
+            : `Open started terminal ${ptyInfo.id}.`,
       invocationIds: [updated.id],
     })
 
@@ -3691,11 +3682,14 @@ export async function openDeploySessionApp(input: {
       url: detectedUrl,
       command: commandToString(command),
       reused: false,
-      message: session.status === "failed"
-        ? `Open failed with exit ${exitCode}.`
-        : keptRunning
-          ? "App launch command started and is still running."
-          : "App launch command completed.",
+      message:
+        session.status === "failed"
+          ? `Open failed in terminal ${ptyInfo.id}.`
+          : keptRunning
+            ? `App launch command is running in terminal ${ptyInfo.id}.`
+            : detectedUrl
+              ? `App is reachable at ${detectedUrl}.`
+              : `App launch command completed in terminal ${ptyInfo.id}.`,
     }
   })
 }
@@ -3738,8 +3732,7 @@ export async function seedBrowserBaseUrlIfNeeded(input: {
   const existingUrl = session.invocations
     .slice()
     .reverse()
-    .find((invocation) => invocation.output?.previewUrl)
-    ?.output?.previewUrl
+    .find((invocation) => invocation.output?.previewUrl)?.output?.previewUrl
   if (existingUrl) return existingUrl
 
   const randomPort = await findOpenPort().catch(() => undefined)
diff --git a/packages/oneshot/src/orchestrator/history.ts b/packages/oneshot/src/orchestrator/history.ts
index 7e81fe3..894838c 100644
--- a/packages/oneshot/src/orchestrator/history.ts
+++ b/packages/oneshot/src/orchestrator/history.ts
@@ -179,7 +179,7 @@ function summarizeGraph(graph: Orchestrator.TaskGraph): {
   const total = tasks.length
   const pending = tasks.filter((task) => task.status === "pending").length
   const inProgress = tasks.filter((task) => task.status === "in_progress").length
-  const completed = tasks.filter((task) => task.status === "completed").length
+  const completed = tasks.filter((task) => task.status === "completed" || task.status === "skipped").length
   const failed = tasks.filter((task) => task.status === "failed" || task.status === "blocked").length
   const progress = total > 0 ? Math.round(((completed + failed) / total) * 100) : graph.progress
 
diff --git a/packages/oneshot/src/orchestrator/index.ts b/packages/oneshot/src/orchestrator/index.ts
index 09f7039..2d8a941 100644
--- a/packages/oneshot/src/orchestrator/index.ts
+++ b/packages/oneshot/src/orchestrator/index.ts
@@ -809,7 +809,7 @@ export async function updatePendingTask(
 export function getReadyTasks(graph: Orchestrator.TaskGraph): Orchestrator.Task[] {
   return Object.values(graph.tasks).filter((task) => {
     if (task.status !== "pending") return false
-    return task.dependencies.every((depId) => graph.tasks[depId]?.status === "completed")
+    return task.dependencies.every((depId) => isSuccessfulDependencyStatus(graph.tasks[depId]?.status))
   })
 }
 
@@ -825,7 +825,7 @@ export function getGraphSummary(graph: Orchestrator.TaskGraph): {
   const total = tasks.length
   const pending = tasks.filter((task) => task.status === "pending").length
   const inProgress = tasks.filter((task) => task.status === "in_progress").length
-  const completed = tasks.filter((task) => task.status === "completed").length
+  const completed = tasks.filter((task) => task.status === "completed" || task.status === "skipped").length
   const failed = tasks.filter((task) => task.status === "failed" || task.status === "blocked").length
   const progress = total > 0 ? Math.round(((completed + failed) / total) * 100) : graph.progress
 
@@ -839,6 +839,10 @@ export function getGraphSummary(graph: Orchestrator.TaskGraph): {
   }
 }
 
+function isSuccessfulDependencyStatus(status: Orchestrator.TaskStatus | undefined): boolean {
+  return status === "completed" || status === "skipped"
+}
+
 function normalizeProjectRoot(projectRoot: string | undefined): string {
   if (!projectRoot || projectRoot === "/") return process.cwd()
   // Accept both Unix (/) and Windows (C:\) absolute paths
diff --git a/packages/oneshot/src/orchestrator/runtime/activity.ts b/packages/oneshot/src/orchestrator/runtime/activity.ts
index 1886bd8..1e306e2 100644
--- a/packages/oneshot/src/orchestrator/runtime/activity.ts
+++ b/packages/oneshot/src/orchestrator/runtime/activity.ts
@@ -175,6 +175,9 @@ export async function markUnschedulableTasksActivity(
 }
 
 export async function markRunFailedActivity(input: OrchestrationWorkflowInput, reason = "Unknown failure"): Promise<void> {
+  abortRunExecution(input.runId)
+  await withProjectInstance(input.projectRoot, () => cancelRunSessions(input.runId)).catch(() => {})
+
   const fromStoreRun = getRun(input.runId)
   const fromStoreGraph = fromStoreRun ? getGraph(fromStoreRun.graphId) : undefined
   const parsedRun = Orchestrator.Run.safeParse(input.resume?.run)
@@ -212,6 +215,9 @@ export async function markRunFailedActivity(input: OrchestrationWorkflowInput, r
 }
 
 export async function markRunPausedActivity(input: OrchestrationWorkflowInput, reason = "Paused by orchestrator"): Promise<void> {
+  abortRunExecution(input.runId)
+  await withProjectInstance(input.projectRoot, () => cancelRunSessions(input.runId)).catch(() => {})
+
   const fromStoreRun = getRun(input.runId)
   const fromStoreGraph = fromStoreRun ? getGraph(fromStoreRun.graphId) : undefined
   const parsedRun = Orchestrator.Run.safeParse(input.resume?.run)
diff --git a/packages/oneshot/src/orchestrator/runtime/delegation.ts b/packages/oneshot/src/orchestrator/runtime/delegation.ts
index 7d26b4a..9f3a788 100644
--- a/packages/oneshot/src/orchestrator/runtime/delegation.ts
+++ b/packages/oneshot/src/orchestrator/runtime/delegation.ts
@@ -2,25 +2,25 @@ import { Orchestrator } from "../types"
 
 const AUTO_DELEGATION_MAX_DEPTH = parsePositiveInt(
   process.env.ONESHOT_AUTO_DELEGATION_MAX_DEPTH,
-  0,
+  1,
   0,
   10,
 )
 const AUTO_DELEGATION_MIN_COMPLEXITY = parsePositiveInt(
   process.env.ONESHOT_AUTO_DELEGATION_MIN_COMPLEXITY,
-  4,
+  3,
   1,
   5,
 )
 const AUTO_DELEGATION_MIN_FILES = parsePositiveInt(
   process.env.ONESHOT_AUTO_DELEGATION_MIN_FILES,
-  3,
+  2,
   1,
   32,
 )
 const NESTED_DELEGATION_MIN_COMPLEXITY = parsePositiveInt(
   process.env.ONESHOT_NESTED_DELEGATION_MIN_COMPLEXITY,
-  4,
+  3,
   1,
   5,
 )
diff --git a/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts b/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
index 48f2bb5..df990db 100644
--- a/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
+++ b/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
@@ -36,7 +36,7 @@ import {
   resolveTokenBudgetState,
   summarizePendingDependencyHealth,
 } from "./scheduling"
-import { evaluatePlanQuality } from "./planner-quality"
+import { evaluatePlanQuality, repairPlanForInitialParallelism } from "./planner-quality"
 import {
   abortMergeIfInProgress,
   cleanupTaskWorktree,
@@ -125,8 +125,17 @@ const PLANNER_MAX_ATTEMPTS = parsePlannerAttempts(process.env.ONESHOT_PLANNER_MA
 const BUDGET_GOVERNOR_ENABLED = parseBooleanFlag(process.env.ONESHOT_BUDGET_GOVERNOR_ENABLED, true)
 const ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS = parseBooleanFlag(
   process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS,
-  false,
+  true,
 )
+const ORCHESTRATOR_PLANNER_SYSTEM_PROMPT = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+  ? "Use the question tool for planner clarifications so questions surface in Mission Control. Ask 3-10 targeted clarifying questions before finalizing register_plan unless those decisions are already resolved."
+  : "Interactive planner questions are disabled in this orchestration flow. Do not ask user questions in plain text or via the question tool. Capture explicit assumptions, call register_plan, then stop."
+const ORCHESTRATOR_PLANNING_TASK_SYSTEM_PROMPT = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+  ? "This is a planning/spec task in orchestrator mode. Ask 3-10 targeted clarifying questions via the question tool before finalizing SPEC.md updates. Wait for answers, then incorporate them."
+  : "This is a planning/spec task in orchestrator mode with interactive questions disabled. Do not use the question tool. Capture explicit assumptions in SPEC.md and continue."
+const ORCHESTRATOR_EXECUTION_TASK_SYSTEM_PROMPT = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+  ? "If ambiguity blocks execution, ask 1-3 targeted clarifying questions via the question tool (not plain text) so they appear in Mission Control."
+  : "Interactive questions are disabled in this orchestration flow. If ambiguity blocks execution, state explicit assumptions in your summary and continue."
 const DEFAULT_MAX_REPLAN_CYCLES = parseMaxReplanCycles(process.env.ONESHOT_MAX_REPLAN_CYCLES)
 // NOTE: Keep this value in sync with LEGACY_DEFAULT_MAX_REPLAN_CYCLES in orchestrator/index.ts
 const LEGACY_DEFAULT_MAX_REPLAN_CYCLES = 3
@@ -146,6 +155,7 @@ const MERGE_INGEST_SELF_HEAL_EXACT_PATHS = new Set([".oneshot/oneshot.jsonc"])
 const MERGE_INGEST_SELF_HEAL_PATH_PATTERNS = [
   /(^|\/)__pycache__\//,
   /\.py[co]$/i,
+  /\.tsbuildinfo$/i,
   /(^|\/)\.pytest_cache\//,
   /(^|\/)\.mypy_cache\//,
   /(^|\/)\.ruff_cache\//,
@@ -217,6 +227,7 @@ const DEFAULT_VALIDATION_PLAN = [
   "Run project tests relevant to touched code paths.",
   "Report any regressions and propose remediation steps.",
 ]
+type ExecutionLane = "code" | "validate" | "deploy"
 const JSON_TOOL_UNAVAILABLE_MODEL_KEYS = new Set<string>()
 // ── LangGraph State ──────────────────────────────────────────────────────────
 
@@ -495,12 +506,18 @@ export async function getExecutionSnapshot(
     return !task.parentTaskId
   })
 
-  const readyTaskIds = scopedTasks
+  const readyTasks = scopedTasks
     .filter((task) => task.status === "pending")
-    .filter((task) => task.dependencies.every((depId) => graph.tasks[depId]?.status === "completed"))
-    .map((task) => task.id)
+    .filter((task) => task.dependencies.every((depId) => isSuccessfulDependencyStatus(graph.tasks[depId]?.status)))
+  const runningTasks = scopedTasks.filter((task) => task.status === "in_progress")
+  const laneReadyTasks = selectTemporalLaneCandidates({
+    graph,
+    readyTasks,
+    runningTasks,
+    scopeTasks: scopedTasks,
+  })
 
-  const rankedReadyTaskIds = rankReadyTasks(graph, readyTaskIds)
+  const rankedReadyTaskIds = rankReadyTasks(graph, laneReadyTasks.map((task) => task.id))
   const dispatchableReadyTaskIds = await resolveDispatchableTaskIDs(
     input.projectRoot,
     run.id,
@@ -530,7 +547,7 @@ export async function getExecutionSnapshot(
   const pendingDependencyHealth = summarizePendingDependencyHealth(graph, pendingTaskIDs)
   const pendingCount = pendingTaskIDs.length
   const inProgressCount = scopedTasks.filter((task) => task.status === "in_progress").length
-  const completedCount = scopedTasks.filter((task) => task.status === "completed").length
+  const completedCount = scopedTasks.filter((task) => task.status === "completed" || task.status === "skipped").length
   const failedCount = scopedTasks.filter((task) => task.status === "failed" || task.status === "blocked").length
 
   return {
@@ -1139,6 +1156,7 @@ async function runInteractivePlanning(input: {
             messageID: Identifier.ascending("message"),
             sessionID: session.id,
             agent: "orchestrator-planner",
+            system: ORCHESTRATOR_PLANNER_SYSTEM_PROMPT,
             model: {
               providerID: input.providerID,
               modelID: input.modelID,
@@ -1169,6 +1187,29 @@ async function runInteractivePlanning(input: {
                 : 0,
             })
             planFromPlanner = convertRegisteredPlanToGeneratedPlan(registeredPlan, input.rootPrompt)
+            const repair = repairPlanForInitialParallelism(
+              planFromPlanner.tasks.map((task) => ({
+                ...task,
+                delegationLevel: (task as any)._delegationLevel,
+              })),
+            )
+            if (repair.changed) {
+              const depsById = new Map(repair.tasks.map((task) => [task.id, task.dependencies]))
+              planFromPlanner.tasks = planFromPlanner.tasks.map((task) => {
+                const nextDeps = depsById.get(task.id)
+                if (!nextDeps) return task
+                return {
+                  ...task,
+                  dependencies: nextDeps,
+                }
+              })
+              if (repair.notes.length > 0) {
+                log.info("Planner plan auto-repaired after registration", {
+                  runId: input.run.id,
+                  notes: repair.notes,
+                })
+              }
+            }
             const quality = evaluatePlanQuality(
               planFromPlanner.tasks.map((task) => ({
                 id: task.id,
@@ -1513,14 +1554,19 @@ function buildInteractivePlannerPrompt(input: {
     ? input.scratchpadContext.slice(0, MAX_SCRATCHPAD_CONTEXT_CHARS)
     : ""
   const requiredSequenceStepTwo = interactiveQuestionsEnabled
-    ? "2. Ask clarifying questions (tool-only) only if needed."
+    ? "2. Ask 3-10 clarifying questions (tool-only) and wait for answers."
     : "2. Capture explicit assumptions (no user questions in this flow)."
+  const firstTurnConstraint = interactiveQuestionsEnabled
+    ? "- Your first turn must either ask required clarifying questions via `question` tool or call `register_plan` quickly when scope is already clear."
+    : "- Your first turn must call `register_plan` quickly after capturing assumptions; do not ask user questions."
   const stepTwoGuidance = interactiveQuestionsEnabled
     ? `### Step 2: Ask Clarifying Questions
-- Use the \`question\` tool only when ambiguity blocks top-level decomposition.
-- Ask at most 1 concise question.
+- Use the \`question\` tool only so prompts flow to Mission Control's escalation panel.
+- Ask 3-10 concise, decision-oriented questions before finalizing the plan.
+- Cover key planning unknowns (scope boundaries, constraints, integration assumptions, validation/deploy expectations, and out-of-scope limits).
+- If you recommend an option, make the recommended choice first and suffix "(Recommended)".
 - Never ask user questions in plain assistant text.
-- If unanswered or ambiguity remains, continue with explicit assumptions and register a plan.`
+- Wait for answers, then continue. If ambiguity remains, capture explicit assumptions.`
     : `### Step 2: Capture Assumptions
 - Interactive questions are disabled in this orchestrator planning flow.
 - Do NOT use the \`question\` tool.
@@ -1558,6 +1604,9 @@ ${stepTwoGuidance}
 - Do NOT design full low-level implementation details here.
 - Focus on top-level workstreams, ordering, and delegation boundaries.
 - Ensure first task is planning/spec enhancement and last task is validation.
+- Quality gate shape: for 4+ execution tasks, at least 2 implementation/integration tasks must be runnable immediately after planning.
+- Prefer fan-out/fan-in dependency shape: planning -> parallel subsystem tasks -> integration.
+- Avoid artificial blockers (for example, do not serialize auth/UI behind full DB wiring when stubs/interfaces can unblock parallel work).
 
 ### Step 4: Call register_plan
 - Provide: \`{ reasoning, successDefinition, tasks, validationPlan }\`
@@ -1566,6 +1615,11 @@ ${stepTwoGuidance}
 - For implementation/validation tasks, include \`verificationSpec\` with deterministic checks whenever possible.
 - If set, \`priority\` and \`complexity\` must be integers from 1 to 5.
 - Use 5-36 top-level tasks depending on scope with correct dependency chains.
+- Before calling register_plan, run this self-check:
+  1) If execution tasks >= 4, at least 2 are runnable immediately after planning.
+  2) If execution tasks >= 6, dependency graph is not near-linear.
+  3) If execution tasks >= 6, include at least one \`delegationLevel: "sub-orchestrator"\` task.
+  4) If execution tasks >= 10, include at least two \`delegationLevel: "sub-orchestrator"\` tasks.
 
 ## Task Design Rules
 - Root tasks should be coarse but executable (roughly 20-60 min each after decomposition).
@@ -1590,7 +1644,7 @@ ${contextSnippet ? `## Initial Project Context\n${contextSnippet}\n` : "## Note\
 ${scratchpadSnippet ? `## User / Supervisor Guidance\n${scratchpadSnippet}\n` : ""}
 
 ## Hard Constraints
-- Your first turn must call \`register_plan\` quickly.
+${firstTurnConstraint}
 - Do not do broad codebase research by default.
 - Do not create mega-tasks that implement entire systems.
 - Do not write SPEC.md in this root planner phase.
@@ -1607,15 +1661,21 @@ ${feedback.trim().slice(0, 1_600)}
 
 `
     : ""
+  const recoveryStepOne = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+    ? `1) Ask targeted clarifying questions via the \`question\` tool when needed (target 3-10 total planner questions in this session).
+   - If you already asked 3-10 useful questions, proceed with explicit assumptions for any remaining ambiguity.`
+    : "1) Do NOT ask user clarifying questions (plain text or via `question` tool). Capture explicit assumptions for any remaining ambiguity."
   return `You did not complete planning correctly in the previous turn.
 
 Continue this same planner session and do exactly this now:
-${feedbackSnippet}1) Do NOT ask user questions; proceed with explicit assumptions.
+${feedbackSnippet}${recoveryStepOne}
 2) Reduce unnecessary dependency chains:
    - Keep only true blocking dependencies.
    - Ensure at least 2 implementation/integration tasks can start right after planning when scope has 4+ execution tasks.
    - Avoid near-linear chains unless the work is truly sequential.
-3) For broad scope (8+ execution tasks), include at least one task with \`delegationLevel: "sub-orchestrator"\`.
+   - Use stubs/mocks for early parallel work and defer full cross-system wiring to integration tasks.
+3) For broad scope (6+ execution tasks), include at least one task with \`delegationLevel: "sub-orchestrator"\`.
+   - For very large scope (10+ execution tasks), include at least two such tasks.
 4) Do NOT write SPEC.md in this root planner phase.
 5) Call register_plan with schema-valid arguments for a top-level task graph.
 6) Stop after register_plan.
@@ -1702,7 +1762,7 @@ async function executionNode(state: EngineState): Promise<Partial<EngineState>>
     const openSlots = Math.max(0, activeParallelism - running.size)
 
     if (openSlots > 0 && ready.length > 0) {
-      const lane = isValidationTask(ready[0]) ? "validation" : "build"
+      const lane = resolveTaskExecutionLaneInGraph(graph, ready[0])
       log.info("Dispatching ready tasks", {
         runId: run.id,
         lane,
@@ -3132,6 +3192,84 @@ Decide: should we replan? If so, what tasks to add, retry, or skip?`,
 // PHASE 4: Hierarchical task injection into live DAG
 // ═══════════════════════════════════════════════════════════════════════════════
 
+function linkTaskDependency(graph: Orchestrator.TaskGraph, dependencyID: string, dependentID: string): void {
+  const dependencyTask = graph.tasks[dependencyID]
+  const dependentTask = graph.tasks[dependentID]
+  if (!dependencyTask || !dependentTask) return
+  if (!dependentTask.dependencies.includes(dependencyID)) {
+    dependentTask.dependencies.push(dependencyID)
+  }
+  if (!dependencyTask.dependents.includes(dependentID)) {
+    dependencyTask.dependents.push(dependentID)
+  }
+  const adjList = graph.adjacencyList[dependencyID] ?? []
+  if (!adjList.includes(dependentID)) adjList.push(dependentID)
+  graph.adjacencyList[dependencyID] = adjList
+}
+
+function enforceResolvedDependenciesForLane(input: {
+  graph: Orchestrator.TaskGraph
+  taskID: string
+  lane: ExecutionLane
+  dependencies: string[]
+}): string[] {
+  const validationTaskIDs = Object.values(input.graph.tasks)
+    .filter((task) => resolveTaskExecutionLaneInGraph(input.graph, task) === "validate")
+    .map((task) => task.id)
+  const validationTaskIDSet = new Set(validationTaskIDs)
+  const deployTaskIDs = Object.values(input.graph.tasks)
+    .filter((task) => resolveTaskExecutionLaneInGraph(input.graph, task) === "deploy")
+    .map((task) => task.id)
+  const deployTaskIDSet = new Set(deployTaskIDs)
+  const codeTaskIDs = Object.values(input.graph.tasks)
+    .map((task) => task.id)
+    .filter((taskID) => !validationTaskIDSet.has(taskID))
+    .filter((taskID) => !deployTaskIDSet.has(taskID))
+
+  let deps = uniqueNonEmptyStrings(input.dependencies.filter((depID) => depID !== input.taskID))
+  if (input.lane === "validate") {
+    deps = deps.filter((depID) => !deployTaskIDSet.has(depID))
+    for (const codeTaskID of codeTaskIDs) {
+      if (codeTaskID === input.taskID || deps.includes(codeTaskID)) continue
+      deps.push(codeTaskID)
+    }
+  } else if (input.lane === "deploy") {
+    for (const codeTaskID of codeTaskIDs) {
+      if (codeTaskID === input.taskID || deps.includes(codeTaskID)) continue
+      deps.push(codeTaskID)
+    }
+    for (const validationTaskID of validationTaskIDs) {
+      if (validationTaskID === input.taskID || deps.includes(validationTaskID)) continue
+      deps.push(validationTaskID)
+    }
+  } else {
+    deps = deps.filter((depID) => !validationTaskIDSet.has(depID) && !deployTaskIDSet.has(depID))
+  }
+
+  return deps
+}
+
+function propagateInjectedTaskDependencies(graph: Orchestrator.TaskGraph, injectedTask: Orchestrator.Task): void {
+  const injectedLane = resolveTaskExecutionLaneInGraph(graph, injectedTask)
+  if (injectedLane === "code") {
+    for (const task of Object.values(graph.tasks)) {
+      if (task.id === injectedTask.id) continue
+      if (task.status === "completed" || task.status === "skipped") continue
+      const lane = resolveTaskExecutionLaneInGraph(graph, task)
+      if (lane !== "validate" && lane !== "deploy") continue
+      linkTaskDependency(graph, injectedTask.id, task.id)
+    }
+  } else if (injectedLane === "validate") {
+    for (const task of Object.values(graph.tasks)) {
+      if (task.id === injectedTask.id) continue
+      if (task.status === "completed" || task.status === "skipped") continue
+      const lane = resolveTaskExecutionLaneInGraph(graph, task)
+      if (lane !== "deploy") continue
+      linkTaskDependency(graph, injectedTask.id, task.id)
+    }
+  }
+}
+
 function injectTasksIntoGraph(graph: Orchestrator.TaskGraph, newTasks: Orchestrator.ReplanDecision["tasksToAdd"]): number {
   const now = Date.now()
   const existingIds = new Set(Object.keys(graph.tasks))
@@ -3153,9 +3291,15 @@ function injectTasksIntoGraph(graph: Orchestrator.TaskGraph, newTasks: Orchestra
 
     const id = uniqueTaskID(rawTask.id, existingIds)
     existingIds.add(id)
+    const workflowPhase = resolveTaskExecutionLane({
+      id,
+      name: rawTask.name,
+      description: rawTask.description,
+      kind: rawTask.kind,
+    })
 
     // Resolve dependencies — only link to tasks that exist in the graph
-    const resolvedDeps = rawTask.dependencies
+    let resolvedDeps = rawTask.dependencies
       .map((dep) => {
         if (graph.tasks[dep]) return dep
         // Try name-based match
@@ -3163,6 +3307,12 @@ function injectTasksIntoGraph(graph: Orchestrator.TaskGraph, newTasks: Orchestra
         return byName?.id
       })
       .filter((dep): dep is string => !!dep)
+    resolvedDeps = enforceResolvedDependenciesForLane({
+      graph,
+      taskID: id,
+      lane: workflowPhase,
+      dependencies: resolvedDeps,
+    })
 
     const task: Orchestrator.Task = {
       id,
@@ -3181,6 +3331,7 @@ function injectTasksIntoGraph(graph: Orchestrator.TaskGraph, newTasks: Orchestra
       metadata: {
         acceptanceCriteria: rawTask.acceptanceCriteria,
         files: rawTask.files,
+        workflowPhase,
         ...(rawTask.verificationSpec ? { verificationSpec: rawTask.verificationSpec } : {}),
         injectedByReplan: graph.replanCount + 1,
       },
@@ -3193,14 +3344,9 @@ function injectTasksIntoGraph(graph: Orchestrator.TaskGraph, newTasks: Orchestra
 
     // Update upstream dependents
     for (const depId of resolvedDeps) {
-      const dep = graph.tasks[depId]
-      if (dep && !dep.dependents.includes(id)) {
-        dep.dependents.push(id)
-      }
-      const adjList = graph.adjacencyList[depId] ?? []
-      if (!adjList.includes(id)) adjList.push(id)
-      graph.adjacencyList[depId] = adjList
+      linkTaskDependency(graph, depId, id)
     }
+    propagateInjectedTaskDependencies(graph, task)
 
     emitTaskUpdated(task)
     injectedCount += 1
@@ -3208,6 +3354,7 @@ function injectTasksIntoGraph(graph: Orchestrator.TaskGraph, newTasks: Orchestra
       taskId: id,
       taskName: rawTask.name,
       kind: rawTask.kind ?? "remediation",
+      workflowPhase,
       dependencies: resolvedDeps,
     })
   }
@@ -3322,7 +3469,7 @@ async function executeTask(state: EngineState, task: Orchestrator.Task): Promise
     })
   } catch (error) {
     const currentRunStatus = getRun(run.id)?.status
-    if (taskAbortSignal?.aborted || currentRunStatus === "paused" || currentRunStatus === "killed" || isAbortError(error)) {
+    if (taskAbortSignal?.aborted || currentRunStatus !== "active" || isAbortError(error)) {
       const supervisorTerminatedTask = typeof task.error === "string"
         && (/^Terminated by supervisor:/i.test(task.error) || /^Terminated:\s/i.test(task.error))
       if (supervisorTerminatedTask) {
@@ -3648,6 +3795,8 @@ async function runTaskSession(input: {
     totalOutputTokens += worker.outputTokens
     summary = worker.summary
 
+    assertRunStillActive(input.run.id, "worktree commit")
+
     if (isPlanningTask(input.task)) {
       const specPath = join(workspace.sessionDirectory, "SPEC.md")
       const specExists = await stat(specPath)
@@ -3666,6 +3815,7 @@ async function runTaskSession(input: {
     })
 
     if (commit.branchAheadCount > 0) {
+      assertRunStillActive(input.run.id, "merge ingest")
       const ingestStartedAt = Date.now()
       try {
         const ingest = await ingestTaskBranchWithDedicatedAgent({
@@ -3733,6 +3883,13 @@ async function runTaskSession(input: {
   }
 }
 
+function assertRunStillActive(runId: string, phase: string): void {
+  const status = getRun(runId)?.status
+  if (status !== "active") {
+    throw new Error(`Run cancelled before ${phase}`)
+  }
+}
+
 async function runTaskPromptInDirectory(input: {
   run: Orchestrator.Run
   task: Orchestrator.Task
@@ -3789,10 +3946,12 @@ async function runTaskPromptInDirectory(input: {
 
           const useMergeSpecialist = shouldRouteTaskToMergeAgent(input.task)
           const prompt = useMergeSpecialist ? buildMergeRemediationPrompt(input) : buildTaskPrompt(input)
+          const taskSystemPrompt = useMergeSpecialist ? undefined : buildTaskExecutionSystemPrompt(input.task)
           const promptPromise = SessionPrompt.prompt({
             messageID: Identifier.ascending("message"),
             sessionID: session.id,
             agent: useMergeSpecialist ? "orchestrator-merge" : "build",
+            ...(taskSystemPrompt ? { system: taskSystemPrompt } : {}),
             ...(useMergeSpecialist ? { system: MERGE_INGEST_SYSTEM_PROMPT } : {}),
             model: {
               providerID: input.providerID,
@@ -4329,7 +4488,7 @@ async function executeSubOrchestrator(state: EngineState, task: Orchestrator.Tas
     const readySubTasks = subTaskIds
       .map((id) => graph.tasks[id])
       .filter((candidate): candidate is Orchestrator.Task => !!candidate && candidate.status === "pending")
-      .filter((candidate) => candidate.dependencies.every((depId) => graph.tasks[depId]?.status === "completed"))
+      .filter((candidate) => candidate.dependencies.every((depId) => isSuccessfulDependencyStatus(graph.tasks[depId]?.status)))
       .filter((candidate) => !subRunning.has(candidate.id))
 
     const budgetState = resolveTokenBudgetState({
@@ -4490,6 +4649,7 @@ async function planSubOrchestratorSubtasks(state: EngineState, task: Orchestrato
           messageID: Identifier.ascending("message"),
           sessionID: subPlannerSession.id,
           agent: "orchestrator-planner",
+          system: ORCHESTRATOR_PLANNER_SYSTEM_PROMPT,
           model: { providerID: subOrchestratorModel.providerID, modelID: subOrchestratorModel.modelID },
           parts: [{ type: "text", text: subPrompt }],
         })
@@ -4639,6 +4799,9 @@ function buildSubOrchestratorPrompt(input: {
   const researchSnippet = input.researchContext
     ? JSON.stringify(input.researchContext, null, 2).slice(0, 3_000)
     : ""
+  const subPlannerQuestionStep = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+    ? "2. Ask clarifying questions via the `question` tool when subsystem scope/contracts are ambiguous (1-5 targeted questions). If clarity is sufficient, proceed with explicit assumptions."
+    : "2. Do NOT ask user clarifying questions (plain text or `question` tool). If scope/contracts are ambiguous, proceed with explicit assumptions."
 
   return `You are a sub-orchestrator planner. You are planning a SUBSET of a larger orchestration. Your scope is narrower — you only plan for the specific subsystem described below.
 
@@ -4651,7 +4814,7 @@ ${input.taskDescription}
 
 ## Instructions
 1. Research the relevant parts of the codebase using your tools
-2. Do NOT ask user clarifying questions in this orchestrator flow; if scope is ambiguous, proceed with explicit assumptions
+${subPlannerQuestionStep}
 3. Ensure \`SPEC.md\` exists for shared context:
    - If it exists, update/append details specific to YOUR subsystem.
    - If it is missing, create it with the subsystem architecture and interfaces.
@@ -4750,6 +4913,11 @@ Commands Run:
 \`\`\``
 }
 
+function buildTaskExecutionSystemPrompt(task: Orchestrator.Task): string {
+  if (isPlanningTask(task)) return ORCHESTRATOR_PLANNING_TASK_SYSTEM_PROMPT
+  return ORCHESTRATOR_EXECUTION_TASK_SYSTEM_PROMPT
+}
+
 function buildTaskPrompt(input: {
   rootPrompt: string
   task: Orchestrator.Task
@@ -4803,9 +4971,16 @@ ${formatVerificationSpecForPrompt(verificationSpec)}
 ${formatVerificationFailureFeedbackForPrompt(verificationFeedback)}
 `
     : ""
+  const planningQuestionGuidance = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+    ? "- Before finalizing SPEC.md, ask 3-10 targeted clarifying questions via the `question` tool so they appear in Mission Control's escalation panel.\n- Wait for user answers, then incorporate them into the spec decisions."
+    : "- Interactive questions are disabled in this orchestration flow.\n- Do NOT ask user questions in plain text and do NOT use the `question` tool.\n- Capture explicit assumptions in SPEC.md and continue."
+  const executionQuestionGuidance = ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
+    ? "- If ambiguity blocks implementation, ask 1-3 targeted clarifying questions via the `question` tool (not plain assistant text)."
+    : "- Interactive questions are disabled in this orchestration flow. If ambiguity blocks implementation, capture explicit assumptions in your summary and continue."
 
   const outputRequirements = planningTask
     ? `- Ensure there is exactly one shared spec file: \`SPEC.md\` at the project root.
+${planningQuestionGuidance}
 - If \`SPEC.md\` already exists, read it carefully, then UPDATE and REFINE it in-place with:
   - More specific implementation details and exact file paths
   - Complete interface definitions with all method signatures and type parameters
@@ -4844,6 +5019,7 @@ ${formatVerificationFailureFeedbackForPrompt(verificationFeedback)}
 - Import shared types, interfaces, and constants from the files defined in the spec document.
 - If work splits cleanly, delegate via subagents and batch independent calls where possible.
 - Only delegate codebase investigation on demand when uncertainty blocks progress, and use Task \`subagent_type: "explore"\` (never \`"research"\`).
+${executionQuestionGuidance}
 - Write any significant discoveries or decisions to stdout for other agents (e.g., "API uses v3, not v2").
 - Run relevant validation commands for your changes.
 - End with a concise "## Summary" section containing:
@@ -4930,6 +5106,7 @@ function materializePlanIntoGraph(graph: Orchestrator.TaskGraph, plan: Generated
   for (const rawTask of plan.tasks) {
     const id = uniqueTaskID(rawTask.id, normalizedIDs)
     normalizedIDs.add(id)
+    const workflowPhase = resolveTaskExecutionLane(rawTask)
     tasks[id] = {
       id,
       name: rawTask.name,
@@ -4954,6 +5131,7 @@ function materializePlanIntoGraph(graph: Orchestrator.TaskGraph, plan: Generated
         validationFocus: rawTask.acceptanceCriteria.length > 0
           ? rawTask.acceptanceCriteria
           : (plan.validationPlan.length > 0 ? plan.validationPlan : DEFAULT_VALIDATION_PLAN),
+        workflowPhase,
         ...(rawTask.verificationSpec ? { verificationSpec: rawTask.verificationSpec } : {}),
         // Carry over delegation level from interactive planner (if set)
         ...((rawTask as any)._delegationLevel === "sub-orchestrator"
@@ -5233,12 +5411,41 @@ function ensureValidationTask(tasks: PlanTask[]): PlanTask[] {
 
 function enforceValidationDependencies(tasks: PlanTask[]): PlanTask[] {
   const planningTaskID = tasks.find((task) => isPlanningTask(task))?.id
+  const validationTaskIDs = tasks.filter((task) => resolveTaskExecutionLane(task) === "validate").map((task) => task.id)
+  const validationTaskIDSet = new Set(validationTaskIDs)
+  const deployTaskIDs = tasks.filter((task) => resolveTaskExecutionLane(task) === "deploy").map((task) => task.id)
+  const deployTaskIDSet = new Set(deployTaskIDs)
+  const codeTaskIDs = tasks
+    .filter((task) => !validationTaskIDSet.has(task.id))
+    .filter((task) => !deployTaskIDSet.has(task.id))
+    .map((task) => task.id)
 
   return tasks.map((task) => {
-    const deps = uniqueNonEmptyStrings(task.dependencies.filter((dep) => dep !== task.id))
-    if (isValidationTask(task) && planningTaskID && task.id !== planningTaskID && !deps.includes(planningTaskID)) {
+    let deps = uniqueNonEmptyStrings(task.dependencies.filter((dep) => dep !== task.id))
+    if (planningTaskID && task.id !== planningTaskID && !deps.includes(planningTaskID)) {
       deps.unshift(planningTaskID)
     }
+
+    const lane = resolveTaskExecutionLane(task)
+    if (lane === "validate") {
+      deps = deps.filter((depID) => !deployTaskIDSet.has(depID))
+      for (const codeTaskID of codeTaskIDs) {
+        if (codeTaskID === task.id || deps.includes(codeTaskID)) continue
+        deps.push(codeTaskID)
+      }
+    } else if (lane === "deploy") {
+      for (const codeTaskID of codeTaskIDs) {
+        if (codeTaskID === task.id || deps.includes(codeTaskID)) continue
+        deps.push(codeTaskID)
+      }
+      for (const validationTaskID of validationTaskIDs) {
+        if (validationTaskID === task.id || deps.includes(validationTaskID)) continue
+        deps.push(validationTaskID)
+      }
+    } else {
+      deps = deps.filter((depID) => !validationTaskIDSet.has(depID) && !deployTaskIDSet.has(depID))
+    }
+
     return {
       ...task,
       dependencies: deps,
@@ -5268,6 +5475,8 @@ type TaskLike = {
   kind?: Orchestrator.TaskKind
 }
 
+type TaskWithDescription = TaskLike & { description?: string }
+
 function isPlanningTask(task: TaskLike): boolean {
   if (task.kind === "planning") return true
   return /\bplan(ning)?\b|\bspec\b/.test(`${task.id} ${task.name}`.toLowerCase())
@@ -5280,6 +5489,52 @@ function isValidationTask(task: TaskLike): boolean {
   )
 }
 
+function isDeployTask(task: TaskWithDescription): boolean {
+  const id = task.id.trim().toLowerCase()
+  const kind = (task.kind ?? "").trim().toLowerCase()
+  const name = task.name.trim().toLowerCase()
+  const description = (task.description ?? "").trim().toLowerCase()
+  const deploySignal = /\bdeploy(ment)?\b|\brelease\b|\brollout\b/
+
+  if (id.startsWith("deploy-remediation-cycle-")) return true
+  if (kind === "local-deploy" || kind === "deploy") return true
+  if (deploySignal.test(`${id} ${name}`) && kind === "remediation") return true
+  if (name.includes("deploy remediation")) return true
+  if (description.includes("deploy verification failed during orchestration finalization")) return true
+  if (description.includes("queued remediation on deploy page")) return true
+  if (deploySignal.test(`${id} ${name}`) && kind !== "planning" && kind !== "research" && kind !== "validation") return true
+  return false
+}
+
+function resolveTaskExecutionLane(task: TaskWithDescription): ExecutionLane {
+  if (isDeployTask(task)) return "deploy"
+  if (isValidationTask(task)) return "validate"
+  return "code"
+}
+
+function resolveTaskExecutionLaneInGraph(
+  graph: Orchestrator.TaskGraph,
+  task: Orchestrator.Task,
+): ExecutionLane {
+  let lane = resolveTaskExecutionLane(task)
+  let parentTaskID = task.parentTaskId
+  const visited = new Set<string>()
+
+  while (parentTaskID && !visited.has(parentTaskID)) {
+    visited.add(parentTaskID)
+    const parent = graph.tasks[parentTaskID]
+    if (!parent) break
+    lane = resolveTaskExecutionLane(parent)
+    parentTaskID = parent.parentTaskId
+  }
+
+  return lane
+}
+
+function isTaskSuccessfulTerminal(status: Orchestrator.TaskStatus): boolean {
+  return status === "completed" || status === "skipped"
+}
+
 function isResearchTask(task: TaskLike): boolean {
   if (task.kind === "research") return true
   return /\bresearch\b|\bcodebase\b|\bexplore\b|\binvestigat(e|ion)\b|\bdiscovery\b/.test(
@@ -5287,13 +5542,13 @@ function isResearchTask(task: TaskLike): boolean {
   )
 }
 
-function looksLikeImplementationSetupTask(task: TaskLike & { description?: string }): boolean {
+function looksLikeImplementationSetupTask(task: TaskWithDescription): boolean {
   return /\b(scaffold|bootstrap|setup|set up|initialize|initialise|init|create (project|repo|application)|vite|install|dependencies?|package\.json|index\.html|dev\s*server|npm|pnpm|yarn|bun)\b/.test(
     `${task.id} ${task.name} ${task.description ?? ""}`.toLowerCase(),
   )
 }
 
-function looksLikeSpecTask(task: TaskLike & { description?: string }): boolean {
+function looksLikeSpecTask(task: TaskWithDescription): boolean {
   return /\bspec\.md\b|\bspecification\b|\barchitecture\b/.test(
     `${task.id} ${task.name} ${task.description ?? ""}`.toLowerCase(),
   )
@@ -5303,6 +5558,58 @@ function looksLikeSpecTask(task: TaskLike & { description?: string }): boolean {
 // Scheduling
 // ═══════════════════════════════════════════════════════════════════════════════
 
+function isSuccessfulDependencyStatus(status: Orchestrator.TaskStatus | undefined): boolean {
+  return status === "completed" || status === "skipped"
+}
+
+function isLaneCompleteForScope(
+  graph: Orchestrator.TaskGraph,
+  scopeTasks: Orchestrator.Task[],
+  lane: ExecutionLane,
+): boolean {
+  const laneTasks = scopeTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === lane)
+  if (laneTasks.length === 0) return true
+  return laneTasks.every((task) => isTaskSuccessfulTerminal(task.status))
+}
+
+function selectTemporalLaneCandidates(input: {
+  graph: Orchestrator.TaskGraph
+  readyTasks: Orchestrator.Task[]
+  runningTasks: Orchestrator.Task[]
+  scopeTasks: Orchestrator.Task[]
+}): Orchestrator.Task[] {
+  const { graph, readyTasks, runningTasks, scopeTasks } = input
+  if (readyTasks.length === 0) return readyTasks
+
+  const hasRunningDeploy = runningTasks.some((task) => resolveTaskExecutionLaneInGraph(graph, task) === "deploy")
+  const hasRunningValidate = runningTasks.some((task) => resolveTaskExecutionLaneInGraph(graph, task) === "validate")
+  const hasRunningCode = runningTasks.some((task) => resolveTaskExecutionLaneInGraph(graph, task) === "code")
+
+  if (hasRunningDeploy) {
+    return readyTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "deploy")
+  }
+  if (hasRunningValidate) {
+    return readyTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "validate")
+  }
+  if (hasRunningCode) {
+    return readyTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "code")
+  }
+
+  const codePhaseComplete = isLaneCompleteForScope(graph, scopeTasks, "code")
+  if (!codePhaseComplete) {
+    return readyTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "code")
+  }
+
+  const validatePhaseComplete = isLaneCompleteForScope(graph, scopeTasks, "validate")
+  if (!validatePhaseComplete) {
+    return readyTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "validate")
+  }
+
+  const deployReady = readyTasks.filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "deploy")
+  if (deployReady.length > 0) return deployReady
+  return readyTasks
+}
+
 function computeGraphProgress(graph: Orchestrator.TaskGraph): number {
   const tasks = Object.values(graph.tasks)
   if (tasks.length === 0) return 0
@@ -5316,7 +5623,7 @@ function getReadyTasks(graph: Orchestrator.TaskGraph): Orchestrator.Task[] {
   const tasks = Object.values(graph.tasks)
   return tasks.filter((task) => {
     if (task.status !== "pending") return false
-    return task.dependencies.every((depId) => graph.tasks[depId]?.status === "completed")
+    return task.dependencies.every((depId) => isSuccessfulDependencyStatus(graph.tasks[depId]?.status))
   })
 }
 
@@ -5327,19 +5634,13 @@ function selectSchedulableReadyTasks(graph: Orchestrator.TaskGraph, runningTaskI
   const runningTasks = runningTaskIDs
     .map((taskID) => graph.tasks[taskID])
     .filter((task): task is Orchestrator.Task => !!task)
-
-  const hasRunningValidation = runningTasks.some((task) => isValidationTask(task))
-  const hasRunningBuild = runningTasks.some((task) => !isValidationTask(task))
-
-  let candidates: Orchestrator.Task[]
-  if (hasRunningValidation) {
-    candidates = ready.filter((task) => isValidationTask(task))
-  } else if (hasRunningBuild) {
-    candidates = ready.filter((task) => !isValidationTask(task))
-  } else {
-    const readyBuildTasks = ready.filter((task) => !isValidationTask(task))
-    candidates = readyBuildTasks.length > 0 ? readyBuildTasks : ready.filter((task) => isValidationTask(task))
-  }
+  const scopeTasks = Object.values(graph.tasks)
+  const candidates = selectTemporalLaneCandidates({
+    graph,
+    readyTasks: ready,
+    runningTasks,
+    scopeTasks,
+  })
 
   const ranked = rankReadyTasks(graph, candidates.map((task) => task.id))
   return ranked
@@ -5512,6 +5813,22 @@ function sanitizeReplanDecision(
   decision: Orchestrator.ReplanDecision,
   options: { maxRetries: number; maxSkips: number },
 ): Orchestrator.ReplanDecision {
+  const existingTasks = Object.values(graph.tasks)
+  const codePhaseComplete = isLaneCompleteForScope(graph, existingTasks, "code")
+  const validatePhaseComplete = isLaneCompleteForScope(graph, existingTasks, "validate")
+  const validationTaskIDs = existingTasks
+    .filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "validate")
+    .map((task) => task.id)
+  const validationTaskIDSet = new Set(validationTaskIDs)
+  const deployTaskIDs = existingTasks
+    .filter((task) => resolveTaskExecutionLaneInGraph(graph, task) === "deploy")
+    .map((task) => task.id)
+  const deployTaskIDSet = new Set(deployTaskIDs)
+  const codeTaskIDs = existingTasks
+    .filter((task) => !validationTaskIDSet.has(task.id))
+    .filter((task) => !deployTaskIDSet.has(task.id))
+    .map((task) => task.id)
+
   const retryableStatuses = new Set<Orchestrator.TaskStatus>(["failed", "blocked", "skipped"])
   const retryIDs = new Set<string>()
   const tasksToRetry: Orchestrator.ReplanDecision["tasksToRetry"] = []
@@ -5553,13 +5870,41 @@ function sanitizeReplanDecision(
   const tasksToAdd: Orchestrator.ReplanDecision["tasksToAdd"] = []
   for (const candidate of decision.tasksToAdd) {
     if (!candidate?.name?.trim() || !candidate.description?.trim()) continue
+    const candidateLane = resolveTaskExecutionLane({
+      id: candidate.id,
+      name: candidate.name,
+      description: candidate.description,
+      kind: candidate.kind,
+    })
+    if (!codePhaseComplete && (candidateLane === "validate" || candidateLane === "deploy")) continue
+    if (!validatePhaseComplete && candidateLane === "deploy") continue
+
     const signature = taskSemanticSignature(candidate)
     if (activeSignatures.has(signature) || injectedSignatures.has(signature)) continue
     injectedSignatures.add(signature)
+
+    let normalizedDeps = uniqueNonEmptyStrings(candidate.dependencies ?? [])
+    if (candidateLane === "validate") {
+      normalizedDeps = normalizedDeps.filter((depID) => !deployTaskIDSet.has(depID))
+      for (const codeTaskID of codeTaskIDs) {
+        if (normalizedDeps.includes(codeTaskID)) continue
+        normalizedDeps.push(codeTaskID)
+      }
+    } else if (candidateLane === "deploy") {
+      for (const codeTaskID of codeTaskIDs) {
+        if (!normalizedDeps.includes(codeTaskID)) normalizedDeps.push(codeTaskID)
+      }
+      for (const validationTaskID of validationTaskIDs) {
+        if (!normalizedDeps.includes(validationTaskID)) normalizedDeps.push(validationTaskID)
+      }
+    } else {
+      normalizedDeps = normalizedDeps.filter((depID) => !validationTaskIDSet.has(depID) && !deployTaskIDSet.has(depID))
+    }
+
     tasksToAdd.push({
       ...candidate,
       id: candidate.id.trim() || `replan-${ulid().toLowerCase()}`,
-      dependencies: uniqueNonEmptyStrings(candidate.dependencies ?? []),
+      dependencies: normalizedDeps,
       acceptanceCriteria: uniqueNonEmptyStrings(candidate.acceptanceCriteria ?? []),
       files: uniqueNonEmptyStrings(candidate.files ?? []),
       verificationSpec: coerceVerificationSpec((candidate as any).verificationSpec),
@@ -5665,6 +6010,23 @@ export const ReplanDecisionInternals = {
   replanCorpusLikelyTargetsTask,
 }
 
+export const PlanningInternals = {
+  normalizeGeneratedPlanForTesting(plan: GeneratedPlan, rootPrompt: string): GeneratedPlan {
+    return normalizeGeneratedPlan(plan, rootPrompt)
+  },
+}
+
+export const SchedulingInternals = {
+  selectTemporalLaneCandidatesForTesting(input: {
+    graph: Orchestrator.TaskGraph
+    readyTasks: Orchestrator.Task[]
+    runningTasks: Orchestrator.Task[]
+    scopeTasks: Orchestrator.Task[]
+  }): Orchestrator.Task[] {
+    return selectTemporalLaneCandidates(input)
+  },
+}
+
 function normalizeTaskStateInvariants(graph: Orchestrator.TaskGraph): number {
   const now = Date.now()
   const knownTaskIDs = new Set(Object.keys(graph.tasks))
diff --git a/packages/oneshot/src/orchestrator/runtime/langgraph/prompt-builders.ts b/packages/oneshot/src/orchestrator/runtime/langgraph/prompt-builders.ts
index 9c9339b..b91f2bc 100644
--- a/packages/oneshot/src/orchestrator/runtime/langgraph/prompt-builders.ts
+++ b/packages/oneshot/src/orchestrator/runtime/langgraph/prompt-builders.ts
@@ -29,14 +29,19 @@ export function createPromptBuilders(deps: PromptBuildersDependencies) {
       ? input.scratchpadContext.slice(0, deps.maxScratchpadContextChars)
       : ""
     const requiredSequenceStepTwo = interactiveQuestionsEnabled
-      ? "2. Ask clarifying questions (tool-only) only if needed."
+      ? "2. Ask 3-10 clarifying questions (tool-only) and wait for answers."
       : "2. Capture explicit assumptions (no user questions in this flow)."
+    const firstTurnConstraint = interactiveQuestionsEnabled
+      ? "- Your first turn must either ask required clarifying questions via `question` tool or call `register_plan` quickly when scope is already clear."
+      : "- Your first turn must call `register_plan` quickly after capturing assumptions; do not ask user questions."
     const stepTwoGuidance = interactiveQuestionsEnabled
       ? `### Step 2: Ask Clarifying Questions
-- Use the \`question\` tool only when ambiguity blocks top-level decomposition.
-- Ask at most 1 concise question.
+- Use the \`question\` tool only so prompts flow to Mission Control's escalation panel.
+- Ask 3-10 concise, decision-oriented questions before finalizing the plan.
+- Cover key planning unknowns (scope boundaries, constraints, integration assumptions, validation/deploy expectations, and out-of-scope limits).
+- If you recommend an option, make the recommended choice first and suffix "(Recommended)".
 - Never ask user questions in plain assistant text.
-- If unanswered or ambiguity remains, continue with explicit assumptions and register a plan.`
+- Wait for answers, then continue. If ambiguity remains, capture explicit assumptions.`
       : `### Step 2: Capture Assumptions
 - Interactive questions are disabled in this orchestrator planning flow.
 - Do NOT use the \`question\` tool.
@@ -73,6 +78,9 @@ ${stepTwoGuidance}
 - Do NOT design full low-level implementation details here.
 - Focus on top-level workstreams, ordering, and delegation boundaries.
 - Ensure first task is planning/spec enhancement and last task is validation.
+- Quality gate shape: for 4+ execution tasks, at least 2 implementation/integration tasks must be runnable immediately after planning.
+- Prefer fan-out/fan-in dependency shape: planning -> parallel subsystem tasks -> integration.
+- Avoid artificial blockers (for example, do not serialize auth/UI behind full DB wiring when stubs/interfaces can unblock parallel work).
 
 ### Step 4: Call register_plan
 - Provide: \`{ reasoning, successDefinition, tasks, validationPlan }\`
@@ -81,6 +89,11 @@ ${stepTwoGuidance}
 - For implementation/validation tasks, include \`verificationSpec\` with deterministic checks whenever possible.
 - If set, \`priority\` and \`complexity\` must be integers from 1 to 5.
 - Use 5-36 top-level tasks depending on scope with correct dependency chains.
+- Before calling register_plan, run this self-check:
+  1) If execution tasks >= 4, at least 2 are runnable immediately after planning.
+  2) If execution tasks >= 6, dependency graph is not near-linear.
+  3) If execution tasks >= 6, include at least one \`delegationLevel: "sub-orchestrator"\` task.
+  4) If execution tasks >= 10, include at least two \`delegationLevel: "sub-orchestrator"\` tasks.
 
 ## Task Design Rules
 - Root tasks should be coarse but executable (roughly 20-60 min each after decomposition).
@@ -105,7 +118,7 @@ ${contextSnippet ? `## Initial Project Context\n${contextSnippet}\n` : "## Note\
 ${scratchpadSnippet ? `## User / Supervisor Guidance\n${scratchpadSnippet}\n` : ""}
 
 ## Hard Constraints
-- Your first turn must call \`register_plan\` quickly.
+${firstTurnConstraint}
 - Do not do broad codebase research by default.
 - Do not create mega-tasks that implement entire systems.
 - Do not write SPEC.md in this root planner phase.
@@ -122,15 +135,21 @@ ${feedback.trim().slice(0, 1_600)}
 
 `
       : ""
+    const recoveryStepOne = deps.orchestratorAllowInteractiveQuestions
+      ? `1) Ask targeted clarifying questions via the \`question\` tool when needed (target 3-10 total planner questions in this session).
+   - If you already asked 3-10 useful questions, proceed with explicit assumptions for any remaining ambiguity.`
+      : "1) Do NOT ask user clarifying questions (plain text or via `question` tool). Capture explicit assumptions for any remaining ambiguity."
     return `You did not complete planning correctly in the previous turn.
 
 Continue this same planner session and do exactly this now:
-${feedbackSnippet}1) Do NOT ask user questions; proceed with explicit assumptions.
+${feedbackSnippet}${recoveryStepOne}
 2) Reduce unnecessary dependency chains:
    - Keep only true blocking dependencies.
    - Ensure at least 2 implementation/integration tasks can start right after planning when scope has 4+ execution tasks.
    - Avoid near-linear chains unless the work is truly sequential.
-3) For broad scope (8+ execution tasks), include at least one task with \`delegationLevel: "sub-orchestrator"\`.
+   - Use stubs/mocks for early parallel work and defer full cross-system wiring to integration tasks.
+3) For broad scope (6+ execution tasks), include at least one task with \`delegationLevel: "sub-orchestrator"\`.
+   - For very large scope (10+ execution tasks), include at least two such tasks.
 4) Do NOT write SPEC.md in this root planner phase.
 5) Call register_plan with schema-valid arguments for a top-level task graph.
 6) Stop after register_plan.
@@ -151,6 +170,9 @@ Do not perform implementation work in this planner session.`
     const researchSnippet = input.researchContext
       ? JSON.stringify(input.researchContext, null, 2).slice(0, 3_000)
       : ""
+    const subPlannerQuestionStep = deps.orchestratorAllowInteractiveQuestions
+      ? "2. Ask clarifying questions via the `question` tool when subsystem scope/contracts are ambiguous (1-5 targeted questions). If clarity is sufficient, proceed with explicit assumptions."
+      : "2. Do NOT ask user clarifying questions (plain text or `question` tool). If scope/contracts are ambiguous, proceed with explicit assumptions."
 
     return `You are a sub-orchestrator planner. You are planning a SUBSET of a larger orchestration. Your scope is narrower — you only plan for the specific subsystem described below.
 
@@ -163,7 +185,7 @@ ${input.taskDescription}
 
 ## Instructions
 1. Research the relevant parts of the codebase using your tools
-2. Do NOT ask user clarifying questions in this orchestrator flow; if scope is ambiguous, proceed with explicit assumptions
+${subPlannerQuestionStep}
 3. Ensure \`SPEC.md\` exists for shared context:
    - If it exists, update/append details specific to YOUR subsystem.
    - If it is missing, create it with the subsystem architecture and interfaces.
@@ -294,9 +316,16 @@ ${deps.formatVerificationSpecForPrompt(verificationSpec)}
 ${deps.formatVerificationFailureFeedbackForPrompt(verificationFeedback)}
 `
       : ""
+    const planningQuestionGuidance = deps.orchestratorAllowInteractiveQuestions
+      ? "- Before finalizing SPEC.md, ask 3-10 targeted clarifying questions via the `question` tool so they appear in Mission Control's escalation panel.\n- Wait for user answers, then incorporate them into the spec decisions."
+      : "- Interactive questions are disabled in this orchestration flow.\n- Do NOT ask user questions in plain text and do NOT use the `question` tool.\n- Capture explicit assumptions in SPEC.md and continue."
+    const executionQuestionGuidance = deps.orchestratorAllowInteractiveQuestions
+      ? "- If ambiguity blocks implementation, ask 1-3 targeted clarifying questions via the `question` tool (not plain assistant text)."
+      : "- Interactive questions are disabled in this orchestration flow. If ambiguity blocks implementation, capture explicit assumptions in your summary and continue."
 
     const outputRequirements = planningTask
       ? `- Ensure there is exactly one shared spec file: \`SPEC.md\` at the project root.
+${planningQuestionGuidance}
 - If \`SPEC.md\` already exists, read it carefully, then UPDATE and REFINE it in-place with:
   - More specific implementation details and exact file paths
   - Complete interface definitions with all method signatures and type parameters
@@ -335,6 +364,7 @@ ${deps.formatVerificationFailureFeedbackForPrompt(verificationFeedback)}
 - Import shared types, interfaces, and constants from the files defined in the spec document.
 - If work splits cleanly, delegate via subagents and batch independent calls where possible.
 - Only use codebase research/explore subagents on demand when uncertainty blocks progress.
+${executionQuestionGuidance}
 - Write any significant discoveries or decisions to stdout for other agents (e.g., "API uses v3, not v2").
 - Run relevant validation commands for your changes.
 - End with a concise "## Summary" section containing:
diff --git a/packages/oneshot/src/orchestrator/runtime/mission-control.ts b/packages/oneshot/src/orchestrator/runtime/mission-control.ts
index 297542f..9743b07 100644
--- a/packages/oneshot/src/orchestrator/runtime/mission-control.ts
+++ b/packages/oneshot/src/orchestrator/runtime/mission-control.ts
@@ -8,7 +8,7 @@ interface HierarchySnapshotNode {
   id: string
   label: string
   sessionId?: string
-  status?: "pending" | "in_progress" | "completed" | "failed"
+  status?: "pending" | "in_progress" | "completed" | "failed" | "skipped"
   kind?: string
   children: HierarchySnapshotNode[]
 }
@@ -49,7 +49,7 @@ function asStringArray(value: unknown): string[] {
 
 function taskStatusToNodeStatus(task: Orchestrator.Task): Orchestrator.MissionControlNodeStatus {
   if ((task.retryCount ?? 0) > 0 && task.status === "in_progress") return "retrying"
-  if (task.status === "completed") return "done"
+  if (task.status === "completed" || task.status === "skipped") return "done"
   if (task.status === "failed") return "failed"
   if (task.status === "in_progress") return "busy"
   if (task.status === "blocked") return "blocked"
@@ -59,7 +59,7 @@ function taskStatusToNodeStatus(task: Orchestrator.Task): Orchestrator.MissionCo
 function snapshotStatusToNodeStatus(
   status: HierarchySnapshotNode["status"] | undefined,
 ): Orchestrator.MissionControlNodeStatus {
-  if (status === "completed") return "done"
+  if (status === "completed" || status === "skipped") return "done"
   if (status === "failed") return "failed"
   if (status === "in_progress") return "busy"
   return "idle"
@@ -123,10 +123,22 @@ function isValidationOwnedTaskRoot(task: Pick<Orchestrator.Task, "kind" | "id" |
   return normalize(task.kind) === "validation" || isValidationRemediationTaskRoot(task)
 }
 
+function workflowPhaseToSection(task: Pick<Orchestrator.Task, "metadata">): MissionControlSection | undefined {
+  const metadata = asRecord(task.metadata)
+  const phase = normalize(asString(metadata?.workflowPhase))
+  if (phase === "code" || phase === "validate" || phase === "deploy") {
+    return phase
+  }
+  return undefined
+}
+
 function resolveSectionByTaskID(orderedTasks: Orchestrator.Task[]): Map<string, MissionControlSection> {
   const sectionByTaskId = new Map<string, MissionControlSection>()
   for (const task of orderedTasks) {
-    if (isDeployOwnedTaskRoot(task)) {
+    const fromWorkflowPhase = workflowPhaseToSection(task)
+    if (fromWorkflowPhase) {
+      sectionByTaskId.set(task.id, fromWorkflowPhase)
+    } else if (isDeployOwnedTaskRoot(task)) {
       sectionByTaskId.set(task.id, "deploy")
     } else if (isValidationOwnedTaskRoot(task)) {
       sectionByTaskId.set(task.id, "validate")
@@ -170,7 +182,11 @@ function asHierarchySnapshotNodes(value: unknown): HierarchySnapshotNode[] {
     const label = asString(record.label) ?? id
     const sessionId = asString(record.sessionId)
     const statusRaw = asString(record.status)
-    const status = statusRaw === "pending" || statusRaw === "in_progress" || statusRaw === "completed" || statusRaw === "failed"
+    const status = statusRaw === "pending"
+      || statusRaw === "in_progress"
+      || statusRaw === "completed"
+      || statusRaw === "failed"
+      || statusRaw === "skipped"
       ? statusRaw
       : undefined
     const kind = asString(record.kind)
@@ -382,7 +398,7 @@ export function buildMissionControlState(input: {
   const runPaused = run.status === "paused"
   const hasAnyInProgress = orderedTasks.some((task) => task.status === "in_progress")
   const hasAnyBlocked = orderedTasks.some((task) => task.status === "blocked")
-  const hasAnyCompleted = orderedTasks.some((task) => task.status === "completed")
+  const hasAnyCompleted = orderedTasks.some((task) => task.status === "completed" || task.status === "skipped")
   const hasAnyOutstanding = orderedTasks.some((task) =>
     task.status === "pending" || task.status === "in_progress" || task.status === "blocked",
   )
@@ -423,8 +439,35 @@ export function buildMissionControlState(input: {
           : hasAnyCompleted
             ? "done"
             : "idle"
+  const planningSessionId = normalizeSessionId(run.planningSessionId)
+  const shouldShowPlannerNode =
+    Boolean(planningSessionId)
+    && (
+      graph?.status === "building"
+      || orderedTasks.length === 0
+      || runPaused
+      || runFailed
+    )
+  const plannerStatus: Orchestrator.MissionControlNodeStatus = runFailed
+    ? "failed"
+    : runPaused
+      ? "paused"
+      : graph?.status === "building" || (run.status === "active" && orderedTasks.length === 0)
+        ? "busy"
+        : "done"
 
   const codeChildren: Orchestrator.MissionControlNode[] = [
+    ...(shouldShowPlannerNode
+      ? [{
+          id: "root-planner",
+          role: "task" as const,
+          label: "Root Planner",
+          sessionId: planningSessionId,
+          status: plannerStatus,
+          kind: "planning",
+          children: [],
+        }]
+      : []),
     ...(shouldShowResearchNode
       ? [{
           id: "researcher",
diff --git a/packages/oneshot/src/orchestrator/runtime/planner-quality.ts b/packages/oneshot/src/orchestrator/runtime/planner-quality.ts
index 92d8b4c..f8a3991 100644
--- a/packages/oneshot/src/orchestrator/runtime/planner-quality.ts
+++ b/packages/oneshot/src/orchestrator/runtime/planner-quality.ts
@@ -24,6 +24,17 @@ export interface PlannerQualityReport {
   issues: PlannerQualityIssue[]
 }
 
+export interface PlannerQualityRepairResult<TTask extends PlannerQualityTask> {
+  tasks: TTask[]
+  changed: boolean
+  notes: string[]
+  before: PlannerQualityReport
+  after: PlannerQualityReport
+}
+
+const MIN_EXECUTION_TASKS_FOR_PARALLELISM_GATE = 4
+const MIN_READY_WORKSTREAMS_AFTER_PLANNING = 2
+
 export function evaluatePlanQuality(tasks: PlannerQualityTask[]): PlannerQualityReport {
   const normalized = tasks
     .filter((task) => !!task && typeof task.id === "string" && task.id.trim().length > 0)
@@ -43,12 +54,7 @@ export function evaluatePlanQuality(tasks: PlannerQualityTask[]): PlannerQuality
 
   let readyAfterPlanningCount = 0
   for (const task of executionTasks) {
-    const deps = task.dependencies.filter((dep) => dep !== task.id)
-    if (deps.length === 0) {
-      readyAfterPlanningCount += 1
-      continue
-    }
-    if (planningTaskId && deps.every((dep) => dep === planningTaskId)) {
+    if (isRunnableImmediatelyAfterPlanning(task, planningTaskId)) {
       readyAfterPlanningCount += 1
     }
   }
@@ -72,12 +78,18 @@ export function evaluatePlanQuality(tasks: PlannerQualityTask[]): PlannerQuality
   }
 
   const issues: PlannerQualityIssue[] = []
-  if (metrics.executionTaskCount >= 4 && metrics.readyAfterPlanningCount < 2) {
+  if (
+    metrics.executionTaskCount >= MIN_EXECUTION_TASKS_FOR_PARALLELISM_GATE
+    && metrics.readyAfterPlanningCount < MIN_READY_WORKSTREAMS_AFTER_PLANNING
+  ) {
     issues.push({
       code: "initial_parallelism_low",
-      message:
-        `Only ${metrics.readyAfterPlanningCount} execution task(s) are runnable immediately after planning ` +
-        `for ${metrics.executionTaskCount} execution tasks. Create at least 2 independent workstreams.`,
+      message: buildInitialParallelismMessage({
+        metrics,
+        executionTasks,
+        executionIDs,
+        planningTaskId,
+      }),
     })
   }
 
@@ -90,14 +102,14 @@ export function evaluatePlanQuality(tasks: PlannerQualityTask[]): PlannerQuality
     })
   }
 
-  if (metrics.executionTaskCount >= 8 && metrics.subOrchestratorCount < 1) {
+  if (metrics.executionTaskCount >= 6 && metrics.subOrchestratorCount < 1) {
     issues.push({
       code: "missing_sub_orchestrator",
       message: "Plan scope is large but has no sub-orchestrator task. Delegate at least one broad subsystem.",
     })
   }
 
-  if (metrics.executionTaskCount >= 12 && metrics.subOrchestratorCount < 2) {
+  if (metrics.executionTaskCount >= 10 && metrics.subOrchestratorCount < 2) {
     issues.push({
       code: "insufficient_sub_orchestrators",
       message: "Very large plan should include at least two sub-orchestrator tasks for recursive decomposition.",
@@ -107,6 +119,129 @@ export function evaluatePlanQuality(tasks: PlannerQualityTask[]): PlannerQuality
   return { metrics, issues }
 }
 
+export function repairPlanForInitialParallelism<TTask extends PlannerQualityTask>(
+  tasks: TTask[],
+): PlannerQualityRepairResult<TTask> {
+  const normalized = tasks.map((task) => ({
+    ...task,
+    id: task.id.trim(),
+    name: (task.name ?? "").trim(),
+    dependencies: uniqueNonEmptyStrings((task.dependencies ?? []).filter((dep) => dep !== task.id)),
+    kind: normalizeKind(task.kind),
+    delegationLevel: typeof task.delegationLevel === "string" ? task.delegationLevel.trim() : undefined,
+  })) as TTask[]
+
+  const before = evaluatePlanQuality(normalized)
+  if (!before.issues.some((issue) => issue.code === "initial_parallelism_low")) {
+    return {
+      tasks: normalized,
+      changed: false,
+      notes: [],
+      before,
+      after: before,
+    }
+  }
+
+  const notes: string[] = []
+  let changed = false
+  let working = normalized
+  const planningTaskId = working.find((task) => isPlanningTaskLike(task))?.id
+  const executionTasks = working.filter((task) => !isPlanningTaskLike(task) && !isValidationTaskLike(task))
+
+  if (executionTasks.length >= MIN_EXECUTION_TASKS_FOR_PARALLELISM_GATE) {
+    const setupTaskIds = new Set(
+      executionTasks.filter((task) => looksLikeImplementationSetupTask(task)).map((task) => task.id),
+    )
+
+    if (setupTaskIds.size > 0) {
+      let updatedCount = 0
+      working = working.map((task) => {
+        if (isPlanningTaskLike(task) || isValidationTaskLike(task)) return task
+        if (setupTaskIds.has(task.id)) return task
+
+        const deps = uniqueNonEmptyStrings((task.dependencies ?? []).filter((dep) => dep !== task.id))
+        if (!deps.some((dep) => setupTaskIds.has(dep))) return task
+
+        let nextDeps = deps.filter((dep) => !setupTaskIds.has(dep))
+        if (nextDeps.length === 0 && planningTaskId && task.id !== planningTaskId) {
+          nextDeps = [planningTaskId]
+        }
+        if (sameStringArray(deps, nextDeps)) return task
+
+        updatedCount += 1
+        return {
+          ...task,
+          dependencies: nextDeps,
+        }
+      })
+
+      if (updatedCount > 0) {
+        changed = true
+        notes.push(`Removed setup/scaffold dependencies from ${updatedCount} task(s).`)
+      }
+    }
+
+    const widened = widenInitialFanOut(working, planningTaskId, MIN_READY_WORKSTREAMS_AFTER_PLANNING)
+    if (widened.changedCount > 0) {
+      changed = true
+      notes.push(`Relaxed early dependency chains for ${widened.changedCount} task(s).`)
+      working = widened.tasks
+    }
+  }
+
+  const after = evaluatePlanQuality(working)
+  return {
+    tasks: working,
+    changed,
+    notes,
+    before,
+    after,
+  }
+}
+
+function buildInitialParallelismMessage(input: {
+  metrics: PlannerQualityMetrics
+  executionTasks: Array<PlannerQualityTask & { dependencies: string[] }>
+  executionIDs: Set<string>
+  planningTaskId?: string
+}): string {
+  const blockedTasks = input.executionTasks
+    .filter((task) => !isRunnableImmediatelyAfterPlanning(task, input.planningTaskId))
+    .map((task) => {
+      const deps = task.dependencies.filter((dep) => dep !== task.id)
+      const blockingExecutionDeps = deps.filter((dep) => input.executionIDs.has(dep))
+      return { task, blockingExecutionDeps }
+    })
+    .filter((item) => item.blockingExecutionDeps.length > 0)
+
+  const candidateTasks = blockedTasks.slice(0, 3).map((item) => `"${item.task.id}"`)
+  const blockers = blockedTasks
+    .slice(0, 2)
+    .map((item) => {
+      const deps = item.blockingExecutionDeps.map((dep) => `"${dep}"`).join(", ")
+      return `"${item.task.id}" waits on ${deps}`
+    })
+    .join("; ")
+
+  let message =
+    `Only ${input.metrics.readyAfterPlanningCount} execution task(s) are runnable immediately after planning ` +
+    `for ${input.metrics.executionTaskCount} execution tasks. ` +
+    "Quality gate requires at least 2 independent workstreams right after planning."
+
+  if (input.planningTaskId && candidateTasks.length > 0) {
+    message +=
+      ` Suggested fix: make ${candidateTasks.join(", ")} depend only on "${input.planningTaskId}" ` +
+      "unless a dependency is truly blocking."
+  }
+
+  if (blockers.length > 0) {
+    message += ` Current blockers: ${blockers}.`
+  }
+
+  message += " Use stubs/mocks at boundaries and defer full wiring to integration tasks."
+  return message
+}
+
 function computeExecutionDepth(
   taskId: string,
   taskById: Map<string, PlannerQualityTask & { dependencies: string[] }>,
@@ -140,10 +275,113 @@ function normalizeKind(value: string | undefined): string | undefined {
   return normalized.length > 0 ? normalized : undefined
 }
 
+function isRunnableImmediatelyAfterPlanning(
+  task: Pick<PlannerQualityTask, "id"> & { dependencies: string[] },
+  planningTaskId: string | undefined,
+): boolean {
+  const deps = task.dependencies.filter((dep) => dep !== task.id)
+  if (deps.length === 0) return true
+  if (planningTaskId && deps.every((dep) => dep === planningTaskId)) return true
+  return false
+}
+
 function uniqueNonEmptyStrings(values: string[]): string[] {
   return [...new Set(values.map((value) => value.trim()).filter(Boolean))]
 }
 
+function sameStringArray(left: string[], right: string[]): boolean {
+  if (left.length !== right.length) return false
+  for (let index = 0; index < left.length; index += 1) {
+    if (left[index] !== right[index]) return false
+  }
+  return true
+}
+
+function countReadyExecutionTasksAfterPlanning(tasks: PlannerQualityTask[], planningTaskId: string | undefined): number {
+  return tasks
+    .filter((task) => !isPlanningTaskLike(task) && !isValidationTaskLike(task))
+    .filter((task) => isRunnableImmediatelyAfterPlanning({
+      id: task.id,
+      dependencies: uniqueNonEmptyStrings(task.dependencies ?? []),
+    }, planningTaskId))
+    .length
+}
+
+function widenInitialFanOut<TTask extends PlannerQualityTask>(
+  tasks: TTask[],
+  planningTaskId: string | undefined,
+  minReady: number,
+): { tasks: TTask[]; changedCount: number } {
+  if (!planningTaskId) return { tasks, changedCount: 0 }
+
+  const executionTaskIds = new Set(
+    tasks.filter((task) => !isPlanningTaskLike(task) && !isValidationTaskLike(task)).map((task) => task.id),
+  )
+
+  let working = tasks
+  let readyCount = countReadyExecutionTasksAfterPlanning(working, planningTaskId)
+  let changedCount = 0
+  while (readyCount < minReady) {
+    const blocked = working
+      .filter((task) => !isPlanningTaskLike(task) && !isValidationTaskLike(task))
+      .filter((task) => !isRunnableImmediatelyAfterPlanning({
+        id: task.id,
+        dependencies: uniqueNonEmptyStrings(task.dependencies ?? []),
+      }, planningTaskId))
+
+    if (blocked.length === 0) break
+
+    const candidate = selectFanOutCandidate(blocked, executionTaskIds)
+    if (!candidate) break
+
+    const deps = uniqueNonEmptyStrings((candidate.dependencies ?? []).filter((dep) => dep !== candidate.id))
+    const relaxedDeps = [planningTaskId]
+    if (sameStringArray(deps, relaxedDeps)) break
+
+    working = working.map((task) => {
+      if (task.id !== candidate.id) return task
+      return {
+        ...task,
+        dependencies: relaxedDeps,
+      }
+    })
+    changedCount += 1
+    readyCount = countReadyExecutionTasksAfterPlanning(working, planningTaskId)
+  }
+
+  return { tasks: working, changedCount }
+}
+
+function selectFanOutCandidate(
+  blocked: PlannerQualityTask[],
+  executionTaskIds: Set<string>,
+): PlannerQualityTask | undefined {
+  const preferred = blocked
+    .filter((task) => !looksLikeImplementationSetupTask(task))
+    .filter((task) => !looksLikeIntegrationTask(task))
+  if (preferred.length > 0) {
+    return preferred.sort((a, b) => compareFanOutPriority(a, b, executionTaskIds))[0]
+  }
+
+  const fallback = blocked.filter((task) => !looksLikeImplementationSetupTask(task))
+  if (fallback.length > 0) {
+    return fallback.sort((a, b) => compareFanOutPriority(a, b, executionTaskIds))[0]
+  }
+
+  return blocked.sort((a, b) => compareFanOutPriority(a, b, executionTaskIds))[0]
+}
+
+function compareFanOutPriority(
+  left: PlannerQualityTask,
+  right: PlannerQualityTask,
+  executionTaskIds: Set<string>,
+): number {
+  const leftDeps = uniqueNonEmptyStrings(left.dependencies ?? []).filter((dep) => executionTaskIds.has(dep)).length
+  const rightDeps = uniqueNonEmptyStrings(right.dependencies ?? []).filter((dep) => executionTaskIds.has(dep)).length
+  if (leftDeps !== rightDeps) return leftDeps - rightDeps
+  return left.id.localeCompare(right.id)
+}
+
 function isPlanningTaskLike(task: Pick<PlannerQualityTask, "id" | "name" | "kind">): boolean {
   if (task.kind === "planning") return true
   return /\bplan(ning)?\b|\bspec\b/.test(`${task.id} ${task.name}`.toLowerCase())
@@ -155,3 +393,15 @@ function isValidationTaskLike(task: Pick<PlannerQualityTask, "id" | "name" | "ki
     `${task.id} ${task.name}`.toLowerCase(),
   )
 }
+
+function looksLikeImplementationSetupTask(task: Pick<PlannerQualityTask, "id" | "name"> & { description?: string }): boolean {
+  return /\b(scaffold|bootstrap|setup|set up|initialize|initialise|init|create (project|repo|application)|vite|install|dependencies?|package\.json|index\.html|dev\s*server|npm|pnpm|yarn|bun)\b/.test(
+    `${task.id} ${task.name} ${task.description ?? ""}`.toLowerCase(),
+  )
+}
+
+function looksLikeIntegrationTask(task: Pick<PlannerQualityTask, "id" | "name"> & { description?: string }): boolean {
+  return /\bintegration\b|\bwire\b|\bwiring\b|\bend[- ]to[- ]end\b|\bcompose\b|\bfinalize\b|\bfinalise\b|\bpolish\b|\bmerge\b/.test(
+    `${task.id} ${task.name} ${task.description ?? ""}`.toLowerCase(),
+  )
+}
diff --git a/packages/oneshot/src/orchestrator/runtime/temporal.ts b/packages/oneshot/src/orchestrator/runtime/temporal.ts
index af2e8cb..607b756 100644
--- a/packages/oneshot/src/orchestrator/runtime/temporal.ts
+++ b/packages/oneshot/src/orchestrator/runtime/temporal.ts
@@ -19,6 +19,7 @@ const require = createRequire(import.meta.url)
 const TEMPORAL_ADDRESS = process.env.TEMPORAL_ADDRESS ?? "127.0.0.1:7233"
 const TEMPORAL_NAMESPACE = process.env.TEMPORAL_NAMESPACE ?? "default"
 const TEMPORAL_TASK_QUEUE = process.env.TEMPORAL_TASK_QUEUE ?? "oneshot-orchestrator-v2"
+const TEMPORAL_CLI_PATH = process.env.ONESHOT_TEMPORAL_CLI_PATH ?? "temporal"
 const TEMPORAL_CONNECT_TIMEOUT_MS = Math.max(
   5_000,
   Number(process.env.ONESHOT_TEMPORAL_CONNECT_TIMEOUT_MS ?? 20_000),
@@ -604,7 +605,7 @@ async function runTemporalCLI(args: string[], label: string, timeoutMs: number):
   log.warn("Running Temporal CLI command", { label, args: cliArgs.join(" "), timeoutMs })
   const startedAt = Date.now()
   const result = await withTimeout(
-    execFileAsync("temporal", cliArgs, { maxBuffer: 8 * 1024 * 1024 }),
+    execFileAsync(TEMPORAL_CLI_PATH, cliArgs, { maxBuffer: 8 * 1024 * 1024 }),
     timeoutMs + 1_000,
     `Temporal CLI ${label}`,
   )
diff --git a/packages/oneshot/src/orchestrator/runtime/verification.ts b/packages/oneshot/src/orchestrator/runtime/verification.ts
index c9ffd59..f5e8173 100644
--- a/packages/oneshot/src/orchestrator/runtime/verification.ts
+++ b/packages/oneshot/src/orchestrator/runtime/verification.ts
@@ -5,6 +5,7 @@ import { Orchestrator } from "../types"
 
 const DEFAULT_COMMAND_TIMEOUT_MS = Number(process.env.ONESHOT_VERIFICATION_COMMAND_TIMEOUT_MS ?? 120_000)
 const MAX_OUTPUT_SAMPLE_CHARS = Number(process.env.ONESHOT_VERIFICATION_OUTPUT_CHARS ?? 2_000)
+const TSC_SHIM_SENTINEL_RE = /this is not the tsc command you are looking for/i
 const VERIFICATION_ISOLATE_WORKTREE = parseBooleanEnv(
   process.env.ONESHOT_VERIFICATION_ISOLATE_WORKTREE,
   true,
@@ -254,7 +255,7 @@ async function runCommandVerificationCheck(input: {
     ? Math.min(15 * 60_000, Math.max(100, input.check.timeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS))
     : DEFAULT_COMMAND_TIMEOUT_MS
   const expectedExit = Number.isFinite(input.check.expectExit) ? Math.trunc(input.check.expectExit ?? 0) : 0
-  const proc = Bun.spawn(["bash", "-lc", input.check.command], {
+  const proc = Bun.spawn(["bash", "-lc", wrapCommandWithPipefail(input.check.command)], {
     cwd: input.projectRoot,
     env: process.env,
     stdout: "pipe",
@@ -288,12 +289,19 @@ async function runCommandVerificationCheck(input: {
   const stdout = stdoutSettled.status === "fulfilled" ? stdoutSettled.value : ""
   const stderr = stderrSettled.status === "fulfilled" ? stderrSettled.value : ""
   const outputSample = [stdout, stderr].filter(Boolean).join("\n").trim().slice(-MAX_OUTPUT_SAMPLE_CHARS)
+  const tscShimDetected = isTscShimFailure({
+    command: input.check.command,
+    stdout,
+    stderr,
+  })
 
-  const passed = !timedOut && actualExit === expectedExit
+  const passed = !timedOut && actualExit === expectedExit && !tscShimDetected
   const summary = passed
     ? `Command exited ${actualExit} as expected`
     : timedOut
       ? `Command timed out after ${timeoutMs}ms`
+      : tscShimDetected
+        ? "Command output indicates the non-TypeScript tsc shim was invoked"
       : `Command exited ${actualExit}, expected ${expectedExit}`
 
   return {
@@ -307,6 +315,16 @@ async function runCommandVerificationCheck(input: {
   }
 }
 
+function wrapCommandWithPipefail(command: string): string {
+  return `set -o pipefail; ${command}`
+}
+
+function isTscShimFailure(input: { command: string; stdout: string; stderr: string }): boolean {
+  if (!/\btsc\b/i.test(input.command)) return false
+  const combinedOutput = `${input.stdout}\n${input.stderr}`
+  return TSC_SHIM_SENTINEL_RE.test(combinedOutput)
+}
+
 async function runFileExistsVerificationCheck(input: {
   projectRoot: string
   check: Orchestrator.VerificationFileExistsCheck
diff --git a/packages/oneshot/src/orchestrator/runtime/workflow.ts b/packages/oneshot/src/orchestrator/runtime/workflow.ts
index 0e7e77d..81a0f3a 100644
--- a/packages/oneshot/src/orchestrator/runtime/workflow.ts
+++ b/packages/oneshot/src/orchestrator/runtime/workflow.ts
@@ -100,11 +100,22 @@ const SUPERVISOR_INTERVENTION_EVENT_MIN_INTERVAL_MS = 4_000
 const SUPERVISOR_INTERVENTION_BACKSTOP_INTERVAL_MS = 15_000
 const SUPERVISOR_STALL_BACKSTOP_MS = 12_000
 const WORKFLOW_RUNNING_POLL_MS = 2_500
+const WORKFLOW_CANCEL_DRAIN_TIMEOUT_MS = 4_000
 const DEADLOCK_SUPERVISOR_THRESHOLD = 3
 const DEADLOCK_FAIL_THRESHOLD = 8
 const DEADLOCK_FAIL_THRESHOLD_WITH_FAILURES = 24
 const ACTIVITY_HEARTBEAT_TIMEOUT = "30s"
 
+class WorkflowControlTerminationError extends Error {
+  readonly alreadyMarkedFailed: boolean
+
+  constructor(message: string, options: { alreadyMarkedFailed?: boolean } = {}) {
+    super(message)
+    this.name = "WorkflowControlTerminationError"
+    this.alreadyMarkedFailed = options.alreadyMarkedFailed === true
+  }
+}
+
 export async function oneshotOrchestrationWorkflow(input: OrchestrationWorkflowInput): Promise<{ runId: string }> {
   const workflowActivities = proxyActivities<typeof activities>({
     startToCloseTimeout: "8 hours",
@@ -374,17 +385,16 @@ export async function oneshotOrchestrationWorkflow(input: OrchestrationWorkflowI
 
       state.stage = "finalizing"
 
-      if (running.size > 0) {
-        await Promise.all([...running.values()].map((pending) => pending.catch(() => ({ taskId: "unknown" }))))
-        running.clear()
-      }
-
       if (state.killRequested) {
         await failureActivities.markRunFailedActivity(
           input,
           state.note ?? "Workflow killed by control signal",
         ).catch(() => {})
-        throw new Error(state.note ?? "Workflow killed by control signal")
+        await drainRunningChildren(running, WORKFLOW_CANCEL_DRAIN_TIMEOUT_MS)
+        state.activeChildTaskIds = []
+        throw new WorkflowControlTerminationError(state.note ?? "Workflow killed by control signal", {
+          alreadyMarkedFailed: true,
+        })
       }
 
       if (state.pauseRequested) {
@@ -392,9 +402,16 @@ export async function oneshotOrchestrationWorkflow(input: OrchestrationWorkflowI
           input,
           state.note ?? "Workflow paused by control signal",
         ).catch(() => {})
+        await drainRunningChildren(running, WORKFLOW_CANCEL_DRAIN_TIMEOUT_MS)
+        state.activeChildTaskIds = []
         return { runId: input.runId }
       }
 
+      if (running.size > 0) {
+        await drainRunningChildren(running)
+        state.activeChildTaskIds = []
+      }
+
       await workflowActivities.runSupervisorCycleActivity(input).catch(() => {})
       const finalizeResult = await workflowActivities.finalizeRunActivity(input)
       if (finalizeResult.route === "execution") {
@@ -405,6 +422,9 @@ export async function oneshotOrchestrationWorkflow(input: OrchestrationWorkflowI
       return { runId: input.runId }
     }
   } catch (error) {
+    if (error instanceof WorkflowControlTerminationError && error.alreadyMarkedFailed) {
+      throw error
+    }
     const reason = error instanceof Error ? error.message : String(error)
     await failureActivities.markRunFailedActivity(input, `Workflow failed: ${reason}`).catch(() => {})
     throw error
@@ -665,3 +685,19 @@ async function waitForTaskCompletionOrTick(
   const tick = sleep(tickMs).then(() => ({ kind: "tick" as const }))
   return Promise.race([completion, tick])
 }
+
+async function drainRunningChildren(
+  running: Map<string, Promise<RunningTaskResult>>,
+  timeoutMs?: number,
+): Promise<void> {
+  if (running.size === 0) return
+
+  const settle = Promise.all([...running.values()].map((pending) => pending.catch(() => ({ taskId: "unknown" }))))
+    .then(() => {})
+  if (typeof timeoutMs === "number" && timeoutMs > 0) {
+    await Promise.race([settle, sleep(timeoutMs)])
+  } else {
+    await settle
+  }
+  running.clear()
+}
diff --git a/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts b/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts
index e716b4a..f960c42 100644
--- a/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts
+++ b/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts
@@ -11,6 +11,7 @@ const COMMIT_STAGE_EXCLUDED_PATH_PATTERNS = [
   /(^|\/)__pycache__\//,
   /\.pyc$/i,
   /\.pyo$/i,
+  /\.tsbuildinfo$/i,
   /(^|\/)\.pytest_cache\//,
 ]
 const LOCKFILE_BASENAMES = new Set(["package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lockb"])
diff --git a/packages/oneshot/src/question/index.ts b/packages/oneshot/src/question/index.ts
index c93b74b..481daf7 100644
--- a/packages/oneshot/src/question/index.ts
+++ b/packages/oneshot/src/question/index.ts
@@ -2,6 +2,7 @@ import { Bus } from "@/bus"
 import { BusEvent } from "@/bus/bus-event"
 import { Identifier } from "@/id/id"
 import { Instance } from "@/project/instance"
+import { State } from "@/project/state"
 import { Log } from "@/util/log"
 import z from "zod"
 
@@ -79,7 +80,10 @@ export namespace Question {
     ),
   }
 
-  const state = Instance.state(async () => {
+  // Scope pending questions by repository worktree root so prompts asked from
+  // orchestration task worktrees are visible to the primary workspace session.
+  // Using project.id can diverge across worktree contexts and hide prompts.
+  const state = State.create(() => Instance.project.worktree, () => {
     const pending: Record<
       string,
       {
@@ -99,7 +103,7 @@ export namespace Question {
     questions: Info[]
     tool?: { messageID: string; callID: string }
   }): Promise<Answer[]> {
-    const s = await state()
+    const s = state()
     const id = Identifier.ascending("question")
 
     log.info("asking", { id, questions: input.questions.length })
@@ -121,7 +125,7 @@ export namespace Question {
   }
 
   export async function reply(input: { requestID: string; answers: Answer[] }): Promise<void> {
-    const s = await state()
+    const s = state()
     const existing = s.pending[input.requestID]
     if (!existing) {
       log.warn("reply for unknown request", { requestID: input.requestID })
@@ -141,7 +145,7 @@ export namespace Question {
   }
 
   export async function reject(requestID: string): Promise<void> {
-    const s = await state()
+    const s = state()
     const existing = s.pending[requestID]
     if (!existing) {
       log.warn("reject for unknown request", { requestID })
@@ -166,6 +170,7 @@ export namespace Question {
   }
 
   export async function list() {
-    return state().then((x) => Object.values(x.pending).map((x) => x.info))
+    const s = state()
+    return Object.values(s.pending).map((item) => item.info)
   }
 }
diff --git a/packages/oneshot/src/tool/question.ts b/packages/oneshot/src/tool/question.ts
index 578f7ef..f6d083c 100644
--- a/packages/oneshot/src/tool/question.ts
+++ b/packages/oneshot/src/tool/question.ts
@@ -2,6 +2,67 @@ import z from "zod"
 import { Tool } from "./tool"
 import { Question } from "../question"
 import DESCRIPTION from "./question.txt"
+import { Log } from "../util/log"
+
+const log = Log.create({ service: "tool.question" })
+
+const QuestionWithoutCustom = Question.Info.omit({ custom: true })
+type ToolQuestion = z.infer<typeof QuestionWithoutCustom>
+type ToolCallRef = { messageID: string; callID: string } | undefined
+
+type ParentResolutionInput = {
+  childSessionID: string
+  parentSessionID: string
+  questions: ToolQuestion[]
+  unresolvedIndexes: number[]
+  abort: AbortSignal
+}
+
+type ResolutionSource = {
+  source: "parent" | "user"
+  sessionID?: string
+}
+
+type HierarchicalResolutionResult = {
+  answers: Question.Answer[]
+  byQuestion: ResolutionSource[]
+  parentSessionsTried: string[]
+}
+
+type ResolutionDependencies = {
+  getParentSessionChain(sessionID: string): Promise<string[]>
+  answerFromParent(input: ParentResolutionInput): Promise<Map<number, Question.Answer>>
+  askUser(input: {
+    sessionID: string
+    questions: ToolQuestion[]
+    tool?: ToolCallRef
+  }): Promise<Question.Answer[]>
+}
+
+type SessionMessageLike = {
+  info: Record<string, unknown>
+  parts: Array<Record<string, unknown>>
+}
+
+const ParentResolutionOutput = z.object({
+  rationale: z.string().optional(),
+  answers: z.array(
+    z.object({
+      index: z.number().int().min(0),
+      selections: z.array(z.string()).default([]),
+      escalate: z.boolean().default(false),
+      reason: z.string().optional(),
+    }),
+  ).default([]),
+})
+
+function defaultResolutionDependencies(): ResolutionDependencies {
+  return {
+    getParentSessionChain: resolveParentSessionChain,
+    answerFromParent: attemptParentQuestionResolution,
+    askUser: Question.ask,
+  }
+}
 
 function parseBooleanFlag(value: string | undefined, defaultValue: boolean): boolean {
   if (!value?.trim()) return defaultValue
@@ -12,13 +73,348 @@ function parseBooleanFlag(value: string | undefined, defaultValue: boolean): boo
 }
 
 function allowOrchestratorPlannerQuestions(): boolean {
-  return parseBooleanFlag(process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS, false)
+  return parseBooleanFlag(process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS, true)
+}
+
+function allowHierarchicalQuestionRouting(): boolean {
+  return parseBooleanFlag(process.env.ONESHOT_SUBAGENT_QUESTION_PARENT_CHAIN, true)
+}
+
+function normalizeSelectionValues(input: Question.Answer | undefined): string[] {
+  if (!Array.isArray(input)) return []
+  const normalized = [] as string[]
+  const seen = new Set<string>()
+  for (const item of input) {
+    if (typeof item !== "string") continue
+    const trimmed = item.trim()
+    if (!trimmed || seen.has(trimmed)) continue
+    seen.add(trimmed)
+    normalized.push(trimmed)
+  }
+  return normalized
+}
+
+function questionAllowsCustom(question: ToolQuestion): boolean {
+  return (question as { custom?: boolean }).custom !== false
+}
+
+function isValidParentAnswer(answer: Question.Answer | undefined, question: ToolQuestion): answer is Question.Answer {
+  const normalized = normalizeSelectionValues(answer)
+  if (normalized.length === 0) return false
+  if (question.multiple !== true && normalized.length > 1) return false
+  if (!questionAllowsCustom(question)) {
+    const optionLabels = new Set(question.options.map((option) => option.label))
+    if (normalized.some((selection) => !optionLabels.has(selection))) return false
+  }
+  return true
+}
+
+function buildParentResolutionPrompt(input: {
+  childSessionID: string
+  parentSessionID: string
+  questions: ToolQuestion[]
+  unresolvedIndexes: number[]
+  parentContext: string
+  childContext: string
+}): string {
+  const questionPayload = input.unresolvedIndexes.map((index) => {
+    const question = input.questions[index]
+    return {
+      index,
+      header: question?.header ?? "",
+      question: question?.question ?? "",
+      options: (question?.options ?? []).map((option) => option.label),
+      multiple: question?.multiple === true,
+      custom: question ? questionAllowsCustom(question) : true,
+    }
+  })
+
+  return [
+    "You are acting as the immediate parent agent in a hierarchy.",
+    "A child agent asked clarification questions while executing a task.",
+    "Answer only questions that can be resolved from known scope/spec consistency and current context.",
+    "If a question requires explicit user preference or missing product direction, set escalate=true and leave selections empty.",
+    "",
+    "Rules:",
+    "- Select labels exactly as listed when choosing options.",
+    "- Use custom text only when custom=true for that question.",
+    "- For multiple=false, return at most one selection.",
+    "- Never invent requirements or preferences.",
+    "",
+    `Parent session: ${input.parentSessionID}`,
+    `Child session: ${input.childSessionID}`,
+    "",
+    "Parent recent context:",
+    input.parentContext,
+    "",
+    "Child recent context:",
+    input.childContext,
+    "",
+    "Questions (JSON):",
+    JSON.stringify(questionPayload, null, 2),
+    "",
+    "Return structured output only.",
+  ].join("\n")
+}
+
+function summarizeMessages(messages: SessionMessageLike[], maxMessages: number = 8, maxChars: number = 260): string {
+  const selected = messages.slice(-maxMessages)
+  const lines = [] as string[]
+
+  for (const message of selected) {
+    const role = typeof message.info.role === "string" ? message.info.role : "unknown"
+    const agent = typeof message.info.agent === "string" ? message.info.agent : undefined
+    const textPart = message.parts.findLast((part) =>
+      part.type === "text" && typeof part.text === "string" && Boolean(part.text.trim())
+    )
+    const rawText = typeof textPart?.text === "string" ? textPart.text : ""
+    const compact = rawText.replace(/\s+/g, " ").trim()
+    if (!compact) continue
+    const label = agent && role === "assistant" ? `${role}(${agent})` : role
+    lines.push(`- ${label}: ${compact.slice(0, maxChars)}`)
+  }
+
+  if (lines.length === 0) return "- [no textual context available]"
+  return lines.join("\n")
+}
+
+function resolveAgentFromMessages(messages: SessionMessageLike[]): string | undefined {
+  for (let index = messages.length - 1; index >= 0; index--) {
+    const info = messages[index]?.info
+    if (!info) continue
+    const agent = typeof info.agent === "string" ? info.agent.trim() : ""
+    if (agent) return agent
+  }
+  return undefined
+}
+
+function resolveModelFromMessages(
+  messages: SessionMessageLike[],
+): { providerID: string; modelID: string } | undefined {
+  for (let index = messages.length - 1; index >= 0; index--) {
+    const info = messages[index]?.info
+    if (!info) continue
+    const providerFromInfo = typeof info.providerID === "string" ? info.providerID.trim() : ""
+    const modelFromInfo = typeof info.modelID === "string" ? info.modelID.trim() : ""
+    if (providerFromInfo && modelFromInfo) {
+      return {
+        providerID: providerFromInfo,
+        modelID: modelFromInfo,
+      }
+    }
+
+    const model = info.model
+    if (!model || typeof model !== "object") continue
+    const providerFromModel = typeof (model as { providerID?: unknown }).providerID === "string"
+      ? ((model as { providerID: string }).providerID).trim()
+      : ""
+    const modelFromModel = typeof (model as { modelID?: unknown }).modelID === "string"
+      ? ((model as { modelID: string }).modelID).trim()
+      : ""
+    if (providerFromModel && modelFromModel) {
+      return {
+        providerID: providerFromModel,
+        modelID: modelFromModel,
+      }
+    }
+  }
+  return undefined
+}
+
+async function resolveParentSessionChain(sessionID: string): Promise<string[]> {
+  const { Session } = await import("../session")
+
+  const chain = [] as string[]
+  const seen = new Set<string>()
+  let currentSessionID = sessionID.trim()
+
+  while (currentSessionID && !seen.has(currentSessionID)) {
+    seen.add(currentSessionID)
+    const current = await Session.get(currentSessionID).catch(() => undefined)
+    const parentID = current?.parentID?.trim()
+    if (!parentID || seen.has(parentID)) break
+    chain.push(parentID)
+    currentSessionID = parentID
+  }
+
+  return chain
+}
+
+async function attemptParentQuestionResolution(input: ParentResolutionInput): Promise<Map<number, Question.Answer>> {
+  const unresolvedIndexes = input.unresolvedIndexes.filter((index) => Number.isInteger(index) && index >= 0)
+  if (unresolvedIndexes.length === 0) return new Map()
+
+  const [{ Session }, { SessionPrompt }, { Identifier }] = await Promise.all([
+    import("../session"),
+    import("../session/prompt"),
+    import("../id/id"),
+  ])
+
+  const [parentMessages, childMessages] = await Promise.all([
+    Session.messages({ sessionID: input.parentSessionID, limit: 24 }).catch(() => []),
+    Session.messages({ sessionID: input.childSessionID, limit: 16 }).catch(() => []),
+  ])
+
+  const parentAgent = resolveAgentFromMessages(parentMessages as SessionMessageLike[]) ?? "build"
+  const parentModel = resolveModelFromMessages(parentMessages as SessionMessageLike[])
+  const parentContext = summarizeMessages(parentMessages as SessionMessageLike[])
+  const childContext = summarizeMessages(childMessages as SessionMessageLike[])
+
+  const resolverSession = await Session.create({
+    parentID: input.parentSessionID,
+    title: `Question Escalation Resolver (${input.childSessionID.slice(0, 8)})`,
+    permission: [
+      { permission: "*", pattern: "*", action: "deny" },
+      { permission: "StructuredOutput", pattern: "*", action: "allow" },
+    ],
+  })
+
+  const cancel = () => SessionPrompt.cancel(resolverSession.id)
+  input.abort.addEventListener("abort", cancel)
+
+  try {
+    const response = await SessionPrompt.prompt({
+      messageID: Identifier.ascending("message"),
+      sessionID: resolverSession.id,
+      agent: parentAgent,
+      ...(parentModel ? { model: parentModel } : {}),
+      format: {
+        type: "json_schema",
+        schema: {
+          type: "object",
+          properties: {
+            rationale: { type: "string" },
+            answers: {
+              type: "array",
+              items: {
+                type: "object",
+                properties: {
+                  index: { type: "number" },
+                  selections: { type: "array", items: { type: "string" } },
+                  escalate: { type: "boolean" },
+                  reason: { type: "string" },
+                },
+                required: ["index", "selections", "escalate"],
+              },
+            },
+          },
+          required: ["answers"],
+        },
+        retryCount: 1,
+      },
+      parts: [{
+        type: "text",
+        text: buildParentResolutionPrompt({
+          childSessionID: input.childSessionID,
+          parentSessionID: input.parentSessionID,
+          questions: input.questions,
+          unresolvedIndexes,
+          parentContext,
+          childContext,
+        }),
+      }],
+    })
+
+    const structured = response.info.role === "assistant" ? response.info.structured : undefined
+    const parsed = ParentResolutionOutput.safeParse(structured)
+    if (!parsed.success) {
+      log.warn("parent resolution parse failed", {
+        parentSessionID: input.parentSessionID,
+      })
+      return new Map()
+    }
+
+    const result = new Map<number, Question.Answer>()
+    for (const answer of parsed.data.answers) {
+      if (answer.escalate) continue
+      if (!unresolvedIndexes.includes(answer.index)) continue
+      result.set(answer.index, normalizeSelectionValues(answer.selections))
+    }
+    return result
+  } catch (error) {
+    log.warn("parent resolution failed", {
+      parentSessionID: input.parentSessionID,
+      error: error instanceof Error ? error.message : String(error),
+    })
+    return new Map()
+  } finally {
+    input.abort.removeEventListener("abort", cancel)
+    void Session.remove(resolverSession.id).catch(() => {})
+  }
+}
+
+export async function resolveQuestionAnswersWithHierarchy(input: {
+  sessionID: string
+  questions: ToolQuestion[]
+  tool?: ToolCallRef
+  abort: AbortSignal
+  allowHierarchy: boolean
+}, deps: ResolutionDependencies = defaultResolutionDependencies()): Promise<HierarchicalResolutionResult> {
+  const answers = Array<Question.Answer | undefined>(input.questions.length).fill(undefined)
+  const byQuestion = Array<ResolutionSource>(input.questions.length).fill({ source: "user" })
+  const parentSessionsTried = [] as string[]
+
+  if (input.allowHierarchy) {
+    const parentChain = await deps.getParentSessionChain(input.sessionID).catch(() => [])
+    for (const parentSessionID of parentChain) {
+      const unresolvedIndexes = answers
+        .map((answer, index) => ({ index, unresolved: !answer }))
+        .filter((item) => item.unresolved)
+        .map((item) => item.index)
+      if (unresolvedIndexes.length === 0) break
+
+      parentSessionsTried.push(parentSessionID)
+      const candidateAnswers = await deps.answerFromParent({
+        childSessionID: input.sessionID,
+        parentSessionID,
+        questions: input.questions,
+        unresolvedIndexes,
+        abort: input.abort,
+      }).catch(() => new Map())
+
+      for (const index of unresolvedIndexes) {
+        const question = input.questions[index]
+        if (!question) continue
+        const candidate = candidateAnswers.get(index)
+        if (!isValidParentAnswer(candidate, question)) continue
+        answers[index] = normalizeSelectionValues(candidate)
+        byQuestion[index] = { source: "parent", sessionID: parentSessionID }
+      }
+    }
+  }
+
+  const unresolvedIndexes = answers
+    .map((answer, index) => ({ index, unresolved: !answer }))
+    .filter((item) => item.unresolved)
+    .map((item) => item.index)
+
+  if (unresolvedIndexes.length > 0) {
+    const unresolvedQuestions = unresolvedIndexes.map((index) => input.questions[index]).filter((question) => Boolean(question))
+    const userAnswers = await deps.askUser({
+      sessionID: input.sessionID,
+      questions: unresolvedQuestions,
+      tool: input.tool,
+    })
+
+    for (let offset = 0; offset < unresolvedIndexes.length; offset++) {
+      const index = unresolvedIndexes[offset]
+      const answer = normalizeSelectionValues(userAnswers[offset])
+      answers[index] = answer
+      byQuestion[index] = { source: "user" }
+    }
+  }
+
+  return {
+    answers: answers.map((answer) => answer ?? []),
+    byQuestion,
+    parentSessionsTried,
+  }
 }
 
 export const QuestionTool = Tool.define("question", {
   description: DESCRIPTION,
   parameters: z.object({
-    questions: z.array(Question.Info.omit({ custom: true })).describe("Questions to ask"),
+    questions: z.array(QuestionWithoutCustom).describe("Questions to ask"),
   }),
   async execute(params, ctx) {
     const questionCount = params.questions.length
@@ -32,15 +428,21 @@ export const QuestionTool = Tool.define("question", {
           reason: "orchestrator_planner_noninteractive",
           questionCount,
           answers: [] as Question.Answer[],
+          parentSessionsTried: [] as string[],
+          answeredByParentCount: 0,
+          answeredByUserCount: 0,
         },
       }
     }
 
-    const answers = await Question.ask({
+    const resolution = await resolveQuestionAnswersWithHierarchy({
       sessionID: ctx.sessionID,
       questions: params.questions,
       tool: ctx.callID ? { messageID: ctx.messageID, callID: ctx.callID } : undefined,
+      abort: ctx.abort,
+      allowHierarchy: allowHierarchicalQuestionRouting(),
     })
+    const answers = resolution.answers
 
     function format(answer: Question.Answer | undefined) {
       if (!answer?.length) return "Unanswered"
@@ -48,15 +450,20 @@ export const QuestionTool = Tool.define("question", {
     }
 
     const formatted = params.questions.map((q, i) => `"${q.question}"="${format(answers[i])}"`).join(", ")
+    const answeredByParentCount = resolution.byQuestion.filter((entry) => entry.source === "parent").length
+    const answeredByUserCount = resolution.byQuestion.filter((entry) => entry.source === "user").length
 
     return {
       title: `Asked ${questionCount} question${questionCount > 1 ? "s" : ""}`,
-      output: `User has answered your questions: ${formatted}. You can now continue with the user's answers in mind.`,
+      output: `Questions were resolved: ${formatted}. Continue using these answers.`,
       metadata: {
         skipped: false,
         reason: "answered",
         questionCount,
         answers,
+        parentSessionsTried: resolution.parentSessionsTried,
+        answeredByParentCount,
+        answeredByUserCount,
       },
     }
   },
diff --git a/packages/oneshot/src/tool/question.txt b/packages/oneshot/src/tool/question.txt
index 03cd496..49c26f9 100644
--- a/packages/oneshot/src/tool/question.txt
+++ b/packages/oneshot/src/tool/question.txt
@@ -1,4 +1,4 @@
-Use this tool when you need to ask the user questions during execution. This allows you to:
+Use this tool when you need clarification during execution. In nested agent hierarchies, questions are routed up the parent chain first and only escalate to the user if still unresolved. This allows you to:
 1. Gather user preferences or requirements
 2. Clarify ambiguous instructions
 3. Get decisions on implementation choices as you work
diff --git a/packages/oneshot/src/tool/register-plan.ts b/packages/oneshot/src/tool/register-plan.ts
index 2492da6..b5145f8 100644
--- a/packages/oneshot/src/tool/register-plan.ts
+++ b/packages/oneshot/src/tool/register-plan.ts
@@ -1,6 +1,7 @@
 import z from "zod"
 import { Tool } from "./tool"
 import { Orchestrator } from "../orchestrator/types"
+import { evaluatePlanQuality, repairPlanForInitialParallelism } from "../orchestrator/runtime/planner-quality"
 
 const RegisterPlanSchema = z.object({
   reasoning: z.string().describe("Your reasoning for this plan structure"),
@@ -85,7 +86,24 @@ export function clearRegisteredPlan(sessionId: string): void {
   registeredPlans.delete(sessionId)
 }
 
-export function validateRegisteredPlan(params: RegisteredPlan): void {
+export interface RegisteredPlanValidationResult {
+  autoRepaired: boolean
+  repairNotes: string[]
+}
+
+function qualityGateFailureMessage(quality: ReturnType<typeof evaluatePlanQuality>, repairAttempted: boolean): string {
+  const detail = quality.issues.map((issue) => `- ${issue.message}`).join("\n")
+  return [
+    "Plan quality gate failed before registration.",
+    detail,
+    repairAttempted ? "Automatic dependency repair was attempted but the quality gate still failed." : undefined,
+    `Metrics: execution=${quality.metrics.executionTaskCount}, ready_after_planning=${quality.metrics.readyAfterPlanningCount}, longest_chain=${quality.metrics.longestExecutionChain}, sub_orchestrators=${quality.metrics.subOrchestratorCount}.`,
+  ]
+    .filter(Boolean)
+    .join("\n")
+}
+
+export function validateRegisteredPlan(params: RegisteredPlan): RegisteredPlanValidationResult {
   const ids = new Set<string>()
   for (const task of params.tasks) {
     if (ids.has(task.id)) {
@@ -138,6 +156,34 @@ export function validateRegisteredPlan(params: RegisteredPlan): void {
   }
 
   for (const id of ids) visit(id)
+
+  let quality = evaluatePlanQuality(
+    params.tasks.map((task) => ({
+      id: task.id,
+      name: task.name,
+      kind: task.kind,
+      dependencies: task.dependencies,
+      delegationLevel: task.delegationLevel,
+    })),
+  )
+
+  let autoRepaired = false
+  let repairNotes: string[] = []
+  if (quality.issues.length > 0) {
+    const repaired = repairPlanForInitialParallelism(params.tasks)
+    if (repaired.changed) {
+      autoRepaired = repaired.after.issues.length === 0
+      repairNotes = repaired.notes
+      params.tasks = repaired.tasks.map((task) => ({ ...task }))
+      quality = repaired.after
+    }
+  }
+
+  if (quality.issues.length > 0) {
+    throw new Error(qualityGateFailureMessage(quality, autoRepaired || repairNotes.length > 0))
+  }
+
+  return { autoRepaired, repairNotes }
 }
 
 // ── Tool definition ──────────────────────────────────────────────────────
@@ -152,6 +198,9 @@ Root planner guidance:
 - Keep this step focused on fast top-level decomposition.
 - Include a dedicated planning/spec task that owns SPEC.md authoring/refinement.
 - Do not block register_plan on writing full SPEC.md in the root planning pass.
+- For plans with 4+ execution tasks, ensure at least 2 execution tasks are runnable immediately after planning.
+- Prefer fan-out/fan-in dependency shape (parallel subsystem tasks, then integration), not long linear chains.
+- If a subsystem can start with stubs/mocks, do that and defer full cross-system wiring to integration tasks.
 
 The plan defines tasks that will be executed by parallel worker agents. Each worker runs in isolation and cannot see other workers' code — they share context only through SPEC.md and shared interface files.
 
@@ -177,6 +226,11 @@ For complex subsystems, set delegationLevel to "sub-orchestrator" — these task
       '- Each task must include: "id", "name", "description", "dependencies", "acceptanceCriteria", "files".',
       '- Optional: "verificationSpec" on task objects for deterministic checks.',
       '- Optional numeric bounds: "priority" and "complexity" must be integers 1-5.',
+      "Quality reminders:",
+      "- For 4+ execution tasks, at least 2 execution tasks must be runnable immediately after planning.",
+      "- Avoid unnecessary execution chains; keep only true blocking dependencies.",
+      "- For broad plans (6+ execution tasks), include at least one sub-orchestrator delegation.",
+      "- For very large plans (10+ execution tasks), include at least two sub-orchestrator delegations.",
     ]
       .filter(Boolean)
       .join("\n")
@@ -185,7 +239,7 @@ For complex subsystems, set delegationLevel to "sub-orchestrator" — these task
   async execute(params, ctx) {
     const validationSteps = Array.isArray(params.validationPlan) ? params.validationPlan.length : 0
 
-    validateRegisteredPlan(params)
+    const validation = validateRegisteredPlan(params)
 
     // Store the plan keyed by session ID
     registeredPlans.set(ctx.sessionID, params)
@@ -204,12 +258,14 @@ Summary:
 - Sub-orchestrator tasks: ${subOrchestratorCount}
 - Task kinds: ${kindsUsed.join(", ")}
 - Validation steps: ${validationSteps}
+${validation.autoRepaired ? `- Dependency repair: auto-adjusted to satisfy planner quality gate (${validation.repairNotes.join(" ")})` : ""}
 
 The orchestrator will now materialize this plan into an execution graph. Worker agents will execute tasks in parallel based on the dependency chain.`,
       metadata: {
         taskCount: params.tasks.length,
         workerCount,
         subOrchestratorCount,
+        autoRepaired: validation.autoRepaired,
       },
     }
   },
diff --git a/packages/oneshot/test/orchestrator/delegation.test.ts b/packages/oneshot/test/orchestrator/delegation.test.ts
index f7a2314..89985ec 100644
--- a/packages/oneshot/test/orchestrator/delegation.test.ts
+++ b/packages/oneshot/test/orchestrator/delegation.test.ts
@@ -45,9 +45,9 @@ describe("orchestrator delegation heuristics", () => {
     expect(shouldDelegate).toBe(true)
   })
 
-  test("does not auto-delegate at nested depth", () => {
+  test("does not auto-delegate past first nested depth", () => {
     const shouldDelegate = shouldAutoDelegateTask({
-      depth: 1,
+      depth: 2,
       maxRecursionDepth: 5,
       task: {
         name: "Build distributed ingestion pipeline",
@@ -67,6 +67,27 @@ describe("orchestrator delegation heuristics", () => {
     expect(shouldDelegate).toBe(false)
   })
 
+  test("auto-delegates at first nested depth for broad complexity-3 scopes", () => {
+    const shouldDelegate = shouldAutoDelegateTask({
+      depth: 1,
+      maxRecursionDepth: 5,
+      task: {
+        name: "Coordinate multi-module auth rollout",
+        description: "Implement cross-module auth integration across gateway.ts and tokens.ts with parallel tracks.",
+        kind: "implementation",
+        complexity: 3,
+        metadata: {
+          files: [
+            "src/gateway.ts",
+            "src/tokens.ts",
+          ],
+        },
+      },
+    })
+
+    expect(shouldDelegate).toBe(true)
+  })
+
   test("rejects nested sub-orchestrator requests for single-file tasks", () => {
     const shouldNest = shouldNestSubOrchestratorTask({
       depthAfterSplit: 2,
diff --git a/packages/oneshot/test/orchestrator/graph-summary.test.ts b/packages/oneshot/test/orchestrator/graph-summary.test.ts
new file mode 100644
index 0000000..d1432e4
--- /dev/null
+++ b/packages/oneshot/test/orchestrator/graph-summary.test.ts
@@ -0,0 +1,73 @@
+import { describe, expect, test } from "bun:test"
+import { getGraphSummary, getReadyTasks } from "../../src/orchestrator"
+import type { Orchestrator } from "../../src/orchestrator/types"
+
+function createTask(input: {
+  id: string
+  status: Orchestrator.TaskStatus
+  dependencies?: string[]
+  dependents?: string[]
+  kind?: Orchestrator.TaskKind
+}): Orchestrator.Task {
+  const now = Date.now()
+  return {
+    id: input.id,
+    name: input.id,
+    description: `${input.id} description`,
+    status: input.status,
+    kind: input.kind ?? "implementation",
+    priority: 3,
+    complexity: 3,
+    dependencies: input.dependencies ?? [],
+    dependents: input.dependents ?? [],
+    subtaskIds: [],
+    time: { created: now },
+    retryCount: 0,
+    maxRetries: 2,
+    metadata: {},
+  }
+}
+
+function createGraph(tasks: Record<string, Orchestrator.Task>): Orchestrator.TaskGraph {
+  const now = Date.now()
+  return {
+    id: "graph-summary-test",
+    orchestrationId: "run-summary-test",
+    rootPrompt: "test",
+    tasks,
+    adjacencyList: {},
+    status: "running",
+    progress: 0,
+    replanCount: 0,
+    maxReplanCycles: 3,
+    validationRetries: 0,
+    maxValidationRetries: 2,
+    scratchpad: [],
+    time: { created: now },
+  }
+}
+
+describe("orchestrator graph summary helpers", () => {
+  test("treats skipped dependencies as ready", () => {
+    const graph = createGraph({
+      plan: createTask({ id: "plan", status: "skipped", kind: "planning", dependents: ["impl"] }),
+      impl: createTask({ id: "impl", status: "pending", dependencies: ["plan"], dependents: ["validate"] }),
+      validate: createTask({ id: "validate", status: "pending", dependencies: ["impl"], kind: "validation" }),
+    })
+    const readyTaskIds = getReadyTasks(graph).map((task) => task.id)
+    expect(readyTaskIds).toEqual(["impl"])
+  })
+
+  test("counts skipped tasks as completed for progress summaries", () => {
+    const graph = createGraph({
+      done: createTask({ id: "done", status: "completed" }),
+      skipped: createTask({ id: "skipped", status: "skipped" }),
+      failed: createTask({ id: "failed", status: "failed" }),
+      pending: createTask({ id: "pending", status: "pending" }),
+    })
+    const summary = getGraphSummary(graph)
+    expect(summary.completed).toBe(2)
+    expect(summary.failed).toBe(1)
+    expect(summary.progress).toBe(75)
+  })
+})
diff --git a/packages/oneshot/test/orchestrator/mission-control.test.ts b/packages/oneshot/test/orchestrator/mission-control.test.ts
new file mode 100644
index 0000000..a68a63c
--- /dev/null
+++ b/packages/oneshot/test/orchestrator/mission-control.test.ts
@@ -0,0 +1,169 @@
+import { describe, expect, test } from "bun:test"
+import { buildMissionControlState } from "../../src/orchestrator/runtime/mission-control"
+import type { Orchestrator } from "../../src/orchestrator/types"
+
+function createRun(overrides: Partial<Orchestrator.Run> = {}): Orchestrator.Run {
+  const now = Date.now()
+  return {
+    id: "run-mission-control",
+    name: "Mission Control Test",
+    rootPrompt: "test",
+    graphId: "graph-mission-control",
+    status: "active",
+    provider: "anthropic",
+    model: "claude-sonnet-4-5",
+    tokenBudget: 100_000,
+    tokenKillThreshold: 90_000,
+    globalTokenUsage: {
+      inputTokens: 0,
+      outputTokens: 0,
+      totalTokens: 0,
+    },
+    maxRecursionDepth: 5,
+    maxParallelAgents: 4,
+    time: {
+      created: now,
+      updated: now,
+    },
+    ...overrides,
+  }
+}
+
+function createGraph(task: Orchestrator.Task): Orchestrator.TaskGraph {
+  const now = Date.now()
+  return {
+    id: "graph-mission-control",
+    orchestrationId: "run-mission-control",
+    rootPrompt: "test",
+    tasks: {
+      [task.id]: task,
+    },
+    adjacencyList: {
+      [task.id]: [],
+    },
+    status: "running",
+    progress: 0,
+    replanCount: 0,
+    maxReplanCycles: 3,
+    validationRetries: 0,
+    maxValidationRetries: 2,
+    scratchpad: [],
+    time: {
+      created: now,
+    },
+  }
+}
+
+function createEmptyGraph(status: Orchestrator.TaskGraph["status"] = "building"): Orchestrator.TaskGraph {
+  const now = Date.now()
+  return {
+    id: "graph-mission-control",
+    orchestrationId: "run-mission-control",
+    rootPrompt: "test",
+    tasks: {},
+    adjacencyList: {},
+    status,
+    progress: 0,
+    replanCount: 0,
+    maxReplanCycles: 3,
+    validationRetries: 0,
+    maxValidationRetries: 2,
+    scratchpad: [],
+    time: {
+      created: now,
+    },
+  }
+}
+
+function createTask(overrides: Partial<Orchestrator.Task>): Orchestrator.Task {
+  const now = Date.now()
+  return {
+    id: "task-skipped",
+    name: "Skipped Task",
+    description: "task",
+    status: "skipped",
+    kind: "implementation",
+    priority: 3,
+    complexity: 3,
+    dependencies: [],
+    dependents: [],
+    subtaskIds: [],
+    time: {
+      created: now,
+      completed: now,
+    },
+    retryCount: 0,
+    maxRetries: 2,
+    metadata: {},
+    ...overrides,
+  }
+}
+
+function findNodeById(node: Orchestrator.MissionControlNode, id: string): Orchestrator.MissionControlNode | undefined {
+  if (node.id === id) return node
+  for (const child of node.children) {
+    const found = findNodeById(child, id)
+    if (found) return found
+  }
+  return undefined
+}
+
+describe("mission control status mapping", () => {
+  test("maps skipped tasks to done", () => {
+    const run = createRun()
+    const graph = createGraph(createTask({ id: "task-skipped", status: "skipped" }))
+    const missionControl = buildMissionControlState({ run, graph })
+    const taskNode = findNodeById(missionControl.root, "task-skipped")
+    expect(taskNode?.status).toBe("done")
+  })
+
+  test("maps skipped hierarchy snapshot nodes to done", () => {
+    const run = createRun()
+    const graph = createGraph(createTask({
+      id: "task-with-hierarchy",
+      status: "pending",
+      metadata: {
+        hierarchy: [{
+          id: "subagent-1",
+          label: "Subagent 1",
+          status: "skipped",
+          children: [],
+        }],
+      },
+    }))
+    const missionControl = buildMissionControlState({ run, graph })
+    const hierarchyNode = findNodeById(missionControl.root, "subagent-1")
+    expect(hierarchyNode?.status).toBe("done")
+  })
+
+  test("shows root planner node while graph is building", () => {
+    const run = createRun({
+      planningSessionId: "session-planner",
+      status: "active",
+    })
+    const graph = createEmptyGraph("building")
+    const missionControl = buildMissionControlState({ run, graph })
+    const plannerNode = findNodeById(missionControl.root, "root-planner")
+    expect(plannerNode?.label).toBe("Root Planner")
+    expect(plannerNode?.status).toBe("busy")
+    expect(plannerNode?.sessionId).toBe("session-planner")
+  })
+
+  test("uses workflowPhase metadata for deterministic section routing", () => {
+    const run = createRun()
+    const graph = createGraph(createTask({
+      id: "task-phase-validate",
+      name: "Post implementation checks",
+      status: "pending",
+      kind: "implementation",
+      metadata: {
+        workflowPhase: "validate",
+      },
+    }))
+
+    const missionControl = buildMissionControlState({ run, graph })
+    const validateSection = findNodeById(missionControl.root, "section:validate")
+    const taskNode = validateSection ? findNodeById(validateSection, "task-phase-validate") : undefined
+    expect(taskNode?.id).toBe("task-phase-validate")
+  })
+})
diff --git a/packages/oneshot/test/orchestrator/planner-quality.test.ts b/packages/oneshot/test/orchestrator/planner-quality.test.ts
index 5226e86..5297b35 100644
--- a/packages/oneshot/test/orchestrator/planner-quality.test.ts
+++ b/packages/oneshot/test/orchestrator/planner-quality.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, test } from "bun:test"
-import { evaluatePlanQuality, type PlannerQualityTask } from "../../src/orchestrator/runtime/planner-quality"
+import {
+  evaluatePlanQuality,
+  repairPlanForInitialParallelism,
+  type PlannerQualityTask,
+} from "../../src/orchestrator/runtime/planner-quality"
 
 function task(input: PlannerQualityTask): PlannerQualityTask {
   return {
@@ -25,7 +29,11 @@ describe("orchestrator planner quality", () => {
 
     expect(report.metrics.executionTaskCount).toBe(5)
     expect(report.metrics.readyAfterPlanningCount).toBe(1)
-    expect(report.issues.some((issue) => issue.code === "initial_parallelism_low")).toBe(true)
+    const issue = report.issues.find((item) => item.code === "initial_parallelism_low")
+    expect(issue).toBeDefined()
+    expect(issue?.message).toContain("Quality gate requires at least 2 independent workstreams")
+    expect(issue?.message).toContain("Suggested fix")
+    expect(issue?.message).toContain("\"plan\"")
   })
 
   test("accepts plans with multiple workstreams after planning", () => {
@@ -52,11 +60,9 @@ describe("orchestrator planner quality", () => {
       task({ id: "d", name: "D", kind: "implementation", dependencies: ["b"] }),
       task({ id: "e", name: "E", kind: "implementation", dependencies: ["b"] }),
       task({ id: "f", name: "F", kind: "implementation", dependencies: ["c"] }),
-      task({ id: "g", name: "G", kind: "implementation", dependencies: ["d"] }),
-      task({ id: "h", name: "H", kind: "implementation", dependencies: ["e"] }),
-      task({ id: "validate", name: "Validation", kind: "validation", dependencies: ["f", "g", "h"] }),
+      task({ id: "validate", name: "Validation", kind: "validation", dependencies: ["d", "e", "f"] }),
     ])
-    expect(withoutSubOrchestrator.metrics.executionTaskCount).toBe(8)
+    expect(withoutSubOrchestrator.metrics.executionTaskCount).toBe(6)
     expect(withoutSubOrchestrator.issues.some((issue) => issue.code === "missing_sub_orchestrator")).toBe(true)
 
     const withOnlyOneSubOrchestrator = evaluatePlanQuality([
@@ -69,13 +75,34 @@ describe("orchestrator planner quality", () => {
       task({ id: "f", name: "F", kind: "implementation", dependencies: ["b"] }),
       task({ id: "g", name: "G", kind: "implementation", dependencies: ["c"] }),
       task({ id: "h", name: "H", kind: "implementation", dependencies: ["d"] }),
-      task({ id: "i", name: "I", kind: "implementation", dependencies: ["e"] }),
+      task({ id: "i", name: "I", kind: "implementation", dependencies: ["e"], delegationLevel: "sub-orchestrator" }),
       task({ id: "j", name: "J", kind: "implementation", dependencies: ["f"] }),
-      task({ id: "k", name: "K", kind: "implementation", dependencies: ["g"], delegationLevel: "sub-orchestrator" }),
-      task({ id: "l", name: "L", kind: "implementation", dependencies: ["h"] }),
-      task({ id: "validate", name: "Validation", kind: "validation", dependencies: ["i", "j", "k", "l"] }),
+      task({ id: "validate", name: "Validation", kind: "validation", dependencies: ["g", "h", "i", "j"] }),
     ])
-    expect(withOnlyOneSubOrchestrator.metrics.executionTaskCount).toBe(12)
+    expect(withOnlyOneSubOrchestrator.metrics.executionTaskCount).toBe(10)
     expect(withOnlyOneSubOrchestrator.issues.some((issue) => issue.code === "insufficient_sub_orchestrators")).toBe(true)
   })
+
+  test("auto-repairs scaffold dependency bottlenecks for initial fan-out", () => {
+    const input = [
+      task({ id: "planning-spec", name: "Planning", kind: "planning" }),
+      task({ id: "project-scaffold", name: "Project scaffold", kind: "implementation", dependencies: ["planning-spec"] }),
+      task({ id: "database-schema", name: "Database schema", kind: "implementation", dependencies: ["project-scaffold"] }),
+      task({ id: "auth", name: "Auth", kind: "implementation", dependencies: ["project-scaffold"] }),
+      task({ id: "seed-data", name: "Seed data", kind: "implementation", dependencies: ["database-schema"] }),
+      task({ id: "validate", name: "Validation", kind: "validation", dependencies: ["seed-data", "auth"] }),
+    ]
+
+    const repaired = repairPlanForInitialParallelism(input)
+    expect(repaired.changed).toBe(true)
+    expect(repaired.notes.length).toBeGreaterThan(0)
+    expect(repaired.before.issues.some((issue) => issue.code === "initial_parallelism_low")).toBe(true)
+    expect(repaired.after.issues.some((issue) => issue.code === "initial_parallelism_low")).toBe(false)
+    expect(repaired.after.metrics.readyAfterPlanningCount).toBeGreaterThanOrEqual(2)
+
+    const databaseTask = repaired.tasks.find((item) => item.id === "database-schema")
+    const authTask = repaired.tasks.find((item) => item.id === "auth")
+    expect(databaseTask?.dependencies).toEqual(["planning-spec"])
+    expect(authTask?.dependencies).toEqual(["planning-spec"])
+  })
 })
diff --git a/packages/oneshot/test/orchestrator/planning-phase-gates.test.ts b/packages/oneshot/test/orchestrator/planning-phase-gates.test.ts
new file mode 100644
index 0000000..dbf2918
--- /dev/null
+++ b/packages/oneshot/test/orchestrator/planning-phase-gates.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, test } from "bun:test"
+import { PlanningInternals } from "../../src/orchestrator/runtime/langgraph-engine"
+
+describe("planner temporal phase normalization", () => {
+  test("forces validation and deploy tasks behind code completion", () => {
+    const normalized = PlanningInternals.normalizeGeneratedPlanForTesting({
+      reasoning: "test",
+      successDefinition: "complete",
+      validationPlan: [],
+      tasks: [
+        {
+          id: "planning-spec",
+          name: "Planning spec",
+          description: "Create SPEC.md",
+          kind: "planning",
+          dependencies: [],
+          acceptanceCriteria: [],
+          files: [],
+        },
+        {
+          id: "feature-a",
+          name: "Feature A",
+          description: "Implement feature A",
+          kind: "implementation",
+          dependencies: ["planning-spec"],
+          acceptanceCriteria: [],
+          files: [],
+        },
+        {
+          id: "feature-b",
+          name: "Feature B",
+          description: "Implement feature B",
+          kind: "implementation",
+          dependencies: ["planning-spec"],
+          acceptanceCriteria: [],
+          files: [],
+        },
+        {
+          id: "validate",
+          name: "Validate implementation",
+          description: "Run E2E validation",
+          kind: "validation",
+          dependencies: ["planning-spec"],
+          acceptanceCriteria: [],
+          files: [],
+        },
+        {
+          id: "deploy-checks",
+          name: "Deploy checks",
+          description: "Run deploy and release verification",
+          kind: "remediation",
+          dependencies: [],
+          acceptanceCriteria: [],
+          files: [],
+        },
+      ],
+    }, "Build app")
+
+    const taskByID = new Map(normalized.tasks.map((task) => [task.id, task]))
+    const validationDeps = taskByID.get("validate")?.dependencies ?? []
+    const deployDeps = taskByID.get("deploy-checks")?.dependencies ?? []
+    const featureADeps = taskByID.get("feature-a")?.dependencies ?? []
+
+    expect(validationDeps).toContain("planning-spec")
+    expect(validationDeps).toContain("feature-a")
+    expect(validationDeps).toContain("feature-b")
+    expect(deployDeps).toContain("planning-spec")
+    expect(deployDeps).toContain("feature-a")
+    expect(deployDeps).toContain("feature-b")
+    expect(deployDeps).toContain("validate")
+    expect(featureADeps).not.toContain("validate")
+    expect(featureADeps).not.toContain("deploy-checks")
+  })
+})
diff --git a/packages/oneshot/test/orchestrator/replan-decision-sanitization.test.ts b/packages/oneshot/test/orchestrator/replan-decision-sanitization.test.ts
index ad3374a..7af9f27 100644
--- a/packages/oneshot/test/orchestrator/replan-decision-sanitization.test.ts
+++ b/packages/oneshot/test/orchestrator/replan-decision-sanitization.test.ts
@@ -6,15 +6,17 @@ function createTask(input: {
   id: string
   name: string
   status: Orchestrator.TaskStatus
+  kind?: Orchestrator.TaskKind
   dependencies?: string[]
+  description?: string
   error?: string
 }): Orchestrator.Task {
   return {
     id: input.id,
     name: input.name,
-    description: input.name,
+    description: input.description ?? input.name,
     status: input.status,
-    kind: "implementation",
+    kind: input.kind ?? "implementation",
     dependencies: input.dependencies ?? [],
     dependents: [],
     subtaskIds: [],
@@ -206,4 +208,128 @@ describe("supervisor replan decision sanitization", () => {
       ),
     ).toBe(false)
   })
+
+  test("drops validation tasksToAdd until code phase is complete", () => {
+    const codeTask = createTask({
+      id: "impl-core",
+      name: "Implement core",
+      status: "pending",
+      kind: "implementation",
+    })
+    const graph = buildGraph([codeTask])
+
+    const decision: Orchestrator.ReplanDecision = {
+      shouldReplan: true,
+      reasoning: "Add a fresh validation pass.",
+      tasksToAdd: [
+        {
+          id: "validation-pass-2",
+          name: "Validation pass 2",
+          description: "Run regression and e2e checks",
+          kind: "validation",
+          dependencies: [],
+          acceptanceCriteria: [],
+          files: [],
+        },
+      ],
+      tasksToRetry: [],
+      tasksToSkip: [],
+    }
+
+    const sanitized = ReplanDecisionInternals.sanitizeReplanDecision(graph, decision, {
+      maxRetries: 8,
+      maxSkips: 8,
+    })
+
+    expect(sanitized.tasksToAdd).toHaveLength(0)
+  })
+
+  test("drops deploy tasksToAdd until validation phase is complete", () => {
+    const graph = buildGraph([
+      createTask({
+        id: "impl-core",
+        name: "Implement core",
+        status: "completed",
+        kind: "implementation",
+      }),
+      createTask({
+        id: "validation",
+        name: "Validation",
+        status: "pending",
+        kind: "validation",
+        dependencies: ["impl-core"],
+      }),
+    ])
+
+    const decision: Orchestrator.ReplanDecision = {
+      shouldReplan: true,
+      reasoning: "Queue deploy smoke checks.",
+      tasksToAdd: [
+        {
+          id: "deploy-smoke",
+          name: "Deploy smoke",
+          description: "Run deploy smoke and rollout checks",
+          kind: "remediation",
+          dependencies: [],
+          acceptanceCriteria: [],
+          files: [],
+        },
+      ],
+      tasksToRetry: [],
+      tasksToSkip: [],
+    }
+
+    const sanitized = ReplanDecisionInternals.sanitizeReplanDecision(graph, decision, {
+      maxRetries: 8,
+      maxSkips: 8,
+    })
+
+    expect(sanitized.tasksToAdd).toHaveLength(0)
+  })
+
+  test("auto-links deploy tasksToAdd to completed code and validation tasks", () => {
+    const graph = buildGraph([
+      createTask({
+        id: "impl-core",
+        name: "Implement core",
+        status: "completed",
+        kind: "implementation",
+      }),
+      createTask({
+        id: "validation",
+        name: "Validation",
+        status: "completed",
+        kind: "validation",
+        dependencies: ["impl-core"],
+      }),
+    ])
+
+    const decision: Orchestrator.ReplanDecision = {
+      shouldReplan: true,
+      reasoning: "Queue deploy smoke checks.",
+      tasksToAdd: [
+        {
+          id: "deploy-smoke",
+          name: "Deploy smoke",
+          description: "Run deploy smoke and rollout checks",
+          kind: "remediation",
+          dependencies: [],
+          acceptanceCriteria: [],
+          files: [],
+        },
+      ],
+      tasksToRetry: [],
+      tasksToSkip: [],
+    }
+
+    const sanitized = ReplanDecisionInternals.sanitizeReplanDecision(graph, decision, {
+      maxRetries: 8,
+      maxSkips: 8,
+    })
+
+    expect(sanitized.tasksToAdd).toHaveLength(1)
+    const deps = sanitized.tasksToAdd[0]?.dependencies ?? []
+    expect(deps).toContain("impl-core")
+    expect(deps).toContain("validation")
+  })
 })
diff --git a/packages/oneshot/test/orchestrator/temporal-phase-scheduling.test.ts b/packages/oneshot/test/orchestrator/temporal-phase-scheduling.test.ts
new file mode 100644
index 0000000..9bb7c8b
--- /dev/null
+++ b/packages/oneshot/test/orchestrator/temporal-phase-scheduling.test.ts
@@ -0,0 +1,145 @@
+import { describe, expect, test } from "bun:test"
+import { SchedulingInternals } from "../../src/orchestrator/runtime/langgraph-engine"
+import type { Orchestrator } from "../../src/orchestrator/types"
+
+function createTask(input: {
+  id: string
+  name: string
+  status: Orchestrator.TaskStatus
+  kind: Orchestrator.TaskKind
+  dependencies?: string[]
+  description?: string
+}): Orchestrator.Task {
+  const now = Date.now()
+  return {
+    id: input.id,
+    name: input.name,
+    description: input.description ?? input.name,
+    status: input.status,
+    kind: input.kind,
+    dependencies: input.dependencies ?? [],
+    dependents: [],
+    subtaskIds: [],
+    retryCount: 0,
+    maxRetries: 2,
+    metadata: {},
+    time: {
+      created: now - 1_000,
+      completed: input.status === "completed" || input.status === "skipped" ? now : undefined,
+    },
+  }
+}
+
+function buildGraph(tasks: Orchestrator.Task[]): Orchestrator.TaskGraph {
+  const byID: Record<string, Orchestrator.Task> = {}
+  const adjacency: Record<string, string[]> = {}
+  for (const task of tasks) {
+    byID[task.id] = task
+    adjacency[task.id] = []
+  }
+  for (const task of tasks) {
+    for (const dependencyID of task.dependencies) {
+      const dependency = byID[dependencyID]
+      if (!dependency) continue
+      if (!dependency.dependents.includes(task.id)) dependency.dependents.push(task.id)
+      adjacency[dependencyID] = [...new Set([...(adjacency[dependencyID] ?? []), task.id])]
+    }
+  }
+
+  return {
+    id: "graph-temporal-phase-scheduling",
+    orchestrationId: "run-temporal-phase-scheduling",
+    rootPrompt: "Test temporal phase scheduling",
+    tasks: byID,
+    adjacencyList: adjacency,
+    status: "running",
+    progress: 0,
+    replanCount: 0,
+    maxReplanCycles: 3,
+    validationRetries: 0,
+    maxValidationRetries: 2,
+    scratchpad: [],
+    time: {
+      created: Date.now() - 5_000,
+    },
+  }
+}
+
+function readyTasks(graph: Orchestrator.TaskGraph): Orchestrator.Task[] {
+  return Object.values(graph.tasks).filter((task) => {
+    if (task.status !== "pending") return false
+    return task.dependencies.every((dependencyID) => {
+      const status = graph.tasks[dependencyID]?.status
+      return status === "completed" || status === "skipped"
+    })
+  })
+}
+
+describe("temporal phase scheduling", () => {
+  test("keeps validation out of the dispatch set until code tasks finish", () => {
+    const graph = buildGraph([
+      createTask({ id: "plan", name: "Planning", kind: "planning", status: "completed" }),
+      createTask({ id: "impl", name: "Implement", kind: "implementation", status: "pending", dependencies: ["plan"] }),
+      createTask({ id: "validate", name: "Validation", kind: "validation", status: "pending", dependencies: ["plan"] }),
+    ])
+
+    const selected = SchedulingInternals.selectTemporalLaneCandidatesForTesting({
+      graph,
+      readyTasks: readyTasks(graph),
+      runningTasks: [],
+      scopeTasks: Object.values(graph.tasks),
+    })
+
+    expect(selected.map((task) => task.id)).toEqual(["impl"])
+  })
+
+  test("keeps deploy out of the dispatch set until validation tasks finish", () => {
+    const graph = buildGraph([
+      createTask({ id: "plan", name: "Planning", kind: "planning", status: "completed" }),
+      createTask({ id: "impl", name: "Implement", kind: "implementation", status: "completed", dependencies: ["plan"] }),
+      createTask({ id: "validate", name: "Validation", kind: "validation", status: "pending", dependencies: ["impl"] }),
+      createTask({
+        id: "deploy",
+        name: "Deploy checks",
+        kind: "remediation",
+        status: "pending",
+        dependencies: ["plan"],
+        description: "Run deploy and rollout verification",
+      }),
+    ])
+
+    const selected = SchedulingInternals.selectTemporalLaneCandidatesForTesting({
+      graph,
+      readyTasks: readyTasks(graph),
+      runningTasks: [],
+      scopeTasks: Object.values(graph.tasks),
+    })
+
+    expect(selected.map((task) => task.id)).toEqual(["validate"])
+  })
+
+  test("dispatches deploy tasks after code and validation are complete", () => {
+    const graph = buildGraph([
+      createTask({ id: "plan", name: "Planning", kind: "planning", status: "completed" }),
+      createTask({ id: "impl", name: "Implement", kind: "implementation", status: "completed", dependencies: ["plan"] }),
+      createTask({ id: "validate", name: "Validation", kind: "validation", status: "completed", dependencies: ["impl"] }),
+      createTask({
+        id: "deploy",
+        name: "Deploy checks",
+        kind: "remediation",
+        status: "pending",
+        dependencies: ["validate"],
+        description: "Run deploy and rollout verification",
+      }),
+    ])
+
+    const selected = SchedulingInternals.selectTemporalLaneCandidatesForTesting({
+      graph,
+      readyTasks: readyTasks(graph),
+      runningTasks: [],
+      scopeTasks: Object.values(graph.tasks),
+    })
+
+    expect(selected.map((task) => task.id)).toEqual(["deploy"])
+  })
+})
diff --git a/packages/oneshot/test/orchestrator/verification.test.ts b/packages/oneshot/test/orchestrator/verification.test.ts
index 421054f..fec5f21 100644
--- a/packages/oneshot/test/orchestrator/verification.test.ts
+++ b/packages/oneshot/test/orchestrator/verification.test.ts
@@ -134,6 +134,59 @@ describe("orchestrator deterministic verification", () => {
     expect(result.failureScore).toBe(1)
   })
 
+  test("uses pipefail so pipeline failures are not masked", async () => {
+    await using tmp = await tmpdir()
+
+    const spec: Orchestrator.VerificationSpec = {
+      checks: [
+        {
+          id: "pipeline-failure",
+          type: "command",
+          command: "false | true",
+          expectExit: 0,
+          assertions: ["pipeline should fail on left-hand command"],
+          required: true,
+        },
+      ],
+      retryPolicy: {
+        maxFixAttempts: 1,
+        requireProgress: false,
+      },
+    }
+
+    const result = await runVerificationSpec({ projectRoot: tmp.path, spec })
+    expect(result.passed).toBe(false)
+    const check = result.checkResults.find((item) => item.checkId === "pipeline-failure")
+    expect(check?.passed).toBe(false)
+  })
+
+  test("fails when tsc shim output is detected", async () => {
+    await using tmp = await tmpdir()
+
+    const spec: Orchestrator.VerificationSpec = {
+      checks: [
+        {
+          id: "tsc-shim",
+          type: "command",
+          command: "echo tsc && echo 'This is not the tsc command you are looking for'",
+          expectExit: 0,
+          assertions: ["typecheck command must invoke real tsc"],
+          required: true,
+        },
+      ],
+      retryPolicy: {
+        maxFixAttempts: 1,
+        requireProgress: false,
+      },
+    }
+
+    const result = await runVerificationSpec({ projectRoot: tmp.path, spec })
+    expect(result.passed).toBe(false)
+    const check = result.checkResults.find((item) => item.checkId === "tsc-shim")
+    expect(check?.passed).toBe(false)
+    expect(check?.summary.toLowerCase()).toContain("non-typescript tsc shim")
+  })
+
   test("rejects checks that resolve outside the project root", async () => {
     await using tmp = await tmpdir()
 
diff --git a/packages/oneshot/test/orchestrator/worktree-ingest.test.ts b/packages/oneshot/test/orchestrator/worktree-ingest.test.ts
index 8597f1a..9250f36 100644
--- a/packages/oneshot/test/orchestrator/worktree-ingest.test.ts
+++ b/packages/oneshot/test/orchestrator/worktree-ingest.test.ts
@@ -173,6 +173,10 @@ describe("orchestrator worktree ingest helpers", () => {
       path.join(prepared.sessionDirectory, ".pytest_cache", "README.md"),
       "pytest cache metadata\n",
     )
+    await Bun.write(
+      path.join(prepared.sessionDirectory, "app", "tsconfig.tsbuildinfo"),
+      "incremental-build-artifact\n",
+    )
 
     const commit = await commitTaskWorktree({
       repoRoot: prepared.repoRoot,
@@ -190,6 +194,7 @@ describe("orchestrator worktree ingest helpers", () => {
     expect(show.stdout).not.toContain("__pycache__/")
     expect(show.stdout).not.toContain(".pyc")
     expect(show.stdout).not.toContain(".pytest_cache/")
+    expect(show.stdout).not.toContain(".tsbuildinfo")
 
     await cleanupTaskWorktree({
       repoRoot: prepared.repoRoot,
diff --git a/packages/oneshot/test/question/question.test.ts b/packages/oneshot/test/question/question.test.ts
index cf24faa..4fb958b 100644
--- a/packages/oneshot/test/question/question.test.ts
+++ b/packages/oneshot/test/question/question.test.ts
@@ -1,4 +1,5 @@
 import { test, expect } from "bun:test"
+import { $ } from "bun"
 import { Question } from "../../src/question"
 import { Instance } from "../../src/project/instance"
 import { tmpdir } from "../fixture/fixture"
@@ -298,3 +299,49 @@ test("list - returns empty when no pending", async () => {
     },
   })
 })
+
+test("questions are shared across worktrees for the same project", async () => {
+  await using tmp = await tmpdir({ git: true })
+  const branch = `question-shared-${Date.now()}-${Math.floor(Math.random() * 1_000_000)}`
+  const worktreePath = `${tmp.path}-worktree`
+  await $`git worktree add ${worktreePath} -b ${branch}`.cwd(tmp.path).quiet()
+
+  const { askPromise, requestID } = await Instance.provide({
+    directory: worktreePath,
+    fn: async () => {
+      const askPromise = Question.ask({
+        sessionID: "ses_shared",
+        questions: [
+          {
+            question: "Should we proceed?",
+            header: "Decision",
+            options: [{ label: "Yes", description: "Proceed" }],
+          },
+        ],
+      })
+      const pending = await Question.list()
+      const current = pending.find((item) => item.sessionID === "ses_shared")
+      if (!current) throw new Error("Expected pending question to exist in worktree context")
+      return { askPromise, requestID: current.id }
+    },
+  })
+
+  const pendingFromRoot = await Instance.provide({
+    directory: tmp.path,
+    fn: async () => Question.list(),
+  })
+  expect(pendingFromRoot.length).toBe(1)
+  expect(pendingFromRoot[0].sessionID).toBe("ses_shared")
+  expect(pendingFromRoot[0].id).toBe(requestID)
+
+  await Instance.provide({
+    directory: tmp.path,
+    fn: async () =>
+      Question.reply({
+        requestID: pendingFromRoot[0].id,
+        answers: [["Yes"]],
+      }),
+  })
+
+  await expect(askPromise).resolves.toEqual([["Yes"]])
+})
diff --git a/packages/oneshot/test/tool/question.test.ts b/packages/oneshot/test/tool/question.test.ts
index b2e4f22..ccbbaf9 100644
--- a/packages/oneshot/test/tool/question.test.ts
+++ b/packages/oneshot/test/tool/question.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test, spyOn, beforeEach, afterEach } from "bun:test"
 import { z } from "zod"
-import { QuestionTool } from "../../src/tool/question"
+import { QuestionTool, resolveQuestionAnswersWithHierarchy } from "../../src/tool/question"
 import * as QuestionModule from "../../src/question"
 
 const ctx = {
@@ -18,13 +18,14 @@ describe("tool.question", () => {
   let askSpy: any
 
   beforeEach(() => {
-    process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS = "false"
+    delete process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
     askSpy = spyOn(QuestionModule.Question, "ask").mockImplementation(async () => {
       return []
     })
   })
 
   afterEach(() => {
+    delete process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS
     askSpy.mockRestore()
   })
 
@@ -65,7 +66,7 @@ describe("tool.question", () => {
     expect(result.output).toContain(`"What is your favorite animal?"="Dog"`)
   })
 
-  test("should skip blocking question requests in orchestrator-planner sessions by default", async () => {
+  test("should allow orchestrator-planner questions by default", async () => {
     const tool = await QuestionTool.init()
     const questions = [
       {
@@ -75,6 +76,7 @@ describe("tool.question", () => {
       },
     ]
 
+    askSpy.mockResolvedValueOnce([["MVP"]])
     const result = await tool.execute(
       { questions },
       {
@@ -83,18 +85,12 @@ describe("tool.question", () => {
       },
     )
 
-    expect(askSpy).not.toHaveBeenCalled()
-    expect(result.title).toBe("Skipped 1 question")
-    expect(result.output).toContain("Interactive questions are disabled")
-    expect(result.metadata).toMatchObject({
-      skipped: true,
-      reason: "orchestrator_planner_noninteractive",
-      questionCount: 1,
-    })
+    expect(askSpy).toHaveBeenCalledTimes(1)
+    expect(result.title).toBe("Asked 1 question")
   })
 
-  test("should allow orchestrator-planner questions when override env is enabled", async () => {
-    process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS = "true"
+  test("should skip orchestrator-planner questions when override env disables interactivity", async () => {
+    process.env.ONESHOT_ORCHESTRATOR_ALLOW_INTERACTIVE_QUESTIONS = "false"
     const tool = await QuestionTool.init()
     const questions = [
       {
@@ -116,8 +112,107 @@ describe("tool.question", () => {
       },
     )
 
-    expect(askSpy).toHaveBeenCalledTimes(1)
-    expect(result.title).toBe("Asked 1 question")
+    expect(askSpy).not.toHaveBeenCalled()
+    expect(result.title).toBe("Skipped 1 question")
+    expect(result.output).toContain("Interactive questions are disabled")
+  })
+
+  test("resolves questions up the parent chain before escalating to user", async () => {
+    const questions = [
+      {
+        question: "Which package manager should we use?",
+        header: "Package manager",
+        options: [
+          { label: "bun", description: "Use bun commands" },
+          { label: "npm", description: "Use npm commands" },
+        ],
+      },
+      {
+        question: "Which test runner should we use?",
+        header: "Tests",
+        options: [
+          { label: "vitest", description: "Use Vitest" },
+          { label: "jest", description: "Use Jest" },
+        ],
+      },
+    ]
+
+    const askUser = spyOn(QuestionModule.Question, "ask").mockResolvedValue([["jest"]])
+
+    const resolution = await resolveQuestionAnswersWithHierarchy({
+      sessionID: "ses_child",
+      questions,
+      abort: AbortSignal.any([]),
+      allowHierarchy: true,
+    }, {
+      async getParentSessionChain() {
+        return ["ses_parent", "ses_master"]
+      },
+      async answerFromParent(input) {
+        if (input.parentSessionID === "ses_parent") {
+          return new Map([[0, ["bun"]]])
+        }
+        if (input.parentSessionID === "ses_master") {
+          return new Map([[1, ["vitest"]]])
+        }
+        return new Map()
+      },
+      askUser: QuestionModule.Question.ask,
+    })
+
+    expect(askUser).not.toHaveBeenCalled()
+    expect(resolution.answers).toEqual([["bun"], ["vitest"]])
+    expect(resolution.parentSessionsTried).toEqual(["ses_parent", "ses_master"])
+    expect(resolution.byQuestion).toEqual([
+      { source: "parent", sessionID: "ses_parent" },
+      { source: "parent", sessionID: "ses_master" },
+    ])
+  })
+
+  test("escalates only unresolved questions to user after parent attempts", async () => {
+    const questions = [
+      {
+        question: "Which package manager should we use?",
+        header: "Package manager",
+        options: [
+          { label: "bun", description: "Use bun commands" },
+          { label: "npm", description: "Use npm commands" },
+        ],
+      },
+      {
+        question: "Should we include telemetry now?",
+        header: "Telemetry",
+        options: [
+          { label: "Yes", description: "Ship telemetry now" },
+          { label: "No", description: "Defer telemetry" },
+        ],
+      },
+    ]
+
+    const askUser = spyOn(QuestionModule.Question, "ask").mockResolvedValue([["No"]])
+
+    const resolution = await resolveQuestionAnswersWithHierarchy({
+      sessionID: "ses_child",
+      questions,
+      abort: AbortSignal.any([]),
+      allowHierarchy: true,
+    }, {
+      async getParentSessionChain() {
+        return ["ses_parent"]
+      },
+      async answerFromParent() {
+        return new Map([[0, ["bun"]]])
+      },
+      askUser: QuestionModule.Question.ask,
+    })
+
+    expect(askUser).toHaveBeenCalledTimes(1)
+    expect(askUser.mock.calls[0]?.[0].questions).toEqual([questions[1]])
+    expect(resolution.answers).toEqual([["bun"], ["No"]])
+    expect(resolution.byQuestion).toEqual([
+      { source: "parent", sessionID: "ses_parent" },
+      { source: "user" },
+    ])
   })
 
   // intentionally removed the zod validation due to tool call errors, hoping prompting is gonna be good enough
diff --git a/packages/oneshot/test/tool/register-plan.test.ts b/packages/oneshot/test/tool/register-plan.test.ts
index 8bdc767..c4deb61 100644
--- a/packages/oneshot/test/tool/register-plan.test.ts
+++ b/packages/oneshot/test/tool/register-plan.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import type { RegisteredPlan } from "../../src/tool/register-plan"
 import { RegisterPlanTool, validateRegisteredPlan } from "../../src/tool/register-plan"
+import { evaluatePlanQuality } from "../../src/orchestrator/runtime/planner-quality"
 
 function createBasePlan(): RegisteredPlan {
   return {
@@ -74,6 +75,140 @@ describe("tool.register_plan validation", () => {
     expect(() => validateRegisteredPlan(plan)).toThrow(/is not a valid task ID/i)
   })
 
+  test("auto-repairs plans that serialize execution behind scaffold bottlenecks", () => {
+    const plan = createBasePlan()
+    plan.tasks = [
+      {
+        id: "spec-planning",
+        name: "Spec planning",
+        description: "Write SPEC.md",
+        kind: "planning",
+        dependencies: [],
+        acceptanceCriteria: [],
+        files: ["SPEC.md"],
+        priority: 1,
+        complexity: 2,
+        delegationLevel: "worker",
+      },
+      {
+        id: "database-setup",
+        name: "Database setup",
+        description: "Initialize persistence layer",
+        kind: "implementation",
+        dependencies: ["spec-planning"],
+        acceptanceCriteria: [],
+        files: ["src/db.ts"],
+        priority: 2,
+        complexity: 3,
+        delegationLevel: "worker",
+      },
+      {
+        id: "auth-and-layout",
+        name: "Auth and layout",
+        description: "Add auth middleware and layout shell",
+        kind: "implementation",
+        dependencies: ["database-setup"],
+        acceptanceCriteria: [],
+        files: ["src/auth.ts", "src/layout.tsx"],
+        priority: 2,
+        complexity: 3,
+        delegationLevel: "worker",
+      },
+      {
+        id: "ui-component-library",
+        name: "UI component library",
+        description: "Build shared UI components",
+        kind: "implementation",
+        dependencies: ["auth-and-layout"],
+        acceptanceCriteria: [],
+        files: ["src/ui/components.tsx"],
+        priority: 2,
+        complexity: 3,
+        delegationLevel: "worker",
+      },
+      {
+        id: "integration",
+        name: "Integration",
+        description: "Wire subsystems together",
+        kind: "integration",
+        dependencies: ["ui-component-library"],
+        acceptanceCriteria: [],
+        files: ["src/integration.ts"],
+        priority: 3,
+        complexity: 3,
+        delegationLevel: "worker",
+      },
+      {
+        id: "validate",
+        name: "Validate",
+        description: "Run checks",
+        kind: "validation",
+        dependencies: ["integration"],
+        acceptanceCriteria: [],
+        files: [],
+        priority: 3,
+        complexity: 2,
+        delegationLevel: "worker",
+      },
+    ]
+
+    const validation = validateRegisteredPlan(plan)
+    expect(validation.autoRepaired).toBe(true)
+    expect(validation.repairNotes.length).toBeGreaterThan(0)
+    expect(plan.tasks.find((task) => task.id === "auth-and-layout")?.dependencies).toEqual(["spec-planning"])
+    const quality = evaluatePlanQuality(
+      plan.tasks.map((task) => ({
+        id: task.id,
+        name: task.name,
+        kind: task.kind,
+        dependencies: task.dependencies,
+        delegationLevel: task.delegationLevel,
+      })),
+    )
+    expect(quality.issues.some((issue) => issue.code === "initial_parallelism_low")).toBe(false)
+    expect(quality.metrics.readyAfterPlanningCount).toBeGreaterThanOrEqual(2)
+  })
+
+  test("still rejects plans that miss mandatory sub-orchestrator delegation", () => {
+    const plan = createBasePlan()
+    plan.tasks = [
+      {
+        id: "planning-spec",
+        name: "Planning",
+        description: "Write SPEC.md",
+        kind: "planning",
+        dependencies: [],
+        acceptanceCriteria: [],
+        files: ["SPEC.md"],
+        priority: 1,
+        complexity: 2,
+        delegationLevel: "worker",
+      },
+      { id: "a", name: "A", description: "A", kind: "implementation", dependencies: ["planning-spec"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "b", name: "B", description: "B", kind: "implementation", dependencies: ["planning-spec"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "c", name: "C", description: "C", kind: "implementation", dependencies: ["a"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "d", name: "D", description: "D", kind: "implementation", dependencies: ["a"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "e", name: "E", description: "E", kind: "implementation", dependencies: ["b"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "f", name: "F", description: "F", kind: "implementation", dependencies: ["b"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "g", name: "G", description: "G", kind: "implementation", dependencies: ["c"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "h", name: "H", description: "H", kind: "implementation", dependencies: ["d"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "i", name: "I", description: "I", kind: "implementation", dependencies: ["e"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      { id: "j", name: "J", description: "J", kind: "implementation", dependencies: ["f"], acceptanceCriteria: [], files: [], delegationLevel: "worker" },
+      {
+        id: "validate",
+        name: "Validate",
+        description: "Run checks",
+        kind: "validation",
+        dependencies: ["g", "h", "i", "j"],
+        acceptanceCriteria: [],
+        files: [],
+        delegationLevel: "worker",
+      },
+    ]
+
+    expect(() => validateRegisteredPlan(plan)).toThrow(/Plan quality gate failed before registration/i)
+  })
+
   test("formats schema failures with actionable register_plan guidance", async () => {
     const tool = await RegisterPlanTool.init()
     const plan = createBasePlan()