From dde600209e930b287443a88ef40ab2488e076c4e Mon Sep 17 00:00:00 2001
From: Braedon Saunders <braedonsaunders@users.noreply.github.com>
Date: Tue, 24 Feb 2026 23:07:52 -0500
Subject: [PATCH 1/2] Hydrate orchestrator run counts

---
 .../src/components/orchestrate/phase-bar.tsx  |  11 +-
 packages/app/src/components/terminal.tsx      |  60 +-
 packages/app/src/context/orchestrate.tsx      |  62 +-
 packages/app/src/pages/deploy.tsx             | 411 +++++--------
 packages/app/src/pages/orchestrate.tsx        |   7 +-
 packages/desktop/src-tauri/src/cli.rs         |  26 +-
 packages/oneshot/src/cli/cmd/serve.ts         |  41 +-
 packages/oneshot/src/deploy/session.ts        | 193 +++++-
 .../runtime/dependency-bootstrap.ts           | 566 ++++++++++++++++++
 .../orchestrator/runtime/langgraph-engine.ts  |  62 ++
 .../src/orchestrator/runtime/local-deploy.ts  | 166 ++++-
 .../orchestrator/runtime/mission-control.ts   |  14 +-
 .../src/orchestrator/runtime/verification.ts  |  76 ++-
 .../orchestrator/runtime/worktree-ingest.ts   |  21 +-
 packages/oneshot/src/pty/index.ts             |  88 ++-
 15 files changed, 1443 insertions(+), 361 deletions(-)
 create mode 100644 packages/oneshot/src/orchestrator/runtime/dependency-bootstrap.ts

diff --git a/packages/app/src/components/orchestrate/phase-bar.tsx b/packages/app/src/components/orchestrate/phase-bar.tsx
index 703970f..2a48730 100644
--- a/packages/app/src/components/orchestrate/phase-bar.tsx
+++ b/packages/app/src/components/orchestrate/phase-bar.tsx
@@ -94,6 +94,13 @@ export const PhaseBar: Component<PhaseBarProps> = (props) => {
     if (props.runStatus === "failed" || props.runStatus === "killed") return true
     return !props.runStatus && props.phase === "failed"
   }
+  const showResume = () => !!props.onResume && !!props.runId && canResume()
+  const showPause = () =>
+    !!props.onPause
+    && !!props.runId
+    && isActive()
+    && !isPaused()
+    && !showResume()
   const pendingQuestions = () => props.pendingQuestionCount ?? 0
   const isActionPending = () =>
     !!props.isPausing || !!props.isResuming || !!props.isDeleting || !!props.isDeploying
@@ -208,7 +215,7 @@ export const PhaseBar: Component<PhaseBarProps> = (props) => {
         </div>
 
         <div class="ml-auto flex shrink-0 items-center justify-end gap-1.5">
-          <Show when={isActive() && !isPaused() && props.onPause && props.runId}>
+          <Show when={showPause()}>
             <Tooltip placement="top" value="Pause run">
               <Button
                 size="small"
@@ -223,7 +230,7 @@ export const PhaseBar: Component<PhaseBarProps> = (props) => {
             </Tooltip>
           </Show>
 
-          <Show when={canResume() && props.onResume && props.runId}>
+          <Show when={showResume()}>
             <Tooltip placement="top" value="Resume run">
               <Button
                 size="small"
diff --git a/packages/app/src/components/terminal.tsx b/packages/app/src/components/terminal.tsx
index 4b00dab..e498769 100644
--- a/packages/app/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
@@ -62,6 +62,37 @@ const debugTerminal = (...values: unknown[]) => {
   console.debug("[terminal]", ...values)
 }
 
+const looksLikeGlyphNoiseChunk = (value: string): boolean => {
+  const trimmed = value.trim()
+  if (trimmed.length < 64) return false
+  const chars = [...trimmed]
+  const total = chars.length
+  let asciiCount = 0
+  let whitespaceCount = 0
+  let astralCount = 0
+  let cjkCount = 0
+  for (const ch of chars) {
+    const code = ch.codePointAt(0) ?? 0
+    if (code >= 0x20 && code <= 0x7e) asciiCount += 1
+    if (/\s/u.test(ch)) whitespaceCount += 1
+    if (code > 0xffff) astralCount += 1
+    if (code >= 0x3400 && code <= 0x9fff) cjkCount += 1
+  }
+  const cjkNoise = cjkCount >= 48 && cjkCount / Math.max(1, total) > 0.72 && asciiCount < 10
+  const astralNoise =
+    astralCount >= 40 && astralCount / Math.max(1, total) > 0.68 && asciiCount < 6 && whitespaceCount < 4
+  return cjkNoise || astralNoise
+}
+
+const sanitizeTerminalReplay = (value: string): string => {
+  if (!value) return value
+  const lines = value.split("\n")
+  const filtered = lines.filter((line) => !looksLikeGlyphNoiseChunk(line))
+  const joined = filtered.join("\n")
+  if (!joined) return ""
+  return looksLikeGlyphNoiseChunk(joined) ? "" : joined
+}
+
 const useTerminalUiBindings = (input: {
   container: HTMLDivElement
   term: Term
@@ -314,7 +345,8 @@ export const Terminal = (props: TerminalProps) => {
 
       const once = { value: false }
 
-      const restore = typeof local.pty.buffer === "string" ? local.pty.buffer : ""
+      const restoreRaw = typeof local.pty.buffer === "string" ? local.pty.buffer : ""
+      const restore = sanitizeTerminalReplay(restoreRaw)
       const restoreSize =
         restore &&
         typeof local.pty.cols === "number" &&
@@ -459,22 +491,30 @@ export const Terminal = (props: TerminalProps) => {
         if (event.data instanceof ArrayBuffer) {
           // WebSocket control frame: 0x00 + UTF-8 JSON (currently { cursor }).
           const bytes = new Uint8Array(event.data)
-          if (bytes[0] !== 0) return
-          const json = decoder.decode(bytes.subarray(1))
-          try {
-            const meta = JSON.parse(json) as { cursor?: unknown }
-            const next = meta?.cursor
-            if (typeof next === "number" && Number.isSafeInteger(next) && next >= 0) {
-              cursor = next
+          if (bytes[0] === 0) {
+            const json = decoder.decode(bytes.subarray(1))
+            try {
+              const meta = JSON.parse(json) as { cursor?: unknown }
+              const next = meta?.cursor
+              if (typeof next === "number" && Number.isSafeInteger(next) && next >= 0) {
+                cursor = next
+              }
+            } catch (err) {
+              debugTerminal("invalid websocket control frame", err)
             }
-          } catch (err) {
-            debugTerminal("invalid websocket control frame", err)
+            return
           }
+
+          const binaryText = decoder.decode(bytes)
+          if (!binaryText || looksLikeGlyphNoiseChunk(binaryText)) return
+          output?.push(binaryText)
+          cursor += binaryText.length
           return
         }
 
         const data = typeof event.data === "string" ? event.data : ""
         if (!data) return
+        if (looksLikeGlyphNoiseChunk(data)) return
         output?.push(data)
         cursor += data.length
       }
diff --git a/packages/app/src/context/orchestrate.tsx b/packages/app/src/context/orchestrate.tsx
index 59dd07a..3459b50 100644
--- a/packages/app/src/context/orchestrate.tsx
+++ b/packages/app/src/context/orchestrate.tsx
@@ -354,6 +354,8 @@ export interface OrchestrateRunSnapshot {
   tokenUsage?: { inputTokens: number; outputTokens: number; totalTokens: number }
 }
 
+const RUN_HISTORY_PREFETCH_LIMIT = 5
+
 // ─── Local helpers ─────────────────────────────────────────────────────────────
 
 const SseTaskUpdatedEventSchema = z.object({
@@ -935,6 +937,7 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
     // Run history
     const [runs, setRuns] = createStore<OrchestrateRunSnapshot[]>([])
     const [selectedRunId, setSelectedRunId] = createSignal<string | undefined>(undefined)
+    const runHistoryHydrationInFlight = new Set<string>()
     let runStartTime = 0
     let eventSourceCleanup: (() => void) | undefined
 
@@ -1024,6 +1027,18 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       return snapshot
     }
 
+    async function hydrateRunSnapshotTasks(runId: string): Promise<void> {
+      const normalizedRunId = runId.trim()
+      if (!normalizedRunId || runHistoryHydrationInFlight.has(normalizedRunId)) return
+
+      runHistoryHydrationInFlight.add(normalizedRunId)
+      try {
+        await fetchRunSnapshotFromServer(normalizedRunId)
+      } finally {
+        runHistoryHydrationInFlight.delete(normalizedRunId)
+      }
+    }
+
     async function refreshRunHistoryFromServer(): Promise<any[]> {
       const base = sdk.url ?? ""
       const directory = sdk.directory
@@ -1035,6 +1050,7 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
 
       const payload = await response.json().catch(() => []) as unknown
       const serverRuns = Array.isArray(payload) ? payload : []
+      let prefetchRunIds: string[] = []
 
       setRuns(
         produce((draft) => {
@@ -1053,10 +1069,18 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
             })
 
           merged.sort((left, right) => right.time.started - left.time.started)
+          prefetchRunIds = merged
+            .slice(0, RUN_HISTORY_PREFETCH_LIMIT)
+            .filter((run) => run.tasks.length === 0)
+            .map((run) => run.id)
           draft.splice(0, draft.length, ...merged)
         }),
       )
 
+      for (const runId of prefetchRunIds) {
+        void hydrateRunSnapshotTasks(runId).catch(() => {})
+      }
+
       return serverRuns
     }
 
@@ -1102,7 +1126,7 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       if (!runId) return
       const snapshot = runs.find((run) => run.id === runId)
       if (!snapshot || snapshot.tasks.length > 0) return
-      void fetchRunSnapshotFromServer(runId).catch(() => {})
+      void hydrateRunSnapshotTasks(runId).catch(() => {})
     })
 
     // ── SSE Event Stream ──────────────────────────────────────────────────
@@ -1528,8 +1552,8 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       try {
         const serverRuns = await refreshRunHistoryFromServer()
         if (serverRuns.length === 0) return
-        // Prefer an active run, otherwise restore a paused run.
-        const active = serverRuns.find((r: any) => r.status === "active") ?? serverRuns.find((r: any) => r.status === "paused")
+        // Prefer a paused run. If an active run is restored, force manual resume.
+        const active = serverRuns.find((r: any) => r.status === "paused") ?? serverRuns.find((r: any) => r.status === "active")
         if (!active) return
         const runStatus = asRunStatus(active.status)
 
@@ -1590,9 +1614,12 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
           }
         }
 
-        // Subscribe only for active runs that are truly still running.
         if (hydratedStatus === "active") {
-          subscribeToRun(active.id)
+          try {
+            await pause()
+          } catch { /* no-op: keep restored run visible in paused/manual-resume mode */ }
+          setState("runStatus", "paused")
+          return
         }
       } catch { /* ignore — server might not be ready yet */ }
     })()
@@ -2465,6 +2492,12 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       const hasAnyOutstanding = state.tasks.some((task) =>
         task.status === "pending" || task.status === "in_progress" || task.status === "blocked",
       )
+      const hasMergeRelatedFailure = state.tasks.some((task) => {
+        if (task.status !== "failed") return false
+        if (task.agentBranch || task.worktreePath || typeof task.metrics?.ingestMs === "number") return true
+        const corpus = `${task.error ?? ""}\n${task.result ?? ""}`.toLowerCase()
+        return /\bmerge ingest\b|\bdeterministic merge\b|\bmerge conflict\b|\bunmerged\b|\bmerge blocked\b|\bconflict resolver\b/.test(corpus)
+      })
 
       const orchestratorStatus: AgentNode["status"] = runFailed
         ? "failed"
@@ -2519,12 +2552,12 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       // Ingest/Merge agent node — visible when the ingest session exists
       const shouldShowIngestNode = !!state.ingestSessionId
       const ingestSessionStatus = state.ingestSessionId ? sync.data.session_status[state.ingestSessionId] : undefined
-      const ingestStatus: AgentNode["status"] = runFailed
-        ? "failed"
-        : runPaused
-          ? "paused"
-          : ingestSessionStatus?.type === "busy" || ingestSessionStatus?.type === "retry"
-            ? "busy"
+      const ingestStatus: AgentNode["status"] = runPaused
+        ? "paused"
+        : ingestSessionStatus?.type === "busy" || ingestSessionStatus?.type === "retry"
+          ? "busy"
+          : hasMergeRelatedFailure
+            ? "failed"
             : state.phase === "complete"
               ? "done"
               : hasAnyCompleted && hasAnyOutstanding
