From 8d012f5e8c998d9116854520c223169906a082bb Mon Sep 17 00:00:00 2001
From: mira-2026 <mira-2026@agentmail.to>
Date: Mon, 27 Jul 2026 16:43:42 +0200
Subject: [PATCH 1/4] refactor: rename PR page to Delivery

---
 docs/architecture/frontend-feature-map.md     |  2 +-
 docs/architecture/overview.md                 | 34 ++++-----
 docs/development/local-dev.md                 |  2 +-
 docs/setup/production-deploy.md               |  2 +-
 .../ProductionReleasesCard.tsx                |  0
 .../PullRequestDevelopmentCard.tsx}           |  2 +-
 src/components/layout/Layout.tsx              | 10 +--
 src/hooks/index.ts                            | 12 +--
 .../{usePullRequests.ts => useDelivery.ts}    | 74 +++++++++----------
 src/pages/{PullRequests.tsx => Delivery.tsx}  | 24 +++---
 src/router.tsx                                | 10 +--
 src/test/frontendBehavior.test.tsx            | 18 +++--
 src/test/pageBehavior.test.tsx                | 19 ++---
 src/test/productionReleasesCard.test.tsx      |  2 +-
 ...sx => pullRequestDevelopmentCard.test.tsx} | 20 ++---
 15 files changed, 119 insertions(+), 112 deletions(-)
 rename src/components/features/{pullRequests => delivery}/ProductionReleasesCard.tsx (100%)
 rename src/components/features/{pullRequests/PullRequestPreviewCard.tsx => delivery/PullRequestDevelopmentCard.tsx} (99%)
 rename src/hooks/{usePullRequests.ts => useDelivery.ts} (85%)
 rename src/pages/{PullRequests.tsx => Delivery.tsx} (98%)
 rename src/test/{pullRequestPreviewCard.test.tsx => pullRequestDevelopmentCard.test.tsx} (82%)

diff --git a/docs/architecture/frontend-feature-map.md b/docs/architecture/frontend-feature-map.md
index 197294d72..2d1fb2552 100644
--- a/docs/architecture/frontend-feature-map.md
+++ b/docs/architecture/frontend-feature-map.md
@@ -20,7 +20,7 @@ cannot infer.
 | `/jobs`          | `Jobs.tsx`              | scheduled jobs and run history              |
 | `/reports`       | `Reports.tsx`           | reports list/detail APIs                    |
 | `/notifications` | notification bell/modal | notification APIs                           |
-| `/pull-requests` | `PullRequests.tsx`      | GitHub, PR dev, release/deploy services     |
+| `/delivery`      | `Delivery.tsx`          | GitHub, PR dev, release/deploy services     |
 | `/docker`        | `Docker.tsx`            | Docker inventory/updater APIs               |
 | `/files`         | `Files.tsx`             | workspace file APIs                         |
 | `/logs`          | `Logs.tsx`              | log file APIs                               |
diff --git a/docs/architecture/overview.md b/docs/architecture/overview.md
index 61829591d..61eb7149b 100644
--- a/docs/architecture/overview.md
+++ b/docs/architecture/overview.md
@@ -38,23 +38,23 @@ Mira Dashboard worker                         |
 
 Primary pages:
 
-| Path             | Purpose                                                    |
-| ---------------- | ---------------------------------------------------------- |
-| `/`              | Operations dashboard overview.                             |
-| `/tasks`         | Local task board and task updates.                         |
-| `/agents`        | Agent status and task history.                             |
-| `/sessions`      | OpenClaw session table and actions.                        |
-| `/chat`          | Gateway-backed chat UI.                                    |
-| `/logs`          | Log file browsing/tailing.                                 |
-| `/jobs`          | Dashboard scheduled jobs.                                  |
-| `/reports`       | Daily briefs, summaries, heartbeats, and custom reports.   |
-| `/pull-requests` | PR review, trusted PR dev, releases, deploy, and rollback. |
-| `/files`         | Workspace file browser/editor.                             |
-| `/docker`        | Docker state and managed updater.                          |
-| `/database`      | Postgres/PgBouncer and Dashboard SQLite overview.          |
-| `/moltbook`      | Moltbook dashboard.                                        |
-| `/settings`      | OpenClaw/Dashboard settings.                               |
-| `/terminal`      | Terminal helper/completion UI.                             |
+| Path        | Purpose                                                    |
+| ----------- | ---------------------------------------------------------- |
+| `/`         | Operations dashboard overview.                             |
+| `/tasks`    | Local task board and task updates.                         |
+| `/agents`   | Agent status and task history.                             |
+| `/sessions` | OpenClaw session table and actions.                        |
+| `/chat`     | Gateway-backed chat UI.                                    |
+| `/logs`     | Log file browsing/tailing.                                 |
+| `/jobs`     | Dashboard scheduled jobs.                                  |
+| `/reports`  | Daily briefs, summaries, heartbeats, and custom reports.   |
+| `/delivery` | PR review, trusted PR dev, releases, deploy, and rollback. |
+| `/files`    | Workspace file browser/editor.                             |
+| `/docker`   | Docker state and managed updater.                          |
+| `/database` | Postgres/PgBouncer and Dashboard SQLite overview.          |
+| `/moltbook` | Moltbook dashboard.                                        |
+| `/settings` | OpenClaw/Dashboard settings.                               |
+| `/terminal` | Terminal helper/completion UI.                             |
 
 ## Backend
 
diff --git a/docs/development/local-dev.md b/docs/development/local-dev.md
index 89a8f9792..8dceb97be 100644
--- a/docs/development/local-dev.md
+++ b/docs/development/local-dev.md
@@ -133,7 +133,7 @@ the frontend proxy strips non-dev Dashboard cookies before forwarding requests.
 
 ## Managed PR Dev
 
-The Pull requests page exposes one shared **PR dev** slot:
+The Delivery page exposes one shared **PR dev** slot:
 
 - Only PRs targeting `main` from the configured trusted-author allowlist can
   start.
diff --git a/docs/setup/production-deploy.md b/docs/setup/production-deploy.md
index fd3c5d54c..8ce037c8d 100644
--- a/docs/setup/production-deploy.md
+++ b/docs/setup/production-deploy.md
@@ -107,7 +107,7 @@ must still return `401`.
 ## Rollback
 
 Normal activation automatically rolls back on restart or commit-bound readiness
-failure. The preferred manual path is **Pull requests → Production releases →
+failure. The preferred manual path is **Delivery → Production releases →
 Roll back**, which uses the same exclusive release lock, persistent job,
 detached guardian, web/worker restart, commit-bound readiness, and automatic
 restoration of the original release if the rollback target fails.
diff --git a/src/components/features/pullRequests/ProductionReleasesCard.tsx b/src/components/features/delivery/ProductionReleasesCard.tsx
similarity index 100%
rename from src/components/features/pullRequests/ProductionReleasesCard.tsx
rename to src/components/features/delivery/ProductionReleasesCard.tsx
diff --git a/src/components/features/pullRequests/PullRequestPreviewCard.tsx b/src/components/features/delivery/PullRequestDevelopmentCard.tsx
similarity index 99%
rename from src/components/features/pullRequests/PullRequestPreviewCard.tsx
rename to src/components/features/delivery/PullRequestDevelopmentCard.tsx
index c243d0d6e..3bfc92613 100644
--- a/src/components/features/pullRequests/PullRequestPreviewCard.tsx
+++ b/src/components/features/delivery/PullRequestDevelopmentCard.tsx
@@ -45,7 +45,7 @@ function previewLabel(status: PullRequestPreviewStatus["status"]): string {
 }
 
 /** Renders the global single-slot trusted PR development status. */
-export function PullRequestPreviewCard({
+export function PullRequestDevelopmentCard({
     error,
     isStopPending = false,
     onStop,
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index 3fb06613b..4a8d12320 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -6,10 +6,10 @@ import {
     Database,
     FileText,
     FolderOpen,
-    GitPullRequest,
     Home,
     MessageSquare,
     Newspaper,
+    Rocket,
     Settings,
     Terminal,
     Users,
@@ -24,7 +24,7 @@ import {
     useState,
 } from "react";
 
-import { PULL_REQUEST_NAV_REFRESH_MS, useCacheEntry, usePullRequests } from "../../hooks";
+import { DELIVERY_NAV_REFRESH_MS, useCacheEntry, usePullRequests } from "../../hooks";
 import { cn } from "../../utils/cn";
 import { AppHeader } from "./AppHeader";
 
@@ -37,7 +37,7 @@ const navItems = [
     { to: "/logs", icon: FileText, label: "Logs" },
     { to: "/jobs", icon: Clock3, label: "Jobs" },
     { to: "/reports", icon: Newspaper, label: "Reports" },
-    { to: "/pull-requests", icon: GitPullRequest, label: "PRs" },
+    { to: "/delivery", icon: Rocket, label: "Delivery" },
     { to: "/files", icon: FolderOpen, label: "Files" },
     { to: "/docker", icon: Boxes, label: "Docker" },
     { to: "/database", icon: Database, label: "Database" },
@@ -65,7 +65,7 @@ export function Layout({ children }: LayoutProperties) {
     const sidebarId = useId();
     const [isSidebarOpen, setIsSidebarOpen] = useState(false);
     const { data: systemHost } = useCacheEntry<SystemHostCache>("system.host", 60_000);
-    const { data: pullRequests = [] } = usePullRequests(PULL_REQUEST_NAV_REFRESH_MS);
+    const { data: pullRequests = [] } = usePullRequests(DELIVERY_NAV_REFRESH_MS);
     const openClawVersion = systemHost?.data.version?.current;
     const openPullRequestCount = pullRequests.length;
 
@@ -120,7 +120,7 @@ export function Layout({ children }: LayoutProperties) {
                         >
                             <item.icon size={20} aria-hidden="true" />
                             <span>{item.label}</span>
-                            {item.to === "/pull-requests" && openPullRequestCount > 0 ? (
+                            {item.to === "/delivery" && openPullRequestCount > 0 ? (
                                 <span
                                     className={cn(
                                         "ml-auto min-w-5 rounded-full px-1.5 py-0.5 text-center text-xs font-semibold",
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 4a6a24a50..32789f806 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -117,17 +117,17 @@ export type {
     PullRequestPreviewStatus,
     PullRequestSummary,
     WorktreeCleanupResult,
-} from "./usePullRequests";
+} from "./useDelivery";
 export {
-    PULL_REQUEST_NAV_REFRESH_MS,
-    PULL_REQUEST_PAGE_REFRESH_MS,
-    pullRequestKeys,
+    DELIVERY_NAV_REFRESH_MS,
+    DELIVERY_PAGE_REFRESH_MS,
+    deliveryKeys,
     useApprovePullRequest,
     useApprovePullRequestReview,
+    useDashboardDeployments,
     useDashboardReleaseStatus,
     useDeployDashboard,
     useProductionCheckout,
-    usePullRequestDeployments,
     usePullRequestPreview,
     usePullRequests,
     useRejectPullRequest,
@@ -135,7 +135,7 @@ export {
     useStartPullRequestPreview,
     useStopPullRequestPreview,
     useUpdatePullRequestBranch,
-} from "./usePullRequests";
+} from "./useDelivery";
 export { hasQuotaStatus, useQuotas } from "./useQuotas";
 export type { ReportItem, ReportStatus, ReportType } from "./useReports";
 export {
diff --git a/src/hooks/usePullRequests.ts b/src/hooks/useDelivery.ts
similarity index 85%
rename from src/hooks/usePullRequests.ts
rename to src/hooks/useDelivery.ts
index 9392f85c0..01cc42a5c 100644
--- a/src/hooks/usePullRequests.ts
+++ b/src/hooks/useDelivery.ts
@@ -148,18 +148,18 @@ interface PullRequestActionResponse {
     pullRequest?: PullRequestSummary;
 }
 
-/** Defines pull request keys. */
-export const pullRequestKeys = {
-    all: ["pull-requests"] as const,
-    list: () => [...pullRequestKeys.all, "list"] as const,
-    deployments: () => [...pullRequestKeys.all, "deployments"] as const,
-    preview: () => [...pullRequestKeys.all, "preview"] as const,
-    productionCheckout: () => [...pullRequestKeys.all, "production-checkout"] as const,
-    releaseStatus: () => [...pullRequestKeys.all, "releases"] as const,
+/** Defines delivery page query keys. */
+export const deliveryKeys = {
+    all: ["delivery"] as const,
+    list: () => [...deliveryKeys.all, "pull-requests"] as const,
+    deployments: () => [...deliveryKeys.all, "deployments"] as const,
+    preview: () => [...deliveryKeys.all, "preview"] as const,
+    productionCheckout: () => [...deliveryKeys.all, "production-checkout"] as const,
+    releaseStatus: () => [...deliveryKeys.all, "releases"] as const,
 };
 
-export const PULL_REQUEST_NAV_REFRESH_MS = 60_000;
-export const PULL_REQUEST_PAGE_REFRESH_MS = AUTO_REFRESH_MS;
+export const DELIVERY_NAV_REFRESH_MS = 60_000;
+export const DELIVERY_PAGE_REFRESH_MS = AUTO_REFRESH_MS;
 
 /** Fetches pull requests. */
 async function fetchPullRequests(): Promise<PullRequestSummary[]> {
@@ -280,19 +280,19 @@ async function stopPullRequestPreview(number: number): Promise<PullRequestPrevie
 }
 
 /** Provides pull requests. */
-export function usePullRequests(refreshInterval = PULL_REQUEST_PAGE_REFRESH_MS) {
+export function usePullRequests(refreshInterval = DELIVERY_PAGE_REFRESH_MS) {
     return useQuery({
-        queryKey: pullRequestKeys.list(),
+        queryKey: deliveryKeys.list(),
         queryFn: fetchPullRequests,
         staleTime: 10_000,
         refetchInterval: refreshInterval,
     });
 }
 
-/** Provides pull request deployments. */
-export function usePullRequestDeployments() {
+/** Provides Dashboard deployment and rollback jobs. */
+export function useDashboardDeployments() {
     return useQuery({
-        queryKey: pullRequestKeys.deployments(),
+        queryKey: deliveryKeys.deployments(),
         queryFn: fetchDeployments,
         staleTime: 5000,
         refetchInterval: AUTO_REFRESH_MS,
@@ -302,7 +302,7 @@ export function usePullRequestDeployments() {
 /** Provides production checkout. */
 export function useProductionCheckout() {
     return useQuery({
-        queryKey: pullRequestKeys.productionCheckout(),
+        queryKey: deliveryKeys.productionCheckout(),
         queryFn: fetchProductionCheckout,
         staleTime: 5000,
         refetchInterval: AUTO_REFRESH_MS,
@@ -312,7 +312,7 @@ export function useProductionCheckout() {
 /** Provides active and previous managed release status. */
 export function useDashboardReleaseStatus() {
     return useQuery({
-        queryKey: pullRequestKeys.releaseStatus(),
+        queryKey: deliveryKeys.releaseStatus(),
         queryFn: fetchDashboardReleaseStatus,
         staleTime: 5000,
         refetchInterval: AUTO_REFRESH_MS,
@@ -322,7 +322,7 @@ export function useDashboardReleaseStatus() {
 /** Provides the managed single-slot PR preview status. */
 export function usePullRequestPreview() {
     return useQuery({
-        queryKey: pullRequestKeys.preview(),
+        queryKey: deliveryKeys.preview(),
         queryFn: fetchPullRequestPreview,
         staleTime: 2000,
         refetchInterval: 5000,
@@ -337,15 +337,15 @@ export function useApprovePullRequest() {
         mutationFn: ({ number, willDeploy }: { number: number; willDeploy: boolean }) =>
             approvePullRequest(number, willDeploy),
         onSuccess: () => {
-            void queryClient.invalidateQueries({ queryKey: pullRequestKeys.list() });
+            void queryClient.invalidateQueries({ queryKey: deliveryKeys.list() });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.deployments(),
+                queryKey: deliveryKeys.deployments(),
             });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.productionCheckout(),
+                queryKey: deliveryKeys.productionCheckout(),
             });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.releaseStatus(),
+                queryKey: deliveryKeys.releaseStatus(),
             });
         },
     });
@@ -361,7 +361,7 @@ export function useApprovePullRequestReview() {
             const updatedPullRequest = response.pullRequest;
             if (updatedPullRequest) {
                 queryClient.setQueryData<PullRequestSummary[]>(
-                    pullRequestKeys.list(),
+                    deliveryKeys.list(),
                     (current = []) =>
                         current.map((pullRequest) =>
                             pullRequest.number === updatedPullRequest.number
@@ -370,7 +370,7 @@ export function useApprovePullRequestReview() {
                         )
                 );
             }
-            void queryClient.invalidateQueries({ queryKey: pullRequestKeys.list() });
+            void queryClient.invalidateQueries({ queryKey: deliveryKeys.list() });
         },
     });
 }
@@ -385,7 +385,7 @@ export function useUpdatePullRequestBranch() {
             const updatedPullRequest = response.pullRequest;
             if (updatedPullRequest) {
                 queryClient.setQueryData<PullRequestSummary[]>(
-                    pullRequestKeys.list(),
+                    deliveryKeys.list(),
                     (current = []) =>
                         current.map((pullRequest) =>
                             pullRequest.number === updatedPullRequest.number
@@ -394,7 +394,7 @@ export function useUpdatePullRequestBranch() {
                         )
                 );
             }
-            void queryClient.invalidateQueries({ queryKey: pullRequestKeys.list() });
+            void queryClient.invalidateQueries({ queryKey: deliveryKeys.list() });
         },
     });
 }
@@ -407,7 +407,7 @@ export function useRejectPullRequest() {
         mutationFn: ({ number, comment }: { number: number; comment?: string }) =>
             rejectPullRequest(number, comment),
         onSuccess: () => {
-            void queryClient.invalidateQueries({ queryKey: pullRequestKeys.list() });
+            void queryClient.invalidateQueries({ queryKey: deliveryKeys.list() });
         },
     });
 }
@@ -420,13 +420,13 @@ export function useDeployDashboard() {
         mutationFn: deployDashboard,
         onSuccess: () => {
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.deployments(),
+                queryKey: deliveryKeys.deployments(),
             });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.productionCheckout(),
+                queryKey: deliveryKeys.productionCheckout(),
             });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.releaseStatus(),
+                queryKey: deliveryKeys.releaseStatus(),
             });
         },
     });
@@ -441,13 +441,13 @@ export function useRollbackDashboard() {
             rollbackDashboard(targetCommit),
         onSuccess: () => {
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.deployments(),
+                queryKey: deliveryKeys.deployments(),
             });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.productionCheckout(),
+                queryKey: deliveryKeys.productionCheckout(),
             });
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.releaseStatus(),
+                queryKey: deliveryKeys.releaseStatus(),
             });
         },
     });
@@ -460,9 +460,9 @@ export function useStartPullRequestPreview() {
     return useMutation({
         mutationFn: ({ number }: { number: number }) => startPullRequestPreview(number),
         onSuccess: (preview) => {
-            queryClient.setQueryData(pullRequestKeys.preview(), preview);
+            queryClient.setQueryData(deliveryKeys.preview(), preview);
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.preview(),
+                queryKey: deliveryKeys.preview(),
             });
         },
     });
@@ -475,9 +475,9 @@ export function useStopPullRequestPreview() {
     return useMutation({
         mutationFn: ({ number }: { number: number }) => stopPullRequestPreview(number),
         onSuccess: (preview) => {
-            queryClient.setQueryData(pullRequestKeys.preview(), preview);
+            queryClient.setQueryData(deliveryKeys.preview(), preview);
             void queryClient.invalidateQueries({
-                queryKey: pullRequestKeys.preview(),
+                queryKey: deliveryKeys.preview(),
             });
         },
     });
diff --git a/src/pages/PullRequests.tsx b/src/pages/Delivery.tsx
similarity index 98%
rename from src/pages/PullRequests.tsx
rename to src/pages/Delivery.tsx
index 21dd839a3..475654368 100644
--- a/src/pages/PullRequests.tsx
+++ b/src/pages/Delivery.tsx
@@ -3,7 +3,6 @@ import {
     ExternalLink,
     GitBranch,
     GitMerge,
-    GitPullRequest,
     Play,
     Rocket,
     Square,
@@ -15,8 +14,8 @@ import rehypeRaw from "rehype-raw";
 import rehypeSanitize from "rehype-sanitize";
 import remarkGfm from "remark-gfm";
 
-import { ProductionReleasesCard } from "../components/features/pullRequests/ProductionReleasesCard";
-import { PullRequestPreviewCard } from "../components/features/pullRequests/PullRequestPreviewCard";
+import { ProductionReleasesCard } from "../components/features/delivery/ProductionReleasesCard";
+import { PullRequestDevelopmentCard } from "../components/features/delivery/PullRequestDevelopmentCard";
 import { Badge } from "../components/ui/Badge";
 import { Button } from "../components/ui/Button";
 import { Card, CardTitle } from "../components/ui/Card";
@@ -38,7 +37,7 @@ import {
     useDashboardReleaseStatus,
     useDeployDashboard,
     useProductionCheckout,
-    usePullRequestDeployments,
+    useDashboardDeployments,
     usePullRequestPreview,
     usePullRequests,
     useRejectPullRequest,
@@ -631,15 +630,15 @@ function RecentDeploysCard({ deployments }: { deployments: DeploymentJob[] }) {
     );
 }
 
-/** Renders the pull requests UI. */
-export function PullRequests() {
+/** Renders Dashboard delivery operations. */
+export function Delivery() {
     const {
         data: pullRequests = [],
         isLoading,
         error,
         refetch: refetchPullRequests,
     } = usePullRequests();
-    const { data: deployments = [] } = usePullRequestDeployments();
+    const { data: deployments = [] } = useDashboardDeployments();
     const { data: productionCheckout, error: productionCheckoutError } =
         useProductionCheckout();
     const { data: releaseStatus, error: releaseStatusError } =
@@ -988,13 +987,12 @@ export function PullRequests() {
                 <div className="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
                     <div>
                         <h2 className="flex items-center gap-2 text-xl font-semibold text-primary-100">
-                            <GitPullRequest className="size-5" />
-                            Pull requests
+                            <Rocket className="size-5" />
+                            Delivery
                         </h2>
                         <p className="mt-1 max-w-2xl text-sm text-primary-400">
-                            Review or temporarily preview open rajohan/Mira-Dashboard pull
-                            requests. Merge actions are enabled after review approval,
-                            passing CI, and a safe production checkout.
+                            Review and run trusted pull requests, manage production
+                            releases, and deploy the latest safe main checkout.
                         </p>
                     </div>
                     <div className="grid grid-cols-1 gap-2 sm:justify-items-end">
@@ -1035,7 +1033,7 @@ export function PullRequests() {
                     </Card>
                 ) : undefined}
 
-                <PullRequestPreviewCard
+                <PullRequestDevelopmentCard
                     error={previewStatusError ?? undefined}
                     isStopPending={isActionPending}
                     onStop={
diff --git a/src/router.tsx b/src/router.tsx
index 0a81b7d65..42dff9cfe 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -17,7 +17,7 @@ import { Jobs } from "./pages/Jobs";
 import { Login } from "./pages/Login";
 import { Logs } from "./pages/Logs";
 import { Moltbook } from "./pages/Moltbook";
-import { PullRequests } from "./pages/PullRequests";
+import { Delivery } from "./pages/Delivery";
 import { Reports } from "./pages/Reports";
 import { Sessions } from "./pages/Sessions";
 import { Settings } from "./pages/Settings";
@@ -120,10 +120,10 @@ const reportsRoute = createRoute({
     component: Reports,
 });
 
-const pullRequestsRoute = createRoute({
+const deliveryRoute = createRoute({
     getParentRoute: () => authenticatedRoute,
-    path: "/pull-requests",
-    component: PullRequests,
+    path: "/delivery",
+    component: Delivery,
 });
 
 const filesRoute = createRoute({
@@ -183,7 +183,7 @@ const routeTree = rootRoute.addChildren([
         logsRoute,
         jobsRoute,
         reportsRoute,
-        pullRequestsRoute,
+        deliveryRoute,
         filesRoute,
         dockerRoute,
         databaseRoute,
diff --git a/src/test/frontendBehavior.test.tsx b/src/test/frontendBehavior.test.tsx
index 123216b21..27bb148c0 100644
--- a/src/test/frontendBehavior.test.tsx
+++ b/src/test/frontendBehavior.test.tsx
@@ -145,13 +145,13 @@ import {
 import { OpenClawSocketProvider, useOpenClawSocket } from "../hooks/useOpenClawSocket";
 import { OPS_ACTIONS, useExecJob, useStartOpsAction } from "../hooks/useOpsActions";
 import {
-    pullRequestKeys,
+    deliveryKeys,
     useApprovePullRequest,
     useApprovePullRequestReview,
+    useDashboardDeployments,
     useDashboardReleaseStatus,
     useDeployDashboard,
     useProductionCheckout,
-    usePullRequestDeployments,
     usePullRequestPreview,
     usePullRequests,
     useRejectPullRequest,
@@ -159,7 +159,7 @@ import {
     useStartPullRequestPreview,
     useStopPullRequestPreview,
     useUpdatePullRequestBranch,
-} from "../hooks/usePullRequests";
+} from "../hooks/useDelivery";
 import { hasQuotaStatus, useQuotas } from "../hooks/useQuotas";
 import {
     scheduledJobKeys,
@@ -664,6 +664,8 @@ describe("Mira Dashboard frontend behavior", () => {
         expect(Login).toBeTypeOf("function");
         expect(DashboardDevtools).toBeTypeOf("function");
         expect(router.navigate).toBeTypeOf("function");
+        expect(Object.keys(router.routesByPath)).toContain("/delivery");
+        expect(Object.keys(router.routesByPath)).not.toContain("/pull-requests");
         expect(normalizeChatSearch({ session: " agent:ops:main:heartbeat " })).toEqual({
             session: "agent:ops:main:heartbeat",
         });
@@ -900,6 +902,10 @@ describe("Mira Dashboard frontend behavior", () => {
             });
 
             expect(screen.getByText("v2026.6.9")).toBeInTheDocument();
+            expect(screen.getByRole("link", { name: /Delivery/u })).toHaveAttribute(
+                "href",
+                "/delivery"
+            );
             const systemStatus = screen.getByRole("button", {
                 name: /System status: .+\. Open details/u,
             });
@@ -3310,7 +3316,7 @@ describe("Mira Dashboard frontend behavior", () => {
             expect(pullRequests.result.current.data?.[0]?.number).toBe(189)
         );
 
-        const deployments = renderHookWithQueryClient(() => usePullRequestDeployments());
+        const deployments = renderHookWithQueryClient(() => useDashboardDeployments());
         await waitFor(() =>
             expect(deployments.result.current.data?.[0]?.id).toBe("deploy-1")
         );
@@ -4738,7 +4744,7 @@ describe("Mira Dashboard frontend behavior", () => {
             status: "running",
         });
         expect(
-            startPreview.queryClient.getQueryData(pullRequestKeys.preview())
+            startPreview.queryClient.getQueryData(deliveryKeys.preview())
         ).toMatchObject({
             number: 189,
             status: "running",
@@ -4752,7 +4758,7 @@ describe("Mira Dashboard frontend behavior", () => {
             status: "stopped",
         });
         expect(
-            stopPreview.queryClient.getQueryData(pullRequestKeys.preview())
+            stopPreview.queryClient.getQueryData(deliveryKeys.preview())
         ).toMatchObject({
             number: 189,
             status: "stopped",
diff --git a/src/test/pageBehavior.test.tsx b/src/test/pageBehavior.test.tsx
index 688a27f0d..460541911 100644
--- a/src/test/pageBehavior.test.tsx
+++ b/src/test/pageBehavior.test.tsx
@@ -43,7 +43,7 @@ import { Files } from "../pages/Files";
 import { defaultDisableUntilDraft, Jobs } from "../pages/Jobs";
 import { Logs } from "../pages/Logs";
 import { Moltbook } from "../pages/Moltbook";
-import { PullRequests } from "../pages/PullRequests";
+import { Delivery } from "../pages/Delivery";
 import { Sessions } from "../pages/Sessions";
 import {
     errorMessage,
@@ -2147,7 +2147,7 @@ describe("Mira Dashboard pages", () => {
             [createElement(Jobs), "Heartbeat"],
             [createElement(Logs), "openclaw.log", { withSocket: true }],
             [createElement(Moltbook), "Dashboard testing"],
-            [createElement(PullRequests), "Expand backend coverage"],
+            [createElement(Delivery), "Expand backend coverage"],
             [createElement(Settings), "Two-step login", { withRouter: true }],
             [createElement(Terminal), "~"],
         ];
@@ -2807,9 +2807,10 @@ describe("Mira Dashboard pages", () => {
 
     it("drives pull request review, branch update, deploy, merge, and reject flows", async () => {
         const user = userEvent.setup();
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         await waitFor(() => {
+            expect(screen.getByRole("heading", { name: "Delivery" })).toBeInTheDocument();
             expect(screen.getByText("Expand backend coverage")).toBeInTheDocument();
             expect(screen.getByText("Bump dashboard dependency")).toBeInTheDocument();
             expect(screen.getByText("Deploy dashboard")).toBeInTheDocument();
@@ -2922,7 +2923,7 @@ describe("Mira Dashboard pages", () => {
             writable: true,
         });
 
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         const previewStatus = await screen.findByText(
             "PR dev status is unavailable: bun executable must resolve to an absolute path"
@@ -3005,7 +3006,7 @@ describe("Mira Dashboard pages", () => {
             writable: true,
         });
 
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         await waitFor(() => {
             expect(screen.getByText("Trusted PR dev")).toBeInTheDocument();
@@ -3077,7 +3078,7 @@ describe("Mira Dashboard pages", () => {
             writable: true,
         });
 
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         await waitFor(() => {
             expect(screen.getByText("GitHub listing unavailable")).toBeInTheDocument();
@@ -3133,7 +3134,7 @@ describe("Mira Dashboard pages", () => {
             writable: true,
         });
 
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         await waitFor(() => {
             expect(screen.getByText("No Mira-authored PRs waiting")).toBeInTheDocument();
@@ -3174,7 +3175,7 @@ describe("Mira Dashboard pages", () => {
             writable: true,
         });
 
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         await waitFor(() => {
             expect(screen.getByText("Dirty checkout")).toBeInTheDocument();
@@ -3248,7 +3249,7 @@ describe("Mira Dashboard pages", () => {
             writable: true,
         });
 
-        const view = renderPage(createElement(PullRequests));
+        const view = renderPage(createElement(Delivery));
 
         await waitFor(() => {
             expect(screen.getByText("Refresh stale check handling")).toBeInTheDocument();
diff --git a/src/test/productionReleasesCard.test.tsx b/src/test/productionReleasesCard.test.tsx
index 09f4aaede..57f7fb81e 100644
--- a/src/test/productionReleasesCard.test.tsx
+++ b/src/test/productionReleasesCard.test.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, render, screen } from "@testing-library/react";
 import { describe, expect, it, jest } from "bun:test";
 
-import { ProductionReleasesCard } from "../components/features/pullRequests/ProductionReleasesCard";
+import { ProductionReleasesCard } from "../components/features/delivery/ProductionReleasesCard";
 import type { DashboardReleaseStatus } from "../hooks";
 
 const CURRENT_COMMIT = "a".repeat(40);
diff --git a/src/test/pullRequestPreviewCard.test.tsx b/src/test/pullRequestDevelopmentCard.test.tsx
similarity index 82%
rename from src/test/pullRequestPreviewCard.test.tsx
rename to src/test/pullRequestDevelopmentCard.test.tsx
index 1ebfca0ae..611f69ef4 100644
--- a/src/test/pullRequestPreviewCard.test.tsx
+++ b/src/test/pullRequestDevelopmentCard.test.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, render, screen } from "@testing-library/react";
 import { describe, expect, it, jest } from "bun:test";
 
-import { PullRequestPreviewCard } from "../components/features/pullRequests/PullRequestPreviewCard";
+import { PullRequestDevelopmentCard } from "../components/features/delivery/PullRequestDevelopmentCard";
 import type { PullRequestPreviewStatus } from "../hooks";
 
 function preview(
@@ -18,9 +18,9 @@ function preview(
     };
 }
 
-describe("PullRequestPreviewCard", () => {
+describe("PullRequestDevelopmentCard", () => {
     it("renders the available and unavailable preview states", () => {
-        const { rerender } = render(<PullRequestPreviewCard preview={undefined} />);
+        const { rerender } = render(<PullRequestDevelopmentCard preview={undefined} />);
 
         expect(screen.getByText("Available")).toBeInTheDocument();
         expect(
@@ -28,7 +28,7 @@ describe("PullRequestPreviewCard", () => {
         ).toBeInTheDocument();
 
         rerender(
-            <PullRequestPreviewCard
+            <PullRequestDevelopmentCard
                 error={new Error("Preview status failed")}
                 preview={undefined}
             />
@@ -41,7 +41,7 @@ describe("PullRequestPreviewCard", () => {
     it("renders every managed lifecycle with bounded preview details", () => {
         const onStop = jest.fn();
         const { rerender } = render(
-            <PullRequestPreviewCard
+            <PullRequestDevelopmentCard
                 onStop={onStop}
                 preview={preview("running", {
                     url: "https://preview.example:5173",
@@ -60,19 +60,19 @@ describe("PullRequestPreviewCard", () => {
         expect(onStop).toHaveBeenCalledTimes(1);
 
         rerender(
-            <PullRequestPreviewCard onStop={onStop} preview={preview("starting")} />
+            <PullRequestDevelopmentCard onStop={onStop} preview={preview("starting")} />
         );
         expect(screen.getByText("Starting")).toBeInTheDocument();
         expect(screen.queryByRole("link", { name: /Open dev/u })).not.toBeInTheDocument();
 
         rerender(
-            <PullRequestPreviewCard onStop={onStop} preview={preview("stopping")} />
+            <PullRequestDevelopmentCard onStop={onStop} preview={preview("stopping")} />
         );
         expect(screen.getByText("Stopping")).toBeInTheDocument();
         expect(screen.getByRole("button", { name: "Stop dev" })).toBeDisabled();
 
         rerender(
-            <PullRequestPreviewCard
+            <PullRequestDevelopmentCard
                 onStop={onStop}
                 preview={preview("failed", {
                     commitSha: undefined,
@@ -87,7 +87,9 @@ describe("PullRequestPreviewCard", () => {
         expect(screen.getByText("commit pending")).toBeInTheDocument();
         expect(screen.getByText("Preview worker failed")).toBeInTheDocument();
 
-        rerender(<PullRequestPreviewCard onStop={onStop} preview={preview("stopped")} />);
+        rerender(
+            <PullRequestDevelopmentCard onStop={onStop} preview={preview("stopped")} />
+        );
         expect(screen.getByText("Available")).toBeInTheDocument();
         expect(screen.queryByRole("button", { name: "Stop dev" })).toBeNull();
     });

From 583e9aade2b06bae7f4225712cd70572397ee20c Mon Sep 17 00:00:00 2001
From: mira-2026 <mira-2026@agentmail.to>
Date: Mon, 27 Jul 2026 16:49:37 +0200
Subject: [PATCH 2/4] style: sort Delivery imports

---
 src/hooks/index.ts                 | 56 +++++++++++++++---------------
 src/pages/Delivery.tsx             |  2 +-
 src/router.tsx                     |  2 +-
 src/test/frontendBehavior.test.tsx | 32 ++++++++---------
 src/test/pageBehavior.test.tsx     |  2 +-
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 32789f806..b98a04644 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -64,6 +64,34 @@ export {
     useToggleCronJob,
     useUpdateCronJob,
 } from "./useCron";
+export type {
+    DashboardReleaseStatus,
+    DashboardReleaseSummary,
+    DeploymentJob,
+    ProductionCheckoutStatus,
+    PullRequestPreviewLifecycle,
+    PullRequestPreviewStatus,
+    PullRequestSummary,
+    WorktreeCleanupResult,
+} from "./useDelivery";
+export {
+    DELIVERY_NAV_REFRESH_MS,
+    DELIVERY_PAGE_REFRESH_MS,
+    deliveryKeys,
+    useApprovePullRequest,
+    useApprovePullRequestReview,
+    useDashboardDeployments,
+    useDashboardReleaseStatus,
+    useDeployDashboard,
+    useProductionCheckout,
+    usePullRequestPreview,
+    usePullRequests,
+    useRejectPullRequest,
+    useRollbackDashboard,
+    useStartPullRequestPreview,
+    useStopPullRequestPreview,
+    useUpdatePullRequestBranch,
+} from "./useDelivery";
 export {
     fileKeys,
     useFileContent,
@@ -108,34 +136,6 @@ export type {
     OpsActionId,
 } from "./useOpsActions";
 export { OPS_ACTIONS, useExecJob, useStartOpsAction } from "./useOpsActions";
-export type {
-    DashboardReleaseStatus,
-    DashboardReleaseSummary,
-    DeploymentJob,
-    ProductionCheckoutStatus,
-    PullRequestPreviewLifecycle,
-    PullRequestPreviewStatus,
-    PullRequestSummary,
-    WorktreeCleanupResult,
-} from "./useDelivery";
-export {
-    DELIVERY_NAV_REFRESH_MS,
-    DELIVERY_PAGE_REFRESH_MS,
-    deliveryKeys,
-    useApprovePullRequest,
-    useApprovePullRequestReview,
-    useDashboardDeployments,
-    useDashboardReleaseStatus,
-    useDeployDashboard,
-    useProductionCheckout,
-    usePullRequestPreview,
-    usePullRequests,
-    useRejectPullRequest,
-    useRollbackDashboard,
-    useStartPullRequestPreview,
-    useStopPullRequestPreview,
-    useUpdatePullRequestBranch,
-} from "./useDelivery";
 export { hasQuotaStatus, useQuotas } from "./useQuotas";
 export type { ReportItem, ReportStatus, ReportType } from "./useReports";
 export {
diff --git a/src/pages/Delivery.tsx b/src/pages/Delivery.tsx
index 475654368..45561fbb9 100644
--- a/src/pages/Delivery.tsx
+++ b/src/pages/Delivery.tsx
@@ -34,10 +34,10 @@ import type {
 import {
     useApprovePullRequest,
     useApprovePullRequestReview,
+    useDashboardDeployments,
     useDashboardReleaseStatus,
     useDeployDashboard,
     useProductionCheckout,
-    useDashboardDeployments,
     usePullRequestPreview,
     usePullRequests,
     useRejectPullRequest,
diff --git a/src/router.tsx b/src/router.tsx
index 42dff9cfe..d66759b0c 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -11,13 +11,13 @@ import { Agents } from "./pages/Agents";
 import { Chat } from "./pages/Chat";
 import { Dashboard } from "./pages/Dashboard";
 import { Database } from "./pages/Database";
+import { Delivery } from "./pages/Delivery";
 import { Docker } from "./pages/Docker";
 import { Files } from "./pages/Files";
 import { Jobs } from "./pages/Jobs";
 import { Login } from "./pages/Login";
 import { Logs } from "./pages/Logs";
 import { Moltbook } from "./pages/Moltbook";
-import { Delivery } from "./pages/Delivery";
 import { Reports } from "./pages/Reports";
 import { Sessions } from "./pages/Sessions";
 import { Settings } from "./pages/Settings";
diff --git a/src/test/frontendBehavior.test.tsx b/src/test/frontendBehavior.test.tsx
index 27bb148c0..f49b596d0 100644
--- a/src/test/frontendBehavior.test.tsx
+++ b/src/test/frontendBehavior.test.tsx
@@ -127,6 +127,22 @@ import {
     useUpdateCronJob,
 } from "../hooks/useCron";
 import { useDatabaseOverview } from "../hooks/useDatabase";
+import {
+    deliveryKeys,
+    useApprovePullRequest,
+    useApprovePullRequestReview,
+    useDashboardDeployments,
+    useDashboardReleaseStatus,
+    useDeployDashboard,
+    useProductionCheckout,
+    usePullRequestPreview,
+    usePullRequests,
+    useRejectPullRequest,
+    useRollbackDashboard,
+    useStartPullRequestPreview,
+    useStopPullRequestPreview,
+    useUpdatePullRequestBranch,
+} from "../hooks/useDelivery";
 import { useDockerContainers } from "../hooks/useDocker";
 import { useFileContent, useFiles, useSaveFile } from "../hooks/useFiles";
 import { type HealthResponse, useHealth } from "../hooks/useHealth";
@@ -144,22 +160,6 @@ import {
 } from "../hooks/useNotifications";
 import { OpenClawSocketProvider, useOpenClawSocket } from "../hooks/useOpenClawSocket";
 import { OPS_ACTIONS, useExecJob, useStartOpsAction } from "../hooks/useOpsActions";
-import {
-    deliveryKeys,
-    useApprovePullRequest,
-    useApprovePullRequestReview,
-    useDashboardDeployments,
-    useDashboardReleaseStatus,
-    useDeployDashboard,
-    useProductionCheckout,
-    usePullRequestPreview,
-    usePullRequests,
-    useRejectPullRequest,
-    useRollbackDashboard,
-    useStartPullRequestPreview,
-    useStopPullRequestPreview,
-    useUpdatePullRequestBranch,
-} from "../hooks/useDelivery";
 import { hasQuotaStatus, useQuotas } from "../hooks/useQuotas";
 import {
     scheduledJobKeys,
diff --git a/src/test/pageBehavior.test.tsx b/src/test/pageBehavior.test.tsx
index 460541911..3db3f39e6 100644
--- a/src/test/pageBehavior.test.tsx
+++ b/src/test/pageBehavior.test.tsx
@@ -38,12 +38,12 @@ import { Agents } from "../pages/Agents";
 import { Chat } from "../pages/Chat";
 import { Dashboard } from "../pages/Dashboard";
 import { Database } from "../pages/Database";
+import { Delivery } from "../pages/Delivery";
 import { Docker } from "../pages/Docker";
 import { Files } from "../pages/Files";
 import { defaultDisableUntilDraft, Jobs } from "../pages/Jobs";
 import { Logs } from "../pages/Logs";
 import { Moltbook } from "../pages/Moltbook";
-import { Delivery } from "../pages/Delivery";
 import { Sessions } from "../pages/Sessions";
 import {
     errorMessage,

From 391df4a46f63e35325753a737afd6b16a2efb502 Mon Sep 17 00:00:00 2001
From: mira-2026 <mira-2026@agentmail.to>
Date: Mon, 27 Jul 2026 17:55:22 +0200
Subject: [PATCH 3/4] feat: improve managed PR dev lifecycle

---
 backend/src/development/developmentStack.ts   |  46 ++++-
 backend/src/routes/pullRequestRoutes.ts       |   5 +-
 .../src/services/pullRequestPreviewHost.ts    | 159 +++++++++++++--
 backend/src/services/pullRequestPreviews.ts   |  77 ++++++-
 backend/src/services/pullRequests.ts          |   9 +
 backend/test/developmentStack.test.ts         |  19 +-
 backend/test/pullRequestPreview.test.ts       | 189 ++++++++++++++++--
 backend/test/serviceBehavior.test.ts          |  12 ++
 backend/test/setup.ts                         |  17 ++
 docs/development/local-dev.md                 |  27 ++-
 docs/setup/production-deploy.md               |  14 +-
 docs/setup/secrets-and-env.md                 |  41 ++--
 scripts/developmentFrontend.ts                |   6 +-
 .../delivery/PullRequestDevelopmentCard.tsx   |   4 +-
 src/hooks/useDelivery.ts                      |   5 +
 src/pages/Delivery.tsx                        |  97 +++++++--
 src/test/pageBehavior.test.tsx                |  94 +++++++++
 src/test/pullRequestDevelopmentCard.test.tsx  |   2 +
 18 files changed, 716 insertions(+), 107 deletions(-)

diff --git a/backend/src/development/developmentStack.ts b/backend/src/development/developmentStack.ts
index 34c5d9069..ec02890f8 100644
--- a/backend/src/development/developmentStack.ts
+++ b/backend/src/development/developmentStack.ts
@@ -70,6 +70,7 @@ export interface DevelopmentStackConfig {
     frontendPort: number;
     gatewayTokenFile?: string;
     gatewayUrl: string;
+    hotReload: boolean;
     openClawClientHome: string;
     openClawConfigSource?: string;
     openClawHome: string;
@@ -269,6 +270,18 @@ function configuredStateOwner(value: string | undefined, fallback: string): stri
     return owner;
 }
 
+function isEnvironmentFlagEnabled(
+    name: string,
+    value: string | undefined,
+    isEnabledByDefault: boolean
+): boolean {
+    const configured = value?.trim();
+    if (!configured) return isEnabledByDefault;
+    if (configured === "1") return true;
+    if (configured === "0") return false;
+    throw new TypeError(`${name} must be 0 or 1`);
+}
+
 function absoluteNonRootPath(
     name: string,
     value: string | undefined,
@@ -425,6 +438,11 @@ export function resolveDevelopmentStackConfig(
         frontendPort,
         gatewayTokenFile,
         gatewayUrl: gatewayUrl || DEFAULT_GATEWAY_URL,
+        hotReload: isEnvironmentFlagEnabled(
+            "MIRA_DASHBOARD_DEV_HOT_RELOAD",
+            environment.MIRA_DASHBOARD_DEV_HOT_RELOAD,
+            true
+        ),
         openClawClientHome: path.join(stateRoot, "openclaw-client"),
         openClawConfigSource: absoluteNonRootPath(
             "MIRA_DASHBOARD_DEV_OPENCLAW_CONFIG_SOURCE",
@@ -993,6 +1011,7 @@ function frontendEnvironment(config: DevelopmentStackConfig): Record<string, str
         DASHBOARD_API_TARGET: config.apiTarget,
         HOST: config.frontendHost,
         MIRA_DASHBOARD_DEV_COOKIE_NAMESPACE: `mira_dashboard_dev_${config.frontendPort}`,
+        MIRA_DASHBOARD_DEV_HOT_RELOAD: config.hotReload ? "1" : "0",
         MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN: config.publicOrigin,
         PORT: String(config.frontendPort),
     };
@@ -1013,27 +1032,31 @@ function stopChild(child: DevelopmentChild): void {
     }
 }
 
-/** Starts watched frontend/backend children and keeps their lifecycle coupled. */
+/** Starts frontend/backend children and keeps their lifecycle coupled. */
 export async function runDevelopmentStack(
     config: DevelopmentStackConfig
 ): Promise<number> {
     const state = prepareDevelopmentState(config);
     prepareDevelopmentLog(config);
     const bun = Bun.which("bun") || process.execPath;
-    const backend = Bun.spawn([bun, "--watch", "src/serverStart.ts"], {
+    const watchArguments = config.hotReload ? ["--watch"] : [];
+    const backend = Bun.spawn([bun, ...watchArguments, "src/serverStart.ts"], {
         cwd: path.join(config.repositoryRoot, "backend"),
         env: developmentBackendEnvironment(config),
         stderr: "inherit",
         stdin: "inherit",
         stdout: "inherit",
     });
-    const frontend = Bun.spawn([bun, "--watch", "scripts/developmentFrontend.ts"], {
-        cwd: config.repositoryRoot,
-        env: frontendEnvironment(config),
-        stderr: "inherit",
-        stdin: "inherit",
-        stdout: "inherit",
-    });
+    const frontend = Bun.spawn(
+        [bun, ...watchArguments, "scripts/developmentFrontend.ts"],
+        {
+            cwd: config.repositoryRoot,
+            env: frontendEnvironment(config),
+            stderr: "inherit",
+            stdin: "inherit",
+            stdout: "inherit",
+        }
+    );
     let developmentLogFixtureIndex = 0;
     const developmentLogFixtureTimer = setInterval(() => {
         try {
@@ -1065,8 +1088,9 @@ export async function runDevelopmentStack(
     console.log(
         [
             `Mira Dashboard development stack: ${config.publicOrigin}`,
-            `Frontend HMR: ${config.frontendHost}:${config.frontendPort}`,
-            `Backend HMR: ${config.backendHost}:${config.backendPort}`,
+            `Frontend${config.hotReload ? " HMR" : ""}: ${config.frontendHost}:${config.frontendPort}`,
+            `Backend${config.hotReload ? " HMR" : ""}: ${config.backendHost}:${config.backendPort}`,
+            `Hot reload: ${config.hotReload ? "enabled" : "disabled"}.`,
             `State: ${config.stateRoot} (database ${state.database}, workspace ${state.workspace}, releases ${state.releases})`,
             `Gateway: ${config.gatewayUrl}`,
             "Isolated scheduler/worker enabled.",
diff --git a/backend/src/routes/pullRequestRoutes.ts b/backend/src/routes/pullRequestRoutes.ts
index 48eaecbf4..76959d6ad 100644
--- a/backend/src/routes/pullRequestRoutes.ts
+++ b/backend/src/routes/pullRequestRoutes.ts
@@ -4,6 +4,7 @@ import {
     getPullRequestPreviewStatus,
     prepareAndStartPullRequestPreview,
     prepareAndStopPullRequestPreview,
+    reconcileClosedPullRequestPreview,
 } from "../services/pullRequestPreviews.ts";
 import {
     getDashboardReleaseStatus,
@@ -43,7 +44,9 @@ export const pullRequestRoutes = {
     "/api/pull-requests": {
         GET: async () => {
             try {
-                return json({ pullRequests: await listDashboardPullRequests() });
+                const pullRequests = await listDashboardPullRequests();
+                await reconcileClosedPullRequestPreview(pullRequests);
+                return json({ pullRequests });
             } catch (error) {
                 return routeError(error);
             }
diff --git a/backend/src/services/pullRequestPreviewHost.ts b/backend/src/services/pullRequestPreviewHost.ts
index f1a8553e2..9f9b6ddcf 100644
--- a/backend/src/services/pullRequestPreviewHost.ts
+++ b/backend/src/services/pullRequestPreviewHost.ts
@@ -40,6 +40,8 @@ const COMMIT_PATTERN = /^[\da-f]{40}$/u;
 const UNIT_NAME_PATTERN = /^[A-Za-z0-9_.@-]+\.service$/u;
 const DEFAULT_GATEWAY_URL = "ws://127.0.0.1:18789";
 const DEFAULT_GATEWAY_PROXY_PORT = 18_790;
+const DEFAULT_PREVIEW_WORKTREE_PATH = "/home/ubuntu/projects/mira-dashboard-preview";
+const PREVIEW_REFERENCE = "refs/mira-dashboard/previews/active";
 const PREVIEW_GATEWAY_PROXY_ENTRYPOINT = "pullRequestPreviewGatewayProxy.js";
 const PREVIEW_GATEWAY_PROXY_READY_TIMEOUT_MS = 45_000;
 const PREVIEW_GATEWAY_PROXY_READY_POLL_MS = 250;
@@ -81,6 +83,12 @@ export interface PullRequestPreviewCandidate {
     title: string;
 }
 
+export interface PullRequestPreviewCleanupResult {
+    message: string;
+    number: number;
+    status: "removed" | "skipped" | "warning";
+}
+
 export interface PullRequestPreviewConfig {
     allowedAuthors: ReadonlySet<string>;
     backendPort: number;
@@ -96,6 +104,7 @@ export interface PullRequestPreviewConfig {
     gatewayUpstreamTokenFile: string;
     gatewayUrl: string;
     gitCommonDirectory: string;
+    managedWorktreePath: string;
     openClawConfigSource?: string;
     previewRoot: string;
     recentAuthMinutes?: string;
@@ -105,7 +114,6 @@ export interface PullRequestPreviewConfig {
     stateFile: string;
     unitName: string;
     workspaceSource?: string;
-    worktreeRoot: string;
 }
 
 interface PullRequestPreviewRecord {
@@ -277,16 +285,28 @@ export function resolvePullRequestPreviewConfig(
         "MIRA_DASHBOARD_ROOT",
         environment.MIRA_DASHBOARD_ROOT?.trim() || "/home/ubuntu/projects/mira-dashboard"
     );
-    const worktreeRoot = absoluteNonRootPath(
-        "MIRA_DASHBOARD_WORKTREE_ROOT",
-        environment.MIRA_DASHBOARD_WORKTREE_ROOT?.trim() ||
-            "/home/ubuntu/projects/mira-dashboard-worktrees"
-    );
     const previewRoot = absoluteNonRootPath(
         "MIRA_DASHBOARD_PREVIEW_ROOT",
         environment.MIRA_DASHBOARD_PREVIEW_ROOT?.trim() ||
             "/home/ubuntu/projects/mira-dashboard-preview-state/managed"
     );
+    const managedWorktreePath = absoluteNonRootPath(
+        "MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH",
+        environment.MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH?.trim() ||
+            DEFAULT_PREVIEW_WORKTREE_PATH
+    );
+    if (
+        [dashboardRoot, previewRoot].some(
+            (protectedRoot) =>
+                managedWorktreePath === protectedRoot ||
+                isPathStrictlyWithin(managedWorktreePath, protectedRoot) ||
+                isPathStrictlyWithin(protectedRoot, managedWorktreePath)
+        )
+    ) {
+        throw new TypeError(
+            "MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH must not overlap Dashboard source or preview state"
+        );
+    }
     const frontendPort = configuredPort(
         "MIRA_DASHBOARD_PREVIEW_FRONTEND_PORT",
         environment.MIRA_DASHBOARD_PREVIEW_FRONTEND_PORT,
@@ -368,6 +388,7 @@ export function resolvePullRequestPreviewConfig(
             dashboardRoot,
             environment.MIRA_DASHBOARD_PREVIEW_GIT_COMMON_DIR
         ),
+        managedWorktreePath,
         openClawConfigSource: openClawSourceRoot
             ? path.join(openClawSourceRoot, "openclaw.json")
             : undefined,
@@ -394,7 +415,6 @@ export function resolvePullRequestPreviewConfig(
         workspaceSource: openClawSourceRoot
             ? path.join(openClawSourceRoot, "workspace")
             : undefined,
-        worktreeRoot,
     };
 }
 
@@ -696,8 +716,47 @@ function githubCommandEnvironment(): Record<string, string | undefined> {
     return environment;
 }
 
-function previewWorktreePath(config: PullRequestPreviewConfig, number: number): string {
-    return path.join(config.worktreeRoot, `preview-pr-${number}`);
+function previewWorktreePath(config: PullRequestPreviewConfig): string {
+    return config.managedWorktreePath;
+}
+
+async function removePreviewWorktree(
+    config: PullRequestPreviewConfig,
+    worktreePath: string,
+    signal?: AbortSignal
+): Promise<boolean> {
+    const resolvedWorktreePath = path.resolve(worktreePath);
+    if (resolvedWorktreePath !== path.resolve(config.managedWorktreePath)) {
+        throw new Error("Refusing to remove an unmanaged preview worktree");
+    }
+    if (!existsSync(resolvedWorktreePath)) return false;
+    if (!isRealDirectory(resolvedWorktreePath)) {
+        throw new Error("Preview worktree path must be a real directory");
+    }
+    const { stdout: registeredRoot } = await runCommand(
+        "git",
+        ["-C", resolvedWorktreePath, "rev-parse", "--show-toplevel"],
+        { signal }
+    );
+    if (realpathSync(registeredRoot.trim()) !== realpathSync(resolvedWorktreePath)) {
+        throw new Error("Preview path is not the expected registered worktree");
+    }
+    await runCommand(
+        "git",
+        [
+            "-C",
+            config.dashboardRoot,
+            "worktree",
+            "remove",
+            "--force",
+            resolvedWorktreePath,
+        ],
+        { signal, timeoutMs: 120_000 }
+    );
+    if (existsSync(resolvedWorktreePath)) {
+        throw new Error("Git did not remove the managed preview worktree");
+    }
+    return true;
 }
 
 async function ensurePreviewWorktree(
@@ -706,12 +765,8 @@ async function ensurePreviewWorktree(
     commitSha: string,
     signal?: AbortSignal
 ): Promise<string> {
-    ensureRealDirectory(config.worktreeRoot);
-    const worktreePath = previewWorktreePath(config, number);
-    if (!isPathStrictlyWithin(worktreePath, config.worktreeRoot)) {
-        throw new Error("Preview worktree escaped the configured worktree root");
-    }
-    const previewReference = `refs/mira-dashboard/previews/pr-${number}`;
+    ensureRealDirectory(path.dirname(config.managedWorktreePath));
+    const worktreePath = previewWorktreePath(config);
     await runCommand(
         "git",
         [
@@ -721,7 +776,7 @@ async function ensurePreviewWorktree(
             "--force",
             "--no-tags",
             "origin",
-            `pull/${number}/head:${previewReference}`,
+            `pull/${number}/head:${PREVIEW_REFERENCE}`,
         ],
         {
             env: githubCommandEnvironment(),
@@ -731,7 +786,7 @@ async function ensurePreviewWorktree(
     );
     const { stdout: fetchedCommit } = await runCommand(
         "git",
-        ["-C", config.dashboardRoot, "rev-parse", previewReference],
+        ["-C", config.dashboardRoot, "rev-parse", PREVIEW_REFERENCE],
         { env: githubCommandEnvironment(), signal }
     );
     if (fetchedCommit.trim() !== commitSha) {
@@ -961,6 +1016,28 @@ function managedStateRoot(config: PullRequestPreviewConfig, number: number): str
     return stateRoot;
 }
 
+function didRemoveManagedPreviewState(
+    config: PullRequestPreviewConfig,
+    number: number
+): boolean {
+    const stateRoot = managedStateRoot(config, number);
+    if (!existsSync(stateRoot)) return false;
+    if (!isRealDirectory(stateRoot)) {
+        throw new Error("PR dev state path must be a real directory");
+    }
+    rmSync(stateRoot, { force: true, recursive: true });
+    return true;
+}
+
+function didRemovePreviewRecord(config: PullRequestPreviewConfig): boolean {
+    if (!existsSync(config.stateFile)) return false;
+    if (!isRealRegularFile(config.stateFile)) {
+        throw new Error("PR dev record path must be a real regular file");
+    }
+    rmSync(config.stateFile, { force: true });
+    return true;
+}
+
 function previewGatewayProxyUrl(config: PullRequestPreviewConfig): string {
     return `ws://127.0.0.1:${config.gatewayProxyPort}/gateway`;
 }
@@ -1122,6 +1199,9 @@ export function buildPullRequestPreviewSandboxCommand(input: {
         "MIRA_DASHBOARD_DEV_GATEWAY_URL",
         previewGatewayProxyUrl(config),
         "--setenv",
+        "MIRA_DASHBOARD_DEV_HOT_RELOAD",
+        "0",
+        "--setenv",
         "MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN",
         publicOrigin,
         "--setenv",
@@ -1515,7 +1595,7 @@ async function waitForPreviewReady(
             });
             if (response.ok && state?.activeState === "active") return;
         } catch {
-            // The watched frontend/backend pair is still starting.
+            // The managed frontend/backend pair is still starting.
         }
         await Bun.sleep(PREVIEW_READY_POLL_MS);
     }
@@ -1617,7 +1697,7 @@ export async function startPullRequestPreview(
         isTailscaleServeOwned = false;
     }
     const publicOrigin = tailscaleRoute.url;
-    const worktreePath = previewWorktreePath(config, number);
+    const worktreePath = previewWorktreePath(config);
     const startingRecord: PullRequestPreviewRecord = {
         backendPort: config.backendPort,
         commitSha: pullRequest.commitSha,
@@ -1759,3 +1839,44 @@ export async function stopPullRequestPreview(
     writePreviewRecord(config, stoppedRecord);
     return publicPreviewStatus(stoppedRecord);
 }
+
+/** Removes the shared checkout and isolated state after its owning PR closes. */
+export async function cleanupClosedPullRequestPreview(
+    number: number,
+    options: { config?: PullRequestPreviewConfig } = {}
+): Promise<PullRequestPreviewCleanupResult> {
+    const config = options.config ?? resolvePullRequestPreviewConfig();
+    const record = readPreviewRecord(config);
+    const hasManagedSlotOwnership = record?.number === number;
+    let didRemove = false;
+    try {
+        if (hasManagedSlotOwnership) {
+            await stopPullRequestPreview(number, { config });
+            didRemove =
+                (await removePreviewWorktree(config, previewWorktreePath(config))) ||
+                didRemove;
+            await runCommand("git", [
+                "-C",
+                config.dashboardRoot,
+                "update-ref",
+                "-d",
+                PREVIEW_REFERENCE,
+            ]);
+            didRemove = didRemovePreviewRecord(config) || didRemove;
+        }
+        didRemove = didRemoveManagedPreviewState(config, number) || didRemove;
+        return {
+            message: didRemove
+                ? `Removed managed PR dev data for #${number}`
+                : `No managed PR dev data found for #${number}`,
+            number,
+            status: didRemove ? "removed" : "skipped",
+        };
+    } catch (error) {
+        return {
+            message: `PR dev cleanup warning for #${number}: ${errorMessage(error, "cleanup failed")}`,
+            number,
+            status: "warning",
+        };
+    }
+}
diff --git a/backend/src/services/pullRequestPreviews.ts b/backend/src/services/pullRequestPreviews.ts
index c85b7ff7d..0179e1ed8 100644
--- a/backend/src/services/pullRequestPreviews.ts
+++ b/backend/src/services/pullRequestPreviews.ts
@@ -1,9 +1,11 @@
+import { errorMessage } from "../lib/errors.ts";
 import {
     enqueueJobExecution,
     type JobExecution,
     listJobExecutions,
 } from "./jobExecutionQueue.ts";
 import {
+    cleanupClosedPullRequestPreview,
     getPullRequestPreviewStatus as readPullRequestPreviewStatus,
     type PullRequestPreviewCandidate,
     type PullRequestPreviewLifecycle,
@@ -30,6 +32,11 @@ export type {
 const PREVIEW_START_TIMEOUT_MS = 30 * 60 * 1000;
 const PREVIEW_STOP_TIMEOUT_MS = 6 * 60 * 1000;
 const PREVIEW_WAIT_GRACE_MS = 5 * 60 * 1000;
+const PREVIEW_ACTION_KEYS = new Set([
+    "dashboard.preview.cleanup",
+    "dashboard.preview.start",
+    "dashboard.preview.stop",
+]);
 const COMMIT_SHA_PATTERN = /^[\da-f]{40}$/u;
 const PREVIEW_LIFECYCLES = new Set<PullRequestPreviewLifecycle>([
     "failed",
@@ -135,9 +142,7 @@ export async function getPullRequestPreviewStatus(): Promise<PullRequestPreviewS
     const activeExecution = listJobExecutions(200).find(
         (execution) =>
             ["queued", "running"].includes(execution.status) &&
-            ["dashboard.preview.start", "dashboard.preview.stop"].includes(
-                execution.actionKey
-            )
+            PREVIEW_ACTION_KEYS.has(execution.actionKey)
     );
     if (!activeExecution) return preview;
 
@@ -161,6 +166,45 @@ export async function getPullRequestPreviewStatus(): Promise<PullRequestPreviewS
     };
 }
 
+/**
+ * Queues cleanup when a successful, exhaustive open-PR listing no longer
+ * contains the PR that owns the managed slot.
+ */
+export async function reconcileClosedPullRequestPreview(
+    openPullRequests: readonly PullRequestSummary[]
+): Promise<void> {
+    try {
+        if (
+            listJobExecutions(200).some(
+                (execution) =>
+                    ["queued", "running"].includes(execution.status) &&
+                    PREVIEW_ACTION_KEYS.has(execution.actionKey)
+            )
+        ) {
+            return;
+        }
+        const preview = await readPullRequestPreviewStatus();
+        if (
+            preview.number === undefined ||
+            openPullRequests.some((pullRequest) => pullRequest.number === preview.number)
+        ) {
+            return;
+        }
+        enqueueJobExecution({
+            actionKey: "dashboard.preview.cleanup",
+            displayName: `Clean up closed PR #${preview.number} preview`,
+            payload: { number: preview.number },
+            resourceClass: "exclusive",
+            timeoutMs: PREVIEW_STOP_TIMEOUT_MS,
+        });
+    } catch (error) {
+        console.error(
+            "[PullRequestPreview] Closed-PR reconciliation failed:",
+            errorMessage(error, "preview cleanup reconciliation failed")
+        );
+    }
+}
+
 /** Queues one managed preview startup in the dedicated production worker. */
 export async function prepareAndStartPullRequestPreview(
     number: number
@@ -227,8 +271,33 @@ export async function prepareAndStopPullRequestPreview(
     );
 }
 
-/** Registers host preview start/stop actions only in the full production worker. */
+/** Registers host preview lifecycle actions only in the full production worker. */
 export function registerPullRequestPreviewExecutionActions(): void {
+    registerScheduledJobAction(
+        "dashboard.preview.cleanup",
+        async (job, _signal, context) => {
+            const number = executionPreviewNumber(job.actionPayload.number);
+            const openPullRequests = await listDashboardPullRequests();
+            const isStillOpen = openPullRequests.some(
+                (pullRequest) => pullRequest.number === number
+            );
+            if (isStillOpen) {
+                return {
+                    cleanup: {
+                        message: `PR #${number} is still open; managed PR dev data was kept`,
+                        number,
+                        status: "skipped",
+                    },
+                    preview: await readPullRequestPreviewStatus(),
+                };
+            }
+            context.protectFromCancellation();
+            return {
+                cleanup: await cleanupClosedPullRequestPreview(number),
+                preview: await readPullRequestPreviewStatus(),
+            };
+        }
+    );
     registerScheduledJobAction(
         "dashboard.preview.start",
         async (job, signal, context) => {
diff --git a/backend/src/services/pullRequests.ts b/backend/src/services/pullRequests.ts
index 5fb934cf7..bcf12fbcf 100644
--- a/backend/src/services/pullRequests.ts
+++ b/backend/src/services/pullRequests.ts
@@ -35,6 +35,10 @@ import {
     registerExpiredJobExecutionHandler,
     registerQueuedJobCancellationHandler,
 } from "./jobExecutionQueue.ts";
+import {
+    cleanupClosedPullRequestPreview,
+    type PullRequestPreviewCleanupResult,
+} from "./pullRequestPreviewHost.ts";
 import {
     isPullRequestPreviewAuthorAllowed,
     resolvePullRequestPreviewAllowedAuthors,
@@ -2800,6 +2804,7 @@ export async function approvePullRequest(
     let deployError: string | undefined;
     let deployment: DeploymentJob | undefined;
     let cleanup: WorktreeCleanupResult;
+    let previewCleanup: PullRequestPreviewCleanupResult;
 
     try {
         if (options.lockHeldBy) {
@@ -2826,6 +2831,7 @@ export async function approvePullRequest(
             { signal: options.signal, timeoutMs: 120_000 }
         );
         cleanup = await cleanupPullRequestWorktree(pr.headRefName, options.signal);
+        previewCleanup = await cleanupClosedPullRequestPreview(number);
 
         try {
             await syncMain(options.signal);
@@ -2859,6 +2865,7 @@ export async function approvePullRequest(
         deployment,
         deployError,
         cleanup,
+        previewCleanup,
         syncError,
     };
 }
@@ -2957,11 +2964,13 @@ export async function rejectPullRequest(
         { signal, timeoutMs: 60_000 }
     );
     const cleanup = await cleanupPullRequestWorktree(pr.headRefName, signal);
+    const previewCleanup = await cleanupClosedPullRequestPreview(number);
 
     return {
         isOk: true,
         message: `PR #${number} closed`,
         cleanup,
+        previewCleanup,
     };
 }
 
diff --git a/backend/test/developmentStack.test.ts b/backend/test/developmentStack.test.ts
index 98a09ee64..80cf2f967 100644
--- a/backend/test/developmentStack.test.ts
+++ b/backend/test/developmentStack.test.ts
@@ -168,6 +168,7 @@ describe("development stack", () => {
                 frontendHost: "127.0.0.1",
                 frontendPort: 5173,
                 gatewayUrl: "ws://127.0.0.1:18789",
+                hotReload: true,
                 publicOrigin: "http://localhost:5173",
                 releaseSource: path.join(root, "projects", "mira-dashboard-releases"),
                 rpId: "localhost",
@@ -187,6 +188,7 @@ describe("development stack", () => {
                     MIRA_DASHBOARD_DEV_FRONTEND_PORT: "4173",
                     MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE: tokenFile,
                     MIRA_DASHBOARD_DEV_GATEWAY_URL: "wss://gateway.example/ws",
+                    MIRA_DASHBOARD_DEV_HOT_RELOAD: "0",
                     MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN: "https://dashboard.example:4173",
                     MIRA_DASHBOARD_DEV_STATE_ROOT: path.join(root, "state"),
                 },
@@ -197,6 +199,7 @@ describe("development stack", () => {
                 frontendPort: 4173,
                 gatewayTokenFile: tokenFile,
                 gatewayUrl: "wss://gateway.example/ws",
+                hotReload: false,
                 rpId: "dashboard.example",
             });
 
@@ -219,6 +222,10 @@ describe("development stack", () => {
                     HOME: root,
                     MIRA_DASHBOARD_DEV_GATEWAY_URL: "https://gateway.example",
                 },
+                {
+                    HOME: root,
+                    MIRA_DASHBOARD_DEV_HOT_RELOAD: "true",
+                },
             ]) {
                 expect(() => resolveDevelopmentStackConfig(environment, root)).toThrow();
             }
@@ -616,7 +623,7 @@ describe("development stack", () => {
         }
     });
 
-    it("couples watched frontend and backend child lifecycles", async () => {
+    it("couples frontend and backend child lifecycles without watchers when disabled", async () => {
         const root = temporaryRoot("mira-development-processes-");
         const gatewayTokenFile = path.join(root, "gateway.token");
         writeFileSync(gatewayTokenFile, "development-gateway-token\n", {
@@ -641,6 +648,7 @@ describe("development stack", () => {
             {
                 HOME: root,
                 MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE: gatewayTokenFile,
+                MIRA_DASHBOARD_DEV_HOT_RELOAD: "0",
                 MIRA_DASHBOARD_DEV_STATE_ROOT: path.join(root, "state"),
             },
             root
@@ -660,6 +668,10 @@ describe("development stack", () => {
             backend.complete(7);
             await expect(running).resolves.toBe(7);
             expect(spawnSpy).toHaveBeenCalledTimes(2);
+            expect(spawnSpy.mock.calls[0]?.[0]).toEqual([
+                expect.any(String),
+                "src/serverStart.ts",
+            ]);
             expect(spawnSpy.mock.calls[0]?.[1]).toMatchObject({
                 cwd: path.join(root, "backend"),
                 env: expect.objectContaining({
@@ -667,10 +679,15 @@ describe("development stack", () => {
                     MIRA_DASHBOARD_JOB_PROFILE: "isolated",
                 }),
             });
+            expect(spawnSpy.mock.calls[1]?.[0]).toEqual([
+                expect.any(String),
+                "scripts/developmentFrontend.ts",
+            ]);
             expect(spawnSpy.mock.calls[1]?.[1]).toMatchObject({
                 cwd: root,
                 env: expect.objectContaining({
                     DASHBOARD_API_TARGET: "http://127.0.0.1:3101",
+                    MIRA_DASHBOARD_DEV_HOT_RELOAD: "0",
                     MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN: "http://localhost:5173",
                     PORT: "5173",
                 }),
diff --git a/backend/test/pullRequestPreview.test.ts b/backend/test/pullRequestPreview.test.ts
index 4b93bd574..6ba50f5b1 100644
--- a/backend/test/pullRequestPreview.test.ts
+++ b/backend/test/pullRequestPreview.test.ts
@@ -22,6 +22,7 @@ import * as jobExecutionQueue from "../src/services/jobExecutionQueue.ts";
 import * as previewHost from "../src/services/pullRequestPreviewHost.ts";
 import {
     buildPullRequestPreviewSandboxCommand,
+    cleanupClosedPullRequestPreview,
     getPullRequestPreviewStatus,
     parsePreviewUnitState,
     type PullRequestPreviewConfig,
@@ -32,6 +33,7 @@ import {
 import {
     prepareAndStartPullRequestPreview,
     prepareAndStopPullRequestPreview,
+    reconcileClosedPullRequestPreview,
     registerPullRequestPreviewExecutionActions,
 } from "../src/services/pullRequestPreviews.ts";
 import type { PullRequestSummary } from "../src/services/pullRequests.ts";
@@ -83,10 +85,10 @@ function previewConfig(root: string): PullRequestPreviewConfig {
         gatewayUpstreamTokenFile: path.join(root, "preview", "gateway-upstream.token"),
         gatewayUrl: "ws://127.0.0.1:18789",
         gitCommonDirectory: path.join(root, "dashboard", ".git"),
+        managedWorktreePath: path.join(root, "managed-preview"),
         previewRoot: path.join(root, "preview"),
         stateFile: path.join(root, "preview", "active-preview.json"),
         unitName: "mira-dashboard-pr-preview.service",
-        worktreeRoot: path.join(root, "worktrees"),
     };
 }
 
@@ -152,8 +154,8 @@ describe("managed pull request preview", () => {
         try {
             const config = resolvePullRequestPreviewConfig({
                 MIRA_DASHBOARD_PREVIEW_ROOT: path.join(root, "state"),
+                MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(root, "managed-preview"),
                 MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
                 PATH: path.join(root, "empty-bin"),
             });
 
@@ -163,8 +165,11 @@ describe("managed pull request preview", () => {
                 resolvePullRequestPreviewConfig({
                     BUN_BINARY: "bun",
                     MIRA_DASHBOARD_PREVIEW_ROOT: path.join(root, "state"),
+                    MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(
+                        root,
+                        "managed-preview"
+                    ),
                     MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                    MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
                     PATH: path.join(root, "empty-bin"),
                 })
             ).toThrow("bun executable must resolve to an absolute path");
@@ -181,8 +186,8 @@ describe("managed pull request preview", () => {
                 MIRA_DASHBOARD_PREVIEW_BACKEND_PORT: "4101",
                 MIRA_DASHBOARD_PREVIEW_FRONTEND_PORT: "4173",
                 MIRA_DASHBOARD_PREVIEW_ROOT: path.join(root, "state"),
+                MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(root, "managed-preview"),
                 MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
             });
             expect(config).toMatchObject({
                 backendPort: 4101,
@@ -196,6 +201,7 @@ describe("managed pull request preview", () => {
                     "gateway-upstream.token"
                 ),
                 gatewayUrl: "ws://127.0.0.1:18789",
+                managedWorktreePath: path.join(root, "managed-preview"),
                 previewRoot: path.join(root, "state"),
                 unitName: "mira-dashboard-pr-preview.service",
             });
@@ -204,8 +210,11 @@ describe("managed pull request preview", () => {
                 resolvePullRequestPreviewConfig({
                     BUN_BINARY: "/home/ubuntu/.bun/bin/bun",
                     MIRA_DASHBOARD_PREVIEW_ALLOWED_AUTHORS: " , ",
+                    MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(
+                        root,
+                        "managed-preview"
+                    ),
                     MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                    MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
                 })
             ).toThrow(
                 "MIRA_DASHBOARD_PREVIEW_ALLOWED_AUTHORS must contain at least one author"
@@ -216,24 +225,49 @@ describe("managed pull request preview", () => {
                     BUN_BINARY: "/home/ubuntu/.bun/bin/bun",
                     MIRA_DASHBOARD_PREVIEW_BACKEND_PORT: "5173",
                     MIRA_DASHBOARD_PREVIEW_FRONTEND_PORT: "5173",
+                    MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(
+                        root,
+                        "managed-preview"
+                    ),
                     MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                    MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
                 },
                 {
                     BUN_BINARY: "/home/ubuntu/.bun/bin/bun",
                     MIRA_DASHBOARD_PREVIEW_GATEWAY_URL: "https://gateway.example/ws",
+                    MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(
+                        root,
+                        "managed-preview"
+                    ),
                     MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                    MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
                 },
                 {
                     BUN_BINARY: "/home/ubuntu/.bun/bin/bun",
                     MIRA_DASHBOARD_PREVIEW_UNIT: "../preview.service",
+                    MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: path.join(
+                        root,
+                        "managed-preview"
+                    ),
                     MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
-                    MIRA_DASHBOARD_WORKTREE_ROOT: path.join(root, "worktrees"),
                 },
             ]) {
                 expect(() => resolvePullRequestPreviewConfig(environment)).toThrow();
             }
+            for (const managedWorktreePath of [
+                path.join(root, "dashboard"),
+                path.join(root, "dashboard", "preview"),
+                path.join(root, "state", "preview"),
+            ]) {
+                expect(() =>
+                    resolvePullRequestPreviewConfig({
+                        BUN_BINARY: "/home/ubuntu/.bun/bin/bun",
+                        MIRA_DASHBOARD_PREVIEW_ROOT: path.join(root, "state"),
+                        MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH: managedWorktreePath,
+                        MIRA_DASHBOARD_ROOT: path.join(root, "dashboard"),
+                    })
+                ).toThrow(
+                    "MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH must not overlap Dashboard source or preview state"
+                );
+            }
         } finally {
             rmSync(root, { force: true, recursive: true });
         }
@@ -248,7 +282,7 @@ describe("managed pull request preview", () => {
                 gatewayUrl: "wss://gateway.example/ws",
                 sourceWebAuthnRpId: "dashboard.example",
             };
-            const worktreePath = path.join(config.worktreeRoot, "preview-pr-335");
+            const worktreePath = config.managedWorktreePath;
             const stateRoot = path.join(config.previewRoot, "states", "pr-335");
             const command = buildPullRequestPreviewSandboxCommand({
                 config,
@@ -274,6 +308,8 @@ describe("managed pull request preview", () => {
                 "/run/mira-dashboard-preview/gateway.token",
                 "MIRA_DASHBOARD_DEV_GATEWAY_URL",
                 "ws://127.0.0.1:18790/gateway",
+                "MIRA_DASHBOARD_DEV_HOT_RELOAD",
+                "0",
                 "MIRA_DASHBOARD_DEV_SOURCE_WEBAUTHN_RP_ID",
                 "dashboard.example",
             ]) {
@@ -401,6 +437,29 @@ describe("managed pull request preview", () => {
         }
     });
 
+    it("removes closed PR state without touching a shared checkout owned by another PR", async () => {
+        const root = mkdtempSync(path.join(tmpdir(), "mira-preview-closed-state-"));
+        const config = previewConfig(root);
+        const managedStatePath = path.join(config.previewRoot, "states", "pr-335");
+        mkdirSync(managedStatePath, { recursive: true });
+        writeFileSync(path.join(managedStatePath, "state.txt"), "managed\n");
+        mkdirSync(config.managedWorktreePath, { recursive: true });
+        writeFileSync(path.join(config.managedWorktreePath, "other-pr.txt"), "keep\n");
+
+        try {
+            await expect(
+                cleanupClosedPullRequestPreview(335, { config })
+            ).resolves.toMatchObject({
+                number: 335,
+                status: "removed",
+            });
+            expect(existsSync(managedStatePath)).toBe(false);
+            expect(existsSync(config.managedWorktreePath)).toBe(true);
+        } finally {
+            rmSync(root, { force: true, recursive: true });
+        }
+    });
+
     it("starts, reuses, updates, reports, and stops one trusted preview slot", async () => {
         const root = mkdtempSync(path.join(tmpdir(), "mira-preview-lifecycle-"));
         const config = {
@@ -408,7 +467,7 @@ describe("managed pull request preview", () => {
             recentAuthMinutes: "10",
             sessionIdleMinutes: "60",
         };
-        const worktreePath = path.join(config.worktreeRoot, "preview-pr-335");
+        const worktreePath = config.managedWorktreePath;
         let expectedCommit = COMMIT;
         let shouldFailServeDisable = false;
         let shouldFailServeInspectionWhenEnabled = false;
@@ -546,6 +605,13 @@ describe("managed pull request preview", () => {
                         recursive: true,
                     });
                 }
+                if (
+                    executable === "git" &&
+                    commandArguments.includes("worktree") &&
+                    commandArguments.includes("remove")
+                ) {
+                    rmSync(worktreePath, { force: true, recursive: true });
+                }
                 if (executable === "git" && commandArguments.includes("rev-parse")) {
                     return {
                         code: 0,
@@ -722,6 +788,7 @@ describe("managed pull request preview", () => {
             expect(commands).toContain(
                 `systemctl --user stop ${config.gatewayProxyUnitName}`
             );
+            expect(existsSync(worktreePath)).toBe(true);
 
             isServeEnabled = true;
             await expect(
@@ -830,6 +897,25 @@ describe("managed pull request preview", () => {
                 ownsTailscaleServe: false,
                 status: "stopped",
             });
+            const managedStatePath = path.join(config.previewRoot, "states", "pr-335");
+            mkdirSync(managedStatePath, { recursive: true });
+            writeFileSync(path.join(managedStatePath, "state.txt"), "managed\n");
+            await expect(
+                cleanupClosedPullRequestPreview(335, { config })
+            ).resolves.toMatchObject({
+                number: 335,
+                status: "removed",
+            });
+            expect(existsSync(worktreePath)).toBe(false);
+            expect(existsSync(managedStatePath)).toBe(false);
+            expect(existsSync(config.stateFile)).toBe(false);
+            expect(
+                commands.some((command) =>
+                    command.includes(
+                        `worktree remove --force ${config.managedWorktreePath}`
+                    )
+                )
+            ).toBe(true);
         } finally {
             processSpy.mockRestore();
             prepareStateSpy.mockRestore();
@@ -841,13 +927,23 @@ describe("managed pull request preview", () => {
     it("queues preview operations and registers guarded worker actions", async () => {
         const queuedStart = previewExecution("preview-start", "queued", "running");
         const queuedStop = previewExecution("preview-stop", "queued", "stopped");
+        const queuedCleanup = {
+            ...queuedStop,
+            actionKey: "dashboard.preview.cleanup",
+            id: "preview-cleanup",
+            payload: { number: 335 },
+        };
         const completedStart = previewExecution("preview-start", "success", "running");
         const completedStop = previewExecution("preview-stop", "success", "stopped");
         const enqueueSpy = jest
             .spyOn(jobExecutionQueue, "enqueueJobExecution")
-            .mockImplementation((input) =>
-                input.actionKey === "dashboard.preview.start" ? queuedStart : queuedStop
-            );
+            .mockImplementation((input) => {
+                if (input.actionKey === "dashboard.preview.start") return queuedStart;
+                if (input.actionKey === "dashboard.preview.cleanup") {
+                    return queuedCleanup;
+                }
+                return queuedStop;
+            });
         const executionsSpy = jest
             .spyOn(jobExecutionQueue, "listJobExecutions")
             .mockReturnValue([]);
@@ -891,6 +987,13 @@ describe("managed pull request preview", () => {
         const stopSpy = jest
             .spyOn(previewHost, "stopPullRequestPreview")
             .mockResolvedValue({ number: 335, status: "stopped" });
+        const cleanupSpy = jest
+            .spyOn(previewHost, "cleanupClosedPullRequestPreview")
+            .mockResolvedValue({
+                message: "Removed managed PR dev data for #335",
+                number: 335,
+                status: "removed",
+            });
         const statusSpy = jest
             .spyOn(previewHost, "getPullRequestPreviewStatus")
             .mockResolvedValue({ status: "stopped" });
@@ -996,6 +1099,38 @@ describe("managed pull request preview", () => {
                     updatedAt: queuedStart.queuedAt,
                 },
             });
+            const enqueueCallsBeforeReconciliation = enqueueSpy.mock.calls.length;
+            executionsSpy.mockReturnValue([]);
+            await reconcileClosedPullRequestPreview([]);
+            expect(enqueueSpy).toHaveBeenLastCalledWith(
+                expect.objectContaining({
+                    actionKey: "dashboard.preview.cleanup",
+                    payload: { number: 335 },
+                    resourceClass: "exclusive",
+                })
+            );
+            expect(enqueueSpy).toHaveBeenCalledTimes(
+                enqueueCallsBeforeReconciliation + 1
+            );
+            executionsSpy.mockReturnValue([queuedCleanup]);
+            await reconcileClosedPullRequestPreview([]);
+            expect(enqueueSpy).toHaveBeenCalledTimes(
+                enqueueCallsBeforeReconciliation + 1
+            );
+            executionsSpy.mockReturnValue([]);
+            const consoleErrorSpy = jest
+                .spyOn(console, "error")
+                .mockImplementation(noOperation);
+            statusSpy.mockRejectedValueOnce(new Error("preview status unavailable"));
+            await reconcileClosedPullRequestPreview([]);
+            expect(enqueueSpy).toHaveBeenCalledTimes(
+                enqueueCallsBeforeReconciliation + 1
+            );
+            expect(consoleErrorSpy).toHaveBeenCalledWith(
+                "[PullRequestPreview] Closed-PR reconciliation failed:",
+                "preview status unavailable"
+            );
+            consoleErrorSpy.mockRestore();
 
             for (const route of [
                 "/api/pull-requests/:number/preview/start",
@@ -1049,11 +1184,13 @@ describe("managed pull request preview", () => {
             });
 
             registerPullRequestPreviewExecutionActions();
+            const cleanupHandler = handlers.get("dashboard.preview.cleanup");
             const startHandler = handlers.get("dashboard.preview.start");
             const stopHandler = handlers.get("dashboard.preview.stop");
+            expect(cleanupHandler).toBeDefined();
             expect(startHandler).toBeDefined();
             expect(stopHandler).toBeDefined();
-            if (!startHandler || !stopHandler) {
+            if (!cleanupHandler || !startHandler || !stopHandler) {
                 throw new Error("Preview handlers were not registered");
             }
             await expect(
@@ -1089,6 +1226,29 @@ describe("managed pull request preview", () => {
                     protectFromCancellation: expect.any(Function),
                 })
             );
+            await expect(
+                cleanupHandler(previewScheduledJob(335), undefined, context)
+            ).resolves.toMatchObject({
+                cleanup: {
+                    number: 335,
+                    status: "skipped",
+                },
+            });
+            expect(cleanupSpy).not.toHaveBeenCalled();
+            listSpy.mockResolvedValue([]);
+            statusSpy.mockResolvedValue({ status: "stopped" });
+            await expect(
+                cleanupHandler(previewScheduledJob(335), undefined, context)
+            ).resolves.toEqual({
+                cleanup: {
+                    message: "Removed managed PR dev data for #335",
+                    number: 335,
+                    status: "removed",
+                },
+                preview: { status: "stopped" },
+            });
+            expect(cleanupSpy).toHaveBeenCalledWith(335);
+            expect(protectFromCancellation).toHaveBeenCalledTimes(2);
 
             listSpy.mockResolvedValue([{ ...pullRequest, headRefOid: "b".repeat(40) }]);
             await expect(
@@ -1108,6 +1268,7 @@ describe("managed pull request preview", () => {
             listSpy.mockRestore();
             startSpy.mockRestore();
             stopSpy.mockRestore();
+            cleanupSpy.mockRestore();
             statusSpy.mockRestore();
         }
     });
diff --git a/backend/test/serviceBehavior.test.ts b/backend/test/serviceBehavior.test.ts
index 23eb0454e..30d21ff13 100644
--- a/backend/test/serviceBehavior.test.ts
+++ b/backend/test/serviceBehavior.test.ts
@@ -3032,6 +3032,10 @@ fi
             },
             isOk: true,
             message: "PR #5 closed",
+            previewCleanup: {
+                number: 5,
+                status: "skipped",
+            },
         });
 
         const reviewRoute = await pullRequestRoutes[
@@ -3197,6 +3201,10 @@ fi
                 },
                 isOk: true,
                 message: "PR #11 merged",
+                previewCleanup: {
+                    number: 11,
+                    status: "skipped",
+                },
             });
             await expect(Bun.file(ghLog).text()).resolves.toContain("pr merge 11");
             await expect(Bun.file(gitLog).text()).resolves.toContain("worktree remove");
@@ -3289,6 +3297,10 @@ fi
                 deployError: undefined,
                 isOk: true,
                 message: "PR #11 merged. Production sync failed",
+                previewCleanup: {
+                    number: 11,
+                    status: "skipped",
+                },
                 syncError: expect.stringContaining("remote moved unexpectedly"),
             });
             await expect(Bun.file(ghLog).text()).resolves.toContain("pr merge 11");
diff --git a/backend/test/setup.ts b/backend/test/setup.ts
index 702801802..f6c853b56 100644
--- a/backend/test/setup.ts
+++ b/backend/test/setup.ts
@@ -9,10 +9,17 @@ const preloadDatabaseRoot = mkdtempSync(
 );
 const originalDatabasePath = process.env.MIRA_DASHBOARD_DB_PATH;
 const originalAutomationCredentials = process.env.MIRA_DASHBOARD_AUTOMATION_CREDENTIALS;
+const originalPreviewRoot = process.env.MIRA_DASHBOARD_PREVIEW_ROOT;
+const originalPreviewWorktreePath = process.env.MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH;
 const originalSecretEncryptionKey = process.env.MIRA_DASHBOARD_SECRET_ENCRYPTION_KEY;
 
 process.env.NODE_ENV = "test";
 process.env.MIRA_DASHBOARD_DB_PATH = path.join(preloadDatabaseRoot, "dashboard.db");
+process.env.MIRA_DASHBOARD_PREVIEW_ROOT = path.join(preloadDatabaseRoot, "preview-state");
+process.env.MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH = path.join(
+    preloadDatabaseRoot,
+    "preview-worktree"
+);
 process.env.MIRA_DASHBOARD_SECRET_ENCRYPTION_KEY = new Uint8Array(32).fill(7).toBase64();
 delete process.env.MIRA_DASHBOARD_AUTOMATION_CREDENTIALS;
 
@@ -27,6 +34,16 @@ afterAll(() => {
     } else {
         process.env.MIRA_DASHBOARD_AUTOMATION_CREDENTIALS = originalAutomationCredentials;
     }
+    if (originalPreviewRoot === undefined) {
+        delete process.env.MIRA_DASHBOARD_PREVIEW_ROOT;
+    } else {
+        process.env.MIRA_DASHBOARD_PREVIEW_ROOT = originalPreviewRoot;
+    }
+    if (originalPreviewWorktreePath === undefined) {
+        delete process.env.MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH;
+    } else {
+        process.env.MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH = originalPreviewWorktreePath;
+    }
     if (originalSecretEncryptionKey === undefined) {
         delete process.env.MIRA_DASHBOARD_SECRET_ENCRYPTION_KEY;
     } else {
diff --git a/docs/development/local-dev.md b/docs/development/local-dev.md
index 8dceb97be..c1412bf26 100644
--- a/docs/development/local-dev.md
+++ b/docs/development/local-dev.md
@@ -47,8 +47,8 @@ Both start commands run:
 - a combined, isolated scheduler/worker;
 - the live production OpenClaw Gateway.
 
-There is no separate reduced preview mode and no permanent development systemd
-unit.
+The ordinary commands run directly from the repository or feature worktree in
+which they were started. There is no permanent development systemd unit.
 
 ## Isolated State
 
@@ -137,8 +137,13 @@ The Delivery page exposes one shared **PR dev** slot:
 
 - Only PRs targeting `main` from the configured trusted-author allowlist can
   start.
+- The exact PR commit is checked out at
+  `/home/ubuntu/projects/mira-dashboard-preview`.
 - Dependencies install with frozen lockfiles and lifecycle scripts disabled.
 - Source and Git metadata are read-only inside a Bubblewrap sandbox.
+- Source watchers and frontend HMR are disabled because the managed checkout is
+  fixed and read-only. Ordinary `bun run dev` and `bun run dev:remote` still
+  provide frontend and backend hot reload from their current worktree.
 - State is stored under
   `/home/ubuntu/projects/mira-dashboard-preview-state/managed/states/pr-<number>/`.
 - Tailscale publishes HTTPS only after the managed frontend/backend pair is
@@ -147,11 +152,22 @@ The Delivery page exposes one shared **PR dev** slot:
   capability proxy. Both enforce CPU, IO, memory, task, and four-hour runtime
   limits; no permanent unit file is installed.
 - Stop removes the owned Tailscale route, stops both transient units, and removes
-  materialized credentials while keeping the worktree and isolated state for a
-  faster restart.
+  materialized credentials while keeping the shared checkout and isolated PR
+  state for a faster restart while the PR remains open.
+- Merge or rejection through Delivery removes the closed PR's isolated state.
+  If that PR owns the slot, it also removes the shared checkout and active
+  preview record.
+- A successful Delivery refresh also reconciles a PR closed or merged directly
+  on GitHub. Cleanup is rechecked in the exclusive worker before any data is
+  removed, so a still-open PR is kept.
 - Status reconciliation performs the same unit, route, and credential cleanup
   if a transient unit exits, is collected, or reaches its four-hour limit.
 
+`managed/bun-cache` is a shared dependency cache retained between PRs to speed up
+frozen installs. `managed/installer-home` is an isolated, normally empty home
+directory for those installs; neither directory contains per-PR application
+state.
+
 The production backend decrypts its persisted Gateway token only when starting
 trusted PR dev. It atomically writes that token to an owner-only `0600` file
 outside the repository for the host-owned proxy, then removes the file as soon
@@ -174,6 +190,7 @@ overrides include:
 ```text
 MIRA_DASHBOARD_DEV_FRONTEND_PORT
 MIRA_DASHBOARD_DEV_BACKEND_PORT
+MIRA_DASHBOARD_DEV_HOT_RELOAD
 MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN
 MIRA_DASHBOARD_DEV_STATE_ROOT
 MIRA_DASHBOARD_DEV_DB_SOURCE
@@ -182,6 +199,8 @@ MIRA_DASHBOARD_DEV_WORKSPACE_SOURCE
 MIRA_DASHBOARD_DEV_OPENCLAW_CONFIG_SOURCE
 MIRA_DASHBOARD_DEV_GATEWAY_URL
 MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE
+MIRA_DASHBOARD_PREVIEW_ROOT
+MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH
 ```
 
 Use overrides only with absolute, non-root state/source paths. The ordinary
diff --git a/docs/setup/production-deploy.md b/docs/setup/production-deploy.md
index 8ce037c8d..f3509493e 100644
--- a/docs/setup/production-deploy.md
+++ b/docs/setup/production-deploy.md
@@ -2,12 +2,14 @@
 
 Production separates source control, immutable code, and persistent state:
 
-| Purpose                                           | Path                                              |
-| ------------------------------------------------- | ------------------------------------------------- |
-| Control checkout and deployment scripts           | `/home/ubuntu/projects/mira-dashboard`            |
-| Temporary detached build worktrees                | `/home/ubuntu/projects/mira-dashboard-worktrees/` |
-| Immutable releases and `current`/`previous` links | `/home/ubuntu/projects/mira-dashboard-releases`   |
-| Persistent production state                       | `/home/ubuntu/projects/mira-dashboard-state`      |
+| Purpose                                           | Path                                                         |
+| ------------------------------------------------- | ------------------------------------------------------------ |
+| Control checkout and deployment scripts           | `/home/ubuntu/projects/mira-dashboard`                       |
+| Temporary detached build worktrees                | `/home/ubuntu/projects/mira-dashboard-worktrees/`            |
+| Shared managed PR-dev checkout                    | `/home/ubuntu/projects/mira-dashboard-preview`               |
+| Managed PR-dev state and dependency cache         | `/home/ubuntu/projects/mira-dashboard-preview-state/managed` |
+| Immutable releases and `current`/`previous` links | `/home/ubuntu/projects/mira-dashboard-releases`              |
+| Persistent production state                       | `/home/ubuntu/projects/mira-dashboard-state`                 |
 
 Web and worker execute from:
 
diff --git a/docs/setup/secrets-and-env.md b/docs/setup/secrets-and-env.md
index f7144302c..bdc9d4338 100644
--- a/docs/setup/secrets-and-env.md
+++ b/docs/setup/secrets-and-env.md
@@ -156,25 +156,28 @@ child environment forwards the two auth timing values unchanged, uses the
 production RP ID only to decide whether copied WebAuthn public credentials are
 compatible, and does not inherit other provider or host credentials.
 
-| Variable                                      | Default                                             | Purpose                                                                          |
-| --------------------------------------------- | --------------------------------------------------- | -------------------------------------------------------------------------------- |
-| `MIRA_DASHBOARD_DEV_FRONTEND_PORT`            | `5173`                                              | Frontend hot-reload port.                                                        |
-| `MIRA_DASHBOARD_DEV_BACKEND_PORT`             | `3101`                                              | Backend restart-on-change port.                                                  |
-| `MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN`            | `http://localhost:5173`                             | Cookie/WebAuthn origin; remote dev derives the Tailscale HTTPS origin.           |
-| `MIRA_DASHBOARD_DEV_SOURCE_WEBAUTHN_RP_ID`    | production `MIRA_DASHBOARD_WEBAUTHN_RP_ID`          | Source snapshot RP used to retain or remove copied WebAuthn public credentials.  |
-| `MIRA_DASHBOARD_DEV_STATE_ROOT`               | `~/projects/mira-dashboard-dev-state/local`         | Owner-only isolated development state.                                           |
-| `MIRA_DASHBOARD_DEV_DB_SOURCE`                | `~/projects/mira-dashboard-state/mira-dashboard.db` | Production database used only to create a scrubbed WAL-consistent snapshot.      |
-| `MIRA_DASHBOARD_DEV_RELEASES_SOURCE`          | `~/projects/mira-dashboard-releases`                | Managed releases copied into isolated state.                                     |
-| `MIRA_DASHBOARD_DEV_WORKSPACE_SOURCE`         | `~/.openclaw/workspace`                             | Workspace copied with secret and symlink filtering.                              |
-| `MIRA_DASHBOARD_DEV_OPENCLAW_CONFIG_SOURCE`   | `~/.openclaw/openclaw.json`                         | Source for sanitized agent-only development config.                              |
-| `MIRA_DASHBOARD_DEV_GATEWAY_URL`              | `ws://127.0.0.1:18789`                              | Live production Gateway used by trusted dev.                                     |
-| `MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE`       | none                                                | Optional owner-only token file; local commands normally use Doppler environment. |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_URL`          | `ws://127.0.0.1:18789`                              | Production Gateway used only by the host-owned PR-dev capability proxy.          |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_TOKEN_FILE`   | `<managed-preview-root>/gateway.token`              | Disposable `0600` proxy credential mounted read-only into trusted PR dev.        |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_PORT`   | `18790`                                             | Loopback-only host proxy port; must differ from frontend/backend ports.          |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_UNIT`   | `mira-dashboard-pr-preview-gateway.service`         | Transient proxy unit name; no permanent systemd unit file is installed.          |
-| `MIRA_DASHBOARD_PREVIEW_OPENCLAW_SOURCE_ROOT` | `/home/ubuntu/.openclaw`                            | Source root for managed PR workspace/config snapshots.                           |
-| `HOST` / `PORT` / `DASHBOARD_API_TARGET`      | `127.0.0.1` / `5173` / `http://127.0.0.1:3101`      | Child frontend bind and exact backend proxy target.                              |
+| Variable                                      | Default                                                      | Purpose                                                                             |
+| --------------------------------------------- | ------------------------------------------------------------ | ----------------------------------------------------------------------------------- |
+| `MIRA_DASHBOARD_DEV_FRONTEND_PORT`            | `5173`                                                       | Frontend hot-reload port.                                                           |
+| `MIRA_DASHBOARD_DEV_BACKEND_PORT`             | `3101`                                                       | Backend restart-on-change port.                                                     |
+| `MIRA_DASHBOARD_DEV_HOT_RELOAD`               | `1`                                                          | Enables frontend HMR and backend/frontend source watchers; managed PR dev sets `0`. |
+| `MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN`            | `http://localhost:5173`                                      | Cookie/WebAuthn origin; remote dev derives the Tailscale HTTPS origin.              |
+| `MIRA_DASHBOARD_DEV_SOURCE_WEBAUTHN_RP_ID`    | production `MIRA_DASHBOARD_WEBAUTHN_RP_ID`                   | Source snapshot RP used to retain or remove copied WebAuthn public credentials.     |
+| `MIRA_DASHBOARD_DEV_STATE_ROOT`               | `~/projects/mira-dashboard-dev-state/local`                  | Owner-only isolated development state.                                              |
+| `MIRA_DASHBOARD_DEV_DB_SOURCE`                | `~/projects/mira-dashboard-state/mira-dashboard.db`          | Production database used only to create a scrubbed WAL-consistent snapshot.         |
+| `MIRA_DASHBOARD_DEV_RELEASES_SOURCE`          | `~/projects/mira-dashboard-releases`                         | Managed releases copied into isolated state.                                        |
+| `MIRA_DASHBOARD_DEV_WORKSPACE_SOURCE`         | `~/.openclaw/workspace`                                      | Workspace copied with secret and symlink filtering.                                 |
+| `MIRA_DASHBOARD_DEV_OPENCLAW_CONFIG_SOURCE`   | `~/.openclaw/openclaw.json`                                  | Source for sanitized agent-only development config.                                 |
+| `MIRA_DASHBOARD_DEV_GATEWAY_URL`              | `ws://127.0.0.1:18789`                                       | Live production Gateway used by trusted dev.                                        |
+| `MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE`       | none                                                         | Optional owner-only token file; local commands normally use Doppler environment.    |
+| `MIRA_DASHBOARD_PREVIEW_ROOT`                 | `/home/ubuntu/projects/mira-dashboard-preview-state/managed` | Host-owned records, shared install cache, and isolated per-PR state.                |
+| `MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH`        | `/home/ubuntu/projects/mira-dashboard-preview`               | Single shared checkout reused by the managed PR-dev slot.                           |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_URL`          | `ws://127.0.0.1:18789`                                       | Production Gateway used only by the host-owned PR-dev capability proxy.             |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_TOKEN_FILE`   | `<managed-preview-root>/gateway.token`                       | Disposable `0600` proxy credential mounted read-only into trusted PR dev.           |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_PORT`   | `18790`                                                      | Loopback-only host proxy port; must differ from frontend/backend ports.             |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_UNIT`   | `mira-dashboard-pr-preview-gateway.service`                  | Transient proxy unit name; no permanent systemd unit file is installed.             |
+| `MIRA_DASHBOARD_PREVIEW_OPENCLAW_SOURCE_ROOT` | `/home/ubuntu/.openclaw`                                     | Source root for managed PR workspace/config snapshots.                              |
+| `HOST` / `PORT` / `DASHBOARD_API_TARGET`      | `127.0.0.1` / `5173` / `http://127.0.0.1:3101`               | Child frontend bind and exact backend proxy target.                                 |
 
 See [Local development](../development/local-dev.md) for snapshot contents,
 blocked production mutations, cookie isolation, and the managed trusted-PR
diff --git a/scripts/developmentFrontend.ts b/scripts/developmentFrontend.ts
index cabf4c054..18572cdbe 100644
--- a/scripts/developmentFrontend.ts
+++ b/scripts/developmentFrontend.ts
@@ -16,6 +16,7 @@ const cookieNamespace =
 const forwardedProtocol = createDevelopmentForwardedProtocolResolver(
     process.env.MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN
 );
+const isHotReloadEnabled = process.env.MIRA_DASHBOARD_DEV_HOT_RELOAD !== "0";
 
 interface WebSocketProxyData {
     backend?: WebSocket;
@@ -93,10 +94,7 @@ function upgradeWebSocket(
 }
 
 const server = Bun.serve<WebSocketProxyData>({
-    development: {
-        console: true,
-        hmr: true,
-    },
+    development: isHotReloadEnabled ? { console: true, hmr: true } : false,
     fetch(request, server) {
         const url = new URL(request.url);
         if (url.pathname === "/ws") {
diff --git a/src/components/features/delivery/PullRequestDevelopmentCard.tsx b/src/components/features/delivery/PullRequestDevelopmentCard.tsx
index 3bfc92613..76078e7bb 100644
--- a/src/components/features/delivery/PullRequestDevelopmentCard.tsx
+++ b/src/components/features/delivery/PullRequestDevelopmentCard.tsx
@@ -68,8 +68,8 @@ export function PullRequestDevelopmentCard({
                         PR dev
                     </CardTitle>
                     <p className="mt-1 text-sm text-primary-400">
-                        One prod-like HTTPS dev slot with hot reload, isolated Dashboard
-                        data, and the live production Gateway.
+                        One prod-like HTTPS dev slot at a fixed PR commit, with isolated
+                        Dashboard data and the live production Gateway.
                     </p>
                 </div>
                 <div className="flex flex-wrap gap-1.5">
diff --git a/src/hooks/useDelivery.ts b/src/hooks/useDelivery.ts
index 01cc42a5c..b815c6062 100644
--- a/src/hooks/useDelivery.ts
+++ b/src/hooks/useDelivery.ts
@@ -145,6 +145,11 @@ interface PullRequestActionResponse {
     deployment?: DeploymentJob;
     deployError?: string;
     cleanup?: WorktreeCleanupResult;
+    previewCleanup?: {
+        message: string;
+        number: number;
+        status: "removed" | "skipped" | "warning";
+    };
     pullRequest?: PullRequestSummary;
 }
 
diff --git a/src/pages/Delivery.tsx b/src/pages/Delivery.tsx
index 45561fbb9..11105b838 100644
--- a/src/pages/Delivery.tsx
+++ b/src/pages/Delivery.tsx
@@ -4,6 +4,7 @@ import {
     GitBranch,
     GitMerge,
     Play,
+    RefreshCw,
     Rocket,
     Square,
     XCircle,
@@ -16,6 +17,7 @@ import remarkGfm from "remark-gfm";
 
 import { ProductionReleasesCard } from "../components/features/delivery/ProductionReleasesCard";
 import { PullRequestDevelopmentCard } from "../components/features/delivery/PullRequestDevelopmentCard";
+import { Alert } from "../components/ui/Alert";
 import { Badge } from "../components/ui/Badge";
 import { Button } from "../components/ui/Button";
 import { Card, CardTitle } from "../components/ui/Card";
@@ -29,7 +31,6 @@ import type {
     ProductionCheckoutStatus,
     PullRequestPreviewStatus,
     PullRequestSummary,
-    WorktreeCleanupResult,
 } from "../hooks";
 import {
     useApprovePullRequest,
@@ -54,6 +55,7 @@ type PendingAction =
     | { type: "merge"; pr: PullRequestSummary }
     | { type: "merge-deploy"; pr: PullRequestSummary }
     | { type: "review-approve"; pr: PullRequestSummary }
+    | { type: "preview-rebuild"; pr: PullRequestSummary }
     | { type: "preview-start"; pr: PullRequestSummary }
     | { number: number; title?: string; type: "preview-stop" }
     | { type: "reject"; pr: PullRequestSummary }
@@ -65,6 +67,7 @@ type UnhandledPendingActionType = Exclude<
     | "deploy"
     | "merge"
     | "merge-deploy"
+    | "preview-rebuild"
     | "preview-start"
     | "preview-stop"
     | "reject"
@@ -424,6 +427,9 @@ function actionLabel(action: Exclude<PendingAction, undefined>) {
         case "preview-start": {
             return "Run PR in dev";
         }
+        case "preview-rebuild": {
+            return "Rebuild PR dev";
+        }
         case "preview-stop": {
             return "Stop PR dev";
         }
@@ -452,11 +458,14 @@ function actionMessage(action: Exclude<PendingAction, undefined>) {
             return `Approve PR #${action.pr.number}: ${action.pr.title}?\n\nThis approves the PR on GitHub. It does not merge or deploy.`;
         }
         case "preview-start": {
-            return `Run PR #${action.pr.number} in dev: ${action.pr.title}?\n\nThis runs the trusted PR over Tailscale HTTPS with hot reload, an isolated Dashboard database, a writable workspace snapshot, and an isolated scheduler/worker without host or backup jobs. It connects to the live production Gateway so chat and session changes can affect production data. The dev environment stops automatically after four hours.`;
+            return `Run PR #${action.pr.number} in dev: ${action.pr.title}?\n\nThis runs the fixed PR commit over Tailscale HTTPS without source watchers, using an isolated Dashboard database, a writable workspace snapshot, and an isolated scheduler/worker without host or backup jobs. It connects to the live production Gateway so chat and session changes can affect production data. The dev environment stops automatically after four hours.`;
+        }
+        case "preview-rebuild": {
+            return `Rebuild PR dev for #${action.pr.number}: ${action.pr.title}?\n\nThis replaces the running dev environment with the latest PR head while keeping the same isolation and live production Gateway connection. The rebuilt environment stops automatically after four hours.`;
         }
         case "preview-stop": {
             const title = action.title ? `: ${action.title}` : "";
-            return `Stop PR dev for #${action.number}${title}?\n\nIts isolated database, workspace snapshot, and worktree are kept for a faster later restart.`;
+            return `Stop PR dev for #${action.number}${title}?\n\nThe shared checkout and isolated PR state are kept while the PR remains open for a faster later restart.`;
         }
         case "reject": {
             return `Reject PR #${action.pr.number}: ${action.pr.title}?\n\nThis closes the PR with a dashboard rejection comment. It does not delete the branch.`;
@@ -470,10 +479,17 @@ function actionMessage(action: Exclude<PendingAction, undefined>) {
     }
 }
 
-/** Performs action result message. */
-function actionResultMessage(message: string, cleanup?: WorktreeCleanupResult) {
-    if (!cleanup) return message;
-    return `${message}\n${cleanup.message}`;
+/** Combines an action result with any best-effort cleanup outcomes. */
+function actionResultMessage(
+    message: string,
+    ...cleanupResults: Array<{ message: string } | undefined>
+) {
+    return [
+        message,
+        ...cleanupResults
+            .filter((cleanup) => cleanup !== undefined)
+            .map((cleanup) => cleanup.message),
+    ].join("\n");
 }
 
 /** Normalizes pull request body. */
@@ -695,7 +711,13 @@ export function Delivery() {
                         number: action.pr.number,
                         willDeploy: false,
                     });
-                    setLastResult(actionResultMessage(result.message, result.cleanup));
+                    setLastResult(
+                        actionResultMessage(
+                            result.message,
+                            result.cleanup,
+                            result.previewCleanup
+                        )
+                    );
                     break;
                 }
 
@@ -707,7 +729,13 @@ export function Delivery() {
                     const message = result.deployError
                         ? `${result.message}: ${result.deployError}`
                         : result.deployment?.note || result.message;
-                    setLastResult(actionResultMessage(message, result.cleanup));
+                    setLastResult(
+                        actionResultMessage(
+                            message,
+                            result.cleanup,
+                            result.previewCleanup
+                        )
+                    );
                     break;
                 }
 
@@ -720,14 +748,16 @@ export function Delivery() {
                     return;
                 }
 
+                case "preview-rebuild":
                 case "preview-start": {
+                    const isRebuild = action.type === "preview-rebuild";
                     const preview = await startPullRequestPreview.mutateAsync({
                         number: action.pr.number,
                     });
                     setLastResult(
                         preview.url
-                            ? `PR #${action.pr.number} dev is running at ${preview.url}`
-                            : `PR #${action.pr.number} dev started`
+                            ? `PR #${action.pr.number} dev ${isRebuild ? "rebuilt" : "is running"} at ${preview.url}`
+                            : `PR #${action.pr.number} dev ${isRebuild ? "rebuilt" : "started"}`
                     );
                     break;
                 }
@@ -744,7 +774,13 @@ export function Delivery() {
                     const result = await rejectPullRequest.mutateAsync({
                         number: action.pr.number,
                     });
-                    setLastResult(actionResultMessage(result.message, result.cleanup));
+                    setLastResult(
+                        actionResultMessage(
+                            result.message,
+                            result.cleanup,
+                            result.previewCleanup
+                        )
+                    );
                     break;
                 }
 
@@ -790,6 +826,8 @@ export function Delivery() {
             previewStatus.commitSha === pr.headRefOid;
         const hasCurrentDevelopment =
             isPreviewSlotActive && hasPullRequestPreviewSlot && isPreviewCommitCurrent;
+        const isRebuildDevelopment =
+            isPreviewSlotActive && hasPullRequestPreviewSlot && !isPreviewCommitCurrent;
         const canStartDevelopment = !hasCurrentDevelopment;
         const isPreviewActionDisabled =
             isActionPending ||
@@ -829,14 +867,24 @@ export function Delivery() {
                         onClick={() =>
                             setPendingAction({
                                 pr,
-                                type: "preview-start",
+                                type: isRebuildDevelopment
+                                    ? "preview-rebuild"
+                                    : "preview-start",
                             })
                         }
                         disabled={isPreviewActionDisabled}
-                        title="Prod-like trusted dev with isolated Dashboard data and the live production Gateway"
+                        title={
+                            isRebuildDevelopment
+                                ? "Rebuild trusted PR dev at the latest PR commit"
+                                : "Prod-like trusted dev with isolated Dashboard data and the live production Gateway"
+                        }
                     >
-                        <Play className="size-4" />
-                        Run in dev
+                        {isRebuildDevelopment ? (
+                            <RefreshCw className="size-4" />
+                        ) : (
+                            <Play className="size-4" />
+                        )}
+                        {isRebuildDevelopment ? "Rebuild dev" : "Run in dev"}
                     </Button>
                 ) : undefined}
                 {hasPullRequestPreviewSlot && previewStatus.status !== "stopped" ? (
@@ -1017,20 +1065,25 @@ export function Delivery() {
                 </div>
 
                 {lastResult ? (
-                    <Card
-                        variant="bordered"
-                        className="border-green-500/30 bg-green-500/10"
+                    <Alert
+                        variant="success"
+                        dismissLabel="Dismiss action result"
+                        onDismiss={() => setLastResult(undefined)}
                     >
                         <p className="text-sm whitespace-pre-line text-green-300">
                             {lastResult}
                         </p>
-                    </Card>
+                    </Alert>
                 ) : undefined}
 
                 {actionError ? (
-                    <Card variant="bordered" className="border-red-500/30 bg-red-500/10">
+                    <Alert
+                        variant="error"
+                        dismissLabel="Dismiss action error"
+                        onDismiss={() => setActionError(undefined)}
+                    >
                         <p className="text-sm text-red-300">{actionError}</p>
-                    </Card>
+                    </Alert>
                 ) : undefined}
 
                 <PullRequestDevelopmentCard
diff --git a/src/test/pageBehavior.test.tsx b/src/test/pageBehavior.test.tsx
index 3db3f39e6..8ab3db6c8 100644
--- a/src/test/pageBehavior.test.tsx
+++ b/src/test/pageBehavior.test.tsx
@@ -3015,13 +3015,25 @@ describe("Mira Dashboard pages", () => {
         expect(
             screen.getByRole("heading", { name: "Run PR in dev" })
         ).toBeInTheDocument();
+        expect(screen.getByText(/without source watchers/u)).toBeInTheDocument();
+        expect(screen.queryByText(/with hot reload/u)).not.toBeInTheDocument();
         await user.click(screen.getByRole("button", { name: "Run PR in dev" }));
         await waitFor(() => {
             expect(
                 screen.getByText("PR #335 dev is running at https://dashboard.test:5173")
             ).toBeInTheDocument();
         });
+        await user.click(screen.getByRole("button", { name: "Dismiss action result" }));
+        expect(
+            screen.queryByText("PR #335 dev is running at https://dashboard.test:5173")
+        ).not.toBeInTheDocument();
         expect(screen.getAllByRole("link", { name: "Open dev" })).toHaveLength(2);
+        expect(
+            screen.queryByRole("button", { name: "Run in dev" })
+        ).not.toBeInTheDocument();
+        expect(
+            screen.queryByRole("button", { name: "Rebuild dev" })
+        ).not.toBeInTheDocument();
 
         await user.click(screen.getAllByRole("button", { name: "Stop dev" })[0]!);
         expect(screen.getByRole("heading", { name: "Stop PR dev" })).toBeInTheDocument();
@@ -3034,6 +3046,88 @@ describe("Mira Dashboard pages", () => {
         view.queryClient.clear();
     });
 
+    it("labels an active PR dev update as a rebuild", async () => {
+        const user = userEvent.setup();
+        let startCalls = 0;
+        let preview: Record<string, unknown> = {
+            commitSha: "b".repeat(40),
+            number: 335,
+            status: "running",
+            title: "Trusted PR dev",
+            updatedAt: "2026-06-24T08:06:00.000Z",
+            url: "https://dashboard.test:5173",
+        };
+        Object.defineProperty(globalThis, "fetch", {
+            configurable: true,
+            value: jest.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+                const url = String(input);
+                const method = init?.method ?? "GET";
+                if (method === "GET" && url === "/api/pull-requests") {
+                    return Response.json({
+                        pullRequests: [
+                            {
+                                author: { login: "mira-2026" },
+                                baseRefName: "main",
+                                createdAt: "2026-06-24T08:00:00.000Z",
+                                headRefName: "mira/trusted-preview",
+                                headRefOid: "a".repeat(40),
+                                isDraft: false,
+                                number: 335,
+                                previewEligible: true,
+                                title: "Trusted PR dev",
+                                updatedAt: "2026-06-24T08:05:00.000Z",
+                                url: "https://github.com/rajohan/Mira-Dashboard/pull/335",
+                            },
+                        ],
+                    });
+                }
+                if (method === "GET" && url === "/api/pull-requests/preview") {
+                    return Response.json({ preview });
+                }
+                if (method === "POST" && url === "/api/pull-requests/335/preview/start") {
+                    startCalls += 1;
+                    preview = {
+                        ...preview,
+                        commitSha: "a".repeat(40),
+                        updatedAt: "2026-06-24T08:07:00.000Z",
+                    };
+                    return Response.json({ isOk: true, preview });
+                }
+                return apiResponse(url, method, init);
+            }),
+            writable: true,
+        });
+
+        const view = renderPage(createElement(Delivery));
+
+        expect(
+            await screen.findByRole("button", { name: "Rebuild dev" })
+        ).toBeInTheDocument();
+        expect(
+            screen.queryByRole("button", { name: "Run in dev" })
+        ).not.toBeInTheDocument();
+
+        await user.click(screen.getByRole("button", { name: "Rebuild dev" }));
+        expect(
+            screen.getByRole("heading", { name: "Rebuild PR dev" })
+        ).toBeInTheDocument();
+        expect(screen.getByText(/latest PR head/u)).toBeInTheDocument();
+        await user.click(screen.getByRole("button", { name: "Rebuild PR dev" }));
+
+        await waitFor(() => {
+            expect(
+                screen.getByText("PR #335 dev rebuilt at https://dashboard.test:5173")
+            ).toBeInTheDocument();
+        });
+        expect(startCalls).toBe(1);
+        expect(
+            screen.queryByRole("button", { name: "Rebuild dev" })
+        ).not.toBeInTheDocument();
+
+        view.unmount();
+        view.queryClient.clear();
+    });
+
     it("keeps an active PR development stop control when GitHub listing fails", async () => {
         const user = userEvent.setup();
         let isPreviewRunning = true;
diff --git a/src/test/pullRequestDevelopmentCard.test.tsx b/src/test/pullRequestDevelopmentCard.test.tsx
index 611f69ef4..b899c5b6f 100644
--- a/src/test/pullRequestDevelopmentCard.test.tsx
+++ b/src/test/pullRequestDevelopmentCard.test.tsx
@@ -23,6 +23,8 @@ describe("PullRequestDevelopmentCard", () => {
         const { rerender } = render(<PullRequestDevelopmentCard preview={undefined} />);
 
         expect(screen.getByText("Available")).toBeInTheDocument();
+        expect(screen.getByText(/fixed PR commit/u)).toBeInTheDocument();
+        expect(screen.queryByText(/hot reload/iu)).not.toBeInTheDocument();
         expect(
             screen.getByText("Run an eligible trusted PR in dev from its card below.")
         ).toBeInTheDocument();

From f00f557176050a2e01c69c4d0963a70ff7a5f20a Mon Sep 17 00:00:00 2001
From: mira-2026 <mira-2026@agentmail.to>
Date: Mon, 27 Jul 2026 18:37:19 +0200
Subject: [PATCH 4/4] fix: harden managed preview lifecycle

---
 backend/src/development/developmentStack.ts   |   2 +-
 .../src/services/pullRequestPreviewHost.ts    | 106 +++++++++++++++++-
 backend/src/services/pullRequestPreviews.ts   |  45 +++++---
 backend/src/services/pullRequests.ts          |  22 ++++
 backend/test/pullRequestPreview.test.ts       | 100 ++++++++++++++++-
 backend/test/serviceBehavior.test.ts          |  13 ++-
 docs/setup/secrets-and-env.md                 |  44 ++++----
 scripts/developmentFrontend.ts                |   2 +-
 src/pages/Delivery.tsx                        |   8 +-
 src/test/pageBehavior.test.tsx                |  15 ++-
 10 files changed, 298 insertions(+), 59 deletions(-)

diff --git a/backend/src/development/developmentStack.ts b/backend/src/development/developmentStack.ts
index ec02890f8..f8d97dfa0 100644
--- a/backend/src/development/developmentStack.ts
+++ b/backend/src/development/developmentStack.ts
@@ -1089,7 +1089,7 @@ export async function runDevelopmentStack(
         [
             `Mira Dashboard development stack: ${config.publicOrigin}`,
             `Frontend${config.hotReload ? " HMR" : ""}: ${config.frontendHost}:${config.frontendPort}`,
-            `Backend${config.hotReload ? " HMR" : ""}: ${config.backendHost}:${config.backendPort}`,
+            `Backend${config.hotReload ? " restart-on-change" : ""}: ${config.backendHost}:${config.backendPort}`,
             `Hot reload: ${config.hotReload ? "enabled" : "disabled"}.`,
             `State: ${config.stateRoot} (database ${state.database}, workspace ${state.workspace}, releases ${state.releases})`,
             `Gateway: ${config.gatewayUrl}`,
diff --git a/backend/src/services/pullRequestPreviewHost.ts b/backend/src/services/pullRequestPreviewHost.ts
index 9f9b6ddcf..360533655 100644
--- a/backend/src/services/pullRequestPreviewHost.ts
+++ b/backend/src/services/pullRequestPreviewHost.ts
@@ -8,6 +8,7 @@ import {
     lstatSync,
     mkdirSync,
     openSync,
+    readdirSync,
     readSync,
     realpathSync,
     renameSync,
@@ -41,6 +42,7 @@ const UNIT_NAME_PATTERN = /^[A-Za-z0-9_.@-]+\.service$/u;
 const DEFAULT_GATEWAY_URL = "ws://127.0.0.1:18789";
 const DEFAULT_GATEWAY_PROXY_PORT = 18_790;
 const DEFAULT_PREVIEW_WORKTREE_PATH = "/home/ubuntu/projects/mira-dashboard-preview";
+const MANAGED_STATE_DIRECTORY_PATTERN = /^pr-([1-9]\d*)$/u;
 const PREVIEW_REFERENCE = "refs/mira-dashboard/previews/active";
 const PREVIEW_GATEWAY_PROXY_ENTRYPOINT = "pullRequestPreviewGatewayProxy.js";
 const PREVIEW_GATEWAY_PROXY_READY_TIMEOUT_MS = 45_000;
@@ -453,6 +455,15 @@ function ensureRealDirectory(directoryPath: string): void {
     chmodSync(directoryPath, 0o700);
 }
 
+function ensureRealDirectoryPreservingExistingMode(directoryPath: string): void {
+    const didExist = existsSync(directoryPath);
+    mkdirSync(directoryPath, { mode: 0o700, recursive: true });
+    if (!isRealDirectory(directoryPath)) {
+        throw new Error(`Preview path must be a real directory: ${directoryPath}`);
+    }
+    if (!didExist) chmodSync(directoryPath, 0o700);
+}
+
 function materializeGatewayTokenFile(
     filePath: string,
     tokenValue: string | undefined,
@@ -720,6 +731,41 @@ function previewWorktreePath(config: PullRequestPreviewConfig): string {
     return config.managedWorktreePath;
 }
 
+async function unregisterMissingPreviewWorktree(
+    config: PullRequestPreviewConfig,
+    worktreePath: string,
+    signal?: AbortSignal
+): Promise<boolean> {
+    const resolvedWorktreePath = path.resolve(worktreePath);
+    const { stdout } = await runCommand(
+        "git",
+        ["-C", config.dashboardRoot, "worktree", "list", "--porcelain"],
+        { signal, timeoutMs: 30_000 }
+    );
+    const isRegistered = stdout
+        .split(/\r?\n/u)
+        .filter((line) => line.startsWith("worktree "))
+        .some(
+            (line) =>
+                path.resolve(line.slice("worktree ".length)) === resolvedWorktreePath
+        );
+    if (!isRegistered) return false;
+    await runCommand(
+        "git",
+        [
+            "-C",
+            config.dashboardRoot,
+            "worktree",
+            "remove",
+            "--force",
+            "--force",
+            resolvedWorktreePath,
+        ],
+        { signal, timeoutMs: 120_000 }
+    );
+    return true;
+}
+
 async function removePreviewWorktree(
     config: PullRequestPreviewConfig,
     worktreePath: string,
@@ -729,7 +775,9 @@ async function removePreviewWorktree(
     if (resolvedWorktreePath !== path.resolve(config.managedWorktreePath)) {
         throw new Error("Refusing to remove an unmanaged preview worktree");
     }
-    if (!existsSync(resolvedWorktreePath)) return false;
+    if (!existsSync(resolvedWorktreePath)) {
+        return unregisterMissingPreviewWorktree(config, resolvedWorktreePath, signal);
+    }
     if (!isRealDirectory(resolvedWorktreePath)) {
         throw new Error("Preview worktree path must be a real directory");
     }
@@ -765,7 +813,7 @@ async function ensurePreviewWorktree(
     commitSha: string,
     signal?: AbortSignal
 ): Promise<string> {
-    ensureRealDirectory(path.dirname(config.managedWorktreePath));
+    ensureRealDirectoryPreservingExistingMode(path.dirname(config.managedWorktreePath));
     const worktreePath = previewWorktreePath(config);
     await runCommand(
         "git",
@@ -819,6 +867,7 @@ async function ensurePreviewWorktree(
             signal,
         });
     } else {
+        await unregisterMissingPreviewWorktree(config, worktreePath, signal);
         await runCommand(
             "git",
             [
@@ -1016,13 +1065,58 @@ function managedStateRoot(config: PullRequestPreviewConfig, number: number): str
     return stateRoot;
 }
 
+/** Lists isolated PR state directories without following directory symlinks. */
+export function listManagedPullRequestPreviewStateNumbers(
+    config: PullRequestPreviewConfig = resolvePullRequestPreviewConfig()
+): number[] {
+    const statesRoot = path.join(config.previewRoot, "states");
+    if (!existsSync(statesRoot)) return [];
+    if (!isRealDirectory(config.previewRoot) || !isRealDirectory(statesRoot)) {
+        throw new Error("PR dev state roots must be real directories");
+    }
+    const resolvedPreviewRoot = realpathSync(config.previewRoot);
+    const resolvedStatesRoot = realpathSync(statesRoot);
+    if (!isPathStrictlyWithin(resolvedStatesRoot, resolvedPreviewRoot)) {
+        throw new Error("PR dev states escaped the configured preview root");
+    }
+    const numbers: number[] = [];
+    const stateEntries = readdirSync(statesRoot, { withFileTypes: true });
+    for (const entry of stateEntries) {
+        const match = MANAGED_STATE_DIRECTORY_PATTERN.exec(entry.name);
+        if (!match || !entry.isDirectory() || entry.isSymbolicLink()) continue;
+        const number = Number(match[1]);
+        if (!Number.isSafeInteger(number) || number <= 0 || number > 2_147_483_647) {
+            continue;
+        }
+        const stateRoot = path.join(statesRoot, entry.name);
+        if (
+            !isRealDirectory(stateRoot) ||
+            !isPathStrictlyWithin(realpathSync(stateRoot), resolvedStatesRoot)
+        ) {
+            throw new Error("PR dev state directory escaped the managed states root");
+        }
+        numbers.push(number);
+    }
+    return numbers.toSorted((left, right) => left - right);
+}
+
 function didRemoveManagedPreviewState(
     config: PullRequestPreviewConfig,
     number: number
 ): boolean {
     const stateRoot = managedStateRoot(config, number);
     if (!existsSync(stateRoot)) return false;
-    if (!isRealDirectory(stateRoot)) {
+    const statesRoot = path.dirname(stateRoot);
+    if (
+        !isRealDirectory(config.previewRoot) ||
+        !isRealDirectory(statesRoot) ||
+        !isRealDirectory(stateRoot) ||
+        !isPathStrictlyWithin(
+            realpathSync(statesRoot),
+            realpathSync(config.previewRoot)
+        ) ||
+        !isPathStrictlyWithin(realpathSync(stateRoot), realpathSync(statesRoot))
+    ) {
         throw new Error("PR dev state path must be a real directory");
     }
     rmSync(stateRoot, { force: true, recursive: true });
@@ -1845,11 +1939,11 @@ export async function cleanupClosedPullRequestPreview(
     number: number,
     options: { config?: PullRequestPreviewConfig } = {}
 ): Promise<PullRequestPreviewCleanupResult> {
-    const config = options.config ?? resolvePullRequestPreviewConfig();
-    const record = readPreviewRecord(config);
-    const hasManagedSlotOwnership = record?.number === number;
     let didRemove = false;
     try {
+        const config = options.config ?? resolvePullRequestPreviewConfig();
+        const record = readPreviewRecord(config);
+        const hasManagedSlotOwnership = record?.number === number;
         if (hasManagedSlotOwnership) {
             await stopPullRequestPreview(number, { config });
             didRemove =
diff --git a/backend/src/services/pullRequestPreviews.ts b/backend/src/services/pullRequestPreviews.ts
index 0179e1ed8..022169b57 100644
--- a/backend/src/services/pullRequestPreviews.ts
+++ b/backend/src/services/pullRequestPreviews.ts
@@ -7,6 +7,7 @@ import {
 import {
     cleanupClosedPullRequestPreview,
     getPullRequestPreviewStatus as readPullRequestPreviewStatus,
+    listManagedPullRequestPreviewStateNumbers,
     type PullRequestPreviewCandidate,
     type PullRequestPreviewLifecycle,
     type PullRequestPreviewStatus,
@@ -14,6 +15,7 @@ import {
     stopPullRequestPreview,
 } from "./pullRequestPreviewHost.ts";
 import {
+    isDashboardPullRequestOpen,
     listDashboardPullRequests,
     type PullRequestSummary,
     validatePrNumber,
@@ -167,8 +169,8 @@ export async function getPullRequestPreviewStatus(): Promise<PullRequestPreviewS
 }
 
 /**
- * Queues cleanup when a successful, exhaustive open-PR listing no longer
- * contains the PR that owns the managed slot.
+ * Queues cleanup when a successful production-base listing omits retained
+ * preview data and an unfiltered GitHub lookup confirms that the PR is closed.
  */
 export async function reconcileClosedPullRequestPreview(
     openPullRequests: readonly PullRequestSummary[]
@@ -184,19 +186,30 @@ export async function reconcileClosedPullRequestPreview(
             return;
         }
         const preview = await readPullRequestPreviewStatus();
-        if (
-            preview.number === undefined ||
-            openPullRequests.some((pullRequest) => pullRequest.number === preview.number)
-        ) {
+        const openPullRequestNumbers = new Set(
+            openPullRequests.map((pullRequest) => pullRequest.number)
+        );
+        const cleanupCandidates = [
+            ...(preview.number !== undefined &&
+            !openPullRequestNumbers.has(preview.number)
+                ? [preview.number]
+                : []),
+            ...listManagedPullRequestPreviewStateNumbers().filter(
+                (number) => !openPullRequestNumbers.has(number)
+            ),
+        ];
+        const uniqueCleanupCandidates = new Set(cleanupCandidates);
+        for (const number of uniqueCleanupCandidates) {
+            if (await isDashboardPullRequestOpen(number)) continue;
+            enqueueJobExecution({
+                actionKey: "dashboard.preview.cleanup",
+                displayName: `Clean up closed PR #${number} preview`,
+                payload: { number },
+                resourceClass: "exclusive",
+                timeoutMs: PREVIEW_STOP_TIMEOUT_MS,
+            });
             return;
         }
-        enqueueJobExecution({
-            actionKey: "dashboard.preview.cleanup",
-            displayName: `Clean up closed PR #${preview.number} preview`,
-            payload: { number: preview.number },
-            resourceClass: "exclusive",
-            timeoutMs: PREVIEW_STOP_TIMEOUT_MS,
-        });
     } catch (error) {
         console.error(
             "[PullRequestPreview] Closed-PR reconciliation failed:",
@@ -277,11 +290,7 @@ export function registerPullRequestPreviewExecutionActions(): void {
         "dashboard.preview.cleanup",
         async (job, _signal, context) => {
             const number = executionPreviewNumber(job.actionPayload.number);
-            const openPullRequests = await listDashboardPullRequests();
-            const isStillOpen = openPullRequests.some(
-                (pullRequest) => pullRequest.number === number
-            );
-            if (isStillOpen) {
+            if (await isDashboardPullRequestOpen(number)) {
                 return {
                     cleanup: {
                         message: `PR #${number} is still open; managed PR dev data was kept`,
diff --git a/backend/src/services/pullRequests.ts b/backend/src/services/pullRequests.ts
index bcf12fbcf..0c1ee6a5f 100644
--- a/backend/src/services/pullRequests.ts
+++ b/backend/src/services/pullRequests.ts
@@ -1487,6 +1487,24 @@ async function getPullRequest(
     );
 }
 
+/** Checks the PR lifecycle without filtering by its current base branch. */
+export async function isDashboardPullRequestOpen(
+    number: number,
+    signal?: AbortSignal
+): Promise<boolean> {
+    const result = await runGhJson<{ state?: unknown }>(
+        ["pr", "view", String(number), "--repo", DASHBOARD_REPO, "--json", "state"],
+        signal
+    );
+    if (
+        typeof result.state !== "string" ||
+        !["CLOSED", "MERGED", "OPEN"].includes(result.state)
+    ) {
+        throw new Error("GitHub returned an invalid pull request state");
+    }
+    return result.state === "OPEN";
+}
+
 /** Validates pr number. */
 export function validatePrNumber(value: unknown): number {
     if (typeof value !== "string" || !/^\d+$/u.test(value)) {
@@ -2831,6 +2849,8 @@ export async function approvePullRequest(
             { signal: options.signal, timeoutMs: 120_000 }
         );
         cleanup = await cleanupPullRequestWorktree(pr.headRefName, options.signal);
+        // The production entry point runs this inside the exclusive github.merge job,
+        // which shares the single-capacity worker with every preview lifecycle action.
         previewCleanup = await cleanupClosedPullRequestPreview(number);
 
         try {
@@ -2964,6 +2984,8 @@ export async function rejectPullRequest(
         { signal, timeoutMs: 60_000 }
     );
     const cleanup = await cleanupPullRequestWorktree(pr.headRefName, signal);
+    // The production entry point runs this inside the exclusive github.reject job,
+    // which shares the single-capacity worker with every preview lifecycle action.
     const previewCleanup = await cleanupClosedPullRequestPreview(number);
 
     return {
diff --git a/backend/test/pullRequestPreview.test.ts b/backend/test/pullRequestPreview.test.ts
index 6ba50f5b1..fdbc623e3 100644
--- a/backend/test/pullRequestPreview.test.ts
+++ b/backend/test/pullRequestPreview.test.ts
@@ -24,6 +24,7 @@ import {
     buildPullRequestPreviewSandboxCommand,
     cleanupClosedPullRequestPreview,
     getPullRequestPreviewStatus,
+    listManagedPullRequestPreviewStateNumbers,
     parsePreviewUnitState,
     type PullRequestPreviewConfig,
     resolvePullRequestPreviewConfig,
@@ -391,6 +392,28 @@ describe("managed pull request preview", () => {
         }
     });
 
+    it("returns a warning when closed-PR cleanup cannot read its preview record", async () => {
+        const root = mkdtempSync(path.join(tmpdir(), "mira-preview-cleanup-warning-"));
+        const config = previewConfig(root);
+        mkdirSync(config.previewRoot, { recursive: true });
+        writeFileSync(config.stateFile, "x".repeat(256 * 1024 + 1), {
+            mode: 0o600,
+        });
+
+        try {
+            await expect(
+                cleanupClosedPullRequestPreview(335, { config })
+            ).resolves.toMatchObject({
+                message: expect.stringContaining("Dashboard preview state is too large"),
+                number: 335,
+                status: "warning",
+            });
+            expect(existsSync(config.stateFile)).toBe(true);
+        } finally {
+            rmSync(root, { force: true, recursive: true });
+        }
+    });
+
     it("preserves preview state after a transient read failure", async () => {
         const root = mkdtempSync(path.join(tmpdir(), "mira-preview-read-failure-"));
         const config = previewConfig(root);
@@ -460,6 +483,25 @@ describe("managed pull request preview", () => {
         }
     });
 
+    it("lists only real isolated managed PR state directories", () => {
+        const root = mkdtempSync(path.join(tmpdir(), "mira-preview-state-list-"));
+        const config = previewConfig(root);
+        const statesRoot = path.join(config.previewRoot, "states");
+        const outsideState = path.join(root, "outside-state");
+        mkdirSync(path.join(statesRoot, "pr-341"), { recursive: true });
+        mkdirSync(path.join(statesRoot, "pr-335"), { recursive: true });
+        mkdirSync(path.join(statesRoot, "pr-0"), { recursive: true });
+        mkdirSync(path.join(statesRoot, "notes"), { recursive: true });
+        mkdirSync(outsideState, { recursive: true });
+        symlinkSync(outsideState, path.join(statesRoot, "pr-999"));
+
+        try {
+            expect(listManagedPullRequestPreviewStateNumbers(config)).toEqual([335, 341]);
+        } finally {
+            rmSync(root, { force: true, recursive: true });
+        }
+    });
+
     it("starts, reuses, updates, reports, and stops one trusted preview slot", async () => {
         const root = mkdtempSync(path.join(tmpdir(), "mira-preview-lifecycle-"));
         const config = {
@@ -476,10 +518,12 @@ describe("managed pull request preview", () => {
         let didProxyReceiveDisposableToken = false;
         let didProxyReceiveUpstreamToken = false;
         let didProxyStartWithStartingRecord = false;
+        let isMissingWorktreeRegistered = true;
         const activeUnits = new Set<string>();
         const commands: string[] = [];
         mkdirSync(config.dashboardRoot, { recursive: true });
         mkdirSync(config.gitCommonDirectory, { recursive: true });
+        chmodSync(root, 0o755);
 
         const processSpy = jest
             .spyOn(processModule, "runProcess")
@@ -596,11 +640,27 @@ describe("managed pull request preview", () => {
                 if (executable === "git" && commandArguments.includes("status")) {
                     return { code: 0, stderr: "", stdout: "" };
                 }
+                if (
+                    executable === "git" &&
+                    commandArguments.includes("worktree") &&
+                    commandArguments.includes("list")
+                ) {
+                    return {
+                        code: 0,
+                        stderr: "",
+                        stdout: isMissingWorktreeRegistered
+                            ? `worktree ${worktreePath}\nHEAD ${expectedCommit}\ndetached\n\n`
+                            : "",
+                    };
+                }
                 if (
                     executable === "git" &&
                     commandArguments.includes("worktree") &&
                     commandArguments.includes("add")
                 ) {
+                    if (isMissingWorktreeRegistered) {
+                        throw new Error("stale worktree registration was not cleared");
+                    }
                     mkdirSync(path.join(worktreePath, "backend"), {
                         recursive: true,
                     });
@@ -610,6 +670,7 @@ describe("managed pull request preview", () => {
                     commandArguments.includes("worktree") &&
                     commandArguments.includes("remove")
                 ) {
+                    isMissingWorktreeRegistered = false;
                     rmSync(worktreePath, { force: true, recursive: true });
                 }
                 if (executable === "git" && commandArguments.includes("rev-parse")) {
@@ -652,6 +713,17 @@ describe("managed pull request preview", () => {
                 status: "running",
                 url: "https://preview-node.ts.net:5173",
             });
+            expect(statSync(root).mode & 0o777).toBe(0o755);
+            const staleRemovalIndex = commands.findIndex((command) =>
+                command.includes(
+                    `worktree remove --force --force ${config.managedWorktreePath}`
+                )
+            );
+            const worktreeAddIndex = commands.findIndex((command) =>
+                command.includes(`worktree add --detach ${config.managedWorktreePath}`)
+            );
+            expect(staleRemovalIndex).toBeGreaterThanOrEqual(0);
+            expect(worktreeAddIndex).toBeGreaterThan(staleRemovalIndex);
             expect(prepareStateSpy).toHaveBeenCalledTimes(1);
             expect(protectFromCancellation).toHaveBeenCalledTimes(1);
             expect(fetchSpy).toHaveBeenCalledWith(
@@ -981,6 +1053,9 @@ describe("managed pull request preview", () => {
         const listSpy = jest
             .spyOn(pullRequests, "listDashboardPullRequests")
             .mockResolvedValue([pullRequest]);
+        const isOpenSpy = jest
+            .spyOn(pullRequests, "isDashboardPullRequestOpen")
+            .mockResolvedValue(false);
         const startSpy = jest
             .spyOn(previewHost, "startPullRequestPreview")
             .mockResolvedValue({ number: 335, status: "running" });
@@ -994,6 +1069,9 @@ describe("managed pull request preview", () => {
                 number: 335,
                 status: "removed",
             });
+        const stateNumbersSpy = jest
+            .spyOn(previewHost, "listManagedPullRequestPreviewStateNumbers")
+            .mockReturnValue([]);
         const statusSpy = jest
             .spyOn(previewHost, "getPullRequestPreviewStatus")
             .mockResolvedValue({ status: "stopped" });
@@ -1101,6 +1179,9 @@ describe("managed pull request preview", () => {
             });
             const enqueueCallsBeforeReconciliation = enqueueSpy.mock.calls.length;
             executionsSpy.mockReturnValue([]);
+            isOpenSpy.mockResolvedValueOnce(true);
+            await reconcileClosedPullRequestPreview([]);
+            expect(enqueueSpy).toHaveBeenCalledTimes(enqueueCallsBeforeReconciliation);
             await reconcileClosedPullRequestPreview([]);
             expect(enqueueSpy).toHaveBeenLastCalledWith(
                 expect.objectContaining({
@@ -1112,10 +1193,22 @@ describe("managed pull request preview", () => {
             expect(enqueueSpy).toHaveBeenCalledTimes(
                 enqueueCallsBeforeReconciliation + 1
             );
+            stateNumbersSpy.mockReturnValueOnce([334]);
+            await reconcileClosedPullRequestPreview([pullRequest]);
+            expect(enqueueSpy).toHaveBeenLastCalledWith(
+                expect.objectContaining({
+                    actionKey: "dashboard.preview.cleanup",
+                    payload: { number: 334 },
+                    resourceClass: "exclusive",
+                })
+            );
+            expect(enqueueSpy).toHaveBeenCalledTimes(
+                enqueueCallsBeforeReconciliation + 2
+            );
             executionsSpy.mockReturnValue([queuedCleanup]);
             await reconcileClosedPullRequestPreview([]);
             expect(enqueueSpy).toHaveBeenCalledTimes(
-                enqueueCallsBeforeReconciliation + 1
+                enqueueCallsBeforeReconciliation + 2
             );
             executionsSpy.mockReturnValue([]);
             const consoleErrorSpy = jest
@@ -1124,7 +1217,7 @@ describe("managed pull request preview", () => {
             statusSpy.mockRejectedValueOnce(new Error("preview status unavailable"));
             await reconcileClosedPullRequestPreview([]);
             expect(enqueueSpy).toHaveBeenCalledTimes(
-                enqueueCallsBeforeReconciliation + 1
+                enqueueCallsBeforeReconciliation + 2
             );
             expect(consoleErrorSpy).toHaveBeenCalledWith(
                 "[PullRequestPreview] Closed-PR reconciliation failed:",
@@ -1226,6 +1319,7 @@ describe("managed pull request preview", () => {
                     protectFromCancellation: expect.any(Function),
                 })
             );
+            isOpenSpy.mockResolvedValueOnce(true);
             await expect(
                 cleanupHandler(previewScheduledJob(335), undefined, context)
             ).resolves.toMatchObject({
@@ -1266,9 +1360,11 @@ describe("managed pull request preview", () => {
             waitSpy.mockRestore();
             registerSpy.mockRestore();
             listSpy.mockRestore();
+            isOpenSpy.mockRestore();
             startSpy.mockRestore();
             stopSpy.mockRestore();
             cleanupSpy.mockRestore();
+            stateNumbersSpy.mockRestore();
             statusSpy.mockRestore();
         }
     });
diff --git a/backend/test/serviceBehavior.test.ts b/backend/test/serviceBehavior.test.ts
index 30d21ff13..6e9befba8 100644
--- a/backend/test/serviceBehavior.test.ts
+++ b/backend/test/serviceBehavior.test.ts
@@ -107,6 +107,10 @@ set -euo pipefail
 if [[ "$1" == "api" && "$2" == "graphql" && "$*" == *"--paginate"* && "$*" == *"-F owner=rajohan"* && "$*" == *"-F name=Mira-Dashboard"* && "$*" == *"-f query="* && "$*" == *"--jq"* ]]; then
   printf '%s\n' '{"number":1,"title":"Ready PR","body":"","url":"https://github.test/pr/1","headRefName":"ready","headRefOid":"head1","baseRefName":"main","author":{"login":"mira-2026"},"createdAt":"2026-06-24T08:00:00.000Z","updatedAt":"2026-06-24T09:00:00.000Z","isDraft":false,"mergeable":"MERGEABLE","mergeStateStatus":"CLEAN","reviewDecision":null,"latestOpinionatedReviews":{"nodes":[{"state":"APPROVED","submittedAt":"2026-06-24T08:30:00.000Z","author":{"login":"rajohan"}}]},"additions":1,"deletions":0,"changedFiles":1,"statusCheckRollup":[{"name":"ci","conclusion":"success","completedAt":"2026-06-24T08:45:00.000Z"}]}'
   printf '%s\n' '{"number":2,"title":"Blocked cached PR","body":"","url":"https://github.test/pr/2","headRefName":"blocked","headRefOid":"head2","baseRefName":"main","author":{"login":"mira-2026"},"createdAt":"2026-06-24T10:00:00.000Z","updatedAt":"2026-06-24T11:00:00.000Z","isDraft":false,"mergeable":"MERGEABLE","mergeStateStatus":"BLOCKED","reviewDecision":"APPROVED","latestOpinionatedReviews":{"nodes":[]},"additions":2,"deletions":1,"changedFiles":2,"statusCheckRollup":[{"name":"ci","conclusion":"success","completedAt":"2026-06-24T10:45:00.000Z"}]}'
+elif [[ "$1 $2 $3" == "pr view 2" && "$*" == *"--json state"* ]]; then
+  printf '%s\n' '{"state":"OPEN"}'
+elif [[ "$1 $2 $3" == "pr view 99" && "$*" == *"--json state"* ]]; then
+  printf '%s\n' '{"state":"CLOSED"}'
 elif [[ "$1 $2 $3" == "pr view 2" ]]; then
   printf '%s\n' '{"number":2,"title":"Blocked refreshed PR","body":"","url":"https://github.test/pr/2","headRefName":"blocked","headRefOid":"head2b","baseRefName":"main","author":{"login":"mira-2026"},"createdAt":"2026-06-24T10:00:00.000Z","updatedAt":"2026-06-24T11:30:00.000Z","isDraft":false,"mergeable":"MERGEABLE","mergeStateStatus":"CLEAN","reviewDecision":"APPROVED","reviews":[],"additions":3,"deletions":1,"changedFiles":2,"statusCheckRollup":[{"name":"ci","conclusion":"success","completedAt":"2026-06-24T11:15:00.000Z"}]}'
 else
@@ -2937,8 +2941,11 @@ fi
         process.env.MIRA_DASHBOARD_ROOT = fakeRoot;
         process.env.RAJOHAN_GITHUB_USERNAME = "rajohan";
 
-        const { listDashboardPullRequests, validatePrNumber } =
-            await import("../src/services/pullRequests.ts");
+        const {
+            isDashboardPullRequestOpen,
+            listDashboardPullRequests,
+            validatePrNumber,
+        } = await import("../src/services/pullRequests.ts");
 
         const pullRequests = await listDashboardPullRequests();
         expect(pullRequests.map((pullRequest) => pullRequest.number)).toEqual([2, 1]);
@@ -2954,6 +2961,8 @@ fi
             reviewerApproved: true,
             canReviewerApprove: false,
         });
+        await expect(isDashboardPullRequestOpen(2)).resolves.toBe(true);
+        await expect(isDashboardPullRequestOpen(99)).resolves.toBe(false);
         expect(validatePrNumber("42")).toBe(42);
         for (const value of ["0", "-1", "1.5", "abc", 1]) {
             expect(() => validatePrNumber(value)).toThrow("Invalid pull request number");
diff --git a/docs/setup/secrets-and-env.md b/docs/setup/secrets-and-env.md
index bdc9d4338..18926bf2c 100644
--- a/docs/setup/secrets-and-env.md
+++ b/docs/setup/secrets-and-env.md
@@ -156,28 +156,28 @@ child environment forwards the two auth timing values unchanged, uses the
 production RP ID only to decide whether copied WebAuthn public credentials are
 compatible, and does not inherit other provider or host credentials.
 
-| Variable                                      | Default                                                      | Purpose                                                                             |
-| --------------------------------------------- | ------------------------------------------------------------ | ----------------------------------------------------------------------------------- |
-| `MIRA_DASHBOARD_DEV_FRONTEND_PORT`            | `5173`                                                       | Frontend hot-reload port.                                                           |
-| `MIRA_DASHBOARD_DEV_BACKEND_PORT`             | `3101`                                                       | Backend restart-on-change port.                                                     |
-| `MIRA_DASHBOARD_DEV_HOT_RELOAD`               | `1`                                                          | Enables frontend HMR and backend/frontend source watchers; managed PR dev sets `0`. |
-| `MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN`            | `http://localhost:5173`                                      | Cookie/WebAuthn origin; remote dev derives the Tailscale HTTPS origin.              |
-| `MIRA_DASHBOARD_DEV_SOURCE_WEBAUTHN_RP_ID`    | production `MIRA_DASHBOARD_WEBAUTHN_RP_ID`                   | Source snapshot RP used to retain or remove copied WebAuthn public credentials.     |
-| `MIRA_DASHBOARD_DEV_STATE_ROOT`               | `~/projects/mira-dashboard-dev-state/local`                  | Owner-only isolated development state.                                              |
-| `MIRA_DASHBOARD_DEV_DB_SOURCE`                | `~/projects/mira-dashboard-state/mira-dashboard.db`          | Production database used only to create a scrubbed WAL-consistent snapshot.         |
-| `MIRA_DASHBOARD_DEV_RELEASES_SOURCE`          | `~/projects/mira-dashboard-releases`                         | Managed releases copied into isolated state.                                        |
-| `MIRA_DASHBOARD_DEV_WORKSPACE_SOURCE`         | `~/.openclaw/workspace`                                      | Workspace copied with secret and symlink filtering.                                 |
-| `MIRA_DASHBOARD_DEV_OPENCLAW_CONFIG_SOURCE`   | `~/.openclaw/openclaw.json`                                  | Source for sanitized agent-only development config.                                 |
-| `MIRA_DASHBOARD_DEV_GATEWAY_URL`              | `ws://127.0.0.1:18789`                                       | Live production Gateway used by trusted dev.                                        |
-| `MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE`       | none                                                         | Optional owner-only token file; local commands normally use Doppler environment.    |
-| `MIRA_DASHBOARD_PREVIEW_ROOT`                 | `/home/ubuntu/projects/mira-dashboard-preview-state/managed` | Host-owned records, shared install cache, and isolated per-PR state.                |
-| `MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH`        | `/home/ubuntu/projects/mira-dashboard-preview`               | Single shared checkout reused by the managed PR-dev slot.                           |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_URL`          | `ws://127.0.0.1:18789`                                       | Production Gateway used only by the host-owned PR-dev capability proxy.             |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_TOKEN_FILE`   | `<managed-preview-root>/gateway.token`                       | Disposable `0600` proxy credential mounted read-only into trusted PR dev.           |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_PORT`   | `18790`                                                      | Loopback-only host proxy port; must differ from frontend/backend ports.             |
-| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_UNIT`   | `mira-dashboard-pr-preview-gateway.service`                  | Transient proxy unit name; no permanent systemd unit file is installed.             |
-| `MIRA_DASHBOARD_PREVIEW_OPENCLAW_SOURCE_ROOT` | `/home/ubuntu/.openclaw`                                     | Source root for managed PR workspace/config snapshots.                              |
-| `HOST` / `PORT` / `DASHBOARD_API_TARGET`      | `127.0.0.1` / `5173` / `http://127.0.0.1:3101`               | Child frontend bind and exact backend proxy target.                                 |
+| Variable                                      | Default                                                      | Purpose                                                                                                            |
+| --------------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------ |
+| `MIRA_DASHBOARD_DEV_FRONTEND_PORT`            | `5173`                                                       | Frontend hot-reload port.                                                                                          |
+| `MIRA_DASHBOARD_DEV_BACKEND_PORT`             | `3101`                                                       | Backend restart-on-change port.                                                                                    |
+| `MIRA_DASHBOARD_DEV_HOT_RELOAD`               | `1` when unset or empty                                      | Accepts only `0` or `1`; enables frontend HMR and backend/frontend source watchers, while managed PR dev sets `0`. |
+| `MIRA_DASHBOARD_DEV_PUBLIC_ORIGIN`            | `http://localhost:5173`                                      | Cookie/WebAuthn origin; remote dev derives the Tailscale HTTPS origin.                                             |
+| `MIRA_DASHBOARD_DEV_SOURCE_WEBAUTHN_RP_ID`    | production `MIRA_DASHBOARD_WEBAUTHN_RP_ID`                   | Source snapshot RP used to retain or remove copied WebAuthn public credentials.                                    |
+| `MIRA_DASHBOARD_DEV_STATE_ROOT`               | `~/projects/mira-dashboard-dev-state/local`                  | Owner-only isolated development state.                                                                             |
+| `MIRA_DASHBOARD_DEV_DB_SOURCE`                | `~/projects/mira-dashboard-state/mira-dashboard.db`          | Production database used only to create a scrubbed WAL-consistent snapshot.                                        |
+| `MIRA_DASHBOARD_DEV_RELEASES_SOURCE`          | `~/projects/mira-dashboard-releases`                         | Managed releases copied into isolated state.                                                                       |
+| `MIRA_DASHBOARD_DEV_WORKSPACE_SOURCE`         | `~/.openclaw/workspace`                                      | Workspace copied with secret and symlink filtering.                                                                |
+| `MIRA_DASHBOARD_DEV_OPENCLAW_CONFIG_SOURCE`   | `~/.openclaw/openclaw.json`                                  | Source for sanitized agent-only development config.                                                                |
+| `MIRA_DASHBOARD_DEV_GATEWAY_URL`              | `ws://127.0.0.1:18789`                                       | Live production Gateway used by trusted dev.                                                                       |
+| `MIRA_DASHBOARD_DEV_GATEWAY_TOKEN_FILE`       | none                                                         | Optional owner-only token file; local commands normally use Doppler environment.                                   |
+| `MIRA_DASHBOARD_PREVIEW_ROOT`                 | `/home/ubuntu/projects/mira-dashboard-preview-state/managed` | Host-owned records, shared install cache, and isolated per-PR state.                                               |
+| `MIRA_DASHBOARD_PREVIEW_WORKTREE_PATH`        | `/home/ubuntu/projects/mira-dashboard-preview`               | Single shared checkout reused by the managed PR-dev slot.                                                          |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_URL`          | `ws://127.0.0.1:18789`                                       | Production Gateway used only by the host-owned PR-dev capability proxy.                                            |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_TOKEN_FILE`   | `<managed-preview-root>/gateway.token`                       | Disposable `0600` proxy credential mounted read-only into trusted PR dev.                                          |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_PORT`   | `18790`                                                      | Loopback-only host proxy port; must differ from frontend/backend ports.                                            |
+| `MIRA_DASHBOARD_PREVIEW_GATEWAY_PROXY_UNIT`   | `mira-dashboard-pr-preview-gateway.service`                  | Transient proxy unit name; no permanent systemd unit file is installed.                                            |
+| `MIRA_DASHBOARD_PREVIEW_OPENCLAW_SOURCE_ROOT` | `/home/ubuntu/.openclaw`                                     | Source root for managed PR workspace/config snapshots.                                                             |
+| `HOST` / `PORT` / `DASHBOARD_API_TARGET`      | `127.0.0.1` / `5173` / `http://127.0.0.1:3101`               | Child frontend bind and exact backend proxy target.                                                                |
 
 See [Local development](../development/local-dev.md) for snapshot contents,
 blocked production mutations, cookie isolation, and the managed trusted-PR
diff --git a/scripts/developmentFrontend.ts b/scripts/developmentFrontend.ts
index 18572cdbe..68f7c6b08 100644
--- a/scripts/developmentFrontend.ts
+++ b/scripts/developmentFrontend.ts
@@ -94,7 +94,7 @@ function upgradeWebSocket(
 }
 
 const server = Bun.serve<WebSocketProxyData>({
-    development: isHotReloadEnabled ? { console: true, hmr: true } : false,
+    development: { console: true, hmr: isHotReloadEnabled },
     fetch(request, server) {
         const url = new URL(request.url);
         if (url.pathname === "/ws") {
diff --git a/src/pages/Delivery.tsx b/src/pages/Delivery.tsx
index 11105b838..0218ce00b 100644
--- a/src/pages/Delivery.tsx
+++ b/src/pages/Delivery.tsx
@@ -755,9 +755,11 @@ export function Delivery() {
                         number: action.pr.number,
                     });
                     setLastResult(
-                        preview.url
-                            ? `PR #${action.pr.number} dev ${isRebuild ? "rebuilt" : "is running"} at ${preview.url}`
-                            : `PR #${action.pr.number} dev ${isRebuild ? "rebuilt" : "started"}`
+                        preview.status === "starting"
+                            ? `PR #${action.pr.number} dev ${isRebuild ? "rebuild" : "start"} queued`
+                            : preview.url
+                              ? `PR #${action.pr.number} dev ${isRebuild ? "rebuilt" : "is running"} at ${preview.url}`
+                              : `PR #${action.pr.number} dev ${isRebuild ? "rebuilt" : "started"}`
                     );
                     break;
                 }
diff --git a/src/test/pageBehavior.test.tsx b/src/test/pageBehavior.test.tsx
index 8ab3db6c8..afbb982aa 100644
--- a/src/test/pageBehavior.test.tsx
+++ b/src/test/pageBehavior.test.tsx
@@ -3091,7 +3091,16 @@ describe("Mira Dashboard pages", () => {
                         commitSha: "a".repeat(40),
                         updatedAt: "2026-06-24T08:07:00.000Z",
                     };
-                    return Response.json({ isOk: true, preview });
+                    return Response.json({
+                        isOk: true,
+                        preview: {
+                            commitSha: "a".repeat(40),
+                            number: 335,
+                            status: "starting",
+                            title: "Trusted PR dev",
+                            updatedAt: "2026-06-24T08:06:30.000Z",
+                        },
+                    });
                 }
                 return apiResponse(url, method, init);
             }),
@@ -3115,9 +3124,7 @@ describe("Mira Dashboard pages", () => {
         await user.click(screen.getByRole("button", { name: "Rebuild PR dev" }));
 
         await waitFor(() => {
-            expect(
-                screen.getByText("PR #335 dev rebuilt at https://dashboard.test:5173")
-            ).toBeInTheDocument();
+            expect(screen.getByText("PR #335 dev rebuild queued")).toBeInTheDocument();
         });
         expect(startCalls).toBe(1);
         expect(