@@ -2902,7 +2935,12 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       }
 
       if (remoteRunStatus === "active") {
-        subscribeToRun(targetRunId)
+        try {
+          await pause()
+        } catch { /* no-op: keep opened run visible in paused/manual-resume mode */ }
+        setState("runStatus", "paused")
+        eventSourceCleanup?.()
+        eventSourceCleanup = undefined
       } else {
         eventSourceCleanup?.()
         eventSourceCleanup = undefined
diff --git a/packages/app/src/pages/deploy.tsx b/packages/app/src/pages/deploy.tsx
index e7e436f..b30711c 100644
--- a/packages/app/src/pages/deploy.tsx
+++ b/packages/app/src/pages/deploy.tsx
@@ -1,6 +1,5 @@
 import { For, Show, createEffect, createMemo, createSignal, onCleanup, type JSX } from "solid-js"
 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"
@@ -242,6 +241,35 @@ function clampLogs(lines: string[] | undefined, max = 14): string[] {
   return lines.slice(lines.length - max)
 }
 
+function looksLikeGlyphNoise(line: string): boolean {
+  const trimmed = line.trim()
+  if (trimmed.length < 64) return false
+  const chars = [...trimmed]
+  const total = chars.length
+  let cjkCount = 0
+  let astralCount = 0
+  let asciiCount = 0
+  let whitespaceCount = 0
+  for (const ch of chars) {
+    const code = ch.codePointAt(0) ?? 0
+    if (code >= 0x3400 && code <= 0x9fff) cjkCount += 1
+    if (code > 0xffff) astralCount += 1
+    if (code >= 0x20 && code <= 0x7e) asciiCount += 1
+    if (/\s/u.test(ch)) whitespaceCount += 1
+  }
+  const cjkNoise = cjkCount >= 48 && cjkCount / Math.max(1, total) > 0.72 && asciiCount < 10
+  const astralNoise =
+    astralCount >= 40 && astralCount / Math.max(1, total) > 0.68 && asciiCount < 6 && whitespaceCount < 4
+  return cjkNoise || astralNoise
+}
+
+function sanitizeTerminalOutput(value: string): string {
+  if (!value) return value
+  const lines = value.split("\n")
+  const filtered = lines.filter((line) => !looksLikeGlyphNoise(line))
+  return filtered.join("\n")
+}
+
 function parseErrorMessage(payload: unknown): string | undefined {
   if (!payload || typeof payload !== "object") return undefined
   const record = payload as Record<string, unknown>
@@ -270,6 +298,7 @@ function invocationLivePty(invocation: DeployToolInvocation): LocalPTY | undefin
   const record = meta as Record<string, unknown>
   const id = typeof record.livePtyId === "string" ? record.livePtyId.trim() : ""
   if (!id) return undefined
+  if (record.keptRunning === false) return undefined
   const title =
     typeof record.livePtyTitle === "string" && record.livePtyTitle.trim()
       ? record.livePtyTitle.trim()
@@ -354,9 +383,12 @@ function InvocationWidget(props: {
 }): JSX.Element {
   const compact = !!props.compact
   const theme = TOOL_WIDGET_THEME[props.invocation.tool]
-  const logs = clampLogs(props.invocation.output?.logs, compact ? 5 : 14)
+  const sanitizedLogText = createMemo(() =>
+    sanitizeTerminalOutput(clampLogs(props.invocation.output?.logs, compact ? 5 : 14).join("\n")).trim())
+  const sanitizedTextOutput = createMemo(() => sanitizeTerminalOutput(props.invocation.output?.text?.trim() ?? "").trim())
   const table = props.invocation.output?.table
   const livePty = createMemo(() => invocationLivePty(props.invocation))
+  const activeLivePty = createMemo(() => (compact ? undefined : livePty()))
   const maxArtifacts = compact ? 2 : 6
 
   return (
@@ -404,7 +436,7 @@ function InvocationWidget(props: {
           )}
         </Show>
 
-        <Show when={livePty()}>
+        <Show when={activeLivePty()}>
           {(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">
@@ -452,22 +484,20 @@ function InvocationWidget(props: {
           </Show>
         </Show>
 
-        <Show when={!livePty() && logs.length > 0}>
+        <Show when={!activeLivePty() && !!sanitizedLogText()}>
           <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")}
+            {sanitizedLogText()}
           </pre>
         </Show>
 
-        <Show when={props.invocation.output?.text && logs.length === 0 && !livePty()}>
-          {(text) => (
-            <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 when={!!sanitizedTextOutput() && !sanitizedLogText() && !activeLivePty()}>
+          <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`}
+          >
+            {sanitizedTextOutput()}
+          </pre>
         </Show>
 
         <Show when={props.invocation.artifacts.length > 0 && !compact}>
@@ -536,26 +566,39 @@ export default function DeployPage() {
   const orchestrate = useOrchestrate()
 
   const [session, setSession] = createSignal<DeploySession | undefined>(undefined)
-  const [sessions, setSessions] = createSignal<DeploySession[]>([])
   const [tools, setTools] = createSignal<DeployToolDescriptor[]>(DEFAULT_TOOLS)
 
   const [initializing, setInitializing] = createSignal(false)
-  const [refreshing, setRefreshing] = createSignal(false)
-  const [creatingSession, setCreatingSession] = createSignal(false)
+  const [, setCreatingSession] = createSignal(false)
   const [sendingMessage, setSendingMessage] = createSignal(false)
   const [linkingRun, setLinkingRun] = createSignal(false)
   const [openingApp, setOpeningApp] = createSignal(false)
 
   const [chatInput, setChatInput] = createSignal("")
   const [runLinkInput, setRunLinkInput] = createSignal("")
-  const [browserReloadToken, setBrowserReloadToken] = createSignal(0)
   const [activeInvocationId, setActiveInvocationId] = createSignal<string | undefined>(undefined)
   const [paneDismissed, setPaneDismissed] = createSignal(true)
+  const [launchGuideExpanded, setLaunchGuideExpanded] = createSignal(true)
 
+  let chatScrollRef: HTMLDivElement | undefined
+  let chatScrollFrame: number | undefined
+  let initialChatScrollSessionId: string | undefined
   let initializeToken = 0
 
   const fetcher = () => platform.fetch ?? globalThis.fetch
 
+  const scrollChatToBottom = () => {
+    if (chatScrollFrame !== undefined) cancelAnimationFrame(chatScrollFrame)
+    chatScrollFrame = requestAnimationFrame(() => {
+      chatScrollFrame = requestAnimationFrame(() => {
+        chatScrollFrame = undefined
+        const el = chatScrollRef
+        if (!el) return
+        el.scrollTop = el.scrollHeight
+      })
+    })
+  }
+
   const activeRunId = createMemo(() => orchestrate.state.runId?.trim() || "")
 
   const invocationById = createMemo(() => {
@@ -587,13 +630,13 @@ export default function DeployPage() {
 
   const launchGuide = createMemo<LaunchGuide | undefined>(() => {
     const deploy = linkedRunLocalDeploy()
-    if (deploy?.status === "passed" && deploy.launchInstructions) {
+    if (deploy?.launchInstructions) {
       const status: LaunchGuide["status"] = deploy.url ? "RUNNING" : "READY_FOR_MANUAL_START"
       return {
         status,
         summary: deploy.launchInstructions.summary,
         steps: deploy.launchInstructions.steps,
-        openUrl: deploy.url,
+        openUrl: deploy.url ?? latestPreviewUrl(),
         source: "run",
       }
     }
@@ -601,7 +644,7 @@ export default function DeployPage() {
     const current = session()
     if (!current) return undefined
 
-    if (current.launchInstructions && current.status === "passed") {
+    if (current.launchInstructions) {
       return {
         status: parseLaunchStatus(current.appStatus),
         summary: current.launchInstructions.summary,
@@ -646,13 +689,6 @@ export default function DeployPage() {
     return undefined
   })
 
-  const browserPreviewSrc = createMemo(() => {
-    const url = latestPreviewUrl()?.trim()
-    if (!url) return undefined
-    const sep = url.includes("?") ? "&" : "?"
-    return `${url}${sep}oneshot_preview=${browserReloadToken()}`
-  })
-
   const latestInvocation = createMemo(() => {
     const list = session()?.invocations ?? []
     if (list.length === 0) return undefined
@@ -681,8 +717,6 @@ export default function DeployPage() {
         .length,
   )
 
-  const sortedSessions = createMemo(() => [...sessions()].sort((left, right) => right.updatedAt - left.updatedAt))
-
   const workspaceKey = createMemo(() => `${sdk.url ?? ""}::${sdk.directory}`)
 
   async function parseFailure(response: Response, fallback: string): Promise<string> {
@@ -719,28 +753,13 @@ export default function DeployPage() {
     setTools(DEFAULT_TOOLS)
   }
 
-  async function loadSessionsState(): Promise<void> {
-    const payload = await apiJson<unknown>("/deploy/sessions")
-    if (!Array.isArray(payload)) {
-      setSessions([])
-      return
-    }
-    const parsed = payload.map((item) => parseSession(item)).filter((item): item is DeploySession => !!item)
-    setSessions(parsed)
-  }
-
-  async function refreshSessionById(sessionId: string, silent = false): Promise<DeploySession | undefined> {
-    if (!silent) setRefreshing(true)
-    try {
-      const payload = await apiJson<unknown>(`/deploy/session/${sessionId}`)
-      const parsed = parseSession(payload)
-      if (parsed) {
-        setSession(parsed)
-      }
-      return parsed
-    } finally {
-      if (!silent) setRefreshing(false)
+  async function refreshSessionById(sessionId: string): Promise<DeploySession | undefined> {
+    const payload = await apiJson<unknown>(`/deploy/session/${sessionId}`)
+    const parsed = parseSession(payload)
+    if (parsed) {
+      setSession(parsed)
     }
+    return parsed
   }
 
   async function createSessionAndMaybeStart(options: {
@@ -767,7 +786,6 @@ export default function DeployPage() {
       setSession(parsed)
       setActiveInvocationId(undefined)
       setPaneDismissed(true)
-      await loadSessionsState()
       return parsed
     } finally {
       setCreatingSession(false)
@@ -778,15 +796,16 @@ export default function DeployPage() {
     const token = ++initializeToken
     setInitializing(true)
     setSession(undefined)
-    setSessions([])
     setActiveInvocationId(undefined)
     setPaneDismissed(true)
 
     try {
-      await Promise.all([loadToolsState(), loadSessionsState()])
-
-      const latestPayload = await apiJson<unknown>("/deploy/session/latest")
-      const latest = latestPayload ? parseSession(latestPayload) : undefined
+      await loadToolsState()
+      const latest = await createSessionAndMaybeStart({
+        autoStart: false,
+        title: "Deploy Agent Session",
+        linkedRunId: activeRunId() || undefined,
+      })
       if (token !== initializeToken) return
 
       if (latest) {
@@ -822,7 +841,6 @@ export default function DeployPage() {
       if (!next) throw new Error("Invalid deploy session response")
       setSession(next)
       setChatInput("")
-      await loadSessionsState()
     } catch (error) {
       showToast({
         title: "Message failed",
@@ -847,7 +865,6 @@ export default function DeployPage() {
       if (!next) throw new Error("Invalid deploy session response")
       setSession(next)
       setRunLinkInput(next.linkedRunId ?? "")
-      await loadSessionsState()
     } catch (error) {
       showToast({
         title: "Run link update failed",
@@ -884,13 +901,25 @@ export default function DeployPage() {
 
     const intervalMs = current.status === "running" || sendingMessage() ? 1800 : 7000
     const timer = setInterval(() => {
-      void refreshSessionById(current.id, true)
-      void loadSessionsState()
+      void refreshSessionById(current.id)
     }, intervalMs)
 
     onCleanup(() => clearInterval(timer))
   })
 
+  createEffect(() => {
+    const current = session()
+    if (!current) return
+    if (current.messages.length === 0) return
+    if (initialChatScrollSessionId === current.id) return
+    initialChatScrollSessionId = current.id
+    scrollChatToBottom()
+  })
+
+  onCleanup(() => {
+    if (chatScrollFrame !== undefined) cancelAnimationFrame(chatScrollFrame)
+  })
+
   const messageInvocationResolver = (message: DeployMessage): DeployToolInvocation[] => {
     const map = invocationById()
     return message.invocationIds.map((id) => map.get(id)).filter((item): item is DeployToolInvocation => !!item)
@@ -906,17 +935,6 @@ export default function DeployPage() {
     return map
   })
 
-  const activeInvocationOutput = createMemo(() => {
-    const invocation = activeInvocation()
-    if (!invocation) return ""
-    const logs = clampLogs(invocation.output?.logs, 120)
-    if (logs.length > 0) return logs.join("\n")
-    const text = invocation.output?.text?.trim()
-    if (text) return text
-    if (invocation.status === "running") return "Awaiting command output..."
-    return "No command output captured."
-  })
-
   async function openApp(): Promise<void> {
     if (openingApp()) return
     const current = session()
@@ -946,7 +964,7 @@ export default function DeployPage() {
       if (nextSession) {
         setSession(nextSession)
       } else {
-        await refreshSessionById(current.id, true)
+        await refreshSessionById(current.id)
       }
 
       const invocationRecord = record.invocation
@@ -963,15 +981,10 @@ export default function DeployPage() {
 
       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)
-        setPaneDismissed(false)
-      } else if (openedUrl && target === "external") {
+      if (openedUrl && (target === "web_view" || target === "external")) {
         platform.openLink(openedUrl)
       }
 
-      await loadSessionsState()
-
       showToast({
         title: "Open complete",
         description: typeof record.message === "string" ? record.message : undefined,
@@ -1053,70 +1066,26 @@ export default function DeployPage() {
                 <Show when={launchGuide() || session()}>
                   <Button
                     size="small"
-                    variant="secondary"
-                    class="h-7 gap-1.5 px-2.5"
-                    disabled={openingApp() || (!session() && !launchGuide()?.openUrl)}
+                    variant="ghost"
+                    class="h-6 px-2"
+                    disabled={
+                      openingApp() ||
+                      (!session()?.launchUrl?.trim() &&
+                        !(session()?.launchCommand?.length ?? 0) &&
+                        !latestPreviewUrl() &&
+                        !launchGuide()?.openUrl)
+                    }
                     onClick={() => {
                       void openApp()
                     }}
                   >
-                    <Icon name="square-arrow-top-right" size="small" />
                     {openingApp() ? "Opening..." : "Open"}
                   </Button>
                 </Show>
-                <Button
-                  size="small"
-                  variant="secondary"
-                  class="h-7 gap-1.5 px-2.5"
-                  disabled={creatingSession()}
-                  onClick={() => {
-                    void createSessionAndMaybeStart({
-                      autoStart: false,
-                      title: "Deploy Agent Session",
-                      linkedRunId: activeRunId() || undefined,
-                    })
-                  }}
-                >
-                  <Icon name="plus" size="small" />
-                  {creatingSession() ? "Creating..." : "New Session"}
-                </Button>
-                <Button
-                  size="small"
-                  variant="ghost"
-                  class="h-7 px-2.5"
-                  disabled={!session() || refreshing()}
-                  onClick={() => {
-                    const current = session()
-                    if (!current) return
-                    void refreshSessionById(current.id)
-                  }}
-                >
-                  {refreshing() ? "Refreshing..." : "Refresh"}
-                </Button>
               </div>
             </div>
 
             <div class="mt-2 flex flex-wrap items-center gap-2">
-              <select
-                class="min-w-[210px] rounded-md border border-border-weak-base bg-background-base px-2 py-1.5 text-11-regular text-text-base outline-none focus:border-border-base"
-                value={session()?.id ?? ""}
-                onChange={(event) => {
-                  const nextId = event.currentTarget.value
-                  const next = sortedSessions().find((item) => item.id === nextId)
-                  if (!next) return
-                  setSession(next)
-                  setRunLinkInput(next.linkedRunId ?? activeRunId())
-                  void refreshSessionById(next.id, true)
-                }}
-              >
-                <For each={sortedSessions().slice(0, 30)}>
-                  {(item) => (
-                    <option value={item.id}>
-                      {item.id} | {item.status}
-                    </option>
-                  )}
-                </For>
-              </select>
               <Show when={session()?.detectedProjectTypes}>
                 {(detected) => (
                   <For each={detected()}>
@@ -1140,36 +1109,46 @@ export default function DeployPage() {
                     >
                       {guide().status}
                     </span>
-                    <span class="ml-auto text-10-regular text-text-weak">Source: {guide().source}</span>
-                  </div>
-
-                  <Show when={guide().summary}>
-                    {(summary) => <div class="mt-1.5 text-11-regular text-text-base">{summary()}</div>}
-                  </Show>
-
-                  <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>
-                    </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">
+                    <span class="text-10-regular text-text-weak">Source: {guide().source}</span>
                     <Button
                       size="small"
                       variant="ghost"
-                      class="h-7 gap-1.5 px-2.5"
-                      onClick={() => {
-                        void copyLaunchGuide()
-                      }}
+                      class="ml-auto h-6 px-2 text-[10px]"
+                      onClick={() => setLaunchGuideExpanded((current) => !current)}
                     >
-                      Copy Steps
+                      {launchGuideExpanded() ? "Minimize" : "Expand"}
                     </Button>
                   </div>
+
+                  <Show when={launchGuideExpanded()}>
+                    <Show when={guide().summary}>
+                      {(summary) => <div class="mt-1.5 text-11-regular text-text-base">{summary()}</div>}
+                    </Show>
+
+                    <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>
+                      </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"
+                        variant="ghost"
+                        class="h-7 gap-1.5 px-2.5"
+                        onClick={() => {
+                          void copyLaunchGuide()
+                        }}
+                      >
+                        Copy Steps
+                      </Button>
+                    </div>
+                  </Show>
                 </div>
               )}
             </Show>
@@ -1188,7 +1167,12 @@ export default function DeployPage() {
                   </div>
 
                   <div class="min-h-0 flex-1 overflow-hidden bg-background-base">
-                    <div class="relative min-h-0 h-full min-w-0 w-full overflow-y-auto session-scroller">
+                    <div
+                      ref={(el) => {
+                        chatScrollRef = el
+                      }}
+                      class="relative min-h-0 h-full min-w-0 w-full overflow-y-auto session-scroller"
+                    >
                       <div
                         role="log"
                         class="flex min-h-full w-full min-w-0 flex-col gap-4 pb-4 pt-3 px-2 md:max-w-200 md:mx-auto 2xl:max-w-[1000px] md:px-0"
@@ -1207,7 +1191,7 @@ export default function DeployPage() {
                               <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."}
+                                  : "Deploy thread is initializing. It should appear automatically."}
                               </div>
                             }
                           >
@@ -1364,7 +1348,9 @@ export default function DeployPage() {
                 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"
                 }`}
-                style={{ width: toolPaneOpen() ? TOOL_PANE_WIDTH : "0px" }}
+                style={{
+                  width: toolPaneOpen() ? TOOL_PANE_WIDTH : "0px",
+                }}
               >
                 <div
                   class={`h-full min-h-0 bg-background-base ${toolPaneOpen() ? "border-l border-border-weak-base" : ""}`}
@@ -1375,7 +1361,7 @@ export default function DeployPage() {
                         <div>
                           <div class="text-12-medium text-text-strong">Tool Flight Deck</div>
                           <div class="mt-0.5 text-11-regular text-text-weak">
-                            Expanded view for active tools, web surface, and large command output.
+                            Active tool details and live terminal output.
                           </div>
                           <div class="mt-1 text-[10px] text-text-weak">Configured tools: {tools().length}</div>
                         </div>
@@ -1423,94 +1409,29 @@ export default function DeployPage() {
                     </div>
 
                     <div class="min-h-0 flex-1 overflow-auto p-3">
-                      <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>
-                          }
-                        >
-                          {(invocation) => (
-                            <div
-                              onMouseDown={() => {
-                                if (activeInvocationId() !== invocation().id) {
-                                  setActiveInvocationId(invocation().id)
-                                }
-                              }}
-                            >
-                              <InvocationWidget
-                                invocation={invocation()}
-                                onOpenUrl={(url) => window.open(url, "_blank", "noopener,noreferrer")}
-                              />
-                            </div>
-                          )}
-                        </Show>
-
-                        <div class="rounded-xl border border-border-weak-base/70 bg-background-weak-base/25 p-2.5">
-                          <div class="mb-2 flex items-center justify-between gap-2">
-                            <div class="text-11-medium text-text-weak">Web Surface</div>
-                            <div class="flex gap-1.5">
-                              <Button
-                                size="small"
-                                variant="ghost"
-                                class="h-6 px-2"
-                                disabled={!browserPreviewSrc()}
-                                onClick={() => setBrowserReloadToken((current) => current + 1)}
-                              >
-                                Reload
-                              </Button>
-                              <Button
-                                size="small"
-                                variant="ghost"
-                                class="h-6 px-2"
-                                disabled={!latestPreviewUrl()}
-                                onClick={() => {
-                                  const url = latestPreviewUrl()
-                                  if (!url) return
-                                  window.open(url, "_blank", "noopener,noreferrer")
-                                }}
-                              >
-                                Open
-                              </Button>
-                            </div>
+                      <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>
-                          <div class="h-44 overflow-hidden rounded-md border border-border-weak-base/70 bg-background-base">
-                            <Show
-                              when={browserPreviewSrc()}
-                              fallback={<div class="p-2.5 text-11-regular text-text-weak">No preview URL yet.</div>}
-                            >
-                              {(src) => <iframe src={src()} class="h-full w-full" loading="lazy" />}
-                            </Show>
-                          </div>
-                        </div>
-
-                        <div class="min-h-[260px] rounded-xl border border-border-weak-base/70 bg-background-weak-base/25 p-2.5">
-                          <div class="mb-2 flex items-center justify-between gap-2">
-                            <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]}`}
-                                >
-                                  {invocation().status.toUpperCase()}
-                                </span>
-                              )}
-                            </Show>
+                        }
+                      >
+                        {(invocation) => (
+                          <div
+                            onMouseDown={() => {
+                              if (activeInvocationId() !== invocation().id) {
+                                setActiveInvocationId(invocation().id)
+                              }
+                            }}
+                          >
+                            <InvocationWidget
+                              invocation={invocation()}
+                              onOpenUrl={(url) => window.open(url, "_blank", "noopener,noreferrer")}
+                            />
                           </div>
-                          <Show when={activeInvocation()?.output?.command}>
-                            {(command) => (
-                              <div class="mb-2 rounded-md border border-border-weak-base/70 bg-background-base px-2 py-1 font-mono text-[11px] text-text-base break-all">
-                                {command()}
-                              </div>
-                            )}
-                          </Show>
-                          <pre class="h-44 overflow-auto rounded-md border border-border-weak-base/70 bg-background-base/90 px-2 py-2 font-mono text-[11px] leading-relaxed text-text-weak whitespace-pre-wrap break-words">
-                            {activeInvocationOutput()}
-                          </pre>
-                        </div>
-                      </div>
+                        )}
+                      </Show>
                     </div>
                   </div>
                 </div>
diff --git a/packages/app/src/pages/orchestrate.tsx b/packages/app/src/pages/orchestrate.tsx
index e05fb7d..7ce4818 100644
--- a/packages/app/src/pages/orchestrate.tsx
+++ b/packages/app/src/pages/orchestrate.tsx
@@ -437,7 +437,8 @@ function findTopLevelBranch(root: AgentNode, selectedNodeId?: string): AgentNode
   const fallback = root.children[0] ?? root
   if (typeof selectedNodeId !== "string" || !selectedNodeId.trim()) return fallback
   const path = findNodePath(root, selectedNodeId.trim())
-  if (!path || path.length <= 1) return fallback
+  if (!path) return fallback
+  if (path.length === 1) return root
   return path[1] ?? fallback
 }
 
@@ -2682,6 +2683,10 @@ function ActiveRunCenterPane(props: {
         const path = tree ? findNodePath(tree, targetNodeId) : undefined
         setForcedExpandedIds(path && path.length > 0 ? new Set(path.map((node) => node.id)) : undefined)
         queueMicrotask(() => {
+          if (path && path.length === 1) {
+            scrollRef?.scrollTo({ top: 0, behavior: "smooth" })
+            return
+          }
           scrollSelectedNodeIntoView(targetNodeId)
         })
       },
diff --git a/packages/desktop/src-tauri/src/cli.rs b/packages/desktop/src-tauri/src/cli.rs
index cf53afc..8e8d341 100644
--- a/packages/desktop/src-tauri/src/cli.rs
+++ b/packages/desktop/src-tauri/src/cli.rs
@@ -466,7 +466,31 @@ pub fn spawn_command(
             tokio::select! {
                 msg = kill_rx.recv(), if kill_open => {
                     if msg.is_some() {
-                        let _ = child.start_kill();
+                        #[cfg(unix)]
+                        {
+                            // Give the sidecar a brief chance to run graceful shutdown hooks.
+                            let mut terminated = false;
+                            let _ = child.signal(15);
+                            let deadline = tokio::time::Instant::now() + Duration::from_millis(1200);
+                            while tokio::time::Instant::now() < deadline {
+                                match child.try_wait() {
+                                    Ok(Some(_)) => {
+                                        terminated = true;
+                                        break;
+                                    }
+                                    Ok(None) => {}
+                                    Err(_) => break,
+                                }
+                                tokio::time::sleep(Duration::from_millis(80)).await;
+                            }
+                            if !terminated {
+                                let _ = child.start_kill();
+                            }
+                        }
+                        #[cfg(not(unix))]
+                        {
+                            let _ = child.start_kill();
+                        }
                     }
                     kill_open = false;
                 }
diff --git a/packages/oneshot/src/cli/cmd/serve.ts b/packages/oneshot/src/cli/cmd/serve.ts
index ea3c0d5..28f92ee 100644
--- a/packages/oneshot/src/cli/cmd/serve.ts
+++ b/packages/oneshot/src/cli/cmd/serve.ts
@@ -2,6 +2,7 @@ import { Server } from "../../server/server"
 import { cmd } from "./cmd"
 import { withNetworkOptions, resolveNetworkOptions } from "../network"
 import { Flag } from "../../flag/flag"
+import { Instance } from "../../project/instance"
 
 export const ServeCommand = cmd({
   command: "serve",
@@ -14,7 +15,43 @@ export const ServeCommand = cmd({
     const opts = await resolveNetworkOptions(args)
     const server = Server.listen(opts)
     console.log(`oneshot server listening on http://${server.hostname}:${server.port}`)
-    await new Promise(() => {})
-    await server.stop()
+
+    let shuttingDown = false
+    let resolveShutdown: (() => void) | undefined
+    const waitForShutdown = new Promise<void>((resolve) => {
+      resolveShutdown = resolve
+    })
+
+    const signals: NodeJS.Signals[] = ["SIGINT", "SIGTERM", "SIGHUP"]
+    const handlers = new Map<NodeJS.Signals, () => void>()
+
+    const shutdown = async () => {
+      if (shuttingDown) return
+      shuttingDown = true
+
+      for (const [signal, handler] of handlers) {
+        process.off(signal, handler)
+      }
+      handlers.clear()
+
+      await Instance.disposeAll().catch((error) => {
+        console.error("Failed to dispose instances during shutdown", error)
+      })
+      await server.stop(true).catch((error) => {
+        console.error("Failed to stop server during shutdown", error)
+      })
+
+      resolveShutdown?.()
+    }
+
+    for (const signal of signals) {
+      const handler = () => {
+        void shutdown()
+      }
+      handlers.set(signal, handler)
+      process.on(signal, handler)
+    }
+
+    await waitForShutdown
   },
 })
diff --git a/packages/oneshot/src/deploy/session.ts b/packages/oneshot/src/deploy/session.ts
index be65253..572a5b2 100644
--- a/packages/oneshot/src/deploy/session.ts
+++ b/packages/oneshot/src/deploy/session.ts
@@ -1,5 +1,6 @@
 import path from "node:path"
 import { createHash, randomUUID } from "node:crypto"
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs"
 import { access, mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises"
 import { createServer } from "node:net"
 import z from "zod"
@@ -25,11 +26,61 @@ 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 WEB_SURFACE_FALLBACK_PORTS = [3000, 4173, 5173, 8000, 8080] as const
+const DEPLOY_STATE_DIR_NAME = ".oneshot"
+const DEPLOY_STATE_FILE_NAME = "deploy-session.json"
 
 const sessions = new Map<string, DeploySessionInternal>()
 const byDirectory = new Map<string, string[]>()
 const sessionLocks = new Map<string, Promise<void>>()
 const activeLaunches = new Map<string, ActiveLaunchHandle>()
+const loadedDirectories = new Set<string>()
+
+function deployStateFilePath(directory: string): string {
+  return path.join(directory, DEPLOY_STATE_DIR_NAME, DEPLOY_STATE_FILE_NAME)
+}
+
+function persistSessionToDisk(session: DeploySessionInternal): void {
+  const statePath = deployStateFilePath(session.directory)
+  const payload = sanitizeSession({
+    ...session,
+    activeExecution: undefined,
+  })
+  try {
+    mkdirSync(path.dirname(statePath), { recursive: true })
+    writeFileSync(statePath, `${JSON.stringify(payload, null, 2)}\n`, "utf8")
+  } catch (error) {
+    log.warn("Failed to persist deploy session state", {
+      sessionId: session.id,
+      directory: session.directory,
+      error: error instanceof Error ? error.message : String(error),
+    })
+  }
+}
+
+function loadSessionFromDisk(directory: string): DeploySessionInternal | undefined {
+  const statePath = deployStateFilePath(directory)
+  try {
+    const raw = readFileSync(statePath, "utf8")
+    const parsed = DeploySession.parse(JSON.parse(raw))
+    return {
+      ...parsed,
+      activeExecution: undefined,
+    }
+  } catch {
+    return undefined
+  }
+}
+
+function ensureDirectorySessionLoaded(directory: string): void {
+  const normalized = normalizeDirectory(directory)
+  if (loadedDirectories.has(normalized)) return
+  loadedDirectories.add(normalized)
+  const persisted = loadSessionFromDisk(normalized)
+  if (!persisted) return
+  sessions.set(persisted.id, persisted)
+  byDirectory.set(normalized, [persisted.id])
+}
 
 const DeployToolName = z.enum([
   "terminal_exec",
@@ -312,6 +363,17 @@ function parsePortFromUrl(url: string): number | undefined {
   }
 }
 
+async function canBindPort(port: number): Promise<boolean> {
+  if (!Number.isFinite(port) || port < 1 || port > 65_535) return false
+  return new Promise((resolve) => {
+    const server = createServer()
+    server.once("error", () => resolve(false))
+    server.listen(port, "127.0.0.1", () => {
+      server.close((error) => resolve(!error))
+    })
+  })
+}
+
 function isLikelyLocalUrl(url: string): boolean {
   try {
     const parsed = new URL(url)
@@ -340,6 +402,14 @@ async function probeUrl(url: string): Promise<boolean> {
   }
 }
 
+async function snapshotReachableUrls(urls: Iterable<string>): Promise<Set<string>> {
+  const reachable = new Set<string>()
+  for (const url of urls) {
+    if (await probeUrl(url)) reachable.add(url)
+  }
+  return reachable
+}
+
 function likelyWebStartupCommand(command: string): boolean {
   const normalized = command.toLowerCase()
   return (
@@ -3012,7 +3082,37 @@ export async function createDeploySession(
   } = {},
 ): Promise<DeploySession> {
   const directory = normalizeDirectory(input.directory ?? Instance.directory)
+  ensureDirectorySessionLoaded(directory)
   const now = Date.now()
+  const existing = getLatestDeploySessionForDirectory(directory)
+  if (existing) {
+    const resumed = sessions.get(existing.id)
+    if (resumed) {
+      const nextTitle = input.title?.trim()
+      if (nextTitle) resumed.title = nextTitle
+      if (input.linkedRunId !== undefined) {
+        resumed.linkedRunId = input.linkedRunId?.trim() || undefined
+      }
+      resumed.updatedAt = now
+      persistSessionToDisk(resumed)
+    }
+    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."
+      void sendDeploySessionMessage({
+        sessionId: existing.id,
+        directory,
+        text: prompt,
+      }).catch((error) => {
+        log.warn("Deploy auto-start failed", {
+          sessionId: existing.id,
+          error: error instanceof Error ? error.message : String(error),
+        })
+      })
+    }
+    return getLatestDeploySessionForDirectory(directory) ?? existing
+  }
   const sessionId = makeSessionID()
   const title = input.title?.trim() || "Deploy Session"
 
@@ -3036,12 +3136,13 @@ export async function createDeploySession(
   }
 
   sessions.set(session.id, session)
-  trackDirectorySession(directory, session.id)
+  byDirectory.set(directory, [session.id])
 
   pushMessage(session, {
     role: "system",
     text: "Deploy session initialized. The deploy agent can run terminal, browser, HTTP, file, docker, DB, iOS, Android, desktop, and artifact tools.",
   })
+  persistSessionToDisk(session)
 
   if (input.autoStart) {
     const prompt =
@@ -3067,14 +3168,14 @@ export function listDeploySessions(
     directory?: string
   } = {},
 ): DeploySession[] {
-  const directory = input.directory ? normalizeDirectory(input.directory) : undefined
-  const all = [...sessions.values()]
-    .filter((session) => !directory || session.directory === directory)
-    .sort((left, right) => right.updatedAt - left.updatedAt)
-  return all.map((session) => sanitizeSession(session))
+  const directory = normalizeDirectory(input.directory ?? Instance.directory)
+  ensureDirectorySessionLoaded(directory)
+  const latest = getLatestDeploySessionForDirectory(directory)
+  return latest ? [latest] : []
 }
 
 export function getDeploySession(input: { sessionId: string; directory?: string }): DeploySession | undefined {
+  ensureDirectorySessionLoaded(input.directory ?? Instance.directory)
   const session = sessions.get(input.sessionId)
   if (!session) return undefined
   if (input.directory && normalizeDirectory(input.directory) !== session.directory) return undefined
@@ -3083,6 +3184,7 @@ export function getDeploySession(input: { sessionId: string; directory?: string
 
 export function getLatestDeploySessionForDirectory(directory: string): DeploySession | undefined {
   const normalized = normalizeDirectory(directory)
+  ensureDirectorySessionLoaded(normalized)
   const ids = byDirectory.get(normalized) ?? []
   if (ids.length === 0) return undefined
   const latest = ids
@@ -3109,6 +3211,7 @@ export async function linkDeploySessionToRun(input: {
       ? `Linked deploy session to orchestration run ${runId}. Failures will queue remediation on the Deploy page.`
       : "Removed orchestration run link for this deploy session.",
   })
+  persistSessionToDisk(session)
   return sanitizeSession(session)
 }
 
@@ -3183,6 +3286,7 @@ export async function invokeDeploySessionTool(input: {
     session.updatedAt = Date.now()
   })
 
+  persistSessionToDisk(session)
   return sanitizeSession(session)
 }
 
@@ -3249,11 +3353,30 @@ export async function sendDeploySessionMessage(input: {
       session.status = "failed"
       session.lastError = `${failedInvocations.length} tool invocation(s) failed.`
       session.appStatus = "ready_for_manual_start"
+      const handoff = buildExternalRunHandoffMessage({
+        session,
+        signals: plan.signals,
+        invocationIds,
+      })
       pushMessage(session, {
         role: "assistant",
         text: `Deploy flow completed with failures in ${failedInvocations.length} tool invocation(s).`,
         invocationIds,
       })
+      pushMessage(session, {
+        role: "assistant",
+        text: handoff.text,
+        invocationIds: handoff.invocationIds,
+      })
+      session.launchCommand = handoff.startCommand?.length ? [...handoff.startCommand] : undefined
+      const latestUrl = latestPreviewUrlFromSession(session)
+      if (latestUrl) session.launchUrl = latestUrl
+      session.launchInstructions = {
+        summary: handoff.summary,
+        steps: handoff.steps,
+        source: "heuristic",
+        generatedAt: Date.now(),
+      }
 
       const routed = await routeDeployFailuresToRun({
         session,
@@ -3310,6 +3433,7 @@ export async function sendDeploySessionMessage(input: {
     session.updatedAt = Date.now()
   })
 
+  persistSessionToDisk(session)
   return sanitizeSession(session)
 }
 
@@ -3512,13 +3636,49 @@ export async function openDeploySessionApp(input: {
     }
 
     const preferredPort = preferredUrl ? parsePortFromUrl(preferredUrl) : undefined
+    const hasPreferredPort = typeof preferredPort === "number" && Number.isFinite(preferredPort)
+    let launchPort = preferredPort
+    let portSelectionNote: string | undefined
+    if (target === "web_view") {
+      if (hasPreferredPort && !await canBindPort(preferredPort)) {
+        const fallbackPort = await findOpenPort().catch(() => undefined)
+        if (Number.isFinite(fallbackPort)) {
+          launchPort = fallbackPort
+          portSelectionNote = `Preferred port ${preferredPort} was already in use; using ${fallbackPort} instead.`
+        } else {
+          launchPort = undefined
+          portSelectionNote = `Preferred port ${preferredPort} was already in use and no fallback port could be reserved.`
+        }
+      } else if (!hasPreferredPort) {
+        const fallbackPort = await findOpenPort().catch(() => undefined)
+        if (Number.isFinite(fallbackPort)) {
+          launchPort = fallbackPort
+          portSelectionNote = `Assigned available port ${fallbackPort} for web launch.`
+        }
+      }
+    }
+
+    const webCandidates = (() => {
+      const urls = new Set<string>()
+      if (Number.isFinite(launchPort)) urls.add(`http://127.0.0.1:${launchPort}`)
+      if (preferredUrl?.trim()) urls.add(preferredUrl.trim())
+      for (const port of WEB_SURFACE_FALLBACK_PORTS) {
+        urls.add(`http://127.0.0.1:${port}`)
+      }
+      return [...urls]
+    })()
+
+    const baselineReachable = target === "web_view"
+      ? await snapshotReachableUrls(webCandidates.filter((url) => isLikelyLocalUrl(url)))
+      : new Set<string>()
+
     const env = Object.fromEntries(
       Object.entries({
         ...process.env,
         BROWSER: "none",
-        ...(Number.isFinite(preferredPort)
+        ...(Number.isFinite(launchPort)
           ? {
-              PORT: String(preferredPort),
+              PORT: String(launchPort),
               HOST: "127.0.0.1",
               HOSTNAME: "127.0.0.1",
             }
@@ -3569,17 +3729,8 @@ export async function openDeploySessionApp(input: {
     }
 
     const logs: string[] = [`Started live terminal ${ptyInfo.id} for Open.`, `Command: ${commandToString(command)}`]
-    let detectedUrl = preferredUrl
-    const webCandidates = [
-      "http://127.0.0.1:3000",
-      "http://127.0.0.1:4173",
-      "http://127.0.0.1:5173",
-      "http://127.0.0.1:8000",
-      "http://127.0.0.1:8080",
-    ]
-    if (Number.isFinite(preferredPort)) {
-      webCandidates.unshift(`http://127.0.0.1:${preferredPort}`)
-    }
+    if (portSelectionNote) logs.push(portSelectionNote)
+    let detectedUrl = preferredUrl && !isLikelyLocalUrl(preferredUrl) ? preferredUrl : undefined
 
     const startedAt = Date.now()
     while (Date.now() - startedAt < OPEN_STARTUP_WAIT_MS) {
@@ -3597,7 +3748,11 @@ export async function openDeploySessionApp(input: {
           detectedUrl = url
           break
         }
+        if (baselineReachable.has(url)) {
+          continue
+        }
         if (await probeUrl(url)) {
+          if (baselineReachable.has(url)) continue
           detectedUrl = url
           break
         }
diff --git a/packages/oneshot/src/orchestrator/runtime/dependency-bootstrap.ts b/packages/oneshot/src/orchestrator/runtime/dependency-bootstrap.ts
new file mode 100644
index 0000000..25f517d
--- /dev/null
+++ b/packages/oneshot/src/orchestrator/runtime/dependency-bootstrap.ts
@@ -0,0 +1,566 @@
+import { createHash } from "node:crypto"
+import { access, lstat, mkdir, readFile, readdir, symlink } from "node:fs/promises"
+import path from "node:path"
+import { Lock } from "../../util/lock"
+import { Log } from "../../util/log"
+
+const log = Log.create({ service: "orchestrator.runtime.dependency-bootstrap" })
+
+const DEPENDENCY_BOOTSTRAP_TIMEOUT_MS = Number(
+  process.env.ONESHOT_DEPENDENCY_BOOTSTRAP_TIMEOUT_MS ?? 15 * 60 * 1000,
+)
+
+const FINGERPRINT_FILES = [
+  "package.json",
+  "package-lock.json",
+  "pnpm-lock.yaml",
+  "yarn.lock",
+  "bun.lock",
+  "bun.lockb",
+  "requirements.txt",
+  "pyproject.toml",
+  "poetry.lock",
+  "Pipfile",
+  "Pipfile.lock",
+  "Gemfile",
+  "Gemfile.lock",
+  "go.mod",
+  "go.sum",
+  "Cargo.toml",
+  "Cargo.lock",
+  "Podfile",
+  "Podfile.lock",
+  "Package.swift",
+  "Package.resolved",
+  "pom.xml",
+  "build.gradle",
+  "build.gradle.kts",
+] as const
+
+const WORKTREE_LINK_CANDIDATES = [
+  "node_modules",
+  ".venv",
+  "venv",
+  "Pods",
+  ".swiftpm",
+  ".build",
+  "vendor/bundle",
+  ".bundle",
+] as const
+
+const bootstrappedFingerprintByProject = new Map<string, string>()
+
+type NodePackageManager = "bun" | "pnpm" | "yarn" | "npm"
+
+interface BootstrapCommand {
+  label: string
+  command: string[]
+  fallbackCommand?: string[]
+}
+
+export interface DependencyBootstrapResult {
+  executed: boolean
+  commands: string[]
+  notes: string[]
+  fingerprint: string
+}
+
+export interface HydrateWorktreeDependenciesResult {
+  linkedPaths: string[]
+}
+
+export async function bootstrapProjectDependencies(projectRoot: string): Promise<DependencyBootstrapResult> {
+  const resolvedRoot = path.resolve(projectRoot)
+  const lockKey = `orchestrator.dependencies.bootstrap.${resolvedRoot}`
+  using _lock = await Lock.write(lockKey)
+
+  const fingerprint = await computeDependencyFingerprint(resolvedRoot)
+  const previousFingerprint = bootstrappedFingerprintByProject.get(resolvedRoot)
+  if (previousFingerprint && previousFingerprint === fingerprint) {
+    return {
+      executed: false,
+      commands: [],
+      notes: ["Dependency manifests unchanged; skipped bootstrap."],
+      fingerprint,
+    }
+  }
+
+  const commands = await detectBootstrapCommands(resolvedRoot)
+  if (commands.commands.length === 0) {
+    bootstrappedFingerprintByProject.set(resolvedRoot, fingerprint)
+    return {
+      executed: false,
+      commands: [],
+      notes: commands.notes.length > 0 ? commands.notes : ["No dependency manifests detected."],
+      fingerprint,
+    }
+  }
+
+  const executedCommands: string[] = []
+  const notes = [...commands.notes]
+  for (const step of commands.commands) {
+    const attempt = await runCommand(step.command, resolvedRoot)
+    if (attempt.exitCode === 0) {
+      executedCommands.push(formatCommand(step.command))
+      continue
+    }
+
+    if (step.fallbackCommand) {
+      const fallback = await runCommand(step.fallbackCommand, resolvedRoot)
+      if (fallback.exitCode === 0) {
+        executedCommands.push(formatCommand(step.fallbackCommand))
+        notes.push(`${step.label}: primary command failed; fallback succeeded.`)
+        continue
+      }
+      throw new Error(
+        `${step.label} failed. Primary: ${formatCommand(step.command)}. `
+        + `Fallback: ${formatCommand(step.fallbackCommand)}. `
+        + `Error: ${summarizeOutput(fallback.stderr || fallback.stdout || attempt.stderr || attempt.stdout, fallback.timedOut || attempt.timedOut)}`,
+      )
+    }
+
+    throw new Error(
+      `${step.label} failed: ${formatCommand(step.command)}. `
+      + `${summarizeOutput(attempt.stderr || attempt.stdout, attempt.timedOut)}`,
+    )
+  }
+
+  bootstrappedFingerprintByProject.set(resolvedRoot, fingerprint)
+  return {
+    executed: executedCommands.length > 0,
+    commands: executedCommands,
+    notes,
+    fingerprint,
+  }
+}
+
+export async function hydrateWorktreeDependencies(input: {
+  sourceProjectRoot: string
+  targetProjectRoot: string
+}): Promise<HydrateWorktreeDependenciesResult> {
+  const sourceRoot = path.resolve(input.sourceProjectRoot)
+  const targetRoot = path.resolve(input.targetProjectRoot)
+  const linkedPaths: string[] = []
+
+  for (const relPath of WORKTREE_LINK_CANDIDATES) {
+    const sourcePath = path.join(sourceRoot, relPath)
+    const targetPath = path.join(targetRoot, relPath)
+
+    const sourceStat = await lstat(sourcePath).catch(() => undefined)
+    if (!sourceStat) continue
+
+    const targetStat = await lstat(targetPath).catch(() => undefined)
+    if (targetStat) continue
+
+    await mkdir(path.dirname(targetPath), { recursive: true })
+    try {
+      await symlink(sourcePath, targetPath, sourceStat.isDirectory() ? "dir" : "file")
+      linkedPaths.push(relPath)
+    } catch (error) {
+      log.warn("Failed to link dependency path into worktree", {
+        sourcePath,
+        targetPath,
+        error: error instanceof Error ? error.message : String(error),
+      })
+    }
+  }
+
+  return { linkedPaths }
+}
+
+async function detectBootstrapCommands(projectRoot: string): Promise<{
+  commands: BootstrapCommand[]
+  notes: string[]
+}> {
+  const commands: BootstrapCommand[] = []
+  const notes: string[] = []
+
+  const node = await detectNodeBootstrapCommand(projectRoot)
+  if (node.command) commands.push(node.command)
+  if (node.note) notes.push(node.note)
+
+  const python = await detectPythonBootstrapCommands(projectRoot)
+  commands.push(...python.commands)
+  notes.push(...python.notes)
+
+  const ruby = await detectRubyBootstrapCommand(projectRoot)
+  if (ruby.command) commands.push(ruby.command)
+  if (ruby.note) notes.push(ruby.note)
+
+  const go = await detectGoBootstrapCommand(projectRoot)
+  if (go.command) commands.push(go.command)
+  if (go.note) notes.push(go.note)
+
+  const rust = await detectRustBootstrapCommand(projectRoot)
+  if (rust.command) commands.push(rust.command)
+  if (rust.note) notes.push(rust.note)
+
+  const xcode = await detectXcodeBootstrapCommands(projectRoot)
+  commands.push(...xcode.commands)
+  notes.push(...xcode.notes)
+
+  const java = await detectJavaBootstrapCommands(projectRoot)
+  commands.push(...java.commands)
+  notes.push(...java.notes)
+
+  const deduped: BootstrapCommand[] = []
+  const seen = new Set<string>()
+  for (const entry of commands) {
+    const key = formatCommand(entry.command)
+    if (seen.has(key)) continue
+    seen.add(key)
+    deduped.push(entry)
+  }
+
+  return {
+    commands: deduped,
+    notes,
+  }
+}
+
+async function detectNodeBootstrapCommand(projectRoot: string): Promise<{
+  command?: BootstrapCommand
+  note?: string
+}> {
+  const hasPackageJSON = await fileExists(path.join(projectRoot, "package.json"))
+  if (!hasPackageJSON) return {}
+
+  const hasBunLock = await fileExists(path.join(projectRoot, "bun.lock")) || await fileExists(path.join(projectRoot, "bun.lockb"))
+  const hasPnpmLock = await fileExists(path.join(projectRoot, "pnpm-lock.yaml"))
+  const hasYarnLock = await fileExists(path.join(projectRoot, "yarn.lock"))
+  const hasNpmLock = await fileExists(path.join(projectRoot, "package-lock.json"))
+
+  const manager = resolveNodeManager({
+    hasBunLock,
+    hasPnpmLock,
+    hasYarnLock,
+    hasNpmLock,
+  })
+  if (!manager) {
+    return { note: "Detected package.json but no Node package manager was found in PATH." }
+  }
+
+  if (manager === "bun") {
+    return {
+      command: {
+        label: "node-deps",
+        command: ["bun", "install", "--frozen-lockfile"],
+        fallbackCommand: ["bun", "install"],
+      },
+    }
+  }
+  if (manager === "pnpm") {
+    return {
+      command: {
+        label: "node-deps",
+        command: ["pnpm", "install", "--frozen-lockfile"],
+        fallbackCommand: ["pnpm", "install"],
+      },
+    }
+  }
+  if (manager === "yarn") {
+    return {
+      command: {
+        label: "node-deps",
+        command: ["yarn", "install", "--frozen-lockfile"],
+        fallbackCommand: ["yarn", "install"],
+      },
+    }
+  }
+
+  if (hasNpmLock) {
+    return {
+      command: {
+        label: "node-deps",
+        command: ["npm", "ci", "--no-audit", "--no-fund"],
+        fallbackCommand: ["npm", "install", "--no-audit", "--no-fund"],
+      },
+    }
+  }
+
+  return {
+    command: {
+      label: "node-deps",
+      command: ["npm", "install", "--no-audit", "--no-fund"],
+    },
+  }
+}
+
+async function detectPythonBootstrapCommands(projectRoot: string): Promise<{
+  commands: BootstrapCommand[]
+  notes: string[]
+}> {
+  const commands: BootstrapCommand[] = []
+  const notes: string[] = []
+
+  const hasRequirements = await fileExists(path.join(projectRoot, "requirements.txt"))
+  const hasPyproject = await fileExists(path.join(projectRoot, "pyproject.toml"))
+  if (!hasRequirements && !hasPyproject) return { commands, notes }
+
+  if (await fileExists(path.join(projectRoot, "uv.lock")) && commandExists("uv")) {
+    commands.push({
+      label: "python-deps",
+      command: ["uv", "sync"],
+    })
+    return { commands, notes }
+  }
+
+  if (await fileExists(path.join(projectRoot, "poetry.lock")) && commandExists("poetry")) {
+    commands.push({
+      label: "python-deps",
+      command: ["poetry", "install"],
+    })
+    return { commands, notes }
+  }
+
+  const python = Bun.which("python3") ?? Bun.which("python")
+  if (!python) {
+    notes.push("Detected Python manifests but python3/python is unavailable in PATH.")
+    return { commands, notes }
+  }
+
+  const venvPython = resolveVenvPythonPath(projectRoot)
+  commands.push({
+    label: "python-venv",
+    command: [python, "-m", "venv", ".venv"],
+  })
+  if (hasRequirements) {
+    commands.push({
+      label: "python-deps",
+      command: [venvPython, "-m", "pip", "install", "-r", "requirements.txt"],
+    })
+  } else if (hasPyproject) {
+    commands.push({
+      label: "python-deps",
+      command: [venvPython, "-m", "pip", "install", "-e", "."],
+    })
+  }
+
+  return { commands, notes }
+}
+
+async function detectRubyBootstrapCommand(projectRoot: string): Promise<{
+  command?: BootstrapCommand
+  note?: string
+}> {
+  if (!await fileExists(path.join(projectRoot, "Gemfile"))) return {}
+  if (!commandExists("bundle")) {
+    return { note: "Detected Gemfile but bundler (`bundle`) is unavailable in PATH." }
+  }
+  return {
+    command: {
+      label: "ruby-deps",
+      command: ["bundle", "install"],
+    },
+  }
+}
+
+async function detectGoBootstrapCommand(projectRoot: string): Promise<{
+  command?: BootstrapCommand
+  note?: string
+}> {
+  if (!await fileExists(path.join(projectRoot, "go.mod"))) return {}
+  if (!commandExists("go")) {
+    return { note: "Detected go.mod but `go` is unavailable in PATH." }
+  }
+  return {
+    command: {
+      label: "go-deps",
+      command: ["go", "mod", "download"],
+    },
+  }
+}
+
+async function detectRustBootstrapCommand(projectRoot: string): Promise<{
+  command?: BootstrapCommand
+  note?: string
+}> {
+  if (!await fileExists(path.join(projectRoot, "Cargo.toml"))) return {}
+  if (!commandExists("cargo")) {
+    return { note: "Detected Cargo.toml but `cargo` is unavailable in PATH." }
+  }
+  return {
+    command: {
+      label: "rust-deps",
+      command: ["cargo", "fetch"],
+    },
+  }
+}
+
+async function detectXcodeBootstrapCommands(projectRoot: string): Promise<{
+  commands: BootstrapCommand[]
+  notes: string[]
+}> {
+  const commands: BootstrapCommand[] = []
+  const notes: string[] = []
+
+  if (await fileExists(path.join(projectRoot, "Podfile"))) {
+    if (commandExists("pod")) {
+      commands.push({
+        label: "cocoapods-deps",
+        command: ["pod", "install"],
+      })
+    } else {
+      notes.push("Detected Podfile but `pod` is unavailable in PATH.")
+    }
+  }
+
+  if (await fileExists(path.join(projectRoot, "Package.swift"))) {
+    if (commandExists("swift")) {
+      commands.push({
+        label: "swift-package-deps",
+        command: ["swift", "package", "resolve"],
+      })
+    } else {
+      notes.push("Detected Package.swift but `swift` is unavailable in PATH.")
+    }
+  }
+
+  return { commands, notes }
+}
+
+async function detectJavaBootstrapCommands(projectRoot: string): Promise<{
+  commands: BootstrapCommand[]
+  notes: string[]
+}> {
+  const commands: BootstrapCommand[] = []
+  const notes: string[] = []
+
+  if (await fileExists(path.join(projectRoot, "pom.xml"))) {
+    if (commandExists("mvn")) {
+      commands.push({
+        label: "maven-deps",
+        command: ["mvn", "-q", "-DskipTests", "dependency:resolve"],
+      })
+    } else {
+      notes.push("Detected pom.xml but `mvn` is unavailable in PATH.")
+    }
+  }
+
+  if (await fileExists(path.join(projectRoot, "gradlew"))) {
+    commands.push({
+      label: "gradle-deps",
+      command: ["sh", "./gradlew", "--quiet", "dependencies"],
+    })
+  } else if (await fileExists(path.join(projectRoot, "build.gradle")) || await fileExists(path.join(projectRoot, "build.gradle.kts"))) {
+    if (commandExists("gradle")) {
+      commands.push({
+        label: "gradle-deps",
+        command: ["gradle", "--quiet", "dependencies"],
+      })
+    } else {
+      notes.push("Detected Gradle build files but no gradle binary was found in PATH.")
+    }
+  }
+
+  return { commands, notes }
+}
+
+function resolveNodeManager(input: {
+  hasBunLock: boolean
+  hasPnpmLock: boolean
+  hasYarnLock: boolean
+  hasNpmLock: boolean
+}): NodePackageManager | undefined {
+  if (input.hasBunLock && commandExists("bun")) return "bun"
+  if (input.hasPnpmLock && commandExists("pnpm")) return "pnpm"
+  if (input.hasYarnLock && commandExists("yarn")) return "yarn"
+  if (input.hasNpmLock && commandExists("npm")) return "npm"
+  if (commandExists("npm")) return "npm"
+  if (commandExists("pnpm")) return "pnpm"
+  if (commandExists("yarn")) return "yarn"
+  if (commandExists("bun")) return "bun"
+  return undefined
+}
+
+function resolveVenvPythonPath(projectRoot: string): string {
+  const win = process.platform === "win32"
+  return win
+    ? path.join(projectRoot, ".venv", "Scripts", "python.exe")
+    : path.join(projectRoot, ".venv", "bin", "python")
+}
+
+async function computeDependencyFingerprint(projectRoot: string): Promise<string> {
+  const hash = createHash("sha256")
+  hash.update(projectRoot)
+  for (const relativePath of FINGERPRINT_FILES) {
+    const fullPath = path.join(projectRoot, relativePath)
+    const content = await readFile(fullPath).catch(() => undefined)
+    if (!content) continue
+    hash.update(relativePath)
+    hash.update(content)
+  }
+
+  const rootEntries = await readdir(projectRoot, { withFileTypes: true }).catch(() => [])
+  for (const entry of rootEntries) {
+    const name = entry.name
+    if (!name.endsWith(".xcodeproj") && !name.endsWith(".xcworkspace")) continue
+    hash.update(name)
+  }
+
+  return hash.digest("hex")
+}
+
+async function runCommand(
+  command: string[],
+  cwd: string,
+): Promise<{ exitCode: number; stdout: string; stderr: string; timedOut: boolean }> {
+  const proc = Bun.spawn(command, {
+    cwd,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+    env: process.env,
+  })
+
+  let timedOut = false
+  const timeout = setTimeout(() => {
+    timedOut = true
+    try {
+      proc.kill()
+    } catch {
+      // Ignore process kill errors; exit code/streams will still be captured.
+    }
+  }, DEPENDENCY_BOOTSTRAP_TIMEOUT_MS)
+
+  const [exitCode, stdout, stderr] = await Promise.all([
+    proc.exited,
+    new Response(proc.stdout).text(),
+    new Response(proc.stderr).text(),
+  ])
+  clearTimeout(timeout)
+
+  return {
+    exitCode,
+    stdout: stdout.trim(),
+    stderr: stderr.trim(),
+    timedOut,
+  }
+}
+
+function formatCommand(parts: string[]): string {
+  return parts
+    .map((part) => (/\s/.test(part) ? JSON.stringify(part) : part))
+    .join(" ")
+}
+
+function summarizeOutput(output: string, timedOut: boolean): string {
+  const normalized = output.trim()
+  if (timedOut && !normalized) return "command timed out."
+  if (timedOut) return `command timed out. Last output: ${normalized.slice(0, 800)}`
+  if (!normalized) return "command exited with no output."
+  return normalized.slice(0, 800)
+}
+
+async function fileExists(fullPath: string): Promise<boolean> {
+  try {
+    await access(fullPath)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function commandExists(command: string): boolean {
+  return Boolean(Bun.which(command))
+}
diff --git a/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts b/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
index 12399a4..852bd1d 100644
--- a/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
+++ b/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
@@ -53,6 +53,7 @@ import {
   restorePathsFromHead,
   runDeterministicMerge,
 } from "./worktree-ingest"
+import { bootstrapProjectDependencies } from "./dependency-bootstrap"
 import { collectLegacyDeployRemediationTaskFamily, isLegacyDeployRemediationRootTask } from "./deploy-remediation"
 import {
   createDeploySession,
@@ -192,6 +193,7 @@ const ALLOWED_EXTENSIONS = new Set([
   ".yml",
   ".toml",
 ])
+const DEPENDENCY_BOOTSTRAP_SCRATCHPAD_KEY = "dependency-bootstrap"
 
 const IGNORE_DIRS = new Set([
   ".git",
@@ -1747,6 +1749,7 @@ async function executionNode(state: EngineState): Promise<Partial<EngineState>>
       log.warn("Supervisor monitor loop error", { runId: run.id, error: error instanceof Error ? error.message : String(error) })
     }
   })
+  let dependenciesBootstrapped = hasDependencyBootstrapMarker(graph)
 
   while (run.status === "active" && !abortSignal?.aborted) {
     const expandedChecklistTasks = materializeChecklistTasksForExecution({ graph, run })
@@ -1774,6 +1777,13 @@ async function executionNode(state: EngineState): Promise<Partial<EngineState>>
       })
     }
 
+    if (!dependenciesBootstrapped) {
+      dependenciesBootstrapped = await ensureDependencyBootstrap(state, {
+        requirePlanningCompletion: true,
+      })
+      if (dependenciesBootstrapped) continue
+    }
+
     const budgetState = resolveTokenBudgetState({
       usedTokens: run.globalTokenUsage.totalTokens,
       budgetTokens: run.tokenBudget,
@@ -1898,6 +1908,53 @@ async function executionNode(state: EngineState): Promise<Partial<EngineState>>
   return {}
 }
 
+function hasDependencyBootstrapMarker(graph: Orchestrator.TaskGraph): boolean {
+  return graph.scratchpad.some((entry) => entry.key === DEPENDENCY_BOOTSTRAP_SCRATCHPAD_KEY)
+}
+
+function buildDependencyBootstrapSummary(result: Awaited<ReturnType<typeof bootstrapProjectDependencies>>): string {
+  const commandSummary = result.commands.length > 0
+    ? `Commands: ${result.commands.join(" ; ")}`
+    : "No install command required for detected manifests."
+  const noteSummary = result.notes.length > 0 ? `Notes: ${result.notes.join(" ")}` : ""
+  return `Dependency bootstrap completed before worker worktree creation. ${commandSummary} ${noteSummary}`.trim()
+}
+
+async function ensureDependencyBootstrap(
+  state: EngineState,
+  options: { requirePlanningCompletion: boolean },
+): Promise<boolean> {
+  const run = state.run as Orchestrator.Run
+  const graph = state.graph as Orchestrator.TaskGraph
+  if (hasDependencyBootstrapMarker(graph)) return true
+  if (options.requirePlanningCompletion) {
+    const planningTask = Object.values(graph.tasks).find((task) => isPlanningTask(task))
+    const planningCompleted = !planningTask || isTaskSuccessfulTerminal(planningTask.status)
+    if (!planningCompleted) return false
+  }
+
+  const bootstrap = await bootstrapProjectDependencies(state.projectRoot)
+  if (hasDependencyBootstrapMarker(graph)) return true
+  const summary = buildDependencyBootstrapSummary(bootstrap)
+  const now = Date.now()
+  writeScratchpadEntry(run.id, {
+    key: DEPENDENCY_BOOTSTRAP_SCRATCHPAD_KEY,
+    value: summary,
+    source: "supervisor",
+    category: "decision",
+    createdAt: now,
+  })
+  emitScratchpadUpdated(run.id)
+  emitSupervisorThought(run.id, {
+    action: "intervene",
+    reasoning: summary,
+  })
+  run.time.updated = now
+  emitRunUpdated(run)
+  await persistSnapshot(state.projectRoot, run, graph)
+  return true
+}
+
 // ═══════════════════════════════════════════════════════════════════════════════
 // NODE: SUPERVISOR (adaptive replanning + validation-remediation cycle)
 // ═══════════════════════════════════════════════════════════════════════════════
@@ -3613,6 +3670,9 @@ async function executeTask(state: EngineState, task: Orchestrator.Task): Promise
   })
 
   try {
+    if (!isPlanningTask(task)) {
+      await ensureDependencyBootstrap(state, { requirePlanningCompletion: false })
+    }
     // Route sub-orchestrator tasks to their own planning+execution cycle
     if (isSubOrchestratorTask(task)) {
       await executeSubOrchestrator(state, task)
@@ -5270,6 +5330,7 @@ ${planningQuestionGuidance}
 - Implement ONLY the specific files and modules described in your task. Do not implement other agents' tasks.
 - Create any missing scaffolding needed for THIS task's scope (directories/bootstrap/module files), but do not expand into other tasks' areas.
 - Import shared types, interfaces, and constants from the files defined in the spec document.
+- Dependencies are bootstrapped after planning. Do NOT run broad dependency install commands unless your task explicitly changes dependency manifests or a required tool is still missing.
 - 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}
@@ -7445,6 +7506,7 @@ async function evaluateDeterministicQualityGate(
     const verification = await runVerificationSpec({
       projectRoot: state.projectRoot,
       spec: verificationSpec,
+      dependencyBootstrapComplete: hasDependencyBootstrapMarker(state.graph as Orchestrator.TaskGraph),
       abortSignal: state.abortSignal,
     })
     const criteriaResults = buildCriteriaResultsFromChecks({
diff --git a/packages/oneshot/src/orchestrator/runtime/local-deploy.ts b/packages/oneshot/src/orchestrator/runtime/local-deploy.ts
index 6f53d02..adb7d2b 100644
--- a/packages/oneshot/src/orchestrator/runtime/local-deploy.ts
+++ b/packages/oneshot/src/orchestrator/runtime/local-deploy.ts
@@ -32,6 +32,10 @@ const MAX_DEPLOY_REQUESTS = Number(process.env.ONESHOT_DEPLOY_MAX_REQUESTS ?? 12
 const SCRIPT_LAUNCH_STARTUP_MS = Number(process.env.ONESHOT_DEPLOY_SCRIPT_STARTUP_MS ?? 8_000)
 const MAX_LAUNCH_GUIDANCE_LOG_LINES = Number(process.env.ONESHOT_DEPLOY_LAUNCH_GUIDANCE_LOG_LINES ?? 40)
 const KNOWN_WEB_PORTS = [3000, 4173, 5173, 8000, 8080] as const
+const DEPLOY_DEFAULT_PORT = Number(process.env.ONESHOT_DEPLOY_DEFAULT_PORT ?? 3000)
+const DEPLOY_PORT_SCAN_LIMIT = Number(process.env.ONESHOT_DEPLOY_PORT_SCAN_LIMIT ?? 200)
+const CHILD_PORT_DISCOVERY_INTERVAL_MS = Number(process.env.ONESHOT_DEPLOY_CHILD_PORT_DISCOVERY_INTERVAL_MS ?? 1_600)
+const CHILD_PORT_DISCOVERY_TIMEOUT_MS = Number(process.env.ONESHOT_DEPLOY_CHILD_PORT_DISCOVERY_TIMEOUT_MS ?? 1_500)
 
 const inFlight = new Map<string, Promise<Orchestrator.LocalDeployState>>()
 
@@ -464,29 +468,55 @@ async function detectRustScriptPlan(projectRoot: string): Promise<DeployCommandP
   }
 }
 
-async function findOpenPort(): Promise<number> {
-  return new Promise((resolve, reject) => {
+async function canBindPort(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
     const server = createServer()
-    server.once("error", reject)
-    server.listen(0, "127.0.0.1", () => {
-      const address = server.address()
-      if (!address || typeof address === "string") {
-        server.close()
-        reject(new Error("Failed to resolve random local port"))
-        return
-      }
-      const port = address.port
+    server.once("error", () => resolve(false))
+    server.listen(port, "127.0.0.1", () => {
       server.close((error) => {
-        if (error) {
-          reject(error)
-          return
-        }
-        resolve(port)
+        if (error) resolve(false)
+        else resolve(true)
       })
     })
   })
 }
 
+async function findOpenPort(input: {
+  startPort?: number
+  maxScan?: number
+} = {}): Promise<number> {
+  const fallbackStartPort = Number.isFinite(DEPLOY_DEFAULT_PORT) ? Math.max(1, DEPLOY_DEFAULT_PORT) : 3000
+  const fallbackMaxScan = Number.isFinite(DEPLOY_PORT_SCAN_LIMIT) ? Math.max(1, DEPLOY_PORT_SCAN_LIMIT) : 200
+  const startPort = Number.isFinite(input.startPort) ? Math.max(1, Number(input.startPort)) : fallbackStartPort
+  const maxScan = Number.isFinite(input.maxScan) ? Math.max(1, Number(input.maxScan)) : fallbackMaxScan
+  for (let offset = 0; offset < maxScan; offset += 1) {
+    const candidate = startPort + offset
+    if (candidate > 65_535) break
+    if (await canBindPort(candidate)) return candidate
+  }
+  throw new Error(`No open local port found from ${startPort} within ${maxScan} attempts`)
+}
+
+function normalizeLocalUrlCandidate(value: string): string | undefined {
+  const trimmed = value.trim()
+  if (!trimmed) return undefined
+  try {
+    const parsed = new URL(trimmed)
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return undefined
+    const host = parsed.hostname.toLowerCase()
+    if (host !== "127.0.0.1" && host !== "localhost" && host !== "0.0.0.0" && host !== "::1" && host !== "[::1]") {
+      return undefined
+    }
+    const port = parsed.port
+      ? Number(parsed.port)
+      : (parsed.protocol === "https:" ? 443 : 80)
+    if (!Number.isFinite(port) || port < 1 || port > 65_535) return undefined
+    return `http://127.0.0.1:${port}`
+  } catch {
+    return undefined
+  }
+}
+
 function parseUrlsFromText(text: string): string[] {
   const results = new Set<string>()
   const urlRegex = /https?:\/\/[^\s"'`<>]+/gi
@@ -494,13 +524,17 @@ function parseUrlsFromText(text: string): string[] {
     const raw = match[0]?.trim()
     if (!raw) continue
     const normalized = raw.replace(/[),.;]+$/, "")
-    results.add(normalized)
+    const localUrl = normalizeLocalUrlCandidate(normalized)
+    if (!localUrl) continue
+    results.add(localUrl)
   }
   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}`)
+    const localUrl = normalizeLocalUrlCandidate(`http://127.0.0.1:${port}`)
+    if (!localUrl) continue
+    results.add(localUrl)
   }
   return [...results]
 }
@@ -596,6 +630,42 @@ async function runCommand(
   }
 }
 
+async function detectChildListeningUrls(input: {
+  pid?: number
+  cwd: string
+  env: Record<string, string | undefined>
+}): Promise<string[]> {
+  const pid = input.pid
+  if (!Number.isFinite(pid) || (pid ?? 0) <= 0) return []
+  const lsof = Bun.which("lsof")
+  if (!lsof) return []
+
+  const result = await runCommand(
+    [lsof, "-Pan", "-p", String(pid), "-iTCP", "-sTCP:LISTEN"],
+    {
+      cwd: input.cwd,
+      env: input.env,
+      timeoutMs: CHILD_PORT_DISCOVERY_TIMEOUT_MS,
+    },
+  )
+
+  if (result.exitCode !== 0 && result.logs.length === 0) return []
+
+  const urls = new Set<string>()
+  for (const line of result.logs) {
+    const match = line.match(/\bTCP\s+([^\s]+)\s+\(LISTEN\)/i)
+    if (!match) continue
+    const endpoint = match[1]
+    if (!endpoint) continue
+    const portMatch = endpoint.match(/:(\d{2,5})$/)
+    if (!portMatch) continue
+    const port = Number(portMatch[1])
+    if (!Number.isFinite(port) || port < 1 || port > 65_535) continue
+    urls.add(`http://127.0.0.1:${port}`)
+  }
+  return [...urls]
+}
+
 async function probeUrl(url: string): Promise<boolean> {
   const controller = new AbortController()
   const timeout = setTimeout(() => controller.abort(), 1_500)
@@ -615,6 +685,17 @@ async function probeUrl(url: string): Promise<boolean> {
   }
 }
 
+async function probeUrlWithRetries(url: string, attempts = 2): Promise<boolean> {
+  const totalAttempts = Math.max(1, attempts)
+  for (let index = 0; index < totalAttempts; index += 1) {
+    if (await probeUrl(url)) return true
+    if (index < totalAttempts - 1) {
+      await new Promise((resolve) => setTimeout(resolve, 180))
+    }
+  }
+  return false
+}
+
 function buildCandidateUrls(input: {
   preferredPort?: number
   discovered?: Iterable<string>
@@ -624,23 +705,23 @@ function buildCandidateUrls(input: {
   if (Number.isFinite(input.preferredPort)) {
     urls.add(`http://127.0.0.1:${input.preferredPort}`)
   }
-  if (input.includeKnownPorts !== false) {
-    for (const port of KNOWN_WEB_PORTS) {
-      urls.add(`http://127.0.0.1:${port}`)
-    }
-  }
   for (const value of input.discovered ?? []) {
     const trimmed = value.trim()
     if (!trimmed) continue
     urls.add(trimmed)
   }
+  if (input.includeKnownPorts !== false) {
+    for (const port of KNOWN_WEB_PORTS) {
+      urls.add(`http://127.0.0.1:${port}`)
+    }
+  }
   return [...urls]
 }
 
 async function snapshotReachableUrls(urls: Iterable<string>): Promise<Set<string>> {
   const reachable = new Set<string>()
   for (const url of urls) {
-    if (await probeUrl(url)) reachable.add(url)
+    if (await probeUrlWithRetries(url, 2)) reachable.add(url)
   }
   return reachable
 }
@@ -656,7 +737,7 @@ async function bootServer(
   const preferredUrl = Number.isFinite(preferredPort) ? `http://127.0.0.1:${preferredPort}` : undefined
   const initialCandidates = buildCandidateUrls({
     preferredPort,
-    includeKnownPorts: true,
+    includeKnownPorts: false,
   })
   const baselineReachable = await snapshotReachableUrls(initialCandidates)
 
@@ -664,6 +745,7 @@ async function bootServer(
   const discovered = new Set<string>()
   let startupErrorCount = 0
   const process = spawnCommand(plan.command, input.cwd, input.env)
+  let lastChildPortProbeAt = 0
   const onLine = (line: string) => {
     const trimmed = line.trim()
     if (!trimmed) return
@@ -690,10 +772,21 @@ async function bootServer(
       )
     }
 
+    const now = Date.now()
+    if (now - lastChildPortProbeAt >= CHILD_PORT_DISCOVERY_INTERVAL_MS) {
+      lastChildPortProbeAt = now
+      const discoveredByPid = await detectChildListeningUrls({
+        pid: process.pid,
+        cwd: input.cwd,
+        env: input.env,
+      })
+      for (const url of discoveredByPid) discovered.add(url)
+    }
+
     const urls = buildCandidateUrls({
       preferredPort,
       discovered,
-      includeKnownPorts: true,
+      includeKnownPorts: false,
     })
     for (const url of urls) {
       const urlWasReachableBeforeLaunch = baselineReachable.has(url)
@@ -702,7 +795,7 @@ async function bootServer(
       if (urlWasReachableBeforeLaunch && !discoveredByCurrentProcess && !isPreferredUrl) {
         continue
       }
-      if (await probeUrl(url)) {
+      if (await probeUrlWithRetries(url, 2)) {
         if (urlWasReachableBeforeLaunch && !discoveredByCurrentProcess && !isPreferredUrl) {
           continue
         }
@@ -736,7 +829,7 @@ async function bootScriptTarget(
   const preferredUrl = Number.isFinite(preferredPort) ? `http://127.0.0.1:${preferredPort}` : undefined
   const baselineCandidates = buildCandidateUrls({
     preferredPort,
-    includeKnownPorts: true,
+    includeKnownPorts: false,
   })
   const baselineReachable = await snapshotReachableUrls(baselineCandidates)
 
@@ -777,10 +870,18 @@ async function bootScriptTarget(
     }
   }
 
+  for (const url of await detectChildListeningUrls({
+    pid: process.pid,
+    cwd: input.cwd,
+    env: input.env,
+  })) {
+    discoveredUrls.add(url)
+  }
+
   const candidateUrls = buildCandidateUrls({
     preferredPort,
     discovered: discoveredUrls,
-    includeKnownPorts: true,
+    includeKnownPorts: false,
   })
 
   let detectedUrl: string | undefined
@@ -791,7 +892,7 @@ async function bootScriptTarget(
     if (urlWasReachableBeforeLaunch && !discoveredByCurrentProcess && !isPreferredUrl) {
       continue
     }
-    if (!await probeUrl(url)) continue
+    if (!await probeUrlWithRetries(url, 2)) continue
     if (urlWasReachableBeforeLaunch && !discoveredByCurrentProcess && !isPreferredUrl) {
       continue
     }
@@ -1798,7 +1899,10 @@ async function executeLocalDeploy(run: Orchestrator.Run, input: DeployOptions):
       `${plan.summary} Source: ${plan.source}. Command: ${formatCommand(plan.command)}.`,
     )
 
-    const port = await findOpenPort()
+    const port = await findOpenPort({
+      startPort: DEPLOY_DEFAULT_PORT,
+      maxScan: DEPLOY_PORT_SCAN_LIMIT,
+    })
     const env = {
       ...process.env,
       CI: "1",
diff --git a/packages/oneshot/src/orchestrator/runtime/mission-control.ts b/packages/oneshot/src/orchestrator/runtime/mission-control.ts
index 9743b07..60d9baa 100644
--- a/packages/oneshot/src/orchestrator/runtime/mission-control.ts
+++ b/packages/oneshot/src/orchestrator/runtime/mission-control.ts
@@ -402,6 +402,12 @@ export function buildMissionControlState(input: {
   const hasAnyOutstanding = orderedTasks.some((task) =>
     task.status === "pending" || task.status === "in_progress" || task.status === "blocked",
   )
+  const hasMergeRelatedFailure = orderedTasks.some((task) => {
+    if (task.status !== "failed") return false
+    if (task.agentBranch || task.worktreePath || typeof task.metrics?.ingestMs === "number") return true
+    const corpus = `${task.error ?? ""}\n${task.result ?? ""}`.toLowerCase()
+    return /\bmerge ingest\b|\bdeterministic merge\b|\bmerge conflict\b|\bunmerged\b|\bmerge blocked\b|\bconflict resolver\b/.test(corpus)
+  })
 
   const orchestratorStatus: Orchestrator.MissionControlNodeStatus = runFailed
     ? "failed"
@@ -428,10 +434,10 @@ export function buildMissionControlState(input: {
         : "done"
 
   const shouldShowIngestNode = Boolean(normalizeSessionId(run.ingestSessionId))
-  const ingestStatus: Orchestrator.MissionControlNodeStatus = runFailed
-    ? "failed"
-    : runPaused
-      ? "paused"
+  const ingestStatus: Orchestrator.MissionControlNodeStatus = runPaused
+    ? "paused"
+    : hasMergeRelatedFailure
+      ? "failed"
       : run.status === "completed"
         ? "done"
         : hasAnyCompleted && hasAnyOutstanding
diff --git a/packages/oneshot/src/orchestrator/runtime/verification.ts b/packages/oneshot/src/orchestrator/runtime/verification.ts
index f5e8173..0fc0982 100644
--- a/packages/oneshot/src/orchestrator/runtime/verification.ts
+++ b/packages/oneshot/src/orchestrator/runtime/verification.ts
@@ -2,6 +2,7 @@ import path from "node:path"
 import { mkdtemp, readFile, rm, stat } from "node:fs/promises"
 import { tmpdir } from "node:os"
 import { Orchestrator } from "../types"
+import { hydrateWorktreeDependencies } from "./dependency-bootstrap"
 
 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)
@@ -104,6 +105,7 @@ export function buildCriteriaResultsFromChecks(input: {
 export async function runVerificationSpec(input: {
   projectRoot: string
   spec: Orchestrator.VerificationSpec
+  dependencyBootstrapComplete?: boolean
   abortSignal?: AbortSignal
 }): Promise<VerificationRunResult> {
   const workspace = await createVerificationWorkspace(input.projectRoot)
@@ -123,6 +125,7 @@ export async function runVerificationSpec(input: {
         const result = await runCommandVerificationCheck({
           projectRoot: verificationRoot,
           check,
+          dependencyBootstrapComplete: input.dependencyBootstrapComplete === true,
           abortSignal: input.abortSignal,
         })
         checkResults.push({
@@ -204,8 +207,17 @@ async function createVerificationWorkspace(projectRoot: string): Promise<Verific
     }
   }
 
+  const relativeProjectRoot = path.relative(gitRoot, path.resolve(projectRoot))
+  const verificationProjectRoot = relativeProjectRoot && !relativeProjectRoot.startsWith("..")
+    ? path.join(workspacePath, relativeProjectRoot)
+    : workspacePath
+  await hydrateWorktreeDependencies({
+    sourceProjectRoot: projectRoot,
+    targetProjectRoot: verificationProjectRoot,
+  }).catch(() => undefined)
+
   return {
-    path: workspacePath,
+    path: verificationProjectRoot,
     cleanup: async () => {
       await runGit(gitRoot, ["worktree", "remove", "--force", workspacePath]).catch(() => {})
       await rm(workspacePath, { recursive: true, force: true }).catch(() => {})
@@ -244,6 +256,7 @@ async function runGit(cwd: string, args: string[]): Promise<{ exitCode: number;
 async function runCommandVerificationCheck(input: {
   projectRoot: string
   check: Orchestrator.VerificationCommandCheck
+  dependencyBootstrapComplete: boolean
   abortSignal?: AbortSignal
 }): Promise<
   Pick<
@@ -255,7 +268,10 @@ 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", wrapCommandWithPipefail(input.check.command)], {
+  const commandToRun = input.dependencyBootstrapComplete
+    ? sanitizeVerificationCommandForPrebootstrappedDependencies(input.check.command)
+    : input.check.command
+  const proc = Bun.spawn(["bash", "-lc", wrapCommandWithPipefail(commandToRun)], {
     cwd: input.projectRoot,
     env: process.env,
     stdout: "pipe",
@@ -290,7 +306,7 @@ async function runCommandVerificationCheck(input: {
   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,
+    command: commandToRun,
     stdout,
     stderr,
   })
@@ -308,13 +324,65 @@ async function runCommandVerificationCheck(input: {
     passed,
     summary,
     details: outputSample || undefined,
-    command: input.check.command,
+    command: commandToRun,
     expectedExit,
     actualExit,
     timedOut: timedOut || undefined,
   }
 }
 
+function sanitizeVerificationCommandForPrebootstrappedDependencies(command: string): string {
+  const segments = splitShellSegments(command)
+  if (segments.length === 0) return "true"
+
+  const kept = segments.filter((segment) => !isInstallBootstrapSegment(segment))
+  if (kept.length === 0) return "true"
+  return kept.join(" && ")
+}
+
+function splitShellSegments(command: string): string[] {
+  const out: string[] = []
+  const regex = /&&|;/g
+  let lastIndex = 0
+  let match = regex.exec(command)
+  while (match) {
+    const chunk = command.slice(lastIndex, match.index).trim()
+    if (chunk) out.push(chunk)
+    lastIndex = regex.lastIndex
+    match = regex.exec(command)
+  }
+  const tail = command.slice(lastIndex).trim()
+  if (tail) out.push(tail)
+  return out
+}
+
+function isInstallBootstrapSegment(segment: string): boolean {
+  const normalized = segment
+    .trim()
+    .replace(/^[A-Za-z_][A-Za-z0-9_]*=\S+\s+/g, "")
+    .toLowerCase()
+
+  if (/^npm\s+(install|ci)\b/.test(normalized)) return true
+  if (/^pnpm\s+install\b/.test(normalized)) return true
+  if (/^yarn\s+install\b/.test(normalized)) return true
+  if (/^bun\s+install\b/.test(normalized)) return true
+  if (/^pip3?\s+install\b/.test(normalized)) return true
+  if (/^python\d*(\.\d+)?\s+-m\s+pip\s+install\b/.test(normalized)) return true
+  if (/\/pip3?\s+install\b/.test(normalized)) return true
+  if (/^python\d*(\.\d+)?\s+-m\s+venv\b/.test(normalized)) return true
+  if (/^poetry\s+install\b/.test(normalized)) return true
+  if (/^bundle\s+install\b/.test(normalized)) return true
+  if (/^go\s+mod\s+download\b/.test(normalized)) return true
+  if (/^cargo\s+fetch\b/.test(normalized)) return true
+  if (/^pod\s+install\b/.test(normalized)) return true
+  if (/^swift\s+package\s+resolve\b/.test(normalized)) return true
+  if (/^mvn\b.*\bdependency:resolve\b/.test(normalized)) return true
+  if (/^gradle\b.*\bdependencies\b/.test(normalized)) return true
+  if (/^(\.\/)?gradlew\b.*\bdependencies\b/.test(normalized)) return true
+  if (/^sh\s+(\.\/)?gradlew\b.*\bdependencies\b/.test(normalized)) return true
+  return false
+}
+
 function wrapCommandWithPipefail(command: string): string {
   return `set -o pipefail; ${command}`
 }
diff --git a/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts b/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts
index f960c42..e367b1d 100644
--- a/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts
+++ b/packages/oneshot/src/orchestrator/runtime/worktree-ingest.ts
@@ -3,10 +3,24 @@ import path from "node:path"
 import { ulid } from "ulid"
 import { Lock } from "../../util/lock"
 import { ensureProjectPolicyConfig, PROJECT_POLICY_CONFIG_RELATIVE_PATH } from "../../policy/profile"
+import { hydrateWorktreeDependencies } from "./dependency-bootstrap"
 
 const GIT_AUTHOR_NAME = process.env.ONESHOT_GIT_AUTHOR_NAME?.trim() || "OneShot Orchestrator"
 const GIT_AUTHOR_EMAIL = process.env.ONESHOT_GIT_AUTHOR_EMAIL?.trim() || "oneshot@local"
-const COMMIT_STAGE_EXCLUDED_PATHS = ["node_modules", ".oneshot", "dist", "build", "coverage"]
+const COMMIT_STAGE_EXCLUDED_PATHS = [
+  "node_modules",
+  ".oneshot",
+  "dist",
+  "build",
+  "coverage",
+  ".venv",
+  "venv",
+  "Pods",
+  ".swiftpm",
+  ".build",
+  "vendor/bundle",
+  ".bundle",
+]
 const COMMIT_STAGE_EXCLUDED_PATH_PATTERNS = [
   /(^|\/)__pycache__\//,
   /\.pyc$/i,
@@ -285,6 +299,11 @@ export async function prepareTaskWorktree(input: {
     ? path.join(worktreeRoot, relativeProjectRoot)
     : worktreeRoot
 
+  await hydrateWorktreeDependencies({
+    sourceProjectRoot: input.projectRoot,
+    targetProjectRoot: sessionDirectory,
+  })
+
   return {
     repoRoot,
     worktreeRoot,
diff --git a/packages/oneshot/src/pty/index.ts b/packages/oneshot/src/pty/index.ts
index 8addc58..e11057b 100644
--- a/packages/oneshot/src/pty/index.ts
+++ b/packages/oneshot/src/pty/index.ts
@@ -8,12 +8,14 @@ import { Instance } from "../project/instance"
 import { lazy } from "@oneshot-ai/util/lazy"
 import { Shell } from "@/shell/shell"
 import { Plugin } from "@/plugin"
+import { spawn } from "node:child_process"
 
 export namespace Pty {
   const log = Log.create({ service: "pty" })
 
   const BUFFER_LIMIT = 1024 * 1024 * 2
   const BUFFER_CHUNK = 64 * 1024
+  const KILL_TREE_GRACE_MS = 220
   const encoder = new TextEncoder()
 
   type Socket = {
@@ -99,20 +101,64 @@ export namespace Pty {
     subscribers: Map<Socket, number>
   }
 
+  async function killSessionProcessTree(session: ActiveSession): Promise<void> {
+    const pid = session.process.pid
+
+    if (!Number.isFinite(pid) || pid <= 0) {
+      try {
+        session.process.kill()
+      } catch {}
+      return
+    }
+
+    if (process.platform === "win32") {
+      await new Promise<void>((resolve) => {
+        const killer = spawn("taskkill", ["/pid", String(pid), "/f", "/t"], {
+          stdio: "ignore",
+        })
+        killer.once("exit", () => resolve())
+        killer.once("error", () => resolve())
+      })
+      return
+    }
+
+    try {
+      process.kill(-pid, "SIGTERM")
+      const deadline = Date.now() + KILL_TREE_GRACE_MS
+      while (Date.now() < deadline) {
+        if (session.info.status === "exited") return
+        await Bun.sleep(40)
+      }
+      if (session.info.status !== "exited") {
+        process.kill(-pid, "SIGKILL")
+      }
+      return
+    } catch {
+      // Some shells may not have their own process group; fall back to direct PTY kill.
+    }
+
+    try {
+      session.process.kill()
+    } catch {}
+  }
+
+  function closeSubscribers(session: ActiveSession) {
+    for (const ws of session.subscribers.keys()) {
+      try {
+        ws.close()
+      } catch {
+        // ignore
+      }
+    }
+    session.subscribers.clear()
+  }
+
   const state = Instance.state(
     () => new Map<string, ActiveSession>(),
     async (sessions) => {
       for (const session of sessions.values()) {
-        try {
-          session.process.kill()
-        } catch {}
-        for (const ws of session.subscribers.keys()) {
-          try {
-            ws.close()
-          } catch {
-            // ignore
-          }
-        }
+        await killSessionProcessTree(session)
+        closeSubscribers(session)
       }
       sessions.clear()
     },
@@ -204,14 +250,7 @@ export namespace Pty {
     ptyProcess.onExit(({ exitCode }) => {
       log.info("session exited", { id, exitCode })
       session.info.status = "exited"
-      for (const ws of session.subscribers.keys()) {
-        try {
-          ws.close()
-        } catch {
-          // ignore
-        }
-      }
-      session.subscribers.clear()
+      closeSubscribers(session)
       Bus.publish(Event.Exited, { id, exitCode })
       state().delete(id)
     })
@@ -236,17 +275,8 @@ export namespace Pty {
     const session = state().get(id)
     if (!session) return
     log.info("removing session", { id })
-    try {
-      session.process.kill()
-    } catch {}
-    for (const ws of session.subscribers.keys()) {
-      try {
-        ws.close()
-      } catch {
-        // ignore
-      }
-    }
-    session.subscribers.clear()
+    await killSessionProcessTree(session)
+    closeSubscribers(session)
     state().delete(id)
     Bus.publish(Event.Deleted, { id })
   }

From ebd9bb24d9646311fa912bb425fd502216e8d370 Mon Sep 17 00:00:00 2001
From: Braedon Saunders <braedonsaunders@users.noreply.github.com>
Date: Tue, 24 Feb 2026 23:37:09 -0500
Subject: [PATCH 2/2] Fix orchestrator hydration display

---
 packages/app/src/context/orchestrate.tsx      |  18 +--
 packages/app/src/pages/orchestrate.tsx        |  12 +-
 .../orchestrator/runtime/langgraph-engine.ts  |  30 +++-
 .../finalize-remediation-loop.test.ts         | 136 ++++++++++++++++++
 4 files changed, 180 insertions(+), 16 deletions(-)

diff --git a/packages/app/src/context/orchestrate.tsx b/packages/app/src/context/orchestrate.tsx
index 3459b50..b78ab44 100644
--- a/packages/app/src/context/orchestrate.tsx
+++ b/packages/app/src/context/orchestrate.tsx
@@ -1552,8 +1552,8 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       try {
         const serverRuns = await refreshRunHistoryFromServer()
         if (serverRuns.length === 0) return
-        // Prefer a paused run. If an active run is restored, force manual resume.
-        const active = serverRuns.find((r: any) => r.status === "paused") ?? serverRuns.find((r: any) => r.status === "active")
+        // Prefer an active run, otherwise restore a paused run.
+        const active = serverRuns.find((r: any) => r.status === "active") ?? serverRuns.find((r: any) => r.status === "paused")
         if (!active) return
         const runStatus = asRunStatus(active.status)
 
@@ -1614,12 +1614,9 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
           }
         }
 
+        // Subscribe only for active runs that are truly still running.
         if (hydratedStatus === "active") {
-          try {
-            await pause()
-          } catch { /* no-op: keep restored run visible in paused/manual-resume mode */ }
-          setState("runStatus", "paused")
-          return
+          subscribeToRun(active.id)
         }
       } catch { /* ignore — server might not be ready yet */ }
     })()
@@ -2935,12 +2932,7 @@ export const { use: useOrchestrate, provider: OrchestrateProvider } = createSimp
       }
 
       if (remoteRunStatus === "active") {
-        try {
-          await pause()
-        } catch { /* no-op: keep opened run visible in paused/manual-resume mode */ }
-        setState("runStatus", "paused")
-        eventSourceCleanup?.()
-        eventSourceCleanup = undefined
+        subscribeToRun(targetRunId)
       } else {
         eventSourceCleanup?.()
         eventSourceCleanup = undefined
diff --git a/packages/app/src/pages/orchestrate.tsx b/packages/app/src/pages/orchestrate.tsx
index 7ce4818..4f7660f 100644
--- a/packages/app/src/pages/orchestrate.tsx
+++ b/packages/app/src/pages/orchestrate.tsx
@@ -590,7 +590,8 @@ function AgentCard(props: {
   const sessionId = createMemo(() => getNodeSessionId(props.node))
   const task = createMemo(() => props.node.task)
   const isSelected = createMemo(() => {
-    if (props.selectedNodeId === props.node.id) return true
+    const selectedNodeId = props.selectedNodeId?.trim()
+    if (selectedNodeId) return selectedNodeId === props.node.id
     const sid = sessionId()
     return !!sid && sid === props.selectedSessionId
   })
@@ -4237,6 +4238,12 @@ function SessionTurnTimeline(props: {
 
   const waitingLabel = createMemo(() => {
     const controllerLabel = props.supervisorLabel ?? "master orchestrator"
+    const runFailed = orch.state.phase === "failed" || orch.state.runStatus === "failed" || orch.state.runStatus === "killed"
+    if (runFailed) {
+      const error = orch.state.error?.trim()
+      if (error) return error
+      return `Run failed before ${controllerLabel} produced output.`
+    }
     const pendingEscalations = orch.pendingEscalations().length
     if (pendingEscalations > 0) {
       return `Waiting for user input on ${pendingEscalations} escalation${pendingEscalations === 1 ? "" : "s"}...`
@@ -4539,7 +4546,8 @@ function SidebarAgentNode(props: {
   }
 
   const isSelected = createMemo(() => {
-    if (props.selectedNodeId === props.node.id) return true
+    const selectedNodeId = props.selectedNodeId?.trim()
+    if (selectedNodeId) return selectedNodeId === props.node.id
     const sid = sessionId()
     return !!sid && sid === props.selectedSessionId
   })
diff --git a/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts b/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
index 852bd1d..f036c37 100644
--- a/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
+++ b/packages/oneshot/src/orchestrator/runtime/langgraph-engine.ts
@@ -2655,6 +2655,18 @@ function findActiveDeployRemediationTask(graph: Orchestrator.TaskGraph): Orchest
       && (task.status === "pending" || task.status === "in_progress"))
 }
 
+function shouldRunFinalizeDeployValidation(run: Orchestrator.Run, graph: Orchestrator.TaskGraph): boolean {
+  const dispatchedCount = run.runtimeStats?.totalDispatches ?? 0
+  if (dispatchedCount > 0) return true
+
+  const hasExecutedNonDeployTask = Object.values(graph.tasks).some((task) => {
+    if (isLegacyDeployRemediationRootTask(task)) return false
+    if (task.status === "in_progress" || task.status === "completed" || task.status === "failed") return true
+    return typeof task.time.started === "number" || typeof task.time.completed === "number"
+  })
+  return hasExecutedNonDeployTask
+}
+
 function queueFinalizeDeployRemediationTask(input: {
   run: Orchestrator.Run
   graph: Orchestrator.TaskGraph
@@ -2815,7 +2827,13 @@ async function finalizeNode(state: EngineState): Promise<Partial<EngineState>> {
     return !deployRemediationTaskFamily.has(task.id)
   })
   let rerouteToExecutionForDeployRemediation = false
-  if (!hasFailure && run.status !== "killed" && run.status !== "paused") {
+  const shouldRunFinalizeDeploy = shouldRunFinalizeDeployValidation(run, graph)
+  if (
+    !hasFailure
+    && run.status !== "killed"
+    && run.status !== "paused"
+    && shouldRunFinalizeDeploy
+  ) {
     let deployResult: Orchestrator.LocalDeployState | undefined
     let deployError: string | undefined
     let deployFailureQueued = false
@@ -2896,6 +2914,16 @@ async function finalizeNode(state: EngineState): Promise<Partial<EngineState>> {
       })
       rerouteToExecutionForDeployRemediation = true
     }
+  } else if (
+    !hasFailure
+    && run.status !== "killed"
+    && run.status !== "paused"
+    && !shouldRunFinalizeDeploy
+  ) {
+    emitSupervisorThought(run.id, {
+      action: "observe",
+      reasoning: "Skipping finalize deploy validation because no implementation tasks were dispatched.",
+    })
   }
 
   if (rerouteToExecutionForDeployRemediation) {
diff --git a/packages/oneshot/test/orchestrator/finalize-remediation-loop.test.ts b/packages/oneshot/test/orchestrator/finalize-remediation-loop.test.ts
index 3a7a476..cc58a57 100644
--- a/packages/oneshot/test/orchestrator/finalize-remediation-loop.test.ts
+++ b/packages/oneshot/test/orchestrator/finalize-remediation-loop.test.ts
@@ -194,6 +194,84 @@ function createGraph(input: { runId: string; graphId: string }): Orchestrator.Ta
   }
 }
 
+function createEmptyGraph(input: { runId: string; graphId: string }): Orchestrator.TaskGraph {
+  const now = Date.now()
+  return {
+    id: input.graphId,
+    orchestrationId: input.runId,
+    rootPrompt: "Ensure deploy failures re-enter execution",
+    tasks: {},
+    adjacencyList: {},
+    status: "running",
+    progress: 0,
+    replanCount: 0,
+    maxReplanCycles: 3,
+    validationRetries: 0,
+    maxValidationRetries: 2,
+    scratchpad: [],
+    time: {
+      created: now - 1_000,
+    },
+  }
+}
+
+function createPendingPlanGraph(input: { runId: string; graphId: string }): Orchestrator.TaskGraph {
+  const now = Date.now()
+  return {
+    id: input.graphId,
+    orchestrationId: input.runId,
+    rootPrompt: "Ensure deploy failures re-enter execution",
+    tasks: {
+      "planning-spec": {
+        id: "planning-spec",
+        name: "Planning & SPEC.md Authoring",
+        description: "Create execution plan",
+        status: "pending",
+        kind: "planning",
+        dependencies: [],
+        dependents: ["implementation"],
+        subtaskIds: [],
+        retryCount: 0,
+        maxRetries: 2,
+        metadata: {},
+        time: {
+          created: now - 2_000,
+        },
+      },
+      implementation: {
+        id: "implementation",
+        name: "Implementation",
+        description: "Implement requested behavior",
+        status: "pending",
+        kind: "implementation",
+        dependencies: ["planning-spec"],
+        dependents: [],
+        subtaskIds: [],
+        retryCount: 0,
+        maxRetries: 2,
+        metadata: {},
+        time: {
+          created: now - 1_500,
+        },
+      },
+    },
+    adjacencyList: {
+      "planning-spec": ["implementation"],
+      implementation: [],
+    },
+    status: "running",
+    progress: 0,
+    replanCount: 0,
+    maxReplanCycles: 3,
+    validationRetries: 0,
+    maxValidationRetries: 2,
+    scratchpad: [],
+    time: {
+      created: now - 3_000,
+    },
+  }
+}
+
 function createLegacyDeployFailureGraph(input: { runId: string; graphId: string }): Orchestrator.TaskGraph {
   const now = Date.now()
   return {
@@ -400,6 +478,64 @@ afterEach(() => {
 })
 
 describe("orchestrator finalize deploy remediation routing", () => {
+  test("skips finalize deploy validation when tasks were planned but never dispatched", async () => {
+    await using tmp = await tmpdir({ git: true })
+
+    const runId = `run-${Date.now()}-planned-not-dispatched`
+    const graphId = `graph-${Date.now()}-planned-not-dispatched`
+    const run = createRun({ runId, graphId })
+    const graph = createPendingPlanGraph({ runId, graphId })
+    setActiveRun(run, graph, tmp.path)
+
+    deployResultFactory = () => createFailedDeployState(1)
+    const runFinalizePhase = await loadRunFinalizePhase()
+
+    const result = await runFinalizePhase(createWorkflowInput({
+      runId,
+      projectRoot: tmp.path,
+    }))
+
+    expect(result.route).toBe("end")
+    expect(deployCalls.length).toBe(0)
+    expect(deploySessionCreateCalls.length).toBe(0)
+    expect(deploySessionMessageCalls.length).toBe(0)
+
+    const nextRun = getRun(runId)
+    const nextGraph = getGraph(graphId)
+    expect(nextRun?.status).toBe("completed")
+    expect(nextGraph?.status).toBe("completed")
+    expect(nextRun?.lastError).toBeUndefined()
+  })
+
+  test("skips finalize deploy validation when no implementation tasks were dispatched", async () => {
+    await using tmp = await tmpdir({ git: true })
+
+    const runId = `run-${Date.now()}-no-dispatches`
+    const graphId = `graph-${Date.now()}-no-dispatches`
+    const run = createRun({ runId, graphId })
+    const graph = createEmptyGraph({ runId, graphId })
+    setActiveRun(run, graph, tmp.path)
+
+    deployResultFactory = () => createFailedDeployState(1)
+    const runFinalizePhase = await loadRunFinalizePhase()
+
+    const result = await runFinalizePhase(createWorkflowInput({
+      runId,
+      projectRoot: tmp.path,
+    }))
+
+    expect(result.route).toBe("end")
+    expect(deployCalls.length).toBe(0)
+    expect(deploySessionCreateCalls.length).toBe(0)
+    expect(deploySessionMessageCalls.length).toBe(0)
+
+    const nextRun = getRun(runId)
+    const nextGraph = getGraph(graphId)
+    expect(nextRun?.status).toBe("completed")
+    expect(nextGraph?.status).toBe("completed")
+    expect(nextRun?.lastError).toBeUndefined()
+  })
+
   test("queues deploy remediation on Deploy page and completes the run after finalize deploy failure", async () => {
     await using tmp = await tmpdir({ git: true })