diff --git a/apps/desktop/src/main/adeMcpProxy.ts b/apps/desktop/src/main/adeMcpProxy.ts
index b9d7ae18c..e38130352 100644
--- a/apps/desktop/src/main/adeMcpProxy.ts
+++ b/apps/desktop/src/main/adeMcpProxy.ts
@@ -18,6 +18,9 @@ type RuntimeRoots = {
   workspaceRoot: string;
 };
 
+const MCP_SOCKET_CONNECT_TIMEOUT_MS = 5_000;
+const MCP_SOCKET_CONNECT_RETRY_DELAY_MS = 150;
+
 function resolveCliArg(flag: string): string | null {
   const args = process.argv.slice(2);
   for (let i = 0; i < args.length; i += 1) {
@@ -118,6 +121,43 @@ function relayProxyInputWithIdentity(socket: net.Socket): void {
   });
 }
 
+function isRetriableSocketConnectError(error: NodeJS.ErrnoException): boolean {
+  return error.code === "ENOENT" || error.code === "ECONNREFUSED";
+}
+
+async function connectToSocketWithRetry(socketPath: string): Promise<net.Socket> {
+  const deadline = Date.now() + MCP_SOCKET_CONNECT_TIMEOUT_MS;
+
+  while (true) {
+    const socket = net.createConnection(socketPath);
+    try {
+      await new Promise<void>((resolve, reject) => {
+        const handleConnect = () => {
+          socket.off("error", handleError);
+          resolve();
+        };
+        const handleError = (error: NodeJS.ErrnoException) => {
+          socket.off("connect", handleConnect);
+          reject(error);
+        };
+        socket.once("connect", handleConnect);
+        socket.once("error", handleError);
+      });
+      return socket;
+    } catch (error) {
+      socket.destroy();
+      const nextError = error as NodeJS.ErrnoException;
+      if (!isRetriableSocketConnectError(nextError) || Date.now() >= deadline) {
+        throw nextError;
+      }
+      await new Promise((resolve) => {
+        const timer = setTimeout(resolve, MCP_SOCKET_CONNECT_RETRY_DELAY_MS);
+        timer.unref?.();
+      });
+    }
+  }
+}
+
 async function main(): Promise<void> {
   const roots = resolveRuntimeRoots();
   const socketPath = process.env.ADE_MCP_SOCKET_PATH?.trim() || resolveAdeLayout(roots.projectRoot).socketPath;
@@ -134,25 +174,20 @@ async function main(): Promise<void> {
     process.exit(0);
   }
 
-  const socket = net.createConnection(socketPath);
-  let connected = false;
+  const socket = await connectToSocketWithRetry(socketPath);
 
   socket.on("error", (err) => {
-    const prefix = connected ? "[ade-mcp-proxy]" : "[ade-mcp-proxy] Failed to connect";
-    process.stderr.write(`${prefix}: ${err.message}\n`);
+    process.stderr.write(`[ade-mcp-proxy]: ${err.message}\n`);
     process.exit(1);
   });
 
-  socket.on("connect", () => {
-    connected = true;
-    process.stdin.resume();
-    relayProxyInputWithIdentity(socket);
-    socket.pipe(process.stdout);
-  });
-
   socket.on("close", () => {
-    process.exit(connected ? 0 : 1);
+    process.exit(0);
   });
+
+  process.stdin.resume();
+  relayProxyInputWithIdentity(socket);
+  socket.pipe(process.stdout);
 }
 
 void main().catch((error) => {
diff --git a/apps/desktop/src/main/main.ts b/apps/desktop/src/main/main.ts
index 59d8d5aae..6114715d9 100644
--- a/apps/desktop/src/main/main.ts
+++ b/apps/desktop/src/main/main.ts
@@ -40,6 +40,7 @@ import { createPrService } from "./services/prs/prService";
 import { createPrPollingService } from "./services/prs/prPollingService";
 import { createQueueLandingService } from "./services/prs/queueLandingService";
 import { createIssueInventoryService } from "./services/prs/issueInventoryService";
+import { createPrSummaryService } from "./services/prs/prSummaryService";
 import {
   detectDefaultBaseRef,
   resolveRepoRoot,
@@ -76,7 +77,6 @@ import { createRebaseSuggestionService } from "./services/lanes/rebaseSuggestion
 import { createAutoRebaseService } from "./services/lanes/autoRebaseService";
 import { createMissionService } from "./services/missions/missionService";
 import { createMissionPreflightService } from "./services/missions/missionPreflightService";
-import { createCompactionFlushService } from "./services/memory/compactionFlushService";
 import { createBatchConsolidationService } from "./services/memory/batchConsolidationService";
 import { createEmbeddingService } from "./services/memory/embeddingService";
 import { createEmbeddingWorkerService } from "./services/memory/embeddingWorkerService";
@@ -1125,7 +1125,6 @@ app.whenReady().then(async () => {
     });
     const reconciledSessions = sessionService.reconcileStaleRunningSessions({
       status: "disposed",
-      excludeToolTypes: ["claude-chat", "codex-chat", "opencode-chat", "cursor"],
     });
     if (reconciledSessions > 0) {
       logger.warn("sessions.reconciled_stale_running", {
@@ -1378,6 +1377,7 @@ app.whenReady().then(async () => {
       logger,
       prService,
       projectConfigService,
+      db,
       onEvent: (event) => emitProjectEvent(projectRoot, IPC.prsEvent, event),
       onPullRequestsChanged: async ({ changedPrs, changes }) => {
         if (changedPrs.length > 0) {
@@ -1456,6 +1456,14 @@ app.whenReady().then(async () => {
 
     const issueInventoryService = createIssueInventoryService({ db });
 
+    const prSummaryService = createPrSummaryService({
+      db,
+      logger,
+      projectRoot,
+      prService,
+      aiIntegrationService,
+    });
+
     const fileService = createFileService({
       laneService,
       onLaneWorktreeMutation: ({ laneId, reason }) => {
@@ -1620,10 +1628,6 @@ app.whenReady().then(async () => {
       memoryService,
     });
     memoryFilesServiceRef = memoryFilesService;
-    const compactionFlushService = createCompactionFlushService(undefined, {
-      logger,
-    });
-    aiIntegrationService.setCompactionFlushService(compactionFlushService);
     const batchConsolidationService = createBatchConsolidationService({
       db,
       logger,
@@ -1905,32 +1909,6 @@ app.whenReady().then(async () => {
         openclawBridgeServiceRef?.onAgentChatEvent(event);
         emitProjectEvent(projectRoot, IPC.agentChatEvent, event);
 
-        // Compaction flush: when context compaction occurs, trigger a flush steer
-        // so the agent can save durable discoveries to memory before they are lost.
-        if (event.event.type === "context_compact") {
-          const sid = event.sessionId;
-          const compactEvt = event.event as { preTokens?: number };
-          void compactionFlushService
-            .beforeCompaction({
-              sessionId: sid,
-              boundaryId: `chat:${sid}:${Date.now()}`,
-              conversationTokenCount: compactEvt.preTokens ?? 200_000,
-              maxTokens: 200_000,
-              flushTurn: async ({ prompt }) => {
-                try {
-                  await agentChatService.steer({
-                    sessionId: sid,
-                    text: prompt,
-                  });
-                  return { status: "flushed" };
-                } catch {
-                  return { status: "budget_exceeded" };
-                }
-              },
-            })
-            .catch(() => {});
-        }
-
         // Capture agent session errors as failure gotchas for the memory system
         if (event.event.type === "error" && event.provenance?.runId) {
           const prov = event.provenance;
@@ -2930,7 +2908,19 @@ app.whenReady().then(async () => {
       });
       conn.on("error", () => {}); // ignore connection errors
     });
-    mcpSocketServer.listen(mcpSocketPath);
+    await new Promise<void>((resolve, reject) => {
+      const handleListening = () => {
+        mcpSocketServer.off("error", handleError);
+        resolve();
+      };
+      const handleError = (error: Error) => {
+        mcpSocketServer.off("listening", handleListening);
+        reject(error);
+      };
+      mcpSocketServer.once("listening", handleListening);
+      mcpSocketServer.once("error", handleError);
+      mcpSocketServer.listen(mcpSocketPath);
+    });
     logger.info("mcp.socket_server_started", { socketPath: mcpSocketPath });
 
     return {
@@ -2970,6 +2960,7 @@ app.whenReady().then(async () => {
       computerUseArtifactBrokerService,
       queueLandingService,
       issueInventoryService,
+      prSummaryService,
       jobEngine,
       automationService,
       automationPlannerService,
@@ -3068,6 +3059,7 @@ app.whenReady().then(async () => {
       prPollingService: null,
       queueLandingService: null,
       issueInventoryService: null,
+      prSummaryService: null,
       jobEngine: null,
       automationService: null,
       automationPlannerService: null,
diff --git a/apps/desktop/src/main/services/ai/aiIntegrationService.test.ts b/apps/desktop/src/main/services/ai/aiIntegrationService.test.ts
index aeb9f6dc8..8ad45414b 100644
--- a/apps/desktop/src/main/services/ai/aiIntegrationService.test.ts
+++ b/apps/desktop/src/main/services/ai/aiIntegrationService.test.ts
@@ -14,6 +14,10 @@ const mockState = vi.hoisted(() => ({
   probeClaudeRuntimeHealth: vi.fn(),
   resetClaudeRuntimeProbeCache: vi.fn(),
   runProviderTask: vi.fn(),
+  clearOpenCodeInventoryCache: vi.fn(),
+  peekOpenCodeInventoryCache: vi.fn(),
+  probeOpenCodeProviderInventory: vi.fn(),
+  resolveOpenCodeBinary: vi.fn(),
 }));
 
 vi.mock("./authDetector", () => ({
@@ -53,6 +57,16 @@ vi.mock("./providerTaskRunner", () => ({
   runProviderTask: (...args: unknown[]) => mockState.runProviderTask(...args),
 }));
 
+vi.mock("../opencode/openCodeInventory", () => ({
+  clearOpenCodeInventoryCache: (...args: unknown[]) => mockState.clearOpenCodeInventoryCache(...args),
+  peekOpenCodeInventoryCache: (...args: unknown[]) => mockState.peekOpenCodeInventoryCache(...args),
+  probeOpenCodeProviderInventory: (...args: unknown[]) => mockState.probeOpenCodeProviderInventory(...args),
+}));
+
+vi.mock("../opencode/openCodeBinaryManager", () => ({
+  resolveOpenCodeBinary: (...args: unknown[]) => mockState.resolveOpenCodeBinary(...args),
+}));
+
 import { getLocalProviderDefaultEndpoint } from "../../../shared/modelRegistry";
 import { createAiIntegrationService } from "./aiIntegrationService";
 
@@ -217,6 +231,18 @@ beforeEach(() => {
   });
   mockState.initModelsDevService.mockResolvedValue(new Map());
   mockState.probeClaudeRuntimeHealth.mockResolvedValue(undefined);
+  mockState.clearOpenCodeInventoryCache.mockImplementation(() => undefined);
+  mockState.peekOpenCodeInventoryCache.mockReturnValue(null);
+  mockState.probeOpenCodeProviderInventory.mockResolvedValue({
+    modelIds: ["opencode/openai/gpt-5.4-mini"],
+    providers: [{ id: "openai", name: "OpenAI", connected: true, modelCount: 1 }],
+    error: null,
+    descriptors: [],
+  });
+  mockState.resolveOpenCodeBinary.mockReturnValue({
+    path: "/Users/admin/.opencode/bin/opencode",
+    source: "user-installed",
+  });
 });
 
 describe("aiIntegrationService", () => {
@@ -364,4 +390,28 @@ describe("aiIntegrationService", () => {
     expect(mockState.buildProviderConnections).toHaveBeenCalledTimes(1);
     expect(secondStatus).toEqual(firstStatus);
   });
+
+  it("does not cold-probe OpenCode inventory on default getStatus", async () => {
+    const { service } = makeService();
+
+    const status = await service.getStatus();
+
+    expect(status.opencodeBinaryInstalled).toBe(true);
+    expect(status.opencodeProviders).toEqual([]);
+    expect(status.availableModelIds).not.toContain("opencode/openai/gpt-5.4-mini");
+    expect(mockState.peekOpenCodeInventoryCache).toHaveBeenCalledTimes(1);
+    expect(mockState.probeOpenCodeProviderInventory).not.toHaveBeenCalled();
+  });
+
+  it("probes OpenCode inventory when explicitly refreshed", async () => {
+    const { service } = makeService();
+
+    const status = await service.getStatus({ refreshOpenCodeInventory: true });
+
+    expect(mockState.probeOpenCodeProviderInventory).toHaveBeenCalledTimes(1);
+    expect(status.opencodeProviders).toEqual([
+      { id: "openai", name: "OpenAI", connected: true, modelCount: 1 },
+    ]);
+    expect(status.availableModelIds).toContain("opencode/openai/gpt-5.4-mini");
+  });
 });
diff --git a/apps/desktop/src/main/services/ai/aiIntegrationService.ts b/apps/desktop/src/main/services/ai/aiIntegrationService.ts
index 844278b94..28c01178f 100644
--- a/apps/desktop/src/main/services/ai/aiIntegrationService.ts
+++ b/apps/desktop/src/main/services/ai/aiIntegrationService.ts
@@ -46,7 +46,6 @@ import { isRecord } from "../shared/utils";
 import { parseStructuredOutput } from "./utils";
 import { getApiKeyStoreStatus } from "./apiKeyStore";
 import type { createMemoryService } from "../memory/memoryService";
-import type { CompactionFlushService } from "../memory/compactionFlushService";
 import { inspectLocalProvider } from "./localModelDiscovery";
 import { discoverCursorCliModelDescriptors, clearCursorCliModelsCache } from "../chat/cursorModelsDiscovery";
 import { resolveCursorAgentExecutable } from "./cursorAgentExecutable";
@@ -655,7 +654,6 @@ export function createAiIntegrationService(args: {
   projectRoot: string;
 }) {
   const { db, logger, projectConfigService, projectRoot } = args;
-  let compactionFlushService: CompactionFlushService | null = null;
 
   // Non-blocking: fetch models.dev data and enrich pricing + registry
   initModelsDevService().then((modelData) => {
@@ -1257,17 +1255,6 @@ export function createAiIntegrationService(args: {
             opencodeInventoryError = peeked.error;
             opencodeModelIds = peeked.modelIds;
             opencodeProviders = peeked.providers;
-          } else {
-            // No cache yet — auto-probe on first getStatus so free/connected models appear immediately.
-            const probed = await probeOpenCodeProviderInventory({
-              projectRoot,
-              projectConfig: effectiveConfig,
-              logger,
-              discoveredLocalModels,
-            });
-            opencodeInventoryError = probed.error;
-            opencodeModelIds = probed.modelIds;
-            opencodeProviders = probed.providers;
           }
         }
 
@@ -1338,9 +1325,6 @@ export function createAiIntegrationService(args: {
 
     getAvailabilityAsync,
     resolveModelForTask,
-    setCompactionFlushService(service: CompactionFlushService | null) {
-      compactionFlushService = service;
-    },
 
     // Backward-compatible convenience methods used by migrated services.
     async generateNarrative(args: {
diff --git a/apps/desktop/src/main/services/chat/agentChatService.test.ts b/apps/desktop/src/main/services/chat/agentChatService.test.ts
index 616818509..82ff6f258 100644
--- a/apps/desktop/src/main/services/chat/agentChatService.test.ts
+++ b/apps/desktop/src/main/services/chat/agentChatService.test.ts
@@ -596,6 +596,10 @@ function createMockSessionService() {
         row.endedAt = args?.endedAt ?? new Date().toISOString();
       }
     }),
+    deleteSession: vi.fn((sessionId: string) => {
+      sessions.delete(sessionId);
+      return true;
+    }),
     updateMeta: vi.fn((args: any) => {
       const row = sessions.get(args.sessionId);
       if (row) {
@@ -944,6 +948,7 @@ describe("createAgentChatService", () => {
     expect(service.getAvailableModels).toBeTypeOf("function");
     expect(service.getSlashCommands).toBeTypeOf("function");
     expect(service.dispose).toBeTypeOf("function");
+    expect(service.deleteSession).toBeTypeOf("function");
     expect(service.disposeAll).toBeTypeOf("function");
     expect(service.updateSession).toBeTypeOf("function");
     expect(service.warmupModel).toBeTypeOf("function");
@@ -2327,6 +2332,146 @@ describe("createAgentChatService", () => {
     });
   });
 
+  // --------------------------------------------------------------------------
+  // compaction flush (issue #153): no visible flush message; PreCompact hook
+  // --------------------------------------------------------------------------
+
+  describe("compaction flush", () => {
+    it("emits context_compact without a user_message carrying the flush prompt", async () => {
+      const send = vi.fn().mockResolvedValue(undefined);
+      const setPermissionMode = vi.fn().mockResolvedValue(undefined);
+      let streamCall = 0;
+      const stream = vi.fn(() => (async function* () {
+        streamCall += 1;
+        if (streamCall === 1) {
+          yield {
+            type: "system",
+            subtype: "init",
+            session_id: "sdk-session-compact",
+            slash_commands: [],
+          };
+          yield {
+            type: "result",
+            usage: { input_tokens: 1, output_tokens: 1 },
+          };
+          return;
+        }
+
+        yield {
+          type: "system",
+          subtype: "compact_boundary",
+          session_id: "sdk-session-compact",
+          compact_metadata: { trigger: "auto", pre_tokens: 150_000 },
+        };
+        yield {
+          type: "assistant",
+          session_id: "sdk-session-compact",
+          message: {
+            content: [{ type: "text", text: "Continuing after compaction" }],
+            usage: { input_tokens: 1, output_tokens: 1 },
+          },
+        };
+        yield {
+          type: "result",
+          usage: { input_tokens: 1, output_tokens: 1 },
+        };
+      })());
+      vi.mocked(unstable_v2_createSession).mockReturnValue({
+        send,
+        stream,
+        close: vi.fn(),
+        sessionId: "sdk-session-compact",
+        setPermissionMode,
+      } as any);
+
+      const onEvent = vi.fn();
+      const { service } = createService({ onEvent });
+      const session = await service.createSession({
+        laneId: "lane-1",
+        provider: "claude",
+        model: "sonnet",
+      });
+
+      await service.runSessionTurn({
+        sessionId: session.id,
+        text: "keep going",
+        timeoutMs: 15_000,
+      });
+      await new Promise((resolve) => setTimeout(resolve, 25));
+
+      const compactEvents = onEvent.mock.calls
+        .map((call) => call[0])
+        .filter((env: any) => env?.event?.type === "context_compact");
+      expect(compactEvents).toHaveLength(1);
+      expect(compactEvents[0].event).toMatchObject({
+        type: "context_compact",
+        trigger: "auto",
+        preTokens: 150_000,
+      });
+
+      const leakedUserMessages = onEvent.mock.calls
+        .map((call) => call[0])
+        .filter((env: any) =>
+          env?.event?.type === "user_message"
+          && typeof env.event.text === "string"
+          && env.event.text.includes("Before context compaction runs"),
+        );
+      expect(leakedUserMessages).toHaveLength(0);
+
+      // Defence in depth: the pre-fix leak happened when main.ts reacted to
+      // the context_compact chat event by calling steer(), which pushed the
+      // flush prompt to the SDK via send(). Assert the SDK never received a
+      // turn whose payload contains the flush-prompt text, regardless of
+      // whether the leak originated from the SDK side or a downstream handler.
+      const flushedSends = send.mock.calls.filter(([payload]) =>
+        typeof payload === "string"
+          ? payload.includes("Before context compaction runs")
+          : JSON.stringify(payload ?? "").includes("Before context compaction runs"),
+      );
+      expect(flushedSends).toHaveLength(0);
+    });
+
+    it("registers a PreCompact hook on non-lightweight Claude sessions", async () => {
+      vi.mocked(unstable_v2_createSession).mockReturnValue({
+        send: vi.fn(),
+        stream: vi.fn(async function* () {
+          return;
+        }),
+        close: vi.fn(),
+        sessionId: "sdk-session-precompact",
+      } as any);
+
+      const { service } = createService();
+      await service.createSession({
+        laneId: "lane-1",
+        provider: "claude",
+        model: "sonnet",
+      });
+
+      await vi.waitFor(() => {
+        expect(unstable_v2_createSession).toHaveBeenCalled();
+      });
+
+      const opts = vi.mocked(unstable_v2_createSession).mock.calls[0]?.[0] as {
+        hooks?: Record<string, Array<{ hooks: Array<(...args: unknown[]) => Promise<any>> }>>;
+      } | undefined;
+      const matchers = opts?.hooks?.PreCompact;
+      expect(matchers).toBeDefined();
+      expect(matchers!.length).toBeGreaterThan(0);
+      const callback = matchers![0].hooks[0];
+      const result = await callback(
+        { hook_event_name: "PreCompact", trigger: "auto", custom_instructions: null } as any,
+        undefined as any,
+        { signal: new AbortController().signal } as any,
+      );
+      expect(result).toMatchObject({ continue: true });
+      expect(typeof (result as { systemMessage?: string }).systemMessage).toBe("string");
+      expect((result as { systemMessage: string }).systemMessage).toContain(
+        "Before context compaction runs",
+      );
+    });
+  });
+
   // --------------------------------------------------------------------------
   // getSessionSummary
   // --------------------------------------------------------------------------
@@ -2865,6 +3010,55 @@ describe("createAgentChatService", () => {
     });
   });
 
+  describe("deleteSession", () => {
+    it("removes persisted chat artifacts and the stored session row", async () => {
+      const { service, sessionService } = createService();
+      const session = await service.createSession({
+        laneId: "lane-1",
+        provider: "opencode",
+        model: "",
+        modelId: "opencode/anthropic/claude-sonnet-4-6",
+      });
+
+      const metadataPath = path.join(tmpRoot, ".ade", "cache", "chat-sessions", `${session.id}.json`);
+      const dedicatedTranscriptPath = path.join(tmpRoot, ".ade", "transcripts", "chat", `${session.id}.jsonl`);
+      const mainTranscriptPath = sessionService.get(session.id)?.transcriptPath ?? "";
+
+      fs.writeFileSync(metadataPath, JSON.stringify({ sessionId: session.id }), "utf8");
+      fs.mkdirSync(path.dirname(dedicatedTranscriptPath), { recursive: true });
+      fs.writeFileSync(dedicatedTranscriptPath, "{\"event\":\"done\"}\n", "utf8");
+      fs.mkdirSync(path.dirname(mainTranscriptPath), { recursive: true });
+      fs.writeFileSync(mainTranscriptPath, "{\"event\":\"done\"}\n", "utf8");
+
+      await service.dispose({ sessionId: session.id });
+      await service.deleteSession({ sessionId: session.id });
+
+      expect(sessionService.deleteSession).toHaveBeenCalledWith(session.id);
+      expect(sessionService.get(session.id)).toBeNull();
+      expect(fs.existsSync(metadataPath)).toBe(false);
+      expect(fs.existsSync(dedicatedTranscriptPath)).toBe(false);
+      expect(fs.existsSync(mainTranscriptPath)).toBe(false);
+      await expect(service.getSessionSummary(session.id)).resolves.toBeNull();
+    });
+
+    it("disposes running chats before purging them", async () => {
+      const { service, sessionService } = createService();
+      const session = await service.createSession({
+        laneId: "lane-1",
+        provider: "opencode",
+        model: "",
+        modelId: "opencode/anthropic/claude-sonnet-4-6",
+      });
+
+      await service.deleteSession({ sessionId: session.id });
+
+      expect(sessionService.end).toHaveBeenCalledWith(
+        expect.objectContaining({ sessionId: session.id }),
+      );
+      expect(sessionService.deleteSession).toHaveBeenCalledWith(session.id);
+    });
+  });
+
   // --------------------------------------------------------------------------
   // cleanupStaleAttachments
   // --------------------------------------------------------------------------
@@ -4608,6 +4802,74 @@ describe("createAgentChatService", () => {
         vi.useRealTimers();
       }
     });
+
+    it("tears down idle Claude runtimes after the inactivity ttl", async () => {
+      vi.useFakeTimers();
+      try {
+        const close = vi.fn();
+        let streamCall = 0;
+        const send = vi.fn().mockResolvedValue(undefined);
+        const setPermissionMode = vi.fn().mockResolvedValue(undefined);
+
+        const sessionHandle = {
+          send,
+          stream: vi.fn(() => (async function* () {
+            streamCall += 1;
+            if (streamCall === 1) {
+              yield {
+                type: "system",
+                subtype: "init",
+                session_id: "sdk-session-idle-ttl",
+                slash_commands: [],
+              };
+              yield {
+                type: "result",
+                usage: { input_tokens: 1, output_tokens: 1 },
+              };
+              return;
+            }
+
+            yield {
+              type: "assistant",
+              session_id: "sdk-session-idle-ttl",
+              message: {
+                content: [{ type: "text", text: "Done." }],
+                usage: { input_tokens: 1, output_tokens: 1 },
+              },
+            };
+            yield {
+              type: "result",
+              usage: { input_tokens: 1, output_tokens: 1 },
+            };
+          })()),
+          close,
+          sessionId: "sdk-session-idle-ttl",
+          setPermissionMode,
+        };
+
+        vi.mocked(unstable_v2_createSession).mockReturnValue(sessionHandle as any);
+        vi.mocked(unstable_v2_resumeSession).mockReturnValue(sessionHandle as any);
+
+        const { service } = createService();
+        const session = await service.createSession({
+          laneId: "lane-1",
+          provider: "claude",
+          model: "sonnet",
+        });
+
+        await service.runSessionTurn({
+          sessionId: session.id,
+          text: "Say hi",
+          timeoutMs: 15_000,
+        });
+
+        await vi.advanceTimersByTimeAsync(6 * 60_000);
+
+        expect(close).toHaveBeenCalledTimes(1);
+      } finally {
+        vi.useRealTimers();
+      }
+    });
   });
 
   // --------------------------------------------------------------------------
diff --git a/apps/desktop/src/main/services/chat/agentChatService.ts b/apps/desktop/src/main/services/chat/agentChatService.ts
index a1af63518..ff2e421c9 100644
--- a/apps/desktop/src/main/services/chat/agentChatService.ts
+++ b/apps/desktop/src/main/services/chat/agentChatService.ts
@@ -56,6 +56,7 @@ import {
   resolvePathWithinRoot,
 } from "../shared/utils";
 import type { EpisodicSummaryService } from "../memory/episodicSummaryService";
+import { DEFAULT_FLUSH_PROMPT } from "../memory/compactionFlushPrompt";
 import {
   createDefaultComputerUsePolicy,
   normalizeComputerUsePolicy,
@@ -69,6 +70,7 @@ import type {
   AgentChatCodexConfigSource,
   AgentChatCodexSandbox,
   AgentChatCreateArgs,
+  AgentChatDeleteArgs,
   AgentChatDisposeArgs,
   AgentChatEditSteerArgs,
   AgentChatExecutionMode,
@@ -350,6 +352,16 @@ type ClaudeRuntime = {
   pauseIdleWatchdog?: (() => void) | null;
   /** Resume the active-turn idle watchdog after the blocking wait finishes. */
   resumeIdleWatchdog?: (() => void) | null;
+  /**
+   * Set while the SDK is running its auto-compaction flow. During compaction
+   * the PreCompact hook nudges the model to persist memories via MCP tools,
+   * which would normally surface an approval prompt. Auto-compaction runs
+   * without a user present, so we bypass MCP approvals while this is true.
+   * Reset by a timeout since the SDK does not emit a PostCompact signal.
+   */
+  compactionInProgress?: boolean;
+  /** Timer used to clear compactionInProgress after a reasonable window. */
+  compactionResetTimer?: ReturnType<typeof setTimeout> | null;
 };
 
 type PendingOpenCodeApproval = {
@@ -714,6 +726,8 @@ type ManagedChatSession = {
   preview: string | null;
   closed: boolean;
   endedNotified: boolean;
+  /** Set when deleteSession begins — persistence paths bail to avoid re-creating deleted files. */
+  deleted: boolean;
   ctoSessionStartedAt: string | null;
   pendingReconstructionContext: string | null;
   autoTitleSeed: string | null;
@@ -3238,10 +3252,15 @@ export function createAgentChatService(args: {
     // Surface approval prompts for non-bypass permission modes so the user can
     // allow or deny individual tool calls (matching the opencode runtime pattern).
     const effectivePermMode = managed.session.claudePermissionMode ?? "default";
-    if (claudeToolNeedsApproval(toolName, input, effectivePermMode)) {
+    const normalizedToolName = normalizeToolNameForApproval(toolName);
+    // During auto-compaction the PreCompact hook asks the model to persist
+    // memories via ADE MCP memory tools. No user is present to approve, so
+    // only those specific tools are auto-allowed — not every MCP tool.
+    const bypassForCompaction = runtime.compactionInProgress === true
+      && normalizedToolName.startsWith("mcp_ade_memory_");
+    if (!bypassForCompaction && claudeToolNeedsApproval(toolName, input, effectivePermMode)) {
       // Check session-wide overrides — user already said "Allow for Session" for this tool
-      const normalizedForOverride = normalizeToolNameForApproval(toolName);
-      if (runtime.approvalOverrides.has(normalizedForOverride)) {
+      if (runtime.approvalOverrides.has(normalizedToolName)) {
         return { behavior: "allow", updatedInput: input };
       }
 
@@ -3280,7 +3299,7 @@ export function createAgentChatService(args: {
       };
 
       emitPendingInputRequest(managed, request, {
-        kind: normalizedForOverride.includes("bash") ? "command" : "file_change",
+        kind: normalizedToolName.includes("bash") ? "command" : "file_change",
         description,
         detail: { tool: toolName, ...(sdkOptions?.blockedPath ? { blockedPath: sdkOptions.blockedPath } : {}) },
       });
@@ -3298,7 +3317,7 @@ export function createAgentChatService(args: {
 
       const approved = response.decision === "accept" || response.decision === "accept_for_session";
       if (response.decision === "accept_for_session") {
-        runtime.approvalOverrides.add(normalizedForOverride);
+        runtime.approvalOverrides.add(normalizedToolName);
       }
       if (approved) {
         return {
@@ -4307,6 +4326,7 @@ export function createAgentChatService(args: {
     managed: ManagedChatSession,
     args: { stage: "initial" | "final"; latestUserText?: string | null; summary?: string | null }
   ): Promise<void> => {
+    if (managed.deleted) return;
     const config = resolveChatConfig();
     if (!config.autoTitleEnabled) return;
     if (managed.manuallyNamed) return;
@@ -4805,7 +4825,47 @@ export function createAgentChatService(args: {
 
   const metadataPathFor = (sessionId: string): string => path.join(chatSessionsDir, `${sessionId}.json`);
 
+  const deletePersistedChatFile = (filePath: string | null | undefined): void => {
+    const trimmed = typeof filePath === "string" ? filePath.trim() : "";
+    if (!trimmed.length) return;
+    const resolvedPath = path.resolve(trimmed);
+    // Resolve symlinks on the target and both roots before comparing, so a
+    // symlink placed inside the chat dir cannot redirect rmSync outside.
+    const safeRealpath = (p: string): string | null => {
+      try { return fs.realpathSync(p); } catch { return null; }
+    };
+    const realTarget = safeRealpath(resolvedPath);
+    // Missing target is safe to skip — nothing to delete.
+    if (!realTarget) return;
+    const realAdeDir = safeRealpath(layout.adeDir);
+    const realTranscriptRoot = safeRealpath(path.resolve(transcriptsDir));
+    const isWithin = (root: string | null): boolean => {
+      if (!root) return false;
+      const rel = path.relative(root, realTarget);
+      return rel === "" || (!rel.startsWith("..") && !path.isAbsolute(rel));
+    };
+    if (!isWithin(realAdeDir) && !isWithin(realTranscriptRoot)) {
+      logger.warn("agent_chat.delete_skipped_path_outside_ade", {
+        filePath: resolvedPath,
+        realTarget,
+      });
+      return;
+    }
+    try {
+      fs.rmSync(realTarget, { force: true });
+    } catch (error) {
+      if (isEnoentError(error)) return;
+      logger.warn("agent_chat.delete_file_failed", {
+        filePath: realTarget,
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
+  };
+
   const persistChatState = (managed: ManagedChatSession): void => {
+    // Tombstoned sessions (deleted while async work was in flight) must not be
+    // re-persisted — otherwise the file recreates after deleteSession removed it.
+    if (managed.deleted) return;
     // When runtime has been torn down (null) but NOT intentionally invalidated,
     // fall back to the last persisted state so that provider session ids and
     // lastLaneDirectiveKey survive a transient teardown (e.g. app backgrounding).
@@ -5627,6 +5687,10 @@ export function createAgentChatService(args: {
       // Mark interrupted so the streaming catch block takes the graceful path
       managed.runtime.interrupted = true;
       cancelClaudeWarmup(managed, managed.runtime, "teardown");
+      if (managed.runtime.compactionResetTimer) {
+        clearTimeout(managed.runtime.compactionResetTimer);
+        managed.runtime.compactionResetTimer = null;
+      }
       try { managed.runtime.v2Session?.close(); } catch { /* ignore */ }
       managed.runtime.v2Session = null;
       managed.runtime.v2WarmupDone = null;
@@ -5724,6 +5788,7 @@ export function createAgentChatService(args: {
     managed: ManagedChatSession,
     deterministicSummary: string | null
   ): Promise<void> => {
+    if (managed.deleted) return;
     const config = resolveChatConfig();
     if (!config.summaryEnabled) return;
     if (managed.summaryInFlight) return;
@@ -5974,6 +6039,7 @@ export function createAgentChatService(args: {
       preview: row.lastOutputPreview ?? null,
       closed: row.status !== "running",
       endedNotified: row.status !== "running",
+      deleted: false,
       ctoSessionStartedAt: row.status === "running" ? row.startedAt : null,
       pendingReconstructionContext: null,
       autoTitleSeed: null,
@@ -7471,6 +7537,8 @@ export function createAgentChatService(args: {
               return event.properties.sessionID ?? null;
             case "command.executed":
               return event.properties.sessionID;
+            case "session.compacted":
+              return event.properties.sessionID;
             default:
               return null;
           }
@@ -7480,6 +7548,15 @@ export function createAgentChatService(args: {
           continue;
         }
 
+        if (event.type === "session.compacted") {
+          emitChatEvent(managed, {
+            type: "context_compact",
+            trigger: "auto",
+            turnId,
+          });
+          continue;
+        }
+
         if (event.type === "message.part.updated") {
           const { part, delta } = event.properties;
           markFirstStreamEvent(part.type);
@@ -8383,6 +8460,20 @@ export function createAgentChatService(args: {
       return completedTurnId;
     })();
 
+    if (itemType === "contextCompaction") {
+      // Codex emits contextCompaction via item/started + item/completed.
+      // Emit the boundary event once, on completion, so the UI badge matches
+      // Claude's post-compaction behavior.
+      if (eventKind === "completed") {
+        emitChatEvent(managed, {
+          type: "context_compact",
+          trigger: "auto",
+          turnId,
+        });
+      }
+      return;
+    }
+
     if (itemType === "commandExecution") {
       emitChatEvent(managed, {
         type: "activity",
@@ -9519,6 +9610,36 @@ export function createAgentChatService(args: {
       }
       opts.canUseTool = buildClaudeCanUseTool(runtime, managed) as any;
 
+      // PreCompact hook: nudge the model to save durable discoveries into
+      // ADE memory before the SDK compacts context. Runs inside the SDK's
+      // compaction flow so the text never surfaces as a visible user turn.
+      //
+      // Mark the runtime as in-compaction so the canUseTool gate auto-allows
+      // MCP memory tools the model calls in response to the flush prompt.
+      // Auto-compaction runs unattended; surfacing an approval prompt would
+      // hang the flow waiting on a user who may not be present. Flag is
+      // cleared by a timer since the SDK does not emit a PostCompact signal.
+      (opts as any).hooks = {
+        PreCompact: [
+          {
+            hooks: [
+              async () => {
+                runtime.compactionInProgress = true;
+                if (runtime.compactionResetTimer) clearTimeout(runtime.compactionResetTimer);
+                runtime.compactionResetTimer = setTimeout(() => {
+                  runtime.compactionInProgress = false;
+                  runtime.compactionResetTimer = null;
+                }, 60_000);
+                return {
+                  continue: true,
+                  systemMessage: DEFAULT_FLUSH_PROMPT,
+                };
+              },
+            ],
+          },
+        ],
+      };
+
       // Handle MCP elicitation requests (form input or OAuth URL flows).
       (opts as any).onElicitation = async (
         elicitReq: { serverName: string; message: string; mode?: "form" | "url"; url?: string; elicitationId?: string; requestedSchema?: Record<string, unknown> },
@@ -10171,6 +10292,7 @@ export function createAgentChatService(args: {
       preview: null,
       closed: false,
       endedNotified: false,
+      deleted: false,
       lastActivitySignature: null,
       bufferedReasoning: null,
       ctoSessionStartedAt: null,
@@ -10526,6 +10648,7 @@ export function createAgentChatService(args: {
       preview: null,
       closed: false,
       endedNotified: false,
+      deleted: false,
       ctoSessionStartedAt: identityKey === "cto" ? startedAt : null,
       pendingReconstructionContext: null,
       autoTitleSeed: null,
@@ -13102,6 +13225,79 @@ export function createAgentChatService(args: {
     });
   };
 
+  const deleteSession = async ({ sessionId }: AgentChatDeleteArgs): Promise<void> => {
+    const trimmedSessionId = typeof sessionId === "string" ? sessionId.trim() : "";
+    if (!trimmedSessionId.length) {
+      throw new Error("Chat session id is required.");
+    }
+
+    const existing = sessionService.get(trimmedSessionId);
+    if (!existing) {
+      throw new Error(`Chat session '${trimmedSessionId}' was not found.`);
+    }
+    if (!isChatToolType(existing.toolType)) {
+      throw new Error(`Session '${trimmedSessionId}' is not an agent chat session.`);
+    }
+
+    // Tombstone the session before any async work so in-flight persistence
+    // (auto-title, summary, chat state writes) bails instead of recreating files.
+    // We do NOT set endedNotified here — dispose() still needs to run finishSession
+    // so sessionService.end fires.
+    const tombstoned = managedSessions.get(trimmedSessionId);
+    if (tombstoned) {
+      tombstoned.deleted = true;
+    }
+
+    if (existing.status === "running") {
+      await dispose({ sessionId: trimmedSessionId });
+    }
+
+    const current = sessionService.get(trimmedSessionId);
+    if (!current) return;
+
+    const activeCollector = sessionTurnCollectors.get(trimmedSessionId);
+    if (activeCollector) {
+      if (activeCollector.timeout) {
+        clearTimeout(activeCollector.timeout);
+      }
+      sessionTurnCollectors.delete(trimmedSessionId);
+      activeCollector.reject(new Error(`Chat session '${trimmedSessionId}' was deleted.`));
+    }
+
+    const managed = managedSessions.get(trimmedSessionId);
+    if (managed) {
+      // Resolve any outstanding input waiters (plan approvals, questions, etc.)
+      // so callers awaiting them unblock with a cancellation instead of hanging
+      // forever once the session is gone.
+      for (const pending of managed.localPendingInputs.values()) {
+        pending.resolve({ decision: "cancel" });
+      }
+      managed.localPendingInputs.clear();
+      managed.deleted = true;
+      managed.closed = true;
+      managed.endedNotified = true;
+      managed.ctoSessionStartedAt = null;
+      clearSubagentSnapshots(trimmedSessionId);
+      teardownRuntime(managed, "ended_session");
+      managedSessions.delete(trimmedSessionId);
+    } else {
+      clearSubagentSnapshots(trimmedSessionId);
+    }
+
+    const persistedMetadataPath = metadataPathFor(trimmedSessionId);
+    const dedicatedTranscriptPath = path.join(chatTranscriptsDir, `${trimmedSessionId}.jsonl`);
+    const transcriptPaths = new Set<string>([
+      persistedMetadataPath,
+      dedicatedTranscriptPath,
+      current.transcriptPath,
+    ]);
+    for (const filePath of transcriptPaths) {
+      deletePersistedChatFile(filePath);
+    }
+
+    sessionService.deleteSession(trimmedSessionId);
+  };
+
   const disposeAll = async (): Promise<void> => {
     clearInterval(sessionCleanupTimer);
     for (const sessionId of [...managedSessions.keys()]) {
@@ -13120,8 +13316,8 @@ export function createAgentChatService(args: {
       if (
         managed.runtime
         && !managed.closed
-        // Keep Claude sessions warm until the user explicitly ends them.
-        && managed.runtime.kind !== "claude"
+        && managed.session.status === "idle"
+        && !hasLivePendingInput(managed)
         && now - managed.lastActivityTimestamp > SESSION_INACTIVITY_TIMEOUT_MS
       ) {
         teardownRuntime(managed, "idle_ttl");
@@ -13138,9 +13334,8 @@ export function createAgentChatService(args: {
     for (const [id, managed] of managedSessions) {
       if (id === excludeSessionId) continue;
       if (!managed.runtime) continue;
-      // Claude V2 runtimes keep their in-memory session state and should not be
-      // evicted behind the user's back.
-      if (managed.runtime.kind === "claude") continue;
+      if (managed.session.status !== "idle") continue;
+      if (hasLivePendingInput(managed)) continue;
       if (managed.lastActivityTimestamp < oldestTimestamp) {
         oldestTimestamp = managed.lastActivityTimestamp;
         oldest = managed;
@@ -13897,6 +14092,7 @@ export function createAgentChatService(args: {
     getSlashCommands,
     codexFuzzyFileSearch,
     dispose,
+    deleteSession,
     disposeAll,
     updateSession,
     warmupModel,
diff --git a/apps/desktop/src/main/services/feedback/feedbackReporterService.test.ts b/apps/desktop/src/main/services/feedback/feedbackReporterService.test.ts
index 185e80419..bf82c0661 100644
--- a/apps/desktop/src/main/services/feedback/feedbackReporterService.test.ts
+++ b/apps/desktop/src/main/services/feedback/feedbackReporterService.test.ts
@@ -33,118 +33,87 @@ describe("createFeedbackReporterService", () => {
     vi.clearAllMocks();
   });
 
-  it("posts successfully when the model wraps JSON in prose", async () => {
+  it("prepares a deterministic bug body and uses AI for title and labels when available", async () => {
     const db = createDb();
     const logger = createLogger();
     const executeTask = vi.fn(async () => ({
       text: [
-        "I reviewed the request. Here is the issue:",
+        "Here is the metadata:",
         "```json",
         JSON.stringify({
-          title: "Improve failed submission details in feedback reporter",
-          body: "## Description\n\nShow the saved error in My Submissions.",
-          labels: ["bug"],
+          title: "Failed submissions should show the error reason",
+          labels: ["bug", "documentation"],
         }),
         "```",
       ].join("\n"),
       structuredOutput: null,
     }));
-    const apiRequest = vi.fn(async () => ({
-      data: {
-        html_url: "https://github.com/arul28/ADE/issues/999",
-        number: 999,
-      },
-    }));
 
     const service = createFeedbackReporterService({
       db: db as any,
       logger: logger as any,
       projectRoot: "/Users/admin/Projects/ADE",
       aiIntegrationService: { executeTask } as any,
-      githubService: { apiRequest } as any,
+      githubService: { apiRequest: vi.fn() } as any,
     });
 
-    service.submit({
-      category: "bug",
-      userDescription: "The failed submission view should show the saved error.",
+    const draft = await service.prepareDraft({
       modelId: "anthropic/claude-opus-4-6",
+      draftInput: {
+        category: "bug",
+        summary: "Failed submissions should show the error reason.",
+        stepsToReproduce: "1. Submit a report\n2. Force GitHub failure",
+        expectedBehavior: "Show the saved error.",
+        actualBehavior: "Only a failed badge is visible.",
+        environment: "ADE Desktop on macOS",
+        additionalContext: "The issue is easier to debug when the saved payload is visible.",
+      },
     });
 
-    await vi.waitFor(() => {
-      expect(apiRequest).toHaveBeenCalledTimes(1);
-    });
-
-    const [submission] = service.list();
-    expect(submission?.status).toBe("posted");
-    expect(submission?.generatedTitle).toBe("Improve failed submission details in feedback reporter");
-    expect(submission?.generatedBody).toContain("Show the saved error");
-    expect(submission?.issueNumber).toBe(999);
-    expect(logger.warn).not.toHaveBeenCalledWith("feedback.generated_with_fallback", expect.anything());
+    expect(draft.generationMode).toBe("ai_assisted");
+    expect(draft.generationWarning).toBeNull();
+    expect(draft.title).toBe("Failed submissions should show the error reason");
+    expect(draft.labels).toEqual(["bug", "documentation"]);
+    expect(draft.body).toContain("## Steps to Reproduce");
+    expect(draft.body).toContain("Only a failed badge is visible.");
+    expect(draft.body).toContain("## Additional Context");
   });
 
-  it("falls back to a deterministic issue draft when the model output is unusable", async () => {
+  it("prepares a deterministic draft when no AI model is selected", async () => {
     const db = createDb();
     const logger = createLogger();
-    const executeTask = vi.fn(async () => ({
-      text: "I could not comply with the requested format, but the report seems valid.",
-      structuredOutput: null,
-    }));
-    const apiRequest = vi.fn(async () => ({
-      data: {
-        html_url: "https://github.com/arul28/ADE/issues/1000",
-        number: 1000,
-      },
-    }));
+    const executeTask = vi.fn();
 
     const service = createFeedbackReporterService({
       db: db as any,
       logger: logger as any,
       projectRoot: "/Users/admin/Projects/ADE",
       aiIntegrationService: { executeTask } as any,
-      githubService: { apiRequest } as any,
-    });
-
-    service.submit({
-      category: "enhancement",
-      userDescription: "The previous submissions tab should expand each report and show the original text.",
-      modelId: "anthropic/claude-opus-4-6",
+      githubService: { apiRequest: vi.fn() } as any,
     });
 
-    await vi.waitFor(() => {
-      expect(apiRequest).toHaveBeenCalledTimes(1);
+    const draft = await service.prepareDraft({
+      draftInput: {
+        category: "enhancement",
+        summary: "Make previous submissions expandable.",
+        useCase: "Inspect what was posted and why it failed.",
+        proposedSolution: "Show a preview panel before posting.",
+        alternativesConsidered: "",
+        additionalContext: "",
+      },
     });
 
-    const [submission] = service.list();
-    expect(submission?.status).toBe("posted");
-    expect(submission?.generatedTitle).toContain("previous submissions tab");
-    expect(submission?.generatedBody).toContain("## Description");
-    expect(submission?.generatedBody).toContain("## Proposed Solution");
-    const request = (apiRequest as any).mock.calls[0]?.[0] as { body?: { labels?: string[] } } | undefined;
-    expect(request?.body?.labels).toEqual(["enhancement"]);
-    expect(logger.warn).toHaveBeenCalledWith(
-      "feedback.generated_with_fallback",
-      expect.objectContaining({
-        category: "enhancement",
-        modelId: "anthropic/claude-opus-4-6",
-      }),
-    );
+    expect(executeTask).not.toHaveBeenCalled();
+    expect(draft.generationMode).toBe("deterministic");
+    expect(draft.generationWarning).toContain("no AI model was selected");
+    expect(draft.title).toBe("Make previous submissions expandable.");
+    expect(draft.labels).toEqual(["enhancement"]);
+    expect(draft.body).toContain("## Proposed Solution");
   });
 
-  it("stores a stage-specific error when GitHub posting fails", async () => {
+  it("stores a failed submission when GitHub posting fails", async () => {
     const db = createDb();
     const logger = createLogger();
-    const executeTask = vi.fn(async () => ({
-      text: JSON.stringify({
-        title: "Improve feedback reporter determinism",
-        body: "## Description\n\nDeterministic fallback formatting.",
-        labels: ["bug"],
-      }),
-      structuredOutput: {
-        title: "Improve feedback reporter determinism",
-        body: "## Description\n\nDeterministic fallback formatting.",
-        labels: ["bug"],
-      },
-    }));
     const apiRequest = vi.fn(async () => {
       throw new Error("GitHub API unavailable");
     });
@@ -153,24 +122,40 @@ describe("createFeedbackReporterService", () => {
       db: db as any,
       logger: logger as any,
       projectRoot: "/Users/admin/Projects/ADE",
-      aiIntegrationService: { executeTask } as any,
+      aiIntegrationService: { executeTask: vi.fn() } as any,
       githubService: { apiRequest } as any,
     });
 
-    service.submit({
-      category: "bug",
-      userDescription: "Posting should preserve the generated content if GitHub fails.",
-      modelId: "anthropic/claude-opus-4-6",
-    });
-
-    await vi.waitFor(() => {
-      const [submission] = service.list();
-      expect(submission?.status).toBe("failed");
+    const submission = await service.submitPreparedDraft({
+      draft: {
+        category: "bug",
+        draftInput: {
+          category: "bug",
+          summary: "Posting should preserve the prepared draft.",
+          stepsToReproduce: "1. Prepare draft",
+          expectedBehavior: "Keep the reviewed draft when post fails.",
+          actualBehavior: "GitHub rejects the request.",
+          environment: "ADE Desktop",
+          additionalContext: "",
+        },
+        userDescription: "## Summary\n\nPosting should preserve the prepared draft.",
+        modelId: "anthropic/claude-opus-4-6",
+        reasoningEffort: null,
+        title: "Preserve reviewed drafts when GitHub posting fails",
+        body: "## Description\n\nDeterministic body.",
+        labels: ["bug"],
+        generationMode: "ai_assisted",
+        generationWarning: null,
+      },
+      title: "Preserve reviewed drafts when GitHub posting fails",
+      body: "## Description\n\nDeterministic body.",
+      labels: ["bug"],
     });
 
-    const [submission] = service.list();
-    expect(submission?.generatedTitle).toBe("Improve feedback reporter determinism");
-    expect(submission?.error).toBe("Posting failed: GitHub API unavailable");
+    expect(submission.generatedTitle).toBe("Preserve reviewed drafts when GitHub posting fails");
+    expect(submission.generationMode).toBe("ai_assisted");
+    expect(submission.status).toBe("failed");
+    expect(submission.error).toBe("Posting failed: GitHub API unavailable");
     expect(logger.error).toHaveBeenCalledWith(
       "feedback.failed",
       expect.objectContaining({
@@ -178,4 +163,55 @@ describe("createFeedbackReporterService", () => {
       }),
     );
   });
+
+  it("stores a posted submission after a reviewed draft is submitted", async () => {
+    const db = createDb();
+    const logger = createLogger();
+    const apiRequest = vi.fn(async () => ({
+      data: {
+        html_url: "https://github.com/arul28/ADE/issues/999",
+        number: 999,
+      },
+    }));
+
+    const service = createFeedbackReporterService({
+      db: db as any,
+      logger: logger as any,
+      projectRoot: "/Users/admin/Projects/ADE",
+      aiIntegrationService: { executeTask: vi.fn() } as any,
+      githubService: { apiRequest } as any,
+    });
+
+    const submission = await service.submitPreparedDraft({
+      draft: {
+        category: "question",
+        draftInput: {
+          category: "question",
+          summary: "Clarify what happens when feedback posting fails.",
+          context: "Users currently only see a failed badge.",
+          expectedGuidance: "Explain the failure and preserve the draft.",
+          additionalContext: "",
+        },
+        userDescription: "## Summary\n\nClarify what happens when feedback posting fails.",
+        modelId: null,
+        reasoningEffort: null,
+        title: "Clarify failed feedback submission behavior",
+        body: "## Description\n\nExplain the failure state.",
+        labels: ["question"],
+        generationMode: "deterministic",
+        generationWarning: "ADE used a deterministic draft because no AI model was selected.",
+      },
+      title: "Clarify failed feedback submission behavior",
+      body: "## Description\n\nExplain the failure state.",
+      labels: ["question"],
+    });
+
+    expect(submission.status).toBe("posted");
+    expect(submission.issueNumber).toBe(999);
+    expect(submission.modelId).toBeNull();
+    expect(logger.info).toHaveBeenCalledWith(
+      "feedback.posted",
+      expect.objectContaining({ issueNumber: 999 }),
+    );
+  });
 });
diff --git a/apps/desktop/src/main/services/feedback/feedbackReporterService.ts b/apps/desktop/src/main/services/feedback/feedbackReporterService.ts
index 7d8031170..53cc4f3e9 100644
--- a/apps/desktop/src/main/services/feedback/feedbackReporterService.ts
+++ b/apps/desktop/src/main/services/feedback/feedbackReporterService.ts
@@ -7,9 +7,14 @@ import type { createAiIntegrationService } from "../ai/aiIntegrationService";
 import type { createGithubService } from "../github/githubService";
 import { parseStructuredOutput } from "../ai/utils";
 import type {
+  FeedbackCategory,
+  FeedbackDraftInput,
+  FeedbackGenerationMode,
+  FeedbackPreparedDraft,
+  FeedbackPrepareDraftArgs,
   FeedbackSubmission,
-  FeedbackSubmitArgs,
   FeedbackSubmissionEvent,
+  FeedbackSubmitDraftArgs,
 } from "../../../shared/types/feedback";
 
 const DB_KEY = "feedback:submissions";
@@ -17,24 +22,27 @@ const ALLOWED_LABELS = new Set([
   "bug", "enhancement", "question", "documentation",
   "good first issue", "help wanted", "invalid", "wontfix",
 ]);
-const FEEDBACK_ISSUE_JSON_SCHEMA = {
+const FEEDBACK_METADATA_JSON_SCHEMA = {
   type: "object",
   additionalProperties: false,
   properties: {
     title: { type: "string" },
-    body: { type: "string" },
     labels: {
       type: "array",
       items: { type: "string" },
     },
   },
-  required: ["title", "body", "labels"],
+  required: ["title", "labels"],
 } as const;
 
-type FeedbackIssueDraft = {
+const DETERMINISTIC_NO_MODEL_WARNING = "ADE used a deterministic draft because no AI model was selected. Review the generated title and labels before posting.";
+const DETERMINISTIC_FORMAT_WARNING = "ADE used a deterministic draft because the AI title and label suggestion did not match the expected structured format.";
+
+type FeedbackMetadataSuggestion = {
   title: string;
-  body: string;
   labels: string[];
+  generationMode: FeedbackGenerationMode;
+  generationWarning: string | null;
 };
 
 function nowIso(): string {
@@ -49,6 +57,10 @@ function normalizeWhitespace(value: string): string {
   return value.replace(/\s+/g, " ").trim();
 }
 
+function normalizeMultiline(value: unknown): string {
+  return typeof value === "string" ? value.trim() : "";
+}
+
 function clampText(value: string, maxLength: number): string {
   const trimmed = normalizeWhitespace(value);
   if (trimmed.length <= maxLength) return trimmed;
@@ -60,7 +72,7 @@ function titleCaseFirst(value: string): string {
   return value[0]!.toUpperCase() + value.slice(1);
 }
 
-function defaultLabelsForCategory(category: FeedbackSubmission["category"]): string[] {
+function defaultLabelsForCategory(category: FeedbackCategory): string[] {
   switch (category) {
     case "bug":
       return ["bug"];
@@ -72,10 +84,7 @@ function defaultLabelsForCategory(category: FeedbackSubmission["category"]): str
   }
 }
 
-function normalizeLabels(
-  category: FeedbackSubmission["category"],
-  labels: unknown,
-): string[] {
+function normalizeLabels(category: FeedbackCategory, labels: unknown): string[] {
   const normalized = Array.isArray(labels)
     ? labels
       .map((value) => String(value ?? "").trim().toLowerCase())
@@ -85,104 +94,156 @@ function normalizeLabels(
   return Array.from(new Set(combined));
 }
 
-function fallbackTitle(submission: FeedbackSubmission): string {
-  const firstLine = submission.userDescription
-    .split(/\r?\n/)
-    .map((line) => normalizeWhitespace(line))
-    .find((line) => line.length > 0);
-  const candidate = firstLine && firstLine.length > 0
-    ? firstLine
-    : `${submission.category} report`;
-  return titleCaseFirst(clampText(candidate, 90));
+type SectionHeadings = {
+  summary: string;
+  bug: { steps: string; expected: string; actual: string; environment: string };
+  feature: { useCase: string; proposed: string; alternatives: string };
+  question: { context: string; guidance: string };
+  additional: string;
+};
+
+const USER_DESCRIPTION_HEADINGS: SectionHeadings = {
+  summary: "Summary",
+  bug: {
+    steps: "Steps to reproduce",
+    expected: "Expected behavior",
+    actual: "Actual behavior",
+    environment: "Environment",
+  },
+  feature: {
+    useCase: "Use case",
+    proposed: "Proposed solution",
+    alternatives: "Alternatives considered",
+  },
+  question: {
+    context: "Context",
+    guidance: "Expected guidance",
+  },
+  additional: "Additional context",
+};
+
+const ISSUE_BODY_HEADINGS: SectionHeadings = {
+  summary: "Description",
+  bug: {
+    steps: "Steps to Reproduce",
+    expected: "Expected Behavior",
+    actual: "Actual Behavior",
+    environment: "Environment",
+  },
+  feature: {
+    useCase: "Use Case",
+    proposed: "Proposed Solution",
+    alternatives: "Alternatives Considered",
+  },
+  question: {
+    context: "Context",
+    guidance: "Expected Guidance",
+  },
+  additional: "Additional Context",
+};
+
+function appendSection(lines: string[], heading: string, value: string): void {
+  lines.push(`## ${heading}`, "", value.length > 0 ? value : "Not provided.", "");
 }
 
-function fallbackBody(submission: FeedbackSubmission): string {
-  const description = submission.userDescription.trim();
-  switch (submission.category) {
+function normalizeDraftInput(input: FeedbackDraftInput): FeedbackDraftInput {
+  const summary = normalizeMultiline(input.summary);
+  const additionalContext = normalizeMultiline(input.additionalContext);
+  switch (input.category) {
     case "bug":
-      return [
-        "## Description",
-        "",
-        description,
-        "",
-        "## Steps to Reproduce",
-        "",
-        "Not provided.",
-        "",
-        "## Expected Behavior",
-        "",
-        "Not provided.",
-        "",
-        "## Actual Behavior",
-        "",
-        "Not provided.",
-        "",
-        "## Environment",
-        "",
-        "- App: ADE Desktop",
-        `- Model: ${submission.modelId}`,
-      ].join("\n");
+      return {
+        category: "bug",
+        summary,
+        stepsToReproduce: normalizeMultiline(input.stepsToReproduce),
+        expectedBehavior: normalizeMultiline(input.expectedBehavior),
+        actualBehavior: normalizeMultiline(input.actualBehavior),
+        environment: normalizeMultiline(input.environment),
+        additionalContext,
+      };
+    case "feature":
+    case "enhancement":
+      return {
+        category: input.category,
+        summary,
+        useCase: normalizeMultiline(input.useCase),
+        proposedSolution: normalizeMultiline(input.proposedSolution),
+        alternativesConsidered: normalizeMultiline(input.alternativesConsidered),
+        additionalContext,
+      };
     case "question":
-      return [
-        "## Description",
-        "",
-        description,
-        "",
-        "## Context",
-        "",
-        "Not provided.",
-        "",
-        "## Expected Guidance",
-        "",
-        "Not provided.",
-      ].join("\n");
+      return {
+        category: "question",
+        summary,
+        context: normalizeMultiline(input.context),
+        expectedGuidance: normalizeMultiline(input.expectedGuidance),
+        additionalContext,
+      };
+  }
+}
+
+function renderSections(input: FeedbackDraftInput, headings: SectionHeadings): string {
+  const lines: string[] = [];
+  appendSection(lines, headings.summary, input.summary);
+  switch (input.category) {
+    case "bug":
+      appendSection(lines, headings.bug.steps, normalizeMultiline(input.stepsToReproduce));
+      appendSection(lines, headings.bug.expected, normalizeMultiline(input.expectedBehavior));
+      appendSection(lines, headings.bug.actual, normalizeMultiline(input.actualBehavior));
+      appendSection(lines, headings.bug.environment, normalizeMultiline(input.environment));
+      break;
     case "feature":
     case "enhancement":
-      return [
-        "## Description",
-        "",
-        description,
-        "",
-        "## Use Case",
-        "",
-        "Not provided.",
-        "",
-        "## Proposed Solution",
-        "",
-        "Not provided.",
-        "",
-        "## Alternatives Considered",
-        "",
-        "Not provided.",
-      ].join("\n");
+      appendSection(lines, headings.feature.useCase, normalizeMultiline(input.useCase));
+      appendSection(lines, headings.feature.proposed, normalizeMultiline(input.proposedSolution));
+      appendSection(lines, headings.feature.alternatives, normalizeMultiline(input.alternativesConsidered));
+      break;
+    case "question":
+      appendSection(lines, headings.question.context, normalizeMultiline(input.context));
+      appendSection(lines, headings.question.guidance, normalizeMultiline(input.expectedGuidance));
+      break;
+  }
+  const additional = normalizeMultiline(input.additionalContext);
+  if (additional.length > 0) {
+    appendSection(lines, headings.additional, additional);
   }
+  while (lines.length > 0 && lines[lines.length - 1] === "") {
+    lines.pop();
+  }
+  return lines.join("\n");
 }
 
-function normalizeIssueDraft(
-  submission: FeedbackSubmission,
-  structuredOutput: unknown,
-): { draft: FeedbackIssueDraft; usedFallback: boolean } {
-  const candidate = isRecord(structuredOutput) ? structuredOutput : null;
-  const title =
-    typeof candidate?.title === "string" && candidate.title.trim().length > 0
-      ? candidate.title.trim()
-      : fallbackTitle(submission);
-  const body =
-    typeof candidate?.body === "string" && candidate.body.trim().length > 0
-      ? candidate.body.trim()
-      : fallbackBody(submission);
-  const labels = normalizeLabels(submission.category, candidate?.labels);
-  const usedFallback = candidate == null
-    || title === fallbackTitle(submission)
-    || body === fallbackBody(submission);
+function buildUserDescription(input: FeedbackDraftInput): string {
+  return renderSections(input, USER_DESCRIPTION_HEADINGS);
+}
+
+function buildIssueBody(input: FeedbackDraftInput): string {
+  return renderSections(input, ISSUE_BODY_HEADINGS);
+}
+
+function fallbackTitleForInput(input: FeedbackDraftInput): string {
+  const candidate = input.summary.length > 0 ? input.summary : `${input.category} report`;
+  return titleCaseFirst(clampText(candidate, 90));
+}
+
+function normalizeGenerationWarning(value: unknown): string | null {
+  const warning = typeof value === "string" ? value.trim() : "";
+  return warning.length > 0 ? warning : null;
+}
+
+function normalizeGenerationMode(value: unknown): FeedbackGenerationMode | null {
+  if (value === "ai_assisted" || value === "deterministic") return value;
+  if (value === "ai_structured") return "ai_assisted";
+  if (value === "fallback_template") return "deterministic";
+  return null;
+}
 
+function normalizeStoredSubmission(submission: FeedbackSubmission): FeedbackSubmission {
   return {
-    draft: {
-      title,
-      body,
-      labels,
-    },
-    usedFallback,
+    ...submission,
+    modelId: pickTrimmed(submission.modelId),
+    reasoningEffort: submission.reasoningEffort ?? null,
+    generationMode: normalizeGenerationMode(submission.generationMode),
+    generationWarning: normalizeGenerationWarning(submission.generationWarning),
   };
 }
 
@@ -196,41 +257,84 @@ function emitUpdate(submission: FeedbackSubmission): void {
   }
 }
 
-const SYSTEM_PROMPT_BUG = `You are a GitHub issue writer for the ADE open-source project (github.com/arul28/ADE).
-The user is reporting a bug. Generate a well-structured GitHub issue.
-
-Use this format:
-- Title: a concise summary of the bug
-- Body (GitHub-flavored markdown):
-  ## Description
-  ## Steps to Reproduce
-  ## Expected Behavior
-  ## Actual Behavior
-  ## Environment
-
-Apply appropriate labels from: bug, enhancement, question, documentation, good first issue, help wanted, invalid, wontfix.
-For bug reports, always include the "bug" label.
-
-Respond with ONLY valid JSON (no markdown fences): { "title": string, "body": string, "labels": string[] }`;
-
-const SYSTEM_PROMPT_FEATURE = `You are a GitHub issue writer for the ADE open-source project (github.com/arul28/ADE).
-The user is requesting a feature or enhancement. Generate a well-structured GitHub issue.
-
-Use this format:
-- Title: a concise summary of the request
-- Body (GitHub-flavored markdown):
-  ## Description
-  ## Use Case
-  ## Proposed Solution
-  ## Alternatives Considered
+const METADATA_SYSTEM_PROMPT = `You help convert structured ADE feedback into GitHub issue metadata.
+
+Return ONLY valid JSON with:
+- title: a concise GitHub issue title
+- labels: an array of allowed GitHub labels
+
+Allowed labels: bug, enhancement, question, documentation, good first issue, help wanted, invalid, wontfix.
+Use only details present in the provided structured fields and deterministic issue body. Do not invent missing sections or behavior.`;
+
+function buildMetadataPrompt(input: FeedbackDraftInput, body: string): string {
+  return [
+    `Category: ${input.category}`,
+    "",
+    "Structured input:",
+    JSON.stringify(input, null, 2),
+    "",
+    "Deterministic issue body:",
+    body,
+    "",
+    "Suggest the best title and labels for this issue.",
+  ].join("\n");
+}
 
-Apply appropriate labels from: bug, enhancement, question, documentation, good first issue, help wanted, invalid, wontfix.
-For features use "enhancement". For questions use "question".
+function normalizeMetadataSuggestion(
+  category: FeedbackCategory,
+  fallbackTitle: string,
+  structuredOutput: unknown,
+): FeedbackMetadataSuggestion {
+  const candidate = isRecord(structuredOutput) ? structuredOutput : null;
+  const aiTitle = typeof candidate?.title === "string" ? candidate.title.trim() : "";
+  if (aiTitle.length === 0) {
+    return {
+      title: fallbackTitle,
+      labels: defaultLabelsForCategory(category),
+      generationMode: "deterministic",
+      generationWarning: DETERMINISTIC_FORMAT_WARNING,
+    };
+  }
+  return {
+    title: aiTitle,
+    labels: normalizeLabels(category, candidate?.labels),
+    generationMode: "ai_assisted",
+    generationWarning: null,
+  };
+}
 
-Respond with ONLY valid JSON (no markdown fences): { "title": string, "body": string, "labels": string[] }`;
+function pickTrimmed(...candidates: (string | null | undefined)[]): string | null {
+  for (const candidate of candidates) {
+    if (typeof candidate !== "string") continue;
+    const trimmed = candidate.trim();
+    if (trimmed.length > 0) return trimmed;
+  }
+  return null;
+}
 
-function systemPromptForCategory(category: FeedbackSubmission["category"]): string {
-  return category === "bug" ? SYSTEM_PROMPT_BUG : SYSTEM_PROMPT_FEATURE;
+function normalizePreparedDraft(
+  draft: FeedbackPreparedDraft,
+  overrides?: { title?: string; body?: string; labels?: string[] },
+): FeedbackPreparedDraft {
+  const draftInput = normalizeDraftInput(draft.draftInput);
+  const category = draftInput.category;
+  const fallbackTitle = fallbackTitleForInput(draftInput);
+  const userDescription = pickTrimmed(draft.userDescription) ?? buildUserDescription(draftInput);
+  const title = pickTrimmed(overrides?.title, draft.title) ?? fallbackTitle;
+  const body = pickTrimmed(overrides?.body, draft.body) ?? buildIssueBody(draftInput);
+  const labels = normalizeLabels(category, overrides?.labels ?? draft.labels);
+  return {
+    category,
+    draftInput,
+    userDescription,
+    modelId: pickTrimmed(draft.modelId),
+    reasoningEffort: draft.reasoningEffort ?? null,
+    title,
+    body,
+    labels,
+    generationMode: normalizeGenerationMode(draft.generationMode) ?? "deterministic",
+    generationWarning: normalizeGenerationWarning(draft.generationWarning),
+  };
 }
 
 export function createFeedbackReporterService({
@@ -247,12 +351,12 @@ export function createFeedbackReporterService({
   githubService: ReturnType<typeof createGithubService>;
 }) {
   function loadAll(): FeedbackSubmission[] {
-    return db.getJson<FeedbackSubmission[]>(DB_KEY) ?? [];
+    return (db.getJson<FeedbackSubmission[]>(DB_KEY) ?? []).map(normalizeStoredSubmission);
   }
 
   function save(submission: FeedbackSubmission): void {
     const all = loadAll();
-    const idx = all.findIndex((s) => s.id === submission.id);
+    const idx = all.findIndex((entry) => entry.id === submission.id);
     if (idx >= 0) {
       all[idx] = submission;
     } else {
@@ -261,120 +365,93 @@ export function createFeedbackReporterService({
     db.setJson(DB_KEY, all);
   }
 
-  async function runSubmission(submission: FeedbackSubmission): Promise<void> {
-    try {
-      // -- Generate --
-      submission.status = "generating";
-      save(submission);
-      emitUpdate(submission);
-
-      let normalizedDraft: FeedbackIssueDraft;
+  async function prepareDraft(args: FeedbackPrepareDraftArgs): Promise<FeedbackPreparedDraft> {
+    const draftInput = normalizeDraftInput(args.draftInput);
+    const category = draftInput.category;
+    const body = buildIssueBody(draftInput);
+    const userDescription = buildUserDescription(draftInput);
+    const fallbackTitle = fallbackTitleForInput(draftInput);
+    const modelId = pickTrimmed(args.modelId);
+    const reasoningEffort = args.reasoningEffort ?? null;
+
+    let title = fallbackTitle;
+    let labels = defaultLabelsForCategory(category);
+    let generationMode: FeedbackGenerationMode = "deterministic";
+    let generationWarning: string | null = modelId ? DETERMINISTIC_FORMAT_WARNING : DETERMINISTIC_NO_MODEL_WARNING;
+
+    if (modelId) {
       try {
         const result = await aiIntegrationService.executeTask({
           feature: "pr_descriptions",
           taskType: "pr_description",
-          prompt: `Category: ${submission.category}\n\nUser description:\n${submission.userDescription}`,
-          systemPrompt: systemPromptForCategory(submission.category),
+          prompt: buildMetadataPrompt(draftInput, body),
+          systemPrompt: METADATA_SYSTEM_PROMPT,
           cwd: projectRoot,
-          model: submission.modelId,
-          jsonSchema: FEEDBACK_ISSUE_JSON_SCHEMA,
+          model: modelId,
+          jsonSchema: FEEDBACK_METADATA_JSON_SCHEMA,
           permissionMode: "read-only",
           oneShot: true,
-          timeoutMs: 300_000,
-          ...(submission.reasoningEffort ? { reasoningEffort: submission.reasoningEffort } : {}),
+          timeoutMs: 120_000,
+          ...(reasoningEffort ? { reasoningEffort } : {}),
         });
-
-        const structuredCandidate = result.structuredOutput ?? parseStructuredOutput(result.text);
-        const normalized = normalizeIssueDraft(submission, structuredCandidate);
-        normalizedDraft = normalized.draft;
-
-        if (normalized.usedFallback) {
-          logger.warn("feedback.generated_with_fallback", {
-            id: submission.id,
-            category: submission.category,
-            modelId: submission.modelId,
+        const suggestion = normalizeMetadataSuggestion(
+          category,
+          fallbackTitle,
+          result.structuredOutput ?? parseStructuredOutput(result.text),
+        );
+        title = suggestion.title;
+        labels = suggestion.labels;
+        generationMode = suggestion.generationMode;
+        generationWarning = suggestion.generationWarning;
+        if (suggestion.generationMode === "deterministic") {
+          logger.warn("feedback.draft_generated_deterministically", {
+            category,
+            modelId,
           });
         }
-
-        submission.generatedTitle = normalized.draft.title;
-        submission.generatedBody = normalized.draft.body;
       } catch (error: unknown) {
         const message = error instanceof Error ? error.message : String(error);
-        logger.warn("feedback.generation_failed_using_fallback", {
-          id: submission.id,
-          category: submission.category,
-          modelId: submission.modelId,
+        logger.warn("feedback.draft_ai_failed_using_deterministic", {
+          category,
+          modelId,
           error: message,
         });
-        normalizedDraft = {
-          title: fallbackTitle(submission),
-          body: fallbackBody(submission),
-          labels: defaultLabelsForCategory(submission.category),
-        };
-        submission.generatedTitle = normalizedDraft.title;
-        submission.generatedBody = normalizedDraft.body;
+        generationWarning = `ADE used a deterministic draft because AI title and label suggestion failed: ${message}`;
       }
-
-      // -- Post to GitHub --
-      submission.status = "posting";
-      save(submission);
-      emitUpdate(submission);
-
-      try {
-        const { data } = await githubService.apiRequest<{
-          html_url: string;
-          number: number;
-        }>({
-          method: "POST",
-          path: "/repos/arul28/ADE/issues",
-          body: {
-            title: normalizedDraft.title,
-            body: normalizedDraft.body,
-            labels: normalizedDraft.labels,
-          },
-        });
-
-        submission.issueUrl = data.html_url;
-        submission.issueNumber = data.number;
-        submission.issueState = "open";
-        submission.status = "posted";
-        submission.completedAt = nowIso();
-        save(submission);
-        emitUpdate(submission);
-
-        logger.info("feedback.posted", {
-          id: submission.id,
-          issueNumber: data.number,
-        });
-      } catch (error: unknown) {
-        const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`Posting failed: ${message}`);
-      }
-    } catch (error: unknown) {
-      const message = error instanceof Error ? error.message : String(error);
-      submission.status = "failed";
-      submission.error = message;
-      submission.completedAt = nowIso();
-      save(submission);
-      emitUpdate(submission);
-
-      logger.error("feedback.failed", {
-        id: submission.id,
-        error: message,
-      });
     }
+
+    return {
+      category,
+      draftInput,
+      userDescription,
+      modelId,
+      reasoningEffort,
+      title,
+      body,
+      labels,
+      generationMode,
+      generationWarning,
+    };
   }
 
-  function submit(args: FeedbackSubmitArgs): FeedbackSubmission {
+  async function submitPreparedDraft(args: FeedbackSubmitDraftArgs): Promise<FeedbackSubmission> {
+    const prepared = normalizePreparedDraft(args.draft, {
+      title: args.title,
+      body: args.body,
+      labels: args.labels,
+    });
+
     const submission: FeedbackSubmission = {
       id: randomUUID(),
-      category: args.category,
-      userDescription: args.userDescription,
-      modelId: args.modelId,
-      reasoningEffort: args.reasoningEffort ?? null,
-      status: "pending",
-      generatedTitle: null,
-      generatedBody: null,
+      category: prepared.category,
+      userDescription: prepared.userDescription,
+      modelId: prepared.modelId,
+      reasoningEffort: prepared.reasoningEffort ?? null,
+      status: "posting",
+      generationMode: prepared.generationMode,
+      generationWarning: prepared.generationWarning,
+      generatedTitle: prepared.title,
+      generatedBody: prepared.body,
       issueUrl: null,
       issueNumber: null,
       issueState: null,
@@ -386,10 +463,45 @@ export function createFeedbackReporterService({
     save(submission);
     emitUpdate(submission);
 
-    // Run generation + posting in the background
-    runSubmission(submission).catch(() => {
-      // Error already handled inside runSubmission
-    });
+    try {
+      const { data } = await githubService.apiRequest<{
+        html_url: string;
+        number: number;
+      }>({
+        method: "POST",
+        path: "/repos/arul28/ADE/issues",
+        body: {
+          title: prepared.title,
+          body: prepared.body,
+          labels: prepared.labels,
+        },
+      });
+
+      submission.issueUrl = data.html_url;
+      submission.issueNumber = data.number;
+      submission.issueState = "open";
+      submission.status = "posted";
+      submission.completedAt = nowIso();
+      save(submission);
+      emitUpdate(submission);
+
+      logger.info("feedback.posted", {
+        id: submission.id,
+        issueNumber: data.number,
+      });
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : String(error);
+      submission.status = "failed";
+      submission.error = `Posting failed: ${message}`;
+      submission.completedAt = nowIso();
+      save(submission);
+      emitUpdate(submission);
+
+      logger.error("feedback.failed", {
+        id: submission.id,
+        error: submission.error,
+      });
+    }
 
     return submission;
   }
@@ -400,5 +512,9 @@ export function createFeedbackReporterService({
     );
   }
 
-  return { submit, list };
+  return {
+    prepareDraft,
+    submitPreparedDraft,
+    list,
+  };
 }
diff --git a/apps/desktop/src/main/services/ipc/registerIpc.ts b/apps/desktop/src/main/services/ipc/registerIpc.ts
index f1fd44655..68d27328d 100644
--- a/apps/desktop/src/main/services/ipc/registerIpc.ts
+++ b/apps/desktop/src/main/services/ipc/registerIpc.ts
@@ -153,6 +153,11 @@ import type {
   QueueLandingState,
   ReplyToPrReviewThreadArgs,
   ResolvePrReviewThreadArgs,
+  PostPrReviewCommentArgs,
+  SetPrReviewThreadResolvedArgs,
+  ReactToPrCommentArgs,
+  LaunchPrIssueResolutionFromThreadArgs,
+  LaunchPrIssueResolutionFromThreadResult,
   SimulateIntegrationArgs,
   UpdatePrDescriptionArgs,
   LandPrArgs,
@@ -167,6 +172,7 @@ import type {
   AgentChatApproveArgs,
   AgentChatClaudePermissionMode,
   AgentChatCreateArgs,
+  AgentChatDeleteArgs,
   AgentChatDisposeArgs,
   AgentChatGetSummaryArgs,
   AgentChatHandoffArgs,
@@ -211,6 +217,7 @@ import type {
   ListLanesArgs,
   ListMissionsArgs,
   ListSessionsArgs,
+  DeleteSessionArgs,
   ListTestRunsArgs,
   MergeSimulationArgs,
   MergeSimulationResult,
@@ -479,8 +486,10 @@ import type {
   GenerateRedirectUrisArgs,
   EncodeOAuthStateArgs,
   DecodeOAuthStateArgs,
-  FeedbackSubmitArgs,
+  FeedbackPrepareDraftArgs,
+  FeedbackPreparedDraft,
   FeedbackSubmission,
+  FeedbackSubmitDraftArgs,
 } from "../../../shared/types";
 import type { Logger } from "../logging/logger";
 import type { AdeDb } from "../state/kvDb";
@@ -512,6 +521,7 @@ import type { createPrService } from "../prs/prService";
 import type { createPrPollingService } from "../prs/prPollingService";
 import type { createQueueLandingService } from "../prs/queueLandingService";
 import type { createIssueInventoryService } from "../prs/issueInventoryService";
+import type { createPrSummaryService } from "../prs/prSummaryService";
 import type { createAgentChatService } from "../chat/agentChatService";
 import type { createComputerUseArtifactBrokerService } from "../computerUse/computerUseArtifactBrokerService";
 import {
@@ -608,6 +618,7 @@ export type AppContext = {
   prPollingService: ReturnType<typeof createPrPollingService>;
   queueLandingService: ReturnType<typeof createQueueLandingService>;
   issueInventoryService: ReturnType<typeof createIssueInventoryService>;
+  prSummaryService: ReturnType<typeof createPrSummaryService>;
   jobEngine: ReturnType<typeof createJobEngine>;
   automationService: ReturnType<typeof createAutomationService>;
   automationPlannerService: ReturnType<typeof createAutomationPlannerService>;
@@ -1455,6 +1466,29 @@ function getAllowedDirs(getCtx: () => AppContext): string[] {
   ];
 }
 
+function buildIssueResolutionInstructionsFromThread(arg: LaunchPrIssueResolutionFromThreadArgs): string {
+  const lines: string[] = [
+    `Focus on review thread ${arg.threadId} on PR ${arg.prId}.`,
+  ];
+  if (arg.commentId) {
+    lines.push(`The relevant comment id is ${arg.commentId}.`);
+  }
+  const fileContext = arg.fileContext;
+  if (fileContext?.path) {
+    const lineNumber = fileContext.startLine ?? fileContext.line ?? null;
+    lines.push(
+      lineNumber != null
+        ? `Start by inspecting ${fileContext.path}:${lineNumber}.`
+        : `Start by inspecting ${fileContext.path}.`,
+    );
+  }
+  if (arg.additionalInstructions) {
+    lines.push("");
+    lines.push(arg.additionalInstructions);
+  }
+  return lines.join("\n");
+}
+
 export function registerIpc({
   getCtx,
   switchProjectFromDialog,
@@ -3963,6 +3997,25 @@ export function registerIpc({
     };
   });
 
+  ipcMain.handle(IPC.sessionsDelete, async (_event, arg: DeleteSessionArgs): Promise<void> => {
+    const ctx = getCtx();
+    const sessionId = typeof arg?.sessionId === "string" ? arg.sessionId.trim() : "";
+    if (!sessionId) {
+      throw new Error("Session id is required.");
+    }
+    const session = ctx.sessionService.get(sessionId);
+    if (!session) {
+      throw new Error(`Session '${sessionId}' was not found.`);
+    }
+    if (isChatToolType(session.toolType)) {
+      throw new Error(`Session '${sessionId}' is an agent chat session. Use the chat delete flow instead.`);
+    }
+    if (session.status === "running" || session.ptyId) {
+      throw new Error("Running terminal sessions must be closed before they can be deleted.");
+    }
+    ctx.sessionService.deleteSession(sessionId);
+  });
+
   ipcMain.handle(IPC.sessionsUpdateMeta, async (_event, arg: UpdateSessionMetaArgs): Promise<TerminalSessionSummary | null> => {
     const ctx = getCtx();
     return ctx.sessionService.updateMeta(arg);
@@ -4056,6 +4109,11 @@ export function registerIpc({
     await ctx.agentChatService.dispose(arg);
   });
 
+  ipcMain.handle(IPC.agentChatDelete, async (_event, arg: AgentChatDeleteArgs): Promise<void> => {
+    const ctx = getCtx();
+    await ctx.agentChatService.deleteSession(arg);
+  });
+
   ipcMain.handle(IPC.agentChatUpdateSession, async (_event, arg: AgentChatUpdateSessionArgs): Promise<AgentChatSession> => {
     const ctx = getCtx();
     return await ctx.agentChatService.updateSession(arg);
@@ -4669,10 +4727,16 @@ export function registerIpc({
   });
 
   // ── Feedback Reporter ──────────────────────────────────────────────
-  ipcMain.handle(IPC.feedbackSubmit, async (_event, arg: FeedbackSubmitArgs): Promise<FeedbackSubmission> => {
+  ipcMain.handle(IPC.feedbackPrepareDraft, async (_event, arg: FeedbackPrepareDraftArgs): Promise<FeedbackPreparedDraft> => {
     const ctx = getCtx();
     if (!ctx.feedbackReporterService) throw new Error("Feedback reporter not available");
-    return await ctx.feedbackReporterService.submit(arg);
+    return await ctx.feedbackReporterService.prepareDraft(arg);
+  });
+
+  ipcMain.handle(IPC.feedbackSubmitDraft, async (_event, arg: FeedbackSubmitDraftArgs): Promise<FeedbackSubmission> => {
+    const ctx = getCtx();
+    if (!ctx.feedbackReporterService) throw new Error("Feedback reporter not available");
+    return await ctx.feedbackReporterService.submitPreparedDraft(arg);
   });
 
   ipcMain.handle(IPC.feedbackList, async (): Promise<FeedbackSubmission[]> => {
@@ -5310,6 +5374,44 @@ export function registerIpc({
   ipcMain.handle(IPC.prsRerunChecks, (_e, args) => getCtx().prService.rerunChecks(args));
   ipcMain.handle(IPC.prsAiReviewSummary, (_e, args) => getCtx().prService.aiReviewSummary(args));
 
+  // PRs Tab redesign (Timeline + Rails)
+  ipcMain.handle(IPC.prsGetDeployments, (_e, args: { prId: string }) => getCtx().prService.getDeployments(args.prId));
+  ipcMain.handle(IPC.prsGetAiSummary, (_e, args: { prId: string }) => getCtx().prSummaryService.getSummary(args.prId));
+  ipcMain.handle(IPC.prsRegenerateAiSummary, (_e, args: { prId: string }) => getCtx().prSummaryService.regenerateSummary(args.prId));
+  ipcMain.handle(IPC.prsPostReviewComment, (_e, args: PostPrReviewCommentArgs) => getCtx().prService.postReviewComment(args));
+  ipcMain.handle(
+    IPC.prsSetReviewThreadResolved,
+    (_e, args: SetPrReviewThreadResolvedArgs) => getCtx().prService.setReviewThreadResolved(args),
+  );
+  ipcMain.handle(IPC.prsReactToComment, (_e, args: ReactToPrCommentArgs) => getCtx().prService.reactToComment(args));
+  ipcMain.handle(
+    IPC.prsLaunchIssueResolutionFromThread,
+    async (_e, arg: LaunchPrIssueResolutionFromThreadArgs): Promise<LaunchPrIssueResolutionFromThreadResult> => {
+      const ctx = getCtx();
+      const additionalInstructions = buildIssueResolutionInstructionsFromThread(arg);
+      if (!arg.modelId) {
+        throw new Error("modelId is required for prsLaunchIssueResolutionFromThread.");
+      }
+      return await launchPrIssueResolutionChat(
+        {
+          prService: ctx.prService,
+          laneService: ctx.laneService,
+          agentChatService: ctx.agentChatService,
+          sessionService: ctx.sessionService,
+          issueInventoryService: ctx.issueInventoryService,
+        },
+        {
+          prId: arg.prId,
+          scope: "comments",
+          modelId: arg.modelId,
+          reasoning: arg.reasoning ?? null,
+          permissionMode: arg.permissionMode,
+          additionalInstructions,
+        },
+      );
+    },
+  );
+
   // Issue Inventory (PR convergence loop)
   ipcMain.handle(IPC.prsIssueInventorySync, async (_e, args: { prId: string }): Promise<IssueInventorySnapshot> => {
     const ctx = getCtx();
diff --git a/apps/desktop/src/main/services/lanes/laneService.test.ts b/apps/desktop/src/main/services/lanes/laneService.test.ts
index 2908a550d..4c5e028bc 100644
--- a/apps/desktop/src/main/services/lanes/laneService.test.ts
+++ b/apps/desktop/src/main/services/lanes/laneService.test.ts
@@ -1961,6 +1961,80 @@ describe("laneService missionId and laneRole", () => {
     }
   });
 
+  it("createChild with baseBranchRef tracks remote-only branch and bases lane on it", async () => {
+    const repoRoot = fs.mkdtempSync(path.join(os.tmpdir(), "ade-lane-service-child-base-override-"));
+    const db = await openKvDb(path.join(repoRoot, "kv.sqlite"), createLogger());
+    await seedProjectAndStack(db, { projectId: "proj-child-base-override", repoRoot });
+
+    const trackCalls: string[][] = [];
+
+    vi.mocked(runGitOrThrow).mockImplementation(async (args: string[]) => {
+      if (args[0] === "branch" && args[1] === "--track") {
+        trackCalls.push([...args]);
+        return { exitCode: 0, stdout: "", stderr: "" } as any;
+      }
+      if (args[0] === "worktree" && args[1] === "add") {
+        // worktree add -b <new-branch> <path> <startPoint>
+        expect(args[2]).toBe("-b");
+        expect(args[5]).toBe("sha-feature-remote");
+        return { exitCode: 0, stdout: "", stderr: "" } as any;
+      }
+      throw new Error(`Unexpected git call: ${args.join(" ")}`);
+    });
+
+    vi.mocked(runGit).mockImplementation(async (args: string[]) => {
+      if (args[0] === "show-ref" && args[1] === "--verify" && args[3] === "refs/heads/origin/feature/remote-only") {
+        return { exitCode: 1, stdout: "", stderr: "" };
+      }
+      if (args[0] === "fetch" && args[1] === "--prune" && args[2] === "--all") {
+        return { exitCode: 0, stdout: "", stderr: "" };
+      }
+      if (args[0] === "show-ref" && args[1] === "--verify" && args[3] === "refs/remotes/origin/feature/remote-only") {
+        return { exitCode: 0, stdout: "", stderr: "" };
+      }
+      if (args[0] === "show-ref" && args[1] === "--verify" && args[3] === "refs/heads/feature/remote-only") {
+        return { exitCode: 1, stdout: "", stderr: "" };
+      }
+      if (args[0] === "rev-parse" && args[1] === "feature/remote-only") {
+        return { exitCode: 0, stdout: "sha-feature-remote\n", stderr: "" };
+      }
+      if (args[0] === "push" && args[1] === "-u") {
+        return { exitCode: 0, stdout: "", stderr: "" };
+      }
+      if (args[0] === "status" && args[1] === "--porcelain=v1") {
+        return { exitCode: 0, stdout: "", stderr: "" };
+      }
+      if (args[0] === "rev-list" && args[1] === "--left-right" && args[2] === "--count") {
+        return { exitCode: 0, stdout: "0\t0\n", stderr: "" };
+      }
+      if (args[0] === "rev-parse" && args[1] === "--abbrev-ref" && args[2] === "--symbolic-full-name" && args[3] === "@{upstream}") {
+        return { exitCode: 1, stdout: "", stderr: "fatal: no upstream configured" };
+      }
+      if (args[0] === "rev-parse" && args[1] === "--path-format=absolute" && args[2] === "--git-dir") {
+        return { exitCode: 1, stdout: "", stderr: "fatal: no git dir" };
+      }
+      throw new Error(`Unexpected git call: ${args.join(" ")}`);
+    });
+
+    const service = createLaneService({
+      db,
+      projectRoot: repoRoot,
+      projectId: "proj-child-base-override",
+      defaultBaseRef: "main",
+      worktreesDir: path.join(repoRoot, "worktrees"),
+    });
+
+    const lane = await service.createChild({
+      parentLaneId: "lane-parent",
+      name: "Override base child",
+      baseBranchRef: "origin/feature/remote-only",
+    });
+
+    expect(trackCalls).toEqual([["branch", "--track", "feature/remote-only", "origin/feature/remote-only"]]);
+    expect(lane.baseRef).toBe("feature/remote-only");
+    expect(lane.parentLaneId).toBe("lane-parent");
+  });
+
   it("setMissionOwnership updates missionId and laneRole on an existing lane", async () => {
     const repoRoot = fs.mkdtempSync(path.join(os.tmpdir(), "ade-lane-service-set-ownership-"));
     const db = await openKvDb(path.join(repoRoot, "kv.sqlite"), createLogger());
diff --git a/apps/desktop/src/main/services/lanes/laneService.ts b/apps/desktop/src/main/services/lanes/laneService.ts
index 88d9ee705..3f20ca16d 100644
--- a/apps/desktop/src/main/services/lanes/laneService.ts
+++ b/apps/desktop/src/main/services/lanes/laneService.ts
@@ -1292,6 +1292,48 @@ export function createLaneService({
       if (!parent) throw new Error(`Parent lane not found: ${args.parentLaneId}`);
       if (parent.status === "archived") throw new Error("Parent lane is archived");
 
+      const trimmedBaseBranchRef = args.baseBranchRef?.trim() ?? "";
+      const hasOverride = trimmedBaseBranchRef.length > 0 && trimmedBaseBranchRef !== parent.branch_ref;
+
+      if (hasOverride) {
+        let localBranchName = trimmedBaseBranchRef;
+        const localExists = await runGit(
+          ["show-ref", "--verify", "--quiet", `refs/heads/${trimmedBaseBranchRef}`],
+          { cwd: projectRoot, timeoutMs: 8_000 },
+        ).then((r) => r.exitCode === 0);
+
+        if (!localExists) {
+          const resolved = await resolveImportBranchTarget({ projectRoot, rawRef: trimmedBaseBranchRef });
+          localBranchName = resolved.localBranchName;
+          const resolvedLocalExists = await runGit(
+            ["show-ref", "--verify", "--quiet", `refs/heads/${resolved.localBranchName}`],
+            { cwd: projectRoot, timeoutMs: 8_000 },
+          ).then((r) => r.exitCode === 0);
+          if (!resolvedLocalExists) {
+            await runGitOrThrow(
+              ["branch", "--track", resolved.localBranchName, resolved.remoteRef],
+              { cwd: projectRoot, timeoutMs: 15_000 },
+            );
+          }
+        }
+
+        const headRes = await runGit(["rev-parse", localBranchName], { cwd: projectRoot, timeoutMs: 10_000 });
+        const startPoint = headRes.exitCode === 0 && headRes.stdout.trim().length
+          ? headRes.stdout.trim()
+          : localBranchName;
+
+        return await createWorktreeLane({
+          name: args.name,
+          description: args.description,
+          baseRef: localBranchName,
+          startPoint,
+          parentLaneId: parent.id,
+          folder: args.folder,
+          missionId: args.missionId ?? null,
+          laneRole: args.laneRole ?? null,
+        });
+      }
+
       if (parent.lane_type === "primary") {
         const requestedBaseRef = defaultBaseRef;
         const headRes = await runGit(["rev-parse", requestedBaseRef], { cwd: projectRoot, timeoutMs: 10_000 });
diff --git a/apps/desktop/src/main/services/memory/compactionFlushPrompt.ts b/apps/desktop/src/main/services/memory/compactionFlushPrompt.ts
new file mode 100644
index 000000000..3819a557c
--- /dev/null
+++ b/apps/desktop/src/main/services/memory/compactionFlushPrompt.ts
@@ -0,0 +1,8 @@
+export const DEFAULT_FLUSH_PROMPT = [
+  "Before context compaction runs, review the conversation for durable discoveries worth preserving.",
+  "Quality bar: would a developer joining this project find this useful on their first day? If not, skip it.",
+  "Each memory should be a single actionable insight, not a paragraph of context. Lead with the rule or fact, then brief context for WHY.",
+  "SAVE: non-obvious conventions, decisions with reasoning, pitfalls others would repeat, patterns that contradict expectations.",
+  "DO NOT SAVE: file paths, session progress, task status, code that is already committed, raw error messages without lessons, anything discoverable via search or git log.",
+  'If nothing qualifies — and often nothing will — respond with "NO_DISCOVERIES". Fewer high-quality memories are better than many low-quality ones.'
+].join(" ");
diff --git a/apps/desktop/src/main/services/memory/compactionFlushService.test.ts b/apps/desktop/src/main/services/memory/compactionFlushService.test.ts
deleted file mode 100644
index f7bb73a20..000000000
--- a/apps/desktop/src/main/services/memory/compactionFlushService.test.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { createCompactionFlushService } from "./compactionFlushService";
-
-describe("compactionFlushService", () => {
-  it("uses sensible default config", () => {
-    const service = createCompactionFlushService();
-
-    expect(service.getConfig()).toMatchObject({
-      enabled: true,
-      reserveTokensFloor: 40_000,
-      maxFlushTurnsPerSession: 3,
-    });
-    expect(service.getConfig().flushPrompt).toContain("compaction");
-  });
-
-  it("injects a hidden system message and runs a flush turn when the threshold is exceeded", async () => {
-    const service = createCompactionFlushService();
-    const appendHiddenMessage = vi.fn();
-    const flushTurn = vi.fn(async () => ({ status: "flushed" as const }));
-
-    const result = await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 70_001,
-      maxTokens: 100_000,
-      appendHiddenMessage,
-      flushTurn,
-    });
-
-    expect(result).toMatchObject({
-      injected: true,
-      flushCount: 1,
-      reason: "flushed",
-    });
-    expect(appendHiddenMessage).toHaveBeenCalledWith(
-      expect.objectContaining({
-        role: "system",
-        hidden: true,
-        content: expect.stringContaining("compaction"),
-      }),
-    );
-    expect(flushTurn).toHaveBeenCalledWith(
-      expect.objectContaining({
-        sessionId: "session-1",
-        boundaryId: "boundary-1",
-        prompt: expect.stringContaining("compaction"),
-      }),
-    );
-  });
-
-  it("does nothing when disabled", async () => {
-    const service = createCompactionFlushService({ enabled: false });
-    const appendHiddenMessage = vi.fn();
-    const flushTurn = vi.fn();
-
-    const result = await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 99_000,
-      maxTokens: 100_000,
-      appendHiddenMessage,
-      flushTurn,
-    });
-
-    expect(result).toMatchObject({
-      injected: false,
-      flushCount: 0,
-      reason: "disabled",
-    });
-    expect(appendHiddenMessage).not.toHaveBeenCalled();
-    expect(flushTurn).not.toHaveBeenCalled();
-  });
-
-  it("does nothing below the reserve threshold", async () => {
-    const service = createCompactionFlushService({ reserveTokensFloor: 20_000 });
-    const appendHiddenMessage = vi.fn();
-    const flushTurn = vi.fn();
-
-    const result = await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 79_999,
-      maxTokens: 100_000,
-      appendHiddenMessage,
-      flushTurn,
-    });
-
-    expect(result).toMatchObject({
-      injected: false,
-      flushCount: 0,
-      reason: "below-threshold",
-    });
-    expect(appendHiddenMessage).not.toHaveBeenCalled();
-    expect(flushTurn).not.toHaveBeenCalled();
-  });
-
-  it("prevents a second flush for the same compaction boundary", async () => {
-    const service = createCompactionFlushService();
-    const flushTurn = vi.fn(async () => ({ status: "flushed" as const }));
-
-    const first = await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 75_000,
-      maxTokens: 100_000,
-      flushTurn,
-    });
-    const second = await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 80_000,
-      maxTokens: 100_000,
-      flushTurn,
-    });
-
-    expect(first.reason).toBe("flushed");
-    expect(second).toMatchObject({
-      injected: false,
-      flushCount: 1,
-      reason: "already-flushed-boundary",
-    });
-    expect(flushTurn).toHaveBeenCalledTimes(1);
-  });
-
-  it("enforces the max flush turns per session across boundaries", async () => {
-    const service = createCompactionFlushService({ maxFlushTurnsPerSession: 2 });
-    const flushTurn = vi.fn(async () => ({ status: "flushed" as const }));
-
-    await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 75_000,
-      maxTokens: 100_000,
-      flushTurn,
-    });
-    await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-2",
-      conversationTokenCount: 80_000,
-      maxTokens: 100_000,
-      flushTurn,
-    });
-    const third = await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-3",
-      conversationTokenCount: 85_000,
-      maxTokens: 100_000,
-      flushTurn,
-    });
-
-    expect(third).toMatchObject({
-      injected: false,
-      flushCount: 2,
-      reason: "max-flush-turns-reached",
-    });
-    expect(flushTurn).toHaveBeenCalledTimes(2);
-  });
-
-  it("uses a custom flush prompt when provided", async () => {
-    const service = createCompactionFlushService({
-      flushPrompt: "Persist durable findings with memoryAdd before compaction.",
-    });
-    const appendHiddenMessage = vi.fn();
-
-    await service.beforeCompaction({
-      sessionId: "session-1",
-      boundaryId: "boundary-1",
-      conversationTokenCount: 90_000,
-      maxTokens: 100_000,
-      appendHiddenMessage,
-      flushTurn: async () => ({ status: "flushed" as const }),
-    });
-
-    expect(appendHiddenMessage).toHaveBeenCalledWith(
-      expect.objectContaining({
-        content: "Persist durable findings with memoryAdd before compaction.",
-      }),
-    );
-  });
-
-  it("treats flush failures as best-effort and still allows compaction to proceed", async () => {
-    const service = createCompactionFlushService();
-
-    await expect(
-      service.beforeCompaction({
-        sessionId: "session-1",
-        boundaryId: "boundary-1",
-        conversationTokenCount: 90_000,
-        maxTokens: 100_000,
-        flushTurn: async () => {
-          throw new Error("tool failure");
-        },
-      }),
-    ).resolves.toMatchObject({
-      injected: true,
-      flushCount: 1,
-      reason: "flush-failed",
-      proceedWithCompaction: true,
-    });
-  });
-
-  it("treats over-budget flush attempts as best-effort and still allows compaction to proceed", async () => {
-    const service = createCompactionFlushService();
-
-    await expect(
-      service.beforeCompaction({
-        sessionId: "session-1",
-        boundaryId: "boundary-1",
-        conversationTokenCount: 90_000,
-        maxTokens: 100_000,
-        flushTurn: async () => ({ status: "budget_exceeded" as const }),
-      }),
-    ).resolves.toMatchObject({
-      injected: true,
-      flushCount: 1,
-      reason: "flush-budget-exceeded",
-      proceedWithCompaction: true,
-    });
-  });
-});
diff --git a/apps/desktop/src/main/services/memory/compactionFlushService.ts b/apps/desktop/src/main/services/memory/compactionFlushService.ts
deleted file mode 100644
index 7377e3db6..000000000
--- a/apps/desktop/src/main/services/memory/compactionFlushService.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-import type { Logger } from "../logging/logger";
-
-export interface CompactionFlushConfig {
-  enabled?: boolean;
-  reserveTokensFloor?: number;
-  maxFlushTurnsPerSession?: number;
-  flushPrompt?: string;
-}
-
-export type CompactionFlushHiddenMessage = {
-  role: "system";
-  content: string;
-  hidden: true;
-};
-
-export type CompactionFlushTurnStatus = "flushed" | "budget_exceeded";
-
-export type CompactionFlushContext = {
-  sessionId: string;
-  boundaryId: string;
-  conversationTokenCount: number;
-  maxTokens: number;
-  appendHiddenMessage?: (message: CompactionFlushHiddenMessage) => void | Promise<void>;
-  flushTurn?: (args: {
-    sessionId: string;
-    boundaryId: string;
-    prompt: string;
-  }) => Promise<{ status: CompactionFlushTurnStatus } | void>;
-};
-
-export type CompactionFlushResult = {
-  injected: boolean;
-  flushCount: number;
-  reason:
-    | "disabled"
-    | "below-threshold"
-    | "flush-handler-unavailable"
-    | "already-flushed-boundary"
-    | "max-flush-turns-reached"
-    | "flushed"
-    | "flush-failed"
-    | "flush-budget-exceeded";
-  proceedWithCompaction: true;
-};
-
-type NormalizedCompactionFlushConfig = Required<CompactionFlushConfig>;
-
-type SessionFlushState = {
-  flushCount: number;
-  flushedBoundaries: Set<string>;
-};
-
-const DEFAULT_FLUSH_PROMPT = [
-  "Before context compaction runs, review the conversation for durable discoveries worth preserving.",
-  "Quality bar: would a developer joining this project find this useful on their first day? If not, skip it.",
-  "Each memory should be a single actionable insight, not a paragraph of context. Lead with the rule or fact, then brief context for WHY.",
-  "SAVE: non-obvious conventions, decisions with reasoning, pitfalls others would repeat, patterns that contradict expectations.",
-  "DO NOT SAVE: file paths, session progress, task status, code that is already committed, raw error messages without lessons, anything discoverable via search or git log.",
-  'If nothing qualifies — and often nothing will — respond with "NO_DISCOVERIES". Fewer high-quality memories are better than many low-quality ones.'
-].join(" ");
-
-function normalizePositiveInteger(value: number | undefined, fallback: number): number {
-  if (!Number.isFinite(value) || Number(value) <= 0) return fallback;
-  return Math.floor(Number(value));
-}
-
-function normalizeConfig(config: CompactionFlushConfig | undefined): NormalizedCompactionFlushConfig {
-  const flushPrompt = typeof config?.flushPrompt === "string" && config.flushPrompt.trim().length > 0
-    ? config.flushPrompt.trim()
-    : DEFAULT_FLUSH_PROMPT;
-
-  return {
-    enabled: config?.enabled !== false,
-    reserveTokensFloor: normalizePositiveInteger(config?.reserveTokensFloor, 40_000),
-    maxFlushTurnsPerSession: normalizePositiveInteger(config?.maxFlushTurnsPerSession, 3),
-    flushPrompt,
-  };
-}
-
-function normalizeSessionId(value: string): string {
-  const normalized = String(value ?? "").trim();
-  return normalized.length > 0 ? normalized : "default-session";
-}
-
-function normalizeBoundaryId(value: string, conversationTokenCount: number): string {
-  const normalized = String(value ?? "").trim();
-  return normalized.length > 0 ? normalized : `boundary-${Math.max(0, Math.floor(conversationTokenCount))}`;
-}
-
-export type CompactionFlushService = ReturnType<typeof createCompactionFlushService>;
-
-export function createCompactionFlushService(
-  config?: CompactionFlushConfig,
-  deps?: { logger?: Pick<Logger, "warn"> },
-) {
-  const logger = deps?.logger;
-  const normalizedConfig = normalizeConfig(config);
-  const sessionState = new Map<string, SessionFlushState>();
-
-  function getOrCreateSessionState(sessionId: string): SessionFlushState {
-    const existing = sessionState.get(sessionId);
-    if (existing) return existing;
-    const created: SessionFlushState = {
-      flushCount: 0,
-      flushedBoundaries: new Set<string>(),
-    };
-    sessionState.set(sessionId, created);
-    return created;
-  }
-
-  async function beforeCompaction(args: CompactionFlushContext): Promise<CompactionFlushResult> {
-    if (!normalizedConfig.enabled) {
-      return {
-        injected: false,
-        flushCount: 0,
-        reason: "disabled",
-        proceedWithCompaction: true,
-      };
-    }
-
-    const threshold = Math.max(0, Math.floor(args.maxTokens) - normalizedConfig.reserveTokensFloor);
-    if (!Number.isFinite(args.conversationTokenCount) || args.conversationTokenCount < threshold) {
-      return {
-        injected: false,
-        flushCount: 0,
-        reason: "below-threshold",
-        proceedWithCompaction: true,
-      };
-    }
-
-    if (!args.flushTurn) {
-      return {
-        injected: false,
-        flushCount: 0,
-        reason: "flush-handler-unavailable",
-        proceedWithCompaction: true,
-      };
-    }
-
-    const sessionId = normalizeSessionId(args.sessionId);
-    const boundaryId = normalizeBoundaryId(args.boundaryId, args.conversationTokenCount);
-    const state = getOrCreateSessionState(sessionId);
-
-    if (state.flushedBoundaries.has(boundaryId)) {
-      return {
-        injected: false,
-        flushCount: state.flushCount,
-        reason: "already-flushed-boundary",
-        proceedWithCompaction: true,
-      };
-    }
-
-    if (state.flushCount >= normalizedConfig.maxFlushTurnsPerSession) {
-      return {
-        injected: false,
-        flushCount: state.flushCount,
-        reason: "max-flush-turns-reached",
-        proceedWithCompaction: true,
-      };
-    }
-
-    state.flushedBoundaries.add(boundaryId);
-    state.flushCount += 1;
-
-    const hiddenMessage: CompactionFlushHiddenMessage = {
-      role: "system",
-      content: normalizedConfig.flushPrompt,
-      hidden: true,
-    };
-
-    try {
-      await args.appendHiddenMessage?.(hiddenMessage);
-    } catch (error) {
-      logger?.warn("memory.compaction_flush.hidden_message_failed", {
-        sessionId,
-        boundaryId,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    }
-
-    try {
-      const flushResult = await args.flushTurn({
-        sessionId,
-        boundaryId,
-        prompt: normalizedConfig.flushPrompt,
-      });
-
-      return {
-        injected: true,
-        flushCount: state.flushCount,
-        reason: flushResult?.status === "budget_exceeded" ? "flush-budget-exceeded" : "flushed",
-        proceedWithCompaction: true,
-      };
-    } catch (error) {
-      logger?.warn("memory.compaction_flush.flush_failed", {
-        sessionId,
-        boundaryId,
-        error: error instanceof Error ? error.message : String(error),
-      });
-      return {
-        injected: true,
-        flushCount: state.flushCount,
-        reason: "flush-failed",
-        proceedWithCompaction: true,
-      };
-    }
-  }
-
-  function getConfig(): NormalizedCompactionFlushConfig {
-    return { ...normalizedConfig };
-  }
-
-  function getSessionFlushCount(sessionId: string): number {
-    return sessionState.get(normalizeSessionId(sessionId))?.flushCount ?? 0;
-  }
-
-  function clearSession(sessionId: string): void {
-    sessionState.delete(normalizeSessionId(sessionId));
-  }
-
-  return {
-    beforeCompaction,
-    getConfig,
-    getSessionFlushCount,
-    clearSession,
-  };
-}
diff --git a/apps/desktop/src/main/services/opencode/openCodeRuntime.test.ts b/apps/desktop/src/main/services/opencode/openCodeRuntime.test.ts
index 7926b2376..8f90a4701 100644
--- a/apps/desktop/src/main/services/opencode/openCodeRuntime.test.ts
+++ b/apps/desktop/src/main/services/opencode/openCodeRuntime.test.ts
@@ -1,8 +1,15 @@
+import fs from "node:fs";
 import { createHash } from "node:crypto";
+import { createServer, type Server } from "node:net";
+import os from "node:os";
+import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { stableStringify } from "../shared/utils";
 
 const originalFetch = global.fetch;
+let dynamicSocketServer: Server | null = null;
+let dynamicSocketDir: string | null = null;
+let dynamicSocketPath = "/tmp/ade.sock";
 
 const mockState = vi.hoisted(() => {
   let nextSessionId = 1;
@@ -123,7 +130,7 @@ function createLaunch(overrides: Partial<Record<string, string>> = {}) {
     },
     entryPath: "dist/main/adeMcpProxy.cjs",
     runtimeRoot: null,
-    socketPath: "/tmp/ade.sock",
+    socketPath: dynamicSocketPath,
     packaged: false,
     resourcesPath: null,
   };
@@ -159,15 +166,48 @@ function expectedDynamicServerName(args: {
 }
 
 describe("openCodeRuntime dynamic ADE MCP registration", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     vi.clearAllMocks();
     mockState.resetSessionIds();
     __resetOpenCodeRuntimeDiagnosticsForTests();
     global.fetch = vi.fn();
+    dynamicSocketDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-opencode-sock-"));
+    dynamicSocketPath = path.join(dynamicSocketDir, "mcp.sock");
+    dynamicSocketServer = createServer((socket) => {
+      socket.end();
+    });
+    await new Promise<void>((resolve, reject) => {
+      dynamicSocketServer!.once("error", reject);
+      dynamicSocketServer!.listen(dynamicSocketPath, resolve);
+    });
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     global.fetch = originalFetch;
+    await new Promise<void>((resolve) => {
+      if (!dynamicSocketServer) {
+        resolve();
+        return;
+      }
+      dynamicSocketServer.close(() => resolve());
+    });
+    dynamicSocketServer = null;
+    if (dynamicSocketPath) {
+      try {
+        fs.unlinkSync(dynamicSocketPath);
+      } catch {
+        // ignore
+      }
+    }
+    if (dynamicSocketDir) {
+      try {
+        fs.rmdirSync(dynamicSocketDir);
+      } catch {
+        // ignore
+      }
+    }
+    dynamicSocketDir = null;
+    dynamicSocketPath = "/tmp/ade.sock";
   });
 
   it("registers a per-session ADE MCP server on the shared OpenCode runtime and scopes tools to it", async () => {
@@ -522,42 +562,101 @@ describe("openCodeRuntime dynamic ADE MCP registration", () => {
       expect.objectContaining({
         ownerKind: "chat",
         ownerId: "chat-fallback",
+        fallbackStrategy: "dedicated_static",
       }),
     );
   });
 
-  it("retries dynamic ADE MCP registration before falling back", async () => {
-    vi.useFakeTimers();
-    try {
-      vi.mocked(global.fetch)
-        .mockRejectedValueOnce(new Error("server warming up"))
-        .mockRejectedValueOnce(new Error("server warming up"))
-        .mockResolvedValueOnce(new Response("{}", { status: 200 }))
-        .mockResolvedValueOnce(new Response("{}", { status: 200 }))
-        .mockResolvedValueOnce(new Response("true", { status: 200 }));
-
-      const promise = startOpenCodeSession({
-        directory: "/repo",
-        title: "Retry chat",
-        leaseKind: "shared",
-        projectConfig: { ai: {} },
-        dynamicMcpLaunch: createLaunch({
-          ADE_CHAT_SESSION_ID: "chat-retry",
-        }),
+  it("skips dedicated fallback and degrades to a shared session without ADE MCP tools when the socket is unavailable", async () => {
+    vi.mocked(global.fetch).mockRejectedValue(
+      new Error("[ade-mcp-proxy] Failed to connect: connect ENOENT /tmp/ade.sock"),
+    );
+    const logger = { warn: vi.fn() } as any;
+
+    const handle = await startOpenCodeSession({
+      directory: "/repo",
+      title: "No MCP chat",
+      leaseKind: "shared",
+      projectConfig: { ai: {} },
+      dynamicMcpLaunch: createLaunch({
+        ADE_CHAT_SESSION_ID: "chat-no-mcp",
+      }),
+      ownerKind: "chat",
+      ownerId: "chat-no-mcp",
+      ownerKey: "chat:chat-no-mcp",
+      logger,
+    });
+
+    expect(acquireSharedOpenCodeServer).toHaveBeenCalledTimes(2);
+    expect(acquireDedicatedOpenCodeServer).not.toHaveBeenCalled();
+    expect(handle.toolSelection).toBeNull();
+    expect(logger.warn).toHaveBeenCalledWith(
+      "opencode.dynamic_mcp_attach_failed",
+      expect.objectContaining({
         ownerKind: "chat",
-        ownerId: "chat-retry",
-        ownerKey: "chat:chat-retry",
-      });
-
-      await vi.advanceTimersByTimeAsync(2 * 150);
-      const handle = await promise;
-
-      expect(acquireSharedOpenCodeServer).toHaveBeenCalledTimes(1);
-      expect(acquireDedicatedOpenCodeServer).not.toHaveBeenCalled();
-      expect(handle.toolSelection).toBeTruthy();
-      expect(vi.mocked(global.fetch)).toHaveBeenCalledTimes(6);
-    } finally {
-      vi.useRealTimers();
-    }
+        ownerId: "chat-no-mcp",
+        fallbackStrategy: "shared_without_mcp",
+      }),
+    );
+  });
+
+  it("fails fast for coordinator sessions when ADE MCP socket startup is unrecoverable", async () => {
+    vi.mocked(global.fetch).mockRejectedValue(
+      new Error("local mcp startup failed: [ade-mcp-proxy] Failed to connect: connect ENOENT /tmp/ade.sock"),
+    );
+    const logger = { warn: vi.fn() } as any;
+
+    await expect(startOpenCodeSession({
+      directory: "/repo",
+      title: "Coordinator",
+      leaseKind: "shared",
+      projectConfig: { ai: {} },
+      dynamicMcpLaunch: createLaunch({
+        ADE_RUN_ID: "run-1",
+      }),
+      ownerKind: "coordinator",
+      ownerId: "run-1",
+      ownerKey: "coordinator:run-1",
+      logger,
+    })).rejects.toThrow(/local mcp startup failed/i);
+
+    expect(acquireSharedOpenCodeServer).toHaveBeenCalledTimes(1);
+    expect(acquireDedicatedOpenCodeServer).not.toHaveBeenCalled();
+    expect(logger.warn).toHaveBeenCalledWith(
+      "opencode.dynamic_mcp_attach_failed",
+      expect.objectContaining({
+        ownerKind: "coordinator",
+        ownerId: "run-1",
+        fallbackStrategy: "abort",
+      }),
+    );
+  });
+
+  it("retries dynamic ADE MCP registration before falling back", async () => {
+    vi.mocked(global.fetch)
+      .mockRejectedValueOnce(new Error("server warming up"))
+      .mockRejectedValueOnce(new Error("server warming up"))
+      .mockResolvedValueOnce(new Response("{}", { status: 200 }))
+      .mockResolvedValueOnce(new Response("{}", { status: 200 }))
+      .mockResolvedValueOnce(new Response("true", { status: 200 }))
+      .mockResolvedValueOnce(new Response("{}", { status: 200 }));
+
+    const handle = await startOpenCodeSession({
+      directory: "/repo",
+      title: "Retry chat",
+      leaseKind: "shared",
+      projectConfig: { ai: {} },
+      dynamicMcpLaunch: createLaunch({
+        ADE_CHAT_SESSION_ID: "chat-retry",
+      }),
+      ownerKind: "chat",
+      ownerId: "chat-retry",
+      ownerKey: "chat:chat-retry",
+    });
+
+    expect(acquireSharedOpenCodeServer).toHaveBeenCalledTimes(1);
+    expect(acquireDedicatedOpenCodeServer).not.toHaveBeenCalled();
+    expect(handle.toolSelection).toBeTruthy();
+    expect(vi.mocked(global.fetch)).toHaveBeenCalledTimes(6);
   });
 });
diff --git a/apps/desktop/src/main/services/opencode/openCodeRuntime.ts b/apps/desktop/src/main/services/opencode/openCodeRuntime.ts
index 41dffc00b..98f7d0ecb 100644
--- a/apps/desktop/src/main/services/opencode/openCodeRuntime.ts
+++ b/apps/desktop/src/main/services/opencode/openCodeRuntime.ts
@@ -1,5 +1,6 @@
+import fs from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
-import { createServer } from "node:net";
+import { createConnection, createServer } from "node:net";
 import { pathToFileURL } from "node:url";
 import {
   createOpencodeClient,
@@ -305,6 +306,8 @@ async function resolveScopedMcpToolSelection(args: {
 
 const DYNAMIC_ADE_MCP_REGISTRATION_ATTEMPTS = 3;
 const DYNAMIC_ADE_MCP_REGISTRATION_RETRY_DELAY_MS = 150;
+const DYNAMIC_ADE_MCP_SOCKET_READY_TIMEOUT_MS = 1_500;
+const DYNAMIC_ADE_MCP_SOCKET_READY_RETRY_DELAY_MS = 75;
 const dynamicMcpDiagnostics: OpenCodeDynamicMcpDiagnostics = {
   registrationAttempts: 0,
   successfulRegistrations: 0,
@@ -320,6 +323,58 @@ async function wait(ms: number): Promise<void> {
   await new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+async function waitForAdeMcpSocketReady(socketPath: string): Promise<void> {
+  const normalizedPath = socketPath.trim();
+  if (!normalizedPath.length) return;
+  const deadline = Date.now() + DYNAMIC_ADE_MCP_SOCKET_READY_TIMEOUT_MS;
+  let lastError: unknown = null;
+
+  while (Date.now() < deadline) {
+    if (fs.existsSync(normalizedPath)) {
+      try {
+        await new Promise<void>((resolve, reject) => {
+          const socket = createConnection(normalizedPath);
+          const cleanup = (): void => {
+            socket.off("connect", handleConnect);
+            socket.off("error", handleError);
+          };
+          const handleConnect = () => {
+            cleanup();
+            socket.end();
+            socket.destroy();
+            resolve();
+          };
+          const handleError = (error: Error) => {
+            cleanup();
+            socket.destroy();
+            reject(error);
+          };
+          socket.once("connect", handleConnect);
+          socket.once("error", handleError);
+        });
+        return;
+      } catch (error) {
+        lastError = error;
+      }
+    }
+    await wait(DYNAMIC_ADE_MCP_SOCKET_READY_RETRY_DELAY_MS);
+  }
+
+  const detail = lastError instanceof Error ? `: ${lastError.message}` : "";
+  throw new Error(`ADE MCP socket not ready at ${normalizedPath}${detail}`);
+}
+
+function isUnrecoverableAdeMcpSocketError(error: unknown): boolean {
+  const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
+  return (
+    message.includes("enoent")
+    || message.includes("econnrefused")
+    || message.includes("local mcp startup failed")
+    || message.includes("[ade-mcp-proxy] failed to connect")
+    || (message.includes("mcp.sock") && message.includes("connect"))
+  );
+}
+
 async function callOpenCodeServer<T>(args: {
   baseUrl: string;
   directory: string;
@@ -367,6 +422,7 @@ async function ensureDynamicAdeMcpRegistration(args: {
   let lastError: unknown = null;
   for (let attempt = 0; attempt < DYNAMIC_ADE_MCP_REGISTRATION_ATTEMPTS; attempt += 1) {
     try {
+      await waitForAdeMcpSocketReady(args.launch.socketPath);
       let status = readDynamicMcpStatus(await callOpenCodeServer<Record<string, unknown>>({
         baseUrl: args.baseUrl,
         directory: args.directory,
@@ -786,17 +842,32 @@ export async function startOpenCodeSession(
         mcpLaunch: undefined,
       });
     } catch (error) {
-      dynamicMcpDiagnostics.fallbackCount += 1;
-      dynamicMcpDiagnostics.lastFallbackAt = new Date().toISOString();
-      dynamicMcpDiagnostics.lastFallbackOwnerKind = args.ownerKind ?? "oneshot";
-      dynamicMcpDiagnostics.lastFallbackOwnerId = args.ownerId?.trim() || null;
-      dynamicMcpDiagnostics.lastFallbackError = error instanceof Error ? error.message : String(error);
+      const ownerKind = args.ownerKind ?? "oneshot";
+      const fallbackStrategy = isUnrecoverableAdeMcpSocketError(error)
+        ? (ownerKind === "coordinator" ? "abort" : "shared_without_mcp")
+        : "dedicated_static";
       args.logger?.warn("opencode.dynamic_mcp_attach_failed", {
-        ownerKind: args.ownerKind ?? "oneshot",
+        ownerKind,
         ownerId: args.ownerId ?? null,
         sessionId: args.sessionId ?? null,
         error: error instanceof Error ? error.message : String(error),
+        fallbackStrategy,
       });
+      if (fallbackStrategy === "abort") {
+        throw error;
+      }
+      dynamicMcpDiagnostics.fallbackCount += 1;
+      dynamicMcpDiagnostics.lastFallbackAt = new Date().toISOString();
+      dynamicMcpDiagnostics.lastFallbackOwnerKind = ownerKind;
+      dynamicMcpDiagnostics.lastFallbackOwnerId = args.ownerId?.trim() || null;
+      dynamicMcpDiagnostics.lastFallbackError = error instanceof Error ? error.message : String(error);
+      if (fallbackStrategy === "shared_without_mcp") {
+        return await startOpenCodeSessionInternal({
+          ...args,
+          dynamicMcpLaunch: undefined,
+          mcpLaunch: undefined,
+        });
+      }
       return await startOpenCodeSessionInternal({
         ...args,
         dynamicMcpLaunch: undefined,
diff --git a/apps/desktop/src/main/services/prs/prPollingService.ts b/apps/desktop/src/main/services/prs/prPollingService.ts
index d9f23e401..070a72deb 100644
--- a/apps/desktop/src/main/services/prs/prPollingService.ts
+++ b/apps/desktop/src/main/services/prs/prPollingService.ts
@@ -1,6 +1,7 @@
 import type { Logger } from "../logging/logger";
 import type { createProjectConfigService } from "../config/projectConfigService";
 import type { createPrService } from "./prService";
+import type { AdeDb } from "../state/kvDb";
 import type { PrEventPayload, PrNotificationKind, PrSummary } from "../../../shared/types";
 import { nowIso } from "../shared/utils";
 
@@ -57,7 +58,8 @@ export function createPrPollingService({
   prService,
   projectConfigService,
   onEvent,
-  onPullRequestsChanged
+  onPullRequestsChanged,
+  db,
 }: {
   logger: Logger;
   prService: ReturnType<typeof createPrService>;
@@ -74,6 +76,8 @@ export function createPrPollingService({
     }>;
     polledAt: string;
   }) => void | Promise<void>;
+  /** Optional database handle used to persist `last_polled_at` per PR for delta polling. */
+  db?: AdeDb;
 }) {
   const DEFAULT_INTERVAL_MS = 60_000;
   const MIN_INTERVAL_MS = 5_000;
@@ -87,6 +91,27 @@ export function createPrPollingService({
     return DEFAULT_INTERVAL_MS;
   };
 
+  const getLastPolledAt = (prId: string): string | null => {
+    if (!db) return null;
+    const row = db.get<{ last_polled_at: string | null }>(
+      "select last_polled_at from pull_requests where id = ? limit 1",
+      [prId],
+    );
+    return row?.last_polled_at ?? null;
+  };
+
+  const setLastPolledAt = (prId: string, iso: string): void => {
+    if (!db) return;
+    try {
+      db.run("update pull_requests set last_polled_at = ? where id = ?", [iso, prId]);
+    } catch (err) {
+      logger.warn("prs.last_polled_at_update_failed", {
+        prId,
+        error: err instanceof Error ? err.message : String(err),
+      });
+    }
+  };
+
   let stopped = false;
   let started = false;
   let timer: NodeJS.Timeout | null = null;
@@ -284,6 +309,12 @@ export function createPrPollingService({
         }
       }
 
+      // Update last_polled_at cursor per PR. Enables delta polling on the next tick:
+      // callers can pass `since=last_polled_at` when fetching review threads / comments.
+      for (const pr of prs) {
+        setLastPolledAt(pr.id, polledAt);
+      }
+
       consecutiveFailures = 0;
     } catch (error) {
       consecutiveFailures += 1;
@@ -321,6 +352,7 @@ export function createPrPollingService({
   return {
     start,
     poke,
+    getLastPolledAt,
     dispose() {
       stopped = true;
       if (timer) clearTimeout(timer);
diff --git a/apps/desktop/src/main/services/prs/prService.timelineRails.test.ts b/apps/desktop/src/main/services/prs/prService.timelineRails.test.ts
new file mode 100644
index 000000000..b016281c5
--- /dev/null
+++ b/apps/desktop/src/main/services/prs/prService.timelineRails.test.ts
@@ -0,0 +1,467 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { describe, expect, it, vi } from "vitest";
+import type { LaneSummary } from "../../../shared/types";
+import { openKvDb } from "../state/kvDb";
+import { createPrService } from "./prService";
+
+function createLogger() {
+  return {
+    debug: () => {},
+    info: () => {},
+    warn: () => {},
+    error: () => {},
+  } as const;
+}
+
+function makeLane(id: string, name: string, branchRef: string, overrides: Partial<LaneSummary> = {}): LaneSummary {
+  return {
+    id,
+    name,
+    description: null,
+    laneType: "worktree",
+    baseRef: "refs/heads/main",
+    branchRef,
+    worktreePath: `/tmp/${id}`,
+    attachedRootPath: null,
+    parentLaneId: null,
+    childCount: 0,
+    stackDepth: 0,
+    parentStatus: null,
+    isEditProtected: false,
+    status: { dirty: false, ahead: 0, behind: 0, remoteBehind: -1, rebaseInProgress: false },
+    color: null,
+    icon: null,
+    tags: [],
+    folder: null,
+    createdAt: "2026-04-14T00:00:00.000Z",
+    archivedAt: null,
+    ...overrides,
+  };
+}
+
+async function seedProject(db: any, projectId: string, repoRoot: string) {
+  const now = "2026-04-14T00:00:00.000Z";
+  db.run(
+    "insert into projects(id, root_path, display_name, default_base_ref, created_at, last_opened_at) values (?, ?, ?, ?, ?, ?)",
+    [projectId, repoRoot, "ADE", "main", now, now],
+  );
+}
+
+async function seedLane(db: any, projectId: string, lane: LaneSummary) {
+  db.run(
+    `
+      insert into lanes(
+        id, project_id, name, description, lane_type, base_ref, branch_ref, worktree_path,
+        attached_root_path, is_edit_protected, parent_lane_id, color, icon, tags_json, status, created_at, archived_at
+      ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `,
+    [
+      lane.id,
+      projectId,
+      lane.name,
+      lane.description,
+      lane.laneType,
+      lane.baseRef,
+      lane.branchRef,
+      lane.worktreePath,
+      lane.attachedRootPath,
+      lane.isEditProtected ? 1 : 0,
+      lane.parentLaneId,
+      lane.color,
+      lane.icon,
+      JSON.stringify(lane.tags),
+      "active",
+      lane.createdAt,
+      lane.archivedAt,
+    ],
+  );
+}
+
+async function seedPr(db: any, args: { prId: string; projectId: string; laneId: string; prNumber: number }) {
+  const now = "2026-04-14T00:00:00.000Z";
+  db.run(
+    `
+      insert into pull_requests(
+        id, project_id, lane_id, repo_owner, repo_name, github_pr_number, github_url, github_node_id,
+        title, state, base_branch, head_branch, checks_status, review_status, additions, deletions,
+        last_synced_at, created_at, updated_at
+      ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `,
+    [
+      args.prId,
+      args.projectId,
+      args.laneId,
+      "arul28",
+      "ADE",
+      args.prNumber,
+      `https://github.com/arul28/ADE/pull/${args.prNumber}`,
+      null,
+      "Timeline + Rails",
+      "open",
+      "main",
+      "feature/timeline",
+      "passing",
+      "approved",
+      10,
+      0,
+      now,
+      now,
+      now,
+    ],
+  );
+}
+
+function mockReviewThreadsResponse() {
+  return {
+    data: {
+      data: {
+        repository: {
+          pullRequest: {
+            reviewThreads: {
+              pageInfo: { hasNextPage: false, endCursor: null },
+              nodes: [
+                {
+                  id: "thread-abc",
+                  isResolved: false,
+                  isOutdated: false,
+                  path: "src/app.ts",
+                  line: 10,
+                  originalLine: 10,
+                  startLine: null,
+                  originalStartLine: null,
+                  diffSide: "RIGHT",
+                  comments: {
+                    nodes: [
+                      {
+                        id: "comment-1",
+                        body: "Please fix.",
+                        url: "https://github.com/x/y/pull/1#r1",
+                        createdAt: "2026-04-14T01:00:00.000Z",
+                        updatedAt: "2026-04-14T01:00:00.000Z",
+                        author: { login: "rev", avatarUrl: null },
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    },
+  };
+}
+
+async function buildService(root: string) {
+  const db = await openKvDb(path.join(root, ".ade.db"), createLogger());
+  const projectId = "proj-timeline";
+  const lane = makeLane("lane-1", "feature/timeline", "refs/heads/feature/timeline", { worktreePath: root });
+  await seedProject(db, projectId, root);
+  await seedLane(db, projectId, lane);
+  await seedPr(db, { prId: "pr-1", projectId, laneId: lane.id, prNumber: 42 });
+  return { db, projectId, lane };
+}
+
+describe("prService.postReviewComment", () => {
+  it("issues an addPullRequestReviewThreadReply GraphQL mutation and maps the response", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-post-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: requestPath, body }: any) => {
+        if (requestPath !== "/graphql") return { data: {} };
+        const query: string = body?.query ?? "";
+        if (query.includes("reviewThreads(first:")) {
+          return mockReviewThreadsResponse();
+        }
+        expect(query).toContain("addPullRequestReviewThreadReply");
+        expect(body.variables).toMatchObject({ threadId: "thread-abc", body: "Thanks!" });
+        return {
+          data: {
+            data: {
+              addPullRequestReviewThreadReply: {
+                comment: {
+                  id: "comment-2",
+                  body: "Thanks!",
+                  url: "https://github.com/x/y/pull/1#r2",
+                  createdAt: "2026-04-14T02:00:00.000Z",
+                  updatedAt: "2026-04-14T02:00:00.000Z",
+                  author: { login: "me", avatarUrl: "avatar.png" },
+                },
+              },
+            },
+          },
+        };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      await expect(
+        service.postReviewComment({ prId: "pr-1", threadId: "thread-abc", body: "Thanks!" }),
+      ).resolves.toEqual({
+        id: "comment-2",
+        author: "me",
+        authorAvatarUrl: "avatar.png",
+        body: "Thanks!",
+        url: "https://github.com/x/y/pull/1#r2",
+        createdAt: "2026-04-14T02:00:00.000Z",
+        updatedAt: "2026-04-14T02:00:00.000Z",
+      });
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it("rejects when the thread does not belong to the PR", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-post-wrong-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: p }: any) => {
+        if (p === "/graphql") return mockReviewThreadsResponse();
+        return { data: {} };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      await expect(
+        service.postReviewComment({ prId: "pr-1", threadId: "not-mine", body: "..." }),
+      ).rejects.toThrow(/does not belong/);
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("prService.setReviewThreadResolved", () => {
+  it("uses resolveReviewThread mutation when resolved=true", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-resolve-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: p, body }: any) => {
+        if (p !== "/graphql") return { data: {} };
+        const q: string = body?.query ?? "";
+        if (q.includes("reviewThreads(first:")) return mockReviewThreadsResponse();
+        expect(q).toContain("resolveReviewThread(");
+        expect(q).not.toContain("unresolveReviewThread");
+        return {
+          data: { data: { resolveReviewThread: { thread: { id: "thread-abc", isResolved: true } } } },
+        };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      await expect(
+        service.setReviewThreadResolved({ prId: "pr-1", threadId: "thread-abc", resolved: true }),
+      ).resolves.toEqual({ threadId: "thread-abc", isResolved: true });
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it("uses unresolveReviewThread mutation when resolved=false", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-unresolve-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: p, body }: any) => {
+        if (p !== "/graphql") return { data: {} };
+        const q: string = body?.query ?? "";
+        if (q.includes("reviewThreads(first:")) return mockReviewThreadsResponse();
+        expect(q).toContain("unresolveReviewThread(");
+        return {
+          data: { data: { unresolveReviewThread: { thread: { id: "thread-abc", isResolved: false } } } },
+        };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      await expect(
+        service.setReviewThreadResolved({ prId: "pr-1", threadId: "thread-abc", resolved: false }),
+      ).resolves.toEqual({ threadId: "thread-abc", isResolved: false });
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("prService.reactToComment", () => {
+  it("issues addReaction with the correct enum value", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-react-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: p, body }: any) => {
+        if (p !== "/graphql") return { data: {} };
+        const q: string = body?.query ?? "";
+        expect(q).toContain("addReaction(");
+        expect(body.variables).toEqual({ subjectId: "comment-1", content: "ROCKET" });
+        return { data: { data: { addReaction: { reaction: { id: "r1", content: "ROCKET" } } } } };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      await expect(
+        service.reactToComment({ prId: "pr-1", commentId: "comment-1", content: "rocket" }),
+      ).resolves.toBeUndefined();
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("prService.getDeployments", () => {
+  it("maps GitHub deployments + latest status into PrDeployment shape", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-deploy-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: p, query }: any) => {
+        if (p === "/repos/arul28/ADE/pulls/42") {
+          return { data: { head: { sha: "deadbeef" }, base: { sha: "baseabc" }, state: "open" } };
+        }
+        if (p === "/repos/arul28/ADE/deployments") {
+          expect(query).toMatchObject({ sha: "deadbeef" });
+          return {
+            data: [
+              {
+                id: 1001,
+                environment: "staging",
+                description: "deploy-desc",
+                payload: { web_url: "https://payload.example" },
+                sha: "deadbeef",
+                ref: "feature/timeline",
+                creator: { login: "arul" },
+                created_at: "2026-04-14T01:00:00.000Z",
+                updated_at: "2026-04-14T01:00:00.000Z",
+              },
+            ],
+          };
+        }
+        if (p === "/repos/arul28/ADE/deployments/1001/statuses") {
+          return {
+            data: [
+              {
+                state: "success",
+                environment_url: "https://preview.example",
+                log_url: "https://logs.example",
+                target_url: "https://target.example",
+                updated_at: "2026-04-14T02:00:00.000Z",
+              },
+            ],
+          };
+        }
+        return { data: [] };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      const deployments = await service.getDeployments("pr-1");
+      expect(deployments).toHaveLength(1);
+      expect(deployments[0]).toMatchObject({
+        environment: "staging",
+        state: "success",
+        environmentUrl: "https://preview.example",
+        logUrl: "https://logs.example",
+        sha: "deadbeef",
+        ref: "feature/timeline",
+        creator: "arul",
+      });
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it("returns an empty array when the PR has no head SHA", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-deploy-empty-"));
+    const { db, projectId, lane } = await buildService(root);
+    try {
+      const apiRequest = vi.fn(async ({ path: p }: any) => {
+        if (p === "/repos/arul28/ADE/pulls/42") {
+          return { data: { head: {}, base: {} } };
+        }
+        return { data: [] };
+      });
+      const service = createPrService({
+        db,
+        logger: createLogger() as any,
+        projectId,
+        projectRoot: root,
+        laneService: { list: async () => [lane] } as any,
+        operationService: {} as any,
+        githubService: { apiRequest } as any,
+        aiIntegrationService: undefined,
+        projectConfigService: {} as any,
+        conflictService: undefined,
+        openExternal: async () => {},
+      });
+      await expect(service.getDeployments("pr-1")).resolves.toEqual([]);
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
diff --git a/apps/desktop/src/main/services/prs/prService.ts b/apps/desktop/src/main/services/prs/prService.ts
index 0e8d6199d..a15d1c346 100644
--- a/apps/desktop/src/main/services/prs/prService.ts
+++ b/apps/desktop/src/main/services/prs/prService.ts
@@ -85,6 +85,13 @@ import type {
   PrReviewThreadComment,
   ReplyToPrReviewThreadArgs,
   ResolvePrReviewThreadArgs,
+  PrDeployment,
+  PrDeploymentState,
+  PostPrReviewCommentArgs,
+  SetPrReviewThreadResolvedArgs,
+  SetPrReviewThreadResolvedResult,
+  ReactToPrCommentArgs,
+  PrReactionContent,
 } from "../../../shared/types";
 import type { AdeDb } from "../state/kvDb";
 import type { Logger } from "../logging/logger";
@@ -554,6 +561,34 @@ function toFileStatus(raw: unknown): PrFile["status"] {
   return "modified";
 }
 
+const DEPLOYMENT_STATES = new Set<PrDeploymentState>([
+  "success",
+  "failure",
+  "error",
+  "pending",
+  "in_progress",
+  "queued",
+  "inactive",
+]);
+
+function toDeploymentState(raw: unknown): PrDeploymentState {
+  const s = asString(raw).toLowerCase() as PrDeploymentState;
+  return DEPLOYMENT_STATES.has(s) ? s : "unknown";
+}
+
+function reactionToGraphqlEnum(content: PrReactionContent): string {
+  switch (content) {
+    case "+1": return "THUMBS_UP";
+    case "-1": return "THUMBS_DOWN";
+    case "laugh": return "LAUGH";
+    case "confused": return "CONFUSED";
+    case "heart": return "HEART";
+    case "hooray": return "HOORAY";
+    case "rocket": return "ROCKET";
+    case "eyes": return "EYES";
+  }
+}
+
 function toUser(raw: any): PrUser {
   return {
     login: asString(raw?.login) || "",
@@ -1570,6 +1605,19 @@ export function createPrService({
     }
     upsertRow(updated);
 
+    // Keep `head_sha` in sync so downstream features (AI summary cache, deployments)
+    // can reliably reference the latest commit on the PR head branch.
+    if (headSha) {
+      try {
+        db.run("update pull_requests set head_sha = ? where id = ? and project_id = ?", [headSha, row.id, projectId]);
+      } catch (err) {
+        logger.warn("prs.head_sha_persist_failed", {
+          prId: row.id,
+          error: err instanceof Error ? err.message : String(err),
+        });
+      }
+    }
+
     return updated;
   };
 
@@ -4893,6 +4941,178 @@ export function createPrService({
       );
     },
 
+    async postReviewComment(args: PostPrReviewCommentArgs): Promise<PrReviewThreadComment> {
+      const row = requireRow(args.prId);
+      const repo = repoFromRow(row);
+      const threads = await fetchReviewThreads(repo, Number(row.github_pr_number));
+      if (!threads.some((t) => t.id === args.threadId)) {
+        throw new Error(`Thread ${args.threadId} does not belong to PR ${args.prId}`);
+      }
+      const data = await graphqlRequest<{
+        addPullRequestReviewThreadReply?: {
+          comment?: {
+            id?: unknown;
+            body?: unknown;
+            url?: unknown;
+            createdAt?: unknown;
+            updatedAt?: unknown;
+            author?: { login?: unknown; avatarUrl?: unknown } | null;
+          } | null;
+        } | null;
+      }>(
+        `
+          mutation AdePostReviewComment($threadId: ID!, $body: String!) {
+            addPullRequestReviewThreadReply(input: { pullRequestReviewThreadId: $threadId, body: $body }) {
+              comment {
+                id
+                body
+                url
+                createdAt
+                updatedAt
+                author { login avatarUrl }
+              }
+            }
+          }
+        `,
+        { threadId: args.threadId, body: args.body },
+      );
+      const comment = data.addPullRequestReviewThreadReply?.comment;
+      if (!comment) {
+        throw new Error("GitHub did not return the review-thread reply.");
+      }
+      return {
+        id: asString(comment.id) || String(randomUUID()),
+        author: asString(comment.author?.login) || "unknown",
+        authorAvatarUrl: asString(comment.author?.avatarUrl) || null,
+        body: asString(comment.body) || null,
+        url: asString(comment.url) || null,
+        createdAt: asString(comment.createdAt) || null,
+        updatedAt: asString(comment.updatedAt) || null,
+      };
+    },
+
+    async setReviewThreadResolved(args: SetPrReviewThreadResolvedArgs): Promise<SetPrReviewThreadResolvedResult> {
+      const row = requireRow(args.prId);
+      const repo = repoFromRow(row);
+      const threads = await fetchReviewThreads(repo, Number(row.github_pr_number));
+      if (!threads.some((t) => t.id === args.threadId)) {
+        throw new Error(`Thread ${args.threadId} does not belong to PR ${args.prId}`);
+      }
+      if (args.resolved) {
+        const data = await graphqlRequest<{
+          resolveReviewThread?: { thread?: { id?: unknown; isResolved?: unknown } | null } | null;
+        }>(
+          `
+            mutation AdeResolveReviewThread($threadId: ID!) {
+              resolveReviewThread(input: { threadId: $threadId }) {
+                thread { id isResolved }
+              }
+            }
+          `,
+          { threadId: args.threadId },
+        );
+        const thread = data.resolveReviewThread?.thread ?? null;
+        return {
+          threadId: asString(thread?.id) || args.threadId,
+          isResolved: thread?.isResolved === true,
+        };
+      }
+      const data = await graphqlRequest<{
+        unresolveReviewThread?: { thread?: { id?: unknown; isResolved?: unknown } | null } | null;
+      }>(
+        `
+          mutation AdeUnresolveReviewThread($threadId: ID!) {
+            unresolveReviewThread(input: { threadId: $threadId }) {
+              thread { id isResolved }
+            }
+          }
+        `,
+        { threadId: args.threadId },
+      );
+      const thread = data.unresolveReviewThread?.thread ?? null;
+      return {
+        threadId: asString(thread?.id) || args.threadId,
+        isResolved: thread?.isResolved === true,
+      };
+    },
+
+    async reactToComment(args: ReactToPrCommentArgs): Promise<void> {
+      // requireRow gates the caller's access to the PR, but the commentId is
+      // trusted from the UI: reactions can target review comments, issue
+      // comments, or review threads — validating ownership for every node type
+      // would require an extra GraphQL round-trip per click and offers little
+      // defense given the user already has write access to the PR's comments.
+      requireRow(args.prId);
+      const contentEnum = reactionToGraphqlEnum(args.content);
+      await graphqlRequest(
+        `
+          mutation AdeReactToComment($subjectId: ID!, $content: ReactionContent!) {
+            addReaction(input: { subjectId: $subjectId, content: $content }) {
+              reaction { id content }
+            }
+          }
+        `,
+        { subjectId: args.commentId, content: contentEnum },
+      );
+    },
+
+    async getDeployments(prId: string): Promise<PrDeployment[]> {
+      const row = requireRow(prId);
+      const repo = repoFromRow(row);
+      const pr = await fetchPr(repo, Number(row.github_pr_number));
+      const headSha = asString(pr?.head?.sha);
+      if (!headSha) return [];
+      const { data } = await githubService.apiRequest<any[]>({
+        method: "GET",
+        path: `/repos/${repo.owner}/${repo.name}/deployments`,
+        query: { sha: headSha, per_page: 100 },
+      });
+      const list = Array.isArray(data) ? data : [];
+      const deployments: PrDeployment[] = await Promise.all(
+        list.map(async (d): Promise<PrDeployment> => {
+          const deploymentId = String(asNumber(d?.id) ?? asString(d?.id) ?? "");
+          let state: PrDeploymentState = "unknown";
+          let environmentUrl: string | null = asString(d?.payload?.web_url) || null;
+          let logUrl: string | null = null;
+          let updatedAt: string | null = asString(d?.updated_at) || null;
+          try {
+            const { data: statuses } = await githubService.apiRequest<any[]>({
+              method: "GET",
+              path: `/repos/${repo.owner}/${repo.name}/deployments/${deploymentId}/statuses`,
+              query: { per_page: 1 },
+            });
+            const latest = Array.isArray(statuses) && statuses.length > 0 ? statuses[0] : null;
+            if (latest) {
+              state = toDeploymentState(latest.state);
+              environmentUrl = asString(latest.environment_url) || environmentUrl;
+              logUrl = asString(latest.log_url) || asString(latest.target_url) || null;
+              updatedAt = asString(latest.updated_at) || updatedAt;
+            }
+          } catch (err) {
+            logger.warn("prs.get_deployments_status_failed", {
+              prId,
+              deploymentId,
+              error: err instanceof Error ? err.message : String(err),
+            });
+          }
+          return {
+            id: deploymentId || randomUUID(),
+            environment: asString(d?.environment) || "unknown",
+            state,
+            description: asString(d?.description) || null,
+            environmentUrl,
+            logUrl,
+            sha: asString(d?.sha) || headSha,
+            ref: asString(d?.ref) || null,
+            creator: asString(d?.creator?.login) || null,
+            createdAt: asString(d?.created_at) || null,
+            updatedAt,
+          };
+        }),
+      );
+      return deployments;
+    },
+
     async updateTitle(args: UpdatePrTitleArgs): Promise<void> {
       const row = requireRow(args.prId);
       const repo = repoFromRow(row);
diff --git a/apps/desktop/src/main/services/prs/prSummaryService.test.ts b/apps/desktop/src/main/services/prs/prSummaryService.test.ts
new file mode 100644
index 000000000..5fafd2de8
--- /dev/null
+++ b/apps/desktop/src/main/services/prs/prSummaryService.test.ts
@@ -0,0 +1,283 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { describe, expect, it, vi } from "vitest";
+import { openKvDb } from "../state/kvDb";
+import { buildPrSummaryPrompt, createPrSummaryService, parsePrSummaryJson } from "./prSummaryService";
+
+function createLogger() {
+  return {
+    debug: () => {},
+    info: () => {},
+    warn: () => {},
+    error: () => {},
+  } as const;
+}
+
+async function seed(db: any, prId: string, headSha: string | null) {
+  const now = "2026-04-14T00:00:00.000Z";
+  db.run(
+    "insert into projects(id, root_path, display_name, default_base_ref, created_at, last_opened_at) values (?, ?, ?, ?, ?, ?)",
+    ["proj", "/tmp", "ADE", "main", now, now],
+  );
+  db.run(
+    `
+      insert into pull_requests(
+        id, project_id, lane_id, repo_owner, repo_name, github_pr_number, github_url, github_node_id,
+        title, state, base_branch, head_branch, checks_status, review_status, additions, deletions,
+        last_synced_at, created_at, updated_at, head_sha
+      ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `,
+    [
+      prId,
+      "proj",
+      "lane-1",
+      "arul28",
+      "ADE",
+      1,
+      "https://github.com/arul28/ADE/pull/1",
+      null,
+      "Test",
+      "open",
+      "main",
+      "feat",
+      "passing",
+      "approved",
+      0,
+      0,
+      now,
+      now,
+      now,
+      headSha,
+    ],
+  );
+}
+
+describe("buildPrSummaryPrompt", () => {
+  it("includes title, body, file list, unresolved count, and bot summaries", () => {
+    const prompt = buildPrSummaryPrompt({
+      title: "Add feature",
+      body: "Body content",
+      changedFiles: [
+        { filename: "a.ts", status: "modified", additions: 1, deletions: 0, patch: null, previousFilename: null },
+        { filename: "b.ts", status: "added", additions: 10, deletions: 0, patch: null, previousFilename: null },
+      ],
+      issueComments: [
+        {
+          id: "c1",
+          author: "greptile-bot",
+          authorAvatarUrl: null,
+          body: "Looks risky",
+          source: "issue",
+          url: null,
+          path: null,
+          line: null,
+          createdAt: null,
+          updatedAt: null,
+        },
+      ],
+      reviews: [
+        {
+          reviewer: "coderabbitai[bot]",
+          reviewerAvatarUrl: null,
+          state: "commented",
+          body: "Formal bot review body",
+          submittedAt: null,
+        },
+      ],
+      unresolvedThreadCount: 3,
+    });
+    expect(prompt).toContain("Add feature");
+    expect(prompt).toContain("Body content");
+    expect(prompt).toContain("modified a.ts");
+    expect(prompt).toContain("added b.ts");
+    expect(prompt).toContain("Unresolved review threads: 3");
+    expect(prompt).toContain("@greptile-bot");
+  });
+});
+
+describe("parsePrSummaryJson", () => {
+  it("returns fields when valid JSON provided", () => {
+    const result = parsePrSummaryJson(
+      '```json\n{"summary":"x","riskAreas":["a"],"reviewerHotspots":["b"],"unresolvedConcerns":[]}\n```',
+    );
+    expect(result).toEqual({
+      summary: "x",
+      riskAreas: ["a"],
+      reviewerHotspots: ["b"],
+      unresolvedConcerns: [],
+    });
+  });
+
+  it("filters non-string array entries", () => {
+    const result = parsePrSummaryJson(
+      '{"summary":"s","riskAreas":["ok", 5, null],"reviewerHotspots":[],"unresolvedConcerns":[]}',
+    );
+    expect(result?.riskAreas).toEqual(["ok"]);
+  });
+
+  it("returns null on missing JSON", () => {
+    expect(parsePrSummaryJson("no json here")).toBeNull();
+  });
+
+  it("returns null on invalid JSON", () => {
+    expect(parsePrSummaryJson("{ not json }")).toBeNull();
+  });
+});
+
+describe("createPrSummaryService", () => {
+  it("returns null from getSummary when no cache entry exists", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-sum-get-"));
+    const db = await openKvDb(path.join(root, ".ade.db"), createLogger());
+    try {
+      await seed(db, "pr-1", "headA");
+      const svc = createPrSummaryService({
+        db,
+        logger: createLogger() as any,
+        projectRoot: root,
+        prService: {} as any,
+      });
+      await expect(svc.getSummary("pr-1")).resolves.toBeNull();
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it("regenerateSummary caches the result keyed by (prId, headSha) and parses JSON", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-sum-regen-"));
+    const db = await openKvDb(path.join(root, ".ade.db"), createLogger());
+    try {
+      await seed(db, "pr-1", "headA");
+
+      const prService = {
+        listAll: () => [
+          {
+            id: "pr-1",
+            laneId: "lane-1",
+            projectId: "proj",
+            repoOwner: "arul28",
+            repoName: "ADE",
+            githubPrNumber: 1,
+            githubUrl: "",
+            githubNodeId: null,
+            title: "PR title",
+            state: "open",
+            baseBranch: "main",
+            headBranch: "feat",
+            checksStatus: "passing",
+            reviewStatus: "approved",
+            additions: 0,
+            deletions: 0,
+            lastSyncedAt: null,
+            createdAt: "",
+            updatedAt: "",
+          },
+        ],
+        getDetail: vi.fn(async () => ({
+          prId: "pr-1",
+          body: "Detail body",
+          labels: [],
+          assignees: [],
+          requestedReviewers: [],
+          author: { login: "arul", avatarUrl: null },
+          isDraft: false,
+          milestone: null,
+          linkedIssues: [],
+        })),
+        getFiles: vi.fn(async () => [
+          { filename: "x.ts", status: "modified", additions: 1, deletions: 0, patch: null, previousFilename: null },
+        ]),
+        getComments: vi.fn(async () => []),
+        getReviewThreads: vi.fn(async () => [
+          {
+            id: "t1",
+            isResolved: false,
+            isOutdated: false,
+            path: "x.ts",
+            line: 1,
+            originalLine: 1,
+            startLine: 0,
+            originalStartLine: 0,
+            diffSide: "RIGHT",
+            url: null,
+            createdAt: null,
+            updatedAt: null,
+            comments: [],
+          },
+        ]),
+        getReviews: vi.fn(async () => []),
+      };
+
+      const aiIntegrationService = {
+        draftPrDescription: vi.fn(async () => ({
+          text: '{"summary":"ok","riskAreas":["a"],"reviewerHotspots":["b"],"unresolvedConcerns":["c"]}',
+          durationMs: 10,
+          executedAt: "x",
+          model: "m",
+          provider: "openai" as const,
+          reasoningEffort: null,
+          promptTokens: null,
+          completionTokens: null,
+          totalTokens: null,
+          budgetState: null,
+          taskType: "pr_description" as const,
+          feature: "pr_descriptions" as const,
+        })),
+      };
+
+      const svc = createPrSummaryService({
+        db,
+        logger: createLogger() as any,
+        projectRoot: root,
+        prService: prService as any,
+        aiIntegrationService: aiIntegrationService as any,
+      });
+
+      const result = await svc.regenerateSummary("pr-1");
+      expect(result.summary).toBe("ok");
+      expect(result.riskAreas).toEqual(["a"]);
+      expect(result.headSha).toBe("headA");
+      expect(aiIntegrationService.draftPrDescription).toHaveBeenCalledTimes(1);
+
+      const cached = await svc.getSummary("pr-1");
+      expect(cached?.summary).toBe("ok");
+      expect(cached?.headSha).toBe("headA");
+
+      // regenerateSummary bypasses cache and always calls AI
+      const again = await svc.regenerateSummary("pr-1");
+      expect(again.summary).toBe("ok");
+      expect(aiIntegrationService.draftPrDescription).toHaveBeenCalledTimes(2);
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it("falls back gracefully when aiIntegrationService is missing", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "ade-prs-sum-fallback-"));
+    const db = await openKvDb(path.join(root, ".ade.db"), createLogger());
+    try {
+      await seed(db, "pr-1", "headA");
+      const prService = {
+        listAll: () => [{ id: "pr-1", title: "t" } as any],
+        getDetail: async () => null,
+        getFiles: async () => [],
+        getComments: async () => [],
+        getReviewThreads: async () => [],
+        getReviews: async () => [],
+      };
+      const svc = createPrSummaryService({
+        db,
+        logger: createLogger() as any,
+        projectRoot: root,
+        prService: prService as any,
+      });
+      const result = await svc.regenerateSummary("pr-1");
+      expect(result.summary).toMatch(/0 file/);
+    } finally {
+      db.close();
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
diff --git a/apps/desktop/src/main/services/prs/prSummaryService.ts b/apps/desktop/src/main/services/prs/prSummaryService.ts
new file mode 100644
index 000000000..2a3fe36c7
--- /dev/null
+++ b/apps/desktop/src/main/services/prs/prSummaryService.ts
@@ -0,0 +1,284 @@
+import type {
+  PrAiSummary,
+  PrComment,
+  PrDetail,
+  PrFile,
+  PrReview,
+  PrReviewThread,
+} from "../../../shared/types";
+import type { AdeDb } from "../state/kvDb";
+import type { Logger } from "../logging/logger";
+import type { createAiIntegrationService } from "../ai/aiIntegrationService";
+import type { createPrService } from "./prService";
+import { extractFirstJsonObject } from "../ai/utils";
+import { asString, nowIso } from "../shared/utils";
+
+type PrSummaryServiceDeps = {
+  db: AdeDb;
+  logger: Logger;
+  projectRoot: string;
+  prService: ReturnType<typeof createPrService>;
+  aiIntegrationService?: ReturnType<typeof createAiIntegrationService>;
+};
+
+type CachedSummaryRow = {
+  pr_id: string;
+  head_sha: string;
+  summary_json: string;
+  generated_at: string;
+};
+
+function toStringArray(value: unknown): string[] {
+  if (!Array.isArray(value)) return [];
+  return value.filter((entry): entry is string => typeof entry === "string" && entry.trim().length > 0);
+}
+
+function isBotLogin(login: string | null | undefined): boolean {
+  const l = (login ?? "").toLowerCase();
+  return l.includes("bot") || l.includes("greptile") || l.includes("seer") || l.includes("coderabbit");
+}
+
+function summarizeBotReviews(comments: PrComment[], reviews: PrReview[]): string {
+  const commentParts = comments
+    .filter((c) => isBotLogin(c.author))
+    .slice(0, 5)
+    .map((c) => `- @${c.author}: ${(c.body ?? "").slice(0, 280)}`);
+  const reviewParts = reviews
+    .filter((r) => isBotLogin(r.reviewer) && (r.body ?? "").trim().length > 0)
+    .slice(0, 3)
+    .map((r) => `- @${r.reviewer} [${r.state}]: ${(r.body ?? "").slice(0, 280)}`);
+  const all = [...commentParts, ...reviewParts];
+  if (all.length === 0) return "(no bot reviews)";
+  return all.join("\n");
+}
+
+export function buildPrSummaryPrompt(args: {
+  title: string;
+  body: string | null;
+  changedFiles: PrFile[];
+  issueComments: PrComment[];
+  reviews: PrReview[];
+  unresolvedThreadCount: number;
+}): string {
+  const fileList = args.changedFiles
+    .slice(0, 30)
+    .map((f) => `- ${f.status} ${f.filename} (+${f.additions}/-${f.deletions})`)
+    .join("\n");
+  const hidden = args.changedFiles.length > 30 ? `\n(+${args.changedFiles.length - 30} more files)` : "";
+  return [
+    "You are a senior reviewer preparing a pull-request briefing card.",
+    'Return ONLY a JSON object with this exact shape:',
+    '{"summary": string, "riskAreas": string[], "reviewerHotspots": string[], "unresolvedConcerns": string[]}',
+    "",
+    "- summary: 2-3 sentences, plain English, what this PR does and why it matters.",
+    "- riskAreas: short phrases naming the riskiest subsystems or files to inspect.",
+    "- reviewerHotspots: 1-6 short bullet points reviewers should focus on.",
+    "- unresolvedConcerns: 0-6 items explicitly derived from bot/human review comments that are still open. Skip if none.",
+    "",
+    `PR title: ${args.title}`,
+    "",
+    "PR description:",
+    (args.body ?? "").slice(0, 4000) || "(empty)",
+    "",
+    "Changed files:",
+    fileList || "(none)",
+    hidden,
+    "",
+    `Unresolved review threads: ${args.unresolvedThreadCount}`,
+    "",
+    "Bot review summaries:",
+    summarizeBotReviews(args.issueComments, args.reviews),
+    "",
+    "Return the JSON object only. No code fences, no prose.",
+  ].join("\n");
+}
+
+export function parsePrSummaryJson(raw: string | null | undefined): Pick<
+  PrAiSummary,
+  "summary" | "riskAreas" | "reviewerHotspots" | "unresolvedConcerns"
+> | null {
+  if (!raw) return null;
+  const json = extractFirstJsonObject(raw);
+  if (!json) return null;
+  try {
+    const obj = JSON.parse(json) as Record<string, unknown>;
+    return {
+      summary: typeof obj.summary === "string" ? obj.summary.trim() : "",
+      riskAreas: toStringArray(obj.riskAreas),
+      reviewerHotspots: toStringArray(obj.reviewerHotspots),
+      unresolvedConcerns: toStringArray(obj.unresolvedConcerns),
+    };
+  } catch {
+    return null;
+  }
+}
+
+async function fetchPrInputs(deps: PrSummaryServiceDeps, prId: string): Promise<{
+  title: string;
+  body: string | null;
+  files: PrFile[];
+  issueComments: PrComment[];
+  reviews: PrReview[];
+  unresolvedThreadCount: number;
+  headSha: string | null;
+  detail: PrDetail | null;
+}> {
+  const summaries = deps.prService.listAll();
+  const summary = summaries.find((s) => s.id === prId);
+  const [detail, files, comments, threads, reviews] = await Promise.all([
+    deps.prService.getDetail(prId).catch((): PrDetail | null => null),
+    deps.prService.getFiles(prId).catch((): PrFile[] => []),
+    deps.prService.getComments(prId).catch((): PrComment[] => []),
+    deps.prService.getReviewThreads(prId).catch((): PrReviewThread[] => []),
+    deps.prService.getReviews(prId).catch((): PrReview[] => []),
+  ]);
+  const unresolved = threads.filter((t) => !t.isResolved).length;
+  const row = deps.db.get<{ head_sha: string | null }>(
+    "select head_sha from pull_requests where id = ? limit 1",
+    [prId],
+  );
+  const headSha = asString(row?.head_sha) || null;
+  return {
+    title: summary?.title ?? "(untitled)",
+    body: detail?.body ?? null,
+    files,
+    issueComments: comments,
+    reviews,
+    unresolvedThreadCount: unresolved,
+    headSha,
+    detail,
+  };
+}
+
+export function createPrSummaryService(deps: PrSummaryServiceDeps) {
+  const readCache = (prId: string, headSha: string): PrAiSummary | null => {
+    const row = deps.db.get<CachedSummaryRow>(
+      "select pr_id, head_sha, summary_json, generated_at from pull_request_ai_summaries where pr_id = ? and head_sha = ? limit 1",
+      [prId, headSha],
+    );
+    if (!row) return null;
+    try {
+      const parsed = JSON.parse(row.summary_json) as Partial<PrAiSummary>;
+      return {
+        prId: row.pr_id,
+        summary: typeof parsed.summary === "string" ? parsed.summary : "",
+        riskAreas: toStringArray(parsed.riskAreas),
+        reviewerHotspots: toStringArray(parsed.reviewerHotspots),
+        unresolvedConcerns: toStringArray(parsed.unresolvedConcerns),
+        generatedAt: row.generated_at,
+        headSha: row.head_sha,
+      };
+    } catch (err) {
+      deps.logger.warn("prs.ai_summary_cache_parse_failed", {
+        prId,
+        headSha,
+        error: err instanceof Error ? err.message : String(err),
+      });
+      return null;
+    }
+  };
+
+  const writeCache = (summary: PrAiSummary): void => {
+    deps.db.run(
+      `
+        insert or replace into pull_request_ai_summaries(pr_id, head_sha, summary_json, generated_at)
+        values (?, ?, ?, ?)
+      `,
+      [
+        summary.prId,
+        summary.headSha,
+        JSON.stringify({
+          summary: summary.summary,
+          riskAreas: summary.riskAreas,
+          reviewerHotspots: summary.reviewerHotspots,
+          unresolvedConcerns: summary.unresolvedConcerns,
+        }),
+        summary.generatedAt,
+      ],
+    );
+  };
+
+  const generate = async (prId: string, options: { force?: boolean } = {}): Promise<PrAiSummary> => {
+    const inputs = await fetchPrInputs(deps, prId);
+    const headSha = inputs.headSha ?? "unknown";
+    if (!options.force && inputs.headSha) {
+      const cached = readCache(prId, inputs.headSha);
+      if (cached) return cached;
+    }
+
+    const prompt = buildPrSummaryPrompt({
+      title: inputs.title,
+      body: inputs.body,
+      changedFiles: inputs.files,
+      issueComments: inputs.issueComments,
+      reviews: inputs.reviews,
+      unresolvedThreadCount: inputs.unresolvedThreadCount,
+    });
+
+    if (!deps.aiIntegrationService) {
+      const fallback: PrAiSummary = {
+        prId,
+        summary: `This PR modifies ${inputs.files.length} file(s).`,
+        riskAreas: [],
+        reviewerHotspots: [],
+        unresolvedConcerns:
+          inputs.unresolvedThreadCount > 0
+            ? [`${inputs.unresolvedThreadCount} unresolved review threads`]
+            : [],
+        generatedAt: nowIso(),
+        headSha,
+      };
+      if (inputs.headSha) writeCache(fallback);
+      return fallback;
+    }
+
+    try {
+      const result = await deps.aiIntegrationService.draftPrDescription({
+        laneId: "", // aiIntegrationService accepts empty laneId for one-shot tasks; uses projectRoot cwd.
+        cwd: deps.projectRoot,
+        prompt,
+      });
+      const parsed = parsePrSummaryJson(result.text);
+      const summary: PrAiSummary = {
+        prId,
+        summary: parsed?.summary ?? "AI summary unavailable.",
+        riskAreas: parsed?.riskAreas ?? [],
+        reviewerHotspots: parsed?.reviewerHotspots ?? [],
+        unresolvedConcerns: parsed?.unresolvedConcerns ?? [],
+        generatedAt: nowIso(),
+        headSha,
+      };
+      if (inputs.headSha) writeCache(summary);
+      return summary;
+    } catch (err) {
+      deps.logger.warn("prs.ai_summary_generate_failed", {
+        prId,
+        error: err instanceof Error ? err.message : String(err),
+      });
+      const fallback: PrAiSummary = {
+        prId,
+        summary: "AI summary failed. Try regenerating.",
+        riskAreas: [],
+        reviewerHotspots: [],
+        unresolvedConcerns: [],
+        generatedAt: nowIso(),
+        headSha,
+      };
+      return fallback;
+    }
+  };
+
+  return {
+    getSummary: async (prId: string): Promise<PrAiSummary | null> => {
+      const row = deps.db.get<{ head_sha: string | null }>(
+        "select head_sha from pull_requests where id = ? limit 1",
+        [prId],
+      );
+      const headSha = asString(row?.head_sha) || null;
+      if (!headSha) return null;
+      return readCache(prId, headSha);
+    },
+    regenerateSummary: async (prId: string): Promise<PrAiSummary> => generate(prId, { force: true }),
+    ensureSummary: async (prId: string): Promise<PrAiSummary> => generate(prId, { force: false }),
+  };
+}
diff --git a/apps/desktop/src/main/services/runtime/adeMcpLaunch.test.ts b/apps/desktop/src/main/services/runtime/adeMcpLaunch.test.ts
index 911fc215b..1ee33dc5d 100644
--- a/apps/desktop/src/main/services/runtime/adeMcpLaunch.test.ts
+++ b/apps/desktop/src/main/services/runtime/adeMcpLaunch.test.ts
@@ -2,15 +2,23 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
+import { resolveExecutableFromKnownLocations } from "../ai/cliExecutableResolver";
 import { resolveDesktopAdeMcpLaunch, resolveRepoRuntimeRoot } from "./adeMcpLaunch";
 
 const originalResourcesPath = process.resourcesPath;
+const originalExecPath = process.execPath;
+const originalPath = process.env.PATH;
 
 afterEach(() => {
   Object.defineProperty(process, "resourcesPath", {
     configurable: true,
     value: originalResourcesPath,
   });
+  Object.defineProperty(process, "execPath", {
+    configurable: true,
+    value: originalExecPath,
+  });
+  process.env.PATH = originalPath;
 });
 
 describe("resolveDesktopAdeMcpLaunch", () => {
@@ -29,7 +37,7 @@ describe("resolveDesktopAdeMcpLaunch", () => {
     });
 
     expect(launch.mode).toBe("bundled_proxy");
-    expect(launch.command).toBe(process.execPath);
+    expect(launch.command).toBe(resolveExecutableFromKnownLocations("node")?.path ?? process.argv0 ?? process.execPath);
     expect(launch.cmdArgs).toEqual([
       path.resolve(proxyEntry),
       "--project-root",
@@ -314,6 +322,33 @@ describe("resolveDesktopAdeMcpLaunch", () => {
     expect(launch.mode).toBe("bundled_proxy");
     expect(launch.runtimeRoot).toBeNull();
   });
+
+  it("falls back to a resolvable node executable when process.execPath is stale", () => {
+    const tempBinDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-launch-node-bin-"));
+    const projectRoot = fs.mkdtempSync(path.join(os.tmpdir(), "ade-launch-project-stale-"));
+    const workspaceRoot = path.join(projectRoot, "workspace");
+    const proxyEntry = path.join(projectRoot, "dist", "main", "adeMcpProxy.cjs");
+    const fakeNode = path.join(tempBinDir, "node");
+
+    fs.mkdirSync(workspaceRoot, { recursive: true });
+    fs.mkdirSync(path.dirname(proxyEntry), { recursive: true });
+    fs.writeFileSync(proxyEntry, "module.exports = {};\n", "utf8");
+    fs.writeFileSync(fakeNode, "#!/bin/sh\nexit 0\n", { encoding: "utf8", mode: 0o755 });
+    Object.defineProperty(process, "execPath", {
+      configurable: true,
+      value: path.join(tempBinDir, "missing-node"),
+    });
+    process.env.PATH = `${tempBinDir}${path.delimiter}${originalPath ?? ""}`;
+
+    const launch = resolveDesktopAdeMcpLaunch({
+      projectRoot,
+      workspaceRoot,
+      bundledProxyPath: proxyEntry,
+    });
+
+    expect(launch.mode).toBe("bundled_proxy");
+    expect(launch.command).toBe(fakeNode);
+  });
 });
 
 describe("resolveRepoRuntimeRoot", () => {
diff --git a/apps/desktop/src/main/services/runtime/adeMcpLaunch.ts b/apps/desktop/src/main/services/runtime/adeMcpLaunch.ts
index 42f965b30..309700db8 100644
--- a/apps/desktop/src/main/services/runtime/adeMcpLaunch.ts
+++ b/apps/desktop/src/main/services/runtime/adeMcpLaunch.ts
@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { resolveAdeLayout } from "../../../shared/adeLayout";
 import type { ComputerUsePolicy } from "../../../shared/types";
+import { resolveExecutableFromKnownLocations } from "../ai/cliExecutableResolver";
 
 export type AdeMcpLaunchMode = "bundled_proxy" | "headless_built" | "headless_source";
 export type AdeMcpWorkspaceBinding = "explicit" | "project_root";
@@ -76,6 +77,21 @@ function resolveBundledProxyPath(overridePath?: string): string | null {
   return null;
 }
 
+function resolveBundledProxyCommand(packaged: boolean): string {
+  if (packaged && pathExists(process.execPath)) {
+    return process.execPath;
+  }
+  const resolvedNode = resolveExecutableFromKnownLocations("node")?.path;
+  if (resolvedNode) {
+    return resolvedNode;
+  }
+  const argv0 = typeof process.argv0 === "string" ? process.argv0.trim() : "";
+  if (argv0.length > 0) {
+    return argv0;
+  }
+  return process.execPath;
+}
+
 export function resolveRepoRuntimeRoot(): string {
   const startPoints = [
     process.cwd(),
@@ -154,7 +170,7 @@ export function resolveDesktopAdeMcpLaunch(args: DesktopAdeMcpLaunchArgs): AdeMc
   if (bundledProxyPath) {
     return {
       mode: "bundled_proxy",
-      command: process.execPath,
+      command: resolveBundledProxyCommand(packaged),
       cmdArgs: [bundledProxyPath, "--project-root", projectRoot, "--workspace-root", workspaceRoot],
       env: {
         ...env,
diff --git a/apps/desktop/src/main/services/sessions/sessionService.test.ts b/apps/desktop/src/main/services/sessions/sessionService.test.ts
index 2cfc13e00..0951767e0 100644
--- a/apps/desktop/src/main/services/sessions/sessionService.test.ts
+++ b/apps/desktop/src/main/services/sessions/sessionService.test.ts
@@ -216,6 +216,32 @@ describe("sessionService resume metadata", () => {
     activeDisposers.push(async () => db.close());
   });
 
+  it("hard deletes a stored session row", async () => {
+    const projectRoot = makeProjectRoot("ade-session-service-");
+    const dbPath = path.join(projectRoot, ".ade", "ade.db");
+    const db = await openKvDb(dbPath, createLogger() as any);
+    insertProjectGraph(db);
+    const service = createSessionService({ db });
+
+    service.create({
+      sessionId: "session-delete",
+      laneId: "lane-1",
+      ptyId: null,
+      tracked: true,
+      title: "Disposable chat",
+      startedAt: "2026-03-17T00:10:00.000Z",
+      transcriptPath: "/tmp/session-delete.log",
+      toolType: "opencode-chat",
+    });
+
+    expect(service.get("session-delete")?.id).toBe("session-delete");
+    expect(service.deleteSession("session-delete")).toBe(true);
+    expect(service.get("session-delete")).toBeNull();
+    expect(service.deleteSession("session-delete")).toBe(false);
+
+    activeDisposers.push(async () => db.close());
+  });
+
   it("reattaches an existing tracked session to a new PTY without changing its identity", async () => {
     const projectRoot = makeProjectRoot("ade-session-service-");
     const dbPath = path.join(projectRoot, ".ade", "ade.db");
@@ -300,4 +326,38 @@ describe("sessionService resume metadata", () => {
 
     activeDisposers.push(async () => db.close());
   });
+
+  it("reconciles stale running chat sessions when no exclusions are provided", async () => {
+    const projectRoot = makeProjectRoot("ade-session-service-");
+    const dbPath = path.join(projectRoot, ".ade", "ade.db");
+    const db = await openKvDb(dbPath, createLogger() as any);
+    insertProjectGraph(db);
+    const service = createSessionService({ db });
+
+    service.create({
+      sessionId: "session-chat-stale",
+      laneId: "lane-1",
+      ptyId: "pty-chat-stale",
+      tracked: true,
+      title: "Claude chat",
+      startedAt: "2026-03-17T00:10:00.000Z",
+      transcriptPath: "/tmp/session-chat-stale.log",
+      toolType: "claude-chat",
+    });
+
+    const reconciled = service.reconcileStaleRunningSessions({
+      endedAt: "2026-03-17T00:20:00.000Z",
+      status: "disposed",
+    });
+
+    expect(reconciled).toBe(1);
+    expect(service.get("session-chat-stale")).toEqual(expect.objectContaining({
+      id: "session-chat-stale",
+      ptyId: null,
+      status: "disposed",
+      endedAt: "2026-03-17T00:20:00.000Z",
+    }));
+
+    activeDisposers.push(async () => db.close());
+  });
 });
diff --git a/apps/desktop/src/main/services/sessions/sessionService.ts b/apps/desktop/src/main/services/sessions/sessionService.ts
index 81a261705..87f7e28d1 100644
--- a/apps/desktop/src/main/services/sessions/sessionService.ts
+++ b/apps/desktop/src/main/services/sessions/sessionService.ts
@@ -544,6 +544,19 @@ export function createSessionService({ db }: { db: AdeDb }) {
       ]);
     },
 
+    deleteSession(sessionId: string): boolean {
+      const trimmed = sessionId.trim();
+      if (!trimmed) return false;
+      const existing = db.get<{ present: number }>(
+        "select 1 as present from terminal_sessions where id = ? limit 1",
+        [trimmed],
+      );
+      if (!existing) return false;
+      db.run("delete from terminal_sessions where id = ?", [trimmed]);
+      emitChanged({ sessionId: trimmed, reason: "deleted" });
+      return true;
+    },
+
     async readTranscriptTail(
       transcriptPath: string,
       maxBytes: number,
diff --git a/apps/desktop/src/main/services/state/kvDb.ts b/apps/desktop/src/main/services/state/kvDb.ts
index 469a3e2b7..d5d0aa728 100644
--- a/apps/desktop/src/main/services/state/kvDb.ts
+++ b/apps/desktop/src/main/services/state/kvDb.ts
@@ -989,6 +989,21 @@ function migrate(db: { run: (sql: string, params?: SqlValue[]) => void }) {
   `);
   db.run("create index if not exists idx_pull_requests_lane_id on pull_requests(lane_id)");
   db.run("create index if not exists idx_pull_requests_project_id on pull_requests(project_id)");
+  try { db.run("alter table pull_requests add column last_polled_at text"); } catch {}
+  try { db.run("alter table pull_requests add column head_sha text"); } catch {}
+
+  // Phase 21: AI PR summary cache (keyed by PR + headSha so pushes invalidate).
+  db.run(`
+    create table if not exists pull_request_ai_summaries (
+      pr_id text not null,
+      head_sha text not null,
+      summary_json text not null,
+      generated_at text not null,
+      primary key(pr_id, head_sha),
+      foreign key(pr_id) references pull_requests(id)
+    )
+  `);
+  db.run("create index if not exists idx_pr_ai_summaries_pr_id on pull_request_ai_summaries(pr_id)");
 
   db.run(`
     create table if not exists pull_request_snapshots (
diff --git a/apps/desktop/src/preload/global.d.ts b/apps/desktop/src/preload/global.d.ts
index 914a83aa3..e09139fd0 100644
--- a/apps/desktop/src/preload/global.d.ts
+++ b/apps/desktop/src/preload/global.d.ts
@@ -63,6 +63,7 @@ import type {
   AgentTool,
   AgentChatApproveArgs,
   AgentChatCreateArgs,
+  AgentChatDeleteArgs,
   AgentChatDisposeArgs,
   AgentChatEventEnvelope,
   AgentChatGetSummaryArgs,
@@ -309,6 +310,14 @@ import type {
   PrStatus,
   PrSummary,
   PrWithConflicts,
+  PrDeployment,
+  PrAiSummary,
+  PostPrReviewCommentArgs,
+  SetPrReviewThreadResolvedArgs,
+  SetPrReviewThreadResolvedResult,
+  ReactToPrCommentArgs,
+  LaunchPrIssueResolutionFromThreadArgs,
+  LaunchPrIssueResolutionFromThreadResult,
   ReplyToPrReviewThreadArgs,
   ResolvePrReviewThreadArgs,
   ResumeQueueAutomationArgs,
@@ -341,6 +350,7 @@ import type {
   ListLanesArgs,
   ListOperationsArgs,
   ListSessionsArgs,
+  DeleteSessionArgs,
   ListTestRunsArgs,
   OperationRecord,
   ProcessActionArgs,
@@ -561,9 +571,11 @@ import type {
   ComputerUseOwnerSnapshot,
   ComputerUseOwnerSnapshotArgs,
   ComputerUseSettingsSnapshot,
-  FeedbackSubmitArgs,
+  FeedbackPrepareDraftArgs,
+  FeedbackPreparedDraft,
   FeedbackSubmission,
   FeedbackSubmissionEvent,
+  FeedbackSubmitDraftArgs,
 } from "../shared/types";
 
 export {};
@@ -1057,6 +1069,7 @@ declare global {
       sessions: {
         list: (args?: ListSessionsArgs) => Promise<TerminalSessionSummary[]>;
         get: (sessionId: string) => Promise<TerminalSessionDetail | null>;
+        delete: (args: DeleteSessionArgs) => Promise<void>;
         updateMeta: (args: UpdateSessionMetaArgs) => Promise<TerminalSessionSummary | null>;
         readTranscriptTail: (args: ReadTranscriptTailArgs) => Promise<string>;
         getDelta: (sessionId: string) => Promise<SessionDeltaSummary | null>;
@@ -1081,6 +1094,7 @@ declare global {
         respondToInput: (args: AgentChatRespondToInputArgs) => Promise<void>;
         models: (args: AgentChatModelsArgs) => Promise<AgentChatModelInfo[]>;
         dispose: (args: AgentChatDisposeArgs) => Promise<void>;
+        delete: (args: AgentChatDeleteArgs) => Promise<void>;
         updateSession: (
           args: AgentChatUpdateSessionArgs,
         ) => Promise<AgentChatSession>;
@@ -1271,7 +1285,8 @@ declare global {
         onStatusChanged: (cb: (status: ContextStatus) => void) => () => void;
       };
       feedback: {
-        submit: (args: FeedbackSubmitArgs) => Promise<FeedbackSubmission>;
+        prepareDraft: (args: FeedbackPrepareDraftArgs) => Promise<FeedbackPreparedDraft>;
+        submitDraft: (args: FeedbackSubmitDraftArgs) => Promise<FeedbackSubmission>;
         list: () => Promise<FeedbackSubmission[]>;
         onUpdate: (cb: (event: FeedbackSubmissionEvent) => void) => () => void;
       };
@@ -1442,6 +1457,19 @@ declare global {
         cleanupIntegrationWorkflow: (
           args: CleanupIntegrationWorkflowArgs,
         ) => Promise<CleanupIntegrationWorkflowResult>;
+        getDeployments: (prId: string) => Promise<PrDeployment[]>;
+        getAiSummary: (prId: string) => Promise<PrAiSummary | null>;
+        regenerateAiSummary: (prId: string) => Promise<PrAiSummary>;
+        postReviewComment: (
+          args: PostPrReviewCommentArgs,
+        ) => Promise<PrReviewThreadComment>;
+        setReviewThreadResolved: (
+          args: SetPrReviewThreadResolvedArgs,
+        ) => Promise<SetPrReviewThreadResolvedResult>;
+        reactToComment: (args: ReactToPrCommentArgs) => Promise<void>;
+        launchIssueResolutionFromThread: (
+          args: LaunchPrIssueResolutionFromThreadArgs,
+        ) => Promise<LaunchPrIssueResolutionFromThreadResult>;
       };
       rebase: {
         scanNeeds: () => Promise<RebaseNeed[]>;
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 98f36ff60..c33a8ad83 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -202,6 +202,14 @@ import type {
   AddPrCommentArgs,
   ReplyToPrReviewThreadArgs,
   ResolvePrReviewThreadArgs,
+  PrDeployment,
+  PrAiSummary,
+  PostPrReviewCommentArgs,
+  SetPrReviewThreadResolvedArgs,
+  SetPrReviewThreadResolvedResult,
+  ReactToPrCommentArgs,
+  LaunchPrIssueResolutionFromThreadArgs,
+  LaunchPrIssueResolutionFromThreadResult,
   UpdatePrTitleArgs,
   UpdatePrBodyArgs,
   SetPrLabelsArgs,
@@ -233,6 +241,7 @@ import type {
   AgentTool,
   AgentChatApproveArgs,
   AgentChatCreateArgs,
+  AgentChatDeleteArgs,
   AgentChatDisposeArgs,
   AgentChatEventEnvelope,
   AgentChatGetSummaryArgs,
@@ -274,6 +283,7 @@ import type {
   ImportBranchLaneArgs,
   ListOperationsArgs,
   ListSessionsArgs,
+  DeleteSessionArgs,
   ListTestRunsArgs,
   MergeSimulationArgs,
   MergeSimulationResult,
@@ -565,9 +575,11 @@ import type {
   ComputerUseOwnerSnapshot,
   ComputerUseOwnerSnapshotArgs,
   ComputerUseSettingsSnapshot,
-  FeedbackSubmitArgs,
+  FeedbackPrepareDraftArgs,
+  FeedbackPreparedDraft,
   FeedbackSubmission,
   FeedbackSubmissionEvent,
+  FeedbackSubmitDraftArgs,
 } from "../shared/types";
 
 contextBridge.exposeInMainWorld("ade", {
@@ -1478,6 +1490,8 @@ contextBridge.exposeInMainWorld("ade", {
       ipcRenderer.invoke(IPC.sessionsList, args),
     get: async (sessionId: string): Promise<TerminalSessionDetail | null> =>
       ipcRenderer.invoke(IPC.sessionsGet, { sessionId }),
+    delete: async (args: DeleteSessionArgs): Promise<void> =>
+      ipcRenderer.invoke(IPC.sessionsDelete, args),
     updateMeta: async (args: UpdateSessionMetaArgs): Promise<TerminalSessionSummary | null> =>
       ipcRenderer.invoke(IPC.sessionsUpdateMeta, args),
     readTranscriptTail: async (args: ReadTranscriptTailArgs): Promise<string> =>
@@ -1528,6 +1542,8 @@ contextBridge.exposeInMainWorld("ade", {
       ipcRenderer.invoke(IPC.agentChatModels, args),
     dispose: async (args: AgentChatDisposeArgs): Promise<void> =>
       ipcRenderer.invoke(IPC.agentChatDispose, args),
+    delete: async (args: AgentChatDeleteArgs): Promise<void> =>
+      ipcRenderer.invoke(IPC.agentChatDelete, args),
     updateSession: async (
       args: AgentChatUpdateSessionArgs,
     ): Promise<AgentChatSession> =>
@@ -1863,8 +1879,10 @@ contextBridge.exposeInMainWorld("ade", {
     },
   },
   feedback: {
-    submit: async (args: FeedbackSubmitArgs): Promise<FeedbackSubmission> =>
-      ipcRenderer.invoke(IPC.feedbackSubmit, args),
+    prepareDraft: async (args: FeedbackPrepareDraftArgs): Promise<FeedbackPreparedDraft> =>
+      ipcRenderer.invoke(IPC.feedbackPrepareDraft, args),
+    submitDraft: async (args: FeedbackSubmitDraftArgs): Promise<FeedbackSubmission> =>
+      ipcRenderer.invoke(IPC.feedbackSubmitDraft, args),
     list: async (): Promise<FeedbackSubmission[]> =>
       ipcRenderer.invoke(IPC.feedbackList),
     onUpdate: (cb: (event: FeedbackSubmissionEvent) => void): (() => void) => {
@@ -2139,6 +2157,26 @@ contextBridge.exposeInMainWorld("ade", {
       args: CleanupIntegrationWorkflowArgs,
     ): Promise<CleanupIntegrationWorkflowResult> =>
       ipcRenderer.invoke(IPC.prsCleanupIntegrationWorkflow, args),
+    getDeployments: async (prId: string): Promise<PrDeployment[]> =>
+      ipcRenderer.invoke(IPC.prsGetDeployments, { prId }),
+    getAiSummary: async (prId: string): Promise<PrAiSummary | null> =>
+      ipcRenderer.invoke(IPC.prsGetAiSummary, { prId }),
+    regenerateAiSummary: async (prId: string): Promise<PrAiSummary> =>
+      ipcRenderer.invoke(IPC.prsRegenerateAiSummary, { prId }),
+    postReviewComment: async (
+      args: PostPrReviewCommentArgs,
+    ): Promise<PrReviewThreadComment> =>
+      ipcRenderer.invoke(IPC.prsPostReviewComment, args),
+    setReviewThreadResolved: async (
+      args: SetPrReviewThreadResolvedArgs,
+    ): Promise<SetPrReviewThreadResolvedResult> =>
+      ipcRenderer.invoke(IPC.prsSetReviewThreadResolved, args),
+    reactToComment: async (args: ReactToPrCommentArgs): Promise<void> =>
+      ipcRenderer.invoke(IPC.prsReactToComment, args),
+    launchIssueResolutionFromThread: async (
+      args: LaunchPrIssueResolutionFromThreadArgs,
+    ): Promise<LaunchPrIssueResolutionFromThreadResult> =>
+      ipcRenderer.invoke(IPC.prsLaunchIssueResolutionFromThread, args),
   },
   rebase: {
     scanNeeds: async (): Promise<RebaseNeed[]> =>
diff --git a/apps/desktop/src/renderer/browserMock.ts b/apps/desktop/src/renderer/browserMock.ts
index 258c7db07..c6006d92d 100644
--- a/apps/desktop/src/renderer/browserMock.ts
+++ b/apps/desktop/src/renderer/browserMock.ts
@@ -1640,9 +1640,17 @@ if (typeof window !== "undefined" && !(window as any).ade) {
     app: {
       ping: resolved("pong" as const),
       getInfo: resolved({
-        version: "0.0.0-browser",
+        appVersion: "0.0.0-browser",
+        isPackaged: false,
         platform: "browser",
         arch: "web",
+        versions: {
+          electron: "0.0.0-browser",
+          chrome: "0.0.0-browser",
+          node: "0.0.0-browser",
+          v8: "0.0.0-browser",
+        },
+        env: {},
       }),
       getProject: resolved(MOCK_PROJECT),
       onProjectChanged: () => () => {},
@@ -2322,9 +2330,11 @@ if (typeof window !== "undefined" && !(window as any).ade) {
     sessions: {
       list: resolved([]),
       get: resolvedArg(null),
+      delete: resolvedArg(undefined),
       updateMeta: resolvedArg(null),
       readTranscriptTail: resolvedArg(""),
       getDelta: resolvedArg(null),
+      onChanged: noop,
     },
     agentChat: {
       list: resolved([]),
@@ -2337,6 +2347,7 @@ if (typeof window !== "undefined" && !(window as any).ade) {
       respondToInput: resolvedArg(undefined),
       models: resolvedArg([]),
       dispose: resolvedArg(undefined),
+      delete: resolvedArg(undefined),
       updateSession: resolvedArg({ id: "mock" }),
       onEvent: noop,
       slashCommands: resolvedArg([]),
@@ -2646,7 +2657,17 @@ if (typeof window !== "undefined" && !(window as any).ade) {
       discardFile: resolvedArg({ ok: true }),
       restoreStagedFile: resolvedArg({ ok: true }),
       commit: resolvedArg({ ok: true }),
-      listRecentCommits: resolvedArg([]),
+      listRecentCommits: resolvedArg([
+        {
+          sha: "abcdef1234567890",
+          shortSha: "abcdef1",
+          parents: [],
+          authorName: "ADE Browser Mock",
+          authoredAt: now,
+          subject: "Browser mock HEAD commit",
+          pushed: true,
+        },
+      ]),
       listCommitFiles: resolvedArg([]),
       getCommitMessage: resolvedArg(""),
       revertCommit: resolvedArg({ ok: true }),
@@ -2697,12 +2718,34 @@ if (typeof window !== "undefined" && !(window as any).ade) {
       openDoc: resolvedArg(undefined),
     },
     feedback: {
-      submit: resolvedArg({
+      prepareDraft: resolvedArg({
+        category: "bug",
+        draftInput: {
+          category: "bug",
+          summary: "Mock feedback",
+          stepsToReproduce: "",
+          expectedBehavior: "",
+          actualBehavior: "",
+          environment: "",
+          additionalContext: "",
+        },
+        userDescription: "## Summary\n\nMock feedback",
+        modelId: null,
+        reasoningEffort: null,
+        title: "Mock feedback",
+        body: "## Description\n\nMock feedback",
+        labels: ["bug"],
+        generationMode: "deterministic",
+        generationWarning: "ADE used a deterministic draft because no AI model was selected.",
+      }),
+      submitDraft: resolvedArg({
         id: "mock-feedback-1",
         category: "bug",
         userDescription: "Mock feedback",
-        modelId: "claude-sonnet-4-6",
-        status: "pending",
+        modelId: null,
+        status: "posted",
+        generationMode: null,
+        generationWarning: null,
         generatedTitle: null,
         generatedBody: null,
         issueUrl: null,
diff --git a/apps/desktop/src/renderer/components/app/FeedbackReporterModal.test.tsx b/apps/desktop/src/renderer/components/app/FeedbackReporterModal.test.tsx
index d76e7916d..b72c66b9b 100644
--- a/apps/desktop/src/renderer/components/app/FeedbackReporterModal.test.tsx
+++ b/apps/desktop/src/renderer/components/app/FeedbackReporterModal.test.tsx
@@ -5,6 +5,7 @@ import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/re
 import { MemoryRouter } from "react-router-dom";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { FeedbackReporterModal } from "./FeedbackReporterModal";
+import { useAppStore } from "../../state/appStore";
 
 vi.mock("motion/react", () => ({
   AnimatePresence: ({ children }: { children: React.ReactNode }) => <>{children}</>,
@@ -41,6 +42,8 @@ describe("FeedbackReporterModal", () => {
       userDescription: "The report failed and I need to see what I originally submitted.",
       modelId: "anthropic/claude-opus-4-6",
       status: "failed",
+      generationMode: "deterministic",
+      generationWarning: "ADE used a deterministic draft because AI title and label suggestion failed: GitHub API unavailable",
       generatedTitle: null,
       generatedBody: null,
       issueUrl: null,
@@ -56,6 +59,8 @@ describe("FeedbackReporterModal", () => {
       userDescription: "Please add a way to expand the previous submissions tab.",
       modelId: "anthropic/claude-opus-4-6",
       status: "posted",
+      generationMode: "ai_assisted",
+      generationWarning: null,
       generatedTitle: "Expandable submissions in feedback reporter",
       generatedBody: "## Description\n\nLet users inspect the saved payload and error state.",
       issueUrl: "https://github.com/arul28/ADE/issues/144",
@@ -68,16 +73,118 @@ describe("FeedbackReporterModal", () => {
   ];
 
   beforeEach(() => {
+    useAppStore.setState({
+      project: {
+        rootPath: "/Users/admin/Projects/ADE",
+        displayName: "ADE",
+        baseRef: "main",
+      },
+      lanes: [
+        {
+          id: "lane-feedback",
+          name: "feedback-reporter",
+          description: null,
+          laneType: "worktree",
+          baseRef: "main",
+          branchRef: "refs/heads/feature/feedback-reporter",
+          worktreePath: "/Users/admin/Projects/ADE/.ade/worktrees/feedback-reporter",
+          attachedRootPath: null,
+          parentLaneId: "lane-main",
+          childCount: 0,
+          stackDepth: 1,
+          parentStatus: null,
+          isEditProtected: false,
+          status: {
+            dirty: true,
+            ahead: 2,
+            behind: 0,
+            remoteBehind: 0,
+            rebaseInProgress: false,
+          },
+          color: null,
+          icon: null,
+          tags: [],
+          createdAt: "2026-04-08T05:00:00.000Z",
+          archivedAt: null,
+        },
+      ] as any,
+      selectedLaneId: "lane-feedback",
+    });
+    const prepareDraft = vi.fn(async () => ({
+      category: "bug",
+      draftInput: {
+        category: "bug",
+        summary: "The feedback reporter should show a preview before posting.",
+        stepsToReproduce: "1. Open the reporter",
+        expectedBehavior: "See a preview",
+        actualBehavior: "It posts immediately",
+        environment: "ADE Desktop",
+        additionalContext: "",
+      },
+      userDescription: "## Summary\n\nThe feedback reporter should show a preview before posting.",
+      modelId: null,
+      reasoningEffort: null,
+      title: "Show a preview before posting feedback issues",
+      body: "## Description\n\nThe feedback reporter should show a preview before posting.",
+      labels: ["bug"],
+      generationMode: "deterministic",
+      generationWarning: "ADE used a deterministic draft because no AI model was selected. Review the generated title and labels before posting.",
+    }));
+    const submitDraft = vi.fn(async () => ({
+      id: "posted-2",
+      category: "bug",
+      userDescription: "## Summary\n\nThe feedback reporter should show a preview before posting.",
+      modelId: null,
+      status: "posted",
+      generationMode: "deterministic",
+      generationWarning: "ADE used a deterministic draft because no AI model was selected. Review the generated title and labels before posting.",
+      generatedTitle: "Show a preview before posting feedback issues",
+      generatedBody: "## Description\n\nThe feedback reporter should show a preview before posting.",
+      issueUrl: "https://github.com/arul28/ADE/issues/145",
+      issueNumber: 145,
+      issueState: "open",
+      error: null,
+      createdAt: "2026-04-08T05:30:00.000Z",
+      completedAt: "2026-04-08T05:30:02.000Z",
+    }));
+
     globalThis.window.ade = {
       github: {
         getStatus: vi.fn(async () => ({ tokenStored: true })),
       },
+      git: {
+        listRecentCommits: vi.fn(async () => [
+          {
+            sha: "abc1234567890",
+            shortSha: "abc1234",
+            parents: [],
+            authorName: "ADE Test",
+            authoredAt: "2026-04-08T05:29:00.000Z",
+            subject: "Tighten feedback reporter preview flow",
+            pushed: false,
+          },
+        ]),
+      },
       feedback: {
         list: vi.fn(async () => submissions),
         onUpdate: vi.fn(() => () => {}),
-        submit: vi.fn(),
+        prepareDraft,
+        submitDraft,
       },
       app: {
+        getInfo: vi.fn(async () => ({
+          appVersion: "1.2.3",
+          isPackaged: false,
+          platform: "darwin",
+          arch: "arm64",
+          versions: {
+            electron: "38.0.0",
+            chrome: "138.0.0.0",
+            node: "22.16.0",
+            v8: "13.8.0.0",
+          },
+          env: {},
+        })),
         openExternal: vi.fn(async () => undefined),
       },
     } as any;
@@ -85,6 +192,11 @@ describe("FeedbackReporterModal", () => {
 
   afterEach(() => {
     cleanup();
+    useAppStore.setState({
+      project: null,
+      lanes: [],
+      selectedLaneId: null,
+    });
     if (originalAde === undefined) {
       delete (globalThis.window as any).ade;
     } else {
@@ -102,6 +214,10 @@ describe("FeedbackReporterModal", () => {
     fireEvent.click(screen.getByRole("button", { name: /my submissions/i }));
 
     expect(await screen.findByText(/Posting failed: GitHub API unavailable/i)).toBeTruthy();
+    expect(screen.getAllByText(/Deterministic/i).length).toBeGreaterThan(0);
+    expect(
+      screen.getByText(/ADE used a deterministic draft because AI title and label suggestion failed/i),
+    ).toBeTruthy();
     expect(
       screen.getByText(/The report failed and I need to see what I originally submitted\./i, {
         selector: "div",
@@ -125,4 +241,35 @@ describe("FeedbackReporterModal", () => {
       screen.getByText(/Let users inspect the saved payload and error state\./i),
     ).toBeTruthy();
   });
+
+  it("prepares a draft from structured fields and posts the reviewed issue", async () => {
+    render(
+      <MemoryRouter>
+        <FeedbackReporterModal open onOpenChange={vi.fn()} />
+      </MemoryRouter>,
+    );
+
+    fireEvent.change(
+      await screen.findByPlaceholderText(/what changed, what broke/i),
+      { target: { value: "The feedback reporter should show a preview before posting." } },
+    );
+
+    await waitFor(() => {
+      expect(screen.getByDisplayValue(/ADE version: 1\.2\.3 \(dev\)/i)).toBeTruthy();
+    });
+    expect(screen.getByDisplayValue(/Selected lane: feedback-reporter/i)).toBeTruthy();
+    expect(screen.getByDisplayValue(/HEAD commit: abc1234 Tighten feedback reporter preview flow/i)).toBeTruthy();
+
+    fireEvent.click(screen.getByRole("button", { name: /generate draft/i }));
+
+    expect(await screen.findByText(/draft preview/i)).toBeTruthy();
+    expect(screen.getByDisplayValue(/Show a preview before posting feedback issues/i)).toBeTruthy();
+
+    fireEvent.click(screen.getByRole("button", { name: /post to github/i }));
+
+    await waitFor(() => {
+      expect((window.ade.feedback.submitDraft as any)).toHaveBeenCalledTimes(1);
+    });
+    expect(await screen.findByText(/Posted issue #145\./i)).toBeTruthy();
+  });
 });
diff --git a/apps/desktop/src/renderer/components/app/FeedbackReporterModal.tsx b/apps/desktop/src/renderer/components/app/FeedbackReporterModal.tsx
index 18376f992..a86f1a493 100644
--- a/apps/desktop/src/renderer/components/app/FeedbackReporterModal.tsx
+++ b/apps/desktop/src/renderer/components/app/FeedbackReporterModal.tsx
@@ -16,10 +16,17 @@ import {
 import { ProviderModelSelector } from "../shared/ProviderModelSelector";
 import { useAppStore } from "../../state/appStore";
 import { COLORS, MONO_FONT, SANS_FONT } from "../lanes/laneDesignTokens";
+import type { AppInfo, ProjectInfo } from "../../../shared/types/core";
+import type { GitCommitSummary } from "../../../shared/types/git";
+import type { LaneSummary } from "../../../shared/types/lanes";
 import type {
   FeedbackCategory,
+  FeedbackDraftInput,
+  FeedbackGenerationMode,
+  FeedbackPreparedDraft,
+  FeedbackPrepareDraftArgs,
   FeedbackSubmission,
-  FeedbackSubmitArgs,
+  FeedbackSubmitDraftArgs,
 } from "../../../shared/types/feedback";
 
 const CATEGORIES: { value: FeedbackCategory; label: string }[] = [
@@ -46,6 +53,14 @@ const INPUT_STYLE: React.CSSProperties = {
   borderRadius: 0,
 };
 
+const TEXTAREA_STYLE: React.CSSProperties = {
+  ...INPUT_STYLE,
+  padding: "8px 12px",
+  fontSize: 12,
+  resize: "none",
+  outline: "none",
+};
+
 function categoryIcon(cat: FeedbackCategory, size = 12) {
   switch (cat) {
     case "bug":
@@ -100,6 +115,145 @@ function formatSubmissionTimestamp(value: string | null): string {
   return date.toLocaleString();
 }
 
+function formattingLabel(mode: FeedbackGenerationMode | null): { text: string; color: string } | null {
+  switch (mode) {
+    case "ai_assisted":
+      return { text: "AI assisted", color: COLORS.success };
+    case "deterministic":
+      return { text: "Deterministic", color: COLORS.warning };
+    default:
+      return null;
+  }
+}
+
+type DraftFormState = {
+  summary: string;
+  additionalContext: string;
+  stepsToReproduce: string;
+  expectedBehavior: string;
+  actualBehavior: string;
+  environment: string;
+  useCase: string;
+  proposedSolution: string;
+  alternativesConsidered: string;
+  context: string;
+  expectedGuidance: string;
+};
+
+function createEmptyDraftForm(): DraftFormState {
+  return {
+    summary: "",
+    additionalContext: "",
+    stepsToReproduce: "",
+    expectedBehavior: "",
+    actualBehavior: "",
+    environment: "",
+    useCase: "",
+    proposedSolution: "",
+    alternativesConsidered: "",
+    context: "",
+    expectedGuidance: "",
+  };
+}
+
+function buildDraftInput(category: FeedbackCategory, form: DraftFormState): FeedbackDraftInput {
+  switch (category) {
+    case "bug":
+      return {
+        category: "bug",
+        summary: form.summary,
+        stepsToReproduce: form.stepsToReproduce,
+        expectedBehavior: form.expectedBehavior,
+        actualBehavior: form.actualBehavior,
+        environment: form.environment,
+        additionalContext: form.additionalContext,
+      };
+    case "feature":
+    case "enhancement":
+      return {
+        category,
+        summary: form.summary,
+        useCase: form.useCase,
+        proposedSolution: form.proposedSolution,
+        alternativesConsidered: form.alternativesConsidered,
+        additionalContext: form.additionalContext,
+      };
+    case "question":
+      return {
+        category: "question",
+        summary: form.summary,
+        context: form.context,
+        expectedGuidance: form.expectedGuidance,
+        additionalContext: form.additionalContext,
+      };
+  }
+}
+
+function labelsToInputValue(labels: string[]): string {
+  return labels.join(", ");
+}
+
+function parseLabelInput(value: string): string[] {
+  return value
+    .split(",")
+    .map((entry) => entry.trim())
+    .filter((entry) => entry.length > 0);
+}
+
+function helperText(text: string) {
+  return (
+    <div style={{ fontSize: 11, color: COLORS.textMuted, lineHeight: 1.5 }}>
+      {text}
+    </div>
+  );
+}
+
+function simplifyRef(ref: string | null | undefined): string {
+  const trimmed = typeof ref === "string" ? ref.trim() : "";
+  if (!trimmed) return "Unknown";
+  return trimmed
+    .replace(/^refs\/heads\//, "")
+    .replace(/^refs\/remotes\//, "");
+}
+
+function describeLaneStatus(lane: LaneSummary): string {
+  const parts = [lane.status.dirty ? "dirty worktree" : "clean worktree"];
+  if (lane.status.ahead > 0) parts.push(`ahead ${lane.status.ahead}`);
+  if (lane.status.behind > 0) parts.push(`behind ${lane.status.behind}`);
+  if (lane.status.remoteBehind > 0) parts.push(`remote ahead ${lane.status.remoteBehind}`);
+  if (lane.status.rebaseInProgress) parts.push("rebase in progress");
+  return parts.join(", ");
+}
+
+function buildAutoEnvironmentText(args: {
+  appInfo: AppInfo | null;
+  project: ProjectInfo | null;
+  selectedLane: LaneSummary | null;
+  headCommit: GitCommitSummary | null;
+}): string {
+  const lines: string[] = [];
+  if (args.appInfo) {
+    const version = args.appInfo.appVersion.trim();
+    lines.push(`ADE version: ${version}${args.appInfo.isPackaged ? "" : " (dev)"}`);
+    lines.push(`Platform: ${args.appInfo.platform} ${args.appInfo.arch}`);
+    lines.push(`Electron: ${args.appInfo.versions.electron}`);
+  }
+  if (args.project) {
+    lines.push(`Project: ${args.project.displayName}`);
+    lines.push(`Project base ref: ${simplifyRef(args.project.baseRef)}`);
+  }
+  if (args.selectedLane) {
+    lines.push(`Selected lane: ${args.selectedLane.name}`);
+    lines.push(`Lane branch: ${simplifyRef(args.selectedLane.branchRef)}`);
+    lines.push(`Lane base ref: ${simplifyRef(args.selectedLane.baseRef)}`);
+    lines.push(`Lane status: ${describeLaneStatus(args.selectedLane)}`);
+  }
+  if (args.headCommit) {
+    lines.push(`HEAD commit: ${args.headCommit.shortSha} ${args.headCommit.subject}`);
+  }
+  return lines.join("\n");
+}
+
 function NewReportTab({
   hasGithubToken,
   onSubmitted,
@@ -111,42 +265,179 @@ function NewReportTab({
   const openAiProvidersSettings = useCallback(() => {
     navigate("/settings?tab=ai#ai-providers");
   }, [navigate]);
+  const project = useAppStore((s) => s.project);
+  const lanes = useAppStore((s) => s.lanes);
+  const selectedLaneId = useAppStore((s) => s.selectedLaneId);
   const availableModels = useAppStore((s) => s.availableModels);
   const availableModelIds = availableModels.map((m) => m.id);
+  const selectedLane = (selectedLaneId
+    ? lanes.find((lane) => lane.id === selectedLaneId)
+    : lanes[0]) ?? null;
   const [category, setCategory] = useState<FeedbackCategory>("bug");
-  const [description, setDescription] = useState("");
+  const [form, setForm] = useState<DraftFormState>(() => createEmptyDraftForm());
   const [modelId, setModelId] = useState("");
   const [reasoningEffort, setReasoningEffort] = useState<string | null>(null);
+  const [preparedDraft, setPreparedDraft] = useState<FeedbackPreparedDraft | null>(null);
+  const [draftTitle, setDraftTitle] = useState("");
+  const [draftBody, setDraftBody] = useState("");
+  const [draftLabelsText, setDraftLabelsText] = useState("");
+  const [preparing, setPreparing] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const [flash, setFlash] = useState<{ msg: string; ok: boolean } | null>(null);
+  const [autoEnvironmentText, setAutoEnvironmentText] = useState("");
   const flashTimer = useRef<number | null>(null);
+  const lastAppliedEnvironmentRef = useRef("");
+
+  const clearPreparedDraft = useCallback(() => {
+    setPreparedDraft(null);
+    setDraftTitle("");
+    setDraftBody("");
+    setDraftLabelsText("");
+  }, []);
+
+  const setFlashMessage = useCallback((msg: string, ok: boolean, timeoutMs: number) => {
+    setFlash({ msg, ok });
+    if (flashTimer.current) window.clearTimeout(flashTimer.current);
+    flashTimer.current = window.setTimeout(() => setFlash(null), timeoutMs);
+  }, []);
+
+  const updateField = useCallback((key: keyof DraftFormState, value: string) => {
+    setForm((prev) => ({ ...prev, [key]: value }));
+    clearPreparedDraft();
+  }, [clearPreparedDraft]);
+
+  const applyAutoEnvironment = useCallback((nextEnvironment: string) => {
+    const trimmed = nextEnvironment.trim();
+    if (!trimmed) return;
+    lastAppliedEnvironmentRef.current = trimmed;
+    let shouldClearDraft = false;
+    setForm((prev) => {
+      if (prev.environment === trimmed) return prev;
+      shouldClearDraft = true;
+      return { ...prev, environment: trimmed };
+    });
+    if (shouldClearDraft) clearPreparedDraft();
+  }, [clearPreparedDraft]);
+
+  useEffect(() => {
+    let cancelled = false;
+    async function hydrateEnvironment() {
+      const [appInfo, latestCommit] = await Promise.all([
+        window.ade.app.getInfo().catch(() => null),
+        selectedLane
+          ? window.ade.git
+            .listRecentCommits({ laneId: selectedLane.id, limit: 1 })
+            .then((commits) => commits[0] ?? null)
+            .catch(() => null)
+          : Promise.resolve(null),
+      ]);
+      if (cancelled) return;
+      const nextEnvironment = buildAutoEnvironmentText({
+        appInfo,
+        project,
+        selectedLane,
+        headCommit: latestCommit,
+      }).trim();
+      setAutoEnvironmentText(nextEnvironment);
+      let shouldClearDraft = false;
+      setForm((prev) => {
+        const currentEnvironment = prev.environment.trim();
+        const lastAppliedEnvironment = lastAppliedEnvironmentRef.current.trim();
+        if (!nextEnvironment) return prev;
+        if (currentEnvironment.length === 0 || currentEnvironment === lastAppliedEnvironment) {
+          lastAppliedEnvironmentRef.current = nextEnvironment;
+          if (prev.environment === nextEnvironment) return prev;
+          shouldClearDraft = true;
+          return { ...prev, environment: nextEnvironment };
+        }
+        return prev;
+      });
+      if (shouldClearDraft) clearPreparedDraft();
+    }
+    void hydrateEnvironment();
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    clearPreparedDraft,
+    project,
+    selectedLane,
+  ]);
 
-  const handleSubmit = useCallback(async () => {
-    if (!description.trim() || !modelId || submitting) return;
+  const handleGenerateDraft = useCallback(async () => {
+    if (!form.summary.trim() || preparing || submitting) return;
+    setPreparing(true);
+    try {
+      const args: FeedbackPrepareDraftArgs = {
+        draftInput: buildDraftInput(category, form),
+        modelId: modelId.trim() || null,
+        reasoningEffort: modelId.trim() ? reasoningEffort : null,
+      };
+      const nextDraft = await window.ade.feedback.prepareDraft(args);
+      setPreparedDraft(nextDraft);
+      setDraftTitle(nextDraft.title);
+      setDraftBody(nextDraft.body);
+      setDraftLabelsText(labelsToInputValue(nextDraft.labels));
+      setFlashMessage("Draft ready. Review and edit it before posting to GitHub.", true, 4000);
+    } catch (err: unknown) {
+      const msg =
+        err instanceof Error ? err.message : "Failed to prepare feedback draft";
+      setFlashMessage(msg, false, 6000);
+    } finally {
+      setPreparing(false);
+    }
+  }, [category, form, modelId, preparing, reasoningEffort, setFlashMessage, submitting]);
+
+  const handleSubmitDraft = useCallback(async () => {
+    if (!preparedDraft || !draftTitle.trim() || !draftBody.trim() || preparing || submitting) return;
     setSubmitting(true);
     try {
-      const args: FeedbackSubmitArgs = {
-        category,
-        userDescription: description.trim(),
-        modelId,
-        reasoningEffort,
+      const args: FeedbackSubmitDraftArgs = {
+        draft: preparedDraft,
+        title: draftTitle.trim(),
+        body: draftBody.trim(),
+        labels: parseLabelInput(draftLabelsText),
       };
-      await window.ade.feedback.submit(args);
-      setDescription("");
-      setFlash({ msg: "Submitted! Report is generating in the background.", ok: true });
-      if (flashTimer.current) window.clearTimeout(flashTimer.current);
-      flashTimer.current = window.setTimeout(() => setFlash(null), 4000);
-      onSubmitted();
+      const submission = await window.ade.feedback.submitDraft(args);
+      if (submission.status === "posted") {
+        setForm({ ...createEmptyDraftForm(), environment: autoEnvironmentText });
+        lastAppliedEnvironmentRef.current = autoEnvironmentText.trim();
+        clearPreparedDraft();
+        setFlashMessage(
+          submission.issueNumber
+            ? `Posted issue #${submission.issueNumber}.`
+            : "Posted issue to GitHub.",
+          true,
+          5000,
+        );
+        onSubmitted();
+      } else {
+        setFlashMessage(
+          submission.error ?? "GitHub posting failed. The reviewed draft was saved in My Submissions.",
+          false,
+          7000,
+        );
+        onSubmitted();
+      }
     } catch (err: unknown) {
       const msg =
-        err instanceof Error ? err.message : "Failed to submit feedback";
-      setFlash({ msg, ok: false });
-      if (flashTimer.current) window.clearTimeout(flashTimer.current);
-      flashTimer.current = window.setTimeout(() => setFlash(null), 6000);
+        err instanceof Error ? err.message : "Failed to post feedback draft";
+      setFlashMessage(msg, false, 7000);
     } finally {
       setSubmitting(false);
     }
-  }, [category, description, modelId, reasoningEffort, submitting, onSubmitted]);
+  }, [
+    clearPreparedDraft,
+    draftBody,
+    draftLabelsText,
+    draftTitle,
+    autoEnvironmentText,
+    onSubmitted,
+    preparedDraft,
+    preparing,
+    setFlashMessage,
+    submitting,
+  ]);
 
   useEffect(() => {
     return () => {
@@ -154,7 +445,13 @@ function NewReportTab({
     };
   }, []);
 
-  const submitDisabled = !description.trim() || !modelId || submitting;
+  const canPrepareDraft = form.summary.trim().length > 0 && !preparing && !submitting;
+  const canSubmitDraft = preparedDraft != null
+    && draftTitle.trim().length > 0
+    && draftBody.trim().length > 0
+    && !preparing
+    && !submitting;
+  const draftSource = formattingLabel(preparedDraft?.generationMode ?? null);
 
   if (!hasGithubToken) {
     return (
@@ -179,12 +476,14 @@ function NewReportTab({
 
   return (
     <div style={{ display: "flex", flexDirection: "column", gap: 14, paddingTop: 12 }}>
-      {/* Category */}
       <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
         <span style={LABEL_STYLE}>Category</span>
         <select
           value={category}
-          onChange={(e) => setCategory(e.target.value as FeedbackCategory)}
+          onChange={(e) => {
+            setCategory(e.target.value as FeedbackCategory);
+            clearPreparedDraft();
+          }}
           style={{ ...INPUT_STYLE, height: 32, padding: "0 8px", fontSize: 12 }}
         >
           {CATEGORIES.map((c) => (
@@ -195,39 +494,178 @@ function NewReportTab({
         </select>
       </div>
 
-      {/* Description */}
       <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-        <span style={LABEL_STYLE}>Description</span>
+        <span style={LABEL_STYLE}>Summary</span>
         <textarea
-          value={description}
-          onChange={(e) => setDescription(e.target.value)}
-          placeholder="Describe the bug you found or feature you'd like to see..."
-          rows={4}
-          style={{
-            ...INPUT_STYLE,
-            padding: "8px 12px",
-            fontSize: 12,
-            resize: "none",
-            outline: "none",
-          }}
+          value={form.summary}
+          onChange={(e) => updateField("summary", e.target.value)}
+          placeholder="What changed, what broke, or what should ADE do differently?"
+          rows={3}
+          style={TEXTAREA_STYLE}
+        />
+        {helperText("This becomes the Description section and fallback title seed if no AI assist is used.")}
+      </div>
+
+      {category === "bug" ? (
+        <>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Steps to reproduce</span>
+            <textarea
+              value={form.stepsToReproduce}
+              onChange={(e) => updateField("stepsToReproduce", e.target.value)}
+              placeholder={"1. Open the feedback reporter\n2. Submit a report\n3. Observe the result"}
+              rows={4}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Expected behavior</span>
+            <textarea
+              value={form.expectedBehavior}
+              onChange={(e) => updateField("expectedBehavior", e.target.value)}
+              placeholder="What should have happened?"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Actual behavior</span>
+            <textarea
+              value={form.actualBehavior}
+              onChange={(e) => updateField("actualBehavior", e.target.value)}
+              placeholder="What actually happened?"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", gap: 8 }}>
+              <span style={LABEL_STYLE}>Environment</span>
+              <button
+                type="button"
+                onClick={() => applyAutoEnvironment(autoEnvironmentText)}
+                disabled={!autoEnvironmentText.trim()}
+                style={{
+                  padding: 0,
+                  background: "transparent",
+                  border: "none",
+                  color: autoEnvironmentText.trim() ? COLORS.accent : COLORS.textDim,
+                  fontSize: 10,
+                  fontWeight: 700,
+                  fontFamily: MONO_FONT,
+                  textTransform: "uppercase",
+                  letterSpacing: "0.5px",
+                  cursor: autoEnvironmentText.trim() ? "pointer" : "not-allowed",
+                  opacity: autoEnvironmentText.trim() ? 1 : 0.5,
+                }}
+              >
+                Refresh details
+              </button>
+            </div>
+            <textarea
+              value={form.environment}
+              onChange={(e) => updateField("environment", e.target.value)}
+              placeholder="OS, ADE version, repro scope, lane, or anything else that matters"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+            {helperText("ADE autofills version, platform, selected lane, and current lane HEAD commit when available. Edit anything before posting.")}
+          </div>
+        </>
+      ) : null}
+
+      {category === "feature" || category === "enhancement" ? (
+        <>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Use case</span>
+            <textarea
+              value={form.useCase}
+              onChange={(e) => updateField("useCase", e.target.value)}
+              placeholder="Who needs this, and what workflow does it unblock?"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Proposed solution</span>
+            <textarea
+              value={form.proposedSolution}
+              onChange={(e) => updateField("proposedSolution", e.target.value)}
+              placeholder="Describe the change you want ADE to make."
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Alternatives considered</span>
+            <textarea
+              value={form.alternativesConsidered}
+              onChange={(e) => updateField("alternativesConsidered", e.target.value)}
+              placeholder="What have you tried instead, and why was it not enough?"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+        </>
+      ) : null}
+
+      {category === "question" ? (
+        <>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Context</span>
+            <textarea
+              value={form.context}
+              onChange={(e) => updateField("context", e.target.value)}
+              placeholder="What were you trying to do when the question came up?"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Expected guidance</span>
+            <textarea
+              value={form.expectedGuidance}
+              onChange={(e) => updateField("expectedGuidance", e.target.value)}
+              placeholder="What answer or guidance would unblock you?"
+              rows={3}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+        </>
+      ) : null}
+
+      <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+        <span style={LABEL_STYLE}>Additional context</span>
+        <textarea
+          value={form.additionalContext}
+          onChange={(e) => updateField("additionalContext", e.target.value)}
+          placeholder="Links, screenshots, workaround notes, or anything else useful."
+          rows={3}
+          style={TEXTAREA_STYLE}
         />
       </div>
 
-      {/* Model */}
       <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-        <span style={LABEL_STYLE}>Model</span>
+        <span style={LABEL_STYLE}>AI assist (optional)</span>
         <ProviderModelSelector
           value={modelId}
-          onChange={(id) => { setModelId(id); setReasoningEffort(null); }}
+          onChange={(id) => {
+            setModelId(id);
+            setReasoningEffort(null);
+            clearPreparedDraft();
+          }}
           availableModelIds={availableModelIds}
           showReasoning
           reasoningEffort={reasoningEffort}
-          onReasoningEffortChange={setReasoningEffort}
+          onReasoningEffortChange={(value) => {
+            setReasoningEffort(value);
+            clearPreparedDraft();
+          }}
           onOpenAiSettings={openAiProvidersSettings}
         />
+        {helperText("Leave this empty to build a fully deterministic draft. If you pick a model, ADE only uses it to suggest the title and labels.")}
       </div>
 
-      {/* Flash message */}
       {flash ? (
         <div
           style={{
@@ -243,12 +681,11 @@ function NewReportTab({
         </div>
       ) : null}
 
-      {/* Submit */}
       <div style={{ display: "flex", justifyContent: "flex-end" }}>
         <button
           type="button"
-          disabled={submitDisabled}
-          onClick={handleSubmit}
+          disabled={!canPrepareDraft}
+          onClick={handleGenerateDraft}
           style={{
             height: 32,
             padding: "0 20px",
@@ -257,17 +694,112 @@ function NewReportTab({
             fontFamily: MONO_FONT,
             textTransform: "uppercase",
             letterSpacing: "0.5px",
-            background: submitDisabled ? COLORS.textDim : COLORS.accent,
+            background: canPrepareDraft ? COLORS.accent : COLORS.textDim,
             color: "#fff",
             border: "none",
-            cursor: submitDisabled ? "not-allowed" : "pointer",
-            opacity: submitDisabled ? 0.5 : 1,
+            cursor: canPrepareDraft ? "pointer" : "not-allowed",
+            opacity: canPrepareDraft ? 1 : 0.5,
             transition: "opacity 0.15s, background 0.15s",
           }}
         >
-          {submitting ? "Submitting..." : "Submit"}
+          {preparing ? "Preparing..." : "Generate draft"}
         </button>
       </div>
+
+      {preparedDraft ? (
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "column",
+            gap: 12,
+            padding: 12,
+            border: `1px solid ${COLORS.border}`,
+            background: COLORS.recessedBg,
+          }}
+        >
+          <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", gap: 8 }}>
+            <div>
+              <div style={LABEL_STYLE}>Draft preview</div>
+              <div style={{ fontSize: 12, color: COLORS.textSecondary }}>
+                Review the generated issue before ADE posts it to GitHub.
+              </div>
+            </div>
+            <div style={{ fontSize: 11, fontFamily: MONO_FONT, color: draftSource?.color ?? COLORS.textMuted }}>
+              {draftSource?.text ?? "Unknown"}
+            </div>
+          </div>
+
+          {preparedDraft.generationWarning ? (
+            <div
+              style={{
+                padding: "8px 10px",
+                fontSize: 12,
+                color: COLORS.warning,
+                background: "rgba(245,158,11,0.08)",
+                border: "1px solid rgba(245,158,11,0.2)",
+                whiteSpace: "pre-wrap",
+              }}
+            >
+              {preparedDraft.generationWarning}
+            </div>
+          ) : null}
+
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Labels</span>
+            <input
+              value={draftLabelsText}
+              onChange={(e) => setDraftLabelsText(e.target.value)}
+              placeholder="bug, enhancement"
+              style={{ ...INPUT_STYLE, height: 32, padding: "0 10px", fontSize: 12 }}
+            />
+          </div>
+
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Title</span>
+            <textarea
+              value={draftTitle}
+              onChange={(e) => setDraftTitle(e.target.value)}
+              rows={2}
+              style={TEXTAREA_STYLE}
+            />
+          </div>
+
+          <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+            <span style={LABEL_STYLE}>Issue body</span>
+            <textarea
+              value={draftBody}
+              onChange={(e) => setDraftBody(e.target.value)}
+              rows={14}
+              style={{ ...INPUT_STYLE, padding: "8px 12px", fontSize: 12, resize: "vertical", outline: "none", minHeight: 240 }}
+            />
+          </div>
+
+          <div style={{ display: "flex", justifyContent: "flex-end" }}>
+            <button
+              type="button"
+              disabled={!canSubmitDraft}
+              onClick={handleSubmitDraft}
+              style={{
+                height: 32,
+                padding: "0 20px",
+                fontSize: 11,
+                fontWeight: 700,
+                fontFamily: MONO_FONT,
+                textTransform: "uppercase",
+                letterSpacing: "0.5px",
+                background: canSubmitDraft ? COLORS.success : COLORS.textDim,
+                color: "#fff",
+                border: "none",
+                cursor: canSubmitDraft ? "pointer" : "not-allowed",
+                opacity: canSubmitDraft ? 1 : 0.5,
+                transition: "opacity 0.15s, background 0.15s",
+              }}
+            >
+              {submitting ? "Posting..." : "Post to GitHub"}
+            </button>
+          </div>
+        </div>
+      ) : null}
     </div>
   );
 }
@@ -275,6 +807,7 @@ function NewReportTab({
 function SubmissionRow({ submission }: { submission: FeedbackSubmission }) {
   const [expanded, setExpanded] = useState(submission.status === "failed");
   const sl = statusLabel(submission.status);
+  const formatting = formattingLabel(submission.generationMode);
   const preview =
     submission.generatedTitle || submission.userDescription.slice(0, 80);
 
@@ -387,7 +920,15 @@ function SubmissionRow({ submission }: { submission: FeedbackSubmission }) {
             </div>
             <div>
               <div style={LABEL_STYLE}>Model</div>
-              <div style={{ fontSize: 11, color: COLORS.textSecondary, wordBreak: "break-word" }}>{submission.modelId}</div>
+              <div style={{ fontSize: 11, color: COLORS.textSecondary, wordBreak: "break-word" }}>
+                {submission.modelId ?? "Not used"}
+              </div>
+            </div>
+            <div>
+              <div style={LABEL_STYLE}>Draft source</div>
+              <div style={{ fontSize: 11, color: formatting?.color ?? COLORS.textSecondary }}>
+                {formatting?.text ?? "Unknown"}
+              </div>
             </div>
             <div>
               <div style={LABEL_STYLE}>Issue</div>
@@ -449,6 +990,24 @@ function SubmissionRow({ submission }: { submission: FeedbackSubmission }) {
             </div>
           ) : null}
 
+          {submission.generationWarning ? (
+            <div>
+              <div style={{ ...LABEL_STYLE, color: COLORS.warning }}>Formatting note</div>
+              <div
+                style={{
+                  padding: "8px 10px",
+                  fontSize: 12,
+                  whiteSpace: "pre-wrap",
+                  color: COLORS.warning,
+                  background: "rgba(245,158,11,0.08)",
+                  border: "1px solid rgba(245,158,11,0.2)",
+                }}
+              >
+                {submission.generationWarning}
+              </div>
+            </div>
+          ) : null}
+
           {submission.generatedTitle ? (
             <div>
               <div style={LABEL_STYLE}>Generated title</div>
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
index 91b06d584..5044d6bd0 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.test.tsx
@@ -194,8 +194,8 @@ describe("AgentChatComposer", () => {
       },
     });
 
-    expect(screen.getByText("Type your answer below.")).toBeTruthy();
-    expect(screen.queryByText("Type your answer below or pick an option above.")).toBeNull();
+    expect(screen.getByText("Answer in the question window above, or type below.")).toBeTruthy();
+    expect(screen.queryByText("Answer in the question window above, or pick an option there.")).toBeNull();
   });
 
   it("keeps the option hint when a pending question includes selectable options", () => {
@@ -224,7 +224,7 @@ describe("AgentChatComposer", () => {
       },
     });
 
-    expect(screen.getByText("Type your answer below or pick an option above.")).toBeTruthy();
+    expect(screen.getByText("Answer in the question window above, or pick an option there.")).toBeTruthy();
   });
 
   it("keeps the option hint when any pending question includes selectable options", () => {
@@ -261,7 +261,7 @@ describe("AgentChatComposer", () => {
       },
     });
 
-    expect(screen.getByText("Type your answer below or pick an option above.")).toBeTruthy();
+    expect(screen.getByText("Answer in the question window above, or pick an option there.")).toBeTruthy();
   });
 
   it("uses decline wording for native Codex structured questions", () => {
@@ -386,7 +386,7 @@ describe("AgentChatComposer", () => {
     expect(screen.queryByTitle("Include project context (PRD + architecture) with first message")).toBeNull();
   });
 
-  it("uses a constrained resizable textarea in grid-tile mode", () => {
+  it("marks the textarea layout variant in grid-tile mode", () => {
     renderComposer({
       layoutVariant: "grid-tile",
       composerMaxHeightPx: 128,
@@ -394,8 +394,7 @@ describe("AgentChatComposer", () => {
 
     const textarea = screen.getByPlaceholderText("Steer the active turn...") as HTMLTextAreaElement;
     expect(textarea.dataset.chatLayoutVariant).toBe("grid-tile");
-    expect(textarea.style.maxHeight).toBe("128px");
-    expect(textarea.className).toContain("resize-y");
+    expect(textarea.className).toContain("resize-none");
   });
 
 });
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
index 59b9e5c71..6d74ceb00 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatComposer.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { At, CaretDown, Check, Image, Paperclip, PencilSimple, Square, X, PaperPlaneTilt, Cube, BookOpen } from "@phosphor-icons/react";
 import {
   inferAttachmentType,
@@ -421,6 +421,19 @@ export function AgentChatComposer({
   const fileAddInProgressRef = useRef(false);
   const canAttach = !turnActive || sessionProvider === "claude" || sessionProvider === "codex";
 
+  const resizeTextarea = useCallback(() => {
+    const el = textareaRef.current;
+    if (!el) return;
+    el.style.height = "0px";
+    const maxH = layoutVariant === "grid-tile" ? (composerMaxHeightPx ?? 200) : 200;
+    const next = Math.min(Math.max(el.scrollHeight, 28), maxH);
+    el.style.height = `${next}px`;
+    el.style.overflowY = el.scrollHeight > maxH ? "auto" : "hidden";
+  }, [layoutVariant, composerMaxHeightPx]);
+  useLayoutEffect(() => {
+    resizeTextarea();
+  }, [draft, resizeTextarea]);
+
   const attachedPaths = useMemo(() => new Set(attachments.map((a) => a.path)), [attachments]);
   const selectedModel = useMemo(() => getModelById(modelId), [modelId]);
 
@@ -984,6 +997,15 @@ export function AgentChatComposer({
   const pendingQuestionCount = getPendingInputQuestionCount(pendingInput);
   const showPendingInputOptionsHint = hasPendingInputOptions(pendingInput);
 
+  let composerHintText: string;
+  if (turnActive) {
+    composerHintText = "Steer the active turn, or press Cmd+. to stop it";
+  } else if (sendOnEnter) {
+    composerHintText = "Enter sends. Shift+Enter adds a newline.";
+  } else {
+    composerHintText = "Cmd+Enter sends. Enter keeps a newline.";
+  }
+
   return (
     <>
       <ChatComposerShell
@@ -1017,19 +1039,23 @@ export function AgentChatComposer({
                     : "Input needed"} · {pendingInput.source}
               </span>
             </div>
-            <div className="mb-2 font-mono text-[11px] leading-relaxed text-fg/68">
-              {pendingInput.description ?? pendingInput.questions[0]?.question ?? "The agent is waiting for input."}
-            </div>
             {pendingInput.kind === "approval" || pendingInput.kind === "permissions" ? (
-              <div className="flex items-center gap-1.5">
-                <button type="button" disabled={approvalResponding} className="rounded-[var(--chat-radius-pill)] border border-accent/30 bg-accent/12 px-3 py-1 font-mono text-[9px] font-bold uppercase tracking-wider text-fg/80 transition-colors hover:bg-accent/20 disabled:opacity-40 disabled:pointer-events-none" onClick={() => onApproval("accept")}>{approvalResponding ? "Processing..." : "Accept"}</button>
-                <button type="button" disabled={approvalResponding} className="rounded-[var(--chat-radius-pill)] border border-border/20 px-3 py-1 font-mono text-[9px] font-bold uppercase tracking-wider text-fg/50 transition-colors hover:bg-border/10 disabled:opacity-40 disabled:pointer-events-none" onClick={() => onApproval("accept_for_session")}>Accept all</button>
-                <button type="button" disabled={approvalResponding} className="rounded-[var(--chat-radius-pill)] border border-border/20 px-3 py-1 font-mono text-[9px] font-bold uppercase tracking-wider text-fg/40 transition-colors hover:bg-border/10 disabled:opacity-40 disabled:pointer-events-none" onClick={() => onApproval("decline")}>Decline</button>
-              </div>
+              <>
+                <div className="mb-2 font-mono text-[11px] leading-relaxed text-fg/68">
+                  {pendingInput.description ?? pendingInput.questions[0]?.question ?? "The agent is waiting for input."}
+                </div>
+                <div className="flex items-center gap-1.5">
+                  <button type="button" disabled={approvalResponding} className="rounded-[var(--chat-radius-pill)] border border-accent/30 bg-accent/12 px-3 py-1 font-mono text-[9px] font-bold uppercase tracking-wider text-fg/80 transition-colors hover:bg-accent/20 disabled:opacity-40 disabled:pointer-events-none" onClick={() => onApproval("accept")}>{approvalResponding ? "Processing..." : "Accept"}</button>
+                  <button type="button" disabled={approvalResponding} className="rounded-[var(--chat-radius-pill)] border border-border/20 px-3 py-1 font-mono text-[9px] font-bold uppercase tracking-wider text-fg/50 transition-colors hover:bg-border/10 disabled:opacity-40 disabled:pointer-events-none" onClick={() => onApproval("accept_for_session")}>Accept all</button>
+                  <button type="button" disabled={approvalResponding} className="rounded-[var(--chat-radius-pill)] border border-border/20 px-3 py-1 font-mono text-[9px] font-bold uppercase tracking-wider text-fg/40 transition-colors hover:bg-border/10 disabled:opacity-40 disabled:pointer-events-none" onClick={() => onApproval("decline")}>Decline</button>
+                </div>
+              </>
             ) : (
               <div className="flex items-center gap-1.5">
                 <span className="font-mono text-[10px] uppercase tracking-[0.14em] text-amber-200/60">
-                  {showPendingInputOptionsHint ? "Type your answer below or pick an option above." : "Type your answer below."}
+                  {showPendingInputOptionsHint
+                    ? "Answer in the question window above, or pick an option there."
+                    : "Answer in the question window above, or type below."}
                 </span>
                 <button
                   type="button"
@@ -1082,8 +1108,8 @@ export function AgentChatComposer({
             }}
           />
           {slashPickerOpen && filteredSlashCommands.length > 0 ? (
-            <div className="absolute bottom-full left-3 z-10 mb-3 w-80 rounded-[14px] border border-violet-400/[0.10] bg-[#151325]/95 shadow-[0_16px_40px_-12px_rgba(0,0,0,0.5)] backdrop-blur-[40px]">
-              <div className="border-b border-white/[0.04] px-3 py-2 font-mono text-[9px] font-bold uppercase tracking-widest text-muted-fg/35">
+            <div className="ade-chat-drawer-glass absolute bottom-full left-3 z-10 mb-3 w-80 overflow-hidden">
+              <div className="border-b border-white/[0.04] px-3 py-2 font-mono text-[9px] font-bold uppercase tracking-widest text-muted-fg/40">
                 Commands
               </div>
               <div className="max-h-52 overflow-auto py-1">
@@ -1091,9 +1117,10 @@ export function AgentChatComposer({
                   <button
                     key={cmd.command}
                     type="button"
+                    data-active={index === slashCursor}
                     className={cn(
-                      "flex w-full items-center gap-3 px-3 py-2 text-left font-mono text-[10px]",
-                      index === slashCursor ? "bg-accent/10 text-fg" : "text-fg/55 hover:bg-border/6",
+                      "ade-chat-drawer-row mx-1 flex w-[calc(100%-0.5rem)] items-center gap-3 rounded-lg px-3 py-2.5 text-left font-mono text-[10px]",
+                      index === slashCursor ? "text-fg" : "text-fg/55",
                     )}
                     onMouseEnter={() => setSlashCursor(index)}
                     onClick={() => handleSlashSelect(cmd)}
@@ -1110,8 +1137,8 @@ export function AgentChatComposer({
           ) : null}
 
           {attachmentPickerOpen ? (
-            <div className="absolute bottom-full left-3 z-10 mb-3 w-80 rounded-[14px] border border-violet-400/[0.10] bg-[#151325]/95 shadow-[0_16px_40px_-12px_rgba(0,0,0,0.5)] backdrop-blur-[40px]">
-              <div className="flex items-center gap-2 border-b border-white/[0.04] px-3 py-2">
+            <div className="ade-chat-drawer-glass absolute bottom-full left-3 z-10 mb-3 w-80 overflow-hidden">
+              <div className="flex items-center gap-2 border-b border-white/[0.04] px-3 py-2.5">
                 <At size={11} weight="bold" className="text-muted-fg/30" />
                 <input
                   ref={attachmentInputRef}
@@ -1140,9 +1167,10 @@ export function AgentChatComposer({
                     <button
                       key={result.path}
                       type="button"
+                      data-active={index === attachmentCursor}
                       className={cn(
-                        "flex w-full items-center gap-2 px-3 py-2 text-left font-mono text-[10px] text-fg/60",
-                        index === attachmentCursor ? "bg-violet-500/[0.08] text-fg/85" : "hover:bg-white/[0.03]",
+                        "ade-chat-drawer-row mx-1 flex w-[calc(100%-0.5rem)] items-center gap-2 rounded-lg px-3 py-2.5 text-left font-mono text-[10px]",
+                        index === attachmentCursor ? "text-fg/85" : "text-fg/60",
                       )}
                       onMouseEnter={() => setAttachmentCursor(index)}
                       onClick={() => selectAttachment(result)}
@@ -1162,7 +1190,7 @@ export function AgentChatComposer({
       footer={
         <div className="flex flex-wrap items-center gap-x-3 gap-y-1.5 px-3.5 py-2">
           {/* Left: permission + model controls */}
-          <div className="flex min-w-0 flex-wrap items-center gap-1.5">
+          <div className="ade-liquid-glass-pill flex min-w-0 flex-wrap items-center gap-1.5 px-2 py-1.5">
             {nativeControlPanel}
             <ProviderModelSelector
               value={modelId}
@@ -1176,8 +1204,14 @@ export function AgentChatComposer({
             />
           </div>
 
+          <div className="hidden min-w-0 flex-1 items-center justify-center xl:flex">
+            <span className="truncate font-mono text-[10px] uppercase tracking-[0.16em] text-fg/34">
+              {composerHintText}
+            </span>
+          </div>
+
           {/* Right: attachment, commands, proof, context, send */}
-          <div className="ml-auto flex shrink-0 items-center gap-0.5">
+          <div className="ade-liquid-glass-pill ml-auto flex shrink-0 items-center gap-0.5 p-1">
             <button
               type="button"
               className="rounded-md px-1.5 py-1 font-sans text-[10px] font-medium text-muted-fg/35 transition-colors hover:bg-violet-500/[0.06] hover:text-violet-300/60"
@@ -1306,7 +1340,7 @@ export function AgentChatComposer({
     >
       {/* Pending steers queue — shows queued messages above the input */}
       {pendingSteers.length > 0 ? (
-        <div className="border-b border-white/[0.06] px-3 py-2 space-y-1.5">
+        <div className="border-b border-white/[0.06] bg-white/[0.02] px-3 py-2 space-y-1.5">
           <div className="font-mono text-[9px] uppercase tracking-[0.16em] text-fg/30">
             Pending {pendingSteers.length === 1 ? "message" : `messages (${pendingSteers.length})`}
           </div>
@@ -1381,14 +1415,12 @@ export function AgentChatComposer({
                 setCommandMenuTrigger(null);
               }
             }}
+            rows={1}
+            onInput={resizeTextarea}
             className={cn(
-              "min-h-[44px] w-full bg-transparent px-4 py-2.5 text-[13px] leading-[1.6] text-fg/88 outline-none transition-colors placeholder:text-muted-fg/30",
-              layoutVariant === "grid-tile" ? "resize-y" : "max-h-[200px] resize-none",
+              "block w-full resize-none bg-transparent px-4 py-2.5 text-[13px] leading-[1.6] text-fg/88 outline-none transition-colors placeholder:text-muted-fg/30",
               dragActive ? "opacity-30" : "",
             )}
-            style={layoutVariant === "grid-tile" && composerMaxHeightPx != null
-              ? { maxHeight: `${composerMaxHeightPx}px` }
-              : undefined}
             data-chat-layout-variant={layoutVariant}
             placeholder={turnActive ? "Steer the active turn..." : (promptSuggestion ? "" : (messagePlaceholder ?? "Type to vibecode..."))}
             onKeyDown={handleKeyDown}
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatMessageList.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatMessageList.test.tsx
index f46f76482..f7fa64aa3 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatMessageList.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatMessageList.test.tsx
@@ -239,23 +239,6 @@ describe("AgentChatMessageList transcript rendering", () => {
   // removed: they tested old ChatWorkLogBlock rendering (Show N earlier,
   // specific label text) which changes with every UI iteration.
 
-  it("uses a bounded assistant bubble width for long markdown responses", () => {
-    const view = renderMessageList([
-      {
-        sessionId: "session-1",
-        timestamp: "2026-03-17T10:00:00.000Z",
-        event: {
-          type: "text",
-          text: "Streaming response",
-          itemId: "text-1",
-          turnId: "turn-1",
-        },
-      },
-    ]);
-
-    expect(view.container.innerHTML).toContain("max-w-[min(96ch,75%)]");
-  });
-
   it("renders markdown tables inside a dedicated scroll shell", () => {
     renderMessageList([
       {
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatMessageList.tsx b/apps/desktop/src/renderer/components/chat/AgentChatMessageList.tsx
index 64b6fcb93..5cddaa075 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatMessageList.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatMessageList.tsx
@@ -241,13 +241,13 @@ function renderSubagentUsage(usage: {
 }
 
 const GLASS_CARD_CLASS =
-  "overflow-hidden rounded-[14px] border border-white/[0.06] bg-[#141220] shadow-[0_2px_12px_-4px_rgba(0,0,0,0.4)]";
+  "ade-liquid-glass overflow-hidden rounded-[14px]";
 
 const WORK_LOG_CARD_CLASS =
-  "border border-white/[0.05] bg-[#13111B]/80 shadow-[0_2px_8px_-2px_rgba(0,0,0,0.3)]";
+  "ade-chat-work-card overflow-hidden rounded-[14px]";
 
 const RECESSED_BLOCK_CLASS =
-  "overflow-auto whitespace-pre-wrap break-words rounded-[10px] border border-white/[0.05] bg-[#09080D] px-4 py-3 font-mono text-[11px] leading-[1.6] text-fg/78";
+  "ade-chat-recessed overflow-auto whitespace-pre-wrap break-words rounded-[10px] px-4 py-3 font-mono text-[11px] leading-[1.6] text-fg/78";
 
 function toolSourceChip(toolName: string): { label: string; tone: ChatSurfaceChipTone } | null {
   if (toolName.startsWith("mcp__")) {
@@ -269,45 +269,42 @@ function toolSourceChip(toolName: string): { label: string; tone: ChatSurfaceChi
 }
 
 const MESSAGE_CARD_STYLE: React.CSSProperties = {
-  background: "linear-gradient(135deg, #7C3AED 0%, #6D28D9 50%, #5B21B6 100%)",
-  borderColor: "rgba(167, 139, 250, 0.30)",
-  boxShadow: "0 4px 16px -4px rgba(124, 58, 237, 0.35)",
+  borderColor: "color-mix(in srgb, var(--chat-accent) 26%, rgba(255,255,255,0.14))",
+  boxShadow: "0 18px 28px -24px color-mix(in srgb, var(--chat-accent) 34%, transparent), 0 10px 26px -22px rgba(0,0,0,0.52)",
 };
 
 const SURFACE_INLINE_CARD_STYLE: React.CSSProperties = {
-  borderColor: "rgba(255, 255, 255, 0.06)",
-  background: "#15131E",
+  borderColor: "color-mix(in srgb, var(--chat-glass-border) 100%, transparent)",
 };
 
 const ASSISTANT_MESSAGE_CARD_STYLE: React.CSSProperties = {
-  borderColor: "rgba(255, 255, 255, 0.06)",
-  background: "#12101A",
-  boxShadow: "0 2px 12px -4px rgba(0, 0, 0, 0.4)",
+  borderColor: "color-mix(in srgb, var(--chat-glass-border) 100%, transparent)",
+  boxShadow: "0 16px 32px -26px rgba(0, 0, 0, 0.5)",
 };
 
 function describeUserDeliveryState(event: Extract<AgentChatEvent, { type: "user_message" }>): { label: string; className: string } | null {
   if (event.deliveryState === "failed") {
     return {
       label: "failed",
-      className: "border-red-500/18 bg-red-500/[0.08] text-red-300",
+      className: "ade-chat-status-pill border-red-500/25 text-red-300",
     };
   }
   if (event.deliveryState === "queued") {
     return {
       label: "queued",
-      className: "border-violet-500/18 bg-violet-500/[0.08] text-violet-300",
+      className: "ade-chat-status-pill border-violet-500/25 text-violet-300",
     };
   }
   if (event.processed) {
     return {
       label: "processed",
-      className: "border-emerald-500/18 bg-emerald-500/[0.08] text-emerald-300",
+      className: "ade-chat-status-pill border-emerald-500/25 text-emerald-300",
     };
   }
   if (event.deliveryState === "delivered") {
     return {
       label: "sent",
-      className: "border-sky-500/18 bg-sky-500/[0.08] text-sky-300",
+      className: "ade-chat-status-pill border-sky-500/25 text-sky-300",
     };
   }
   return null;
@@ -820,9 +817,9 @@ function ToolResultCard({ event }: { event: Extract<AgentChatEvent, { type: "too
   return (
     <motion.div
       className="w-fit max-w-full"
-      initial={{ opacity: 0, y: 6, scale: 0.99 }}
-      animate={{ opacity: 1, y: 0, scale: 1 }}
-      transition={{ duration: 0.25, ease: "easeOut" }}
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      transition={{ duration: 0.12, ease: "easeOut" }}
     >
     <CollapsibleCard
       summary={
@@ -830,7 +827,7 @@ function ToolResultCard({ event }: { event: Extract<AgentChatEvent, { type: "too
           <span className={cn("inline-flex", (event.status ?? "completed") === "running" && "ade-tool-bounce")}>
             <StatusIcon status={event.status ?? "completed"} />
           </span>
-          <span className={cn("inline-flex items-center gap-1.5 rounded-md border px-2 py-0.5 text-[9px] font-bold uppercase tracking-wider", meta.badgeCls)}>
+          <span className={cn("ade-chat-status-pill inline-flex items-center gap-1.5 border px-2 py-0.5 text-[9px] font-bold uppercase tracking-wider", meta.badgeCls)}>
             <ToolIcon size={11} weight="bold" />
             {meta.label}
           </span>
@@ -1184,16 +1181,11 @@ function renderEvent(
     return (
       <motion.div
         className="flex justify-end"
-        initial={{ opacity: 0, y: 14, scale: 1.01 }}
-        animate={{ opacity: 1, y: 0, scale: 1 }}
-        transition={{
-          type: "spring",
-          stiffness: 320,
-          damping: 26,
-          mass: 0.7,
-        }}
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 0.14, ease: "easeOut" }}
       >
-        <div className={cn(GLASS_CARD_CLASS, "group relative max-w-[82%] px-4 py-2.5")} style={MESSAGE_CARD_STYLE}>
+        <div className={cn(GLASS_CARD_CLASS, "ade-chat-message-card-user group relative max-w-[82%] px-4 py-2.5")} style={MESSAGE_CARD_STYLE}>
           {deliveryChip ? (
             <span className={cn("mb-1 inline-flex items-center border px-1.5 py-0.5 font-sans text-[9px] font-medium", deliveryChip.className)}>
               {deliveryChip.label}
@@ -1220,14 +1212,14 @@ function renderEvent(
     return (
       <motion.div
         className="flex justify-start"
-        initial={{ opacity: 0, y: 8 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.3, ease: "easeOut" }}
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 0.14, ease: "easeOut" }}
       >
         <div
           className={cn(
             GLASS_CARD_CLASS,
-            "group relative max-w-[min(96ch,75%)] px-5 py-4",
+            "ade-chat-message-card-assistant group relative max-w-[min(104ch,78%)] px-5 py-4",
             options?.turnActive && "min-h-[5.5rem] ade-glow-pulse",
           )}
           style={ASSISTANT_MESSAGE_CARD_STYLE}
@@ -1373,9 +1365,9 @@ function renderEvent(
     const isFailed = event.status === "failed";
     return (
       <motion.div
-        initial={{ opacity: 0, y: 6 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.25, ease: "easeOut" }}
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 0.12, ease: "easeOut" }}
         className={cn(
           "group relative overflow-hidden rounded-xl border p-0",
           isFailed
@@ -1479,9 +1471,9 @@ function renderEvent(
     return (
       <motion.div
         className={cn("overflow-hidden rounded-xl border p-0", "border-violet-500/10 bg-gradient-to-br from-violet-950/20 via-[#0d0b14] to-[#0d0d10]")}
-        initial={{ opacity: 0, y: 8, scale: 0.98 }}
-        animate={{ opacity: 1, y: 0, scale: 1 }}
-        transition={{ duration: 0.3, ease: "easeOut" }}
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 0.14, ease: "easeOut" }}
       >
         <div className="h-px w-full bg-gradient-to-r from-transparent via-violet-400/25 to-transparent" />
         <div className="flex items-center gap-3 px-4 py-3">
@@ -1724,9 +1716,9 @@ function renderEvent(
     return (
       <motion.div
         className="w-fit max-w-full"
-        initial={{ opacity: 0, y: 6 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.25, ease: "easeOut" }}
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 0.12, ease: "easeOut" }}
       >
         <CollapsibleCard
           defaultOpen={false}
@@ -1745,7 +1737,7 @@ function renderEvent(
                 <>
                   <span className="font-medium text-fg/55">Thought</span>
                   {durationLabel ? (
-                    <span className="rounded-full border border-violet-400/10 bg-violet-500/[0.04] px-2 py-0.5 text-[9px] text-violet-300/40">
+                    <span className="ade-liquid-glass-pill px-2 py-0.5 text-[9px] text-violet-300/40">
                       {durationLabel}
                     </span>
                   ) : null}
@@ -1753,8 +1745,7 @@ function renderEvent(
               )}
             </div>
           }
-          className="w-fit max-w-[70ch] border-violet-400/[0.06] bg-[#141220]/50"
-          style={{ background: "rgba(20, 18, 32, 0.5)", borderColor: "rgba(167, 139, 250, 0.06)" }}
+          className="ade-chat-thinking-glass w-fit max-w-[70ch]"
         >
           <div className="text-fg/55 text-[12px] leading-relaxed">
             <MarkdownBlock markdown={reasoningText.length ? event.text : "Thinking..."} />
@@ -2582,11 +2573,14 @@ const EventRow = React.memo(function EventRow({
       {showTurnDivider ? (
         <div className="my-3 flex items-center gap-4">
           <span className="h-px flex-1 bg-gradient-to-r from-transparent via-violet-400/[0.08] to-transparent" />
-          <span
-            className="inline-flex items-center gap-2.5 rounded-full border border-white/[0.06] bg-[#141220]/80 px-3.5 py-1.5 font-sans text-[10px] text-fg/40 shadow-[0_2px_8px_-2px_rgba(0,0,0,0.3)]"
-            style={{ backdropFilter: "blur(12px)", WebkitBackdropFilter: "blur(12px)" }}
-          >
+          <span className="ade-liquid-glass-pill inline-flex items-center gap-2.5 rounded-full px-3.5 py-1.5 font-sans text-[10px] text-fg/42">
             <span className="text-fg/35">{turnDividerLabel ?? "Turn"}</span>
+            {turnModel?.label ? (
+              <span className="inline-flex items-center gap-1 rounded-full border border-white/[0.06] bg-white/[0.04] px-2 py-0.5 text-[9px] text-fg/42">
+                <ModelGlyph modelId={turnModel.modelId} model={turnModel.model} size={10} className="text-fg/36" />
+                <span>{turnModel.label}</span>
+              </span>
+            ) : null}
           </span>
           <span className="h-px flex-1 bg-gradient-to-r from-transparent via-violet-400/[0.08] to-transparent" />
         </div>
@@ -3107,11 +3101,11 @@ export function AgentChatMessageList({
   const streamingIndicator = showStreamingIndicator ? (
     <motion.div
       className="pt-3 pb-2"
-      initial={{ opacity: 0, y: 6 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.25, ease: "easeOut" }}
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      transition={{ duration: 0.12, ease: "easeOut" }}
     >
-      <div className="relative overflow-hidden rounded-xl border border-violet-400/[0.08] bg-[#141220]/60 px-4 py-3">
+      <div className="ade-liquid-glass relative overflow-hidden rounded-xl px-4 py-3">
         <div className="pointer-events-none absolute inset-0 overflow-hidden rounded-xl">
           <div
             className="absolute inset-0"
@@ -3140,7 +3134,7 @@ export function AgentChatMessageList({
   return (
     <div
       ref={scrollRef}
-      className={cn("h-full min-h-0 overflow-auto bg-[#0C0B10] px-5 pt-5 pb-8", className)}
+      className={cn("ade-chat-timeline-pane h-full min-h-0 overflow-auto px-5 pt-5 pb-8", className)}
       onScroll={handleScroll}
     >
       {rows.length === 0 && !streamingIndicator ? (
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatPane.submit.test.tsx b/apps/desktop/src/renderer/components/chat/AgentChatPane.submit.test.tsx
index fbff4073f..b12c47eaa 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatPane.submit.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatPane.submit.test.tsx
@@ -349,7 +349,7 @@ describe("AgentChatPane submit recovery", () => {
 
     const textbox = await screen.findByRole("textbox");
     fireEvent.change(textbox, { target: { value: "Ship the transcript cleanup." } });
-    fireEvent.click(screen.getByTitle("Send"));
+    fireEvent.click(await screen.findByTitle("Send"));
 
     await waitFor(() => {
       expect(send).toHaveBeenCalledWith(expect.objectContaining({
@@ -378,7 +378,7 @@ describe("AgentChatPane submit recovery", () => {
 
     const textbox = await screen.findByRole("textbox");
     fireEvent.change(textbox, { target: { value: "Ship the optimistic bubble." } });
-    fireEvent.click(screen.getByTitle("Send"));
+    fireEvent.click(await screen.findByTitle("Send"));
 
     await waitFor(() => {
       expect(screen.getByText(/Queued — will be delivered after this turn/i)).toBeTruthy();
@@ -428,7 +428,7 @@ describe("AgentChatPane submit recovery", () => {
 
     const textbox = await screen.findByRole("textbox");
     fireEvent.change(textbox, { target: { value: "Retry after the failure." } });
-    fireEvent.click(screen.getByTitle("Send"));
+    fireEvent.click(await screen.findByTitle("Send"));
 
     await waitFor(() => {
       expect(send).toHaveBeenCalled();
@@ -475,7 +475,7 @@ describe("AgentChatPane submit recovery", () => {
 
     const textbox = await screen.findByRole("textbox");
     fireEvent.change(textbox, { target: { value: "Just plan the implementation." } });
-    fireEvent.click(screen.getByTitle("Send"));
+    fireEvent.click(await screen.findByTitle("Send"));
 
     await waitFor(() => {
       expect(send).toHaveBeenCalledWith(expect.objectContaining({
@@ -779,7 +779,7 @@ describe("AgentChatPane submit recovery", () => {
 
     const textbox = await screen.findByRole("textbox");
     fireEvent.change(textbox, { target: { value: "Ship the instant route fix." } });
-    fireEvent.click(screen.getByTitle("Send"));
+    fireEvent.click(await screen.findByTitle("Send"));
 
     await waitFor(() => {
       expect(create).toHaveBeenCalled();
@@ -845,7 +845,7 @@ describe("AgentChatPane submit recovery", () => {
 
     const textbox = await screen.findByRole("textbox");
     fireEvent.change(textbox, { target: { value: "Ship it." } });
-    fireEvent.click(screen.getByTitle("Send"));
+    fireEvent.click(await screen.findByTitle("Send"));
 
     await waitFor(() => {
       expect(create).toHaveBeenCalled();
diff --git a/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx b/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
index 5d6197051..b537b40c2 100644
--- a/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentChatPane.tsx
@@ -47,6 +47,7 @@ import { CURSOR_AVAILABLE_MODE_IDS } from "../../../shared/cursorModes";
 import { cn } from "../ui/cn";
 import { AgentChatComposer } from "./AgentChatComposer";
 import { AgentChatMessageList } from "./AgentChatMessageList";
+import { AgentQuestionModal } from "./AgentQuestionModal";
 import { ChatStatusGlyph } from "./chatStatusVisuals";
 import { isChatToolType } from "../../lib/sessions";
 import { ToolLogo } from "../terminals/ToolLogos";
@@ -72,6 +73,7 @@ import { useAppStore } from "../../state/appStore";
 import { ClaudeCacheTtlBadge } from "../shared/ClaudeCacheTtlBadge";
 import { shouldShowClaudeCacheTtl } from "../../lib/claudeCacheTtl";
 import { getAgentChatModelsCached, getAiStatusCached } from "../../lib/aiDiscoveryCache";
+import { invalidateSessionListCache } from "../../lib/sessionListCache";
 
 const LAST_MODEL_ID_KEY = "ade.chat.lastModelId";
 const LAST_REASONING_KEY_PREFIX = "ade.chat.lastReasoningEffort";
@@ -751,6 +753,8 @@ export function AgentChatPane({
   const [loading, setLoading] = useState(false);
   const [preferencesReady, setPreferencesReady] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const [closingChatSessionId, setClosingChatSessionId] = useState<string | null>(null);
+  const [deletingChatSessionId, setDeletingChatSessionId] = useState<string | null>(null);
   const [computerUseSnapshot, setComputerUseSnapshot] = useState<ComputerUseOwnerSnapshot | null>(null);
   const [proofDrawerOpen, setProofDrawerOpen] = useState(false);
   const [terminalDrawerOpen, setTerminalDrawerOpen] = useState(false);
@@ -2112,6 +2116,51 @@ export function AgentChatPane({
     }
   }, [canShowHandoff, handoffBlocked, handoffModelId, notifySessionCreated, refreshSessions, selectedSessionId]);
 
+  const handleEndSelectedChat = useCallback(() => {
+    if (!selectedSessionId || !selectedSession || selectedSession.status === "ended") return;
+    setError(null);
+    setClosingChatSessionId(selectedSessionId);
+    void window.ade.agentChat.dispose({ sessionId: selectedSessionId })
+      .then(async () => {
+        invalidateSessionListCache();
+        await refreshSessions().catch(() => {});
+      })
+      .catch((err: unknown) => {
+        const message = err instanceof Error ? err.message : String(err);
+        setError(`End chat failed: ${message}`);
+      })
+      .finally(() => {
+        setClosingChatSessionId((current) => (current === selectedSessionId ? null : current));
+      });
+  }, [refreshSessions, selectedSession, selectedSessionId]);
+
+  const handleDeleteSelectedChat = useCallback(() => {
+    if (!selectedSessionId || !selectedSession || selectedSession.status !== "ended") return;
+    const label = chatSessionTitle(selectedSession).trim() || "this chat";
+    const confirmed = window.confirm(
+      `Delete "${label}"?\n\nThis permanently removes the saved chat history from ADE.`,
+    );
+    if (!confirmed) return;
+
+    setError(null);
+    setDeletingChatSessionId(selectedSessionId);
+    void window.ade.agentChat.delete({ sessionId: selectedSessionId })
+      .then(async () => {
+        invalidateSessionListCache();
+        draftsPerSessionRef.current.delete(selectedSessionId);
+        localTouchBySessionRef.current.delete(selectedSessionId);
+        loadedHistoryRef.current.delete(selectedSessionId);
+        await refreshSessions().catch(() => {});
+      })
+      .catch((err: unknown) => {
+        const message = err instanceof Error ? err.message : String(err);
+        setError(`Delete failed: ${message}`);
+      })
+      .finally(() => {
+        setDeletingChatSessionId((current) => (current === selectedSessionId ? null : current));
+      });
+  }, [refreshSessions, selectedSession, selectedSessionId]);
+
   // ── Eager session creation ──
   // Create a session as soon as we have a model + lane, so slash commands,
   // MCP status, and other pre-chat metadata are available immediately.
@@ -2570,6 +2619,26 @@ export function AgentChatPane({
               ) : null}
             </div>
           ) : null}
+          {!lockedSingleSessionMode && selectedSessionId && selectedSession?.status !== "ended" ? (
+            <button
+              type="button"
+              className="inline-flex items-center rounded-md border border-white/[0.06] px-2 py-0.5 font-sans text-[10px] font-medium text-muted-fg/50 transition-colors hover:border-white/[0.1] hover:text-fg disabled:cursor-not-allowed disabled:opacity-40"
+              onClick={handleEndSelectedChat}
+              disabled={closingChatSessionId === selectedSessionId || deletingChatSessionId === selectedSessionId}
+            >
+              {closingChatSessionId === selectedSessionId ? "Ending..." : "End chat"}
+            </button>
+          ) : null}
+          {!lockedSingleSessionMode && selectedSessionId && selectedSession?.status === "ended" ? (
+            <button
+              type="button"
+              className="inline-flex items-center rounded-md border border-red-500/20 px-2 py-0.5 font-sans text-[10px] font-medium text-red-200/70 transition-colors hover:border-red-500/30 hover:text-red-100 disabled:cursor-not-allowed disabled:opacity-40"
+              onClick={handleDeleteSelectedChat}
+              disabled={deletingChatSessionId === selectedSessionId}
+            >
+              {deletingChatSessionId === selectedSessionId ? "Deleting..." : "Delete chat"}
+            </button>
+          ) : null}
           {isPersistentIdentitySurface && selectedSessionId ? (
             <button
               type="button"
@@ -2997,24 +3066,19 @@ export function AgentChatPane({
                   exit={{ opacity: 0, scale: 0.95, transition: { duration: 0.2, ease: "easeIn" } }}
                   className="absolute inset-0 flex flex-col items-center justify-center px-6"
                 >
-                  <div className="flex flex-col items-center text-center">
-                    {/* ADE logo with subtle glow */}
+                  <div className="flex w-full max-w-2xl flex-col items-center gap-4 text-center">
                     <motion.div
-                      className="relative mb-5"
+                      className="relative"
                       exit={{ opacity: 0, scale: 0.8, transition: { duration: 0.3, ease: "easeOut" } }}
                     >
                       <div
-                        className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 h-[500px] w-[500px] rounded-full pointer-events-none"
-                        style={{
-                          background: "var(--color-accent)",
-                          opacity: 0.06,
-                          filter: "blur(140px)",
-                        }}
+                        className="pointer-events-none absolute top-1/2 left-1/2 h-[360px] w-[360px] -translate-x-1/2 -translate-y-1/2 rounded-full"
+                        style={{ background: "var(--color-accent)", opacity: 0.08, filter: "blur(110px)" }}
                       />
                       <img
                         src="./logo.png"
                         alt="ADE"
-                        className="relative z-10 w-96 h-96 object-contain"
+                        className="relative z-10 h-96 w-96 object-contain"
                         style={{ filter: "drop-shadow(0 0 40px rgba(168,130,255,0.15))" }}
                       />
                     </motion.div>
@@ -3022,14 +3086,13 @@ export function AgentChatPane({
                     <h2 className="font-sans text-[18px] font-semibold tracking-tight text-fg/80">
                       Start a new conversation
                     </h2>
-                    <p className="mt-1.5 mb-4 max-w-sm text-center text-[13px] leading-relaxed text-fg/35">
+                    <p className="max-w-sm text-center text-[13px] leading-relaxed text-fg/35">
                       Ask ADE anything — refactor code, debug issues, or explore ideas.
                     </p>
 
                     {/* Lane selector pill */}
                     {availableLanes && availableLanes.length > 0 && onLaneChange ? (
                       <motion.div
-                        className="mb-4"
                         exit={{ opacity: 0, transition: { duration: 0.15 } }}
                       >
                         <select
@@ -3055,7 +3118,7 @@ export function AgentChatPane({
                       </motion.div>
                     ) : laneDisplayLabel ? (
                       <motion.div
-                        className="mb-4 flex items-center gap-2 rounded-full px-4 py-1.5"
+                        className="flex items-center gap-2 rounded-full px-4 py-1.5"
                         style={{ background: "rgba(255,255,255,0.04)", border: "1px solid rgba(255,255,255,0.08)" }}
                         exit={{ opacity: 0, transition: { duration: 0.15 } }}
                       >
@@ -3075,6 +3138,16 @@ export function AgentChatPane({
           )}
         </div>
       </ChatSurfaceShell>
+      {pendingInput
+        && (pendingInput.request.kind === "question" || pendingInput.request.kind === "structured_question")
+        && selectedSessionId ? (
+        <AgentQuestionModal
+          request={pendingInput.request}
+          onClose={() => { void approve("cancel"); }}
+          onSubmit={({ answers, responseText }) => { void approve("accept", responseText ?? null, answers); }}
+          onDecline={() => { void approve("decline"); }}
+        />
+      ) : null}
     </>
   );
 }
diff --git a/apps/desktop/src/renderer/components/chat/AgentQuestionModal.tsx b/apps/desktop/src/renderer/components/chat/AgentQuestionModal.tsx
index 9182e1544..6c13c45c4 100644
--- a/apps/desktop/src/renderer/components/chat/AgentQuestionModal.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentQuestionModal.tsx
@@ -1,11 +1,8 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import ReactMarkdown from "react-markdown";
-import rehypeRaw from "rehype-raw";
-import rehypeSanitize, { defaultSchema } from "rehype-sanitize";
-import remarkGfm from "remark-gfm";
 import { ChatCircleText, HandPalm, PaperPlaneTilt, X } from "@phosphor-icons/react";
 import type { PendingInputRequest } from "../../../shared/types";
 import { Button } from "../ui/Button";
+import { ChatMarkdown } from "./chatMarkdown";
 
 type AgentQuestionModalProps = {
   request: PendingInputRequest;
@@ -20,29 +17,6 @@ type QuestionDraft = {
   activePreviewValue: string | null;
 };
 
-const SAFE_PREVIEW_SCHEMA = {
-  ...defaultSchema,
-  tagNames: [
-    "p",
-    "ul",
-    "ol",
-    "li",
-    "strong",
-    "em",
-    "code",
-    "pre",
-    "blockquote",
-    "table",
-    "thead",
-    "tbody",
-    "tr",
-    "th",
-    "td",
-    "br",
-    "hr",
-  ],
-};
-
 function createEmptyDraft(): QuestionDraft {
   return {
     text: "",
@@ -152,7 +126,7 @@ export function AgentQuestionModal({
         if (passiveDismissAllowed && event.target === event.currentTarget) onClose();
       }}
     >
-      <div className="ade-glass-card w-full max-w-3xl overflow-hidden border-border/20 bg-[linear-gradient(180deg,rgba(18,24,38,0.94),rgba(11,15,24,0.88))] shadow-[var(--shadow-panel)]">
+      <div className="ade-liquid-glass ade-liquid-glass-strong w-full max-w-3xl overflow-hidden rounded-2xl shadow-[var(--shadow-panel)]">
         <div className="flex items-start justify-between gap-3 border-b border-border/15 bg-[linear-gradient(90deg,rgba(78,154,241,0.12),transparent)] px-5 py-3">
           <div className="min-w-0">
             <div className="mb-1 flex flex-wrap items-center gap-2">
@@ -342,36 +316,7 @@ export function AgentQuestionModal({
                             </div>
                           </div>
                           <div className="max-h-[320px] overflow-auto px-3 py-3 text-[12px] leading-6 text-fg/86">
-                            <ReactMarkdown
-                              remarkPlugins={[remarkGfm]}
-                              rehypePlugins={[rehypeRaw, [rehypeSanitize, SAFE_PREVIEW_SCHEMA]]}
-                              components={{
-                                p: ({ children }) => <p className="mb-3 whitespace-pre-wrap">{children}</p>,
-                                ul: ({ children }) => <ul className="mb-3 list-disc space-y-1 pl-5">{children}</ul>,
-                                ol: ({ children }) => <ol className="mb-3 list-decimal space-y-1 pl-5">{children}</ol>,
-                                li: ({ children }) => <li>{children}</li>,
-                                pre: ({ children }) => (
-                                  <pre className="mb-3 overflow-auto rounded-sm border border-white/[0.06] bg-black/25 p-3 font-mono text-[11px] leading-5">
-                                    {children}
-                                  </pre>
-                                ),
-                                code: ({ children, className }) => (
-                                  <code className={className ?? "rounded-sm bg-black/30 px-1 py-0.5 font-mono text-[11px]"}>
-                                    {children}
-                                  </code>
-                                ),
-                                blockquote: ({ children }) => (
-                                  <blockquote className="mb-3 border-l-2 border-sky-300/25 pl-3 text-muted-fg/72">
-                                    {children}
-                                  </blockquote>
-                                ),
-                                table: ({ children }) => <table className="mb-3 w-full border-collapse text-left">{children}</table>,
-                                th: ({ children }) => <th className="border border-white/[0.08] px-2 py-1 font-semibold">{children}</th>,
-                                td: ({ children }) => <td className="border border-white/[0.08] px-2 py-1 align-top">{children}</td>,
-                              }}
-                            >
-                              {activePreviewOption.preview}
-                            </ReactMarkdown>
+                            <ChatMarkdown tone="sky">{activePreviewOption.preview}</ChatMarkdown>
                           </div>
                         </div>
                       ) : null}
diff --git a/apps/desktop/src/renderer/components/chat/ChatAttachmentTray.tsx b/apps/desktop/src/renderer/components/chat/ChatAttachmentTray.tsx
index 03c1f42c6..b7e7fee8a 100644
--- a/apps/desktop/src/renderer/components/chat/ChatAttachmentTray.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatAttachmentTray.tsx
@@ -37,7 +37,7 @@ export function ChatAttachmentTray({
         <span
           key={attachment.path}
           className={cn(
-            "group inline-flex max-w-full items-center gap-2 border px-2.5 py-1 font-mono text-[10px] transition-colors",
+            "ade-liquid-glass-pill group inline-flex max-w-full items-center gap-2 rounded-[var(--chat-radius-pill)] px-2.5 py-1.5 font-mono text-[10px] transition-colors",
             chipTone,
           )}
         >
@@ -46,7 +46,7 @@ export function ChatAttachmentTray({
           {onRemove ? (
             <button
               type="button"
-              className="text-current/45 transition-colors hover:text-current"
+              className="rounded-full text-current/45 transition-colors hover:bg-white/[0.06] hover:text-current"
               title={`Remove ${attachment.path}`}
               onClick={() => onRemove(attachment.path)}
             >
diff --git a/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx b/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx
index e26570fda..9b647c949 100644
--- a/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatCommandMenu.tsx
@@ -202,20 +202,20 @@ export const ChatCommandMenu = forwardRef<ChatCommandMenuHandle, ChatCommandMenu
             animate={{ opacity: 1, y: 0 }}
             exit={{ opacity: 0, y: 8 }}
             transition={{ duration: 0.12, ease: "easeOut" }}
-            className="absolute z-50 min-w-[300px] max-w-[340px] overflow-hidden rounded-[14px] border border-violet-400/[0.12] bg-[#151325]/95 shadow-[0_20px_50px_-12px_rgba(0,0,0,0.55)] backdrop-blur-[40px]"
+            className="ade-chat-drawer-glass absolute z-50 min-w-[300px] max-w-[340px] overflow-hidden"
             style={{ top: anchor!.top, left: anchor!.left, marginTop: "-8px" }}
           >
             {/* Header hint */}
-            <div className="flex items-center gap-2 border-b border-white/[0.06] px-3.5 py-2">
+            <div className="flex items-center gap-2 border-b border-white/[0.06] px-3.5 py-2.5">
               {trigger!.type === "at" ? (
                 <>
                   <MagnifyingGlass size={12} weight="bold" className="text-violet-400/60" />
-                  <span className="text-[10px] font-medium tracking-wide text-fg/40">File search</span>
+                  <span className="text-[10px] font-medium tracking-wide text-fg/46">File search</span>
                 </>
               ) : (
                 <>
                   <Command size={12} weight="bold" className="text-violet-400/60" />
-                  <span className="text-[10px] font-medium tracking-wide text-fg/40">Slash commands</span>
+                  <span className="text-[10px] font-medium tracking-wide text-fg/46">Slash commands</span>
                 </>
               )}
             </div>
@@ -254,11 +254,10 @@ export const ChatCommandMenu = forwardRef<ChatCommandMenuHandle, ChatCommandMenu
                   return (
                     <div
                       key={item.path}
+                      data-active={isSelected}
                       className={cn(
-                        "mx-1 flex cursor-pointer items-center gap-2.5 px-3 py-2 text-[11px] transition-all",
-                        isSelected
-                          ? "rounded-md bg-gradient-to-r from-violet-500/[0.12] to-violet-500/[0.06] border border-violet-400/[0.15]"
-                          : "rounded-md border border-transparent hover:bg-white/[0.03]",
+                        "ade-chat-drawer-row mx-1 flex cursor-pointer items-center gap-2.5 rounded-lg px-3 py-2.5 text-[11px]",
+                        isSelected ? "text-fg/88" : "text-fg/58",
                       )}
                       onMouseEnter={() => setSelectedIndex(i)}
                       onClick={() => handleSelect(i)}
@@ -276,11 +275,10 @@ export const ChatCommandMenu = forwardRef<ChatCommandMenuHandle, ChatCommandMenu
                 return (
                   <div
                     key={item.name}
+                    data-active={isSelected}
                     className={cn(
-                      "mx-1 flex cursor-pointer items-center gap-2.5 px-3 py-2 text-[11px] transition-all",
-                      isSelected
-                        ? "rounded-md bg-gradient-to-r from-violet-500/[0.12] to-violet-500/[0.06] border border-violet-400/[0.15]"
-                        : "rounded-md border border-transparent hover:bg-white/[0.03]",
+                      "ade-chat-drawer-row mx-1 flex cursor-pointer items-center gap-2.5 rounded-lg px-3 py-2.5 text-[11px]",
+                      isSelected ? "text-fg/88" : "text-fg/58",
                     )}
                     onMouseEnter={() => setSelectedIndex(i)}
                     onClick={() => handleSelect(i)}
diff --git a/apps/desktop/src/renderer/components/chat/ChatComposerShell.tsx b/apps/desktop/src/renderer/components/chat/ChatComposerShell.tsx
index 5481d90be..d2c0a9731 100644
--- a/apps/desktop/src/renderer/components/chat/ChatComposerShell.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatComposerShell.tsx
@@ -24,20 +24,18 @@ export function ChatComposerShell({
   return (
     <div
       className={cn(
-        "relative overflow-hidden rounded-[var(--chat-radius-shell)] transition-colors",
-        "bg-[#14121F]/90 border border-white/[0.08] shadow-[0_8px_32px_rgba(0,0,0,0.45),0_0_0_1px_rgba(167,139,250,0.06)]",
+        "ade-liquid-glass ade-liquid-glass-strong relative overflow-hidden rounded-[var(--chat-radius-shell)] transition-colors",
         className,
       )}
-      style={{
-        backdropFilter: "blur(24px)",
-        WebkitBackdropFilter: "blur(24px)",
-        ...(glowColor ? {
-          boxShadow: `0 0 24px 2px ${glowColor}, 0 0 48px 4px ${glowColor}, 0 8px 32px rgba(0,0,0,0.45), 0 0 0 1px rgba(167,139,250,0.06)`,
-          borderColor: glowColor.replace(/[\d.]+\)$/, "0.3)"),
-        } : {}),
-      }}
+      style={glowColor ? {
+        boxShadow: `0 0 24px -6px ${glowColor}, 0 0 48px -16px ${glowColor}, 0 26px 64px -34px rgba(0,0,0,0.72), 0 0 0 1px color-mix(in srgb, ${glowColor} 30%, rgba(255,255,255,0.04))`,
+        borderColor: `color-mix(in srgb, ${glowColor} 30%, transparent)`,
+      } : undefined}
       data-chat-composer-mode={mode}
     >
+      <div className="pointer-events-none absolute inset-x-8 top-0 h-px bg-gradient-to-r from-transparent via-white/20 to-transparent" />
+      <div className="pointer-events-none absolute left-6 top-0 h-24 w-32 rounded-full bg-[radial-gradient(circle,rgba(255,255,255,0.10)_0%,transparent_72%)] opacity-70 blur-2xl" />
+      <div className="pointer-events-none absolute bottom-[-3rem] right-[-2rem] h-24 w-36 rounded-full bg-[radial-gradient(circle,var(--chat-liquid-sheen)_0%,transparent_70%)] opacity-80 blur-3xl" />
       {pendingBanner ? <div className="relative border-b border-[color:var(--chat-panel-border)]">{pendingBanner}</div> : null}
       {trays ? <div className="relative border-b border-[color:var(--chat-panel-border)]">{trays}</div> : null}
       <div className="relative">
diff --git a/apps/desktop/src/renderer/components/chat/ChatProposedPlanCard.tsx b/apps/desktop/src/renderer/components/chat/ChatProposedPlanCard.tsx
index b97b074dd..d2a94301c 100644
--- a/apps/desktop/src/renderer/components/chat/ChatProposedPlanCard.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatProposedPlanCard.tsx
@@ -1,8 +1,8 @@
-import React, { useCallback, useMemo, useState } from "react";
-import { ListChecks, CopySimple, CaretDown, CaretRight } from "@phosphor-icons/react";
-import { AnimatePresence, motion } from "motion/react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { ListChecks, CopySimple, ArrowsOut, X } from "@phosphor-icons/react";
 import { cn } from "../ui/cn";
 import { ChatStatusGlyph } from "./chatStatusVisuals";
+import { ChatMarkdown } from "./chatMarkdown";
 
 /* ── Types ── */
 
@@ -15,41 +15,9 @@ interface ChatProposedPlanCardProps {
   onReject: () => void;
 }
 
-/* ── Step parsing ── */
-
-type ParsedSegment =
-  | { kind: "header"; text: string }
-  | { kind: "step"; text: string }
-  | { kind: "text"; text: string };
-
-function parseDescription(raw: string): ParsedSegment[] {
-  const lines = raw.split(/\r?\n/);
-  const segments: ParsedSegment[] = [];
-
-  for (const line of lines) {
-    const trimmed = line.trimStart();
-    if (/^#{1,2}\s+/.test(trimmed)) {
-      segments.push({ kind: "header", text: trimmed.replace(/^#{1,2}\s+/, "").trim() });
-    } else if (/^\d+\.\s+/.test(trimmed)) {
-      segments.push({ kind: "step", text: trimmed.replace(/^\d+\.\s+/, "").trim() });
-    } else if (/^[-*]\s+/.test(trimmed)) {
-      segments.push({ kind: "step", text: trimmed.replace(/^[-*]\s+/, "").trim() });
-    } else if (trimmed.length > 0) {
-      segments.push({ kind: "text", text: line });
-    }
-  }
-
-  return segments;
-}
-
-function hasStructure(segments: ParsedSegment[]): boolean {
-  return segments.some((s) => s.kind === "header" || s.kind === "step");
-}
-
 /* ── Constants ── */
 
-const COLLAPSE_THRESHOLD = 300;
-const VISIBLE_CHARS = 200;
+const FULL_VIEW_THRESHOLD = 2000;
 
 /* ── Component ── */
 
@@ -61,16 +29,14 @@ const ChatProposedPlanCard = React.memo(function ChatProposedPlanCard({
   onApprove,
   onReject,
 }: ChatProposedPlanCardProps) {
-  const [expanded, setExpanded] = useState(false);
-  const [animating, setAnimating] = useState(false);
+  const [fullViewOpen, setFullViewOpen] = useState(false);
   const [copied, setCopied] = useState(false);
+  const triggerRef = useRef<HTMLElement | null>(null);
+  const modalRef = useRef<HTMLDivElement | null>(null);
+  const closeButtonRef = useRef<HTMLButtonElement | null>(null);
 
   const bodyText = description ?? question ?? "The agent has prepared a plan.";
-
-  const segments = useMemo(() => parseDescription(bodyText), [bodyText]);
-  const structured = useMemo(() => hasStructure(segments), [segments]);
-  const isLong = bodyText.length > COLLAPSE_THRESHOLD;
-  const showFull = expanded || !isLong;
+  const offerFullView = bodyText.length > FULL_VIEW_THRESHOLD;
 
   const handleCopy = useCallback(() => {
     void navigator.clipboard.writeText(bodyText).then(() => {
@@ -79,152 +45,198 @@ const ChatProposedPlanCard = React.memo(function ChatProposedPlanCard({
     });
   }, [bodyText]);
 
-  /* ── Truncated plain text ── */
-  const truncatedText = useMemo(() => {
-    if (showFull) return bodyText;
-    return bodyText.slice(0, VISIBLE_CHARS).trimEnd() + "\u2026";
-  }, [bodyText, showFull]);
-
-  /* ── Truncated structured segments ── */
-  const visibleSegments = useMemo(() => {
-    if (showFull) return segments;
-    let charCount = 0;
-    const result: ParsedSegment[] = [];
-    for (const seg of segments) {
-      charCount += seg.text.length;
-      if (charCount > VISIBLE_CHARS && result.length > 0) break;
-      result.push(seg);
-    }
-    return result;
-  }, [segments, showFull]);
+  // When the modal is open: lock body scroll, move focus into the dialog,
+  // trap Tab/Shift+Tab inside the focusable elements, and restore focus to
+  // the trigger button when the dialog closes.
+  useEffect(() => {
+    if (!fullViewOpen) return;
+    const previousOverflow = document.body.style.overflow;
+    document.body.style.overflow = "hidden";
+    closeButtonRef.current?.focus();
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") {
+        event.stopPropagation();
+        event.preventDefault();
+        setFullViewOpen(false);
+        return;
+      }
+      if (event.key !== "Tab") return;
+      const container = modalRef.current;
+      if (!container) return;
+      const focusables = Array.from(
+        container.querySelectorAll<HTMLElement>(
+          'button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])',
+        ),
+      ).filter((el) => !el.hasAttribute("data-focus-skip"));
+      if (focusables.length === 0) return;
+      const first = focusables[0]!;
+      const last = focusables[focusables.length - 1]!;
+      const active = document.activeElement as HTMLElement | null;
+      if (event.shiftKey && (active === first || !container.contains(active))) {
+        event.preventDefault();
+        last.focus();
+      } else if (!event.shiftKey && active === last) {
+        event.preventDefault();
+        first.focus();
+      }
+    };
+    window.addEventListener("keydown", onKeyDown, true);
+    return () => {
+      window.removeEventListener("keydown", onKeyDown, true);
+      document.body.style.overflow = previousOverflow;
+      triggerRef.current?.focus?.();
+    };
+  }, [fullViewOpen]);
 
   return (
-    <div className="relative overflow-hidden rounded-xl border border-amber-500/[0.10] bg-gradient-to-br from-amber-950/15 via-[#12101A] to-[#12101A] p-4">
-      {/* Gradient accent line */}
-      <div className="absolute inset-x-0 top-0 h-px bg-gradient-to-r from-transparent via-amber-400/25 to-transparent" />
-
-      {/* ── Header ── */}
-      <div className="mb-2.5 flex items-center gap-2">
-        <span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-amber-500/[0.10] shadow-[0_0_0_3px_rgba(245,158,11,0.08)]">
-          <ChatStatusGlyph status="waiting" size={11} />
-        </span>
-        <ListChecks size={13} weight="bold" className="text-amber-400/60" />
-        <span className="text-amber-300/50 font-mono text-[9px] uppercase tracking-[0.16em]">
-          Plan Approval &middot; {source}
-        </span>
+    <>
+      <div className="relative overflow-hidden rounded-xl border border-amber-500/[0.10] bg-gradient-to-br from-amber-950/15 via-[#12101A] to-[#12101A] p-4">
+        {/* Gradient accent line */}
+        <div className="absolute inset-x-0 top-0 h-px bg-gradient-to-r from-transparent via-amber-400/25 to-transparent" />
+
+        {/* ── Header ── */}
+        <div className="mb-2.5 flex items-center gap-2">
+          <span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-amber-500/[0.10] shadow-[0_0_0_3px_rgba(245,158,11,0.08)]">
+            <ChatStatusGlyph status="waiting" size={11} />
+          </span>
+          <ListChecks size={13} weight="bold" className="text-amber-400/60" />
+          <span className="text-amber-300/50 font-mono text-[9px] uppercase tracking-[0.16em]">
+            Plan Approval &middot; {source}
+          </span>
+        </div>
+
+        {/* ── Body ── */}
+        <div
+          data-testid="chat-proposed-plan-body"
+          className="mb-2 max-h-[22rem] overflow-y-auto pr-1 text-[12px] leading-6 text-fg/82"
+        >
+          <ChatMarkdown tone="amber">{bodyText}</ChatMarkdown>
+        </div>
+
+        {offerFullView && (
+          <div className="mb-2.5 flex items-center">
+            <button
+              type="button"
+              className="flex items-center gap-1 font-mono text-[9px] uppercase tracking-[0.14em] text-amber-300/55 transition-colors hover:text-amber-200/80"
+              onClick={(event) => {
+                triggerRef.current = event.currentTarget;
+                setFullViewOpen(true);
+              }}
+            >
+              <ArrowsOut size={9} weight="bold" />
+              View full plan
+            </button>
+          </div>
+        )}
+
+        {/* ── Actions ── */}
+        <div className="flex items-center gap-1.5">
+          <button
+            type="button"
+            disabled={disabled}
+            className={cn(
+              "rounded-lg border border-emerald-400/25 bg-emerald-500/[0.10] px-3 py-1.5 text-[11px] font-medium text-emerald-300 transition-colors",
+              "hover:bg-emerald-500/[0.16] disabled:pointer-events-none disabled:opacity-40",
+            )}
+            onClick={onApprove}
+          >
+            Approve &amp; Implement
+          </button>
+          <button
+            type="button"
+            disabled={disabled}
+            className={cn(
+              "rounded-lg border border-white/[0.06] px-3 py-1.5 text-[11px] text-fg/50 transition-colors",
+              "hover:bg-white/[0.04] disabled:pointer-events-none disabled:opacity-40",
+            )}
+            onClick={onReject}
+          >
+            Reject &amp; Revise
+          </button>
+          <button
+            type="button"
+            className="ml-auto flex items-center gap-1 rounded-[var(--chat-radius-pill)] border border-white/[0.06] px-2 py-1 font-mono text-[9px] uppercase tracking-[0.12em] text-fg/35 transition-colors hover:bg-white/[0.04] hover:text-fg/55"
+            onClick={handleCopy}
+          >
+            <CopySimple size={10} weight="bold" />
+            {copied ? "Copied" : "Copy Plan"}
+          </button>
+        </div>
       </div>
 
-      {/* ── Body ── */}
-      <AnimatePresence initial={false}>
-        <motion.div
-          key={showFull ? "full" : "collapsed"}
-          initial={{ height: 0, opacity: 0 }}
-          animate={{ height: "auto", opacity: 1 }}
-          exit={{ height: 0, opacity: 0 }}
-          transition={{ duration: 0.2, ease: "easeInOut" }}
-          onAnimationStart={() => setAnimating(true)}
-          onAnimationComplete={() => setAnimating(false)}
-          className={animating ? "overflow-hidden" : ""}
+      {fullViewOpen ? (
+        <div
+          data-testid="chat-proposed-plan-full-view"
+          role="dialog"
+          aria-modal="true"
+          aria-label="Plan approval full view"
+          className="fixed inset-0 z-[9999] flex items-center justify-center bg-[radial-gradient(circle_at_top,rgba(245,158,11,0.12),rgba(8,7,12,0.84))] px-4 backdrop-blur-md"
+          onClick={(event) => {
+            if (event.target === event.currentTarget) setFullViewOpen(false);
+          }}
         >
-          {structured ? (
-            <div className="mb-2 space-y-1">
-              {visibleSegments.map((seg, i) => {
-                if (seg.kind === "header") {
-                  return (
-                    <div
-                      key={`h-${i}`}
-                      className="mt-1.5 font-mono text-[10px] font-bold uppercase tracking-[0.14em] text-amber-300/70"
-                    >
-                      {seg.text}
-                    </div>
-                  );
-                }
-                if (seg.kind === "step") {
-                  return (
-                    <div key={`s-${i}`} className="flex items-start gap-2 pl-0.5">
-                      <span className="mt-[3px] block h-1 w-1 shrink-0 rounded-full bg-amber-400/40" />
-                      <span className="text-[12px] leading-relaxed text-fg/80">
-                        {seg.text}
-                      </span>
-                    </div>
-                  );
-                }
-                return (
-                  <div
-                    key={`t-${i}`}
-                    className="font-mono text-[11px] leading-relaxed text-fg/68"
-                  >
-                    {seg.text}
-                  </div>
-                );
-              })}
-              {!showFull && (
-                <span className="font-mono text-[10px] text-fg/30">&hellip;</span>
-              )}
+          <div
+            ref={modalRef}
+            className="ade-glass-card flex h-[min(88vh,900px)] w-full max-w-3xl flex-col overflow-hidden border-amber-500/15 bg-[linear-gradient(180deg,rgba(24,18,12,0.94),rgba(14,11,18,0.9))] shadow-[var(--shadow-panel)]">
+            <div className="flex items-center justify-between gap-3 border-b border-amber-400/12 bg-[linear-gradient(90deg,rgba(245,158,11,0.10),transparent)] px-5 py-3">
+              <div className="flex items-center gap-2">
+                <ListChecks size={14} weight="bold" className="text-amber-300/75" />
+                <div className="font-mono text-[11px] font-bold uppercase tracking-[0.18em] text-amber-200/80">
+                  Plan Approval &middot; {source}
+                </div>
+              </div>
+              <button
+                ref={closeButtonRef}
+                type="button"
+                className="text-muted-fg/45 transition-colors hover:text-fg/80"
+                onClick={() => setFullViewOpen(false)}
+                aria-label="Close full plan view"
+              >
+                <X size={14} />
+              </button>
             </div>
-          ) : (
-            <div className="mb-2 max-h-72 overflow-y-auto whitespace-pre-wrap font-mono text-[11px] leading-relaxed text-fg/68">
-              {truncatedText}
+            <div className="flex-1 overflow-y-auto px-6 py-5 text-[13px] leading-6 text-fg/88">
+              <ChatMarkdown tone="amber">{bodyText}</ChatMarkdown>
             </div>
-          )}
-        </motion.div>
-      </AnimatePresence>
-
-      {/* ── Show more / less toggle ── */}
-      {isLong && (
-        <button
-          type="button"
-          className="mb-2.5 flex items-center gap-1 font-mono text-[9px] uppercase tracking-[0.14em] text-amber-300/55 transition-colors hover:text-amber-200/80"
-          onClick={() => setExpanded((v) => !v)}
-        >
-          {expanded ? (
-            <>
-              <CaretDown size={9} weight="bold" />
-              Show less
-            </>
-          ) : (
-            <>
-              <CaretRight size={9} weight="bold" />
-              Show more
-            </>
-          )}
-        </button>
-      )}
-
-      {/* ── Actions ── */}
-      <div className="flex items-center gap-1.5">
-        <button
-          type="button"
-          disabled={disabled}
-          className={cn(
-            "rounded-lg border border-emerald-400/25 bg-emerald-500/[0.10] px-3 py-1.5 text-[11px] font-medium text-emerald-300 transition-colors",
-            "hover:bg-emerald-500/[0.16] disabled:pointer-events-none disabled:opacity-40",
-          )}
-          onClick={onApprove}
-        >
-          Approve &amp; Implement
-        </button>
-        <button
-          type="button"
-          disabled={disabled}
-          className={cn(
-            "rounded-lg border border-white/[0.06] px-3 py-1.5 text-[11px] text-fg/50 transition-colors",
-            "hover:bg-white/[0.04] disabled:pointer-events-none disabled:opacity-40",
-          )}
-          onClick={onReject}
-        >
-          Reject &amp; Revise
-        </button>
-        <button
-          type="button"
-          className="ml-auto flex items-center gap-1 rounded-[var(--chat-radius-pill)] border border-white/[0.06] px-2 py-1 font-mono text-[9px] uppercase tracking-[0.12em] text-fg/35 transition-colors hover:bg-white/[0.04] hover:text-fg/55"
-          onClick={handleCopy}
-        >
-          <CopySimple size={10} weight="bold" />
-          {copied ? "Copied" : "Copy Plan"}
-        </button>
-      </div>
-    </div>
+            <div className="flex items-center justify-between gap-3 border-t border-amber-400/10 bg-[linear-gradient(180deg,rgba(245,158,11,0.04),transparent)] px-5 py-3">
+              <button
+                type="button"
+                className="flex items-center gap-1 rounded-[var(--chat-radius-pill)] border border-white/[0.06] px-2 py-1 font-mono text-[9px] uppercase tracking-[0.12em] text-fg/45 transition-colors hover:bg-white/[0.04] hover:text-fg/70"
+                onClick={handleCopy}
+              >
+                <CopySimple size={10} weight="bold" />
+                {copied ? "Copied" : "Copy Plan"}
+              </button>
+              <div className="flex items-center gap-1.5">
+                <button
+                  type="button"
+                  disabled={disabled}
+                  className={cn(
+                    "rounded-lg border border-emerald-400/25 bg-emerald-500/[0.10] px-3 py-1.5 text-[11px] font-medium text-emerald-300 transition-colors",
+                    "hover:bg-emerald-500/[0.16] disabled:pointer-events-none disabled:opacity-40",
+                  )}
+                  onClick={() => { setFullViewOpen(false); onApprove(); }}
+                >
+                  Approve &amp; Implement
+                </button>
+                <button
+                  type="button"
+                  disabled={disabled}
+                  className={cn(
+                    "rounded-lg border border-white/[0.06] px-3 py-1.5 text-[11px] text-fg/55 transition-colors",
+                    "hover:bg-white/[0.04] disabled:pointer-events-none disabled:opacity-40",
+                  )}
+                  onClick={() => { setFullViewOpen(false); onReject(); }}
+                >
+                  Reject &amp; Revise
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      ) : null}
+    </>
   );
 });
 
diff --git a/apps/desktop/src/renderer/components/chat/ChatSubagentsPanel.tsx b/apps/desktop/src/renderer/components/chat/ChatSubagentsPanel.tsx
index c2c7946d5..1c19c1ebd 100644
--- a/apps/desktop/src/renderer/components/chat/ChatSubagentsPanel.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatSubagentsPanel.tsx
@@ -57,25 +57,25 @@ function statusMeta(status: ChatSubagentSnapshot["status"]): {
     case "completed":
       return {
         label: "Done",
-        chipClassName: "border-emerald-400/15 bg-emerald-500/[0.06] text-emerald-300/90",
+        chipClassName: "border-emerald-400/15 text-emerald-300/90",
         icon: <CheckCircle size={12} weight="fill" className="text-emerald-400" />,
       };
     case "failed":
       return {
         label: "Failed",
-        chipClassName: "border-red-500/20 bg-red-500/[0.08] text-red-300/90",
+        chipClassName: "border-red-500/20 text-red-300/90",
         icon: <XCircle size={12} weight="fill" className="text-red-400" />,
       };
     case "stopped":
       return {
         label: "Stopped",
-        chipClassName: "border-amber-400/20 bg-amber-500/[0.08] text-amber-300/90",
+        chipClassName: "border-amber-400/20 text-amber-300/90",
         icon: <ClockCounterClockwise size={12} weight="bold" className="text-amber-400" />,
       };
     default:
       return {
         label: "Running",
-        chipClassName: "border-emerald-400/20 bg-emerald-500/[0.08] text-emerald-300",
+        chipClassName: "border-emerald-400/20 text-emerald-300",
         icon: <ChatStatusGlyph status="working" size={12} className="ade-glow-pulse" />,
       };
   }
@@ -128,7 +128,7 @@ function SubagentDetailView({
           {snapshot.description}
         </span>
         <span className={cn(
-          "rounded-full border px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wider",
+          "ade-chat-status-pill rounded-full border px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wider",
           meta.chipClassName,
         )}>
           {meta.label}
@@ -325,7 +325,10 @@ export function ChatSubagentsPanel({
               <button
                 key={snapshot.taskId}
                 type="button"
-                className="group flex w-full items-center gap-2.5 rounded-xl border border-white/[0.06] bg-[#141220]/80 px-3.5 py-3 text-left transition-colors hover:bg-[#141220]"
+                className={cn(
+                  "ade-chat-subagent-card group flex w-full items-center gap-2.5 rounded-xl px-3.5 py-3 text-left",
+                  snapshot.status === "running" && "ade-chat-subagent-card-active",
+                )}
                 onClick={() => setView({ mode: "detail", taskId: snapshot.taskId })}
                 title={snapshot.description}
               >
@@ -345,7 +348,7 @@ export function ChatSubagentsPanel({
                     {runtimeSummary}
                   </span>
                 ) : null}
-                <span className={cn("rounded-full border px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wider", meta.chipClassName)}>
+                <span className={cn("ade-chat-status-pill rounded-full border px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wider", meta.chipClassName)}>
                   {meta.label}
                 </span>
               </button>
diff --git a/apps/desktop/src/renderer/components/chat/ChatSurfaceShell.tsx b/apps/desktop/src/renderer/components/chat/ChatSurfaceShell.tsx
index 44f47234b..b2e8dd245 100644
--- a/apps/desktop/src/renderer/components/chat/ChatSurfaceShell.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatSurfaceShell.tsx
@@ -35,14 +35,7 @@ export function ChatSurfaceShell({
     >
       {header ? (
         <div
-          className="relative z-10 mx-3 mt-2.5 overflow-visible rounded-[var(--chat-radius-shell)]"
-          style={{
-            backdropFilter: "blur(30px)",
-            WebkitBackdropFilter: "blur(30px)",
-            background: "rgba(20, 18, 32, 0.85)",
-            border: "1px solid rgba(255, 255, 255, 0.06)",
-            boxShadow: "0 8px 32px -8px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(167, 139, 250, 0.04), inset 0 1px 0 rgba(255, 255, 255, 0.04)",
-          }}
+          className="ade-liquid-glass ade-liquid-glass-strong relative z-10 mx-3 mt-2.5 overflow-visible rounded-[var(--chat-radius-shell)]"
         >
           {header}
         </div>
@@ -51,7 +44,7 @@ export function ChatSurfaceShell({
         {children}
       </div>
       {footer ? (
-        <div className={cn("relative px-3 pb-2 pt-0", footerClassName)} style={{ background: "var(--color-bg)" }}>
+        <div className={cn("relative px-3 pb-2 pt-0", footerClassName)}>
           {footer}
         </div>
       ) : null}
diff --git a/apps/desktop/src/renderer/components/chat/ChatTasksPanel.tsx b/apps/desktop/src/renderer/components/chat/ChatTasksPanel.tsx
index afbdee7ca..7095ab576 100644
--- a/apps/desktop/src/renderer/components/chat/ChatTasksPanel.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatTasksPanel.tsx
@@ -89,8 +89,8 @@ export const ChatTasksPanel = React.memo(function ChatTasksPanel({
           <div
             key={item.id}
             className={cn(
-              "flex items-start gap-2.5 px-3 py-1.5 transition-colors",
-              item.status === "in_progress" && "bg-sky-500/[0.03]",
+              "ade-chat-task-row flex items-start gap-2.5 px-3 py-1.5",
+              item.status === "in_progress" && "ade-chat-task-row-active",
             )}
           >
             <span className="mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center">
diff --git a/apps/desktop/src/renderer/components/chat/ChatWorkLogBlock.tsx b/apps/desktop/src/renderer/components/chat/ChatWorkLogBlock.tsx
index b99a6c801..45b24aecb 100644
--- a/apps/desktop/src/renderer/components/chat/ChatWorkLogBlock.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatWorkLogBlock.tsx
@@ -25,7 +25,7 @@ import { replaceInternalToolNames } from "./toolPresentation";
 
 const MAX_SUMMARY_WORK_LOG_ENTRIES = 4;
 const RECESSED_BLOCK_CLASS =
-  "overflow-auto whitespace-pre-wrap break-words rounded-[10px] border border-white/[0.04] bg-[#09080D] px-4 py-3 font-mono text-[11px] leading-[1.6] text-fg/78";
+  "ade-chat-recessed overflow-auto whitespace-pre-wrap break-words rounded-[10px] px-4 py-3 font-mono text-[11px] leading-[1.6] text-fg/78";
 
 const NAVIGATION_SURFACES = new Set(["work", "missions", "lanes", "cto"]);
 
@@ -107,6 +107,13 @@ function DiffPreview({ diff }: { diff: string }) {
 
 const FAILED_ICON_CLASS = "text-red-300/80";
 
+const MEMORY_TOOL_LABELS = new Set(["Memory", "Core Memory", "Memory Add", "Memory Pin"]);
+
+function isMemoryToolEntry(entry: ChatWorkLogEntry): boolean {
+  if (entry.entryKind !== "tool" || !entry.toolName) return false;
+  return MEMORY_TOOL_LABELS.has(getToolMeta(entry.toolName).label);
+}
+
 function workToneIcon(entry: ChatWorkLogEntry): { icon: Icon; className: string } {
   const isFailed = entry.status === "failed";
 
@@ -319,7 +326,7 @@ function WorkLogEntryDetail({
           <button
             key={`${suggestion.surface}:${suggestion.href}`}
             type="button"
-            className="rounded-[8px] border border-accent/20 bg-accent/[0.08] px-2.5 py-1 font-mono text-[10px] font-semibold text-accent/85 transition-colors hover:bg-accent/[0.14] hover:text-accent"
+            className="ade-liquid-glass-pill rounded-full px-2.5 py-1 font-mono text-[10px] font-semibold text-accent/85 transition-colors hover:border-accent/25 hover:bg-accent/[0.14] hover:text-accent"
             onClick={() => onNavigateSuggestion(suggestion)}
           >
             {suggestion.label}
@@ -484,6 +491,7 @@ export function ChatWorkLogBlock({
   const { icon: LatestIcon, className: latestIconClass } = latestEntry
     ? workToneIcon(latestEntry)
     : { icon: Warning, className: "text-fg/34" };
+  const latestIsMemory = latestEntry ? isMemoryToolEntry(latestEntry) : false;
 
   const toggleEntry = (entryId: string) => {
     setExpandedEntries((current) => ({
@@ -498,34 +506,40 @@ export function ChatWorkLogBlock({
 
   return (
     <div className={cn(
-      "rounded-lg transition-colors",
-      groupStatus === "failed" && "bg-red-500/[0.04] px-2 -mx-2",
+      "ade-chat-work-card rounded-[16px] px-3 py-2.5 transition-all",
+      groupStatus === "failed" && "border-red-400/14 bg-red-500/[0.05] shadow-[0_16px_32px_-28px_rgba(239,68,68,0.45)]",
       className,
     )}>
       {/* Collapsed one-line summary */}
       <button
         type="button"
-        className="group flex w-full items-center gap-2 py-1 text-left"
+        className="group flex w-full items-center gap-2 rounded-[12px] px-1 py-1.5 text-left transition-colors hover:bg-white/[0.03]"
         onClick={() => setExpanded((prev) => !prev)}
       >
         <span className="inline-flex h-3 w-3 shrink-0 items-center justify-center">
           <ChatStatusGlyph status={groupStatus} size={11} />
         </span>
-        <LatestIcon size={12} weight="regular" className={cn("shrink-0", latestIconClass)} />
-        <span className="min-w-0 truncate font-mono text-[11px] text-fg/50">
+        {latestIsMemory ? (
+          <span className="ade-memory-chip inline-flex h-5 w-5 shrink-0 items-center justify-center">
+            <LatestIcon size={11} weight="regular" className={latestIconClass} />
+          </span>
+        ) : (
+          <LatestIcon size={12} weight="regular" className={cn("shrink-0", latestIconClass)} />
+        )}
+        <span className="min-w-0 truncate font-mono text-[11px] text-fg/58">
           {summaryText}
         </span>
         {entries.length > 1 ? (
           <>
             <span className="shrink-0 text-[10px] text-fg/20">&middot;</span>
-            <span className="shrink-0 font-mono text-[10px] text-fg/30">
+            <span className="ade-liquid-glass-pill shrink-0 rounded-full px-2 py-0.5 font-mono text-[9px] text-fg/34">
               {entries.length} calls
             </span>
           </>
         ) : null}
         <span className="shrink-0 text-[10px] text-fg/20">&middot;</span>
         <span className={cn(
-          "shrink-0 font-mono text-[10px]",
+          "ade-liquid-glass-pill shrink-0 rounded-full px-2 py-0.5 font-mono text-[9px] uppercase tracking-[0.12em]",
           chatStatusTextClass(groupStatus),
         )}>
           {groupStatusLabel}
@@ -539,9 +553,10 @@ export function ChatWorkLogBlock({
 
       {/* Expanded entry list */}
       {expanded ? (
-        <div className="ml-[23px] mt-1 space-y-0.5 border-l border-white/[0.06] pl-3 pb-1">
+        <div className="ml-[23px] mt-1 space-y-1 border-l border-white/[0.06] pl-3 pb-1">
           {entries.map((entry) => {
             const { icon: EntryIcon, className: iconClassName } = workToneIcon(entry);
+            const entryIsMemory = isMemoryToolEntry(entry);
             const hasSuggestions = readNavigationSuggestions(entry.result).length > 0;
             const isEntryExpanded = expandedEntries[entry.id] ?? (hasSuggestions || entry.status === "failed");
             const heading = replaceInternalToolNames(workEntryHeading(entry));
@@ -552,7 +567,7 @@ export function ChatWorkLogBlock({
               <div key={entry.id}>
                 <button
                   type="button"
-                  className="flex w-full items-center gap-2 py-1 text-left"
+                  className="flex w-full items-center gap-2 rounded-[10px] px-2 py-1.5 text-left transition-colors hover:bg-white/[0.03]"
                   onClick={() => toggleEntry(entry.id)}
                 >
                   {isEntryExpanded ? (
@@ -563,7 +578,13 @@ export function ChatWorkLogBlock({
                   <span className="inline-flex h-2.5 w-2.5 shrink-0 items-center justify-center">
                     <ChatStatusGlyph status={workStatusState(entry.status)} size={10} />
                   </span>
-                  <EntryIcon size={11} weight="regular" className={cn("shrink-0", iconClassName)} />
+                  {entryIsMemory ? (
+                    <span className="ade-memory-chip inline-flex h-5 w-5 shrink-0 items-center justify-center">
+                      <EntryIcon size={10} weight="regular" className={iconClassName} />
+                    </span>
+                  ) : (
+                    <EntryIcon size={11} weight="regular" className={cn("shrink-0", iconClassName)} />
+                  )}
                   <span className="min-w-0 flex-1 truncate text-[11px] text-fg/70">
                     {heading}
                   </span>
@@ -581,7 +602,7 @@ export function ChatWorkLogBlock({
                 </button>
 
                 {isEntryExpanded ? (
-                  <div className="ml-5 mb-1.5 mt-1 rounded-xl border border-white/[0.05] bg-[#141220]/70 px-3 py-2.5">
+                  <div className="ade-liquid-glass ml-5 mb-1.5 mt-1 rounded-[14px] px-3 py-2.5">
                     <WorkLogEntryDetail entry={entry} onNavigateSuggestion={onNavigateSuggestion} />
                   </div>
                 ) : null}
diff --git a/apps/desktop/src/renderer/components/chat/chatMarkdown.tsx b/apps/desktop/src/renderer/components/chat/chatMarkdown.tsx
new file mode 100644
index 000000000..eb381e429
--- /dev/null
+++ b/apps/desktop/src/renderer/components/chat/chatMarkdown.tsx
@@ -0,0 +1,133 @@
+import type { ReactNode } from "react";
+import ReactMarkdown, { type Components } from "react-markdown";
+import rehypeRaw from "rehype-raw";
+import rehypeSanitize, { defaultSchema } from "rehype-sanitize";
+import remarkGfm from "remark-gfm";
+
+export const SAFE_PREVIEW_SCHEMA = {
+  ...defaultSchema,
+  tagNames: [
+    "p",
+    "ul",
+    "ol",
+    "li",
+    "strong",
+    "em",
+    "code",
+    "pre",
+    "blockquote",
+    "table",
+    "thead",
+    "tbody",
+    "tr",
+    "th",
+    "td",
+    "br",
+    "hr",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "a",
+  ],
+};
+
+type Tone = "sky" | "amber";
+
+type Overrides = Partial<Components>;
+
+function toneAccents(tone: Tone) {
+  return tone === "amber"
+    ? {
+        headerText: "text-amber-300/80",
+        blockquoteBorder: "border-amber-300/25",
+        hr: "border-amber-300/15",
+      }
+    : {
+        headerText: "text-sky-200/85",
+        blockquoteBorder: "border-sky-300/25",
+        hr: "border-sky-300/15",
+      };
+}
+
+export function buildChatMarkdownComponents(tone: Tone = "sky", overrides: Overrides = {}): Components {
+  const accent = toneAccents(tone);
+  return {
+    p: ({ children }) => <p className="mb-3 whitespace-pre-wrap last:mb-0">{children}</p>,
+    ul: ({ children }) => <ul className="mb-3 list-disc space-y-1 pl-5 last:mb-0">{children}</ul>,
+    ol: ({ children }) => <ol className="mb-3 list-decimal space-y-1 pl-5 last:mb-0">{children}</ol>,
+    li: ({ children }) => <li>{children}</li>,
+    h1: ({ children }) => (
+      <h1 className={`mb-2 mt-3 font-mono text-[12px] font-bold uppercase tracking-[0.14em] ${accent.headerText} first:mt-0`}>
+        {children}
+      </h1>
+    ),
+    h2: ({ children }) => (
+      <h2 className={`mb-2 mt-3 font-mono text-[11px] font-bold uppercase tracking-[0.14em] ${accent.headerText} first:mt-0`}>
+        {children}
+      </h2>
+    ),
+    h3: ({ children }) => (
+      <h3 className={`mb-2 mt-3 font-mono text-[10px] font-bold uppercase tracking-[0.14em] ${accent.headerText} first:mt-0`}>
+        {children}
+      </h3>
+    ),
+    h4: ({ children }) => (
+      <h4 className={`mb-2 mt-3 font-mono text-[10px] font-semibold uppercase tracking-[0.14em] ${accent.headerText} first:mt-0`}>
+        {children}
+      </h4>
+    ),
+    hr: () => <hr className={`my-3 ${accent.hr}`} />,
+    pre: ({ children }) => (
+      <pre className="mb-3 overflow-auto rounded-sm border border-white/[0.06] bg-black/25 p-3 font-mono text-[11px] leading-5 last:mb-0">
+        {children}
+      </pre>
+    ),
+    code: ({ children, className }) => (
+      <code className={className ?? "rounded-sm bg-black/30 px-1 py-0.5 font-mono text-[11px]"}>
+        {children}
+      </code>
+    ),
+    blockquote: ({ children }) => (
+      <blockquote className={`mb-3 border-l-2 pl-3 text-muted-fg/72 last:mb-0 ${accent.blockquoteBorder}`}>
+        {children}
+      </blockquote>
+    ),
+    strong: ({ children }) => <strong className="font-semibold text-fg">{children}</strong>,
+    em: ({ children }) => <em className="italic">{children}</em>,
+    a: ({ children, href }) => (
+      <a
+        href={href}
+        target="_blank"
+        rel="noopener noreferrer"
+        className="text-sky-300/90 underline underline-offset-2 transition-colors hover:text-sky-200"
+      >
+        {children}
+      </a>
+    ),
+    table: ({ children }) => <table className="mb-3 w-full border-collapse text-left last:mb-0">{children}</table>,
+    th: ({ children }) => <th className="border border-white/[0.08] px-2 py-1 font-semibold">{children}</th>,
+    td: ({ children }) => <td className="border border-white/[0.08] px-2 py-1 align-top">{children}</td>,
+    ...overrides,
+  } satisfies Components;
+}
+
+type ChatMarkdownProps = {
+  children: string;
+  tone?: Tone;
+  componentOverrides?: Overrides;
+};
+
+export function ChatMarkdown({ children, tone = "sky", componentOverrides }: ChatMarkdownProps): ReactNode {
+  return (
+    <ReactMarkdown
+      remarkPlugins={[remarkGfm]}
+      rehypePlugins={[rehypeRaw, [rehypeSanitize, SAFE_PREVIEW_SCHEMA]]}
+      components={buildChatMarkdownComponents(tone, componentOverrides)}
+    >
+      {children}
+    </ReactMarkdown>
+  );
+}
diff --git a/apps/desktop/src/renderer/components/chat/chatSurfaceTheme.ts b/apps/desktop/src/renderer/components/chat/chatSurfaceTheme.ts
index f964a74e2..d07e1b6e9 100644
--- a/apps/desktop/src/renderer/components/chat/chatSurfaceTheme.ts
+++ b/apps/desktop/src/renderer/components/chat/chatSurfaceTheme.ts
@@ -48,6 +48,9 @@ export function chatSurfaceVars(mode: ChatSurfaceMode, accentColor?: string | nu
     ["--chat-accent-soft" as string]: colorToRgba(accent, 0.14),
     ["--chat-accent-faint" as string]: colorToRgba(accent, 0.08),
     ["--chat-accent-glow" as string]: colorToRgba(accent, 0.28),
+    ["--chat-liquid-highlight" as string]: colorToRgba(accent, 0.18),
+    ["--chat-liquid-sheen" as string]: colorToRgba(accent, 0.12),
+    ["--chat-liquid-shadow" as string]: colorToRgba(accent, 0.16),
     ["--chat-surface-bg" as string]: "color-mix(in srgb, var(--color-card) 80%, var(--color-bg) 20%)",
     ["--chat-surface-raised" as string]: "color-mix(in srgb, var(--color-card) 88%, var(--color-bg) 12%)",
     ["--chat-panel-bg" as string]: "color-mix(in srgb, var(--color-surface-raised) 78%, var(--color-card) 22%)",
diff --git a/apps/desktop/src/renderer/components/files/FilesPage.tsx b/apps/desktop/src/renderer/components/files/FilesPage.tsx
index ef0b194cd..264f07a1c 100644
--- a/apps/desktop/src/renderer/components/files/FilesPage.tsx
+++ b/apps/desktop/src/renderer/components/files/FilesPage.tsx
@@ -31,7 +31,7 @@ import type {
   FilesWorkspace,
   GitCommitSummary
 } from "../../../shared/types";
-import { MonacoDiffView } from "../lanes/MonacoDiffView";
+import { MonacoDiffView, type MonacoDiffHandle } from "../lanes/MonacoDiffView";
 import { useAppStore } from "../../state/appStore";
 import { clearDirtyBuffersForWorkspace, replaceDirtyBuffersForWorkspace } from "../../lib/dirtyWorkspaceBuffers";
 import { revealLabel } from "../../lib/platform";
@@ -51,6 +51,8 @@ type FilesPageNavState = {
   openFilePath?: string;
   laneId?: string;
   preferPrimaryWorkspace?: boolean;
+  mode?: "edit" | "diff";
+  startLine?: number;
 };
 
 type ConflictHunk = {
@@ -401,7 +403,8 @@ export function FilesPage() {
   const [tree, setTree] = useState<FileTreeNode[]>([]);
   const [expanded, setExpanded] = useState<Set<string>>(new Set());
   const [selectedNodePath, setSelectedNodePath] = useState<string | null>(initialSession?.selectedNodePath ?? null);
-  const pendingOpenRef = useRef<{ filePath: string; laneId: string | null; preferPrimaryWorkspace: boolean; key: string } | null>(null);
+  const pendingOpenRef = useRef<{ filePath: string; laneId: string | null; preferPrimaryWorkspace: boolean; key: string; mode?: "edit" | "diff"; startLine?: number } | null>(null);
+  const diffViewRef = useRef<MonacoDiffHandle | null>(null);
   const treeRefreshStateRef = useRef<{
     inFlight: boolean;
     queuedFull: boolean;
@@ -679,6 +682,8 @@ export function FilesPage() {
       filePath: openFilePath,
       laneId: st?.laneId ?? null,
       preferPrimaryWorkspace: st?.preferPrimaryWorkspace === true,
+      mode: st?.mode,
+      startLine: st?.startLine,
     };
   }, [location.key, location.state]);
 
@@ -873,9 +878,40 @@ export function FilesPage() {
     }
     if (!workspaceId) return;
 
-    openFile(pending.filePath).catch(() => {});
+    const pendingMode = pending.mode;
+    const pendingStartLine = pending.startLine;
+    let cancelled = false;
+    let pendingTimer: ReturnType<typeof setTimeout> | null = null;
+    openFile(pending.filePath)
+      .then(() => {
+        if (cancelled) return;
+        if (pendingMode === "diff") setMode("diff");
+        if (typeof pendingStartLine === "number" && pendingStartLine > 0) {
+          const attemptReveal = (attemptsLeft: number) => {
+            if (cancelled) return;
+            const handle = diffViewRef.current;
+            if (handle) {
+              try {
+                handle.revealLineInCenter(pendingStartLine);
+              } catch {
+                /* ignore */
+              }
+              return;
+            }
+            if (attemptsLeft > 0) {
+              pendingTimer = setTimeout(() => attemptReveal(attemptsLeft - 1), 80);
+            }
+          };
+          attemptReveal(6);
+        }
+      })
+      .catch(() => {});
     pendingOpenRef.current = null;
     navigate(location.pathname, { replace: true, state: null });
+    return () => {
+      cancelled = true;
+      if (pendingTimer !== null) clearTimeout(pendingTimer);
+    };
   }, [workspaces, workspaceId, switchWorkspace, openFile, navigate, location.pathname]);
 
   const closeTab = useCallback((filePath: string) => {
@@ -1919,7 +1955,7 @@ export function FilesPage() {
               </div>
             ) : mode === "diff" ? (
               laneIdForDiff && activeTabPath ? (
-                <FilesDiffPanel laneId={laneIdForDiff} path={activeTabPath} theme={editorTheme} />
+                <FilesDiffPanel laneId={laneIdForDiff} path={activeTabPath} theme={editorTheme} diffViewRef={diffViewRef} />
               ) : (
                 <div style={{ padding: 16, fontFamily: MONO_FONT, fontSize: 12, color: COLORS.textMuted }}>
                   DIFF MODE REQUIRES A LANE WORKSPACE AND AN OPEN FILE.
@@ -2189,7 +2225,7 @@ export function FilesPage() {
             </button>
           </SmartTooltip>
           {openInMenuOpen ? (
-            <div className="absolute right-0 top-full z-50 mt-1" style={{ width: 220, background: COLORS.cardBg, backdropFilter: "blur(20px)", WebkitBackdropFilter: "blur(20px)", border: `1px solid ${COLORS.border}`, borderRadius: 12, padding: "2px 0", overflow: "hidden" }}>
+            <div className="ade-liquid-glass-menu absolute right-0 top-full z-50 mt-1 overflow-hidden" style={{ width: 220, padding: "2px 0" }}>
               {(
                 [
                   { key: "finder", label: revealLabel.toUpperCase() },
@@ -2305,8 +2341,8 @@ export function FilesPage() {
       {/* Context menu overlay */}
       {contextMenu ? (
         <div
-          className="fixed z-40"
-          style={{ left: contextMenu.x, top: contextMenu.y, minWidth: 200, background: COLORS.cardBg, backdropFilter: "blur(20px)", WebkitBackdropFilter: "blur(20px)", border: `1px solid ${COLORS.border}`, borderRadius: 12, padding: "4px 0" }}
+          className="ade-liquid-glass-menu fixed z-40"
+          style={{ left: contextMenu.x, top: contextMenu.y, minWidth: 200, padding: "4px 0" }}
           onPointerDown={(e) => e.stopPropagation()}
         >
           {contextMenu.nodeType === "file" ? (
@@ -2454,7 +2490,17 @@ export function FilesPage() {
   );
 }
 
-function FilesDiffPanel({ laneId, path, theme }: { laneId: string; path: string; theme: EditorThemeMode }) {
+function FilesDiffPanel({
+  laneId,
+  path,
+  theme,
+  diffViewRef,
+}: {
+  laneId: string;
+  path: string;
+  theme: EditorThemeMode;
+  diffViewRef?: React.MutableRefObject<MonacoDiffHandle | null>;
+}) {
   const [mode, setMode] = useState<"unstaged" | "staged" | "commit">("unstaged");
   const [diff, setDiff] = useState<any>(null);
   const [error, setError] = useState<string | null>(null);
@@ -2562,7 +2608,7 @@ function FilesDiffPanel({ laneId, path, theme }: { laneId: string; path: string;
       </div>
 
       {error ? <div style={{ padding: 12, fontFamily: MONO_FONT, fontSize: 11, color: COLORS.danger }}>{error}</div> : null}
-      <div className="min-h-0 flex-1">{diff ? <MonacoDiffView diff={diff} className="h-full" theme={theme} /> : null}</div>
+      <div className="min-h-0 flex-1">{diff ? <MonacoDiffView ref={diffViewRef} diff={diff} className="h-full" theme={theme} /> : null}</div>
     </div>
   );
 }
diff --git a/apps/desktop/src/renderer/components/lanes/CreateLaneDialog.tsx b/apps/desktop/src/renderer/components/lanes/CreateLaneDialog.tsx
index e0ba0d61d..de5f22fa5 100644
--- a/apps/desktop/src/renderer/components/lanes/CreateLaneDialog.tsx
+++ b/apps/desktop/src/renderer/components/lanes/CreateLaneDialog.tsx
@@ -1,19 +1,53 @@
-import { GitBranch, GitFork, Plus, StackSimple } from "@phosphor-icons/react";
+import { CaretDown, GitBranch, GitFork, Plus, StackSimple } from "@phosphor-icons/react";
 import { Button } from "../ui/Button";
 import type { LaneSummary, LaneEnvInitProgress, LaneTemplate } from "../../../shared/types";
 import type { LaneBranchOption } from "./laneUtils";
 import { LaneEnvInitProgressPanel } from "./LaneEnvInitProgress";
 import { LaneDialogShell } from "./LaneDialogShell";
-import { SECTION_CLASS_NAME, LABEL_CLASS_NAME, INPUT_CLASS_NAME, SELECT_CLASS_NAME } from "./laneDialogTokens";
+import {
+  SECTION_CLASS_NAME,
+  LABEL_CLASS_NAME,
+  INPUT_CLASS_NAME,
+  SELECT_CLASS_NAME,
+  CARD_CLASS_NAME,
+  CARD_ACTIVE_CLASS_NAME,
+  CHIP_PRIMARY,
+  CHIP_BRANCH,
+  CHIP_CHILD,
+} from "./laneDialogTokens";
 
 export type CreateLaneMode = "primary" | "existing" | "child";
 
-const MODE_META: Record<CreateLaneMode, { icon: typeof GitBranch; label: string }> = {
-  primary:  { icon: GitBranch,    label: "From primary" },
-  existing: { icon: GitFork,      label: "Existing branch" },
-  child:    { icon: StackSimple,  label: "Child lane" },
+type ModeMeta = {
+  icon: typeof GitBranch;
+  label: string;
+  description: string;
+  chip: string;
 };
 
+const MODE_META: Record<CreateLaneMode, ModeMeta> = {
+  primary: {
+    icon: GitBranch,
+    label: "Primary",
+    description: "Brand new lane based off main on the primary lane",
+    chip: CHIP_PRIMARY,
+  },
+  existing: {
+    icon: GitFork,
+    label: "Branch",
+    description: "New lane based off a branch on local or remote",
+    chip: CHIP_BRANCH,
+  },
+  child: {
+    icon: StackSimple,
+    label: "Child",
+    description: "Create a child lane based on another existing lane",
+    chip: CHIP_CHILD,
+  },
+};
+
+const MODE_ORDER: readonly CreateLaneMode[] = ["primary", "existing", "child"];
+
 function submitLabel(busy: boolean | undefined, mode: CreateLaneMode, baseBranch: string, laneCreated: boolean | undefined): string {
   if (busy) return "Setting up lane\u2026";
   if (laneCreated) return "Retry environment setup";
@@ -35,6 +69,8 @@ export function CreateLaneDialog({
   setCreateBaseBranch,
   createImportBranch,
   setCreateImportBranch,
+  createChildBaseBranch,
+  setCreateChildBaseBranch,
   createBranches,
   lanes,
   onSubmit,
@@ -60,6 +96,8 @@ export function CreateLaneDialog({
   setCreateBaseBranch: (v: string) => void;
   createImportBranch: string;
   setCreateImportBranch: (v: string) => void;
+  createChildBaseBranch: string;
+  setCreateChildBaseBranch: (v: string) => void;
   createBranches: LaneBranchOption[];
   lanes: LaneSummary[];
   onSubmit: () => void;
@@ -79,8 +117,6 @@ export function CreateLaneDialog({
   const allBranches = createBranches;
   const selectedTemplate = templates.find((t) => t.id === selectedTemplateId) ?? null;
 
-  // When the lane already exists, the CTA only retries env setup — no form
-  // validation needed beyond not being busy.
   const isSubmitDisabled = laneCreated
     ? !!busy
     : (busy
@@ -89,6 +125,8 @@ export function CreateLaneDialog({
       || (createMode === "primary" && !createBaseBranch)
       || (createMode === "existing" && !createImportBranch));
 
+  const hasAdvanced = templates.length > 0 || !!onNavigateToTemplates;
+
   return (
     <LaneDialogShell
       open={open}
@@ -114,16 +152,18 @@ export function CreateLaneDialog({
           </label>
         </section>
 
-        {/* Starting point — mode picker + contextual field */}
+        {/* Start from — three-up source cards + contextual field */}
         <section className={SECTION_CLASS_NAME}>
-          <span className={LABEL_CLASS_NAME}>Starting point</span>
+          <span className={LABEL_CLASS_NAME}>Start from</span>
 
-          {/* Compact pill tabs */}
-          <div className="mt-2 inline-flex rounded-lg border border-white/[0.06] bg-white/[0.02] p-0.5">
-            {(["primary", "existing", "child"] as const).map((mode) => {
+          <div className="mt-2 grid grid-cols-3 gap-2">
+            {MODE_ORDER.map((mode) => {
               const meta = MODE_META[mode];
               const Icon = meta.icon;
               const active = createMode === mode;
+              const cardClass = active
+                ? `${CARD_CLASS_NAME} ${CARD_ACTIVE_CLASS_NAME}`
+                : CARD_CLASS_NAME;
               return (
                 <button
                   key={mode}
@@ -132,16 +172,24 @@ export function CreateLaneDialog({
                   disabled={busy || laneCreated}
                   onClick={() => {
                     setCreateMode(mode);
-                    if (mode !== "child") setCreateParentLaneId("");
+                    if (mode !== "child") {
+                      setCreateParentLaneId("");
+                      setCreateChildBaseBranch("");
+                    }
                   }}
-                  className={`inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors ${
-                    active
-                      ? "bg-accent/15 text-accent shadow-sm"
-                      : "text-muted-fg hover:text-fg"
-                  }`}
+                  className={cardClass}
                 >
-                  <Icon size={12} />
-                  {meta.label}
+                  <div className="flex items-start gap-2">
+                    <span className={meta.chip} aria-hidden="true">
+                      <Icon size={16} weight="duotone" />
+                    </span>
+                    <div className="min-w-0 flex-1">
+                      <div className="text-sm font-semibold text-fg">{meta.label}</div>
+                    </div>
+                  </div>
+                  <div className="mt-1.5 line-clamp-2 text-[11px] leading-snug text-muted-fg/70">
+                    {meta.description}
+                  </div>
                 </button>
               );
             })}
@@ -241,52 +289,90 @@ export function CreateLaneDialog({
                     Base: {lanes.find((l) => l.id === createParentLaneId)?.branchRef ?? "unknown"} — rebase suggestions will track parent lane
                   </div>
                 ) : null}
+
+                {allBranches.length > 0 ? (
+                  <div className="mt-3">
+                    <span className={LABEL_CLASS_NAME}>Base branch (optional)</span>
+                    <select
+                      value={createChildBaseBranch}
+                      onChange={(e) => setCreateChildBaseBranch(e.target.value)}
+                      className={SELECT_CLASS_NAME}
+                      disabled={busy || laneCreated}
+                      aria-label="Child base branch override"
+                    >
+                      <option value="">Parent lane's branch (default)</option>
+                      {allBranches.map((b) => (
+                        <option key={b.name} value={b.name}>
+                          {b.name}{b.isRemote ? " (remote)" : ""}
+                        </option>
+                      ))}
+                    </select>
+                    <div className="mt-1.5 text-[11px] text-muted-fg/60">
+                      Override to base this child on any branch, including origin/* remote refs.
+                    </div>
+                  </div>
+                ) : null}
               </>
             ) : null}
           </div>
         </section>
 
-        {/* Template — compact row, not a big section */}
-        <section className={SECTION_CLASS_NAME}>
-          <div className="flex items-center justify-between gap-3">
-            <span className={LABEL_CLASS_NAME}>Template</span>
-            {onNavigateToTemplates ? (
-              <button
-                type="button"
-                className="text-[10px] font-medium text-muted-fg/60 transition-colors hover:text-accent"
-                disabled={busy || laneCreated}
-                onClick={() => { onOpenChange(false); onNavigateToTemplates(); }}
-              >
-                {templates.length > 0 ? "Manage" : "Create template"}
-              </button>
-            ) : null}
-          </div>
-          {templates.length > 0 ? (
-            <>
-              <select
-                value={selectedTemplateId}
-                onChange={(e) => setSelectedTemplateId(e.target.value)}
-                className={SELECT_CLASS_NAME}
-                disabled={busy || laneCreated}
-                aria-label="Template"
-              >
-                <option value="">None</option>
-                {templates.map((t) => (
-                  <option key={t.id} value={t.id}>
-                    {t.name}{t.description ? ` — ${t.description}` : ""}
-                  </option>
-                ))}
-              </select>
-              {selectedTemplate?.description ? (
-                <div className="mt-1.5 text-[11px] text-muted-fg/60">{selectedTemplate.description}</div>
+        {/* Advanced — template (collapsed by default) */}
+        {hasAdvanced ? (
+          <details className="group rounded-xl border border-white/[0.06] bg-white/[0.02] open:bg-white/[0.03]">
+            <summary className="flex cursor-pointer select-none items-center justify-between gap-3 rounded-xl px-4 py-2.5 text-[11px] font-semibold uppercase tracking-[0.14em] text-muted-fg/70 transition-colors hover:text-fg [&::-webkit-details-marker]:hidden">
+              <span className="flex items-center gap-2">
+                <CaretDown size={10} weight="bold" className="transition-transform group-open:rotate-0 -rotate-90" />
+                Advanced
+              </span>
+              {onNavigateToTemplates ? (
+                <button
+                  type="button"
+                  className="text-[10px] font-medium normal-case tracking-normal text-muted-fg/60 transition-colors hover:text-accent"
+                  disabled={busy || laneCreated}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    onOpenChange(false);
+                    onNavigateToTemplates();
+                  }}
+                >
+                  {templates.length > 0 ? "Manage templates" : "Create template"}
+                </button>
               ) : null}
-            </>
-          ) : (
-            <div className="mt-2 text-xs text-muted-fg/50">
-              No templates yet.
+            </summary>
+            <div className="space-y-3 px-4 pb-4 pt-1">
+              <div>
+                <span className={LABEL_CLASS_NAME}>Template</span>
+                {templates.length > 0 ? (
+                  <>
+                    <select
+                      value={selectedTemplateId}
+                      onChange={(e) => setSelectedTemplateId(e.target.value)}
+                      className={SELECT_CLASS_NAME}
+                      disabled={busy || laneCreated}
+                      aria-label="Template"
+                    >
+                      <option value="">None</option>
+                      {templates.map((t) => (
+                        <option key={t.id} value={t.id}>
+                          {t.name}{t.description ? ` — ${t.description}` : ""}
+                        </option>
+                      ))}
+                    </select>
+                    {selectedTemplate?.description ? (
+                      <div className="mt-1.5 text-[11px] text-muted-fg/60">{selectedTemplate.description}</div>
+                    ) : null}
+                  </>
+                ) : (
+                  <div className="mt-2 text-xs text-muted-fg/50">
+                    No templates yet.
+                  </div>
+                )}
+              </div>
             </div>
-          )}
-        </section>
+          </details>
+        ) : null}
 
         {error ? (
           <div className="rounded-xl border border-red-500/25 bg-red-500/10 px-3 py-2 text-sm text-red-200">
@@ -305,6 +391,7 @@ export function CreateLaneDialog({
               setCreateMode("primary");
               setCreateBaseBranch("");
               setCreateImportBranch("");
+              setCreateChildBaseBranch("");
             }}
           >
             Cancel
diff --git a/apps/desktop/src/renderer/components/lanes/LaneContextMenu.tsx b/apps/desktop/src/renderer/components/lanes/LaneContextMenu.tsx
index 936bfacda..63590a98b 100644
--- a/apps/desktop/src/renderer/components/lanes/LaneContextMenu.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LaneContextMenu.tsx
@@ -99,19 +99,15 @@ export function LaneContextMenu({
       ref={menuRef}
       role="menu"
       tabIndex={-1}
+      className="ade-liquid-glass-menu"
       style={{
         position: "fixed",
         zIndex: 40,
         minWidth: 200,
         maxHeight: "calc(100vh - 20px)",
         overflowY: "auto",
-        background: COLORS.cardBgSolid,
-        backdropFilter: "blur(20px)",
-        WebkitBackdropFilter: "blur(20px)",
         border: `1px solid ${COLORS.outlineBorder}`,
-        borderRadius: 12,
         padding: "4px 0",
-        boxShadow: "0 8px 32px -8px rgba(0,0,0,0.5)",
         left: laneContextMenu.x,
         top: Math.min(laneContextMenu.y, window.innerHeight - 20),
       }}
diff --git a/apps/desktop/src/renderer/components/lanes/LanesPage.tsx b/apps/desktop/src/renderer/components/lanes/LanesPage.tsx
index 569fa253b..b9d26b32c 100644
--- a/apps/desktop/src/renderer/components/lanes/LanesPage.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LanesPage.tsx
@@ -175,6 +175,7 @@ export function LanesPage() {
   const [createMode, setCreateMode] = useState<CreateLaneMode>("primary");
   const [createBaseBranch, setCreateBaseBranch] = useState("");
   const [createImportBranch, setCreateImportBranch] = useState("");
+  const [createChildBaseBranch, setCreateChildBaseBranch] = useState("");
   const [createBranches, setCreateBranches] = useState<LaneBranchOption[]>([]);
   const [createBusy, setCreateBusy] = useState(false);
   const [createError, setCreateError] = useState<string | null>(null);
@@ -1101,6 +1102,7 @@ export function LanesPage() {
     setCreateMode("primary");
     setCreateBaseBranch("");
     setCreateImportBranch("");
+    setCreateChildBaseBranch("");
     setCreateBusy(false);
     setCreateError(null);
     setCreateEnvInitProgress(null);
@@ -1113,6 +1115,7 @@ export function LanesPage() {
     setCreateMode("primary");
     setCreateBaseBranch("");
     setCreateImportBranch("");
+    setCreateChildBaseBranch("");
     setCreateBranches([]);
     setLaneCreated(false);
     createBaseBranchUserPickedRef.current = false;
@@ -1246,7 +1249,17 @@ export function LanesPage() {
       if (request.kind === "import") {
         lane = await window.ade.lanes.importBranch(request.args);
       } else if (request.kind === "child") {
-        lane = await window.ade.lanes.createChild(request.args);
+        const trimmedBase = createChildBaseBranch.trim();
+        const parentLane = lanes.find((l) => l.id === request.args.parentLaneId);
+        if (!parentLane) {
+          setCreateError("Parent lane no longer exists. Please close and reopen the dialog.");
+          setCreateBusy(false);
+          return;
+        }
+        const childArgs = trimmedBase && trimmedBase !== parentLane.branchRef
+          ? { ...request.args, baseBranchRef: trimmedBase }
+          : request.args;
+        lane = await window.ade.lanes.createChild(childArgs);
       } else {
         lane = await window.ade.lanes.create(request.args);
       }
@@ -1264,7 +1277,7 @@ export function LanesPage() {
       setCreateError(err instanceof Error ? err.message : String(err));
       setCreateBusy(false);
     }
-  }, [createLaneName, createMode, createParentLaneId, createBaseBranch, createImportBranch, createBusy, navigate, refreshLanes, runEnvSetupForCreatedLane, selectedTemplateId, templates]);
+  }, [createLaneName, createMode, createParentLaneId, createBaseBranch, createImportBranch, createChildBaseBranch, lanes, createBusy, navigate, refreshLanes, runEnvSetupForCreatedLane, selectedTemplateId, templates]);
 
   const handleAttachSubmit = useCallback(async () => {
     const name = attachName.trim();
@@ -1425,7 +1438,7 @@ export function LanesPage() {
               </button>
             </SmartTooltip>
             {branchDropdownOpen ? (
-              <div className="absolute left-0 top-full z-[200] mt-1 max-h-80 overflow-hidden flex flex-col" style={{ width: 288, background: COLORS.cardBgSolid, backdropFilter: "blur(20px)", WebkitBackdropFilter: "blur(20px)", border: `1px solid ${COLORS.outlineBorder}`, borderRadius: 12, padding: "4px 0" }}>
+              <div className="ade-liquid-glass-menu absolute left-0 top-full z-[200] mt-1 max-h-80 overflow-hidden flex flex-col" style={{ width: 288, padding: "4px 0" }}>
                 <div className="relative shrink-0" style={{ padding: "4px 8px" }}>
                   <MagnifyingGlass size={13} className="pointer-events-none absolute" style={{ left: 16, top: "50%", transform: "translateY(-50%)", color: COLORS.textDim }} />
                   <input
@@ -2140,6 +2153,8 @@ export function LanesPage() {
         setCreateBaseBranch={handleSetCreateBaseBranch}
         createImportBranch={createImportBranch}
         setCreateImportBranch={setCreateImportBranch}
+        createChildBaseBranch={createChildBaseBranch}
+        setCreateChildBaseBranch={setCreateChildBaseBranch}
         createBranches={createBranches}
         lanes={lanes}
         onSubmit={handleCreateSubmit}
diff --git a/apps/desktop/src/renderer/components/lanes/MonacoDiffView.tsx b/apps/desktop/src/renderer/components/lanes/MonacoDiffView.tsx
index 1b6b8c3ae..a33dbb88a 100644
--- a/apps/desktop/src/renderer/components/lanes/MonacoDiffView.tsx
+++ b/apps/desktop/src/renderer/components/lanes/MonacoDiffView.tsx
@@ -5,6 +5,7 @@ import { cn } from "../ui/cn";
 
 export type MonacoDiffHandle = {
   getModifiedValue: () => string | null;
+  revealLineInCenter: (line: number) => void;
 };
 
 let monacoInit: Promise<typeof import("monaco-editor")> | null = null;
@@ -73,7 +74,15 @@ export const MonacoDiffView = forwardRef<MonacoDiffHandle, { diff: FileDiff; edi
     const monacoTheme = theme === "light" ? "vs" : "vs-dark";
 
     useImperativeHandle(ref, () => ({
-      getModifiedValue: () => diffEditorRef.current?.getModel()?.modified.getValue() ?? null
+      getModifiedValue: () => diffEditorRef.current?.getModel()?.modified.getValue() ?? null,
+      revealLineInCenter: (line: number) => {
+        try {
+          const modifiedEditor = diffEditorRef.current?.getModifiedEditor();
+          modifiedEditor?.revealLineInCenter(line);
+        } catch {
+          /* ignore */
+        }
+      },
     }));
 
     useEffect(() => {
diff --git a/apps/desktop/src/renderer/components/lanes/laneDialogTokens.ts b/apps/desktop/src/renderer/components/lanes/laneDialogTokens.ts
index ee3a76cc3..76c943dbc 100644
--- a/apps/desktop/src/renderer/components/lanes/laneDialogTokens.ts
+++ b/apps/desktop/src/renderer/components/lanes/laneDialogTokens.ts
@@ -6,3 +6,15 @@ export const INPUT_CLASS_NAME =
   "mt-2 h-11 w-full rounded-lg border border-white/[0.06] bg-white/[0.03] px-3 text-sm text-fg outline-none transition-colors placeholder:text-muted-fg/60 focus:border-accent/40";
 export const SELECT_CLASS_NAME =
   "mt-2 h-11 w-full rounded-lg border border-white/[0.06] bg-white/[0.03] px-3 text-sm text-fg outline-none transition-colors focus:border-accent/40";
+
+export const CARD_CLASS_NAME =
+  "rounded-2xl border border-white/[0.06] bg-white/[0.03] p-3 text-left transition-colors hover:border-accent/30 disabled:opacity-60 disabled:cursor-not-allowed";
+export const CARD_ACTIVE_CLASS_NAME =
+  "border-accent/60 bg-accent/[0.08] ring-1 ring-accent/40 shadow-card";
+
+export const CHIP_PRIMARY =
+  "flex h-8 w-8 items-center justify-center rounded-lg bg-emerald-400/15 text-emerald-300";
+export const CHIP_BRANCH =
+  "flex h-8 w-8 items-center justify-center rounded-lg bg-sky-400/15 text-sky-300";
+export const CHIP_CHILD =
+  "flex h-8 w-8 items-center justify-center rounded-lg bg-violet-400/15 text-violet-300";
diff --git a/apps/desktop/src/renderer/components/missions/ChatInput.tsx b/apps/desktop/src/renderer/components/missions/ChatInput.tsx
index ac9ee7e29..1663f6432 100644
--- a/apps/desktop/src/renderer/components/missions/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/missions/ChatInput.tsx
@@ -99,25 +99,22 @@ export const ChatInput = React.memo(function ChatInput({
     <div
       className="px-4 pb-4 pt-3"
       style={{
-        background: `linear-gradient(180deg, ${BG_MAIN} 0%, ${BG_ELEVATED} 100%)`,
+        background: `radial-gradient(circle at top, color-mix(in srgb, var(--chat-liquid-sheen, rgba(255,255,255,0.08)) 34%, transparent) 0%, transparent 34%), linear-gradient(180deg, ${BG_MAIN} 0%, ${BG_ELEVATED} 100%)`,
       }}
     >
       <div
-        className="mb-3 flex flex-wrap items-start gap-3 px-4 py-3"
+        className="ade-liquid-glass ade-liquid-glass-strong mb-3 flex flex-wrap items-start gap-3 rounded-[18px] px-4 py-3"
         style={{
-          border: `1px solid ${BORDER}`,
-          background: `${BG_MAIN}CC`,
-          boxShadow: "0 18px 48px rgba(4, 2, 10, 0.32)",
+          borderColor: `color-mix(in srgb, ${BORDER} 70%, rgba(255,255,255,0.08))`,
+          boxShadow: "0 22px 52px -28px rgba(4, 2, 10, 0.58)",
         }}
       >
         <div className="min-w-0 flex-1">
           <div className="flex flex-wrap items-center gap-2">
             <span style={LABEL_STYLE}>Compose</span>
             <span
-              className="inline-flex items-center gap-1 px-2 py-0.5 text-[10px] font-bold uppercase tracking-[0.14em]"
+              className="ade-liquid-glass-pill inline-flex items-center gap-1 rounded-full px-2.5 py-1 text-[10px] font-bold uppercase tracking-[0.14em]"
               style={{
-                border: "1px solid color-mix(in srgb, var(--chat-accent) 18%, rgba(255,255,255,0.08))",
-                background: "color-mix(in srgb, var(--chat-accent) 10%, transparent)",
                 color: TEXT_PRIMARY,
                 fontFamily: MONO,
               }}
@@ -126,7 +123,7 @@ export const ChatInput = React.memo(function ChatInput({
             </span>
             {chatBlocked ? (
               <span
-                className="inline-flex items-center gap-1 px-2 py-0.5 text-[10px] font-bold uppercase tracking-[0.14em]"
+                className="ade-liquid-glass-pill inline-flex items-center gap-1 rounded-full px-2.5 py-1 text-[10px] font-bold uppercase tracking-[0.14em]"
                 style={{
                   border: `1px solid ${WARNING}28`,
                   background: `${WARNING}12`,
@@ -144,17 +141,15 @@ export const ChatInput = React.memo(function ChatInput({
         </div>
 
         {quickTargets.length > 0 ? (
-          <div className="flex min-w-0 flex-wrap justify-end gap-1.5">
+          <div className="flex min-w-0 flex-wrap justify-end gap-2">
             {quickTargets.map((target) => (
               <button
                 key={target.id}
                 type="button"
                 onClick={() => onAppendMentionTarget(target.id)}
                 disabled={sending || chatBlocked}
-                className="inline-flex items-center gap-1.5 px-2.5 py-1 text-[10px] transition-opacity hover:opacity-90 disabled:opacity-50"
+                className="ade-liquid-glass-pill inline-flex items-center gap-1.5 rounded-full px-2.5 py-1.5 text-[10px] transition-all hover:border-white/[0.12] hover:opacity-100 disabled:opacity-50"
                 style={{
-                  background: "color-mix(in srgb, var(--chat-accent) 9%, transparent)",
-                  border: "1px solid color-mix(in srgb, var(--chat-accent) 16%, rgba(255,255,255,0.08))",
                   color: TEXT_PRIMARY,
                   fontFamily: MONO,
                 }}
diff --git a/apps/desktop/src/renderer/components/prs/PRsPage.tsx b/apps/desktop/src/renderer/components/prs/PRsPage.tsx
index 2ce5b9630..460a78774 100644
--- a/apps/desktop/src/renderer/components/prs/PRsPage.tsx
+++ b/apps/desktop/src/renderer/components/prs/PRsPage.tsx
@@ -108,11 +108,23 @@ function PRsPageInner() {
   }, [location.search, rebaseNeeds, setActiveTab, setSelectedPrId, setSelectedQueueGroupId, setSelectedRebaseItemId]);
 
   React.useEffect(() => {
+    const current = parsePrsRouteState({ search: location.search });
+    // Preserve per-PR deep-link params (eventId/threadId/commitSha) as long as
+    // the URL still points at the currently selected PR. When the PR changes,
+    // stale deep-link params for the old PR get dropped.
+    const preserveDeepLinks =
+      activeTab === "normal" &&
+      selectedPrId !== null &&
+      current.prId === selectedPrId;
+    const deepLinks = preserveDeepLinks
+      ? { eventId: current.eventId, threadId: current.threadId, commitSha: current.commitSha }
+      : { eventId: null, threadId: null, commitSha: null };
     const nextSearch = buildPrsRouteSearch({
       activeTab,
       selectedPrId,
       selectedQueueGroupId,
       selectedRebaseItemId,
+      ...deepLinks,
     });
     if (location.search === nextSearch) return;
     void navigate({ pathname: location.pathname, search: nextSearch }, { replace: true });
diff --git a/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.timelineRails.test.tsx b/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.timelineRails.test.tsx
new file mode 100644
index 000000000..974a22d16
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.timelineRails.test.tsx
@@ -0,0 +1,307 @@
+// @vitest-environment jsdom
+
+import React from "react";
+import { MemoryRouter } from "react-router-dom";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type {
+  LaneSummary,
+  PrAiSummary,
+  PrDeployment,
+  PrReviewThread,
+  PrStatus,
+  PrWithConflicts,
+} from "../../../../shared/types";
+
+const mockUsePrs = vi.fn();
+
+vi.mock("../state/PrsContext", () => ({
+  usePrs: () => mockUsePrs(),
+}));
+
+vi.mock("../shared/PrIssueResolverModal", () => ({
+  PrIssueResolverModal: ({ open }: { open: boolean }) => (open ? <div data-testid="issue-resolver-modal-open" /> : null),
+}));
+
+import { PrDetailPane } from "./PrDetailPane";
+
+function makePr(): PrWithConflicts {
+  return {
+    id: "pr-200",
+    laneId: "lane-1",
+    projectId: "project-1",
+    repoOwner: "ade-dev",
+    repoName: "ade",
+    githubPrNumber: 200,
+    githubUrl: "https://github.com/ade-dev/ade/pull/200",
+    githubNodeId: "PR_kwDOExample",
+    title: "Timeline rails integration smoke",
+    state: "open",
+    baseBranch: "main",
+    headBranch: "feature/pr-200",
+    checksStatus: "passing",
+    reviewStatus: "approved",
+    additions: 10,
+    deletions: 2,
+    lastSyncedAt: "2026-04-14T10:00:00.000Z",
+    createdAt: "2026-04-14T09:00:00.000Z",
+    updatedAt: "2026-04-14T10:00:00.000Z",
+    conflictAnalysis: null,
+  };
+}
+
+function makeLane(): LaneSummary {
+  return {
+    id: "lane-1",
+    name: "feature/pr-200",
+    description: null,
+    laneType: "worktree",
+    baseRef: "main",
+    branchRef: "feature/pr-200",
+    worktreePath: "/tmp/lane-1",
+    attachedRootPath: null,
+    parentLaneId: null,
+    childCount: 0,
+    stackDepth: 0,
+    parentStatus: null,
+    isEditProtected: false,
+    status: { dirty: false, ahead: 0, behind: 0, remoteBehind: -1, rebaseInProgress: false },
+    color: null,
+    icon: null,
+    tags: [],
+    folder: null,
+    createdAt: "2026-04-14T09:00:00.000Z",
+    archivedAt: null,
+  };
+}
+
+function makeStatus(): PrStatus {
+  return {
+    prId: "pr-200",
+    state: "open",
+    checksStatus: "passing",
+    reviewStatus: "approved",
+    isMergeable: true,
+    mergeConflicts: false,
+    behindBaseBy: 0,
+  };
+}
+
+const reviewThread: PrReviewThread = {
+  id: "thread-smoke-1",
+  isResolved: false,
+  isOutdated: false,
+  path: "src/a.ts",
+  line: 10,
+  originalLine: 10,
+  startLine: null,
+  originalStartLine: null,
+  diffSide: "RIGHT",
+  url: null,
+  createdAt: "2026-04-14T09:30:00.000Z",
+  updatedAt: "2026-04-14T09:30:00.000Z",
+  comments: [
+    {
+      id: "c-1",
+      author: "reviewer",
+      authorAvatarUrl: null,
+      body: "Consider renaming this.",
+      url: null,
+      createdAt: "2026-04-14T09:30:00.000Z",
+      updatedAt: "2026-04-14T09:30:00.000Z",
+    },
+  ],
+};
+
+const deployment: PrDeployment = {
+  id: "deploy-1",
+  environment: "preview",
+  state: "success",
+  description: null,
+  environmentUrl: "https://preview.example.com",
+  logUrl: null,
+  sha: "abc123",
+  ref: "feature/pr-200",
+  creator: "bot",
+  createdAt: "2026-04-14T09:45:00.000Z",
+  updatedAt: "2026-04-14T09:45:00.000Z",
+};
+
+const aiSummary: PrAiSummary = {
+  prId: "pr-200",
+  summary: "This PR tightens timeline rails integration.",
+  riskAreas: ["State fetch order"],
+  reviewerHotspots: ["PrsContext.tsx"],
+  unresolvedConcerns: [],
+  generatedAt: "2026-04-14T10:00:00.000Z",
+  headSha: "abc123",
+};
+
+function installAdeMock() {
+  Object.assign(window, {
+    ade: {
+      prs: {
+        getDetail: vi.fn().mockResolvedValue({
+          prId: "pr-200",
+          body: "This is the PR description body.",
+          labels: [],
+          assignees: [],
+          requestedReviewers: [],
+          author: { login: "octocat", avatarUrl: null },
+          isDraft: false,
+          milestone: null,
+          linkedIssues: [],
+        }),
+        getFiles: vi.fn().mockResolvedValue([]),
+        getActionRuns: vi.fn().mockResolvedValue([]),
+        getActivity: vi.fn().mockResolvedValue([]),
+        getReviewThreads: vi.fn().mockResolvedValue([reviewThread]),
+        getChecks: vi.fn().mockResolvedValue([]),
+        getStatus: vi.fn().mockResolvedValue(makeStatus()),
+        issueInventorySync: vi.fn().mockResolvedValue({
+          items: [],
+          convergence: { currentRound: 0, maxRounds: 5, totalNew: 0, totalSentToAgent: 0, isConverging: false },
+        }),
+        issueInventoryReset: vi.fn().mockResolvedValue(undefined),
+        pipelineSettingsGet: vi.fn().mockResolvedValue({
+          autoMerge: false,
+          mergeMethod: "repo_default",
+          maxRounds: 5,
+          onRebaseNeeded: "pause",
+        }),
+        onAiResolutionEvent: vi.fn(() => () => {}),
+        openInGitHub: vi.fn().mockResolvedValue(undefined),
+      },
+      lanes: {
+        list: vi.fn().mockResolvedValue([makeLane()]),
+      },
+      git: {
+        getSyncStatus: vi.fn().mockResolvedValue({
+          hasUpstream: true,
+          upstreamRef: "origin/feature/pr-200",
+          ahead: 0,
+          behind: 0,
+          diverged: false,
+          recommendedAction: "none",
+        }),
+      },
+      app: {
+        openExternal: vi.fn(),
+        writeClipboardText: vi.fn().mockResolvedValue(undefined),
+      },
+      sessions: {
+        get: vi.fn().mockResolvedValue(null),
+      },
+      ai: {
+        getStatus: vi.fn().mockResolvedValue({ availableModels: [] }),
+      },
+    },
+  });
+}
+
+describe("PrDetailPane Timeline+Rails overview", () => {
+  beforeEach(() => {
+    installAdeMock();
+    mockUsePrs.mockReturnValue({
+      convergenceStatesByPrId: {},
+      loadConvergenceState: vi.fn().mockResolvedValue(null),
+      saveConvergenceState: vi.fn().mockResolvedValue(null),
+      resetConvergenceState: vi.fn().mockResolvedValue(undefined),
+      rebaseNeeds: [],
+      resolverModel: "openai/gpt-5.4-codex",
+      resolverReasoningLevel: "high",
+      resolverPermissionMode: "guarded_edit",
+      setResolverModel: vi.fn(),
+      setResolverReasoningLevel: vi.fn(),
+      setResolverPermissionMode: vi.fn(),
+      prsTimelineRailsEnabled: true,
+      dismissedAiSummaries: {},
+      timelineFiltersByPrId: {},
+      viewerLogin: "octocat",
+      detailAiSummary: aiSummary,
+      detailReviewThreads: [reviewThread],
+      detailDeployments: [deployment],
+      setTimelineFilters: vi.fn(),
+      setAiSummaryDismissed: vi.fn(),
+      regeneratePrAiSummary: vi.fn().mockResolvedValue(undefined),
+    });
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  it("renders timeline + commit rail + status rail when the flag is enabled", async () => {
+    render(
+      <MemoryRouter>
+        <PrDetailPane
+          pr={makePr()}
+          status={makeStatus()}
+          checks={[]}
+          reviews={[]}
+          comments={[]}
+          detailBusy={false}
+          lanes={[makeLane()]}
+          mergeMethod="squash"
+          onRefresh={vi.fn().mockResolvedValue(undefined)}
+          onNavigate={vi.fn()}
+        />
+      </MemoryRouter>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByTestId("pr-detail-timeline-rails")).toBeTruthy();
+      expect(screen.getByTestId("pr-commit-rail")).toBeTruthy();
+      expect(screen.getByTestId("pr-timeline")).toBeTruthy();
+      expect(screen.getByTestId("pr-status-rail")).toBeTruthy();
+    });
+  });
+
+  it("falls back to the legacy overview when the flag is disabled", async () => {
+    mockUsePrs.mockReturnValue({
+      convergenceStatesByPrId: {},
+      loadConvergenceState: vi.fn().mockResolvedValue(null),
+      saveConvergenceState: vi.fn().mockResolvedValue(null),
+      resetConvergenceState: vi.fn().mockResolvedValue(undefined),
+      rebaseNeeds: [],
+      resolverModel: "openai/gpt-5.4-codex",
+      resolverReasoningLevel: "high",
+      resolverPermissionMode: "guarded_edit",
+      setResolverModel: vi.fn(),
+      setResolverReasoningLevel: vi.fn(),
+      setResolverPermissionMode: vi.fn(),
+      prsTimelineRailsEnabled: false,
+      dismissedAiSummaries: {},
+      timelineFiltersByPrId: {},
+      viewerLogin: "octocat",
+      detailAiSummary: null,
+      detailReviewThreads: [],
+      detailDeployments: [],
+      setTimelineFilters: vi.fn(),
+      setAiSummaryDismissed: vi.fn(),
+      regeneratePrAiSummary: vi.fn().mockResolvedValue(undefined),
+    });
+
+    render(
+      <MemoryRouter>
+        <PrDetailPane
+          pr={makePr()}
+          status={makeStatus()}
+          checks={[]}
+          reviews={[]}
+          comments={[]}
+          detailBusy={false}
+          lanes={[makeLane()]}
+          mergeMethod="squash"
+          onRefresh={vi.fn().mockResolvedValue(undefined)}
+          onNavigate={vi.fn()}
+        />
+      </MemoryRouter>,
+    );
+
+    // The legacy Overview has the merge bar "MERGEABLE" text; Timeline rails container is absent.
+    await waitFor(() => {
+      expect(screen.queryByTestId("pr-detail-timeline-rails")).toBeNull();
+    });
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.tsx b/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.tsx
index cdf6e5c8d..8481bf3fc 100644
--- a/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.tsx
+++ b/apps/desktop/src/renderer/components/prs/detail/PrDetailPane.tsx
@@ -18,6 +18,10 @@ import type {
   PrConvergenceState,
   PrConvergenceStatePatch,
 } from "../../../../shared/types";
+import { DEFAULT_PR_TIMELINE_FILTERS, type PrTimelineFilters } from "../shared/PrTimeline";
+import type { PaletteKind } from "../shared/PrCommandPalettes";
+import { parsePrsRouteState } from "../prsRouteState";
+import { PrDetailTimelineRails as TimelineRailsOverview, type PrDetailTimelineRailsRef } from "./PrDetailTimelineRails";
 import { DEFAULT_PIPELINE_SETTINGS } from "../../../../shared/types";
 import { getPrIssueResolutionAvailability } from "../../../../shared/prIssueResolution";
 import { COLORS, MONO_FONT, SANS_FONT, LABEL_STYLE, cardStyle, inlineBadge, outlineButton, primaryButton, dangerButton } from "../../lanes/laneDesignTokens";
@@ -414,6 +418,16 @@ export function PrDetailPane({
     setResolverModel,
     setResolverReasoningLevel,
     setResolverPermissionMode,
+    prsTimelineRailsEnabled,
+    dismissedAiSummaries,
+    timelineFiltersByPrId,
+    detailAiSummary,
+    detailReviewThreads: ctxReviewThreads,
+    detailDeployments,
+    viewerLogin,
+    setTimelineFilters,
+    setAiSummaryDismissed,
+    regeneratePrAiSummary,
   } = usePrs();
   const [activeTab, setActiveTab] = React.useState<DetailTab>("overview");
   const [detail, setDetail] = React.useState<PrDetail | null>(null);
@@ -421,6 +435,87 @@ export function PrDetailPane({
   const [actionRuns, setActionRuns] = React.useState<PrActionRun[]>([]);
   const [activity, setActivity] = React.useState<PrActivityEvent[]>([]);
   const [reviewThreads, setReviewThreads] = React.useState<PrReviewThread[]>([]);
+  const timelineRailsRef = React.useRef<PrDetailTimelineRailsRef | null>(null);
+  const deepLinkState = React.useMemo(() => {
+    try {
+      const parsed = parsePrsRouteState({ search: window.location.search, hash: window.location.hash });
+      return { eventId: parsed.eventId, threadId: parsed.threadId, commitSha: parsed.commitSha };
+    } catch {
+      return { eventId: null, threadId: null, commitSha: null };
+    }
+  }, [pr.id]); // eslint-disable-line react-hooks/exhaustive-deps
+  const timelineFilters: PrTimelineFilters = React.useMemo(
+    () => timelineFiltersByPrId?.[pr.id] ?? DEFAULT_PR_TIMELINE_FILTERS,
+    [timelineFiltersByPrId, pr.id],
+  );
+  const handleTimelineFiltersChange = React.useCallback(
+    (next: PrTimelineFilters) => setTimelineFilters?.(pr.id, next),
+    [pr.id, setTimelineFilters],
+  );
+  const reviewThreadsForTimeline = React.useMemo(
+    () => ((ctxReviewThreads?.length ?? 0) > 0 ? ctxReviewThreads! : reviewThreads),
+    [ctxReviewThreads, reviewThreads],
+  );
+  const aiSummaryDismissedForPr = Boolean(dismissedAiSummaries?.[pr.id]);
+  const handleDismissAiSummary = React.useCallback(() => {
+    setAiSummaryDismissed?.(pr.id, true);
+  }, [pr.id, setAiSummaryDismissed]);
+  const handleRegenerateAiSummary = React.useCallback(() => {
+    void regeneratePrAiSummary?.(pr.id);
+  }, [pr.id, regeneratePrAiSummary]);
+
+  // Page-level keyboard shortcuts scoped to the Timeline+Rails overview.
+  // Only attach listeners when the flag is on AND the overview tab is active.
+  React.useEffect(() => {
+    if (!prsTimelineRailsEnabled) return;
+    const CHORD_WINDOW_MS = 800;
+    const chordPalettes: Record<string, PaletteKind> = { c: "commit", t: "thread", f: "file" };
+    let lastKey = "";
+    let lastKeyAt = 0;
+    const handler = (event: KeyboardEvent) => {
+      if (event.defaultPrevented) return;
+      const target = event.target as HTMLElement | null;
+      if (target) {
+        const tag = target.tagName;
+        if (tag === "INPUT" || tag === "TEXTAREA" || target.isContentEditable) return;
+      }
+      if (event.metaKey || event.ctrlKey || event.altKey) return;
+      if (activeTab !== "overview") return;
+
+      const rails = timelineRailsRef.current;
+      if (!rails) return;
+
+      const now = Date.now();
+      const inChord = lastKey === "g" && now - lastKeyAt < CHORD_WINDOW_MS;
+
+      if (inChord) {
+        const palette = chordPalettes[event.key];
+        if (palette) {
+          event.preventDefault();
+          rails.openPalette(palette);
+        }
+        lastKey = "";
+        lastKeyAt = 0;
+        return;
+      }
+
+      if (event.key === "g") {
+        lastKey = "g";
+        lastKeyAt = now;
+        return;
+      }
+
+      if (event.key === "[") {
+        event.preventDefault();
+        rails.prevUnresolvedThread();
+      } else if (event.key === "]") {
+        event.preventDefault();
+        rails.nextUnresolvedThread();
+      }
+    };
+    window.addEventListener("keydown", handler);
+    return () => window.removeEventListener("keydown", handler);
+  }, [prsTimelineRailsEnabled, activeTab]);
   const [aiSummary, setAiSummary] = React.useState<AiReviewSummary | null>(null);
   const [aiSummaryBusy, setAiSummaryBusy] = React.useState(false);
   const [showIssueResolverModal, setShowIssueResolverModal] = React.useState(false);
@@ -1878,7 +1973,30 @@ export function PrDetailPane({
 
       {/* ===== TAB CONTENT ===== */}
       <div style={{ flex: 1, minHeight: 0, overflow: "auto" }}>
-        {activeTab === "overview" && (
+        {activeTab === "overview" && prsTimelineRailsEnabled && (
+          <TimelineRailsOverview
+            ref={timelineRailsRef}
+            pr={pr}
+            detail={detail}
+            status={status}
+            checks={checks}
+            reviews={reviews}
+            comments={comments}
+            activity={activity}
+            files={files}
+            reviewThreads={reviewThreadsForTimeline}
+            deployments={detailDeployments}
+            viewerLogin={viewerLogin}
+            filters={timelineFilters}
+            onFiltersChange={handleTimelineFiltersChange}
+            aiSummary={detailAiSummary}
+            aiSummaryDismissed={aiSummaryDismissedForPr}
+            onDismissAiSummary={handleDismissAiSummary}
+            onRegenerateAiSummary={handleRegenerateAiSummary}
+            deepLink={deepLinkState}
+          />
+        )}
+        {activeTab === "overview" && !prsTimelineRailsEnabled && (
           <OverviewTab
             pr={pr} detail={detail} status={status} checks={checks} actionRuns={actionRuns} reviews={reviews} comments={comments}
             detailBusy={detailBusy} aiSummary={aiSummary} aiSummaryBusy={aiSummaryBusy}
@@ -2121,12 +2239,13 @@ function CommentMenu({ url }: { url: string | null }) {
         <DotsThreeVertical size={16} weight="bold" />
       </button>
       {open && (
-        <div style={{
-          position: "absolute", top: "100%", right: 0, marginTop: 4,
-          background: COLORS.cardBgSolid, border: `1px solid ${COLORS.outlineBorder}`,
-          borderRadius: 10, padding: 4, minWidth: 160, zIndex: 20,
-          boxShadow: "0 8px 32px rgba(0,0,0,0.5)",
-        }}>
+        <div
+          className="ade-liquid-glass-menu"
+          style={{
+            position: "absolute", top: "100%", right: 0, marginTop: 4,
+            padding: 4, minWidth: 160, zIndex: 20,
+          }}
+        >
           <button
             type="button"
             onClick={() => { void window.ade.app.openExternal(url); setOpen(false); }}
diff --git a/apps/desktop/src/renderer/components/prs/detail/PrDetailTimelineRails.tsx b/apps/desktop/src/renderer/components/prs/detail/PrDetailTimelineRails.tsx
new file mode 100644
index 000000000..f859a8941
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/detail/PrDetailTimelineRails.tsx
@@ -0,0 +1,581 @@
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+import { buildPrsRouteSearch, parsePrsRouteState } from "../prsRouteState";
+import type {
+  PrActivityEvent,
+  PrAiSummary,
+  PrCheck,
+  PrComment,
+  PrDeployment,
+  PrDetail,
+  PrReview,
+  PrReviewThread,
+  PrStatus,
+  PrTimelineEvent,
+  PrWithConflicts,
+} from "../../../../shared/types";
+import { PrTimeline, DEFAULT_PR_TIMELINE_FILTERS, type PrTimelineFilters, type PrTimelineRef } from "../shared/PrTimeline";
+import { PrCommitRail, type PrCommitRailCommit } from "../shared/PrCommitRail";
+import { PrStatusRail, type PrStatusRailMergeState } from "../shared/PrStatusRail";
+import { PrCommandPalettes, type PaletteKind } from "../shared/PrCommandPalettes";
+import { PrCheckLogDrawer } from "../shared/PrCheckLogDrawer";
+import { COLORS } from "../../lanes/laneDesignTokens";
+
+export type PrDetailTimelineRailsRef = {
+  scrollToEventId: (id: string) => void;
+  focusEvent: (id: string) => void;
+  nextUnresolvedThread: () => void;
+  prevUnresolvedThread: () => void;
+  openPalette: (kind: PaletteKind) => void;
+  closePalette: () => void;
+};
+
+type Props = {
+  pr: PrWithConflicts;
+  detail: PrDetail | null;
+  status: PrStatus | null;
+  checks: PrCheck[];
+  reviews: PrReview[];
+  comments: PrComment[];
+  activity: PrActivityEvent[];
+  files: Array<{ filename: string; additions: number; deletions: number }>;
+  reviewThreads: PrReviewThread[];
+  deployments: PrDeployment[];
+  viewerLogin: string | null;
+  filters: PrTimelineFilters;
+  onFiltersChange: (next: PrTimelineFilters) => void;
+  aiSummary: PrAiSummary | null;
+  aiSummaryDismissed: boolean;
+  onDismissAiSummary: () => void;
+  onRegenerateAiSummary: () => void;
+  deepLink: { eventId: string | null; threadId: string | null; commitSha: string | null };
+};
+
+function shortenSha(sha: string): string {
+  return sha.length > 7 ? sha.slice(0, 7) : sha;
+}
+
+function readActivityString(event: PrActivityEvent, key: string): string | null {
+  const value = (event.metadata as Record<string, unknown>)[key];
+  return typeof value === "string" ? value : null;
+}
+
+function threadFirstCommentAuthor(thread: PrReviewThread): string | null {
+  return thread.comments[0]?.author ?? null;
+}
+
+function threadFirstCommentAvatar(thread: PrReviewThread): string | null {
+  return thread.comments[0]?.authorAvatarUrl ?? null;
+}
+
+function threadFirstCommentBody(thread: PrReviewThread): string | null {
+  return thread.comments[0]?.body ?? null;
+}
+
+function threadTimestamp(thread: PrReviewThread): string {
+  return thread.updatedAt ?? thread.createdAt ?? new Date(0).toISOString();
+}
+
+function stableSortByTs<T extends { timestamp: string }>(events: T[]): T[] {
+  return [...events].sort((a, b) => {
+    const ta = Date.parse(a.timestamp);
+    const tb = Date.parse(b.timestamp);
+    if (Number.isNaN(ta) && Number.isNaN(tb)) return 0;
+    if (Number.isNaN(ta)) return -1;
+    if (Number.isNaN(tb)) return 1;
+    return ta - tb;
+  });
+}
+
+function isBotLogin(login: string | null | undefined): boolean {
+  if (!login) return false;
+  const l = login.toLowerCase();
+  return l.endsWith("[bot]") || l.endsWith("-bot") || l === "github-actions";
+}
+
+export function buildTimelineEvents(args: {
+  pr: PrWithConflicts;
+  detail: PrDetail | null;
+  activity: PrActivityEvent[];
+  reviews: PrReview[];
+  reviewThreads: PrReviewThread[];
+  comments: PrComment[];
+  checks: PrCheck[];
+  deployments: PrDeployment[];
+}): PrTimelineEvent[] {
+  const events: PrTimelineEvent[] = [];
+
+  // Description as first event.
+  if (args.detail?.body) {
+    events.push({
+      id: `desc:${args.pr.id}`,
+      type: "description",
+      timestamp: args.pr.createdAt ?? new Date(0).toISOString(),
+      author: args.detail.author?.login ?? null,
+      avatarUrl: args.detail.author?.avatarUrl ?? null,
+      body: args.detail.body,
+    });
+  }
+
+  // Activity events split into push / label / merge.
+  for (const act of args.activity) {
+    if (act.type === "commit") {
+      const sha = readActivityString(act, "sha") ?? act.id;
+      const subject = readActivityString(act, "subject") ?? act.body ?? "";
+      events.push({
+        id: `commit:${sha}`,
+        type: "commit_push",
+        timestamp: act.timestamp,
+        author: act.author ?? null,
+        avatarUrl: act.avatarUrl ?? null,
+        sha,
+        shortSha: shortenSha(sha),
+        subject,
+        commitCount: 1,
+        forcePushed: false,
+      });
+    } else if (act.type === "force_push") {
+      const sha = readActivityString(act, "sha") ?? act.id;
+      events.push({
+        id: `fpush:${act.id}`,
+        type: "commit_push",
+        timestamp: act.timestamp,
+        author: act.author ?? null,
+        avatarUrl: act.avatarUrl ?? null,
+        sha,
+        shortSha: shortenSha(sha),
+        subject: readActivityString(act, "subject") ?? "Force-pushed",
+        commitCount: 1,
+        forcePushed: true,
+      });
+    } else if (act.type === "label") {
+      const action = readActivityString(act, "action") === "removed" ? "removed" : "added";
+      const label = readActivityString(act, "label") ?? "";
+      events.push({
+        id: `label:${act.id}`,
+        type: "label_change",
+        timestamp: act.timestamp,
+        author: act.author ?? null,
+        avatarUrl: act.avatarUrl ?? null,
+        action,
+        label,
+        color: readActivityString(act, "color"),
+      });
+    } else if (act.type === "state_change") {
+      const newState = readActivityString(act, "state");
+      if (newState === "merged") {
+        events.push({
+          id: `merge:${act.id}`,
+          type: "merge",
+          timestamp: act.timestamp,
+          author: act.author ?? null,
+          avatarUrl: act.avatarUrl ?? null,
+          mergeCommitSha: readActivityString(act, "mergeCommitSha"),
+          method: null,
+        });
+      }
+    }
+  }
+
+  // Reviews
+  for (const review of args.reviews) {
+    const ts = review.submittedAt ?? args.pr.updatedAt ?? new Date(0).toISOString();
+    events.push({
+      id: `review:${review.reviewer}:${ts}`,
+      type: "review",
+      timestamp: ts,
+      author: review.reviewer,
+      avatarUrl: review.reviewerAvatarUrl,
+      reviewId: `${review.reviewer}:${ts}`,
+      state: review.state,
+      body: review.body,
+      isBot: isBotLogin(review.reviewer),
+    });
+  }
+
+  // Review threads
+  for (const thread of args.reviewThreads) {
+    events.push({
+      id: `thread:${thread.id}`,
+      type: "review_thread",
+      timestamp: threadTimestamp(thread),
+      author: threadFirstCommentAuthor(thread),
+      avatarUrl: threadFirstCommentAvatar(thread),
+      threadId: thread.id,
+      path: thread.path,
+      line: thread.line,
+      startLine: thread.startLine,
+      isResolved: thread.isResolved,
+      isOutdated: thread.isOutdated,
+      commentCount: thread.comments.length,
+      firstCommentBody: threadFirstCommentBody(thread),
+    });
+  }
+
+  // Issue comments (not tied to a review thread).
+  for (const comment of args.comments) {
+    if (comment.source !== "issue") continue;
+    events.push({
+      id: `comment:${comment.id}`,
+      type: "issue_comment",
+      timestamp: comment.createdAt ?? new Date(0).toISOString(),
+      author: comment.author,
+      avatarUrl: comment.authorAvatarUrl,
+      commentId: comment.id,
+      body: comment.body,
+      isBot: isBotLogin(comment.author),
+    });
+  }
+
+  // Checks — one event per check (latest state).
+  for (const check of args.checks) {
+    const ts = check.completedAt ?? check.startedAt ?? args.pr.updatedAt ?? new Date(0).toISOString();
+    events.push({
+      id: `check:${check.name}:${ts}`,
+      type: "check_update",
+      timestamp: ts,
+      author: null,
+      avatarUrl: null,
+      checkName: check.name,
+      status: check.status,
+      conclusion: check.conclusion,
+      detailsUrl: check.detailsUrl,
+    });
+  }
+
+  // Deployments
+  for (const dep of args.deployments) {
+    events.push({
+      id: `deploy:${dep.id}`,
+      type: "deployment",
+      timestamp: dep.updatedAt ?? dep.createdAt ?? new Date(0).toISOString(),
+      author: dep.creator,
+      avatarUrl: null,
+      deploymentId: dep.id,
+      environment: dep.environment,
+      state: dep.state,
+      environmentUrl: dep.environmentUrl,
+    });
+  }
+
+  return stableSortByTs(events);
+}
+
+function buildCommitRailCommits(
+  activity: PrActivityEvent[],
+  reviewThreads: PrReviewThread[],
+): PrCommitRailCommit[] {
+  const commits: PrCommitRailCommit[] = [];
+  for (const act of activity) {
+    if (act.type !== "commit" && act.type !== "force_push") continue;
+    const sha = readActivityString(act, "sha") ?? act.id;
+    const subject = readActivityString(act, "subject") ?? act.body ?? "";
+    commits.push({
+      sha,
+      shortSha: shortenSha(sha),
+      subject,
+      author: act.author ?? "unknown",
+      authoredAt: act.timestamp,
+      threadCount: 0,
+      resolvedCount: 0,
+    });
+  }
+  // Best-effort: attribute resolved/unresolved thread counts to the latest commit
+  // touching the relevant file. Without commit<->file diff history, bucket them
+  // into the most recent commit.
+  if (commits.length > 0) {
+    const last = commits[commits.length - 1]!;
+    for (const thread of reviewThreads) {
+      last.threadCount += 1;
+      if (thread.isResolved) last.resolvedCount += 1;
+    }
+  }
+  return commits;
+}
+
+function deriveMergeState(
+  pr: PrWithConflicts,
+  status: PrStatus | null,
+  reviews: PrReview[],
+  checks: PrCheck[],
+): PrStatusRailMergeState {
+  const approvals = reviews.filter((r) => r.state === "approved").length;
+  const failingChecks = checks.filter((c) => c.status === "completed" && (c.conclusion === "failure" || c.conclusion === "cancelled")).length;
+  const pendingChecks = checks.filter((c) => c.status !== "completed").length;
+  const mergeable: "clean" | "dirty" | "unknown" = status
+    ? status.mergeConflicts
+      ? "dirty"
+      : status.isMergeable
+        ? "clean"
+        : "unknown"
+    : "unknown";
+  return {
+    mergeable,
+    hasConflicts: Boolean(status?.mergeConflicts),
+    approvals,
+    requiredApprovals: null,
+    failingChecks,
+    pendingChecks,
+    githubUrl: pr.githubUrl,
+  };
+}
+
+export const PrDetailTimelineRails = forwardRef<PrDetailTimelineRailsRef, Props>(
+  function PrDetailTimelineRails(props, ref) {
+    const {
+      pr,
+      detail,
+      status,
+      checks,
+      reviews,
+      comments,
+      activity,
+      files,
+      reviewThreads,
+      deployments,
+      viewerLogin,
+      filters,
+      onFiltersChange,
+      aiSummary,
+      aiSummaryDismissed,
+      onDismissAiSummary,
+      onRegenerateAiSummary,
+      deepLink,
+    } = props;
+
+    const timelineRef = useRef<PrTimelineRef | null>(null);
+    const navigate = useNavigate();
+    const location = useLocation();
+    const [activeCommitSha, setActiveCommitSha] = useState<string | null>(null);
+    const [logDrawerCheck, setLogDrawerCheck] = useState<PrCheck | null>(null);
+    const [paletteKind, setPaletteKind] = useState<PaletteKind | null>(null);
+
+    const events = useMemo(
+      () =>
+        buildTimelineEvents({
+          pr,
+          detail,
+          activity,
+          reviews,
+          reviewThreads,
+          comments,
+          checks,
+          deployments,
+        }),
+      [pr, detail, activity, reviews, reviewThreads, comments, checks, deployments],
+    );
+
+    const commits = useMemo(
+      () => buildCommitRailCommits(activity, reviewThreads),
+      [activity, reviewThreads],
+    );
+
+    const mergeState = useMemo(
+      () => deriveMergeState(pr, status, reviews, checks),
+      [pr, status, reviews, checks],
+    );
+
+    const handleSelectCommit = useCallback(
+      (sha: string) => {
+        setActiveCommitSha(sha);
+        const target = events.find((e) => e.type === "commit_push" && e.sha === sha);
+        if (target) {
+          timelineRef.current?.scrollToEventId(target.id);
+          timelineRef.current?.focusEvent(target.id);
+        }
+      },
+      [events],
+    );
+
+    const handleOpenLog = useCallback((check: PrCheck) => {
+      setLogDrawerCheck(check);
+    }, []);
+
+    const handleOpenExternal = useCallback((url: string) => {
+      if (!url) return;
+      try {
+        const parsed = new URL(url);
+        if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return;
+      } catch {
+        return;
+      }
+      const opener = window.ade?.app?.openExternal;
+      if (opener) {
+        void opener(url).catch((err: unknown) => {
+          console.warn("[PrDetailTimelineRails] openExternal failed", { url, err });
+        });
+      }
+    }, []);
+
+    const paletteCommits = useMemo(
+      () => commits.map((c) => ({ sha: c.sha, subject: c.subject, author: c.author })),
+      [commits],
+    );
+    const paletteThreads = useMemo(
+      () =>
+        reviewThreads.map((t) => ({
+          id: t.id,
+          path: t.path,
+          line: t.line,
+          resolved: t.isResolved,
+          firstCommentAuthor: threadFirstCommentAuthor(t),
+        })),
+      [reviewThreads],
+    );
+    const paletteFiles = useMemo(
+      () =>
+        files.map((f) => ({
+          path: f.filename,
+          additions: f.additions,
+          deletions: f.deletions,
+        })),
+      [files],
+    );
+
+    useImperativeHandle(
+      ref,
+      () => ({
+        scrollToEventId: (id) => timelineRef.current?.scrollToEventId(id),
+        focusEvent: (id) => timelineRef.current?.focusEvent(id),
+        nextUnresolvedThread: () => timelineRef.current?.nextUnresolved(),
+        prevUnresolvedThread: () => timelineRef.current?.prevUnresolved(),
+        openPalette: (kind) => setPaletteKind(kind),
+        closePalette: () => setPaletteKind(null),
+      }),
+      [],
+    );
+
+    // Honor deep-link params once the event list is ready.
+    const deepLinkAppliedRef = useRef<string | null>(null);
+    useEffect(() => {
+      const key = `${deepLink.eventId ?? ""}|${deepLink.threadId ?? ""}|${deepLink.commitSha ?? ""}`;
+      if (!key || key === "||") return;
+      if (deepLinkAppliedRef.current === key) return;
+      if (events.length === 0) return;
+      deepLinkAppliedRef.current = key;
+      const target =
+        (deepLink.eventId && events.find((e) => e.id === deepLink.eventId)) ||
+        (deepLink.threadId && events.find((e) => e.type === "review_thread" && e.threadId === deepLink.threadId)) ||
+        (deepLink.commitSha && events.find((e) => e.type === "commit_push" && e.sha === deepLink.commitSha));
+      if (target) {
+        timelineRef.current?.focusEvent(target.id);
+      }
+      if (deepLink.commitSha) setActiveCommitSha(deepLink.commitSha);
+    }, [deepLink, events]);
+
+    // Scroll → URL round-trip. Write eventId to the URL (replace) as the user
+    // scrolls, so the address bar reflects the current position for sharing.
+    const locationSearchRef = useRef(location.search);
+    const locationPathnameRef = useRef(location.pathname);
+    useEffect(() => {
+      locationSearchRef.current = location.search;
+      locationPathnameRef.current = location.pathname;
+    }, [location.pathname, location.search]);
+    const handleVisibleEventChange = useCallback(
+      (eventId: string | null) => {
+        const current = parsePrsRouteState({ search: locationSearchRef.current });
+        if ((current.eventId ?? null) === eventId) return;
+        // Only write URL for PR-scoped tabs with a selected PR.
+        if (current.prId !== pr.id) return;
+        const tab = current.tab === "github" || current.tab === "normal" ? current.tab : "normal";
+        const nextSearch = buildPrsRouteSearch({
+          activeTab: tab,
+          selectedPrId: pr.id,
+          selectedQueueGroupId: null,
+          selectedRebaseItemId: null,
+          eventId,
+          threadId: current.threadId,
+          commitSha: current.commitSha,
+        });
+        if (nextSearch === locationSearchRef.current) return;
+        void navigate({ pathname: locationPathnameRef.current, search: nextSearch }, { replace: true });
+      },
+      [pr.id, navigate],
+    );
+
+    const summaryForTimeline = aiSummaryDismissed ? null : aiSummary ?? null;
+
+    return (
+      <div
+        className="grid h-full min-h-0 w-full"
+        style={{
+          gridTemplateColumns: "220px minmax(0, 1fr) 260px",
+          gridTemplateRows: "minmax(0, 1fr)",
+          background: COLORS.pageBg,
+        }}
+        data-testid="pr-detail-timeline-rails"
+      >
+        <div className="min-h-0">
+          <PrCommitRail
+            commits={commits}
+            activeSha={activeCommitSha}
+            viewerLogin={viewerLogin}
+            onSelectCommit={handleSelectCommit}
+          />
+        </div>
+
+        <div className="min-h-0">
+          <PrTimeline
+            ref={timelineRef}
+            events={events}
+            prId={pr.id}
+            laneId={pr.laneId}
+            repoOwner={pr.repoOwner}
+            repoName={pr.repoName}
+            viewerLogin={viewerLogin}
+            filters={filters}
+            onFiltersChange={onFiltersChange}
+            summary={summaryForTimeline}
+            onRegenerateSummary={onRegenerateAiSummary}
+            onDismissSummary={onDismissAiSummary}
+            onVisibleEventChange={handleVisibleEventChange}
+          />
+        </div>
+
+        <div className="min-h-0">
+          <PrStatusRail
+            checks={checks}
+            deployments={deployments}
+            mergeState={mergeState}
+            onOpenLog={handleOpenLog}
+            onOpenExternal={handleOpenExternal}
+          />
+        </div>
+
+        <PrCheckLogDrawer check={logDrawerCheck} onClose={() => setLogDrawerCheck(null)} />
+
+        <PrCommandPalettes
+          open={paletteKind}
+          onClose={() => setPaletteKind(null)}
+          commits={paletteCommits}
+          threads={paletteThreads}
+          files={paletteFiles}
+          onPickCommit={(sha) => {
+            setPaletteKind(null);
+            handleSelectCommit(sha);
+          }}
+          onPickThread={(id) => {
+            setPaletteKind(null);
+            const target = events.find(
+              (e) => e.type === "review_thread" && e.threadId === id,
+            );
+            if (target) timelineRef.current?.focusEvent(target.id);
+          }}
+          onPickFile={(path) => {
+            setPaletteKind(null);
+            if (!path) return;
+            navigate("/files", {
+              state: {
+                openFilePath: path,
+                laneId: pr.laneId,
+                mode: "diff",
+              },
+            });
+          }}
+        />
+      </div>
+    );
+  },
+);
+
+export { DEFAULT_PR_TIMELINE_FILTERS };
diff --git a/apps/desktop/src/renderer/components/prs/prsRouteState.test.ts b/apps/desktop/src/renderer/components/prs/prsRouteState.test.ts
index ce0a8215c..421bd9c11 100644
--- a/apps/desktop/src/renderer/components/prs/prsRouteState.test.ts
+++ b/apps/desktop/src/renderer/components/prs/prsRouteState.test.ts
@@ -14,6 +14,9 @@ describe("prsRouteState", () => {
       laneId: "lane-search",
       prId: "pr-123",
       queueGroupId: "group-hash",
+      eventId: null,
+      threadId: null,
+      commitSha: null,
     });
   });
 
@@ -29,9 +32,43 @@ describe("prsRouteState", () => {
       laneId: "lane-456",
       prId: "pr-789",
       queueGroupId: "group-1",
+      eventId: null,
+      threadId: null,
+      commitSha: null,
     });
   });
 
+  it("parses deep-link event, thread, and commit params", () => {
+    expect(
+      parsePrsRouteState({
+        search: "?tab=normal&prId=pr-1&eventId=evt-99&threadId=thr-12&commitSha=abc123",
+      }),
+    ).toEqual({
+      tab: "normal",
+      workflowTab: null,
+      laneId: null,
+      prId: "pr-1",
+      queueGroupId: null,
+      eventId: "evt-99",
+      threadId: "thr-12",
+      commitSha: "abc123",
+    });
+  });
+
+  it("builds search with deep-link params", () => {
+    expect(
+      buildPrsRouteSearch({
+        activeTab: "normal",
+        selectedPrId: "pr-1",
+        selectedQueueGroupId: null,
+        selectedRebaseItemId: null,
+        eventId: "evt-5",
+        threadId: "thr-3",
+        commitSha: "abc",
+      }),
+    ).toBe("?tab=normal&prId=pr-1&eventId=evt-5&threadId=thr-3&commitSha=abc");
+  });
+
   it("builds normal and workflow route searches with the expected ids", () => {
     expect(
       buildPrsRouteSearch({
diff --git a/apps/desktop/src/renderer/components/prs/prsRouteState.ts b/apps/desktop/src/renderer/components/prs/prsRouteState.ts
index 82ba70686..ecdea45a5 100644
--- a/apps/desktop/src/renderer/components/prs/prsRouteState.ts
+++ b/apps/desktop/src/renderer/components/prs/prsRouteState.ts
@@ -7,6 +7,9 @@ export type ParsedPrsRouteState = {
   laneId: string | null;
   prId: string | null;
   queueGroupId: string | null;
+  eventId: string | null;
+  threadId: string | null;
+  commitSha: string | null;
 };
 
 function parseSearch(search: string): URLSearchParams {
@@ -42,12 +45,18 @@ export function parsePrsRouteState(args: { search?: string | null; hash?: string
   const searchParams = parseSearch(args.search ?? "");
   const hashParams = parseHashParams(args.hash ?? "");
 
+  const pick = (key: string): string | null =>
+    parseOptionalId(searchParams.get(key)) ?? parseOptionalId(hashParams.get(key));
+
   return {
     tab: parseTab(searchParams.get("tab") ?? hashParams.get("tab")),
     workflowTab: parseWorkflowTab(searchParams.get("workflow") ?? hashParams.get("workflow")),
-    laneId: parseOptionalId(searchParams.get("laneId")) ?? parseOptionalId(hashParams.get("laneId")),
-    prId: parseOptionalId(searchParams.get("prId")) ?? parseOptionalId(hashParams.get("prId")),
-    queueGroupId: parseOptionalId(searchParams.get("queueGroupId")) ?? parseOptionalId(hashParams.get("queueGroupId")),
+    laneId: pick("laneId"),
+    prId: pick("prId"),
+    queueGroupId: pick("queueGroupId"),
+    eventId: pick("eventId"),
+    threadId: pick("threadId"),
+    commitSha: pick("commitSha"),
   };
 }
 
@@ -56,12 +65,18 @@ export function buildPrsRouteSearch(args: {
   selectedPrId: string | null;
   selectedQueueGroupId: string | null;
   selectedRebaseItemId: string | null;
+  eventId?: string | null;
+  threadId?: string | null;
+  commitSha?: string | null;
 }): string {
   const params = new URLSearchParams();
 
   if (args.activeTab === "normal" || args.activeTab === "github") {
     params.set("tab", args.activeTab);
     if (args.selectedPrId) params.set("prId", args.selectedPrId);
+    if (args.eventId) params.set("eventId", args.eventId);
+    if (args.threadId) params.set("threadId", args.threadId);
+    if (args.commitSha) params.set("commitSha", args.commitSha);
   } else {
     params.set("tab", "workflows");
     params.set("workflow", args.activeTab);
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrAiSummaryCard.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrAiSummaryCard.test.tsx
new file mode 100644
index 000000000..5408fe645
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrAiSummaryCard.test.tsx
@@ -0,0 +1,96 @@
+// @vitest-environment jsdom
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+
+import type { PrAiSummary } from "../../../../shared/types";
+import { PrAiSummaryCard } from "./PrAiSummaryCard";
+
+function makeSummary(overrides: Partial<PrAiSummary> = {}): PrAiSummary {
+  return {
+    prId: "pr-1",
+    summary: "Refactors the auth middleware to use session cookies.",
+    riskAreas: ["auth middleware", "session storage"],
+    reviewerHotspots: ["src/auth.ts:42"],
+    unresolvedConcerns: ["Missing migration plan"],
+    generatedAt: "2026-04-14T10:00:00.000Z",
+    headSha: "abc123",
+    ...overrides,
+  };
+}
+
+let regenerateAiSummary: ReturnType<typeof vi.fn>;
+
+beforeEach(() => {
+  sessionStorage.clear();
+  regenerateAiSummary = vi.fn().mockResolvedValue(makeSummary({ summary: "Updated summary." }));
+  (window as unknown as { ade?: unknown }).ade = {
+    prs: { regenerateAiSummary },
+  };
+});
+
+afterEach(() => {
+  cleanup();
+  sessionStorage.clear();
+  delete (window as unknown as { ade?: unknown }).ade;
+});
+
+describe("PrAiSummaryCard", () => {
+  it("renders summary paragraph and section chips", () => {
+    render(<PrAiSummaryCard prId="pr-1" summary={makeSummary()} />);
+    expect(screen.getByText(/refactors the auth middleware/i)).toBeTruthy();
+    expect(screen.getByText("auth middleware")).toBeTruthy();
+    expect(screen.getByText("src/auth.ts:42")).toBeTruthy();
+    expect(screen.getByText("Missing migration plan")).toBeTruthy();
+  });
+
+  it("shows skeleton while loading", () => {
+    const { container } = render(<PrAiSummaryCard prId="pr-1" summary={null} loading />);
+    expect(container.querySelector("[data-pr-ai-summary-skeleton]")).toBeTruthy();
+  });
+
+  it("shows Generate CTA when summary is null", () => {
+    render(<PrAiSummaryCard prId="pr-1" summary={null} />);
+    expect(screen.getByRole("button", { name: /generate summary/i })).toBeTruthy();
+  });
+
+  it("calls regenerateAiSummary on Regenerate click and invokes onGenerated", async () => {
+    const user = userEvent.setup();
+    const onGenerated = vi.fn();
+    render(<PrAiSummaryCard prId="pr-1" summary={makeSummary()} onGenerated={onGenerated} />);
+    await user.click(screen.getByRole("button", { name: /regenerate/i }));
+    await waitFor(() => {
+      expect(regenerateAiSummary).toHaveBeenCalledWith("pr-1");
+      expect(onGenerated).toHaveBeenCalled();
+    });
+  });
+
+  it("persists dismissal in sessionStorage and hides the card", async () => {
+    const user = userEvent.setup();
+    const onDismiss = vi.fn();
+    const { container } = render(
+      <PrAiSummaryCard prId="pr-42" summary={makeSummary({ prId: "pr-42" })} onDismiss={onDismiss} />,
+    );
+    await user.click(screen.getByRole("button", { name: /dismiss summary/i }));
+    expect(onDismiss).toHaveBeenCalledWith("pr-42");
+    expect(container.querySelector("[data-pr-ai-summary-card]")).toBeNull();
+    expect(sessionStorage.getItem("ade:pr-ai-summary-dismissed:pr-42")).toBe("1");
+  });
+
+  it("respects a pre-existing sessionStorage dismissal", () => {
+    sessionStorage.setItem("ade:pr-ai-summary-dismissed:pr-7", "1");
+    const { container } = render(<PrAiSummaryCard prId="pr-7" summary={makeSummary({ prId: "pr-7" })} />);
+    expect(container.querySelector("[data-pr-ai-summary-card]")).toBeNull();
+  });
+
+  it("surfaces errors from regeneration as an alert", async () => {
+    const user = userEvent.setup();
+    regenerateAiSummary.mockRejectedValueOnce(new Error("rate limited"));
+    render(<PrAiSummaryCard prId="pr-1" summary={makeSummary()} />);
+    await user.click(screen.getByRole("button", { name: /regenerate/i }));
+    await waitFor(() => {
+      expect(screen.getByRole("alert").textContent).toContain("rate limited");
+    });
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrAiSummaryCard.tsx b/apps/desktop/src/renderer/components/prs/shared/PrAiSummaryCard.tsx
new file mode 100644
index 000000000..9390e6b5d
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrAiSummaryCard.tsx
@@ -0,0 +1,254 @@
+import { memo, useCallback, useMemo, useState, type CSSProperties } from "react";
+import { ArrowClockwise, Sparkle, X } from "@phosphor-icons/react";
+
+import type { PrAiSummary } from "../../../../shared/types";
+import {
+  COLORS,
+  SANS_FONT,
+  cardStyle,
+  inlineBadge,
+  outlineButton,
+} from "../../lanes/laneDesignTokens";
+import { formatTimeAgo } from "./prFormatters";
+
+type PrAiSummaryCardProps = {
+  prId: string;
+  summary: PrAiSummary | null;
+  loading?: boolean;
+  onGenerated?: (next: PrAiSummary) => void;
+  onDismiss?: (prId: string) => void;
+  dismissed?: boolean;
+};
+
+const DISMISS_PREFIX = "ade:pr-ai-summary-dismissed:";
+
+export function isAiSummaryDismissed(prId: string): boolean {
+  try {
+    return sessionStorage.getItem(DISMISS_PREFIX + prId) === "1";
+  } catch {
+    return false;
+  }
+}
+
+function persistDismissed(prId: string, value: boolean) {
+  try {
+    if (value) sessionStorage.setItem(DISMISS_PREFIX + prId, "1");
+    else sessionStorage.removeItem(DISMISS_PREFIX + prId);
+  } catch {
+    /* ignore */
+  }
+}
+
+function Section({
+  heading,
+  items,
+  kind,
+}: {
+  heading: string;
+  items: string[];
+  kind: "risk" | "hotspot" | "concern";
+}) {
+  if (!items.length) return null;
+  const chipColor =
+    kind === "risk" ? COLORS.danger : kind === "hotspot" ? COLORS.warning : COLORS.info;
+  return (
+    <div className="flex flex-col gap-1.5">
+      <span
+        className="text-[10px] font-semibold uppercase tracking-wider"
+        style={{ color: COLORS.textMuted, fontFamily: SANS_FONT }}
+      >
+        {heading}
+      </span>
+      <div className="flex flex-wrap gap-1.5">
+        {items.map((item, idx) => (
+          <span
+            key={`${kind}-${idx}`}
+            style={inlineBadge(chipColor, { padding: "2px 8px", fontSize: 11 })}
+          >
+            {item}
+          </span>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+function Skeleton() {
+  const shimmerLine: CSSProperties = {
+    background:
+      "linear-gradient(90deg, rgba(255,255,255,0.04) 0%, rgba(255,255,255,0.08) 50%, rgba(255,255,255,0.04) 100%)",
+    backgroundSize: "200% 100%",
+    animation: "pr-ai-summary-shimmer 1.4s ease-in-out infinite",
+    borderRadius: 4,
+  };
+
+  return (
+    <div data-pr-ai-summary-skeleton className="flex flex-col gap-3">
+      <style>{`@keyframes pr-ai-summary-shimmer { 0% { background-position: 200% 0; } 100% { background-position: -200% 0; } }`}</style>
+      <div style={{ ...shimmerLine, height: 10, width: "90%" }} />
+      <div style={{ ...shimmerLine, height: 10, width: "70%" }} />
+      <div style={{ ...shimmerLine, height: 10, width: "80%" }} />
+    </div>
+  );
+}
+
+export const PrAiSummaryCard = memo(function PrAiSummaryCard({
+  prId,
+  summary,
+  loading,
+  onGenerated,
+  onDismiss,
+  dismissed,
+}: PrAiSummaryCardProps) {
+  const [busy, setBusy] = useState<"regenerate" | "generate" | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [localDismissed, setLocalDismissed] = useState(() => dismissed ?? isAiSummaryDismissed(prId));
+
+  const containerStyle = useMemo<CSSProperties>(
+    () =>
+      cardStyle({
+        padding: 16,
+        borderRadius: 12,
+        borderColor: COLORS.accentBorder,
+        background: `linear-gradient(180deg, ${COLORS.accentSubtle} 0%, rgba(255,255,255,0.03) 100%)`,
+      }),
+    [],
+  );
+
+  const handleGenerate = useCallback(async () => {
+    const bridge = window.ade?.prs?.regenerateAiSummary;
+    if (!bridge) return;
+    setBusy(summary ? "regenerate" : "generate");
+    setError(null);
+    try {
+      const next = await bridge(prId);
+      onGenerated?.(next);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setBusy(null);
+    }
+  }, [summary, prId, onGenerated]);
+
+  const handleDismiss = useCallback(() => {
+    persistDismissed(prId, true);
+    setLocalDismissed(true);
+    onDismiss?.(prId);
+  }, [prId, onDismiss]);
+
+  if (localDismissed) return null;
+
+  const headerLabel = "AI summary";
+  const timestamp = summary ? formatTimeAgo(summary.generatedAt) : null;
+
+  return (
+    <div data-pr-ai-summary-card style={containerStyle}>
+      <div className="mb-3 flex items-center gap-2">
+        <span
+          aria-hidden
+          className="inline-flex h-6 w-6 items-center justify-center rounded-[6px]"
+          style={{ background: COLORS.accentSubtle, color: COLORS.accent }}
+        >
+          <Sparkle size={12} weight="fill" />
+        </span>
+        <span
+          className="flex-1 text-[12px] font-semibold"
+          style={{ color: COLORS.textPrimary, fontFamily: SANS_FONT }}
+        >
+          {headerLabel}
+        </span>
+        {timestamp ? (
+          <span className="text-[11px]" style={{ color: COLORS.textMuted }}>
+            {timestamp}
+          </span>
+        ) : null}
+        {summary ? (
+          <button
+            type="button"
+            onClick={handleGenerate}
+            disabled={busy === "regenerate"}
+            aria-label="Regenerate summary"
+            style={outlineButton({ height: 24, fontSize: 11, padding: "0 8px" })}
+          >
+            <ArrowClockwise size={11} weight="regular" />
+            {busy === "regenerate" ? "…" : "Regenerate"}
+          </button>
+        ) : null}
+        <button
+          type="button"
+          onClick={handleDismiss}
+          aria-label="Dismiss summary"
+          className="inline-flex h-6 w-6 items-center justify-center rounded-[6px] transition-colors hover:bg-white/[0.06]"
+          style={{ color: COLORS.textMuted }}
+        >
+          <X size={12} weight="bold" />
+        </button>
+      </div>
+
+      {loading ? (
+        <Skeleton />
+      ) : summary ? (
+        <div className="flex flex-col gap-3">
+          <p
+            className="text-[12px] leading-relaxed"
+            style={{ color: COLORS.textPrimary, fontFamily: SANS_FONT }}
+          >
+            {summary.summary}
+          </p>
+          <Section heading="Risk areas" items={summary.riskAreas} kind="risk" />
+          <Section
+            heading="Reviewer hotspots"
+            items={summary.reviewerHotspots}
+            kind="hotspot"
+          />
+          <Section
+            heading="Unresolved concerns"
+            items={summary.unresolvedConcerns}
+            kind="concern"
+          />
+        </div>
+      ) : (
+        <div className="flex items-center gap-3">
+          <span
+            className="flex-1 text-[12px]"
+            style={{ color: COLORS.textMuted, fontFamily: SANS_FONT }}
+          >
+            No summary yet.
+          </span>
+          <button
+            type="button"
+            onClick={handleGenerate}
+            disabled={busy === "generate"}
+            style={outlineButton({
+              height: 28,
+              fontSize: 12,
+              color: COLORS.accent,
+              borderColor: COLORS.accentBorder,
+              background: COLORS.accentSubtle,
+            })}
+          >
+            <Sparkle size={12} weight="fill" />
+            {busy === "generate" ? "Generating…" : "Generate summary"}
+          </button>
+        </div>
+      )}
+
+      {error ? (
+        <div
+          role="alert"
+          className="mt-3 rounded-[6px] border px-3 py-2 text-[11px]"
+          style={{
+            borderColor: `${COLORS.danger}40`,
+            background: `${COLORS.danger}10`,
+            color: COLORS.danger,
+            fontFamily: SANS_FONT,
+          }}
+        >
+          {error}
+        </div>
+      ) : null}
+    </div>
+  );
+});
+
+export default PrAiSummaryCard;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrBotReviewCard.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrBotReviewCard.test.tsx
new file mode 100644
index 000000000..bfc0697bb
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrBotReviewCard.test.tsx
@@ -0,0 +1,108 @@
+// @vitest-environment jsdom
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+
+import type { PrReview } from "../../../../shared/types";
+import { PrBotReviewCard, detectBotProvider } from "./PrBotReviewCard";
+
+vi.mock("../../chat/CodeHighlighter.tsx", () => ({
+  HighlightedCode: ({ code }: { code: string }) => <pre>{code}</pre>,
+}));
+
+const BASE: Pick<PrReview, "state" | "submittedAt"> & { reviewerAvatarUrl: string | null } = {
+  state: "commented",
+  submittedAt: "2026-04-14T10:00:00.000Z",
+  reviewerAvatarUrl: null,
+};
+
+function makeReview(overrides: Partial<PrReview> = {}): PrReview {
+  return {
+    reviewer: "greptile-apps[bot]",
+    body: "Looks good overall.",
+    ...BASE,
+    ...overrides,
+  };
+}
+
+beforeEach(() => {
+  (window as unknown as { ade?: unknown }).ade = { app: { openExternal: vi.fn() } };
+});
+
+afterEach(() => {
+  cleanup();
+  delete (window as unknown as { ade?: unknown }).ade;
+});
+
+describe("detectBotProvider", () => {
+  it("identifies greptile, seer, coderabbit, claude, sourcery logins", () => {
+    expect(detectBotProvider("greptile-apps[bot]")).toBe("greptile");
+    expect(detectBotProvider("seer-by-sentry")).toBe("seer");
+    expect(detectBotProvider("coderabbitai[bot]")).toBe("coderabbit");
+    expect(detectBotProvider("claude-reviewer")).toBe("claude");
+    expect(detectBotProvider("sourcery-ai[bot]")).toBe("sourcery");
+  });
+
+  it("returns null for human logins", () => {
+    expect(detectBotProvider("octocat")).toBeNull();
+    expect(detectBotProvider("")).toBeNull();
+  });
+});
+
+describe("PrBotReviewCard", () => {
+  it("starts collapsed and toggles open on click", () => {
+    render(
+      <PrBotReviewCard review={makeReview({ body: "Hidden body" })} repoOwner="acme" repoName="ade" />,
+    );
+    const toggle = screen.getByRole("button", { name: /greptile/i });
+    expect(toggle.getAttribute("aria-expanded")).toBe("false");
+    expect(screen.queryByText(/hidden body/i)).toBeNull();
+
+    fireEvent.click(toggle);
+    expect(toggle.getAttribute("aria-expanded")).toBe("true");
+    expect(screen.getByText(/hidden body/i)).toBeTruthy();
+  });
+
+  it("shows severity badges parsed from the body", () => {
+    render(
+      <PrBotReviewCard
+        review={makeReview({
+          reviewer: "seer-by-sentry",
+          body: "Found one P0 crash and one P2 code smell.",
+        })}
+        repoOwner="acme"
+        repoName="ade"
+      />,
+    );
+    expect(screen.getByText("P0")).toBeTruthy();
+    expect(screen.getByText("P2")).toBeTruthy();
+  });
+
+  it("extracts confidence and issue count in the summary line", () => {
+    render(
+      <PrBotReviewCard
+        review={makeReview({
+          reviewer: "coderabbitai[bot]",
+          body: "Confidence: High — 3 issues found.",
+        })}
+        repoOwner="acme"
+        repoName="ade"
+      />,
+    );
+    expect(screen.getByText(/coderabbit/i)).toBeTruthy();
+    expect(screen.getAllByText(/High/).length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByText(/3 issues/i).length).toBeGreaterThanOrEqual(1);
+  });
+
+  it("sets data-provider for unknown reviewers to 'unknown'", () => {
+    const { container } = render(
+      <PrBotReviewCard
+        review={makeReview({ reviewer: "octocat" })}
+        repoOwner="acme"
+        repoName="ade"
+      />,
+    );
+    const card = container.querySelector("[data-pr-bot-review-card]");
+    expect(card?.getAttribute("data-provider")).toBe("unknown");
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrBotReviewCard.tsx b/apps/desktop/src/renderer/components/prs/shared/PrBotReviewCard.tsx
new file mode 100644
index 000000000..1fea922e6
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrBotReviewCard.tsx
@@ -0,0 +1,187 @@
+import { memo, useMemo, useState, type CSSProperties } from "react";
+import { CaretRight, Robot } from "@phosphor-icons/react";
+
+import type { PrReview } from "../../../../shared/types";
+import { COLORS, SANS_FONT, cardStyle, inlineBadge } from "../../lanes/laneDesignTokens";
+import { formatTimeAgo } from "./prFormatters";
+import { PrMarkdown } from "./PrMarkdown";
+
+export type BotProvider = "greptile" | "seer" | "coderabbit" | "claude" | "sourcery";
+
+type ProviderVisual = {
+  label: string;
+  accent: string;
+  initial: string;
+};
+
+const PROVIDERS: Record<BotProvider, ProviderVisual> = {
+  greptile: { label: "Greptile", accent: COLORS.success, initial: "G" },
+  seer: { label: "Seer", accent: COLORS.accent, initial: "S" },
+  coderabbit: { label: "CodeRabbit", accent: COLORS.entryCli, initial: "R" },
+  claude: { label: "Claude", accent: COLORS.info, initial: "C" },
+  sourcery: { label: "Sourcery", accent: COLORS.warning, initial: "Y" },
+};
+
+const DETECTION_PATTERNS: Array<{ provider: BotProvider; test: (login: string) => boolean }> = [
+  { provider: "greptile", test: (l) => l.startsWith("greptile") },
+  { provider: "seer", test: (l) => l.startsWith("seer") || l.includes("seer-by-sentry") },
+  { provider: "coderabbit", test: (l) => l.startsWith("coderabbit") },
+  { provider: "claude", test: (l) => l === "claude" || l.startsWith("claude-") || l.startsWith("anthropic-") },
+  { provider: "sourcery", test: (l) => l.startsWith("sourcery") },
+];
+
+export function detectBotProvider(authorLogin: string): BotProvider | null {
+  if (!authorLogin) return null;
+  const normalized = authorLogin.toLowerCase().replace(/\[bot\]$/, "");
+  for (const { provider, test } of DETECTION_PATTERNS) {
+    if (test(normalized)) return provider;
+  }
+  return null;
+}
+
+type Severity = "P0" | "P1" | "P2" | "High" | "Medium" | "Low";
+
+const SEVERITY_COLORS: Record<Severity, string> = {
+  P0: COLORS.danger,
+  P1: COLORS.warning,
+  P2: COLORS.textSecondary,
+  High: COLORS.danger,
+  Medium: COLORS.warning,
+  Low: COLORS.textSecondary,
+};
+
+function extractSeverities(body: string): Severity[] {
+  const found = new Set<Severity>();
+  const re = /\b(P[012]|High|Medium|Low)\b/g;
+  let match: RegExpExecArray | null;
+  while ((match = re.exec(body)) !== null) {
+    found.add(match[1] as Severity);
+  }
+  return Array.from(found);
+}
+
+function extractIssueCount(body: string): number | null {
+  const match = body.match(/(\d+)\s+(?:issues?|findings?|comments?)/i);
+  return match ? Number(match[1]) : null;
+}
+
+function extractConfidence(body: string): string | null {
+  const match = body.match(/confidence[:\s]+(high|medium|low|\d+%)/i);
+  return match ? match[1] : null;
+}
+
+type PrBotReviewCardProps = {
+  review: PrReview;
+  repoOwner: string;
+  repoName: string;
+  defaultOpen?: boolean;
+};
+
+export const PrBotReviewCard = memo(function PrBotReviewCard({
+  review,
+  repoOwner,
+  repoName,
+  defaultOpen = false,
+}: PrBotReviewCardProps) {
+  const [open, setOpen] = useState(defaultOpen);
+
+  const provider = useMemo(() => detectBotProvider(review.reviewer), [review.reviewer]);
+  const visual = provider ? PROVIDERS[provider] : null;
+  const accent = visual?.accent ?? COLORS.textSecondary;
+  const body = review.body ?? "";
+
+  const severities = useMemo(() => extractSeverities(body), [body]);
+  const issueCount = useMemo(() => extractIssueCount(body), [body]);
+  const confidence = useMemo(() => extractConfidence(body), [body]);
+
+  const summaryParts: string[] = [visual?.label ?? review.reviewer];
+  if (confidence) summaryParts.push(confidence);
+  if (issueCount !== null) summaryParts.push(`${issueCount} ${issueCount === 1 ? "issue" : "issues"}`);
+
+  const containerStyle: CSSProperties = cardStyle({
+    padding: 0,
+    borderRadius: 12,
+    borderLeft: `3px solid ${accent}`,
+    overflow: "hidden",
+  });
+
+  return (
+    <div
+      data-pr-bot-review-card
+      data-provider={provider ?? "unknown"}
+      style={containerStyle}
+    >
+      <button
+        type="button"
+        onClick={() => setOpen((v) => !v)}
+        aria-expanded={open}
+        className="flex w-full items-center gap-3 px-4 py-3 text-left transition-colors hover:bg-white/[0.04]"
+        style={{ fontFamily: SANS_FONT, color: COLORS.textPrimary }}
+      >
+        <span
+          aria-hidden
+          className="flex h-6 w-6 shrink-0 items-center justify-center rounded-[6px] text-[11px] font-semibold"
+          style={{
+            background: `${accent}18`,
+            color: accent,
+            border: `1px solid ${accent}30`,
+          }}
+        >
+          {visual ? visual.initial : <Robot size={12} weight="bold" />}
+        </span>
+        <div className="flex min-w-0 flex-1 flex-col gap-0.5">
+          <div className="flex items-center gap-2 text-[12px] font-medium">
+            <span className="truncate" style={{ color: COLORS.textPrimary }}>
+              {summaryParts.join(" · ")}
+            </span>
+            {severities.map((sev) => (
+              <span
+                key={sev}
+                style={inlineBadge(SEVERITY_COLORS[sev], {
+                  padding: "1px 6px",
+                  fontSize: 10,
+                  fontWeight: 600,
+                  letterSpacing: 0.2,
+                })}
+              >
+                {sev}
+              </span>
+            ))}
+          </div>
+          <span className="text-[11px]" style={{ color: COLORS.textMuted }}>
+            {formatTimeAgo(review.submittedAt)}
+          </span>
+        </div>
+        <CaretRight
+          size={12}
+          weight="bold"
+          className="shrink-0 transition-transform"
+          style={{
+            transform: open ? "rotate(90deg)" : "rotate(0deg)",
+            color: COLORS.textSecondary,
+          }}
+        />
+      </button>
+      {open && body ? (
+        <div
+          className="border-t px-4 py-3"
+          style={{ borderColor: COLORS.border, background: "rgba(255,255,255,0.01)" }}
+        >
+          <PrMarkdown repoOwner={repoOwner} repoName={repoName} dense>
+            {body}
+          </PrMarkdown>
+        </div>
+      ) : null}
+      {open && !body ? (
+        <div
+          className="border-t px-4 py-3 text-[12px]"
+          style={{ borderColor: COLORS.border, color: COLORS.textMuted, fontFamily: SANS_FONT }}
+        >
+          No review body.
+        </div>
+      ) : null}
+    </div>
+  );
+});
+
+export default PrBotReviewCard;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrCheckLogDrawer.tsx b/apps/desktop/src/renderer/components/prs/shared/PrCheckLogDrawer.tsx
new file mode 100644
index 000000000..398424b23
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrCheckLogDrawer.tsx
@@ -0,0 +1,131 @@
+import { memo, useCallback, useEffect } from "react";
+import { ArrowSquareOut, X } from "@phosphor-icons/react";
+
+import type { PrCheck } from "../../../../shared/types/prs";
+import { COLORS, MONO_FONT } from "../../lanes/laneDesignTokens";
+import { healthColor } from "../../lanes/laneDesignTokens";
+
+function openExternalUrl(url: string | undefined | null) {
+  if (!url) return;
+  const bridge = typeof window !== "undefined" ? window.ade?.app?.openExternal : undefined;
+  if (bridge) void bridge(url).catch(() => {});
+}
+
+function checkDotColor(check: PrCheck): string {
+  if (check.status !== "completed") return COLORS.warning;
+  switch (check.conclusion) {
+    case "success":
+      return healthColor("healthy");
+    case "failure":
+    case "cancelled":
+      return healthColor("unhealthy");
+    case "neutral":
+    case "skipped":
+      return COLORS.textDim;
+    default:
+      return COLORS.textMuted;
+  }
+}
+
+export type PrCheckLogDrawerProps = {
+  check: PrCheck | null;
+  onClose: () => void;
+};
+
+export const PrCheckLogDrawer = memo(function PrCheckLogDrawer({
+  check,
+  onClose,
+}: PrCheckLogDrawerProps) {
+  useEffect(() => {
+    if (!check) return;
+    const handler = (event: KeyboardEvent) => {
+      if (event.key === "Escape") onClose();
+    };
+    window.addEventListener("keydown", handler);
+    return () => window.removeEventListener("keydown", handler);
+  }, [check, onClose]);
+
+  const handleOpenExternal = useCallback(() => {
+    if (!check?.detailsUrl) return;
+    openExternalUrl(check.detailsUrl);
+  }, [check]);
+
+  if (!check) return null;
+
+  return (
+    <div
+      role="dialog"
+      aria-label={`Logs for ${check.name}`}
+      data-testid="pr-check-log-drawer"
+      className="absolute inset-y-0 right-0 z-20 flex w-[380px] max-w-full flex-col"
+      style={{
+        background: COLORS.cardBgSolid,
+        borderLeft: `1px solid ${COLORS.border}`,
+        boxShadow: "-12px 0 32px rgba(0,0,0,0.35)",
+      }}
+    >
+      <div
+        className="flex items-center gap-2 px-3"
+        style={{ borderBottom: `1px solid ${COLORS.border}`, height: 40 }}
+      >
+        <span
+          className="inline-block h-2 w-2 shrink-0 rounded-full"
+          style={{ background: checkDotColor(check) }}
+        />
+        <div className="min-w-0 flex-1 truncate text-[12px]" style={{ color: COLORS.textPrimary }}>
+          {check.name}
+        </div>
+        <button
+          type="button"
+          onClick={onClose}
+          aria-label="Close log drawer"
+          className="p-1 transition-colors"
+          style={{ color: COLORS.textMuted }}
+        >
+          <X size={14} weight="regular" />
+        </button>
+      </div>
+
+      <div className="flex-1 overflow-auto p-3">
+        <div
+          className="text-[10px] uppercase tracking-[0.8px]"
+          style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+        >
+          Logs
+        </div>
+        <pre
+          className="mt-1.5 whitespace-pre-wrap break-words rounded-[4px] p-2 text-[11px] leading-[1.5]"
+          style={{
+            fontFamily: MONO_FONT,
+            color: COLORS.textSecondary,
+            background: "rgba(0,0,0,0.35)",
+            border: `1px solid ${COLORS.border}`,
+          }}
+        >
+          Inline log preview isn’t wired up yet. Use “Open full logs” to view the
+          complete run on GitHub.
+        </pre>
+      </div>
+
+      <div className="p-3" style={{ borderTop: `1px solid ${COLORS.border}` }}>
+        <button
+          type="button"
+          onClick={handleOpenExternal}
+          disabled={!check.detailsUrl}
+          className="inline-flex h-8 w-full items-center justify-center gap-2 text-[12px] font-medium transition-colors"
+          style={{
+            color: check.detailsUrl ? COLORS.accent : COLORS.textDim,
+            background: check.detailsUrl ? COLORS.accentSubtle : "transparent",
+            border: `1px solid ${check.detailsUrl ? COLORS.accentBorder : COLORS.border}`,
+            cursor: check.detailsUrl ? "pointer" : "not-allowed",
+          }}
+        >
+          Open full logs
+          <ArrowSquareOut size={12} weight="regular" />
+        </button>
+      </div>
+    </div>
+  );
+});
+
+export default PrCheckLogDrawer;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrCommandPalettes.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrCommandPalettes.test.tsx
new file mode 100644
index 000000000..0de664a24
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrCommandPalettes.test.tsx
@@ -0,0 +1,108 @@
+// @vitest-environment jsdom
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+
+import { PrCommandPalettes } from "./PrCommandPalettes";
+
+afterEach(cleanup);
+
+const COMMITS = [
+  { sha: "aaaaaaa", subject: "Add feature", author: "alice" },
+  { sha: "bbbbbbb", subject: "Fix bug", author: "bob" },
+  { sha: "ccccccc", subject: "Refactor types", author: "carol" },
+];
+
+const THREADS = [
+  { id: "t1", path: "src/app.ts", line: 12, resolved: false, firstCommentAuthor: "alice" },
+  { id: "t2", path: "src/util.ts", line: 8, resolved: true, firstCommentAuthor: "bob" },
+];
+
+const FILES = [
+  { path: "src/app.ts", additions: 20, deletions: 2 },
+  { path: "src/util.ts", additions: 3, deletions: 1 },
+  { path: "README.md", additions: 5, deletions: 5 },
+];
+
+describe("PrCommandPalettes", () => {
+  it("does not render when open is null", () => {
+    render(
+      <PrCommandPalettes
+        open={null}
+        onClose={() => {}}
+        commits={COMMITS}
+        threads={THREADS}
+        files={FILES}
+        onPickCommit={() => {}}
+        onPickThread={() => {}}
+        onPickFile={() => {}}
+      />,
+    );
+    expect(screen.queryByTestId("pr-command-palette-input")).toBeNull();
+  });
+
+  it("fuzzy-filters commits by query and picks on Enter", () => {
+    const onPickCommit = vi.fn();
+    render(
+      <PrCommandPalettes
+        open="commit"
+        onClose={() => {}}
+        commits={COMMITS}
+        threads={THREADS}
+        files={FILES}
+        onPickCommit={onPickCommit}
+        onPickThread={() => {}}
+        onPickFile={() => {}}
+      />,
+    );
+    const input = screen.getByTestId("pr-command-palette-input") as HTMLInputElement;
+    fireEvent.change(input, { target: { value: "ft" } });
+    // fuzzy "ft" matches "Refactor" and "Fix bug" (both contain f…t)
+    const rows = screen.getAllByRole("button").filter((b) => b.hasAttribute("aria-current"));
+    expect(rows.length).toBeGreaterThan(0);
+    fireEvent.keyDown(input, { key: "Enter" });
+    expect(onPickCommit).toHaveBeenCalled();
+  });
+
+  it("calls onClose and onPickFile when a file row is clicked", () => {
+    const onClose = vi.fn();
+    const onPickFile = vi.fn();
+    render(
+      <PrCommandPalettes
+        open="file"
+        onClose={onClose}
+        commits={COMMITS}
+        threads={THREADS}
+        files={FILES}
+        onPickCommit={() => {}}
+        onPickThread={() => {}}
+        onPickFile={onPickFile}
+      />,
+    );
+    fireEvent.click(screen.getByText("README.md"));
+    expect(onPickFile).toHaveBeenCalledWith("README.md");
+    expect(onClose).toHaveBeenCalled();
+  });
+
+  it("cycles selection with ArrowDown / ArrowUp", () => {
+    render(
+      <PrCommandPalettes
+        open="commit"
+        onClose={() => {}}
+        commits={COMMITS}
+        threads={THREADS}
+        files={FILES}
+        onPickCommit={() => {}}
+        onPickThread={() => {}}
+        onPickFile={() => {}}
+      />,
+    );
+    const input = screen.getByTestId("pr-command-palette-input") as HTMLInputElement;
+    fireEvent.keyDown(input, { key: "ArrowDown" });
+    fireEvent.keyDown(input, { key: "ArrowDown" });
+    const selected = screen
+      .getAllByRole("button")
+      .filter((b) => b.getAttribute("aria-current") === "true");
+    expect(selected).toHaveLength(1);
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrCommandPalettes.tsx b/apps/desktop/src/renderer/components/prs/shared/PrCommandPalettes.tsx
new file mode 100644
index 000000000..79f238952
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrCommandPalettes.tsx
@@ -0,0 +1,286 @@
+import {
+  memo,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type KeyboardEvent as ReactKeyboardEvent,
+} from "react";
+import * as Dialog from "@radix-ui/react-dialog";
+import { MagnifyingGlass } from "@phosphor-icons/react";
+
+import { COLORS, MONO_FONT } from "../../lanes/laneDesignTokens";
+
+export type PaletteKind = "commit" | "thread" | "file";
+
+export type PaletteCommit = { sha: string; subject: string; author: string };
+export type PaletteThread = {
+  id: string;
+  path: string | null;
+  line: number | null;
+  resolved: boolean;
+  firstCommentAuthor: string | null;
+};
+export type PaletteFile = { path: string; additions: number; deletions: number };
+
+export type PrCommandPalettesProps = {
+  open: PaletteKind | null;
+  onClose: () => void;
+  commits: PaletteCommit[];
+  threads: PaletteThread[];
+  files: PaletteFile[];
+  onPickCommit: (sha: string) => void;
+  onPickThread: (id: string) => void;
+  onPickFile: (path: string) => void;
+};
+
+type PaletteItem = { id: string; primary: string; secondary: string };
+
+function fuzzyMatch(haystack: string, needle: string): boolean {
+  if (!needle) return true;
+  const h = haystack.toLowerCase();
+  const n = needle.toLowerCase();
+  let hi = 0;
+  for (let ni = 0; ni < n.length; ni += 1) {
+    const ch = n[ni]!;
+    while (hi < h.length && h[hi] !== ch) hi += 1;
+    if (hi >= h.length) return false;
+    hi += 1;
+  }
+  return true;
+}
+
+function paletteTitle(kind: PaletteKind): string {
+  if (kind === "commit") return "Jump to commit";
+  if (kind === "thread") return "Jump to review thread";
+  return "Jump to file";
+}
+
+function placeholder(kind: PaletteKind): string {
+  if (kind === "commit") return "Search commits by SHA, subject, author…";
+  if (kind === "thread") return "Search review threads by path, author, excerpt…";
+  return "Search files in this PR…";
+}
+
+function buildItems(
+  kind: PaletteKind,
+  commits: PaletteCommit[],
+  threads: PaletteThread[],
+  files: PaletteFile[],
+): PaletteItem[] {
+  if (kind === "commit") {
+    return commits.map((c) => ({
+      id: c.sha,
+      primary: c.subject,
+      secondary: `${c.sha.slice(0, 7)} · ${c.author}`,
+    }));
+  }
+  if (kind === "thread") {
+    return threads.map((t) => ({
+      id: t.id,
+      primary:
+        (t.path ?? "(no file)") +
+        (t.line != null ? `:${t.line}` : "") +
+        (t.resolved ? " · resolved" : ""),
+      secondary: t.firstCommentAuthor ?? "unknown",
+    }));
+  }
+  return files.map((f) => ({
+    id: f.path,
+    primary: f.path,
+    secondary: `+${f.additions} −${f.deletions}`,
+  }));
+}
+
+export const PrCommandPalettes = memo(function PrCommandPalettes({
+  open,
+  onClose,
+  commits,
+  threads,
+  files,
+  onPickCommit,
+  onPickThread,
+  onPickFile,
+}: PrCommandPalettesProps) {
+  const [query, setQuery] = useState("");
+  const [selectedIdx, setSelectedIdx] = useState(0);
+  const listRef = useRef<HTMLUListElement>(null);
+
+  useEffect(() => {
+    setQuery("");
+    setSelectedIdx(0);
+  }, [open]);
+
+  const items = useMemo(() => {
+    if (!open) return [];
+    return buildItems(open, commits, threads, files);
+  }, [open, commits, threads, files]);
+
+  const filtered = useMemo(() => {
+    const q = query.trim();
+    if (!q) return items;
+    return items.filter(
+      (item) => fuzzyMatch(item.primary, q) || fuzzyMatch(item.secondary, q),
+    );
+  }, [items, query]);
+
+  useEffect(() => {
+    if (selectedIdx >= filtered.length) {
+      setSelectedIdx(Math.max(0, filtered.length - 1));
+    }
+  }, [filtered.length, selectedIdx]);
+
+  const pick = useCallback(
+    (id: string) => {
+      if (!open) return;
+      if (open === "commit") onPickCommit(id);
+      else if (open === "thread") onPickThread(id);
+      else onPickFile(id);
+      onClose();
+    },
+    [open, onClose, onPickCommit, onPickThread, onPickFile],
+  );
+
+  const handleKeyDown = useCallback(
+    (event: ReactKeyboardEvent<HTMLInputElement>) => {
+      if (event.key === "ArrowDown") {
+        event.preventDefault();
+        setSelectedIdx((prev) => (filtered.length === 0 ? 0 : (prev + 1) % filtered.length));
+      } else if (event.key === "ArrowUp") {
+        event.preventDefault();
+        setSelectedIdx((prev) =>
+          filtered.length === 0 ? 0 : (prev - 1 + filtered.length) % filtered.length,
+        );
+      } else if (event.key === "Enter") {
+        event.preventDefault();
+        const item = filtered[selectedIdx];
+        if (item) pick(item.id);
+      }
+    },
+    [filtered, selectedIdx, pick],
+  );
+
+  useEffect(() => {
+    if (!listRef.current) return;
+    const rows = listRef.current.querySelectorAll<HTMLLIElement>("[data-palette-row]");
+    const row = rows[selectedIdx];
+    if (row && typeof row.scrollIntoView === "function") {
+      row.scrollIntoView({ block: "nearest" });
+    }
+  }, [selectedIdx]);
+
+  return (
+    <Dialog.Root
+      open={open !== null}
+      onOpenChange={(next) => {
+        if (!next) onClose();
+      }}
+    >
+      <Dialog.Portal>
+        <Dialog.Overlay
+          className="fixed inset-0"
+          style={{ background: "rgba(0,0,0,0.45)", backdropFilter: "blur(4px)" }}
+        />
+        <Dialog.Content
+          onOpenAutoFocus={(e) => e.preventDefault()}
+          className="fixed left-1/2 top-[16%] flex w-[520px] max-w-[90vw] -translate-x-1/2 flex-col outline-none"
+          style={{
+            background: COLORS.cardBgSolid,
+            border: `1px solid ${COLORS.border}`,
+            boxShadow: "0 24px 48px -12px rgba(0,0,0,0.6)",
+          }}
+          aria-label={open ? paletteTitle(open) : undefined}
+        >
+          <Dialog.Title className="sr-only">
+            {open ? paletteTitle(open) : "Command palette"}
+          </Dialog.Title>
+          <Dialog.Description className="sr-only">
+            Type to fuzzy-search. Press Enter to select, Esc to dismiss.
+          </Dialog.Description>
+
+          <div
+            className="flex items-center gap-2 px-3"
+            style={{
+              borderBottom: `1px solid ${COLORS.border}`,
+              background: COLORS.recessedBg,
+            }}
+          >
+            <MagnifyingGlass size={14} weight="regular" style={{ color: COLORS.textMuted }} />
+            <input
+              autoFocus
+              value={query}
+              onChange={(e) => {
+                setQuery(e.target.value);
+                setSelectedIdx(0);
+              }}
+              onKeyDown={handleKeyDown}
+              placeholder={open ? placeholder(open) : ""}
+              className="h-10 w-full bg-transparent text-[13px] outline-none"
+              style={{
+                color: COLORS.textPrimary,
+                fontFamily: MONO_FONT,
+              }}
+              data-testid="pr-command-palette-input"
+            />
+          </div>
+
+          <div className="max-h-[360px] overflow-y-auto">
+            {filtered.length === 0 ? (
+              <div
+                className="px-3 py-6 text-[12px]"
+                style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+              >
+                No matches.
+              </div>
+            ) : (
+              <ul ref={listRef} data-testid="pr-command-palette-list">
+                {filtered.map((item, idx) => {
+                  const selected = idx === selectedIdx;
+                  return (
+                    <li key={item.id} data-palette-row data-palette-id={item.id}>
+                      <button
+                        type="button"
+                        onClick={() => pick(item.id)}
+                        onMouseEnter={() => setSelectedIdx(idx)}
+                        className="flex w-full flex-col items-start gap-0.5 px-3 py-2 text-left transition-colors"
+                        style={
+                          selected
+                            ? {
+                                background: COLORS.accentSubtle,
+                                borderLeft: `3px solid ${COLORS.accent}`,
+                                paddingLeft: 9,
+                              }
+                            : {
+                                borderLeft: "3px solid transparent",
+                                paddingLeft: 9,
+                              }
+                        }
+                        aria-current={selected ? "true" : undefined}
+                      >
+                        <span
+                          className="max-w-full truncate text-[12px]"
+                          style={{ color: COLORS.textPrimary }}
+                        >
+                          {item.primary}
+                        </span>
+                        <span
+                          className="max-w-full truncate text-[10px]"
+                          style={{ color: COLORS.textMuted, fontFamily: MONO_FONT }}
+                        >
+                          {item.secondary}
+                        </span>
+                      </button>
+                    </li>
+                  );
+                })}
+              </ul>
+            )}
+          </div>
+        </Dialog.Content>
+      </Dialog.Portal>
+    </Dialog.Root>
+  );
+});
+
+export default PrCommandPalettes;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrCommitRail.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrCommitRail.test.tsx
new file mode 100644
index 000000000..e98187ac3
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrCommitRail.test.tsx
@@ -0,0 +1,74 @@
+// @vitest-environment jsdom
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+
+import { PrCommitRail, type PrCommitRailCommit } from "./PrCommitRail";
+
+afterEach(cleanup);
+
+function makeCommit(overrides: Partial<PrCommitRailCommit> = {}): PrCommitRailCommit {
+  return {
+    sha: "a".repeat(40),
+    shortSha: "aaaaaaa",
+    subject: "Initial commit",
+    author: "alice",
+    authoredAt: new Date().toISOString(),
+    threadCount: 0,
+    resolvedCount: 0,
+    ...overrides,
+  };
+}
+
+describe("PrCommitRail", () => {
+  it("renders each commit and fires onSelectCommit on click", () => {
+    const commits = [
+      makeCommit({ sha: "1".repeat(40), shortSha: "1111111", subject: "one" }),
+      makeCommit({ sha: "2".repeat(40), shortSha: "2222222", subject: "two" }),
+    ];
+    const onSelect = vi.fn();
+    render(
+      <PrCommitRail
+        commits={commits}
+        activeSha={null}
+        onSelectCommit={onSelect}
+      />,
+    );
+    fireEvent.click(screen.getByText("two"));
+    expect(onSelect).toHaveBeenCalledWith("2".repeat(40));
+  });
+
+  it("highlights the active commit with aria-current", () => {
+    const commits = [
+      makeCommit({ sha: "a".repeat(40), shortSha: "aaaaaaa", subject: "alpha" }),
+      makeCommit({ sha: "b".repeat(40), shortSha: "bbbbbbb", subject: "beta" }),
+    ];
+    render(
+      <PrCommitRail
+        commits={commits}
+        activeSha={"b".repeat(40)}
+        onSelectCommit={() => {}}
+      />,
+    );
+    const rows = screen.getAllByTestId("pr-commit-rail-row");
+    expect(rows[0]!.getAttribute("aria-current")).toBeNull();
+    expect(rows[1]!.getAttribute("aria-current")).toBe("true");
+  });
+
+  it("filters to bot-touched commits when Bots pill is selected", () => {
+    const commits = [
+      makeCommit({ sha: "1".repeat(40), subject: "human", author: "alice" }),
+      makeCommit({ sha: "2".repeat(40), subject: "byebot", author: "renovate[bot]" }),
+    ];
+    render(
+      <PrCommitRail
+        commits={commits}
+        activeSha={null}
+        onSelectCommit={() => {}}
+      />,
+    );
+    fireEvent.click(screen.getByRole("button", { name: "Bots" }));
+    expect(screen.queryByText("human")).toBeNull();
+    expect(screen.getByText("byebot")).toBeTruthy();
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrCommitRail.tsx b/apps/desktop/src/renderer/components/prs/shared/PrCommitRail.tsx
new file mode 100644
index 000000000..6d6bdbaef
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrCommitRail.tsx
@@ -0,0 +1,286 @@
+import { memo, useMemo, useRef, useState, type CSSProperties } from "react";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { GitCommit } from "@phosphor-icons/react";
+
+import { COLORS, MONO_FONT } from "../../lanes/laneDesignTokens";
+import { relativeWhen } from "../../../lib/format";
+
+export type PrCommitRailCommit = {
+  sha: string;
+  shortSha: string;
+  subject: string;
+  author: string;
+  authoredAt: string;
+  threadCount: number;
+  resolvedCount: number;
+};
+
+type CommitFilter = "all" | "mine" | "bots";
+
+export type PrCommitRailProps = {
+  commits: PrCommitRailCommit[];
+  activeSha: string | null;
+  viewerLogin?: string | null;
+  onSelectCommit: (sha: string) => void;
+};
+
+const BOT_SUFFIXES = ["[bot]", "-bot"];
+
+function looksLikeBot(author: string): boolean {
+  const lower = author.toLowerCase();
+  return BOT_SUFFIXES.some((suffix) => lower.endsWith(suffix)) || lower === "github-actions";
+}
+
+function commitMatchesFilter(
+  commit: PrCommitRailCommit,
+  filter: CommitFilter,
+  viewerLogin: string | null | undefined,
+): boolean {
+  if (filter === "all") return true;
+  if (filter === "mine") {
+    if (!viewerLogin) return false;
+    return commit.author.toLowerCase() === viewerLogin.toLowerCase();
+  }
+  return looksLikeBot(commit.author);
+}
+
+const VIRTUALIZE_AT = 50;
+
+export const PrCommitRail = memo(function PrCommitRail({
+  commits,
+  activeSha,
+  viewerLogin,
+  onSelectCommit,
+}: PrCommitRailProps) {
+  const [filter, setFilter] = useState<CommitFilter>("all");
+
+  const filtered = useMemo(
+    () => commits.filter((c) => commitMatchesFilter(c, filter, viewerLogin)),
+    [commits, filter, viewerLogin],
+  );
+
+  const shouldVirtualize = filtered.length > VIRTUALIZE_AT;
+
+  return (
+    <div
+      data-testid="pr-commit-rail"
+      className="flex h-full w-full flex-col"
+      style={{ background: COLORS.cardBg, borderRight: `1px solid ${COLORS.border}` }}
+    >
+      <div
+        className="flex items-center gap-1 px-2.5"
+        style={{ borderBottom: `1px solid ${COLORS.border}`, height: 36 }}
+      >
+        <GitCommit size={12} weight="bold" style={{ color: COLORS.textMuted }} />
+        <span
+          className="text-[10px] font-bold uppercase tracking-[1px]"
+          style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+        >
+          Commits
+        </span>
+        <span
+          className="ml-auto text-[10px]"
+          style={{ color: COLORS.textMuted, fontFamily: MONO_FONT }}
+        >
+          {filtered.length}
+        </span>
+      </div>
+
+      <div
+        className="flex items-center gap-0.5 p-1.5"
+        style={{ borderBottom: `1px solid ${COLORS.border}` }}
+      >
+        <FilterPill label="All" value="all" current={filter} onChange={setFilter} />
+        <FilterPill label="Mine" value="mine" current={filter} onChange={setFilter} />
+        <FilterPill label="Bots" value="bots" current={filter} onChange={setFilter} />
+      </div>
+
+      <div className="min-h-0 flex-1 overflow-hidden">
+        {filtered.length === 0 ? (
+          <div
+            className="px-3 py-4 text-[11px]"
+            style={{ color: COLORS.textDim }}
+          >
+            No commits match this filter.
+          </div>
+        ) : shouldVirtualize ? (
+          <VirtualizedCommitList
+            commits={filtered}
+            activeSha={activeSha}
+            onSelectCommit={onSelectCommit}
+          />
+        ) : (
+          <div className="h-full overflow-y-auto">
+            {filtered.map((commit) => (
+              <CommitRow
+                key={commit.sha}
+                commit={commit}
+                isActive={commit.sha === activeSha}
+                onSelect={onSelectCommit}
+              />
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+});
+
+function FilterPill({
+  label,
+  value,
+  current,
+  onChange,
+}: {
+  label: string;
+  value: CommitFilter;
+  current: CommitFilter;
+  onChange: (next: CommitFilter) => void;
+}) {
+  const active = current === value;
+  const style: CSSProperties = active
+    ? {
+        background: COLORS.accentSubtle,
+        border: `1px solid ${COLORS.accentBorder}`,
+        color: COLORS.accent,
+      }
+    : {
+        background: "transparent",
+        border: `1px solid transparent`,
+        color: COLORS.textMuted,
+      };
+  return (
+    <button
+      type="button"
+      onClick={() => onChange(value)}
+      className="h-6 px-2 text-[11px] font-medium transition-colors"
+      style={style}
+      aria-pressed={active}
+    >
+      {label}
+    </button>
+  );
+}
+
+function VirtualizedCommitList({
+  commits,
+  activeSha,
+  onSelectCommit,
+}: {
+  commits: PrCommitRailCommit[];
+  activeSha: string | null;
+  onSelectCommit: (sha: string) => void;
+}) {
+  const parentRef = useRef<HTMLDivElement>(null);
+  const virtualizer = useVirtualizer({
+    count: commits.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 58,
+    overscan: 6,
+  });
+  return (
+    <div
+      ref={parentRef}
+      data-testid="pr-commit-rail-virtual"
+      className="h-full overflow-y-auto"
+    >
+      <div style={{ height: virtualizer.getTotalSize(), position: "relative" }}>
+        {virtualizer.getVirtualItems().map((virtualRow) => {
+          const commit = commits[virtualRow.index]!;
+          return (
+            <div
+              key={commit.sha}
+              data-index={virtualRow.index}
+              ref={virtualizer.measureElement}
+              style={{
+                position: "absolute",
+                top: 0,
+                left: 0,
+                width: "100%",
+                transform: `translateY(${virtualRow.start}px)`,
+              }}
+            >
+              <CommitRow
+                commit={commit}
+                isActive={commit.sha === activeSha}
+                onSelect={onSelectCommit}
+              />
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+function CommitRow({
+  commit,
+  isActive,
+  onSelect,
+}: {
+  commit: PrCommitRailCommit;
+  isActive: boolean;
+  onSelect: (sha: string) => void;
+}) {
+  const unresolved = Math.max(0, commit.threadCount - commit.resolvedCount);
+  const style: CSSProperties = isActive
+    ? {
+        background: COLORS.accentSubtle,
+        borderLeft: `3px solid ${COLORS.accent}`,
+        paddingLeft: 7,
+      }
+    : {
+        borderLeft: "3px solid transparent",
+        paddingLeft: 7,
+      };
+  return (
+    <button
+      type="button"
+      onClick={() => onSelect(commit.sha)}
+      className="block w-full text-left transition-colors"
+      style={{ ...style, padding: "8px 10px", borderBottom: `1px solid ${COLORS.borderMuted}` }}
+      aria-current={isActive ? "true" : undefined}
+      data-sha={commit.sha}
+      data-testid="pr-commit-rail-row"
+    >
+      <div className="flex items-center gap-2">
+        <span
+          className="text-[10px] font-semibold"
+          style={{
+            color: isActive ? COLORS.accent : COLORS.textMuted,
+            fontFamily: MONO_FONT,
+          }}
+        >
+          {commit.shortSha}
+        </span>
+        <span
+          className="ml-auto text-[10px]"
+          style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+        >
+          {relativeWhen(commit.authoredAt)}
+        </span>
+      </div>
+      <div
+        className="mt-1 line-clamp-2 text-[11px] leading-[1.35]"
+        style={{ color: COLORS.textPrimary }}
+      >
+        {commit.subject}
+      </div>
+      {commit.threadCount > 0 ? (
+        <div
+          className="mt-1 text-[10px]"
+          style={{
+            color: unresolved > 0 ? COLORS.warning : COLORS.textMuted,
+            fontFamily: MONO_FONT,
+          }}
+        >
+          {commit.threadCount} thread{commit.threadCount === 1 ? "" : "s"}
+          {" · "}
+          {commit.resolvedCount}/{commit.threadCount} resolved
+        </div>
+      ) : null}
+    </button>
+  );
+}
+
+export default PrCommitRail;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrDeploymentCard.tsx b/apps/desktop/src/renderer/components/prs/shared/PrDeploymentCard.tsx
new file mode 100644
index 000000000..b7f720475
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrDeploymentCard.tsx
@@ -0,0 +1,136 @@
+import { memo, useCallback } from "react";
+import { ArrowSquareOut, MagnifyingGlass } from "@phosphor-icons/react";
+
+import type { PrDeployment, PrDeploymentState } from "../../../../shared/types/prs";
+import { COLORS, MONO_FONT } from "../../lanes/laneDesignTokens";
+import { relativeWhen } from "../../../lib/format";
+
+function openExternalUrl(url: string | undefined | null) {
+  if (!url) return;
+  const bridge = typeof window !== "undefined" ? window.ade?.app?.openExternal : undefined;
+  if (bridge) void bridge(url).catch(() => {});
+}
+
+export function deploymentStateColor(state: PrDeploymentState): string {
+  switch (state) {
+    case "success":
+      return COLORS.success;
+    case "failure":
+    case "error":
+      return COLORS.danger;
+    case "in_progress":
+    case "pending":
+    case "queued":
+      return COLORS.warning;
+    case "inactive":
+      return COLORS.textDim;
+    default:
+      return COLORS.textMuted;
+  }
+}
+
+function stateLabel(state: PrDeploymentState): string {
+  switch (state) {
+    case "in_progress":
+      return "Deploying";
+    case "success":
+      return "Live";
+    case "failure":
+      return "Failed";
+    case "error":
+      return "Error";
+    case "queued":
+      return "Queued";
+    case "pending":
+      return "Pending";
+    case "inactive":
+      return "Inactive";
+    default:
+      return "Unknown";
+  }
+}
+
+export type PrDeploymentCardProps = {
+  deployment: PrDeployment;
+};
+
+export const PrDeploymentCard = memo(function PrDeploymentCard({
+  deployment,
+}: PrDeploymentCardProps) {
+  const color = deploymentStateColor(deployment.state);
+  const ts = deployment.updatedAt ?? deployment.createdAt;
+  const handlePreview = useCallback(() => {
+    openExternalUrl(deployment.environmentUrl);
+  }, [deployment.environmentUrl]);
+  const handleInspector = useCallback(() => {
+    openExternalUrl(deployment.logUrl);
+  }, [deployment.logUrl]);
+
+  return (
+    <div
+      data-testid="pr-deployment-card"
+      className="flex flex-col gap-1.5 px-3 py-2"
+      style={{ background: COLORS.recessedBg, border: `1px solid ${COLORS.border}` }}
+    >
+      <div className="flex items-center gap-2">
+        <span
+          className="inline-block h-2 w-2 shrink-0 rounded-full"
+          style={{ background: color, boxShadow: `0 0 6px ${color}60` }}
+        />
+        <span
+          className="truncate text-[12px] font-medium"
+          style={{ color: COLORS.textPrimary }}
+        >
+          {deployment.environment}
+        </span>
+        <span
+          className="ml-auto text-[10px] uppercase tracking-[0.8px]"
+          style={{ color, fontFamily: MONO_FONT }}
+        >
+          {stateLabel(deployment.state)}
+        </span>
+      </div>
+
+      {deployment.description ? (
+        <div className="text-[11px] leading-[1.4]" style={{ color: COLORS.textMuted }}>
+          {deployment.description}
+        </div>
+      ) : null}
+
+      <div className="flex items-center gap-2">
+        {deployment.environmentUrl ? (
+          <button
+            type="button"
+            onClick={handlePreview}
+            className="inline-flex items-center gap-1 text-[11px] underline-offset-2 hover:underline"
+            style={{ color: COLORS.accent }}
+          >
+            Preview
+            <ArrowSquareOut size={11} weight="regular" />
+          </button>
+        ) : null}
+        {deployment.logUrl ? (
+          <button
+            type="button"
+            onClick={handleInspector}
+            className="inline-flex items-center gap-1 text-[11px]"
+            style={{ color: COLORS.textSecondary }}
+          >
+            <MagnifyingGlass size={11} weight="regular" />
+            Inspector
+          </button>
+        ) : null}
+        {ts ? (
+          <span
+            className="ml-auto text-[10px]"
+            style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+          >
+            {relativeWhen(ts)}
+          </span>
+        ) : null}
+      </div>
+    </div>
+  );
+});
+
+export default PrDeploymentCard;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrMarkdown.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrMarkdown.test.tsx
new file mode 100644
index 000000000..c1eb4a254
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrMarkdown.test.tsx
@@ -0,0 +1,170 @@
+// @vitest-environment jsdom
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+
+import { PrMarkdown } from "./PrMarkdown";
+
+// Keep Shiki out of the unit test — we only care that fenced code blocks
+// route *through* the shared highlighter component (i.e. a `language-diff`
+// or `language-ts` fence produces the highlighter wrapper), not that Shiki
+// actually paints tokens.
+vi.mock("../../chat/CodeHighlighter.tsx", () => ({
+  HighlightedCode: ({ code, language }: { code: string; language: string }) => (
+    <div data-testid="highlighted-code" data-language={language}>
+      {code}
+    </div>
+  ),
+}));
+
+const BASE_PROPS = { repoOwner: "acme", repoName: "ade" } as const;
+
+const openExternal = vi.fn(async (_url: string) => {});
+
+beforeEach(() => {
+  openExternal.mockClear();
+  (window as unknown as { ade?: unknown }).ade = {
+    app: { openExternal },
+  };
+});
+
+afterEach(() => {
+  cleanup();
+  delete (window as unknown as { ade?: unknown }).ade;
+});
+
+describe("PrMarkdown", () => {
+  it("renders <details>/<summary> as a toggleable accordion", () => {
+    const markdown = [
+      "<details>",
+      "<summary>Greptile analysis</summary>",
+      "",
+      "Hidden review body content goes here.",
+      "",
+      "</details>",
+    ].join("\n");
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const toggle = screen.getByRole("button", { name: /greptile analysis/i });
+    expect(toggle.getAttribute("aria-expanded")).toBe("false");
+    // The hidden-by-default body should still be in the DOM (collapsed, not removed).
+    expect(screen.getByText(/hidden review body content/i)).toBeTruthy();
+
+    fireEvent.click(toggle);
+    expect(toggle.getAttribute("aria-expanded")).toBe("true");
+  });
+
+  it("renders GFM tables with a sticky header wrapper", () => {
+    const markdown = [
+      "| col a | col b |",
+      "| --- | --- |",
+      "| one | two |",
+      "| three | four |",
+    ].join("\n");
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const table = screen.getByRole("table");
+    expect(table).toBeTruthy();
+    expect(screen.getByRole("columnheader", { name: /col a/i })).toBeTruthy();
+    // Sticky thead gets a marker class we assert on so downstream styling stays stable.
+    const thead = table.querySelector("thead");
+    expect(thead).toBeTruthy();
+    expect(thead?.className).toContain("pr-md-thead");
+  });
+
+  it("routes fenced diff blocks through the shared CodeHighlighter", () => {
+    const markdown = [
+      "```diff",
+      "- removed line",
+      "+ added line",
+      "```",
+    ].join("\n");
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const highlighted = screen.getByTestId("highlighted-code");
+    expect(highlighted.getAttribute("data-language")).toBe("diff");
+    expect(highlighted.textContent).toContain("- removed line");
+    expect(highlighted.textContent).toContain("+ added line");
+  });
+
+  it("autolinks #123 to the repo PR and @user to the GitHub profile", () => {
+    const markdown = "See #123 — thanks @octocat for the review!";
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const prLink = screen.getByRole("link", { name: "#123" }) as HTMLAnchorElement;
+    expect(prLink.getAttribute("href")).toBe("https://github.com/acme/ade/pull/123");
+    expect(prLink.getAttribute("data-pr-link-kind")).toBe("pr");
+
+    const mention = screen.getByRole("link", { name: "@octocat" }) as HTMLAnchorElement;
+    expect(mention.getAttribute("href")).toBe("https://github.com/octocat");
+    expect(mention.getAttribute("data-pr-link-kind")).toBe("mention");
+  });
+
+  it("does not autolink #123 or @user inside code spans", () => {
+    const markdown = "Look at `#999` and `@ghost` — literal strings.";
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    expect(screen.queryByRole("link", { name: "#999" })).toBeNull();
+    expect(screen.queryByRole("link", { name: "@ghost" })).toBeNull();
+  });
+
+  it("opens images via window.ade.app.openExternal when clicked", () => {
+    const markdown = "![alt text](https://example.test/pic.png)";
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const img = screen.getByRole("img", { name: /alt text/i }) as HTMLImageElement;
+    expect(img.getAttribute("loading")).toBe("lazy");
+    expect(img.getAttribute("src")).toBe("https://example.test/pic.png");
+
+    fireEvent.click(img);
+    expect(openExternal).toHaveBeenCalledWith("https://example.test/pic.png");
+  });
+
+  it("opens external links via the Electron bridge and prevents default navigation", () => {
+    const markdown = "[ADE docs](https://example.test/docs)";
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const link = screen.getByRole("link", { name: /ade docs/i }) as HTMLAnchorElement;
+    expect(link.getAttribute("href")).toBe("https://example.test/docs");
+
+    fireEvent.click(link);
+    expect(openExternal).toHaveBeenCalledWith("https://example.test/docs");
+  });
+
+  it("strips <script> tags from raw HTML", () => {
+    const markdown = [
+      "Safe preamble.",
+      "",
+      '<script>window.__pwn = 1;</script>',
+      "",
+      "Safe trailing.",
+    ].join("\n");
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const container = screen.getByText(/safe preamble/i).closest(".pr-md-root");
+    expect(container).toBeTruthy();
+    expect(container?.querySelector("script")).toBeNull();
+    expect((window as unknown as { __pwn?: number }).__pwn).toBeUndefined();
+  });
+
+  it("renders task-list checkboxes as read-only", () => {
+    const markdown = ["- [x] Done item", "- [ ] Open item"].join("\n");
+
+    render(<PrMarkdown {...BASE_PROPS}>{markdown}</PrMarkdown>);
+
+    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
+    expect(checkboxes).toHaveLength(2);
+    expect(checkboxes[0].checked).toBe(true);
+    expect(checkboxes[0].disabled).toBe(true);
+    expect(checkboxes[1].checked).toBe(false);
+    expect(checkboxes[1].disabled).toBe(true);
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrMarkdown.tsx b/apps/desktop/src/renderer/components/prs/shared/PrMarkdown.tsx
new file mode 100644
index 000000000..974e300d6
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrMarkdown.tsx
@@ -0,0 +1,601 @@
+import {
+  memo,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type MouseEvent,
+  type ReactNode,
+} from "react";
+import ReactMarkdown, { type Components } from "react-markdown";
+import rehypeRaw from "rehype-raw";
+import rehypeSanitize, { defaultSchema } from "rehype-sanitize";
+import remarkGfm from "remark-gfm";
+import { findAndReplace } from "mdast-util-find-and-replace";
+import type { Root } from "mdast";
+import { CaretRight, ArrowSquareOut } from "@phosphor-icons/react";
+
+import {
+  buildChatMarkdownComponents,
+  SAFE_PREVIEW_SCHEMA,
+} from "../../chat/chatMarkdown";
+import { HighlightedCode } from "../../chat/CodeHighlighter";
+import { COLORS } from "../../lanes/laneDesignTokens";
+
+type PrMarkdownTone = "neutral" | "sky" | "amber";
+
+export type PrMarkdownProps = {
+  children: string;
+  repoOwner: string;
+  repoName: string;
+  tone?: PrMarkdownTone;
+  dense?: boolean;
+};
+
+/* ── Extended sanitization schema ──────────────────────────────────── */
+
+const PR_SAFE_SCHEMA = (() => {
+  const baseTagNames = SAFE_PREVIEW_SCHEMA.tagNames ?? defaultSchema.tagNames ?? [];
+  const baseAttributes = {
+    ...(defaultSchema.attributes ?? {}),
+    ...(SAFE_PREVIEW_SCHEMA.attributes ?? {}),
+  };
+
+  return {
+    ...SAFE_PREVIEW_SCHEMA,
+    tagNames: Array.from(
+      new Set([
+        ...baseTagNames,
+        "details",
+        "summary",
+        "img",
+        "input",
+        "del",
+        "span",
+        "div",
+      ]),
+    ),
+    attributes: {
+      ...baseAttributes,
+      a: [...(baseAttributes.a ?? []), "href", "title"],
+      img: ["src", "alt", "title", "width", "height", "loading"],
+      input: [
+        ["type", "checkbox"],
+        ["disabled", true],
+        ["checked", true],
+        "checked",
+        "disabled",
+      ],
+      details: ["open"],
+      summary: [],
+      code: [...(baseAttributes.code ?? []), ["className", /^language-/]],
+      span: [["className", /^pr-md-/]],
+      div: [["className", /^pr-md-/]],
+      th: [...(baseAttributes.th ?? []), "align"],
+      td: [...(baseAttributes.td ?? []), "align"],
+    },
+    protocols: {
+      ...(defaultSchema.protocols ?? {}),
+      href: ["http", "https", "mailto"],
+      src: ["http", "https", "data"],
+    },
+  } as typeof SAFE_PREVIEW_SCHEMA;
+})();
+
+/* ── Remark plugin: autolink #123 and @user ────────────────────────── */
+
+function remarkPrAutolinks({
+  repoOwner,
+  repoName,
+}: {
+  repoOwner: string;
+  repoName: string;
+}) {
+  return (tree: Root) => {
+    findAndReplace(
+      tree,
+      [
+        [
+          /(^|[\s(\[{>])#(\d+)\b/g,
+          (_full: string, prefix: string, num: string) =>
+            [
+              { type: "text", value: prefix },
+              {
+                type: "link",
+                url: `https://github.com/${repoOwner}/${repoName}/pull/${num}`,
+                children: [{ type: "text", value: `#${num}` }],
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            ] as any,
+        ],
+        [
+          /(^|[\s(\[{>])@([A-Za-z0-9][A-Za-z0-9-]{0,38})\b/g,
+          (_full: string, prefix: string, user: string) =>
+            [
+              { type: "text", value: prefix },
+              {
+                type: "link",
+                url: `https://github.com/${user}`,
+                children: [{ type: "text", value: `@${user}` }],
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            ] as any,
+        ],
+      ],
+      { ignore: ["link", "linkReference", "code", "inlineCode"] },
+    );
+  };
+}
+
+/* ── <details>/<summary> accordion ─────────────────────────────────── */
+
+function PrSummaryMarker(props: { children?: ReactNode }) {
+  return <>{props.children}</>;
+}
+PrSummaryMarker.displayName = "PrSummaryMarker";
+
+function isSummaryElement(node: unknown): node is { props: { children?: ReactNode } } {
+  if (!node || typeof node !== "object") return false;
+  const type = (node as { type?: unknown }).type;
+  if (type === PrSummaryMarker) return true;
+  // React-markdown wraps component overrides in an anonymous arrow that
+  // forwards props — detect by the display name attached to that arrow.
+  if (typeof type === "function" && (type as { displayName?: string }).displayName === "PrSummaryMarker") {
+    return true;
+  }
+  return false;
+}
+
+function PrDetails({
+  open: openProp,
+  children,
+}: {
+  open?: boolean;
+  children?: ReactNode;
+}) {
+  const [open, setOpen] = useState<boolean>(!!openProp);
+  const bodyRef = useRef<HTMLDivElement | null>(null);
+  const [bodyHeight, setBodyHeight] = useState<number | null>(null);
+
+  const childArray = Array.isArray(children) ? children : [children];
+  let summaryNode: ReactNode = null;
+  const rest: ReactNode[] = [];
+  for (const child of childArray) {
+    if (
+      summaryNode === null &&
+      isSummaryElement(child)
+    ) {
+      summaryNode = (child as { props: { children?: ReactNode } }).props.children;
+      continue;
+    }
+    if (typeof child === "string" && child.trim() === "") {
+      // Drop whitespace-only text nodes between <details> and <summary>.
+      continue;
+    }
+    rest.push(child);
+  }
+
+  useEffect(() => {
+    if (!bodyRef.current) return;
+    const next = bodyRef.current.scrollHeight;
+    setBodyHeight(next);
+  }, [open, children]);
+
+  const onToggle = useCallback(
+    (event: MouseEvent<HTMLButtonElement>) => {
+      event.preventDefault();
+      setOpen((prev) => !prev);
+    },
+    [],
+  );
+
+  return (
+    <div
+      className="pr-md-details mb-3 overflow-hidden rounded-[8px] border last:mb-0"
+      style={{ borderColor: COLORS.border, background: COLORS.recessedBg }}
+    >
+      <button
+        type="button"
+        onClick={onToggle}
+        aria-expanded={open}
+        className="flex w-full items-center gap-2 px-3 py-2 text-left text-[12px] font-medium transition-colors hover:bg-white/[0.04]"
+        style={{ color: COLORS.textPrimary }}
+      >
+        <CaretRight
+          size={12}
+          weight="bold"
+          className="shrink-0 transition-transform"
+          style={{
+            transform: open ? "rotate(90deg)" : "rotate(0deg)",
+            color: COLORS.textSecondary,
+          }}
+        />
+        <span className="min-w-0 flex-1 truncate">{summaryNode ?? "Details"}</span>
+      </button>
+      <div
+        aria-hidden={!open}
+        style={{
+          height: open ? bodyHeight ?? "auto" : 0,
+          transition: "height 160ms ease-out",
+        }}
+      >
+        <div ref={bodyRef} className="border-t px-3 py-2" style={{ borderColor: COLORS.border }}>
+          {rest}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+/* ── External-link handling ────────────────────────────────────────── */
+
+function openExternalUrl(url: string | undefined) {
+  if (!url) return;
+  const bridge = typeof window !== "undefined" ? window.ade?.app?.openExternal : undefined;
+  if (bridge) {
+    void bridge(url).catch(() => {});
+  }
+}
+
+/* ── Image with click-to-open ──────────────────────────────────────── */
+
+function PrImage({
+  src,
+  alt,
+  title,
+}: {
+  src?: string;
+  alt?: string;
+  title?: string;
+}) {
+  const handleClick = useCallback(
+    (event: MouseEvent<HTMLImageElement>) => {
+      event.preventDefault();
+      openExternalUrl(src);
+    },
+    [src],
+  );
+  if (!src) return null;
+  return (
+    <img
+      src={src}
+      alt={alt ?? ""}
+      title={title}
+      loading="lazy"
+      onClick={handleClick}
+      className="my-2 block max-w-full cursor-zoom-in rounded-[6px] border"
+      style={{ borderColor: COLORS.border, maxHeight: 520 }}
+    />
+  );
+}
+
+/* ── Link with external-open handling ─────────────────────────────── */
+
+type LinkFlavor = "default" | "pr" | "mention";
+
+function classifyLink(
+  href: string | undefined,
+  children: ReactNode,
+  repoOwner: string,
+  repoName: string,
+): LinkFlavor {
+  if (!href) return "default";
+  const text = extractLinkText(children);
+  if (
+    text.startsWith("#") &&
+    href.includes(`/${repoOwner}/${repoName}/pull/`)
+  ) {
+    return "pr";
+  }
+  if (text.startsWith("@") && /^https:\/\/github\.com\/[^/]+\/?$/.test(href)) {
+    return "mention";
+  }
+  return "default";
+}
+
+function extractLinkText(node: ReactNode): string {
+  if (typeof node === "string") return node;
+  if (typeof node === "number") return String(node);
+  if (Array.isArray(node)) return node.map(extractLinkText).join("");
+  if (node && typeof node === "object" && "props" in (node as object)) {
+    const props = (node as { props: { children?: ReactNode } }).props;
+    return extractLinkText(props?.children);
+  }
+  return "";
+}
+
+function PrLink({
+  href,
+  children,
+  repoOwner,
+  repoName,
+}: {
+  href?: string;
+  children?: ReactNode;
+  repoOwner: string;
+  repoName: string;
+}) {
+  const flavor = classifyLink(href, children, repoOwner, repoName);
+  const handleClick = useCallback(
+    (event: MouseEvent<HTMLAnchorElement>) => {
+      event.preventDefault();
+      openExternalUrl(href);
+    },
+    [href],
+  );
+
+  if (flavor === "pr" || flavor === "mention") {
+    return (
+      <a
+        href={href}
+        onClick={handleClick}
+        className="rounded-[4px] px-[3px] transition-colors"
+        style={{
+          color: COLORS.accent,
+          background: COLORS.accentSubtle,
+          textDecoration: "none",
+        }}
+        data-pr-link-kind={flavor}
+      >
+        {children}
+      </a>
+    );
+  }
+
+  return (
+    <a
+      href={href}
+      onClick={handleClick}
+      className="inline-flex items-center gap-0.5 underline underline-offset-2 transition-colors"
+      style={{ color: COLORS.textPrimary }}
+    >
+      {children}
+      <ArrowSquareOut size={10} weight="regular" style={{ color: COLORS.textMuted }} />
+    </a>
+  );
+}
+
+/* ── Task-list checkbox ────────────────────────────────────────────── */
+
+function PrTaskCheckbox({ checked }: { checked?: boolean }) {
+  return (
+    <input
+      type="checkbox"
+      checked={!!checked}
+      readOnly
+      disabled
+      aria-readonly
+      className="pr-md-task-checkbox relative mr-1.5 inline-block h-[12px] w-[12px] shrink-0 appearance-none rounded-[3px] border align-middle"
+      style={{
+        borderColor: checked ? COLORS.accent : COLORS.outlineBorder,
+        background: checked ? COLORS.accent : "transparent",
+        cursor: "default",
+      }}
+    />
+  );
+}
+
+/* ── Component overrides ───────────────────────────────────────────── */
+
+function toneAccent(tone: PrMarkdownTone): string {
+  switch (tone) {
+    case "amber":
+      return COLORS.warning;
+    case "sky":
+      return COLORS.info;
+    default:
+      return COLORS.textSecondary;
+  }
+}
+
+function buildPrOverrides({
+  tone,
+  dense,
+  repoOwner,
+  repoName,
+}: {
+  tone: PrMarkdownTone;
+  dense: boolean;
+  repoOwner: string;
+  repoName: string;
+}): Partial<Components> {
+  const mb = dense ? "mb-2" : "mb-3";
+  const headerTone = toneAccent(tone);
+
+  return {
+    p: ({ children }) => (
+      <p className={`${mb} whitespace-pre-wrap last:mb-0`} style={{ color: COLORS.textPrimary }}>
+        {children}
+      </p>
+    ),
+    h1: ({ children }) => (
+      <h1
+        className={`${mb} mt-3 text-[15px] font-semibold leading-snug first:mt-0`}
+        style={{ color: headerTone }}
+      >
+        {children}
+      </h1>
+    ),
+    h2: ({ children }) => (
+      <h2
+        className={`${mb} mt-3 text-[13px] font-semibold leading-snug first:mt-0`}
+        style={{ color: headerTone }}
+      >
+        {children}
+      </h2>
+    ),
+    h3: ({ children }) => (
+      <h3
+        className={`${mb} mt-3 text-[12px] font-semibold leading-snug first:mt-0`}
+        style={{ color: headerTone }}
+      >
+        {children}
+      </h3>
+    ),
+    h4: ({ children }) => (
+      <h4
+        className={`${mb} mt-3 text-[12px] font-medium leading-snug first:mt-0`}
+        style={{ color: headerTone }}
+      >
+        {children}
+      </h4>
+    ),
+    a: ({ href, children }) => (
+      <PrLink href={href} repoOwner={repoOwner} repoName={repoName}>
+        {children}
+      </PrLink>
+    ),
+    // Route fenced code blocks through the shared Shiki highlighter.
+    pre: ({ children }) => {
+      const first = Array.isArray(children) ? children[0] : children;
+      if (
+        first &&
+        typeof first === "object" &&
+        "props" in (first as object)
+      ) {
+        const props = (first as {
+          props?: { className?: string; children?: ReactNode };
+        }).props;
+        const className = props?.className ?? "";
+        const match = /language-([\w-]+)/.exec(className);
+        const language = match ? match[1] : "text";
+        const codeText = extractLinkText(props?.children).replace(/\n$/, "");
+        return <HighlightedCode code={codeText} language={language} />;
+      }
+      return (
+        <pre
+          className={`${mb} overflow-auto rounded-[6px] border p-3 font-mono text-[11px] leading-5 last:mb-0`}
+          style={{ borderColor: COLORS.border, background: "rgba(0,0,0,0.25)" }}
+        >
+          {children}
+        </pre>
+      );
+    },
+    code: ({ className, children }) => {
+      // Fenced blocks are handled by `pre`. Inline code stays small & mono.
+      if (className && /language-/.test(className)) {
+        return <code className={className}>{children}</code>;
+      }
+      return (
+        <code
+          className="rounded-[4px] px-1 py-0.5 font-mono text-[11px]"
+          style={{ background: "rgba(0,0,0,0.3)", color: COLORS.textPrimary }}
+        >
+          {children}
+        </code>
+      );
+    },
+    // GFM: task-list checkbox inputs.
+    input: (props) => {
+      const { type, checked } = props as { type?: string; checked?: boolean };
+      if (type === "checkbox") return <PrTaskCheckbox checked={checked} />;
+      return null;
+    },
+    // GFM: tables need horizontal scroll with sticky header.
+    table: ({ children }) => (
+      <div
+        className={`${mb} overflow-x-auto rounded-[6px] border last:mb-0`}
+        style={{ borderColor: COLORS.border }}
+      >
+        <table className="w-full border-collapse text-left text-[12px]">{children}</table>
+      </div>
+    ),
+    thead: ({ children }) => (
+      <thead
+        className="pr-md-thead sticky top-0 z-10"
+        style={{ background: COLORS.cardBgSolid }}
+      >
+        {children}
+      </thead>
+    ),
+    th: ({ children }) => (
+      <th
+        className="border-b px-3 py-1.5 font-semibold"
+        style={{ borderColor: COLORS.border, color: COLORS.textPrimary }}
+      >
+        {children}
+      </th>
+    ),
+    td: ({ children }) => (
+      <td
+        className="border-b px-3 py-1.5 align-top"
+        style={{ borderColor: COLORS.borderMuted, color: COLORS.textPrimary }}
+      >
+        {children}
+      </td>
+    ),
+    blockquote: ({ children }) => (
+      <blockquote
+        className={`${mb} border-l-2 pl-3 last:mb-0`}
+        style={{ borderColor: COLORS.accentBorder, color: COLORS.textSecondary }}
+      >
+        {children}
+      </blockquote>
+    ),
+    img: (props) => (
+      <PrImage
+        src={(props as { src?: string }).src}
+        alt={(props as { alt?: string }).alt}
+        title={(props as { title?: string }).title}
+      />
+    ),
+    // Route <details>/<summary> through our accordion. The summary is
+    // tagged with a sentinel component so `PrDetails` can peel it out from
+    // the rest of the body (the collapsed content).
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    details: (props: any) => <PrDetails open={!!props.open}>{props.children}</PrDetails>,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    summary: PrSummaryMarker as any,
+  };
+}
+
+/* ── Main exported component ───────────────────────────────────────── */
+
+export const PrMarkdown = memo(function PrMarkdown({
+  children,
+  repoOwner,
+  repoName,
+  tone = "neutral",
+  dense = false,
+}: PrMarkdownProps) {
+  const overrides = useMemo(
+    () => buildPrOverrides({ tone, dense, repoOwner, repoName }),
+    [tone, dense, repoOwner, repoName],
+  );
+
+  const components = useMemo<Components>(() => {
+    const chatTone = tone === "amber" ? "amber" : "sky";
+    // `buildChatMarkdownComponents` signature only accepts "sky" | "amber".
+    const base = buildChatMarkdownComponents(chatTone, overrides);
+    return base;
+  }, [tone, overrides]);
+
+  const remarkPlugins = useMemo(
+    () => [
+      remarkGfm,
+      [remarkPrAutolinks, { repoOwner, repoName }] as [
+        typeof remarkPrAutolinks,
+        { repoOwner: string; repoName: string },
+      ],
+    ],
+    [repoOwner, repoName],
+  );
+
+  return (
+    <div
+      className={`pr-md-root text-[13px] leading-[1.55] ${dense ? "pr-md-dense" : ""}`}
+      style={{ color: COLORS.textPrimary }}
+    >
+      <ReactMarkdown
+        remarkPlugins={remarkPlugins}
+        rehypePlugins={[rehypeRaw, [rehypeSanitize, PR_SAFE_SCHEMA]]}
+        components={components}
+      >
+        {children}
+      </ReactMarkdown>
+    </div>
+  );
+});
+
+export default PrMarkdown;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrReviewThreadCard.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrReviewThreadCard.test.tsx
new file mode 100644
index 000000000..c12181fff
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrReviewThreadCard.test.tsx
@@ -0,0 +1,240 @@
+// @vitest-environment jsdom
+
+import { createRef } from "react";
+import { MemoryRouter } from "react-router-dom";
+import type * as ReactRouterDom from "react-router-dom";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+
+import type { PrReviewThread } from "../../../../shared/types";
+import { PrReviewThreadCard, type PrReviewThreadCardHandle } from "./PrReviewThreadCard";
+
+vi.mock("../../chat/CodeHighlighter.tsx", () => ({
+  HighlightedCode: ({ code }: { code: string }) => <pre>{code}</pre>,
+}));
+
+const mockNavigate = vi.fn();
+vi.mock("react-router-dom", async () => {
+  const actual = await vi.importActual<typeof ReactRouterDom>("react-router-dom");
+  return {
+    ...actual,
+    useNavigate: () => mockNavigate,
+  };
+});
+
+function makeThread(overrides: Partial<PrReviewThread> = {}): PrReviewThread {
+  return {
+    id: "thread-1",
+    isResolved: false,
+    isOutdated: false,
+    path: "src/foo.ts",
+    line: 42,
+    originalLine: 42,
+    startLine: null,
+    originalStartLine: null,
+    diffSide: "RIGHT",
+    url: null,
+    createdAt: "2026-04-14T10:00:00.000Z",
+    updatedAt: "2026-04-14T10:00:00.000Z",
+    comments: [
+      {
+        id: "comment-1",
+        author: "reviewer",
+        authorAvatarUrl: null,
+        body: "Please tighten this logic.",
+        url: null,
+        createdAt: "2026-04-14T10:00:00.000Z",
+        updatedAt: null,
+      },
+    ],
+    ...overrides,
+  };
+}
+
+const BASE_PROPS = {
+  prId: "pr-1",
+  laneId: "lane-1",
+  repoOwner: "acme",
+  repoName: "ade",
+  viewerLogin: "octocat",
+  modelId: "claude-opus-4-6",
+};
+
+let postReviewComment: ReturnType<typeof vi.fn>;
+let setReviewThreadResolved: ReturnType<typeof vi.fn>;
+let reactToComment: ReturnType<typeof vi.fn>;
+let launchIssueResolutionFromThread: ReturnType<typeof vi.fn>;
+
+beforeEach(() => {
+  mockNavigate.mockClear();
+  postReviewComment = vi.fn().mockResolvedValue({ id: "new-comment", author: "octocat" });
+  setReviewThreadResolved = vi
+    .fn()
+    .mockImplementation(async ({ resolved }: { resolved: boolean }) => ({ threadId: "thread-1", isResolved: resolved }));
+  reactToComment = vi.fn().mockResolvedValue(undefined);
+  launchIssueResolutionFromThread = vi
+    .fn()
+    .mockResolvedValue({ sessionId: "s-1", laneId: "lane-1", href: "/work?laneId=lane-1" });
+
+  (window as unknown as { ade?: unknown }).ade = {
+    app: { openExternal: vi.fn() },
+    prs: {
+      postReviewComment,
+      setReviewThreadResolved,
+      reactToComment,
+      launchIssueResolutionFromThread,
+    },
+  };
+});
+
+afterEach(() => {
+  cleanup();
+  delete (window as unknown as { ade?: unknown }).ade;
+});
+
+function renderCard(overrides: Partial<PrReviewThread> = {}, extraProps: Record<string, unknown> = {}) {
+  return render(
+    <MemoryRouter>
+      <PrReviewThreadCard thread={makeThread(overrides)} {...BASE_PROPS} {...extraProps} />
+    </MemoryRouter>,
+  );
+}
+
+describe("PrReviewThreadCard", () => {
+  it("renders expanded by default when unresolved and not outdated", () => {
+    renderCard();
+    expect(screen.getByText(/please tighten this logic/i)).toBeTruthy();
+    expect(screen.getByText(/src\/foo\.ts:42/)).toBeTruthy();
+    expect(screen.getByRole("button", { name: /resolve/i })).toBeTruthy();
+  });
+
+  it("collapses resolved threads behind a one-line summary", () => {
+    const { container } = renderCard({ isResolved: true });
+    const card = container.querySelector("[data-pr-review-thread-card]");
+    expect(card?.getAttribute("data-expanded")).toBe("false");
+    expect(screen.getByText(/Resolved/)).toBeTruthy();
+    expect(screen.getByText(/1 comment/)).toBeTruthy();
+  });
+
+  it("expands collapsed summary when clicked", () => {
+    const { container } = renderCard({ isResolved: true });
+    const card = container.querySelector("[data-pr-review-thread-card]") as HTMLElement;
+    fireEvent.click(card);
+    expect(card.getAttribute("data-expanded")).toBe("true");
+  });
+
+  it("posts a reply via IPC and clears the textarea", async () => {
+    const user = userEvent.setup();
+    renderCard();
+
+    await user.click(screen.getByRole("button", { name: /^reply$/i }));
+    const textarea = screen.getByPlaceholderText(/reply as @octocat/i);
+    await user.type(textarea, "ack — will fix");
+    await user.click(screen.getByRole("button", { name: /post reply/i }));
+
+    await waitFor(() => {
+      expect(postReviewComment).toHaveBeenCalledWith({
+        prId: "pr-1",
+        threadId: "thread-1",
+        body: "ack — will fix",
+      });
+    });
+  });
+
+  it("toggles resolve state via setReviewThreadResolved", async () => {
+    const user = userEvent.setup();
+    renderCard();
+    await user.click(screen.getByRole("button", { name: /^resolve$/i }));
+    await waitFor(() => {
+      expect(setReviewThreadResolved).toHaveBeenCalledWith({
+        prId: "pr-1",
+        threadId: "thread-1",
+        resolved: true,
+      });
+    });
+    expect(await screen.findByRole("button", { name: /unresolve/i })).toBeTruthy();
+  });
+
+  it("navigates to /files with diff state when View file diff clicked", async () => {
+    const user = userEvent.setup();
+    renderCard();
+    await user.click(screen.getByRole("button", { name: /view file diff/i }));
+    expect(mockNavigate).toHaveBeenCalledWith("/files", {
+      state: { openFilePath: "src/foo.ts", laneId: "lane-1", mode: "diff", startLine: 42 },
+    });
+  });
+
+  it("launches issue resolution with modelId and navigates to returned href", async () => {
+    const user = userEvent.setup();
+    renderCard();
+    await user.click(screen.getByRole("button", { name: /ask ai to fix/i }));
+    await waitFor(() => {
+      expect(launchIssueResolutionFromThread).toHaveBeenCalledWith(
+        expect.objectContaining({
+          prId: "pr-1",
+          threadId: "thread-1",
+          modelId: "claude-opus-4-6",
+          fileContext: expect.objectContaining({ path: "src/foo.ts", line: 42 }),
+        }),
+      );
+      expect(mockNavigate).toHaveBeenCalledWith("/work?laneId=lane-1");
+    });
+  });
+
+  it("responds to 'r' by opening reply, and 'x' by toggling resolve", async () => {
+    const { container } = renderCard();
+    const card = container.querySelector("[data-pr-review-thread-card]") as HTMLElement;
+
+    fireEvent.keyDown(card, { key: "r" });
+    expect(screen.getByPlaceholderText(/reply as @octocat/i)).toBeTruthy();
+
+    fireEvent.keyDown(card, { key: "x" });
+    await waitFor(() => {
+      expect(setReviewThreadResolved).toHaveBeenCalled();
+    });
+  });
+
+  it("delegates ] and n to onNext", () => {
+    const onNext = vi.fn();
+    const { container } = renderCard({}, { onNext });
+    const card = container.querySelector("[data-pr-review-thread-card]") as HTMLElement;
+    fireEvent.keyDown(card, { key: "]" });
+    fireEvent.keyDown(card, { key: "n" });
+    expect(onNext).toHaveBeenCalledTimes(2);
+  });
+
+  it("exposes focus() via imperative handle", () => {
+    const ref = createRef<PrReviewThreadCardHandle>();
+    render(
+      <MemoryRouter>
+        <PrReviewThreadCard ref={ref} thread={makeThread()} {...BASE_PROPS} />
+      </MemoryRouter>,
+    );
+    expect(ref.current).toBeTruthy();
+    expect(typeof ref.current?.focus).toBe("function");
+    ref.current?.focus();
+    const card = document.querySelector("[data-pr-review-thread-card]");
+    expect(document.activeElement).toBe(card);
+  });
+
+  it("sends a reaction via reactToComment", async () => {
+    const user = userEvent.setup();
+    renderCard();
+    await user.click(screen.getByRole("button", { name: /add reaction/i }));
+    await user.click(screen.getByRole("button", { name: /react \+1/i }));
+    await waitFor(() => {
+      expect(reactToComment).toHaveBeenCalledWith({
+        prId: "pr-1",
+        commentId: "comment-1",
+        content: "+1",
+      });
+    });
+  });
+
+  it("renders a focus ring when focused is true", () => {
+    const { container } = renderCard({}, { focused: true });
+    const card = container.querySelector("[data-pr-review-thread-card]") as HTMLElement;
+    expect(card.style.outline).toContain("2px solid");
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrReviewThreadCard.tsx b/apps/desktop/src/renderer/components/prs/shared/PrReviewThreadCard.tsx
new file mode 100644
index 000000000..5e181047e
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrReviewThreadCard.tsx
@@ -0,0 +1,645 @@
+import {
+  forwardRef,
+  memo,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+  type CSSProperties,
+  type KeyboardEvent as ReactKeyboardEvent,
+} from "react";
+import { useNavigate } from "react-router-dom";
+import {
+  ArrowSquareOut,
+  CheckCircle,
+  ChatCircleDots,
+  Sparkle,
+  X,
+} from "@phosphor-icons/react";
+
+import type {
+  PrReactionContent,
+  PrReviewThread,
+  PrReviewThreadComment,
+} from "../../../../shared/types";
+import {
+  COLORS,
+  SANS_FONT,
+  cardStyle,
+  inlineBadge,
+  outlineButton,
+} from "../../lanes/laneDesignTokens";
+import { formatTimeAgo } from "./prFormatters";
+import { PrMarkdown } from "./PrMarkdown";
+
+export type PrReviewThreadCardHandle = {
+  focus: () => void;
+};
+
+type PrReviewThreadCardProps = {
+  thread: PrReviewThread;
+  prId: string;
+  laneId: string | null;
+  repoOwner: string;
+  repoName: string;
+  viewerLogin: string | null;
+  modelId?: string | null;
+  focused?: boolean;
+  onNext?: () => void;
+  onPrev?: () => void;
+  onFocus?: () => void;
+};
+
+type ReactionCommentLite = PrReviewThreadComment & {
+  reactions?: ReactionLite[];
+};
+
+type ReactionLite = {
+  id?: string;
+  content: PrReactionContent;
+  user?: string;
+};
+
+const REACTION_OPTIONS: Array<{ content: PrReactionContent; label: string }> = [
+  { content: "+1", label: "👍" },
+  { content: "-1", label: "👎" },
+  { content: "laugh", label: "😄" },
+  { content: "heart", label: "❤️" },
+  { content: "hooray", label: "🎉" },
+];
+
+const REACTION_LABELS: Record<PrReactionContent, string> = {
+  "+1": "👍",
+  "-1": "👎",
+  laugh: "😄",
+  confused: "😕",
+  heart: "❤️",
+  hooray: "🎉",
+  rocket: "🚀",
+  eyes: "👀",
+};
+
+function statusChip(thread: PrReviewThread) {
+  if (thread.isResolved) {
+    return { label: "Resolved", color: COLORS.success };
+  }
+  if (thread.isOutdated) {
+    return { label: "Outdated", color: COLORS.textMuted };
+  }
+  return { label: "Open", color: COLORS.warning };
+}
+
+function getCommentReactions(comment: ReactionCommentLite): ReactionLite[] {
+  return Array.isArray(comment.reactions) ? comment.reactions : [];
+}
+
+function aggregateReactions(reactions: ReactionLite[]) {
+  const counts = new Map<PrReactionContent, number>();
+  for (const r of reactions) {
+    counts.set(r.content, (counts.get(r.content) ?? 0) + 1);
+  }
+  return Array.from(counts.entries()).map(([content, count]) => ({ content, count }));
+}
+
+function AvatarStack({ comments }: { comments: PrReviewThreadComment[] }) {
+  const authors: Array<{ login: string; url: string | null }> = [];
+  const seen = new Set<string>();
+  for (const comment of comments) {
+    if (seen.has(comment.author)) continue;
+    seen.add(comment.author);
+    authors.push({ login: comment.author, url: comment.authorAvatarUrl });
+    if (authors.length >= 3) break;
+  }
+  const overflow = Math.max(0, new Set(comments.map((c) => c.author)).size - authors.length);
+
+  return (
+    <div className="flex items-center" style={{ marginLeft: 0 }}>
+      {authors.map((a, idx) => (
+        <span
+          key={a.login}
+          title={a.login}
+          className="inline-flex h-[18px] w-[18px] items-center justify-center rounded-full border text-[9px] font-semibold"
+          style={{
+            marginLeft: idx === 0 ? 0 : -5,
+            background: a.url ? "transparent" : COLORS.accentSubtle,
+            borderColor: COLORS.border,
+            color: COLORS.accent,
+            zIndex: 10 - idx,
+            overflow: "hidden",
+          }}
+        >
+          {a.url ? (
+            <img
+              src={a.url}
+              alt={`${a.login} avatar`}
+              style={{ width: "100%", height: "100%", objectFit: "cover" }}
+            />
+          ) : (
+            a.login.charAt(0).toUpperCase()
+          )}
+        </span>
+      ))}
+      {overflow > 0 ? (
+        <span
+          className="ml-[-5px] inline-flex h-[18px] min-w-[18px] items-center justify-center rounded-full border px-1 text-[9px] font-semibold"
+          style={{
+            background: COLORS.recessedBg,
+            borderColor: COLORS.border,
+            color: COLORS.textMuted,
+          }}
+        >
+          +{overflow}
+        </span>
+      ) : null}
+    </div>
+  );
+}
+
+function CommentRow({
+  comment,
+  prId,
+  repoOwner,
+  repoName,
+  onReact,
+}: {
+  comment: PrReviewThreadComment;
+  prId: string;
+  repoOwner: string;
+  repoName: string;
+  onReact: (commentId: string, content: PrReactionContent) => void;
+}) {
+  const [pickerOpen, setPickerOpen] = useState(false);
+  const reactions = getCommentReactions(comment as ReactionCommentLite);
+  const grouped = aggregateReactions(reactions);
+
+  return (
+    <div className="flex flex-col gap-1.5 py-2" data-pr-thread-comment>
+      <div className="flex items-center gap-2 text-[11px]" style={{ color: COLORS.textMuted }}>
+        <span className="font-medium" style={{ color: COLORS.textSecondary }}>
+          {comment.author}
+        </span>
+        <span>·</span>
+        <span>{formatTimeAgo(comment.createdAt)}</span>
+      </div>
+      {comment.body ? (
+        <PrMarkdown repoOwner={repoOwner} repoName={repoName} dense>
+          {comment.body}
+        </PrMarkdown>
+      ) : null}
+      <div className="flex items-center gap-1.5">
+        {grouped.map((r) => (
+          <button
+            key={r.content}
+            type="button"
+            onClick={() => onReact(comment.id, r.content)}
+            className="inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-[11px] transition-colors hover:bg-white/[0.04]"
+            style={{
+              borderColor: COLORS.border,
+              background: COLORS.recessedBg,
+              color: COLORS.textSecondary,
+              fontFamily: SANS_FONT,
+            }}
+          >
+            <span>{REACTION_LABELS[r.content]}</span>
+            <span>{r.count}</span>
+          </button>
+        ))}
+        <div className="relative">
+          <button
+            type="button"
+            onClick={() => setPickerOpen((v) => !v)}
+            aria-label="Add reaction"
+            aria-haspopup="true"
+            aria-expanded={pickerOpen}
+            className="inline-flex h-[22px] w-[22px] items-center justify-center rounded-full border text-[11px] transition-colors hover:bg-white/[0.04]"
+            style={{ borderColor: COLORS.border, color: COLORS.textMuted }}
+          >
+            +
+          </button>
+          {pickerOpen ? (
+            <div
+              role="menu"
+              className="ade-liquid-glass-menu absolute left-0 top-[26px] z-20 flex items-center gap-0.5 px-1 py-1"
+              data-pr-reaction-picker
+              data-pr-id={prId}
+            >
+              {REACTION_OPTIONS.map((opt) => (
+                <button
+                  key={opt.content}
+                  type="button"
+                  onClick={() => {
+                    onReact(comment.id, opt.content);
+                    setPickerOpen(false);
+                  }}
+                  aria-label={`React ${opt.content}`}
+                  className="inline-flex h-[22px] w-[22px] items-center justify-center rounded-[4px] text-[13px] transition-colors hover:bg-white/[0.08]"
+                >
+                  {opt.label}
+                </button>
+              ))}
+            </div>
+          ) : null}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export const PrReviewThreadCard = memo(
+  forwardRef<PrReviewThreadCardHandle, PrReviewThreadCardProps>(function PrReviewThreadCard(
+    {
+      thread,
+      prId,
+      laneId,
+      repoOwner,
+      repoName,
+      viewerLogin,
+      modelId,
+      focused,
+      onNext,
+      onPrev,
+      onFocus,
+    },
+    ref,
+  ) {
+    const collapsedByDefault = thread.isResolved || thread.isOutdated;
+    const [expanded, setExpanded] = useState(!collapsedByDefault);
+    const [replyOpen, setReplyOpen] = useState(false);
+    const [replyValue, setReplyValue] = useState("");
+    const [busy, setBusy] = useState<"reply" | "resolve" | "fix" | null>(null);
+    const [error, setError] = useState<string | null>(null);
+    const [localResolved, setLocalResolved] = useState(thread.isResolved);
+
+    const cardRef = useRef<HTMLDivElement | null>(null);
+    const navigate = useNavigate();
+    const resolveInFlightRef = useRef(false);
+    const replyInFlightRef = useRef(false);
+
+    useEffect(() => {
+      setLocalResolved(thread.isResolved);
+    }, [thread.isResolved]);
+
+    useImperativeHandle(ref, () => ({
+      focus: () => {
+        cardRef.current?.focus();
+      },
+    }));
+
+    useEffect(() => {
+      if (focused) {
+        cardRef.current?.focus({ preventScroll: true });
+      }
+    }, [focused]);
+
+    const chip = useMemo(() => {
+      return statusChip({ ...thread, isResolved: localResolved });
+    }, [thread, localResolved]);
+
+    const fileLabel = useMemo(() => {
+      if (!thread.path) return null;
+      const line = thread.startLine ?? thread.line ?? thread.originalLine;
+      return line ? `${thread.path}:${line}` : thread.path;
+    }, [thread]);
+
+    const handleViewDiff = useCallback(() => {
+      if (!thread.path) return;
+      navigate("/files", {
+        state: {
+          openFilePath: thread.path,
+          laneId,
+          mode: "diff",
+          startLine: thread.startLine ?? thread.line ?? thread.originalLine ?? null,
+        },
+      });
+    }, [navigate, thread, laneId]);
+
+    const handleReply = useCallback(async () => {
+      if (replyInFlightRef.current) return;
+      const bridge = window.ade?.prs?.postReviewComment;
+      if (!bridge) return;
+      const body = replyValue.trim();
+      if (!body) return;
+      replyInFlightRef.current = true;
+      setBusy("reply");
+      setError(null);
+      try {
+        await bridge({ prId, threadId: thread.id, body });
+        setReplyValue("");
+        setReplyOpen(false);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : String(err));
+      } finally {
+        replyInFlightRef.current = false;
+        setBusy(null);
+      }
+    }, [replyValue, prId, thread.id]);
+
+    const handleResolveToggle = useCallback(async () => {
+      if (resolveInFlightRef.current) return;
+      const bridge = window.ade?.prs?.setReviewThreadResolved;
+      if (!bridge) return;
+      const next = !localResolved;
+      resolveInFlightRef.current = true;
+      setBusy("resolve");
+      setError(null);
+      try {
+        const result = await bridge({ prId, threadId: thread.id, resolved: next });
+        setLocalResolved(result?.isResolved ?? next);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : String(err));
+      } finally {
+        resolveInFlightRef.current = false;
+        setBusy(null);
+      }
+    }, [localResolved, prId, thread.id]);
+
+    const handleAskAiFix = useCallback(async () => {
+      const bridge = window.ade?.prs?.launchIssueResolutionFromThread;
+      if (!bridge) return;
+      setBusy("fix");
+      setError(null);
+      try {
+        const result = await bridge({
+          prId,
+          threadId: thread.id,
+          commentId: thread.comments[0]?.id ?? null,
+          modelId: modelId ?? null,
+          fileContext: thread.path
+            ? {
+                path: thread.path,
+                line: thread.line,
+                startLine: thread.startLine,
+              }
+            : null,
+        });
+        if (result?.href) {
+          navigate(result.href);
+        }
+      } catch (err) {
+        setError(err instanceof Error ? err.message : String(err));
+      } finally {
+        setBusy(null);
+      }
+    }, [prId, thread, modelId, navigate]);
+
+    const handleReact = useCallback(
+      async (commentId: string, content: PrReactionContent) => {
+        const bridge = window.ade?.prs?.reactToComment;
+        if (!bridge) return;
+        try {
+          await bridge({ prId, commentId, content });
+        } catch (err) {
+          setError(err instanceof Error ? err.message : String(err));
+        }
+      },
+      [prId],
+    );
+
+    const onKeyDown = useCallback(
+      (event: ReactKeyboardEvent<HTMLDivElement>) => {
+        if (event.defaultPrevented) return;
+        const target = event.target as HTMLElement;
+        if (target.tagName === "TEXTAREA" || target.tagName === "INPUT") return;
+        if (event.key === "r") {
+          event.preventDefault();
+          setExpanded(true);
+          setReplyOpen(true);
+        } else if (event.key === "x") {
+          event.preventDefault();
+          void handleResolveToggle();
+        } else if (event.key === "]" || event.key === "n") {
+          event.preventDefault();
+          onNext?.();
+        } else if (event.key === "[" || event.key === "p") {
+          event.preventDefault();
+          onPrev?.();
+        }
+      },
+      [handleResolveToggle, onNext, onPrev],
+    );
+
+    const containerStyle: CSSProperties = cardStyle({
+      padding: 0,
+      borderRadius: 12,
+      outline: focused ? `2px solid ${COLORS.accent}` : "none",
+      outlineOffset: focused ? 1 : 0,
+    });
+
+    if (!expanded) {
+      return (
+        <div
+          ref={cardRef}
+          data-pr-review-thread-card
+          data-expanded="false"
+          data-resolved={localResolved ? "true" : "false"}
+          tabIndex={0}
+          role="button"
+          aria-expanded={false}
+          onClick={() => setExpanded(true)}
+          onFocus={onFocus}
+          onKeyDown={onKeyDown}
+          onKeyUp={(e) => {
+            if (e.key === "Enter" || e.key === " ") setExpanded(true);
+          }}
+          className="flex w-full cursor-pointer items-center gap-3 px-3 py-2 text-left transition-colors hover:bg-white/[0.04]"
+          style={containerStyle}
+        >
+          <CheckCircle
+            size={14}
+            weight={localResolved ? "fill" : "regular"}
+            style={{ color: localResolved ? COLORS.success : COLORS.textMuted }}
+          />
+          <span
+            className="flex-1 truncate text-[12px]"
+            style={{ color: COLORS.textSecondary, fontFamily: SANS_FONT }}
+          >
+            <span style={{ color: COLORS.textPrimary, fontWeight: 500 }}>{chip.label}</span>
+            <span> · {thread.comments.length} {thread.comments.length === 1 ? "comment" : "comments"}</span>
+            {fileLabel ? <span> · {fileLabel}</span> : null}
+          </span>
+        </div>
+      );
+    }
+
+    return (
+      <div
+        ref={cardRef}
+        data-pr-review-thread-card
+        data-expanded="true"
+        data-resolved={localResolved ? "true" : "false"}
+        tabIndex={0}
+        onFocus={onFocus}
+        onKeyDown={onKeyDown}
+        className="flex flex-col"
+        style={containerStyle}
+      >
+        <div
+          className="flex items-center gap-3 border-b px-4 py-2.5"
+          style={{ borderColor: COLORS.border }}
+        >
+          <AvatarStack comments={thread.comments} />
+          <div className="flex min-w-0 flex-1 flex-col">
+            {fileLabel ? (
+              <span
+                className="truncate text-[11px] font-medium"
+                style={{ color: COLORS.textSecondary, fontFamily: SANS_FONT }}
+              >
+                {fileLabel}
+              </span>
+            ) : null}
+            <span className="text-[11px]" style={{ color: COLORS.textMuted }}>
+              {thread.comments.length} {thread.comments.length === 1 ? "comment" : "comments"}
+            </span>
+          </div>
+          <span style={inlineBadge(chip.color, { padding: "2px 8px" })}>{chip.label}</span>
+          <button
+            type="button"
+            aria-label="Collapse thread"
+            onClick={() => setExpanded(false)}
+            className="inline-flex h-6 w-6 items-center justify-center rounded-[6px] transition-colors hover:bg-white/[0.06]"
+            style={{ color: COLORS.textMuted }}
+          >
+            <X size={12} weight="bold" />
+          </button>
+        </div>
+
+        <div className="flex flex-col px-4">
+          {thread.comments.map((c, idx) => (
+            <div
+              key={c.id}
+              style={idx > 0 ? { borderTop: `1px solid ${COLORS.borderMuted}` } : undefined}
+            >
+              <CommentRow
+                comment={c}
+                prId={prId}
+                repoOwner={repoOwner}
+                repoName={repoName}
+                onReact={handleReact}
+              />
+            </div>
+          ))}
+        </div>
+
+        {error ? (
+          <div
+            className="mx-4 mb-2 rounded-[6px] border px-3 py-2 text-[11px]"
+            style={{
+              borderColor: `${COLORS.danger}40`,
+              background: `${COLORS.danger}10`,
+              color: COLORS.danger,
+              fontFamily: SANS_FONT,
+            }}
+            role="alert"
+          >
+            {error}
+          </div>
+        ) : null}
+
+        {replyOpen ? (
+          <div className="flex flex-col gap-2 border-t px-4 py-3" style={{ borderColor: COLORS.border }}>
+            <textarea
+              value={replyValue}
+              onChange={(e) => setReplyValue(e.target.value)}
+              placeholder={viewerLogin ? `Reply as @${viewerLogin}…` : "Reply…"}
+              rows={3}
+              className="w-full resize-y rounded-[8px] border px-3 py-2 text-[12px] outline-none"
+              style={{
+                borderColor: COLORS.border,
+                background: COLORS.recessedBg,
+                color: COLORS.textPrimary,
+                fontFamily: SANS_FONT,
+              }}
+            />
+            <div className="flex items-center justify-end gap-2">
+              <button
+                type="button"
+                onClick={() => {
+                  setReplyOpen(false);
+                  setReplyValue("");
+                }}
+                style={outlineButton({ height: 28, fontSize: 11 })}
+              >
+                Cancel
+              </button>
+              <button
+                type="button"
+                onClick={handleReply}
+                disabled={!replyValue.trim() || busy === "reply"}
+                style={outlineButton({
+                  height: 28,
+                  fontSize: 11,
+                  background: COLORS.accentSubtle,
+                  borderColor: COLORS.accentBorder,
+                  color: COLORS.accent,
+                  opacity: !replyValue.trim() || busy === "reply" ? 0.5 : 1,
+                })}
+              >
+                {busy === "reply" ? "Posting…" : "Post reply"}
+              </button>
+            </div>
+          </div>
+        ) : null}
+
+        <div
+          className="flex flex-wrap items-center gap-2 border-t px-4 py-2"
+          style={{ borderColor: COLORS.border, background: "rgba(255,255,255,0.01)" }}
+        >
+          {thread.path ? (
+            <button
+              type="button"
+              onClick={handleViewDiff}
+              style={outlineButton({ height: 26, fontSize: 11, padding: "0 10px" })}
+            >
+              <ArrowSquareOut size={11} weight="regular" />
+              View file diff
+            </button>
+          ) : null}
+          <button
+            type="button"
+            onClick={() => setReplyOpen((v) => !v)}
+            style={outlineButton({ height: 26, fontSize: 11, padding: "0 10px" })}
+          >
+            <ChatCircleDots size={11} weight="regular" />
+            Reply
+          </button>
+          <button
+            type="button"
+            onClick={handleResolveToggle}
+            disabled={busy === "resolve"}
+            style={outlineButton({
+              height: 26,
+              fontSize: 11,
+              padding: "0 10px",
+              color: localResolved ? COLORS.textSecondary : COLORS.success,
+              opacity: busy === "resolve" ? 0.6 : 1,
+            })}
+          >
+            <CheckCircle size={11} weight={localResolved ? "fill" : "regular"} />
+            {localResolved ? "Unresolve" : "Resolve"}
+          </button>
+          <button
+            type="button"
+            onClick={handleAskAiFix}
+            disabled={busy === "fix"}
+            style={outlineButton({
+              height: 26,
+              fontSize: 11,
+              padding: "0 10px",
+              color: COLORS.accent,
+              borderColor: COLORS.accentBorder,
+              background: COLORS.accentSubtle,
+              opacity: busy === "fix" ? 0.6 : 1,
+            })}
+          >
+            <Sparkle size={11} weight="regular" />
+            {busy === "fix" ? "Launching…" : "Ask AI to fix"}
+          </button>
+        </div>
+      </div>
+    );
+  }),
+);
+
+export default PrReviewThreadCard;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrStatusRail.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrStatusRail.test.tsx
new file mode 100644
index 000000000..9835eda89
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrStatusRail.test.tsx
@@ -0,0 +1,135 @@
+// @vitest-environment jsdom
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+
+import { PrStatusRail } from "./PrStatusRail";
+import type { PrCheck, PrDeployment } from "../../../../shared/types/prs";
+
+afterEach(cleanup);
+
+function makeCheck(overrides: Partial<PrCheck> = {}): PrCheck {
+  return {
+    name: "ci / test",
+    status: "completed",
+    conclusion: "success",
+    detailsUrl: "https://example.com/runs/1",
+    startedAt: new Date(Date.now() - 60_000).toISOString(),
+    completedAt: new Date().toISOString(),
+    ...overrides,
+  };
+}
+
+function makeDeployment(overrides: Partial<PrDeployment> = {}): PrDeployment {
+  return {
+    id: "dep-1",
+    environment: "preview",
+    state: "success",
+    description: "Deployed preview",
+    environmentUrl: "https://preview.example.com",
+    logUrl: "https://vercel.com/inspector",
+    sha: null,
+    ref: null,
+    creator: "vercel[bot]",
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    ...overrides,
+  };
+}
+
+describe("PrStatusRail", () => {
+  it("renders the three sections with empty messages when data is absent", () => {
+    render(
+      <PrStatusRail
+        checks={[]}
+        deployments={[]}
+        mergeState={{
+          mergeable: "unknown",
+          hasConflicts: false,
+          approvals: 0,
+          requiredApprovals: null,
+          failingChecks: 0,
+          pendingChecks: 0,
+          githubUrl: null,
+        }}
+        onOpenLog={() => {}}
+        onOpenExternal={() => {}}
+      />,
+    );
+    expect(screen.getByText(/No checks have reported/i)).toBeTruthy();
+    expect(screen.getByText(/No active deployments/i)).toBeTruthy();
+  });
+
+  it("groups checks by provider and triggers onOpenLog when logs button is clicked", () => {
+    const openLog = vi.fn();
+    render(
+      <PrStatusRail
+        checks={[
+          makeCheck({ name: "ci/lint" }),
+          makeCheck({ name: "codeql-analysis" }),
+          makeCheck({ name: "greptile-review" }),
+        ]}
+        deployments={[]}
+        mergeState={{
+          mergeable: "clean",
+          hasConflicts: false,
+          approvals: 2,
+          requiredApprovals: 1,
+          failingChecks: 0,
+          pendingChecks: 0,
+          githubUrl: "https://github.com/example/repo/pull/1",
+        }}
+        onOpenLog={openLog}
+        onOpenExternal={() => {}}
+      />,
+    );
+    expect(screen.getAllByTestId("pr-status-rail-check-row")).toHaveLength(3);
+    const btns = screen.getAllByLabelText(/View logs/);
+    fireEvent.click(btns[0]!);
+    expect(openLog).toHaveBeenCalled();
+  });
+
+  it("renders deployment cards when deployments are present", () => {
+    render(
+      <PrStatusRail
+        checks={[]}
+        deployments={[makeDeployment(), makeDeployment({ id: "dep-2", environment: "staging" })]}
+        mergeState={{
+          mergeable: "clean",
+          hasConflicts: false,
+          approvals: 0,
+          requiredApprovals: null,
+          failingChecks: 0,
+          pendingChecks: 0,
+          githubUrl: null,
+        }}
+        onOpenLog={() => {}}
+        onOpenExternal={() => {}}
+      />,
+    );
+    expect(screen.getAllByTestId("pr-deployment-card")).toHaveLength(2);
+  });
+
+  it("opens merge page externally when Merge on GitHub is clicked", () => {
+    const openExternal = vi.fn();
+    render(
+      <PrStatusRail
+        checks={[]}
+        deployments={[]}
+        mergeState={{
+          mergeable: "clean",
+          hasConflicts: false,
+          approvals: 1,
+          requiredApprovals: 1,
+          failingChecks: 0,
+          pendingChecks: 0,
+          githubUrl: "https://github.com/example/repo/pull/1",
+        }}
+        onOpenLog={() => {}}
+        onOpenExternal={openExternal}
+      />,
+    );
+    fireEvent.click(screen.getByRole("button", { name: /Merge on GitHub/i }));
+    expect(openExternal).toHaveBeenCalledWith("https://github.com/example/repo/pull/1");
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrStatusRail.tsx b/apps/desktop/src/renderer/components/prs/shared/PrStatusRail.tsx
new file mode 100644
index 000000000..486cb0ad9
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrStatusRail.tsx
@@ -0,0 +1,353 @@
+import { memo, useMemo } from "react";
+import { ArrowSquareOut, GitMerge, Warning, CheckCircle, Clock } from "@phosphor-icons/react";
+
+import type { PrCheck, PrDeployment } from "../../../../shared/types/prs";
+import { COLORS, MONO_FONT, healthColor } from "../../lanes/laneDesignTokens";
+import { formatDurationMs } from "../../../lib/format";
+import { PrDeploymentCard } from "./PrDeploymentCard";
+
+export type PrStatusRailMergeState = {
+  mergeable: "clean" | "dirty" | "unknown";
+  hasConflicts: boolean;
+  approvals: number;
+  requiredApprovals: number | null;
+  failingChecks: number;
+  pendingChecks: number;
+  githubUrl: string | null;
+};
+
+type CheckGroup = "ci" | "security" | "bots" | "other";
+
+export type PrStatusRailProps = {
+  checks: PrCheck[];
+  deployments: PrDeployment[];
+  mergeState: PrStatusRailMergeState;
+  onOpenLog: (check: PrCheck) => void;
+  onOpenExternal: (url: string) => void;
+};
+
+const SECURITY_KEYWORDS = ["codeql", "snyk", "dependabot", "trivy", "security", "sast"];
+const BOT_KEYWORDS = ["bot", "greptile", "coderabbit", "sonarcloud", "sonarqube", "codecov"];
+
+function groupCheck(check: PrCheck): CheckGroup {
+  const name = check.name.toLowerCase();
+  if (SECURITY_KEYWORDS.some((k) => name.includes(k))) return "security";
+  if (BOT_KEYWORDS.some((k) => name.includes(k))) return "bots";
+  if (name.includes("ci") || name.includes("build") || name.includes("test") || name.includes("lint")) {
+    return "ci";
+  }
+  return "other";
+}
+
+function checkDotColor(check: PrCheck): string {
+  if (check.status !== "completed") return COLORS.warning;
+  switch (check.conclusion) {
+    case "success":
+      return healthColor("healthy");
+    case "failure":
+    case "cancelled":
+      return healthColor("unhealthy");
+    case "neutral":
+    case "skipped":
+      return COLORS.textDim;
+    default:
+      return COLORS.textMuted;
+  }
+}
+
+function durationMs(check: PrCheck): number | null {
+  if (!check.startedAt) return null;
+  const end = check.completedAt ? Date.parse(check.completedAt) : Date.now();
+  const start = Date.parse(check.startedAt);
+  if (Number.isNaN(start) || Number.isNaN(end)) return null;
+  return Math.max(0, end - start);
+}
+
+export const PrStatusRail = memo(function PrStatusRail({
+  checks,
+  deployments,
+  mergeState,
+  onOpenLog,
+  onOpenExternal,
+}: PrStatusRailProps) {
+  const grouped = useMemo(() => {
+    const groups: Record<CheckGroup, PrCheck[]> = { ci: [], security: [], bots: [], other: [] };
+    for (const check of checks) {
+      groups[groupCheck(check)].push(check);
+    }
+    return groups;
+  }, [checks]);
+
+  return (
+    <div
+      data-testid="pr-status-rail"
+      className="relative flex h-full w-full flex-col overflow-y-auto"
+      style={{ background: COLORS.cardBg, borderLeft: `1px solid ${COLORS.border}` }}
+    >
+      <RailSection title="Checks">
+        {checks.length === 0 ? (
+          <EmptyRow>No checks have reported yet.</EmptyRow>
+        ) : (
+          <>
+            <CheckGroupBlock
+              label="CI"
+              checks={grouped.ci}
+              onOpenLog={onOpenLog}
+              onOpenExternal={onOpenExternal}
+            />
+            <CheckGroupBlock
+              label="Bots"
+              checks={grouped.bots}
+              onOpenLog={onOpenLog}
+              onOpenExternal={onOpenExternal}
+            />
+            <CheckGroupBlock
+              label="Security"
+              checks={grouped.security}
+              onOpenLog={onOpenLog}
+              onOpenExternal={onOpenExternal}
+            />
+            <CheckGroupBlock
+              label="Other"
+              checks={grouped.other}
+              onOpenLog={onOpenLog}
+              onOpenExternal={onOpenExternal}
+            />
+          </>
+        )}
+      </RailSection>
+
+      <RailSection title="Deployments">
+        {deployments.length === 0 ? (
+          <EmptyRow>No active deployments.</EmptyRow>
+        ) : (
+          <div className="flex flex-col gap-1.5 px-2.5 pb-2">
+            {deployments.map((d) => (
+              <PrDeploymentCard key={d.id} deployment={d} />
+            ))}
+          </div>
+        )}
+      </RailSection>
+
+      <RailSection title="Merge">
+        <MergeSummary mergeState={mergeState} onOpenExternal={onOpenExternal} />
+      </RailSection>
+    </div>
+  );
+});
+
+function RailSection({ title, children }: { title: string; children: React.ReactNode }) {
+  return (
+    <section
+      style={{ borderBottom: `1px solid ${COLORS.border}` }}
+      data-testid={`pr-status-rail-section-${title.toLowerCase()}`}
+    >
+      <div
+        className="flex items-center px-2.5 pt-2.5"
+        style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+      >
+        <span className="text-[10px] font-bold uppercase tracking-[1px]">{title}</span>
+      </div>
+      <div className="pt-1.5 pb-2">{children}</div>
+    </section>
+  );
+}
+
+function EmptyRow({ children }: { children: React.ReactNode }) {
+  return (
+    <div className="px-3 py-1 text-[11px]" style={{ color: COLORS.textDim }}>
+      {children}
+    </div>
+  );
+}
+
+function CheckGroupBlock({
+  label,
+  checks,
+  onOpenLog,
+  onOpenExternal,
+}: {
+  label: string;
+  checks: PrCheck[];
+  onOpenLog: (check: PrCheck) => void;
+  onOpenExternal: (url: string) => void;
+}) {
+  if (checks.length === 0) return null;
+  return (
+    <div className="px-2.5 pb-1 pt-0.5">
+      <div
+        className="px-1 pb-1 text-[9px] font-bold uppercase tracking-[1px]"
+        style={{ color: COLORS.textMuted, fontFamily: MONO_FONT }}
+      >
+        {label}
+      </div>
+      <div className="flex flex-col">
+        {checks.map((check) => (
+          <CheckRow
+            key={`${label}-${check.name}`}
+            check={check}
+            onOpenLog={onOpenLog}
+            onOpenExternal={onOpenExternal}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+function CheckRow({
+  check,
+  onOpenLog,
+  onOpenExternal,
+}: {
+  check: PrCheck;
+  onOpenLog: (check: PrCheck) => void;
+  onOpenExternal: (url: string) => void;
+}) {
+  const duration = durationMs(check);
+  return (
+    <div
+      className="flex items-center gap-2 py-1.5"
+      data-testid="pr-status-rail-check-row"
+      data-check-name={check.name}
+    >
+      <span
+        className="inline-block h-2 w-2 shrink-0 rounded-full"
+        style={{ background: checkDotColor(check) }}
+      />
+      <span
+        className="min-w-0 flex-1 truncate text-[11px]"
+        style={{ color: COLORS.textPrimary }}
+      >
+        {check.name}
+      </span>
+      {duration != null ? (
+        <span
+          className="text-[10px]"
+          style={{ color: COLORS.textMuted, fontFamily: MONO_FONT }}
+        >
+          {formatDurationMs(duration)}
+        </span>
+      ) : null}
+      <button
+        type="button"
+        onClick={() => {
+          if (check.detailsUrl) {
+            onOpenLog(check);
+          }
+        }}
+        disabled={!check.detailsUrl}
+        className="inline-flex items-center gap-0.5 px-1.5 py-0.5 text-[10px] transition-colors"
+        style={{
+          color: check.detailsUrl ? COLORS.accent : COLORS.textDim,
+          cursor: check.detailsUrl ? "pointer" : "not-allowed",
+          fontFamily: MONO_FONT,
+        }}
+        aria-label={`View logs for ${check.name}`}
+      >
+        logs
+        <ArrowSquareOut size={9} weight="regular" />
+      </button>
+    </div>
+  );
+}
+
+function MergeSummary({
+  mergeState,
+  onOpenExternal,
+}: {
+  mergeState: PrStatusRailMergeState;
+  onOpenExternal: (url: string) => void;
+}) {
+  const approvalsNeeded =
+    mergeState.requiredApprovals != null &&
+    mergeState.approvals < mergeState.requiredApprovals;
+
+  return (
+    <div className="flex flex-col gap-1.5 px-2.5 pb-2">
+      <div className="flex items-center gap-1.5 text-[11px]" style={{ color: COLORS.textPrimary }}>
+        {mergeState.hasConflicts ? (
+          <>
+            <Warning size={12} weight="fill" style={{ color: COLORS.danger }} />
+            <span style={{ color: COLORS.danger }}>Conflicts with base</span>
+          </>
+        ) : mergeState.mergeable === "clean" ? (
+          <>
+            <CheckCircle size={12} weight="fill" style={{ color: COLORS.success }} />
+            <span>Ready to merge</span>
+          </>
+        ) : mergeState.mergeable === "dirty" ? (
+          <>
+            <Warning size={12} weight="fill" style={{ color: COLORS.warning }} />
+            <span style={{ color: COLORS.warning }}>Unmergeable</span>
+          </>
+        ) : (
+          <>
+            <Clock size={12} weight="fill" style={{ color: COLORS.textMuted }} />
+            <span style={{ color: COLORS.textMuted }}>Checking mergeability…</span>
+          </>
+        )}
+      </div>
+
+      <MergeStat
+        label="Approvals"
+        value={
+          mergeState.requiredApprovals != null
+            ? `${mergeState.approvals}/${mergeState.requiredApprovals}`
+            : String(mergeState.approvals)
+        }
+        tone={approvalsNeeded ? "warning" : "ok"}
+      />
+      <MergeStat
+        label="Failing"
+        value={String(mergeState.failingChecks)}
+        tone={mergeState.failingChecks > 0 ? "danger" : "ok"}
+      />
+      <MergeStat
+        label="Pending"
+        value={String(mergeState.pendingChecks)}
+        tone={mergeState.pendingChecks > 0 ? "warning" : "ok"}
+      />
+
+      <button
+        type="button"
+        onClick={() => {
+          if (mergeState.githubUrl) onOpenExternal(mergeState.githubUrl);
+        }}
+        disabled={!mergeState.githubUrl}
+        className="mt-1 inline-flex h-7 items-center justify-center gap-1.5 text-[11px] font-medium transition-colors"
+        style={{
+          color: mergeState.githubUrl ? COLORS.accent : COLORS.textDim,
+          background: mergeState.githubUrl ? COLORS.accentSubtle : "transparent",
+          border: `1px solid ${mergeState.githubUrl ? COLORS.accentBorder : COLORS.border}`,
+          cursor: mergeState.githubUrl ? "pointer" : "not-allowed",
+        }}
+      >
+        <GitMerge size={11} weight="bold" />
+        Merge on GitHub
+        <ArrowSquareOut size={10} weight="regular" />
+      </button>
+    </div>
+  );
+}
+
+function MergeStat({
+  label,
+  value,
+  tone,
+}: {
+  label: string;
+  value: string;
+  tone: "ok" | "warning" | "danger";
+}) {
+  const color =
+    tone === "danger" ? COLORS.danger : tone === "warning" ? COLORS.warning : COLORS.textPrimary;
+  return (
+    <div className="flex items-center justify-between text-[11px]">
+      <span style={{ color: COLORS.textMuted }}>{label}</span>
+      <span style={{ color, fontFamily: MONO_FONT }}>{value}</span>
+    </div>
+  );
+}
+
+export default PrStatusRail;
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrTimeline.test.tsx b/apps/desktop/src/renderer/components/prs/shared/PrTimeline.test.tsx
new file mode 100644
index 000000000..1508fac00
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrTimeline.test.tsx
@@ -0,0 +1,360 @@
+// @vitest-environment jsdom
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createRef } from "react";
+import { act, cleanup, fireEvent, render, screen } from "@testing-library/react";
+
+// Mock child cards to keep this test focused on Timeline behavior.
+vi.mock("./PrReviewThreadCard", () => ({
+  PrReviewThreadCard: ({
+    thread,
+    focused,
+  }: {
+    thread: { id: string };
+    focused?: boolean;
+  }) => (
+    <div data-testid="review-thread-card" data-thread-id={thread.id} data-focused={!!focused} />
+  ),
+}));
+
+vi.mock("./PrBotReviewCard", () => ({
+  PrBotReviewCard: ({ review }: { review: { reviewer: string } }) => (
+    <div data-testid="bot-review-card" data-reviewer={review.reviewer} />
+  ),
+  detectBotProvider: (login: string) => (login.endsWith("[bot]") ? "coderabbit" : null),
+}));
+
+vi.mock("./PrAiSummaryCard", () => ({
+  PrAiSummaryCard: ({ prId }: { prId: string }) => (
+    <div data-testid="ai-summary-card" data-pr-id={prId} />
+  ),
+  isAiSummaryDismissed: () => false,
+}));
+
+vi.mock("./PrMarkdown", () => ({
+  PrMarkdown: ({ children }: { children: string }) => (
+    <div data-testid="pr-markdown">{children}</div>
+  ),
+}));
+
+// Mock the virtualizer: jsdom has no layout, so by default getVirtualItems
+// returns an empty list. Render all items at once so tests can assert
+// rendered content without coordinating scroll state.
+const virtualizerSpy = vi.fn();
+vi.mock("@tanstack/react-virtual", () => ({
+  useVirtualizer: (options: { count: number; estimateSize: () => number }) => {
+    virtualizerSpy(options);
+    const size = options.estimateSize();
+    return {
+      getTotalSize: () => options.count * size,
+      getVirtualItems: () =>
+        Array.from({ length: options.count }, (_, index) => ({
+          index,
+          key: index,
+          start: index * size,
+          size,
+        })),
+      scrollToIndex: () => {},
+      measureElement: () => {},
+    };
+  },
+}));
+
+import type {
+  PrTimelineEvent,
+  PrAiSummary,
+} from "../../../../shared/types/prs";
+import {
+  PrTimeline,
+  applyTimelineFilters,
+  DEFAULT_PR_TIMELINE_FILTERS,
+  type PrTimelineRef,
+  type PrTimelineFilters,
+} from "./PrTimeline";
+
+beforeEach(() => {
+  // IntersectionObserver stub — mark everything immediately visible.
+  (globalThis as unknown as { IntersectionObserver: unknown }).IntersectionObserver = class {
+    constructor(private cb: (entries: IntersectionObserverEntry[]) => void) {}
+    observe(el: Element) {
+      this.cb([
+        {
+          isIntersecting: true,
+          target: el,
+        } as unknown as IntersectionObserverEntry,
+      ]);
+    }
+    unobserve() {}
+    disconnect() {}
+    takeRecords() {
+      return [];
+    }
+    root = null;
+    rootMargin = "";
+    thresholds = [];
+  };
+
+  // scrollTo is called by the virtualizer when `scrollToIndex` runs.
+  // jsdom doesn't implement it on HTMLElement so stub it.
+  Element.prototype.scrollTo = function () {};
+});
+
+afterEach(() => {
+  cleanup();
+  vi.restoreAllMocks();
+});
+
+function makeEvent(overrides: Partial<PrTimelineEvent> & Pick<PrTimelineEvent, "type">): PrTimelineEvent {
+  const base = {
+    id: "ev-" + Math.random().toString(36).slice(2, 10),
+    timestamp: new Date().toISOString(),
+    author: "alice",
+    avatarUrl: null,
+  };
+  // We rely on caller passing the rest of the discriminated union fields.
+  return { ...base, ...overrides } as PrTimelineEvent;
+}
+
+function fixture500(): PrTimelineEvent[] {
+  const events: PrTimelineEvent[] = [];
+  for (let i = 0; i < 500; i += 1) {
+    events.push(
+      makeEvent({
+        id: `e-${i}`,
+        type: "commit_push",
+        sha: "a".repeat(40),
+        shortSha: "aaaaaaa",
+        subject: `commit ${i}`,
+        commitCount: 1,
+        forcePushed: false,
+      }),
+    );
+  }
+  return events;
+}
+
+describe("applyTimelineFilters", () => {
+  const events: PrTimelineEvent[] = [
+    makeEvent({
+      id: "t-open",
+      type: "review_thread",
+      threadId: "t-open",
+      path: "a.ts",
+      line: 1,
+      startLine: null,
+      isResolved: false,
+      isOutdated: false,
+      commentCount: 1,
+      firstCommentBody: "issue",
+    }),
+    makeEvent({
+      id: "t-resolved",
+      type: "review_thread",
+      threadId: "t-resolved",
+      path: "b.ts",
+      line: 2,
+      startLine: null,
+      isResolved: true,
+      isOutdated: false,
+      commentCount: 1,
+      firstCommentBody: "done",
+    }),
+    makeEvent({
+      id: "t-outdated",
+      type: "review_thread",
+      threadId: "t-outdated",
+      path: "c.ts",
+      line: 3,
+      startLine: null,
+      isResolved: false,
+      isOutdated: true,
+      commentCount: 1,
+      firstCommentBody: "stale",
+    }),
+  ];
+
+  it("hides resolved and outdated by default", () => {
+    const out = applyTimelineFilters(events, DEFAULT_PR_TIMELINE_FILTERS, "alice");
+    const ids = out.map((e) => e.id);
+    expect(ids).toEqual(["t-open"]);
+  });
+
+  it("includes resolved + outdated when flags are on", () => {
+    const filters: PrTimelineFilters = {
+      showResolved: true,
+      showOutdated: true,
+      onlyMine: false,
+      onlyBots: false,
+    };
+    const out = applyTimelineFilters(events, filters, "alice");
+    expect(out).toHaveLength(3);
+  });
+});
+
+describe("PrTimeline", () => {
+  it("mounts without crashing on a 500-event fixture and uses the virtualizer", () => {
+    virtualizerSpy.mockClear();
+    const events = fixture500();
+    render(
+      <PrTimeline
+        events={events}
+        prId="pr-1"
+        laneId={null}
+        repoOwner="acme"
+        repoName="ade"
+        viewerLogin="alice"
+        filters={DEFAULT_PR_TIMELINE_FILTERS}
+        onFiltersChange={() => {}}
+      />,
+    );
+    expect(virtualizerSpy).toHaveBeenCalled();
+    const args = virtualizerSpy.mock.calls[0]![0] as { count: number };
+    expect(args.count).toBe(500);
+  });
+
+  it("hides resolved review threads under default filters", () => {
+    const events: PrTimelineEvent[] = [
+      makeEvent({
+        id: "open",
+        type: "review_thread",
+        threadId: "t1",
+        path: "a.ts",
+        line: 10,
+        startLine: null,
+        isResolved: false,
+        isOutdated: false,
+        commentCount: 1,
+        firstCommentBody: "open",
+      }),
+      makeEvent({
+        id: "closed",
+        type: "review_thread",
+        threadId: "t2",
+        path: "b.ts",
+        line: 2,
+        startLine: null,
+        isResolved: true,
+        isOutdated: false,
+        commentCount: 1,
+        firstCommentBody: "closed",
+      }),
+    ];
+    render(
+      <PrTimeline
+        events={events}
+        prId="pr-1"
+        laneId={null}
+        repoOwner="acme"
+        repoName="ade"
+        viewerLogin="alice"
+        filters={DEFAULT_PR_TIMELINE_FILTERS}
+        onFiltersChange={() => {}}
+      />,
+    );
+    const cards = screen.getAllByTestId("review-thread-card");
+    const ids = cards.map((c) => c.getAttribute("data-thread-id"));
+    expect(ids).toContain("t1");
+    expect(ids).not.toContain("t2");
+  });
+
+  it("nextUnresolved advances the focused event id via imperative handle", () => {
+    const events: PrTimelineEvent[] = [
+      makeEvent({
+        id: "t1",
+        type: "review_thread",
+        threadId: "t1",
+        path: null,
+        line: null,
+        startLine: null,
+        isResolved: false,
+        isOutdated: false,
+        commentCount: 1,
+        firstCommentBody: "a",
+      }),
+      makeEvent({
+        id: "t2",
+        type: "review_thread",
+        threadId: "t2",
+        path: null,
+        line: null,
+        startLine: null,
+        isResolved: false,
+        isOutdated: false,
+        commentCount: 1,
+        firstCommentBody: "b",
+      }),
+    ];
+    const ref = createRef<PrTimelineRef>();
+    render(
+      <PrTimeline
+        ref={ref}
+        events={events}
+        prId="pr-1"
+        laneId={null}
+        repoOwner="acme"
+        repoName="ade"
+        viewerLogin="alice"
+        filters={DEFAULT_PR_TIMELINE_FILTERS}
+        onFiltersChange={() => {}}
+      />,
+    );
+    expect(ref.current).not.toBeNull();
+    act(() => ref.current!.nextUnresolved());
+    const first = screen
+      .getAllByTestId("review-thread-card")
+      .find((card) => card.getAttribute("data-focused") === "true");
+    expect(first?.getAttribute("data-thread-id")).toBe("t1");
+    act(() => ref.current!.nextUnresolved());
+    const second = screen
+      .getAllByTestId("review-thread-card")
+      .find((card) => card.getAttribute("data-focused") === "true");
+    expect(second?.getAttribute("data-thread-id")).toBe("t2");
+  });
+
+  it("toggles the onlyMine filter when Mine pill is clicked", () => {
+    const onFiltersChange = vi.fn();
+    render(
+      <PrTimeline
+        events={[]}
+        prId="pr-1"
+        laneId={null}
+        repoOwner="acme"
+        repoName="ade"
+        viewerLogin="alice"
+        filters={DEFAULT_PR_TIMELINE_FILTERS}
+        onFiltersChange={onFiltersChange}
+      />,
+    );
+    fireEvent.click(screen.getByRole("button", { name: /Mine/i }));
+    expect(onFiltersChange).toHaveBeenCalledWith({
+      ...DEFAULT_PR_TIMELINE_FILTERS,
+      onlyMine: true,
+    });
+  });
+
+  it("renders the AI summary card when a summary is provided", () => {
+    const summary: PrAiSummary = {
+      prId: "pr-1",
+      summary: "LGTM",
+      riskAreas: [],
+      reviewerHotspots: [],
+      unresolvedConcerns: [],
+      generatedAt: new Date().toISOString(),
+      headSha: "a".repeat(40),
+    };
+    render(
+      <PrTimeline
+        events={[]}
+        prId="pr-1"
+        laneId={null}
+        repoOwner="acme"
+        repoName="ade"
+        viewerLogin="alice"
+        filters={DEFAULT_PR_TIMELINE_FILTERS}
+        onFiltersChange={() => {}}
+        summary={summary}
+      />,
+    );
+    expect(screen.getByTestId("ai-summary-card")).toBeTruthy();
+  });
+});
diff --git a/apps/desktop/src/renderer/components/prs/shared/PrTimeline.tsx b/apps/desktop/src/renderer/components/prs/shared/PrTimeline.tsx
new file mode 100644
index 000000000..4b8d5a7fe
--- /dev/null
+++ b/apps/desktop/src/renderer/components/prs/shared/PrTimeline.tsx
@@ -0,0 +1,977 @@
+import {
+  forwardRef,
+  memo,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+  type CSSProperties,
+  type ReactNode,
+} from "react";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import {
+  ChatCircle,
+  CheckCircle,
+  GitCommit,
+  Package,
+  Tag,
+  GitMerge,
+  ArrowDown,
+  Robot,
+  WarningCircle,
+  Clock,
+} from "@phosphor-icons/react";
+
+import type {
+  PrAiSummary,
+  PrTimelineEvent,
+  PrDeploymentState,
+  PrReview,
+  PrReviewThread,
+} from "../../../../shared/types/prs";
+import { COLORS, MONO_FONT } from "../../lanes/laneDesignTokens";
+import { relativeWhen } from "../../../lib/format";
+import { PrMarkdown } from "./PrMarkdown";
+import { PrReviewThreadCard } from "./PrReviewThreadCard";
+import { PrBotReviewCard, detectBotProvider } from "./PrBotReviewCard";
+import { PrAiSummaryCard } from "./PrAiSummaryCard";
+
+/* ══════════════════ Types ══════════════════ */
+
+export type PrTimelineFilters = {
+  showResolved: boolean;
+  showOutdated: boolean;
+  onlyMine: boolean;
+  onlyBots: boolean;
+};
+
+export const DEFAULT_PR_TIMELINE_FILTERS: PrTimelineFilters = {
+  showResolved: false,
+  showOutdated: false,
+  onlyMine: false,
+  onlyBots: false,
+};
+
+export type PrTimelineProps = {
+  events: PrTimelineEvent[];
+  prId: string;
+  laneId: string | null;
+  repoOwner: string;
+  repoName: string;
+  viewerLogin: string | null;
+  filters: PrTimelineFilters;
+  onFiltersChange: (next: PrTimelineFilters) => void;
+  summary?: PrAiSummary | null;
+  onRegenerateSummary?: () => void;
+  onDismissSummary?: () => void;
+  /** Fired (debounced) with the id of the top-most visible event as the user scrolls. */
+  onVisibleEventChange?: (eventId: string | null) => void;
+};
+
+export type PrTimelineRef = {
+  scrollToEventId: (id: string) => void;
+  focusEvent: (id: string) => void;
+  nextUnresolved: () => void;
+  prevUnresolved: () => void;
+};
+
+/* ══════════════════ Filtering ══════════════════ */
+
+function eventAuthor(event: PrTimelineEvent): string | null {
+  return event.author;
+}
+
+function isBotEvent(event: PrTimelineEvent): boolean {
+  if (event.type === "review" && event.isBot) return true;
+  if (event.type === "issue_comment" && event.isBot) return true;
+  const author = eventAuthor(event);
+  if (!author) return false;
+  return detectBotProvider(author) !== null;
+}
+
+export function applyTimelineFilters(
+  events: PrTimelineEvent[],
+  filters: PrTimelineFilters,
+  viewerLogin: string | null,
+): PrTimelineEvent[] {
+  return events.filter((event) => {
+    if (event.type === "review_thread") {
+      if (!filters.showResolved && event.isResolved) return false;
+      if (!filters.showOutdated && event.isOutdated) return false;
+    }
+    if (filters.onlyMine) {
+      if (!viewerLogin) return false;
+      const author = eventAuthor(event);
+      if (!author || author.toLowerCase() !== viewerLogin.toLowerCase()) return false;
+    }
+    if (filters.onlyBots && !isBotEvent(event)) {
+      return false;
+    }
+    return true;
+  });
+}
+
+function collectUnresolvedThreadIds(events: PrTimelineEvent[]): string[] {
+  const ids: string[] = [];
+  for (const event of events) {
+    if (event.type === "review_thread" && !event.isResolved) {
+      ids.push(event.id);
+    }
+  }
+  return ids;
+}
+
+/* ══════════════════ Intersection gating ══════════════════ */
+
+function useNearViewport(
+  parentRef: React.MutableRefObject<HTMLDivElement | null>,
+  rowRef: React.MutableRefObject<HTMLDivElement | null>,
+): boolean {
+  const [visible, setVisible] = useState(false);
+  useEffect(() => {
+    const row = rowRef.current;
+    const root = parentRef.current;
+    if (!row) return;
+    if (typeof IntersectionObserver === "undefined") {
+      setVisible(true);
+      return;
+    }
+    const observer = new IntersectionObserver(
+      (entries) => {
+        for (const entry of entries) {
+          if (entry.isIntersecting) {
+            setVisible(true);
+            observer.disconnect();
+            break;
+          }
+        }
+      },
+      { root: root ?? null, rootMargin: "500px 0px" },
+    );
+    observer.observe(row);
+    return () => observer.disconnect();
+  }, [parentRef, rowRef]);
+  return visible;
+}
+
+/* ══════════════════ Main component ══════════════════ */
+
+export const PrTimeline = forwardRef<PrTimelineRef, PrTimelineProps>(function PrTimeline(
+  {
+    events,
+    prId,
+    laneId,
+    repoOwner,
+    repoName,
+    viewerLogin,
+    filters,
+    onFiltersChange,
+    summary,
+    onRegenerateSummary,
+    onDismissSummary,
+    onVisibleEventChange,
+  },
+  ref,
+) {
+  const filtered = useMemo(
+    () => applyTimelineFilters(events, filters, viewerLogin),
+    [events, filters, viewerLogin],
+  );
+
+  const unresolvedIds = useMemo(() => collectUnresolvedThreadIds(filtered), [filtered]);
+
+  const parentRef = useRef<HTMLDivElement | null>(null);
+  const virtualizer = useVirtualizer({
+    count: filtered.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 120,
+    overscan: 4,
+  });
+
+  const indexById = useMemo(() => {
+    const map = new Map<string, number>();
+    filtered.forEach((event, idx) => map.set(event.id, idx));
+    return map;
+  }, [filtered]);
+
+  const [focusedEventId, setFocusedEventId] = useState<string | null>(null);
+
+  const scrollToIndex = useCallback(
+    (index: number) => {
+      if (index < 0) return;
+      virtualizer.scrollToIndex(index, { align: "center" });
+    },
+    [virtualizer],
+  );
+
+  const scrollToEventId = useCallback(
+    (id: string) => {
+      const idx = indexById.get(id);
+      if (idx === undefined) return;
+      scrollToIndex(idx);
+    },
+    [indexById, scrollToIndex],
+  );
+
+  const focusEvent = useCallback(
+    (id: string) => {
+      setFocusedEventId(id);
+      scrollToEventId(id);
+    },
+    [scrollToEventId],
+  );
+
+  const cycleUnresolved = useCallback(
+    (direction: 1 | -1) => {
+      if (unresolvedIds.length === 0) return;
+      const currentIdx = focusedEventId ? unresolvedIds.indexOf(focusedEventId) : -1;
+      const nextIdx =
+        currentIdx === -1
+          ? direction === 1
+            ? 0
+            : unresolvedIds.length - 1
+          : (currentIdx + direction + unresolvedIds.length) % unresolvedIds.length;
+      const nextId = unresolvedIds[nextIdx]!;
+      setFocusedEventId(nextId);
+      scrollToEventId(nextId);
+    },
+    [unresolvedIds, focusedEventId, scrollToEventId],
+  );
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      scrollToEventId,
+      focusEvent,
+      nextUnresolved: () => cycleUnresolved(1),
+      prevUnresolved: () => cycleUnresolved(-1),
+    }),
+    [scrollToEventId, focusEvent, cycleUnresolved],
+  );
+
+  // Keyboard: n / p for cycling unresolved
+  useEffect(() => {
+    const handler = (event: KeyboardEvent) => {
+      if (event.defaultPrevented) return;
+      const target = event.target as HTMLElement | null;
+      if (target) {
+        const tag = target.tagName;
+        if (tag === "INPUT" || tag === "TEXTAREA" || target.isContentEditable) return;
+      }
+      if (event.metaKey || event.ctrlKey || event.altKey) return;
+      if (event.key === "n") {
+        event.preventDefault();
+        cycleUnresolved(1);
+      } else if (event.key === "p") {
+        event.preventDefault();
+        cycleUnresolved(-1);
+      }
+    };
+    window.addEventListener("keydown", handler);
+    return () => window.removeEventListener("keydown", handler);
+  }, [cycleUnresolved]);
+
+  // Scroll → visible-event callback (debounced). Used for URL round-trip.
+  const lastReportedVisibleIdRef = useRef<string | null>(null);
+  useEffect(() => {
+    if (!onVisibleEventChange) return;
+    const root = parentRef.current;
+    if (!root) return;
+    let timer: ReturnType<typeof setTimeout> | null = null;
+    const report = () => {
+      const scrollTop = root.scrollTop;
+      const items = virtualizer.getVirtualItems();
+      if (items.length === 0) {
+        if (lastReportedVisibleIdRef.current !== null) {
+          lastReportedVisibleIdRef.current = null;
+          onVisibleEventChange(null);
+        }
+        return;
+      }
+      const topItem =
+        items.find((item) => item.start + item.size > scrollTop) ?? items[0]!;
+      const event = filtered[topItem.index];
+      const id = event?.id ?? null;
+      if (id !== lastReportedVisibleIdRef.current) {
+        lastReportedVisibleIdRef.current = id;
+        onVisibleEventChange(id);
+      }
+    };
+    const onScroll = () => {
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(report, 250);
+    };
+    root.addEventListener("scroll", onScroll, { passive: true });
+    return () => {
+      if (timer) clearTimeout(timer);
+      root.removeEventListener("scroll", onScroll);
+    };
+  }, [filtered, onVisibleEventChange, virtualizer]);
+
+  return (
+    <div
+      data-testid="pr-timeline"
+      className="flex h-full w-full min-h-0 flex-col"
+      style={{ background: COLORS.pageBg }}
+    >
+      <FilterToolbar filters={filters} onChange={onFiltersChange} />
+
+      {summary ? (
+        <div
+          className="shrink-0 px-3 pt-3"
+          data-testid="pr-timeline-summary"
+        >
+          <PrAiSummaryCard
+            prId={prId}
+            summary={summary}
+            onDismiss={onDismissSummary ? () => onDismissSummary() : undefined}
+          />
+          {onRegenerateSummary ? <span className="hidden" /> : null}
+        </div>
+      ) : null}
+
+      <div
+        ref={parentRef}
+        data-testid="pr-timeline-viewport"
+        className="relative min-h-0 flex-1 overflow-y-auto px-3 py-3"
+      >
+        {filtered.length === 0 ? (
+          <div
+            className="py-8 text-center text-[12px]"
+            style={{ color: COLORS.textDim }}
+          >
+            No events match the current filters.
+          </div>
+        ) : (
+          <div style={{ height: virtualizer.getTotalSize(), position: "relative" }}>
+            {virtualizer.getVirtualItems().map((virtualRow) => {
+              const event = filtered[virtualRow.index]!;
+              return (
+                <TimelineRow
+                  key={event.id}
+                  event={event}
+                  index={virtualRow.index}
+                  start={virtualRow.start}
+                  measure={virtualizer.measureElement}
+                  parentRef={parentRef}
+                  focusedEventId={focusedEventId}
+                  prId={prId}
+                  laneId={laneId}
+                  repoOwner={repoOwner}
+                  repoName={repoName}
+                  viewerLogin={viewerLogin}
+                  onFocus={setFocusedEventId}
+                />
+              );
+            })}
+          </div>
+        )}
+
+        {unresolvedIds.length > 0 ? (
+          <button
+            type="button"
+            onClick={() => cycleUnresolved(1)}
+            className="flex h-8 items-center gap-1.5 px-3 text-[11px] font-medium"
+            style={{
+              position: "sticky",
+              bottom: 12,
+              marginLeft: "auto",
+              marginRight: 0,
+              background: COLORS.accentSubtle,
+              border: `1px solid ${COLORS.accentBorder}`,
+              borderRadius: 8,
+              color: COLORS.accent,
+              boxShadow: "0 8px 20px rgba(0,0,0,0.35)",
+            }}
+            data-testid="pr-timeline-unresolved-fab"
+            aria-label={`Jump to unresolved threads (${unresolvedIds.length})`}
+          >
+            <ArrowDown size={11} weight="bold" />
+            {unresolvedIds.length} unresolved
+          </button>
+        ) : null}
+      </div>
+    </div>
+  );
+});
+
+export default PrTimeline;
+
+/* ══════════════════ Filter toolbar ══════════════════ */
+
+const FILTER_BUTTONS: Array<{
+  key: "all" | "unresolved" | "mine" | "bots" | "outdated";
+  label: string;
+}> = [
+  { key: "all", label: "All" },
+  { key: "unresolved", label: "Unresolved" },
+  { key: "mine", label: "Mine" },
+  { key: "bots", label: "Bots only" },
+  { key: "outdated", label: "Show outdated" },
+];
+
+function isAllSelected(filters: PrTimelineFilters): boolean {
+  return (
+    filters.showResolved &&
+    filters.showOutdated &&
+    !filters.onlyMine &&
+    !filters.onlyBots
+  );
+}
+
+function FilterToolbar({
+  filters,
+  onChange,
+}: {
+  filters: PrTimelineFilters;
+  onChange: (next: PrTimelineFilters) => void;
+}) {
+  const isActive = useCallback(
+    (key: (typeof FILTER_BUTTONS)[number]["key"]): boolean => {
+      if (key === "all") return isAllSelected(filters);
+      if (key === "unresolved") return !filters.showResolved;
+      if (key === "mine") return filters.onlyMine;
+      if (key === "bots") return filters.onlyBots;
+      return filters.showOutdated;
+    },
+    [filters],
+  );
+
+  const toggle = useCallback(
+    (key: (typeof FILTER_BUTTONS)[number]["key"]) => {
+      if (key === "all") {
+        onChange({
+          showResolved: true,
+          showOutdated: true,
+          onlyMine: false,
+          onlyBots: false,
+        });
+        return;
+      }
+      if (key === "unresolved") {
+        onChange({ ...filters, showResolved: !filters.showResolved });
+        return;
+      }
+      if (key === "mine") {
+        onChange({ ...filters, onlyMine: !filters.onlyMine });
+        return;
+      }
+      if (key === "bots") {
+        onChange({ ...filters, onlyBots: !filters.onlyBots });
+        return;
+      }
+      onChange({ ...filters, showOutdated: !filters.showOutdated });
+    },
+    [filters, onChange],
+  );
+
+  return (
+    <div
+      className="flex shrink-0 items-center gap-1 px-3"
+      style={{ borderBottom: `1px solid ${COLORS.border}`, height: 38 }}
+      data-testid="pr-timeline-filter-toolbar"
+    >
+      {FILTER_BUTTONS.map((btn) => {
+        const active = isActive(btn.key);
+        const style: CSSProperties = active
+          ? {
+              background: COLORS.accentSubtle,
+              border: `1px solid ${COLORS.accentBorder}`,
+              color: COLORS.accent,
+            }
+          : {
+              background: "transparent",
+              border: `1px solid ${COLORS.border}`,
+              color: COLORS.textMuted,
+            };
+        return (
+          <button
+            key={btn.key}
+            type="button"
+            onClick={() => toggle(btn.key)}
+            className="h-6 px-2 text-[11px] font-medium transition-colors"
+            style={style}
+            aria-pressed={active}
+            data-filter-key={btn.key}
+          >
+            {btn.label}
+          </button>
+        );
+      })}
+    </div>
+  );
+}
+
+/* ══════════════════ Timeline row ══════════════════ */
+
+type TimelineRowProps = {
+  event: PrTimelineEvent;
+  index: number;
+  start: number;
+  measure: (node: HTMLElement | null) => void;
+  parentRef: React.MutableRefObject<HTMLDivElement | null>;
+  focusedEventId: string | null;
+  prId: string;
+  laneId: string | null;
+  repoOwner: string;
+  repoName: string;
+  viewerLogin: string | null;
+  onFocus: (id: string) => void;
+};
+
+function TimelineRow(props: TimelineRowProps) {
+  const {
+    event,
+    index,
+    start,
+    measure,
+    parentRef,
+    focusedEventId,
+    repoOwner,
+    repoName,
+    viewerLogin,
+    onFocus,
+  } = props;
+
+  const rowRef = useRef<HTMLDivElement | null>(null);
+  const isNear = useNearViewport(parentRef, rowRef);
+  const isFocused = focusedEventId === event.id;
+
+  const setRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      rowRef.current = node;
+      measure(node);
+    },
+    [measure],
+  );
+
+  return (
+    <div
+      ref={setRef}
+      data-index={index}
+      data-event-id={event.id}
+      data-event-type={event.type}
+      id={`pr-timeline-${event.id}`}
+      style={{
+        position: "absolute",
+        top: 0,
+        left: 0,
+        width: "100%",
+        transform: `translateY(${start}px)`,
+        paddingBottom: 12,
+      }}
+    >
+      <TimelineRowContent
+        event={event}
+        near={isNear}
+        focused={isFocused}
+        prId={props.prId}
+        laneId={props.laneId}
+        repoOwner={repoOwner}
+        repoName={repoName}
+        viewerLogin={viewerLogin}
+        onFocus={onFocus}
+      />
+    </div>
+  );
+}
+
+/* ══════════════════ Row content by type ══════════════════ */
+
+type TimelineRowContentProps = {
+  event: PrTimelineEvent;
+  near: boolean;
+  focused: boolean;
+  prId: string;
+  laneId: string | null;
+  repoOwner: string;
+  repoName: string;
+  viewerLogin: string | null;
+  onFocus: (id: string) => void;
+};
+
+function TimelineRowContent({
+  event,
+  near,
+  focused,
+  prId,
+  laneId,
+  repoOwner,
+  repoName,
+  viewerLogin,
+  onFocus,
+}: TimelineRowContentProps) {
+  switch (event.type) {
+    case "description":
+      return (
+        <Card icon={<ChatCircle size={12} weight="fill" />} author={event.author} ts={event.timestamp}>
+          {near && event.body ? (
+            <PrMarkdown repoOwner={repoOwner} repoName={repoName} dense>
+              {event.body}
+            </PrMarkdown>
+          ) : (
+            <BodySkeleton />
+          )}
+        </Card>
+      );
+    case "commit_push":
+      return (
+        <InlineRow icon={<GitCommit size={12} weight="bold" />}>
+          <span style={{ color: COLORS.textSecondary }}>
+            <strong style={{ color: COLORS.textPrimary }}>{event.author ?? "someone"}</strong>{" "}
+            pushed{" "}
+            <span
+              style={{
+                color: COLORS.textMuted,
+                fontFamily: MONO_FONT,
+              }}
+            >
+              {event.shortSha}
+            </span>
+            {" · "}
+            <span style={{ color: COLORS.textPrimary }}>{event.subject}</span>
+            {event.forcePushed ? (
+              <span
+                style={{ color: COLORS.warning, marginLeft: 6, fontFamily: MONO_FONT }}
+              >
+                force-pushed
+              </span>
+            ) : null}
+          </span>
+          <Timestamp ts={event.timestamp} />
+        </InlineRow>
+      );
+    case "review":
+      if (event.isBot) {
+        return near ? (
+          <PrBotReviewCard
+            review={buildPrReviewFromEvent(event)}
+            repoOwner={repoOwner}
+            repoName={repoName}
+          />
+        ) : (
+          <BodySkeleton height={96} />
+        );
+      }
+      return (
+        <PrReviewCard
+          author={event.author}
+          state={event.state}
+          body={event.body}
+          timestamp={event.timestamp}
+          repoOwner={repoOwner}
+          repoName={repoName}
+          near={near}
+        />
+      );
+    case "review_thread":
+      return near ? (
+        <PrReviewThreadCard
+          thread={buildPrReviewThreadFromEvent(event)}
+          prId={prId}
+          laneId={laneId}
+          repoOwner={repoOwner}
+          repoName={repoName}
+          viewerLogin={viewerLogin}
+          focused={focused}
+          onFocus={() => onFocus(event.id)}
+        />
+      ) : (
+        <BodySkeleton height={140} />
+      );
+    case "issue_comment":
+      return (
+        <Card
+          icon={event.isBot ? <Robot size={12} weight="bold" /> : <ChatCircle size={12} weight="regular" />}
+          author={event.author}
+          ts={event.timestamp}
+        >
+          {near && event.body ? (
+            <PrMarkdown repoOwner={repoOwner} repoName={repoName} dense>
+              {event.body}
+            </PrMarkdown>
+          ) : (
+            <BodySkeleton />
+          )}
+        </Card>
+      );
+    case "check_update":
+      return (
+        <InlineRow icon={<CheckIconForConclusion conclusion={event.conclusion} status={event.status} />}>
+          <span style={{ color: COLORS.textSecondary }}>
+            Check{" "}
+            <span style={{ color: COLORS.textPrimary, fontFamily: MONO_FONT }}>
+              {event.checkName}
+            </span>
+            {" · "}
+            <span style={{ color: checkConclusionColor(event.conclusion, event.status) }}>
+              {event.status === "completed" ? event.conclusion ?? "completed" : event.status}
+            </span>
+          </span>
+          <Timestamp ts={event.timestamp} />
+        </InlineRow>
+      );
+    case "deployment":
+      return (
+        <InlineRow icon={<Package size={12} weight="bold" />}>
+          <span style={{ color: COLORS.textSecondary }}>
+            Deployment to{" "}
+            <span style={{ color: COLORS.textPrimary }}>{event.environment}</span>
+            {" · "}
+            <span style={{ color: deploymentColor(event.state) }}>{event.state}</span>
+          </span>
+          <Timestamp ts={event.timestamp} />
+        </InlineRow>
+      );
+    case "label_change":
+      return (
+        <InlineRow icon={<Tag size={12} weight="bold" />}>
+          <span style={{ color: COLORS.textSecondary }}>
+            <strong style={{ color: COLORS.textPrimary }}>{event.author ?? "someone"}</strong>{" "}
+            {event.action === "added" ? "added" : "removed"} label{" "}
+            <span
+              style={{
+                background: event.color ? `#${event.color}24` : COLORS.recessedBg,
+                border: `1px solid ${event.color ? `#${event.color}48` : COLORS.border}`,
+                color: event.color ? `#${event.color}` : COLORS.textPrimary,
+                padding: "0 6px",
+                fontFamily: MONO_FONT,
+              }}
+            >
+              {event.label}
+            </span>
+          </span>
+          <Timestamp ts={event.timestamp} />
+        </InlineRow>
+      );
+    case "merge":
+      return (
+        <InlineRow icon={<GitMerge size={12} weight="fill" />}>
+          <span style={{ color: COLORS.textPrimary }}>
+            Merged
+            {event.mergeCommitSha ? (
+              <span style={{ color: COLORS.textMuted, fontFamily: MONO_FONT, marginLeft: 6 }}>
+                {event.mergeCommitSha.slice(0, 7)}
+              </span>
+            ) : null}
+            {event.method ? (
+              <span style={{ color: COLORS.textMuted, marginLeft: 6 }}>· {event.method}</span>
+            ) : null}
+          </span>
+          <Timestamp ts={event.timestamp} />
+        </InlineRow>
+      );
+    default:
+      return null;
+  }
+}
+
+/* ══════════════════ Small building blocks ══════════════════ */
+
+function Card({
+  icon,
+  author,
+  ts,
+  children,
+}: {
+  icon: ReactNode;
+  author: string | null;
+  ts: string;
+  children: ReactNode;
+}) {
+  return (
+    <div
+      className="flex flex-col gap-1.5 px-3 py-2.5"
+      style={{
+        background: COLORS.cardBg,
+        border: `1px solid ${COLORS.border}`,
+      }}
+    >
+      <div className="flex items-center gap-1.5 text-[11px]" style={{ color: COLORS.textMuted }}>
+        <span style={{ color: COLORS.textMuted }}>{icon}</span>
+        <span style={{ color: COLORS.textPrimary }}>{author ?? "unknown"}</span>
+        <Timestamp ts={ts} />
+      </div>
+      <div>{children}</div>
+    </div>
+  );
+}
+
+function InlineRow({ icon, children }: { icon: ReactNode; children: ReactNode }) {
+  return (
+    <div
+      className="flex items-center gap-2 px-3 py-2 text-[11px]"
+      style={{
+        background: "transparent",
+        color: COLORS.textSecondary,
+      }}
+    >
+      <span style={{ color: COLORS.textMuted }}>{icon}</span>
+      <div className="flex min-w-0 flex-1 items-center gap-2">{children}</div>
+    </div>
+  );
+}
+
+function Timestamp({ ts }: { ts: string }) {
+  return (
+    <span
+      className="ml-auto text-[10px]"
+      style={{ color: COLORS.textDim, fontFamily: MONO_FONT }}
+    >
+      {relativeWhen(ts)}
+    </span>
+  );
+}
+
+function BodySkeleton({ height = 72 }: { height?: number }) {
+  return (
+    <div
+      aria-hidden
+      data-testid="pr-timeline-skeleton"
+      style={{
+        height,
+        background: COLORS.recessedBg,
+        border: `1px dashed ${COLORS.border}`,
+      }}
+    />
+  );
+}
+
+/* ══════════════════ Human review card (small, inline) ══════════════════ */
+
+function reviewStateColor(state: string): string {
+  if (state === "approved") return COLORS.success;
+  if (state === "changes_requested") return COLORS.danger;
+  if (state === "dismissed") return COLORS.textDim;
+  return COLORS.textMuted;
+}
+
+function reviewStateLabel(state: string): string {
+  if (state === "approved") return "Approved";
+  if (state === "changes_requested") return "Requested changes";
+  if (state === "dismissed") return "Dismissed";
+  if (state === "commented") return "Commented";
+  return "Pending";
+}
+
+function PrReviewCard({
+  author,
+  state,
+  body,
+  timestamp,
+  repoOwner,
+  repoName,
+  near,
+}: {
+  author: string | null;
+  state: string;
+  body: string | null;
+  timestamp: string;
+  repoOwner: string;
+  repoName: string;
+  near: boolean;
+}) {
+  return (
+    <div
+      className="flex flex-col gap-1.5 px-3 py-2.5"
+      style={{ background: COLORS.cardBg, border: `1px solid ${COLORS.border}` }}
+      data-testid="pr-timeline-review-card"
+    >
+      <div className="flex items-center gap-1.5 text-[11px]">
+        <CheckCircle size={12} weight="bold" style={{ color: reviewStateColor(state) }} />
+        <span style={{ color: COLORS.textPrimary }}>{author ?? "reviewer"}</span>
+        <span style={{ color: reviewStateColor(state) }}>· {reviewStateLabel(state)}</span>
+        <Timestamp ts={timestamp} />
+      </div>
+      {body ? (
+        near ? (
+          <PrMarkdown repoOwner={repoOwner} repoName={repoName} dense>
+            {body}
+          </PrMarkdown>
+        ) : (
+          <BodySkeleton />
+        )
+      ) : null}
+    </div>
+  );
+}
+
+function CheckIconForConclusion({
+  conclusion,
+  status,
+}: {
+  conclusion: "success" | "failure" | "neutral" | "skipped" | "cancelled" | null;
+  status: "queued" | "in_progress" | "completed";
+}) {
+  if (status !== "completed") {
+    return <Clock size={12} weight="bold" style={{ color: COLORS.warning }} />;
+  }
+  if (conclusion === "success") {
+    return <CheckCircle size={12} weight="fill" style={{ color: COLORS.success }} />;
+  }
+  if (conclusion === "failure" || conclusion === "cancelled") {
+    return <WarningCircle size={12} weight="fill" style={{ color: COLORS.danger }} />;
+  }
+  return <Clock size={12} weight="bold" style={{ color: COLORS.textMuted }} />;
+}
+
+function checkConclusionColor(
+  conclusion: "success" | "failure" | "neutral" | "skipped" | "cancelled" | null,
+  status: "queued" | "in_progress" | "completed",
+): string {
+  if (status !== "completed") return COLORS.warning;
+  if (conclusion === "success") return COLORS.success;
+  if (conclusion === "failure" || conclusion === "cancelled") return COLORS.danger;
+  return COLORS.textMuted;
+}
+
+function deploymentColor(state: PrDeploymentState): string {
+  if (state === "success") return COLORS.success;
+  if (state === "failure" || state === "error") return COLORS.danger;
+  if (state === "in_progress" || state === "pending" || state === "queued") return COLORS.warning;
+  return COLORS.textMuted;
+}
+
+function buildPrReviewFromEvent(event: Extract<PrTimelineEvent, { type: "review" }>): PrReview {
+  return {
+    reviewer: event.author ?? "bot",
+    reviewerAvatarUrl: event.avatarUrl ?? null,
+    state: event.state,
+    body: event.body,
+    submittedAt: event.timestamp,
+  };
+}
+
+function buildPrReviewThreadFromEvent(
+  event: Extract<PrTimelineEvent, { type: "review_thread" }>,
+): PrReviewThread {
+  return {
+    id: event.threadId,
+    isResolved: event.isResolved,
+    isOutdated: event.isOutdated,
+    path: event.path,
+    line: event.line,
+    originalLine: null,
+    startLine: event.startLine,
+    originalStartLine: null,
+    diffSide: null,
+    url: null,
+    createdAt: event.timestamp,
+    updatedAt: event.timestamp,
+    comments: event.firstCommentBody
+      ? [
+          {
+            id: `${event.threadId}:first`,
+            author: event.author ?? "unknown",
+            authorAvatarUrl: event.avatarUrl ?? null,
+            body: event.firstCommentBody,
+            url: null,
+            createdAt: event.timestamp,
+            updatedAt: event.timestamp,
+          },
+        ]
+      : [],
+  };
+}
diff --git a/apps/desktop/src/renderer/components/prs/state/PrsContext.tsx b/apps/desktop/src/renderer/components/prs/state/PrsContext.tsx
index 93a4122ff..2e8f014c2 100644
--- a/apps/desktop/src/renderer/components/prs/state/PrsContext.tsx
+++ b/apps/desktop/src/renderer/components/prs/state/PrsContext.tsx
@@ -26,7 +26,12 @@ import type {
   AutoRebaseLaneStatus,
   AutoRebaseEventPayload,
   PrConvergenceStatePatch,
+  PrReviewThread,
+  PrDeployment,
+  PrAiSummary,
 } from "../../../../shared/types";
+import type { PrTimelineFilters } from "../shared/PrTimeline";
+import { DEFAULT_PR_TIMELINE_FILTERS } from "../shared/PrTimeline";
 import { buildPrAiResolutionContextKey } from "../../../../shared/types";
 import { getModelById } from "../../../../shared/modelRegistry";
 
@@ -58,6 +63,9 @@ type PrsState = {
   detailChecks: PrCheck[];
   detailReviews: PrReview[];
   detailComments: PrComment[];
+  detailReviewThreads: PrReviewThread[];
+  detailDeployments: PrDeployment[];
+  detailAiSummary: PrAiSummary | null;
   detailBusy: boolean;
 
   // Rebase state
@@ -78,6 +86,12 @@ type PrsState = {
   resolverReasoningLevel: string;
   resolverPermissionMode: AiPermissionMode;
   resolverSessionsByContextKey: Record<string, PrAiResolutionSessionInfo>;
+
+  // Timeline + rails (PRs tab redesign)
+  prsTimelineRailsEnabled: boolean;
+  dismissedAiSummaries: Record<string, boolean>;
+  timelineFiltersByPrId: Record<string, PrTimelineFilters>;
+  viewerLogin: string | null;
 };
 
 type PrsContextValue = PrsState & {
@@ -96,6 +110,12 @@ type PrsContextValue = PrsState & {
   saveConvergenceState: (prId: string, state: PrConvergenceStatePatch) => Promise<PrConvergenceState>;
   resetConvergenceState: (prId: string) => Promise<void>;
   refresh: () => Promise<void>;
+
+  // Timeline + rails controls
+  setPrsTimelineRailsEnabled: (enabled: boolean) => void;
+  setTimelineFilters: (prId: string, filters: PrTimelineFilters) => void;
+  setAiSummaryDismissed: (prId: string, dismissed: boolean) => void;
+  regeneratePrAiSummary: (prId: string) => Promise<void>;
 };
 
 const PrsContext = createContext<PrsContextValue | null>(null);
@@ -103,6 +123,38 @@ const PrsContext = createContext<PrsContextValue | null>(null);
 const LS_MODEL_KEY = "ade:prs:resolverModel";
 const LS_REASONING_KEY = "ade:prs:resolverReasoningLevel";
 const LS_PERMISSION_KEY = "ade:prs:resolverPermissions";
+const LS_TIMELINE_RAILS_KEY = "ade:prs:timelineRailsEnabled";
+const LS_DISMISSED_SUMMARIES_KEY = "ade:prs:dismissedAiSummaries";
+const LS_TIMELINE_FILTERS_KEY = "ade:prs:timelineFiltersByPrId";
+
+function readBoolLs(key: string, fallback: boolean): boolean {
+  try {
+    const raw = localStorage.getItem(key);
+    if (raw === "true") return true;
+    if (raw === "false") return false;
+  } catch {
+    /* ignore */
+  }
+  return fallback;
+}
+
+function readJsonLs<T>(key: string, fallback: T): T {
+  try {
+    const raw = localStorage.getItem(key);
+    if (!raw) return fallback;
+    return JSON.parse(raw) as T;
+  } catch {
+    return fallback;
+  }
+}
+
+function writeJsonLs(key: string, value: unknown): void {
+  try {
+    localStorage.setItem(key, JSON.stringify(value));
+  } catch {
+    /* ignore */
+  }
+}
 
 type ResolverPermissionPreferences = {
   claude: AiPermissionMode;
@@ -233,7 +285,62 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
   const [detailChecks, setDetailChecks] = useState<PrCheck[]>([]);
   const [detailReviews, setDetailReviews] = useState<PrReview[]>([]);
   const [detailComments, setDetailComments] = useState<PrComment[]>([]);
+  const [detailReviewThreads, setDetailReviewThreads] = useState<PrReviewThread[]>([]);
+  const [detailDeployments, setDetailDeployments] = useState<PrDeployment[]>([]);
+  const [detailAiSummary, setDetailAiSummary] = useState<PrAiSummary | null>(null);
   const [detailBusy, setDetailBusy] = useState(false);
+  const [viewerLogin, setViewerLogin] = useState<string | null>(null);
+
+  // Timeline + rails (new)
+  const [prsTimelineRailsEnabled, setPrsTimelineRailsEnabledRaw] = useState<boolean>(
+    () => readBoolLs(LS_TIMELINE_RAILS_KEY, true),
+  );
+  const [dismissedAiSummaries, setDismissedAiSummaries] = useState<Record<string, boolean>>(
+    () => readJsonLs<Record<string, boolean>>(LS_DISMISSED_SUMMARIES_KEY, {}),
+  );
+  const [timelineFiltersByPrId, setTimelineFiltersByPrId] = useState<Record<string, PrTimelineFilters>>(
+    () => readJsonLs<Record<string, PrTimelineFilters>>(LS_TIMELINE_FILTERS_KEY, {}),
+  );
+
+  const setPrsTimelineRailsEnabled = useCallback((enabled: boolean) => {
+    setPrsTimelineRailsEnabledRaw(enabled);
+    try {
+      localStorage.setItem(LS_TIMELINE_RAILS_KEY, enabled ? "true" : "false");
+    } catch {
+      /* ignore */
+    }
+  }, []);
+
+  const setTimelineFilters = useCallback((prId: string, filters: PrTimelineFilters) => {
+    setTimelineFiltersByPrId((prev) => {
+      const next = { ...prev, [prId]: filters };
+      writeJsonLs(LS_TIMELINE_FILTERS_KEY, next);
+      return next;
+    });
+  }, []);
+
+  const setAiSummaryDismissed = useCallback((prId: string, dismissed: boolean) => {
+    setDismissedAiSummaries((prev) => {
+      if (Boolean(prev[prId]) === dismissed) return prev;
+      const next = { ...prev };
+      if (dismissed) next[prId] = true;
+      else delete next[prId];
+      writeJsonLs(LS_DISMISSED_SUMMARIES_KEY, next);
+      return next;
+    });
+  }, []);
+
+  const regeneratePrAiSummary = useCallback(async (prId: string) => {
+    const fn = window.ade?.prs?.regenerateAiSummary;
+    if (typeof fn !== "function") return;
+    try {
+      const summary = await fn(prId);
+      if (selectedPrIdRef.current !== prId) return;
+      setDetailAiSummary(summary);
+    } catch (err) {
+      console.warn("[PrsContext] regenerateAiSummary failed:", err);
+    }
+  }, []);
 
   // Rebase state
   const [rebaseNeeds, setRebaseNeeds] = useState<RebaseNeed[]>([]);
@@ -511,6 +618,23 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
     refresh();
   }, [refresh]);
 
+  // Resolve viewer login once from the GitHub snapshot (best-effort).
+  useEffect(() => {
+    let cancelled = false;
+    const fetchSnap = window.ade?.prs?.getGitHubSnapshot;
+    if (typeof fetchSnap !== "function") return;
+    fetchSnap()
+      .then((snap) => {
+        if (!cancelled && snap?.viewerLogin) setViewerLogin(snap.viewerLogin);
+      })
+      .catch(() => {
+        /* non-fatal */
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+
   // Silently refresh detail data for the given PR (no loading state).
   // Returns early if a fetch is already in progress or the PR is no longer selected.
   const rateLimitedUntilRef = React.useRef(0);
@@ -586,6 +710,9 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       setDetailChecks([]);
       setDetailReviews([]);
       setDetailComments([]);
+      setDetailReviewThreads([]);
+      setDetailDeployments([]);
+      setDetailAiSummary(null);
       return;
     }
 
@@ -664,6 +791,50 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
         if (!cancelled) setDetailBusy(false);
       });
 
+    // Progressive secondary fetch (review threads, deployments, AI summary) — yields
+    // to the main paint so the primary header + checks render first.
+    setDetailReviewThreads([]);
+    setDetailDeployments([]);
+    setDetailAiSummary(null);
+    const yieldToPaint = () =>
+      new Promise<void>((resolve) => {
+        const ric = (window as unknown as {
+          requestIdleCallback?: (cb: () => void) => void;
+        }).requestIdleCallback;
+        if (typeof ric === "function") ric(() => resolve());
+        else setTimeout(resolve, 0);
+      });
+    (async () => {
+      const api = window.ade?.prs;
+      const steps: Array<[string, () => Promise<void>]> = [
+        ["getReviewThreads", async () => {
+          if (typeof api?.getReviewThreads !== "function") return;
+          const threads = await api.getReviewThreads(prId);
+          if (!cancelled && selectedPrIdRef.current === prId) setDetailReviewThreads(threads);
+        }],
+        ["getDeployments", async () => {
+          if (typeof api?.getDeployments !== "function") return;
+          const deployments = await api.getDeployments(prId);
+          if (!cancelled && selectedPrIdRef.current === prId) setDetailDeployments(deployments);
+        }],
+        ["getAiSummary", async () => {
+          if (typeof api?.getAiSummary !== "function") return;
+          const summary = await api.getAiSummary(prId);
+          if (!cancelled && selectedPrIdRef.current === prId) setDetailAiSummary(summary);
+        }],
+      ];
+      for (const [name, step] of steps) {
+        if (cancelled) return;
+        await yieldToPaint();
+        if (cancelled) return;
+        try {
+          await step();
+        } catch (err) {
+          console.warn(`[PrsContext] ${name} failed:`, err);
+        }
+      }
+    })();
+
     // After the initial fetch, poll every 60 seconds for fresh detail data.
     // GitHub rate limit is 5000/hour (~83/min) and each detail refresh uses ~10 API calls,
     // so polling faster than 60s risks exhausting the rate limit.
@@ -808,6 +979,9 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       detailChecks,
       detailReviews,
       detailComments,
+      detailReviewThreads,
+      detailDeployments,
+      detailAiSummary,
       detailBusy,
       rebaseNeeds,
       autoRebaseStatuses,
@@ -818,6 +992,10 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       resolverReasoningLevel,
       resolverPermissionMode: resolverPermissions[resolvePermissionFamilyForModel(resolverModel)],
       resolverSessionsByContextKey,
+      prsTimelineRailsEnabled,
+      dismissedAiSummaries,
+      timelineFiltersByPrId,
+      viewerLogin,
       setActiveTab,
       setSelectedPrId,
       setSelectedQueueGroupId,
@@ -833,6 +1011,10 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       saveConvergenceState,
       resetConvergenceState,
       refresh,
+      setPrsTimelineRailsEnabled,
+      setTimelineFilters,
+      setAiSummaryDismissed,
+      regeneratePrAiSummary,
     }),
     // Note: setActiveTab, setSelectedPrId, setSelectedQueueGroupId, setSelectedRebaseItemId,
     // setMergeMethod, and setInlineTerminal are intentionally excluded from this dependency
@@ -854,6 +1036,9 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       detailChecks,
       detailReviews,
       detailComments,
+      detailReviewThreads,
+      detailDeployments,
+      detailAiSummary,
       detailBusy,
       rebaseNeeds,
       autoRebaseStatuses,
@@ -864,6 +1049,10 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       resolverReasoningLevel,
       resolverPermissions,
       resolverSessionsByContextKey,
+      prsTimelineRailsEnabled,
+      dismissedAiSummaries,
+      timelineFiltersByPrId,
+      viewerLogin,
       setResolverModel,
       setResolverReasoningLevel,
       setResolverPermissionMode,
@@ -873,6 +1062,10 @@ export function PrsProvider({ children }: { children: React.ReactNode }) {
       saveConvergenceState,
       resetConvergenceState,
       refresh,
+      setPrsTimelineRailsEnabled,
+      setTimelineFilters,
+      setAiSummaryDismissed,
+      regeneratePrAiSummary,
     ],
   );
 
diff --git a/apps/desktop/src/renderer/components/prs/tabs/GitHubTab.tsx b/apps/desktop/src/renderer/components/prs/tabs/GitHubTab.tsx
index 2239b93af..6c186c02a 100644
--- a/apps/desktop/src/renderer/components/prs/tabs/GitHubTab.tsx
+++ b/apps/desktop/src/renderer/components/prs/tabs/GitHubTab.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { ArrowsClockwise, ArrowSquareOut, ChatText, CheckCircle, CircleNotch, GitMerge, GithubLogo, Link, MagnifyingGlass, Warning, XCircle } from "@phosphor-icons/react";
 import { useNavigate } from "react-router-dom";
+import { useVirtualizer } from "@tanstack/react-virtual";
 import type { GitHubPrListItem, GitHubPrSnapshot, LaneSummary, MergeMethod, PrSummary } from "../../../../shared/types";
 import { EmptyState } from "../../ui/EmptyState";
 import { COLORS, LABEL_STYLE, MONO_FONT, SANS_FONT, cardStyle, inlineBadge, outlineButton, primaryButton } from "../../lanes/laneDesignTokens";
@@ -10,6 +11,8 @@ import { formatTimestampShort, formatTimeAgoCompact } from "../shared/prFormatte
 import { PrCiRunningIndicator } from "../shared/prVisuals";
 import { usePrs } from "../state/PrsContext";
 
+const VIRTUALIZE_AT = 50;
+
 type GitHubTabProps = {
   lanes: LaneSummary[];
   mergeMethod: MergeMethod;
@@ -358,6 +361,7 @@ export function GitHubTab({ lanes, mergeMethod, selectedPrId, onSelectPr, onRefr
   const hotRefreshUntilRef = React.useRef(0);
   const hotRefreshTimerRef = React.useRef<number | null>(null);
   const inFlightSnapshotRef = React.useRef<Promise<GitHubPrSnapshot> | null>(null);
+  const listRef = React.useRef<HTMLDivElement | null>(null);
   snapshotRef.current = snapshot;
 
   /* Build a lookup from linkedPrId -> PrSummary for CI/review indicators */
@@ -798,7 +802,7 @@ export function GitHubTab({ lanes, mergeMethod, selectedPrId, onSelectPr, onRefr
 
       <div style={{ display: "flex", minHeight: 0, flex: 1 }}>
         {/* PR list sidebar */}
-        <div style={{ width: 380, borderRight: "1px solid rgba(255,255,255,0.06)", overflow: "auto", flexShrink: 0 }}>
+        <div ref={listRef} style={{ width: 380, borderRight: "1px solid rgba(255,255,255,0.06)", overflow: "auto", flexShrink: 0 }}>
           {/* Section header */}
           <div style={{
             padding: "10px 14px",
@@ -827,243 +831,26 @@ export function GitHubTab({ lanes, mergeMethod, selectedPrId, onSelectPr, onRefr
             <div style={{ padding: 20 }}>
               <EmptyState title="No pull requests" description="No pull requests match the current filters." />
             </div>
+          ) : filteredItems.length > VIRTUALIZE_AT ? (
+            <GitHubTabVirtualList
+              parentRef={listRef}
+              items={filteredItems}
+              selectedItemId={selectedItemId}
+              prsByIdMap={prsByIdMap}
+              onSelect={handleSelectItem}
+              onOpenQueueView={onOpenQueueView}
+            />
           ) : (
-            filteredItems.map((item) => {
-              const selected = item.id === selectedItemId;
-              const sc = stateColor(item.state);
-              const linkedPr = item.linkedPrId ? prsByIdMap.get(item.linkedPrId) ?? null : null;
-              const ci = ciDotColor(linkedPr);
-              const ciRunning = linkedPr?.checksStatus === "pending";
-              const review = reviewIndicator(linkedPr);
-              const ago = formatTimeAgoCompact(item.createdAt);
-              const visibleLabels = item.labels.slice(0, 4);
-              const overflowCount = item.labels.length - 4;
-              return (
-                <button
-                  key={item.id}
-                  type="button"
-                  onClick={() => handleSelectItem(item)}
-                  style={{
-                    display: "flex",
-                    width: "100%",
-                    flexDirection: "column",
-                    gap: 6,
-                    padding: "11px 14px",
-                    textAlign: "left",
-                    border: "none",
-                    borderLeft: selected ? `3px solid ${sc.text}` : "3px solid transparent",
-                    borderBottom: "1px solid rgba(255,255,255,0.04)",
-                    background: selected
-                      ? `linear-gradient(90deg, ${sc.bg} 0%, rgba(255,255,255,0.02) 100%)`
-                      : "transparent",
-                    cursor: "pointer",
-                    transition: "background 150ms ease",
-                  }}
-                  onMouseEnter={(e) => { if (!selected) e.currentTarget.style.background = "rgba(255,255,255,0.025)"; }}
-                  onMouseLeave={(e) => { if (!selected) e.currentTarget.style.background = "transparent"; }}
-                >
-                  {/* Row 1: avatar, bot badge, PR number, title, CI icon, time, comments */}
-                  <div style={{ display: "flex", alignItems: "center", gap: 6, minWidth: 0 }}>
-                    {item.author ? (
-                      <img
-                        src={`https://avatars.githubusercontent.com/${item.author}?size=32`}
-                        alt=""
-                        style={{
-                          width: 22,
-                          height: 22,
-                          borderRadius: "50%",
-                          flexShrink: 0,
-                          border: `1.5px solid ${sc.bg}`,
-                        }}
-                        onError={(e) => { (e.target as HTMLImageElement).style.display = "none"; }}
-                      />
-                    ) : (
-                      <div style={{
-                        width: 22,
-                        height: 22,
-                        borderRadius: "50%",
-                        flexShrink: 0,
-                        background: "rgba(255,255,255,0.05)",
-                        border: "1px solid rgba(255,255,255,0.08)",
-                      }} />
-                    )}
-                    {item.isBot ? (
-                      <span style={{
-                        fontSize: 9,
-                        fontWeight: 700,
-                        fontFamily: SANS_FONT,
-                        textTransform: "uppercase",
-                        padding: "1px 5px",
-                        borderRadius: 3,
-                        background: "rgba(255,255,255,0.06)",
-                        color: COLORS.textDim,
-                        flexShrink: 0,
-                        letterSpacing: "0.3px",
-                      }}>
-                        bot
-                      </span>
-                    ) : null}
-                    <span style={{ fontFamily: MONO_FONT, fontSize: 11, color: sc.text, flexShrink: 0 }}>
-                      #{item.githubPrNumber}
-                    </span>
-                    <span style={{
-                      fontSize: 12,
-                      fontWeight: 600,
-                      color: COLORS.textPrimary,
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                      fontFamily: SANS_FONT,
-                      flex: 1,
-                      minWidth: 0,
-                    }}>
-                      {item.title}
-                    </span>
-                    {ci ? (
-                      <span title={ci.title} style={{ display: "inline-flex", flexShrink: 0 }}>
-                        {linkedPr?.checksStatus === "passing" ? (
-                          <CheckCircle size={14} weight="fill" style={{ color: "#4ADE80" }} />
-                        ) : linkedPr?.checksStatus === "failing" ? (
-                          <XCircle size={14} weight="fill" style={{ color: "#EF4444" }} />
-                        ) : ciRunning ? (
-                          <PrCiRunningIndicator color="#FBBF24" size={14} />
-                        ) : null}
-                      </span>
-                    ) : null}
-                    {ago ? (
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim, flexShrink: 0 }}>
-                        {ago}
-                      </span>
-                    ) : null}
-                    {item.commentCount > 0 ? (
-                      <span style={{ display: "inline-flex", alignItems: "center", gap: 3, flexShrink: 0, color: COLORS.textDim }}>
-                        <ChatText size={12} />
-                        <span style={{ fontFamily: MONO_FONT, fontSize: 10 }}>{item.commentCount}</span>
-                      </span>
-                    ) : null}
-                  </div>
-                  {/* Row 1.5: labels */}
-                  {visibleLabels.length > 0 ? (
-                    <div style={{ display: "flex", alignItems: "center", gap: 4, paddingLeft: 30, flexWrap: "wrap" }}>
-                      {visibleLabels.map((label) => {
-                        const bg = `#${label.color}`;
-                        const textColor = labelTextColor(label.color);
-                        return (
-                          <span
-                            key={label.name}
-                            style={{
-                              display: "inline-flex",
-                              alignItems: "center",
-                              padding: "1px 8px",
-                              fontSize: 10,
-                              fontWeight: 600,
-                              fontFamily: SANS_FONT,
-                              color: textColor,
-                              background: bg,
-                              borderRadius: 10,
-                              lineHeight: "16px",
-                            }}
-                          >
-                            {label.name}
-                          </span>
-                        );
-                      })}
-                      {overflowCount > 0 ? (
-                        <span style={{ fontSize: 10, fontFamily: SANS_FONT, color: COLORS.textDim }}>
-                          +{overflowCount}
-                        </span>
-                      ) : null}
-                    </div>
-                  ) : null}
-                  {/* Row 2: branch info */}
-                  {item.baseBranch && item.headBranch ? (
-                    <div style={{ display: "flex", alignItems: "center", gap: 4, paddingLeft: 30, fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim }}>
-                      <span>{item.baseBranch}</span>
-                      <span style={{ color: COLORS.textMuted }}>←</span>
-                      <span style={{ color: COLORS.textMuted, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{item.headBranch}</span>
-                    </div>
-                  ) : null}
-                  {/* Row 3: inline stats */}
-                  <div style={{ display: "flex", alignItems: "center", flexWrap: "wrap", gap: 6, paddingLeft: 30 }}>
-                    <span style={stateBadgeStyle(item)}>{item.state}</span>
-                    {adeKindBadge(item.adeKind) ? <span style={adeKindBadge(item.adeKind)!}>{item.adeKind}</span> : null}
-                    {item.scope === "external" ? (
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim }}>
-                        {item.repoOwner}/{item.repoName}
-                      </span>
-                    ) : null}
-                    {item.linkedLaneName ? (
-                      <span style={{ ...inlineBadge(COLORS.textSecondary), fontSize: 10, padding: "2px 7px", borderRadius: 5 }}>
-                        {item.linkedLaneName}
-                      </span>
-                    ) : (
-                      <span style={{ display: "inline-flex", alignItems: "center", padding: "2px 7px", fontSize: 10, fontWeight: 600, fontFamily: SANS_FONT, color: "#FBBF24", background: "rgba(245,158,11,0.10)", border: "1px solid rgba(245,158,11,0.18)", borderRadius: 5 }}>
-                        unmapped
-                      </span>
-                    )}
-                    {review ? (
-                      <span style={{ display: "inline-flex", alignItems: "center", padding: "2px 6px", fontSize: 10, fontWeight: 500, fontFamily: SANS_FONT, color: review.color, background: `${review.color}10`, borderRadius: 4 }}>
-                        {review.label}
-                      </span>
-                    ) : null}
-                    {linkedPr ? (
-                      <span style={{ display: "inline-flex", alignItems: "center", gap: 4, fontSize: 10, fontFamily: MONO_FONT }}>
-                        <span style={{ color: COLORS.success }}>+{linkedPr.additions}</span>
-                        <span style={{ color: COLORS.danger }}>-{linkedPr.deletions}</span>
-                      </span>
-                    ) : null}
-                    {item.cleanupState === "required" ? (
-                      <span style={{ ...inlineBadge(COLORS.warning), fontSize: 10, padding: "2px 7px", borderRadius: 5 }}>cleanup</span>
-                    ) : null}
-                    {item.adeKind === "queue" && item.linkedGroupId && onOpenQueueView ? (
-                      <span
-                        role="button"
-                        tabIndex={0}
-                        onClick={(event) => {
-                          event.stopPropagation();
-                          onOpenQueueView(item.linkedGroupId!);
-                        }}
-                        onKeyDown={(event) => {
-                          if (event.key === "Enter" || event.key === " ") {
-                            event.preventDefault();
-                            event.stopPropagation();
-                            onOpenQueueView(item.linkedGroupId!);
-                          }
-                        }}
-                        style={{
-                          display: "inline-flex",
-                          alignItems: "center",
-                          padding: "2px 7px",
-                          fontSize: 10,
-                          fontWeight: 600,
-                          fontFamily: SANS_FONT,
-                          color: COLORS.info,
-                          background: "rgba(59,130,246,0.10)",
-                          border: "1px solid rgba(59,130,246,0.18)",
-                          borderRadius: 5,
-                          cursor: "pointer",
-                        }}
-                        title="Open queue workflow"
-                      >
-                        open queue
-                      </span>
-                    ) : null}
-                    <span
-                      role="link"
-                      tabIndex={0}
-                      onClick={(e) => { e.stopPropagation(); void window.ade.app.openExternal(item.githubUrl); }}
-                      onKeyDown={(e) => { if (e.key === "Enter") { e.stopPropagation(); void window.ade.app.openExternal(item.githubUrl); } }}
-                      style={{ display: "inline-flex", alignItems: "center", marginLeft: "auto", padding: 0, cursor: "pointer", color: COLORS.textDim, transition: "color 100ms ease" }}
-                      title="Open on GitHub"
-                      onMouseEnter={(e) => { e.currentTarget.style.color = COLORS.textSecondary; }}
-                      onMouseLeave={(e) => { e.currentTarget.style.color = COLORS.textDim; }}
-                    >
-                      <ArrowSquareOut size={13} />
-                    </span>
-                  </div>
-                </button>
-              );
-            })
+            filteredItems.map((item) => (
+              <GitHubTabPrRow
+                key={item.id}
+                item={item}
+                selected={item.id === selectedItemId}
+                linkedPr={item.linkedPrId ? prsByIdMap.get(item.linkedPrId) ?? null : null}
+                onSelect={handleSelectItem}
+                onOpenQueueView={onOpenQueueView}
+              />
+            ))
           )}
         </div>
 
@@ -1104,3 +891,306 @@ export function GitHubTab({ lanes, mergeMethod, selectedPrId, onSelectPr, onRefr
     </div>
   );
 }
+
+/* ---- PR row (shared between list and virtualizer) ---- */
+function GitHubTabPrRow({
+  item,
+  selected,
+  linkedPr,
+  onSelect,
+  onOpenQueueView,
+}: {
+  item: GitHubPrListItem;
+  selected: boolean;
+  linkedPr: PrSummary | null;
+  onSelect: (item: GitHubPrListItem) => void;
+  onOpenQueueView?: (groupId: string) => void;
+}) {
+  const sc = stateColor(item.state);
+  const ci = ciDotColor(linkedPr);
+  const ciRunning = linkedPr?.checksStatus === "pending";
+  const review = reviewIndicator(linkedPr);
+  const ago = formatTimeAgoCompact(item.createdAt);
+  const visibleLabels = item.labels.slice(0, 4);
+  const overflowCount = item.labels.length - 4;
+  return (
+    <button
+      type="button"
+      onClick={() => onSelect(item)}
+      style={{
+        display: "flex",
+        width: "100%",
+        flexDirection: "column",
+        gap: 6,
+        padding: "11px 14px",
+        textAlign: "left",
+        border: "none",
+        borderLeft: selected ? `3px solid ${sc.text}` : "3px solid transparent",
+        borderBottom: "1px solid rgba(255,255,255,0.04)",
+        background: selected
+          ? `linear-gradient(90deg, ${sc.bg} 0%, rgba(255,255,255,0.02) 100%)`
+          : "transparent",
+        cursor: "pointer",
+        transition: "background 150ms ease",
+      }}
+      onMouseEnter={(e) => { if (!selected) e.currentTarget.style.background = "rgba(255,255,255,0.025)"; }}
+      onMouseLeave={(e) => { if (!selected) e.currentTarget.style.background = "transparent"; }}
+    >
+      {/* Row 1: avatar, bot badge, PR number, title, CI icon, time, comments */}
+      <div style={{ display: "flex", alignItems: "center", gap: 6, minWidth: 0 }}>
+        {item.author ? (
+          <img
+            src={`https://avatars.githubusercontent.com/${item.author}?size=32`}
+            alt=""
+            style={{
+              width: 22,
+              height: 22,
+              borderRadius: "50%",
+              flexShrink: 0,
+              border: `1.5px solid ${sc.bg}`,
+            }}
+            onError={(e) => { (e.target as HTMLImageElement).style.display = "none"; }}
+          />
+        ) : (
+          <div style={{
+            width: 22,
+            height: 22,
+            borderRadius: "50%",
+            flexShrink: 0,
+            background: "rgba(255,255,255,0.05)",
+            border: "1px solid rgba(255,255,255,0.08)",
+          }} />
+        )}
+        {item.isBot ? (
+          <span style={{
+            fontSize: 9,
+            fontWeight: 700,
+            fontFamily: SANS_FONT,
+            textTransform: "uppercase",
+            padding: "1px 5px",
+            borderRadius: 3,
+            background: "rgba(255,255,255,0.06)",
+            color: COLORS.textDim,
+            flexShrink: 0,
+            letterSpacing: "0.3px",
+          }}>
+            bot
+          </span>
+        ) : null}
+        <span style={{ fontFamily: MONO_FONT, fontSize: 11, color: sc.text, flexShrink: 0 }}>
+          #{item.githubPrNumber}
+        </span>
+        <span style={{
+          fontSize: 12,
+          fontWeight: 600,
+          color: COLORS.textPrimary,
+          overflow: "hidden",
+          textOverflow: "ellipsis",
+          whiteSpace: "nowrap",
+          fontFamily: SANS_FONT,
+          flex: 1,
+          minWidth: 0,
+        }}>
+          {item.title}
+        </span>
+        {ci ? (
+          <span title={ci.title} style={{ display: "inline-flex", flexShrink: 0 }}>
+            {linkedPr?.checksStatus === "passing" ? (
+              <CheckCircle size={14} weight="fill" style={{ color: "#4ADE80" }} />
+            ) : linkedPr?.checksStatus === "failing" ? (
+              <XCircle size={14} weight="fill" style={{ color: "#EF4444" }} />
+            ) : ciRunning ? (
+              <PrCiRunningIndicator color="#FBBF24" size={14} />
+            ) : null}
+          </span>
+        ) : null}
+        {ago ? (
+          <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim, flexShrink: 0 }}>
+            {ago}
+          </span>
+        ) : null}
+        {item.commentCount > 0 ? (
+          <span style={{ display: "inline-flex", alignItems: "center", gap: 3, flexShrink: 0, color: COLORS.textDim }}>
+            <ChatText size={12} />
+            <span style={{ fontFamily: MONO_FONT, fontSize: 10 }}>{item.commentCount}</span>
+          </span>
+        ) : null}
+      </div>
+      {/* Row 1.5: labels */}
+      {visibleLabels.length > 0 ? (
+        <div style={{ display: "flex", alignItems: "center", gap: 4, paddingLeft: 30, flexWrap: "wrap" }}>
+          {visibleLabels.map((label) => {
+            const bg = `#${label.color}`;
+            const textColor = labelTextColor(label.color);
+            return (
+              <span
+                key={label.name}
+                style={{
+                  display: "inline-flex",
+                  alignItems: "center",
+                  padding: "1px 8px",
+                  fontSize: 10,
+                  fontWeight: 600,
+                  fontFamily: SANS_FONT,
+                  color: textColor,
+                  background: bg,
+                  borderRadius: 10,
+                  lineHeight: "16px",
+                }}
+              >
+                {label.name}
+              </span>
+            );
+          })}
+          {overflowCount > 0 ? (
+            <span style={{ fontSize: 10, fontFamily: SANS_FONT, color: COLORS.textDim }}>
+              +{overflowCount}
+            </span>
+          ) : null}
+        </div>
+      ) : null}
+      {/* Row 2: branch info */}
+      {item.baseBranch && item.headBranch ? (
+        <div style={{ display: "flex", alignItems: "center", gap: 4, paddingLeft: 30, fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim }}>
+          <span>{item.baseBranch}</span>
+          <span style={{ color: COLORS.textMuted }}>←</span>
+          <span style={{ color: COLORS.textMuted, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{item.headBranch}</span>
+        </div>
+      ) : null}
+      {/* Row 3: inline stats */}
+      <div style={{ display: "flex", alignItems: "center", flexWrap: "wrap", gap: 6, paddingLeft: 30 }}>
+        <span style={stateBadgeStyle(item)}>{item.state}</span>
+        {adeKindBadge(item.adeKind) ? <span style={adeKindBadge(item.adeKind)!}>{item.adeKind}</span> : null}
+        {item.scope === "external" ? (
+          <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim }}>
+            {item.repoOwner}/{item.repoName}
+          </span>
+        ) : null}
+        {item.linkedLaneName ? (
+          <span style={{ ...inlineBadge(COLORS.textSecondary), fontSize: 10, padding: "2px 7px", borderRadius: 5 }}>
+            {item.linkedLaneName}
+          </span>
+        ) : (
+          <span style={{ display: "inline-flex", alignItems: "center", padding: "2px 7px", fontSize: 10, fontWeight: 600, fontFamily: SANS_FONT, color: "#FBBF24", background: "rgba(245,158,11,0.10)", border: "1px solid rgba(245,158,11,0.18)", borderRadius: 5 }}>
+            unmapped
+          </span>
+        )}
+        {review ? (
+          <span style={{ display: "inline-flex", alignItems: "center", padding: "2px 6px", fontSize: 10, fontWeight: 500, fontFamily: SANS_FONT, color: review.color, background: `${review.color}10`, borderRadius: 4 }}>
+            {review.label}
+          </span>
+        ) : null}
+        {linkedPr ? (
+          <span style={{ display: "inline-flex", alignItems: "center", gap: 4, fontSize: 10, fontFamily: MONO_FONT }}>
+            <span style={{ color: COLORS.success }}>+{linkedPr.additions}</span>
+            <span style={{ color: COLORS.danger }}>-{linkedPr.deletions}</span>
+          </span>
+        ) : null}
+        {item.cleanupState === "required" ? (
+          <span style={{ ...inlineBadge(COLORS.warning), fontSize: 10, padding: "2px 7px", borderRadius: 5 }}>cleanup</span>
+        ) : null}
+        {item.adeKind === "queue" && item.linkedGroupId && onOpenQueueView ? (
+          <span
+            role="button"
+            tabIndex={0}
+            onClick={(event) => {
+              event.stopPropagation();
+              onOpenQueueView(item.linkedGroupId!);
+            }}
+            onKeyDown={(event) => {
+              if (event.key === "Enter" || event.key === " ") {
+                event.preventDefault();
+                event.stopPropagation();
+                onOpenQueueView(item.linkedGroupId!);
+              }
+            }}
+            style={{
+              display: "inline-flex",
+              alignItems: "center",
+              padding: "2px 7px",
+              fontSize: 10,
+              fontWeight: 600,
+              fontFamily: SANS_FONT,
+              color: COLORS.info,
+              background: "rgba(59,130,246,0.10)",
+              border: "1px solid rgba(59,130,246,0.18)",
+              borderRadius: 5,
+              cursor: "pointer",
+            }}
+            title="Open queue workflow"
+          >
+            open queue
+          </span>
+        ) : null}
+        <span
+          role="link"
+          tabIndex={0}
+          onClick={(e) => { e.stopPropagation(); void window.ade.app.openExternal(item.githubUrl); }}
+          onKeyDown={(e) => { if (e.key === "Enter") { e.stopPropagation(); void window.ade.app.openExternal(item.githubUrl); } }}
+          style={{ display: "inline-flex", alignItems: "center", marginLeft: "auto", padding: 0, cursor: "pointer", color: COLORS.textDim, transition: "color 100ms ease" }}
+          title="Open on GitHub"
+          onMouseEnter={(e) => { e.currentTarget.style.color = COLORS.textSecondary; }}
+          onMouseLeave={(e) => { e.currentTarget.style.color = COLORS.textDim; }}
+        >
+          <ArrowSquareOut size={13} />
+        </span>
+      </div>
+    </button>
+  );
+}
+
+/* ---- Virtual list for GitHub PR sidebar (activated above VIRTUALIZE_AT) ---- */
+function GitHubTabVirtualList({
+  parentRef,
+  items,
+  selectedItemId,
+  prsByIdMap,
+  onSelect,
+  onOpenQueueView,
+}: {
+  parentRef: React.RefObject<HTMLDivElement | null>;
+  items: GitHubPrListItem[];
+  selectedItemId: string | null;
+  prsByIdMap: Map<string, PrSummary>;
+  onSelect: (item: GitHubPrListItem) => void;
+  onOpenQueueView?: (groupId: string) => void;
+}) {
+  const virtualizer = useVirtualizer({
+    count: items.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 108,
+    overscan: 6,
+  });
+  return (
+    <div
+      data-testid="pr-github-list-virtual"
+      style={{ height: virtualizer.getTotalSize(), position: "relative" }}
+    >
+      {virtualizer.getVirtualItems().map((virtualRow) => {
+        const item = items[virtualRow.index]!;
+        return (
+          <div
+            key={item.id}
+            data-index={virtualRow.index}
+            ref={virtualizer.measureElement}
+            style={{
+              position: "absolute",
+              top: 0,
+              left: 0,
+              width: "100%",
+              transform: `translateY(${virtualRow.start}px)`,
+            }}
+          >
+            <GitHubTabPrRow
+              item={item}
+              selected={item.id === selectedItemId}
+              linkedPr={item.linkedPrId ? prsByIdMap.get(item.linkedPrId) ?? null : null}
+              onSelect={onSelect}
+              onOpenQueueView={onOpenQueueView}
+            />
+          </div>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/apps/desktop/src/renderer/components/prs/tabs/NormalTab.tsx b/apps/desktop/src/renderer/components/prs/tabs/NormalTab.tsx
index 87937523e..53bfc24c6 100644
--- a/apps/desktop/src/renderer/components/prs/tabs/NormalTab.tsx
+++ b/apps/desktop/src/renderer/components/prs/tabs/NormalTab.tsx
@@ -3,6 +3,7 @@ import {
   MagnifyingGlass, Funnel, XCircle,
 } from "@phosphor-icons/react";
 import { useNavigate } from "react-router-dom";
+import { useVirtualizer } from "@tanstack/react-virtual";
 import type {
   MergeMethod, PrMergeContext, PrWithConflicts, LaneSummary,
 } from "../../../../shared/types";
@@ -22,6 +23,8 @@ function statusDotColor(state: string): string {
   return COLORS.textMuted;
 }
 
+const VIRTUALIZE_AT = 50;
+
 /* ---- Filter types ---- */
 type FilterState = {
   search: string;
@@ -213,66 +216,24 @@ export function NormalTab({ prs, lanes, mergeContextByPrId, mergeMethod, selecte
             <div style={{ padding: 20 }}>
               <EmptyState title={hasActiveFilters ? "No matching PRs" : "No PRs"} description={hasActiveFilters ? "Try adjusting your filters." : "Create a PR from a lane or link an existing GitHub PR."} />
             </div>
+          ) : filteredPrs.length > VIRTUALIZE_AT ? (
+            <NormalTabVirtualList
+              parentRef={listRef}
+              prs={filteredPrs}
+              selectedPrId={selectedPrId}
+              laneById={laneById}
+              onSelectPr={onSelectPr}
+            />
           ) : (
-            filteredPrs.map((pr) => {
-              const isSelected = pr.id === selectedPrId;
-              const laneName = laneById.get(pr.laneId)?.name ?? pr.laneId;
-              const sc = getPrStateBadge(pr.state);
-              const cc = getPrChecksBadge(pr.checksStatus);
-              const rc = getPrReviewsBadge(pr.reviewStatus);
-
-              return (
-                <button
-                  key={pr.id}
-                  type="button"
-                  onClick={() => onSelectPr(pr.id)}
-                  style={{
-                    display: "flex", width: "100%", alignItems: "flex-start", gap: 10,
-                    padding: "12px 14px", textAlign: "left", border: "none", cursor: "pointer",
-                    borderLeft: isSelected ? `3px solid ${COLORS.accent}` : "3px solid transparent",
-                    background: isSelected ? `${COLORS.accent}12` : "transparent",
-                    borderBottom: `1px solid ${COLORS.border}`, transition: "background 100ms",
-                  }}
-                  onMouseEnter={(e) => { if (!isSelected) e.currentTarget.style.background = COLORS.hoverBg; }}
-                  onMouseLeave={(e) => { if (!isSelected) e.currentTarget.style.background = "transparent"; }}
-                >
-                  {/* Status dot */}
-                  <div style={{
-                    width: 8, height: 8, borderRadius: "50%", marginTop: 5, flexShrink: 0,
-                    background: statusDotColor(pr.state),
-                  }} />
-
-                  <div style={{ flex: 1, minWidth: 0 }}>
-                    <div style={{ display: "flex", alignItems: "center", gap: 6 }}>
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 11, color: COLORS.textMuted }}>#{pr.githubPrNumber}</span>
-                      <span style={{ fontWeight: 600, fontSize: 12, color: COLORS.textPrimary, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: 1 }}>
-                        {pr.title}
-                      </span>
-                    </div>
-                    <div style={{ display: "flex", alignItems: "center", gap: 6, marginTop: 4 }}>
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: 1 }}>
-                        {laneName}
-                      </span>
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim, flexShrink: 0 }}>
-                        {formatTimeAgoCompact(pr.updatedAt)}
-                      </span>
-                    </div>
-                    <div style={{ display: "flex", alignItems: "center", gap: 4, marginTop: 6, flexWrap: "wrap" }}>
-                      <PrConflictBadge riskLevel={pr.conflictAnalysis?.riskLevel ?? null} overlappingFileCount={pr.conflictAnalysis?.overlapCount} />
-                      <span style={{ display: "inline-flex", alignItems: "center", gap: 4 }}>
-                        <InlinePrBadge {...cc} />
-                        {pr.checksStatus === "pending" ? <PrCiRunningIndicator /> : null}
-                      </span>
-                      <InlinePrBadge {...rc} />
-                      <InlinePrBadge {...sc} />
-                      {/* Diff stats mini */}
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 9, color: COLORS.success }}>+{pr.additions}</span>
-                      <span style={{ fontFamily: MONO_FONT, fontSize: 9, color: COLORS.danger }}>-{pr.deletions}</span>
-                    </div>
-                  </div>
-                </button>
-              );
-            })
+            filteredPrs.map((pr) => (
+              <NormalTabPrRow
+                key={pr.id}
+                pr={pr}
+                laneById={laneById}
+                isSelected={pr.id === selectedPrId}
+                onSelectPr={onSelectPr}
+              />
+            ))
           )}
         </div>
 
@@ -379,3 +340,130 @@ function KbdHint({ keys, label }: { keys: string; label: string }) {
     </div>
   );
 }
+
+/* ---- PR row (shared between list and virtualizer) ---- */
+function NormalTabPrRow({
+  pr,
+  laneById,
+  isSelected,
+  onSelectPr,
+}: {
+  pr: PrWithConflicts;
+  laneById: Map<string, LaneSummary>;
+  isSelected: boolean;
+  onSelectPr: (id: string | null) => void;
+}) {
+  const laneName = laneById.get(pr.laneId)?.name ?? pr.laneId;
+  const sc = getPrStateBadge(pr.state);
+  const cc = getPrChecksBadge(pr.checksStatus);
+  const rc = getPrReviewsBadge(pr.reviewStatus);
+  return (
+    <button
+      type="button"
+      onClick={() => onSelectPr(pr.id)}
+      style={{
+        display: "flex", width: "100%", alignItems: "flex-start", gap: 10,
+        padding: "12px 14px", textAlign: "left", border: "none", cursor: "pointer",
+        borderLeft: isSelected ? `3px solid ${COLORS.accent}` : "3px solid transparent",
+        background: isSelected ? `${COLORS.accent}12` : "transparent",
+        borderBottom: `1px solid ${COLORS.border}`, transition: "background 100ms",
+      }}
+      onMouseEnter={(e) => { if (!isSelected) e.currentTarget.style.background = COLORS.hoverBg; }}
+      onMouseLeave={(e) => { if (!isSelected) e.currentTarget.style.background = "transparent"; }}
+    >
+      <div style={{
+        width: 8, height: 8, borderRadius: "50%", marginTop: 5, flexShrink: 0,
+        background: statusDotColor(pr.state),
+      }} />
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <div style={{ display: "flex", alignItems: "center", gap: 6 }}>
+          <span style={{ fontFamily: MONO_FONT, fontSize: 11, color: COLORS.textMuted }}>#{pr.githubPrNumber}</span>
+          <span style={{ fontWeight: 600, fontSize: 12, color: COLORS.textPrimary, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: 1 }}>
+            {pr.title}
+          </span>
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: 6, marginTop: 4 }}>
+          <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: 1 }}>
+            {laneName}
+          </span>
+          <span style={{ fontFamily: MONO_FONT, fontSize: 10, color: COLORS.textDim, flexShrink: 0 }}>
+            {formatTimeAgoCompact(pr.updatedAt)}
+          </span>
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: 4, marginTop: 6, flexWrap: "wrap" }}>
+          <PrConflictBadge riskLevel={pr.conflictAnalysis?.riskLevel ?? null} overlappingFileCount={pr.conflictAnalysis?.overlapCount} />
+          <span style={{ display: "inline-flex", alignItems: "center", gap: 4 }}>
+            <InlinePrBadge {...cc} />
+            {pr.checksStatus === "pending" ? <PrCiRunningIndicator /> : null}
+          </span>
+          <InlinePrBadge {...rc} />
+          <InlinePrBadge {...sc} />
+          <span style={{ fontFamily: MONO_FONT, fontSize: 9, color: COLORS.success }}>+{pr.additions}</span>
+          <span style={{ fontFamily: MONO_FONT, fontSize: 9, color: COLORS.danger }}>-{pr.deletions}</span>
+        </div>
+      </div>
+    </button>
+  );
+}
+
+/* ---- Virtual list for PR sidebar (activated above VIRTUALIZE_AT) ---- */
+function NormalTabVirtualList({
+  parentRef,
+  prs,
+  selectedPrId,
+  laneById,
+  onSelectPr,
+}: {
+  parentRef: React.RefObject<HTMLDivElement>;
+  prs: PrWithConflicts[];
+  selectedPrId: string | null;
+  laneById: Map<string, LaneSummary>;
+  onSelectPr: (id: string | null) => void;
+}) {
+  const virtualizer = useVirtualizer({
+    count: prs.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 96,
+    overscan: 6,
+  });
+  // Keyboard navigation moves selectedPrId outside the rendered window; scroll
+  // the selected row into view so the user can see what is highlighted.
+  React.useEffect(() => {
+    if (!selectedPrId) return;
+    const index = prs.findIndex((p) => p.id === selectedPrId);
+    if (index < 0) return;
+    virtualizer.scrollToIndex(index, { align: "auto" });
+  }, [selectedPrId, prs, virtualizer]);
+  return (
+    <div
+      data-testid="pr-normal-list-virtual"
+      style={{ height: virtualizer.getTotalSize(), position: "relative" }}
+    >
+      {virtualizer.getVirtualItems().map((virtualRow) => {
+        const pr = prs[virtualRow.index];
+        if (!pr) return null;
+        return (
+          <div
+            key={pr.id}
+            data-index={virtualRow.index}
+            ref={virtualizer.measureElement}
+            style={{
+              position: "absolute",
+              top: 0,
+              left: 0,
+              width: "100%",
+              transform: `translateY(${virtualRow.start}px)`,
+            }}
+          >
+            <NormalTabPrRow
+              pr={pr}
+              laneById={laneById}
+              isSelected={pr.id === selectedPrId}
+              onSelectPr={onSelectPr}
+            />
+          </div>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/apps/desktop/src/renderer/components/run/QuickRunMenu.tsx b/apps/desktop/src/renderer/components/run/QuickRunMenu.tsx
index d7fc97a0c..d9d958e77 100644
--- a/apps/desktop/src/renderer/components/run/QuickRunMenu.tsx
+++ b/apps/desktop/src/renderer/components/run/QuickRunMenu.tsx
@@ -19,10 +19,6 @@ const menuContentStyle: React.CSSProperties = {
   minWidth: 240,
   maxWidth: 320,
   padding: 6,
-  background: COLORS.cardBg,
-  border: `1px solid ${COLORS.border}`,
-  borderRadius: 0,
-  boxShadow: "0 12px 32px rgba(0, 0, 0, 0.28)",
   zIndex: 300,
 };
 
@@ -180,7 +176,7 @@ export function QuickRunMenu({
       </DropdownMenu.Trigger>
 
       <DropdownMenu.Portal>
-        <DropdownMenu.Content sideOffset={6} align={align} style={menuContentStyle}>
+        <DropdownMenu.Content sideOffset={6} align={align} className="ade-liquid-glass-menu" style={menuContentStyle}>
           <div style={menuSectionLabelStyle}>Lane runtime</div>
           <QuickRunItem icon={<Rocket size={12} />} label="Open Run tab" onSelect={handleOpenRun} />
           <QuickRunItem icon={<Terminal size={12} />} label="Open shell in Work" onSelect={handleOpenShell} />
diff --git a/apps/desktop/src/renderer/components/run/RunSidebar.tsx b/apps/desktop/src/renderer/components/run/RunSidebar.tsx
index c17551bd1..5d2df2806 100644
--- a/apps/desktop/src/renderer/components/run/RunSidebar.tsx
+++ b/apps/desktop/src/renderer/components/run/RunSidebar.tsx
@@ -258,14 +258,12 @@ export function RunSidebar({
       {contextMenu && (
         <div
           ref={contextMenuRef}
+          className="ade-liquid-glass-menu"
           style={{
             position: "fixed",
             top: Math.min(contextMenu.y, window.innerHeight - 100),
             left: Math.min(contextMenu.x, window.innerWidth - 160),
             zIndex: 100,
-            background: COLORS.cardBg,
-            border: `1px solid ${COLORS.border}`,
-            borderRadius: 0,
             minWidth: 140,
             padding: "4px 0",
           }}
diff --git a/apps/desktop/src/renderer/components/run/RunStackTabs.tsx b/apps/desktop/src/renderer/components/run/RunStackTabs.tsx
index 321e49797..1eef9c93a 100644
--- a/apps/desktop/src/renderer/components/run/RunStackTabs.tsx
+++ b/apps/desktop/src/renderer/components/run/RunStackTabs.tsx
@@ -264,6 +264,7 @@ export function RunStackTabs({
       {contextMenu ? (
         <div
           ref={contextMenuRef}
+          className="ade-liquid-glass-menu"
           style={{
             position: "fixed",
             top: contextMenu.y,
@@ -271,9 +272,6 @@ export function RunStackTabs({
             zIndex: 120,
             minWidth: 190,
             padding: "4px 0",
-            background: COLORS.cardBgSolid,
-            border: `1px solid ${COLORS.border}`,
-            boxShadow: "0 18px 40px rgba(0,0,0,0.42)",
           }}
         >
           {([
diff --git a/apps/desktop/src/renderer/components/shared/ModelCatalogPanel.tsx b/apps/desktop/src/renderer/components/shared/ModelCatalogPanel.tsx
index 9c1f48422..69a91222e 100644
--- a/apps/desktop/src/renderer/components/shared/ModelCatalogPanel.tsx
+++ b/apps/desktop/src/renderer/components/shared/ModelCatalogPanel.tsx
@@ -699,11 +699,10 @@ export function ModelCatalogPanel({
       ref={panelRef}
       role="presentation"
       className={cn(
-        "flex w-full flex-col overflow-hidden rounded-[18px] border border-violet-400/[0.12] outline-none",
+        "ade-chat-drawer-glass flex w-full flex-col overflow-hidden outline-none",
         "max-h-[min(560px,70vh)]",
         className,
       )}
-      style={{ background: "#131122", backdropFilter: "blur(60px)", boxShadow: "0 28px 64px -16px rgba(0,0,0,0.67)" }}
     >
 
       <div className="shrink-0 space-y-3 border-b border-white/[0.04] px-6 pb-4 pt-5">
diff --git a/apps/desktop/src/renderer/components/terminals/LaneCombobox.tsx b/apps/desktop/src/renderer/components/terminals/LaneCombobox.tsx
index d59ec26f4..e9c1daeae 100644
--- a/apps/desktop/src/renderer/components/terminals/LaneCombobox.tsx
+++ b/apps/desktop/src/renderer/components/terminals/LaneCombobox.tsx
@@ -201,7 +201,7 @@ export function LaneCombobox({
         ? createPortal(
             <div
               ref={popoverRef}
-              className="ade-lane-popover"
+              className="ade-lane-popover ade-liquid-glass-menu"
               style={popoverStyle}
               onKeyDown={handleKeyDown}
             >
diff --git a/apps/desktop/src/renderer/components/terminals/PackedSessionGrid.tsx b/apps/desktop/src/renderer/components/terminals/PackedSessionGrid.tsx
index 7694e2811..33ae8fc49 100644
--- a/apps/desktop/src/renderer/components/terminals/PackedSessionGrid.tsx
+++ b/apps/desktop/src/renderer/components/terminals/PackedSessionGrid.tsx
@@ -371,7 +371,7 @@ export function PackedSessionGrid({
               onMouseDown={() => tile.onSelect?.()}
             >
               <div className={cn(
-                "flex h-full min-h-0 min-w-0 flex-col overflow-hidden rounded-md",
+                "flex h-full min-h-0 min-w-0 flex-col overflow-hidden rounded-xl",
                 tile.className,
               )}>
                 {tile.header}
@@ -379,7 +379,7 @@ export function PackedSessionGrid({
               </div>
               <div
                 className={cn(
-                  "pointer-events-none absolute inset-0 rounded-md border border-white/[0.04] transition-opacity",
+                  "pointer-events-none absolute inset-0 rounded-xl border border-[color-mix(in_srgb,var(--color-accent)_30%,transparent)] transition-opacity",
                   tile.selected || resizingTileId === tile.id ? "opacity-100" : "opacity-0 group-hover:opacity-100",
                 )}
               />
diff --git a/apps/desktop/src/renderer/components/terminals/SessionContextMenu.test.tsx b/apps/desktop/src/renderer/components/terminals/SessionContextMenu.test.tsx
new file mode 100644
index 000000000..a4adb2249
--- /dev/null
+++ b/apps/desktop/src/renderer/components/terminals/SessionContextMenu.test.tsx
@@ -0,0 +1,79 @@
+// @vitest-environment jsdom
+
+import React from "react";
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import type { TerminalSessionSummary } from "../../../shared/types";
+import { SessionContextMenu } from "./SessionContextMenu";
+
+function makeSession(overrides: Partial<TerminalSessionSummary> = {}): TerminalSessionSummary {
+  return {
+    id: "session-1",
+    laneId: "lane-1",
+    laneName: "Lane 1",
+    ptyId: null,
+    tracked: true,
+    pinned: false,
+    goal: null,
+    toolType: "codex",
+    title: "CLI session",
+    status: "completed",
+    startedAt: "2026-04-14T12:00:00.000Z",
+    endedAt: "2026-04-14T12:05:00.000Z",
+    exitCode: 0,
+    transcriptPath: "/tmp/session-1.log",
+    headShaStart: null,
+    headShaEnd: null,
+    lastOutputPreview: null,
+    summary: null,
+    runtimeState: "exited",
+    resumeCommand: null,
+    ...overrides,
+  };
+}
+
+describe("SessionContextMenu", () => {
+  it("shows delete session for ended CLI sessions", () => {
+    const { container } = render(
+      <SessionContextMenu
+        menu={{ session: makeSession(), x: 10, y: 10 }}
+        onClose={vi.fn()}
+        onCloseSession={vi.fn()}
+        onEndChat={vi.fn()}
+        onDeleteChat={vi.fn()}
+        onDeleteSession={vi.fn()}
+        deletingSessionId={null}
+        onResume={vi.fn()}
+        onCopyResumeCommand={vi.fn()}
+        onGoToLane={vi.fn()}
+        onCopySessionId={vi.fn()}
+        onRename={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByRole("button", { name: "Delete session" })).toBeTruthy();
+    expect(container.textContent ?? "").not.toContain("Delete chat");
+  });
+
+  it("keeps delete chat for ended chat sessions", () => {
+    const { container } = render(
+      <SessionContextMenu
+        menu={{ session: makeSession({ toolType: "codex-chat" }), x: 10, y: 10 }}
+        onClose={vi.fn()}
+        onCloseSession={vi.fn()}
+        onEndChat={vi.fn()}
+        onDeleteChat={vi.fn()}
+        onDeleteSession={vi.fn()}
+        deletingSessionId={null}
+        onResume={vi.fn()}
+        onCopyResumeCommand={vi.fn()}
+        onGoToLane={vi.fn()}
+        onCopySessionId={vi.fn()}
+        onRename={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByRole("button", { name: "Delete chat" })).toBeTruthy();
+    expect(container.textContent ?? "").not.toContain("Delete session");
+  });
+});
diff --git a/apps/desktop/src/renderer/components/terminals/SessionContextMenu.tsx b/apps/desktop/src/renderer/components/terminals/SessionContextMenu.tsx
index 2e9fb2b92..5b74770a4 100644
--- a/apps/desktop/src/renderer/components/terminals/SessionContextMenu.tsx
+++ b/apps/desktop/src/renderer/components/terminals/SessionContextMenu.tsx
@@ -14,6 +14,9 @@ type SessionContextMenuProps = {
   onClose: () => void;
   onCloseSession: (args: { ptyId: string; sessionId: string }) => void;
   onEndChat: (sessionId: string) => void;
+  onDeleteChat: (session: TerminalSessionSummary) => void;
+  onDeleteSession: (session: TerminalSessionSummary) => void;
+  deletingSessionId: string | null;
   onResume: (session: TerminalSessionSummary) => void;
   onCopyResumeCommand: (command: string) => void;
   onGoToLane: (session: TerminalSessionSummary) => void;
@@ -26,6 +29,9 @@ export function SessionContextMenu({
   onClose,
   onCloseSession,
   onEndChat,
+  onDeleteChat,
+  onDeleteSession,
+  deletingSessionId,
   onResume,
   onCopyResumeCommand,
   onGoToLane,
@@ -77,7 +83,7 @@ export function SessionContextMenu({
 
       {/* Menu */}
       <div
-        className="fixed z-50 min-w-[180px] rounded-lg bg-[--color-surface-overlay] border border-border/30 py-1 shadow-2xl backdrop-blur-md"
+        className="ade-liquid-glass-menu fixed z-50 min-w-[180px] py-1"
         style={{ left: x, top: y }}
         onPointerDown={(e) => e.stopPropagation()}
       >
@@ -127,6 +133,26 @@ export function SessionContextMenu({
           </button>
         ) : null}
 
+        {!isRunning && isChat ? (
+          <button
+            className="flex w-full items-center gap-2 rounded px-3 py-1.5 text-left text-xs text-red-300 hover:bg-red-500/10 transition-colors"
+            disabled={deletingSessionId === session.id}
+            onClick={() => { onDeleteChat(session); onClose(); }}
+          >
+            {deletingSessionId === session.id ? "Deleting..." : "Delete chat"}
+          </button>
+        ) : null}
+
+        {!isRunning && !isChat ? (
+          <button
+            className="flex w-full items-center gap-2 rounded px-3 py-1.5 text-left text-xs text-red-300 hover:bg-red-500/10 transition-colors"
+            disabled={deletingSessionId === session.id}
+            onClick={() => { onDeleteSession(session); onClose(); }}
+          >
+            {deletingSessionId === session.id ? "Deleting..." : "Delete session"}
+          </button>
+        ) : null}
+
         {canResume ? (
           <button
             className="flex w-full items-center gap-2 rounded px-3 py-1.5 text-left text-xs hover:bg-muted/40 transition-colors"
diff --git a/apps/desktop/src/renderer/components/terminals/SessionInfoPopover.tsx b/apps/desktop/src/renderer/components/terminals/SessionInfoPopover.tsx
index 0fbe1e44a..8628e48a1 100644
--- a/apps/desktop/src/renderer/components/terminals/SessionInfoPopover.tsx
+++ b/apps/desktop/src/renderer/components/terminals/SessionInfoPopover.tsx
@@ -6,6 +6,7 @@ import {
   Monitor,
   Play,
   Stop as Square,
+  Trash,
   X,
 } from "@phosphor-icons/react";
 import type { TerminalSessionSummary } from "../../../shared/types";
@@ -33,20 +34,26 @@ export function SessionInfoPopover({
   onClose,
   onCloseSession,
   onEndChat,
+  onDeleteChat,
+  onDeleteSession,
   onResume,
   onGoToLane,
   closingPtyIds,
   closingChatSessionId,
+  deletingSessionId,
   resumingSessionId,
 }: {
   popover: InfoPopoverState;
   onClose: () => void;
   onCloseSession: (args: { ptyId: string; sessionId: string }) => void;
   onEndChat: (sessionId: string) => void;
+  onDeleteChat: (session: TerminalSessionSummary) => void;
+  onDeleteSession: (session: TerminalSessionSummary) => void;
   onResume: (session: TerminalSessionSummary) => void;
   onGoToLane: (session: TerminalSessionSummary) => void;
   closingPtyIds: Set<string>;
   closingChatSessionId: string | null;
+  deletingSessionId: string | null;
   resumingSessionId: string | null;
 }) {
   const ref = useRef<HTMLDivElement>(null);
@@ -237,6 +244,32 @@ export function SessionInfoPopover({
               </Button>
             </SmartTooltip>
           ) : null}
+          {session.status !== "running" && isChat ? (
+            <SmartTooltip content={{ label: "Delete Chat", description: "Permanently remove this saved chat from ADE." }}>
+              <Button
+                variant="danger"
+                size="sm"
+                disabled={deletingSessionId === session.id}
+                onClick={() => onDeleteChat(session)}
+              >
+                <Trash size={14} weight="regular" />
+                {deletingSessionId === session.id ? "Deleting..." : "Delete chat"}
+              </Button>
+            </SmartTooltip>
+          ) : null}
+          {session.status !== "running" && !isChat ? (
+            <SmartTooltip content={{ label: "Delete Session", description: "Permanently remove this saved terminal session from ADE." }}>
+              <Button
+                variant="danger"
+                size="sm"
+                disabled={deletingSessionId === session.id}
+                onClick={() => onDeleteSession(session)}
+              >
+                <Trash size={14} weight="regular" />
+                {deletingSessionId === session.id ? "Deleting..." : "Delete session"}
+              </Button>
+            </SmartTooltip>
+          ) : null}
           <SmartTooltip content={{ label: "Go to Lane", description: "Navigate to the lane that contains this session." }}>
             <Button variant="outline" size="sm" onClick={() => onGoToLane(session)}>
               Go to lane
diff --git a/apps/desktop/src/renderer/components/terminals/SessionListPane.tsx b/apps/desktop/src/renderer/components/terminals/SessionListPane.tsx
index 7b11b1902..480f1e82e 100644
--- a/apps/desktop/src/renderer/components/terminals/SessionListPane.tsx
+++ b/apps/desktop/src/renderer/components/terminals/SessionListPane.tsx
@@ -324,7 +324,7 @@ export const SessionListPane = React.memo(function SessionListPane({
 
         {/* Expandable filter panel */}
         {filterOpen ? (
-          <div className="space-y-1.5 rounded-lg p-2" style={{ background: "rgba(255,255,255,0.02)", border: "1px solid rgba(255,255,255,0.04)" }}>
+          <div className="ade-chat-drawer-glass space-y-1.5 p-2">
             <div className="flex items-center gap-1">
               <span className="text-[9px] font-medium text-muted-fg/50 uppercase tracking-wider shrink-0 w-10">Group</span>
               <div className="flex items-center gap-0.5 flex-1">
@@ -347,9 +347,9 @@ export const SessionListPane = React.memo(function SessionListPane({
                   >
                     <button
                       type="button"
-                      className="flex-1 rounded-md px-2 py-1 text-[10px] font-medium transition-colors"
+                      className="ade-chat-drawer-row flex-1 rounded-md px-2 py-1 text-[10px] font-medium"
+                      data-active={sessionListOrganization === opt.key ? "true" : undefined}
                       style={{
-                        background: sessionListOrganization === opt.key ? "rgba(255,255,255,0.08)" : "transparent",
                         color: sessionListOrganization === opt.key ? "var(--color-fg)" : "var(--color-muted-fg)",
                       }}
                       onClick={() => setSessionListOrganization(opt.key)}
diff --git a/apps/desktop/src/renderer/components/terminals/TerminalView.test.tsx b/apps/desktop/src/renderer/components/terminals/TerminalView.test.tsx
index 08e796a71..d383b2ff4 100644
--- a/apps/desktop/src/renderer/components/terminals/TerminalView.test.tsx
+++ b/apps/desktop/src/renderer/components/terminals/TerminalView.test.tsx
@@ -436,7 +436,7 @@ describe("TerminalView", () => {
     expect(terminal?.dispose).not.toHaveBeenCalled();
   });
 
-  it("buffers PTY output while unmounted instead of writing into a parked runtime", async () => {
+  it("writes PTY output into the parked runtime so the terminal state stays current", async () => {
     const firstView = render(<TerminalView ptyId="pty-buffered" sessionId="session-buffered" isActive />);
     await flushAllTimers();
 
@@ -452,10 +452,17 @@ describe("TerminalView", () => {
       listener({ ptyId: "pty-buffered", sessionId: "session-buffered", data: "hello from background\n" });
     }
     await flushAnimationFrame();
-    expect(terminal?.write).not.toHaveBeenCalled();
+    // xterm.write is safe on a parked runtime (host is detached but the
+    // instance still owns a valid internal buffer). Writing through while
+    // parked keeps the terminal state in sync so switching back shows the
+    // latest output instead of a stale snapshot.
+    expect(terminal?.write).toHaveBeenCalledWith("hello from background\n");
 
+    terminal?.write.mockClear();
     render(<TerminalView ptyId="pty-buffered" sessionId="session-buffered" isActive />);
     await flushAnimationFrame();
-    expect(terminal?.write).toHaveBeenCalledWith("hello from background\n");
+    // Remount should not duplicate the write — the data was already applied
+    // via the parked-runtime path, so no further synchronous flush is needed.
+    expect(terminal?.write).not.toHaveBeenCalledWith("hello from background\n");
   });
 });
diff --git a/apps/desktop/src/renderer/components/terminals/TerminalView.tsx b/apps/desktop/src/renderer/components/terminals/TerminalView.tsx
index 3c7cfecdf..2d1ae1786 100644
--- a/apps/desktop/src/renderer/components/terminals/TerminalView.tsx
+++ b/apps/desktop/src/renderer/components/terminals/TerminalView.tsx
@@ -475,6 +475,19 @@ function scheduleFit(runtime: CachedRuntime, forcePtyResize = false) {
   });
 }
 
+function flushFrameWriteChunksSync(runtime: CachedRuntime) {
+  if (runtime.disposed) return;
+  if (runtime.frameWriteChunks.length === 0) return;
+  const merged = runtime.frameWriteChunks.join("");
+  runtime.frameWriteChunks.length = 0;
+  runtime.frameWriteBytes = 0;
+  try {
+    runtime.term.write(merged);
+  } catch {
+    // ignore write errors after disposal
+  }
+}
+
 function enqueueFrameWrite(runtime: CachedRuntime, chunk: string) {
   if (!chunk) return;
   runtime.frameWriteChunks.push(chunk);
@@ -484,7 +497,6 @@ function enqueueFrameWrite(runtime: CachedRuntime, chunk: string) {
     runtime.frameWriteBytes -= dropped?.length ?? 0;
     incrementHealth(runtime, "droppedChunks");
   }
-  if (runtime.refs === 0) return;
   scheduleFrameWriteFlush(runtime);
 }
 
@@ -492,18 +504,11 @@ function scheduleFrameWriteFlush(runtime: CachedRuntime) {
   if (runtime.flushRafId != null) return;
   runtime.flushRafId = requestAnimationFrame(() => {
     runtime.flushRafId = null;
-    if (runtime.disposed) return;
-    if (runtime.frameWriteChunks.length === 0) return;
-    // Keep writes buffered while no view is mounted; the remount path reschedules the flush.
-    if (runtime.refs === 0) return;
-    const merged = runtime.frameWriteChunks.join("");
-    runtime.frameWriteChunks.length = 0;
-    runtime.frameWriteBytes = 0;
-    try {
-      runtime.term.write(merged);
-    } catch {
-      // ignore write errors after disposal
-    }
+    // Write to xterm even while parked: xterm.write only updates the internal
+    // buffer, so it is safe to call when the host is detached. Writing through
+    // keeps the terminal state current so switching back shows the latest
+    // output instead of a stale snapshot (issue #157).
+    flushFrameWriteChunksSync(runtime);
   });
 }
 
@@ -942,7 +947,14 @@ export function TerminalView({
     if (runtime.host.parentElement !== el) {
       el.replaceChildren(runtime.host);
     }
-    scheduleFrameWriteFlush(runtime);
+    // Drain any buffered output synchronously on remount so the user sees the
+    // latest terminal state immediately when they switch back, even if a
+    // previously-scheduled flush RAF got throttled while the host was parked.
+    if (runtime.flushRafId != null) {
+      cancelAnimationFrame(runtime.flushRafId);
+      runtime.flushRafId = null;
+    }
+    flushFrameWriteChunksSync(runtime);
 
     const schedule = (forceResize = false) => scheduleFit(runtime, forceResize);
 
diff --git a/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx b/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx
index a320aa54e..4de54f9bd 100644
--- a/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx
+++ b/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx
@@ -26,7 +26,8 @@ export function TerminalsPage() {
 
   const [contextMenu, setContextMenu] = useState<SessionContextMenuState>(null);
   const [infoPopover, setInfoPopover] = useState<InfoPopoverState>(null);
-  const [renameError, setRenameError] = useState<string | null>(null);
+  const [sessionActionError, setSessionActionError] = useState<string | null>(null);
+  const [deletingSessionId, setDeletingSessionId] = useState<string | null>(null);
 
   const handleSelectSession = useCallback(
     (id: string) => {
@@ -79,6 +80,83 @@ export function TerminalsPage() {
     [work],
   );
 
+  const handleDeleteChat = useCallback(
+    (session: TerminalSessionSummary) => {
+      const label = (session.goal ?? session.title).trim() || "this chat";
+      const confirmed = window.confirm(
+        `Delete "${label}"?\n\nThis permanently removes the saved chat history from ADE.`,
+      );
+      if (!confirmed) return;
+
+      setSessionActionError(null);
+      setDeletingSessionId(session.id);
+      void window.ade.agentChat.delete({ sessionId: session.id })
+        .then(async () => {
+          invalidateSessionListCache();
+          work.removeSessionFromList(session.id);
+          work.closeTab(session.id);
+          setContextMenu((current) => (current?.session.id === session.id ? null : current));
+          setInfoPopover((current) => (current?.session.id === session.id ? null : current));
+          // Refresh is post-delete housekeeping; a failure here must not be
+          // reported as "Delete failed" because the delete itself succeeded.
+          await work.refresh({ showLoading: false, force: true }).catch((refreshErr: unknown) => {
+            console.error("[TerminalsPage] refresh after delete failed", { sessionId: session.id, refreshErr });
+          });
+        })
+        .catch((err: unknown) => {
+          const message = err instanceof Error ? err.message : String(err);
+          console.error("[TerminalsPage] delete chat failed", { sessionId: session.id, err });
+          setSessionActionError(`Delete failed: ${message}`);
+          window.setTimeout(() => setSessionActionError(null), 6000);
+        })
+        .finally(() => {
+          setDeletingSessionId((current) => (current === session.id ? null : current));
+        });
+    },
+    [work],
+  );
+
+  const handleDeleteSession = useCallback(
+    (session: TerminalSessionSummary) => {
+      const label = (session.goal ?? session.title).trim() || "this session";
+      const confirmed = window.confirm(
+        `Delete "${label}"?\n\nThis permanently removes the saved terminal session from ADE.`,
+      );
+      if (!confirmed) return;
+
+      setSessionActionError(null);
+      setDeletingSessionId(session.id);
+      void window.ade.sessions.delete({ sessionId: session.id })
+        .then(async () => {
+          invalidateSessionListCache();
+          work.removeSessionFromList(session.id);
+          work.closeTab(session.id);
+          setContextMenu((current) => (current?.session.id === session.id ? null : current));
+          setInfoPopover((current) => (current?.session.id === session.id ? null : current));
+          await work.refresh({ showLoading: false, force: true }).catch((refreshErr: unknown) => {
+            console.error("[TerminalsPage] refresh after session delete failed", { sessionId: session.id, refreshErr });
+          });
+        })
+        .catch((err: unknown) => {
+          const message = err instanceof Error ? err.message : String(err);
+          console.error("[TerminalsPage] delete session failed", { sessionId: session.id, err });
+          setSessionActionError(`Delete failed: ${message}`);
+          window.setTimeout(() => setSessionActionError(null), 6000);
+        })
+        .finally(() => {
+          setDeletingSessionId((current) => (current === session.id ? null : current));
+        });
+    },
+    [work],
+  );
+
+  const handleResumeSession = useCallback(
+    (session: TerminalSessionSummary) => {
+      void work.resumeSession(session).catch(() => {});
+    },
+    [work],
+  );
+
   const workViewArea = useMemo(
     () => (
       <WorkViewArea
@@ -100,7 +178,7 @@ export function TerminalsPage() {
         onToggleTabGroupCollapsed={work.toggleWorkTabGroupCollapsed}
         closingPtyIds={work.closingPtyIds}
         onContextMenu={handleContextMenu}
-        onResumeSession={(s) => work.resumeSession(s).catch(() => {})}
+        onResumeSession={handleResumeSession}
       />
     ),
     [
@@ -120,8 +198,8 @@ export function TerminalsPage() {
       work.launchPtySession,
       work.toggleWorkTabGroupCollapsed,
       work.closingPtyIds,
-      work.resumeSession,
       handleOpenChatSession,
+      handleResumeSession,
       handleContextMenu,
     ],
   );
@@ -213,13 +291,13 @@ export function TerminalsPage() {
 
   return (
     <div className="flex h-full min-w-0 flex-col" style={{ background: "var(--color-bg)" }}>
-      {renameError ? (
+      {sessionActionError ? (
         <div
           className="shrink-0 border-b border-red-500/25 px-4 py-2 text-[12px] text-red-300/95"
           style={{ background: "rgba(239, 68, 68, 0.08)" }}
           role="status"
         >
-          {renameError}
+          {sessionActionError}
         </div>
       ) : null}
       {work.workFocusSessionsHidden ? (
@@ -269,12 +347,15 @@ export function TerminalsPage() {
         onClose={() => setContextMenu(null)}
         onCloseSession={({ ptyId, sessionId }) => work.closeSession(ptyId, sessionId).catch(() => {})}
         onEndChat={(id) => work.closeChatSession(id).catch(() => {})}
-        onResume={(s) => work.resumeSession(s).catch(() => {})}
+        onDeleteChat={handleDeleteChat}
+        onDeleteSession={handleDeleteSession}
+        deletingSessionId={deletingSessionId}
+        onResume={handleResumeSession}
         onCopyResumeCommand={(cmd) => navigator.clipboard.writeText(cmd).catch(() => {})}
         onGoToLane={handleGoToLane}
         onCopySessionId={(id) => navigator.clipboard.writeText(id).catch(() => {})}
         onRename={(session, newTitle) => {
-          setRenameError(null);
+          setSessionActionError(null);
           const renamePromise = isChatToolType(session.toolType)
             ? window.ade.agentChat.updateSession({ sessionId: session.id, title: newTitle, manuallyNamed: true })
             : window.ade.sessions.updateMeta({ sessionId: session.id, title: newTitle, manuallyNamed: true });
@@ -288,8 +369,8 @@ export function TerminalsPage() {
             .catch((err: unknown) => {
               const message = err instanceof Error ? err.message : String(err);
               console.error("[TerminalsPage] rename session failed", { sessionId: session.id, err });
-              setRenameError(`Rename failed: ${message}`);
-              window.setTimeout(() => setRenameError(null), 6000);
+              setSessionActionError(`Rename failed: ${message}`);
+              window.setTimeout(() => setSessionActionError(null), 6000);
             });
         }}
       />
@@ -299,10 +380,13 @@ export function TerminalsPage() {
         onClose={() => setInfoPopover(null)}
         onCloseSession={({ ptyId, sessionId }) => work.closeSession(ptyId, sessionId).catch(() => {})}
         onEndChat={(id) => work.closeChatSession(id).catch(() => {})}
-        onResume={(s) => work.resumeSession(s).catch(() => {})}
+        onDeleteChat={handleDeleteChat}
+        onDeleteSession={handleDeleteSession}
+        onResume={handleResumeSession}
         onGoToLane={handleGoToLane}
         closingPtyIds={work.closingPtyIds}
         closingChatSessionId={work.closingChatSessionId}
+        deletingSessionId={deletingSessionId}
         resumingSessionId={work.resumingSessionId}
       />
     </div>
diff --git a/apps/desktop/src/renderer/components/terminals/WorkStartSurface.tsx b/apps/desktop/src/renderer/components/terminals/WorkStartSurface.tsx
index 3af0686d5..32f6670ab 100644
--- a/apps/desktop/src/renderer/components/terminals/WorkStartSurface.tsx
+++ b/apps/desktop/src/renderer/components/terminals/WorkStartSurface.tsx
@@ -135,7 +135,7 @@ export function WorkStartSurface({
   if (!lanes.length) {
     return (
       <div className="flex h-full items-center justify-center px-6" style={{ background: "var(--color-bg)" }}>
-        <div className="rounded-lg p-5 text-center" style={{ background: "rgba(255,255,255,0.03)" }}>
+        <div className="ade-liquid-glass ade-liquid-glass-menu rounded-lg p-5 text-center">
           <div className="text-[12px] font-medium text-fg">No lanes available</div>
           <div className="mt-1.5 text-[11px] text-muted-fg">
             Create or reopen a lane before starting work.
@@ -149,7 +149,7 @@ export function WorkStartSurface({
   if (draftKind === "chat") {
     return (
       <div className="flex h-full min-h-0 flex-col" style={{ background: "var(--color-bg)" }}>
-        <div className="min-h-0 flex-1 overflow-hidden">
+        <div className="mx-auto flex w-full min-h-0 max-w-2xl flex-1 flex-col overflow-hidden">
           {chatDraftReady ? (
             <AgentChatPane
               laneId={selectedLaneId}
@@ -162,8 +162,8 @@ export function WorkStartSurface({
               onLaneChange={setLaneAndSync}
             />
           ) : (
-            <div className="flex h-full items-center justify-center px-6">
-              <div className="rounded-lg px-4 py-3 text-center" style={{ background: "rgba(255,255,255,0.03)" }}>
+            <div className="flex flex-1 items-center justify-center px-6">
+              <div className="ade-liquid-glass ade-liquid-glass-menu rounded-lg px-4 py-3 text-center">
                 <div className="text-[12px] font-medium text-fg">Preparing chat draft</div>
                 <div className="mt-1.5 text-[11px] text-muted-fg">
                   ADE waits briefly before mounting the full chat surface so fast tab switches stay cheap.
@@ -179,9 +179,10 @@ export function WorkStartSurface({
   /* ---- CLI draft ---- */
   if (draftKind === "cli") {
     return (
-      <div className="flex h-full min-h-0 flex-col items-center justify-center" style={{ background: "var(--color-bg)" }}>
+      <div className="flex h-full min-h-0 flex-col items-center justify-center gap-8 px-6 py-6" style={{ background: "var(--color-bg)" }}>
         <LogoGlow size="lg" />
-        <GlassCard>
+        <div className="flex w-full max-w-sm flex-col items-center">
+          <GlassCard>
           {/* Lane */}
           <div className="flex items-center gap-2">
             <span className="text-[10px] text-muted-fg/60 shrink-0">Lane</span>
@@ -256,16 +257,18 @@ export function WorkStartSurface({
               <ArrowRight size={12} weight="regular" />
             </button>
           </SmartTooltip>
-        </GlassCard>
+          </GlassCard>
+        </div>
       </div>
     );
   }
 
   /* ---- Shell draft ---- */
   return (
-    <div className="flex h-full min-h-0 flex-col items-center justify-center" style={{ background: "var(--color-bg)" }}>
+    <div className="flex h-full min-h-0 flex-col items-center justify-center gap-8 px-6 py-6" style={{ background: "var(--color-bg)" }}>
       <LogoGlow size="lg" />
-      <GlassCard>
+      <div className="flex w-full max-w-sm flex-col items-center">
+        <GlassCard>
         {/* Lane */}
         <div className="flex items-center gap-2">
           <span className="text-[10px] text-muted-fg/60 shrink-0">Lane</span>
@@ -273,7 +276,7 @@ export function WorkStartSurface({
         </div>
 
         {/* Description */}
-        <div className="rounded-md px-3 py-2.5" style={{ background: "rgba(255,255,255,0.02)" }}>
+        <div className="ade-chat-recessed rounded-md px-3 py-2.5">
           <div className="flex items-center gap-2">
             <Terminal size={14} weight="regular" className="text-muted-fg/50 shrink-0" />
             <div>
@@ -303,7 +306,8 @@ export function WorkStartSurface({
             <ArrowRight size={12} weight="regular" />
           </button>
         </SmartTooltip>
-      </GlassCard>
+        </GlassCard>
+      </div>
     </div>
   );
 }
@@ -333,16 +337,7 @@ function LogoGlow({ size }: { size: "lg" | "sm" }) {
 
 function GlassCard({ children }: { children: React.ReactNode }) {
   return (
-    <div
-      className="flex w-full max-w-sm flex-col gap-4 rounded-lg p-5"
-      style={{
-        backdropFilter: "blur(20px)",
-        WebkitBackdropFilter: "blur(20px)",
-        background: "rgba(30, 30, 40, 0.7)",
-        border: "1px solid rgba(255, 255, 255, 0.08)",
-        boxShadow: "0 8px 32px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.05)",
-      }}
-    >
+    <div className="ade-liquid-glass ade-liquid-glass-strong flex w-full max-w-sm flex-col gap-4 rounded-xl p-5">
       {children}
     </div>
   );
diff --git a/apps/desktop/src/renderer/components/terminals/WorkViewArea.tsx b/apps/desktop/src/renderer/components/terminals/WorkViewArea.tsx
index 76fa943e6..a6f1eb1bb 100644
--- a/apps/desktop/src/renderer/components/terminals/WorkViewArea.tsx
+++ b/apps/desktop/src/renderer/components/terminals/WorkViewArea.tsx
@@ -55,7 +55,7 @@ function SessionSurface({
       || session.lastOutputPreview?.trim()
       || (isChatToolType(session.toolType) ? "Select this tile to resume the live chat view." : "Select this tile to resume the live terminal view.");
     return (
-      <div className="flex h-full w-full flex-col justify-between bg-[var(--color-card)] px-4 py-3 text-left">
+      <div className="ade-work-glass-tile flex h-full w-full flex-col justify-between px-4 py-3 text-left">
         <div className="flex items-start justify-between gap-3">
           <div className="min-w-0">
             <div className="flex items-center gap-2 text-[11px] text-fg">
@@ -116,8 +116,13 @@ function SessionSurface({
     : null;
 
   return (
-    <div className="flex h-full w-full items-center justify-center px-6" style={{ background: "var(--color-card)" }}>
-      <div className="flex w-full max-w-md flex-col gap-4 rounded-lg border border-white/[0.06] px-5 py-5" style={{ background: "rgba(255,255,255,0.02)" }}>
+    <div
+      className="flex h-full w-full items-center justify-center px-6"
+      style={{
+        background: "radial-gradient(circle at top, color-mix(in srgb, var(--color-accent-glow-strong) 30%, transparent) 0%, transparent 40%), var(--color-card)",
+      }}
+    >
+      <div className="ade-liquid-glass-menu flex w-full max-w-md flex-col gap-4 rounded-lg px-5 py-5">
         {/* Header: tool logo + session name */}
         <div className="flex items-start gap-3">
           <div className="mt-0.5 flex h-8 w-8 shrink-0 items-center justify-center rounded-md" style={{ background: "rgba(255,255,255,0.05)" }}>
@@ -164,10 +169,8 @@ function SessionSurface({
           <button
             type="button"
             onClick={() => onResume(session)}
-            className="flex items-center justify-center gap-2 rounded-md px-4 py-2 text-[12px] font-medium text-fg transition-colors"
-            style={{ background: "rgba(255,255,255,0.08)", cursor: "pointer", border: "none" }}
-            onMouseEnter={(e) => { (e.currentTarget as HTMLElement).style.background = "rgba(255,255,255,0.14)"; }}
-            onMouseLeave={(e) => { (e.currentTarget as HTMLElement).style.background = "rgba(255,255,255,0.08)"; }}
+            className="ade-work-new-chat-btn flex items-center justify-center gap-2 px-4 py-2 text-[12px] font-medium"
+            style={{ cursor: "pointer" }}
           >
             <Play size={14} weight="fill" />
             Resume session
@@ -209,8 +212,7 @@ function ResumeCommandBlock({ command }: { command: string }) {
 
   return (
     <div
-      className="group relative flex items-center rounded-md px-3 py-2 font-mono text-[11px] text-fg/80"
-      style={{ background: "rgba(0,0,0,0.25)" }}
+      className="ade-chat-recessed group relative flex items-center rounded-md px-3 py-2 font-mono text-[11px] text-fg/80"
     >
       <span className="flex-1 select-all break-all">{command}</span>
       <button
@@ -240,16 +242,16 @@ function ModeSwitcherPills({
   onShowDraftKind: (kind: WorkDraftKind) => void;
 }) {
   return (
-    <div className="inline-flex items-center rounded-full p-0.5" style={{ background: "rgba(255,255,255,0.04)" }}>
+    <div className="ade-liquid-glass-pill inline-flex items-center rounded-full p-0.5">
       {MODE_OPTIONS.map((opt) => {
         const active = draftKind === opt.kind;
         return (
           <button
             key={opt.kind}
             type="button"
-            className="rounded-full px-3 py-1 text-[11px] font-medium transition-all"
+            className={`rounded-full px-3 py-1 text-[11px] font-medium transition-all${active ? " ade-work-tab-active" : ""}`}
             style={{
-              background: active ? "rgba(255,255,255,0.10)" : "transparent",
+              background: active ? undefined : "transparent",
               color: active ? "var(--color-fg)" : "var(--color-muted-fg)",
               cursor: "pointer",
               border: "none",
@@ -347,16 +349,12 @@ export function WorkViewArea({
       selected: isActive,
       onSelect: () => onSelectItem(session.id),
       className: isActive
-        ? "border border-white/[0.08] bg-white/[0.02]"
-        : "border border-white/[0.04] bg-transparent",
+        ? "ade-work-glass-tile-active"
+        : "ade-work-glass-tile",
       header: (
         <div
-          className="flex items-center gap-2 px-2 py-1.5"
+          className="ade-work-glass-tile-header flex items-center gap-2 px-2 py-1.5"
           onContextMenu={(e) => handleContextMenu(session, e)}
-          style={{
-            borderBottom: "1px solid rgba(255,255,255,0.04)",
-            background: isActive ? "rgba(255,255,255,0.02)" : "transparent",
-          }}
         >
           <button
             type="button"
@@ -433,13 +431,10 @@ export function WorkViewArea({
   if (viewMode === "grid") {
     return (
       <div className="flex h-full flex-col">
-        <div
-          className="flex items-center gap-3 px-3 py-1.5"
-          style={{ borderBottom: "1px solid var(--work-pane-border)", background: "transparent" }}
-        >
+        <div className="ade-work-glass-header flex items-center gap-3 px-3 py-1.5">
           <ViewModeToggle viewMode={viewMode} setViewMode={setViewMode} />
           <span className="text-[11px] font-medium text-muted-fg">Grid</span>
-          <span className="inline-flex items-center px-1.5 text-[10px] text-muted-fg/60 rounded" style={{ background: "rgba(255,255,255,0.04)" }}>
+          <span className="ade-liquid-glass-pill inline-flex items-center px-1.5 text-[10px] text-muted-fg/60 rounded">
             {visibleSessions.length}
           </span>
         </div>
@@ -473,10 +468,8 @@ export function WorkViewArea({
     return (
       <div className="flex h-full flex-col">
         <div
-          className="flex items-center gap-0 px-0.5"
+          className="ade-work-glass-header flex items-center gap-0 px-0.5"
           style={{
-            borderBottom: "1px solid var(--work-pane-border)",
-            background: "transparent",
             height: 32,
             minHeight: 32,
             maxHeight: 32,
@@ -551,15 +544,11 @@ export function WorkViewArea({
             <SmartTooltip content={{ label: "New Chat", description: "Start a new AI chat session." }}>
               <button
                 type="button"
-                className="inline-flex shrink-0 items-center justify-center transition-colors hover:opacity-80"
+                className="ade-work-new-chat-btn inline-flex shrink-0 items-center justify-center"
                 style={{
                   width: 22,
                   height: 22,
                   marginLeft: 4,
-                  borderRadius: "50%",
-                  border: "1px solid rgba(168,130,255,0.35)",
-                  background: "rgba(168,130,255,0.08)",
-                  color: "rgba(168,130,255,0.9)",
                   cursor: "pointer",
                 }}
                 onClick={() => onShowDraftKind("chat")}
@@ -612,13 +601,7 @@ export function WorkViewArea({
 
   return (
     <div className="flex h-full flex-col">
-      <div
-        className="flex items-start gap-1.5 px-1 py-1"
-        style={{
-          borderBottom: "1px solid var(--work-pane-border)",
-          background: "transparent",
-        }}
-      >
+      <div className="ade-work-glass-header flex items-start gap-1.5 px-1 py-1">
         <div className="shrink-0">
           <ViewModeToggle viewMode={viewMode} setViewMode={setViewMode} />
         </div>
@@ -627,17 +610,10 @@ export function WorkViewArea({
           <div className="flex items-stretch gap-1.5">
             {resolvedTabGroups.map((group) => {
               const hasActive = group.sessionIds.includes(activeSession?.id ?? "");
-              const groupStyle = group.kind === "lane"
-                ? "rgba(255,255,255,0.03)"
-                : "rgba(255,255,255,0.025)";
               return (
                 <div
                   key={group.id}
-                  className={`inline-flex shrink-0 flex-col overflow-hidden border ${group.collapsed ? "rounded-full" : "rounded-xl"}`}
-                  style={{
-                    borderColor: hasActive ? "rgba(168,130,255,0.35)" : "rgba(255,255,255,0.06)",
-                    background: groupStyle,
-                  }}
+                  className={`ade-work-glass-group${hasActive ? " ade-work-glass-group-active" : ""} inline-flex shrink-0 flex-col overflow-hidden ${group.collapsed ? "rounded-full" : "rounded-xl"}`}
                 >
                   <button
                     type="button"
@@ -673,13 +649,13 @@ export function WorkViewArea({
                           <button
                             key={session.id}
                             type="button"
-                            className="group/tab inline-flex shrink-0 items-center gap-1.5 transition-all"
+                            className={`group/tab inline-flex shrink-0 items-center gap-1.5 transition-all${isActive ? " ade-work-tab-active" : ""}`}
                             style={{
                               padding: "0 8px",
                               height: 28,
                               fontSize: 11,
                               fontWeight: isActive ? 500 : 400,
-                              background: isActive ? "rgba(167, 139, 250, 0.12)" : "transparent",
+                              background: isActive ? undefined : "transparent",
                               color: isActive ? "var(--color-fg)" : "var(--color-muted-fg)",
                               cursor: "pointer",
                               border: "none",
@@ -734,15 +710,11 @@ export function WorkViewArea({
             <SmartTooltip content={{ label: "New Chat", description: "Start a new AI chat session." }}>
               <button
                 type="button"
-                className="inline-flex shrink-0 items-center justify-center transition-colors hover:opacity-80"
+                className="ade-work-new-chat-btn inline-flex shrink-0 items-center justify-center"
                 style={{
                   width: 22,
                   height: 22,
                   marginTop: 3,
-                  borderRadius: "50%",
-                  border: "1px solid rgba(168,130,255,0.35)",
-                  background: "rgba(168,130,255,0.08)",
-                  color: "rgba(168,130,255,0.9)",
                   cursor: "pointer",
                 }}
                 onClick={() => onShowDraftKind("chat")}
@@ -804,10 +776,8 @@ function ViewModeToggle({
 }) {
   return (
     <div
-      className="inline-flex items-center rounded-full p-0.5"
+      className="ade-liquid-glass-pill inline-flex items-center rounded-full p-0.5"
       style={{
-        background: "rgba(255, 255, 255, 0.04)",
-        border: "1px solid rgba(255, 255, 255, 0.08)",
         height: 24,
       }}
     >
@@ -822,10 +792,10 @@ function ViewModeToggle({
               type="button"
               aria-pressed={active}
               onClick={() => setViewMode(mode)}
-              className="inline-flex items-center gap-1 rounded-full px-2.5 text-[10px] font-medium transition-all"
+              className={`inline-flex items-center gap-1 rounded-full px-2.5 text-[10px] font-medium transition-all${active ? " ade-work-tab-active" : ""}`}
               style={{
                 height: 20,
-                background: active ? "rgba(167, 139, 250, 0.15)" : "transparent",
+                background: active ? undefined : "transparent",
                 color: active ? "var(--color-accent)" : "var(--color-muted-fg)",
                 border: "none",
                 cursor: "pointer",
diff --git a/apps/desktop/src/renderer/components/terminals/useWorkSessions.ts b/apps/desktop/src/renderer/components/terminals/useWorkSessions.ts
index 992737a9f..ac9c68c3e 100644
--- a/apps/desktop/src/renderer/components/terminals/useWorkSessions.ts
+++ b/apps/desktop/src/renderer/components/terminals/useWorkSessions.ts
@@ -994,6 +994,10 @@ export function useWorkSessions() {
     [focusSession, openSessionTab, refresh, selectLane],
   );
 
+  const removeSessionFromList = useCallback((sessionId: string) => {
+    setSessions((prev) => prev.filter((session) => session.id !== sessionId));
+  }, []);
+
   return {
     sessions,
     lanes,
@@ -1048,6 +1052,7 @@ export function useWorkSessions() {
 
     refresh,
     upsertOptimisticChatSession,
+    removeSessionFromList,
     closeSession,
     closeAllRunning,
     resumeSession,
diff --git a/apps/desktop/src/renderer/index.css b/apps/desktop/src/renderer/index.css
index d9baa4299..b74899044 100644
--- a/apps/desktop/src/renderer/index.css
+++ b/apps/desktop/src/renderer/index.css
@@ -101,6 +101,9 @@
   --chat-composer-shadow: 0 -12px 30px -26px rgba(0, 0, 0, 0.7);
   --chat-glass-bg: rgba(20, 18, 32, 0.75);
   --chat-glass-border: rgba(255, 255, 255, 0.08);
+  --chat-glass-highlight: rgba(255, 255, 255, 0.10);
+  --chat-glass-lowlight: rgba(10, 8, 18, 0.34);
+  --chat-glass-sheen: rgba(167, 139, 250, 0.10);
   --chat-panel-bg: rgba(20, 18, 32, 0.85);
   --chat-panel-border: rgba(255, 255, 255, 0.10);
   --chat-panel-bg-strong: rgba(28, 25, 38, 0.92);
@@ -227,6 +230,9 @@
   --chat-composer-shadow: 0 -12px 22px -24px rgba(15, 23, 42, 0.12);
   --chat-glass-bg: rgba(255, 255, 255, 0.76);
   --chat-glass-border: rgba(26, 26, 30, 0.08);
+  --chat-glass-highlight: rgba(255, 255, 255, 0.65);
+  --chat-glass-lowlight: rgba(182, 190, 204, 0.14);
+  --chat-glass-sheen: rgba(4, 144, 104, 0.08);
   --chat-panel-bg: rgba(255, 255, 255, 0.82);
   --chat-panel-border: rgba(26, 26, 30, 0.10);
   --chat-panel-bg-strong: rgba(255, 255, 255, 0.92);
@@ -2549,6 +2555,447 @@ button:active, [role="button"]:active {
   box-shadow: var(--shadow-card-hover);
 }
 
+.ade-liquid-glass {
+  position: relative;
+  isolation: isolate;
+  overflow: hidden;
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-glass-bg) 88%, transparent) 0%, color-mix(in srgb, var(--chat-panel-bg-strong) 84%, transparent) 100%);
+  border: 1px solid var(--chat-glass-border);
+  box-shadow:
+    inset 0 1px 0 var(--chat-glass-highlight),
+    inset 0 -1px 0 color-mix(in srgb, var(--chat-glass-lowlight) 86%, transparent),
+    0 18px 45px -28px rgba(0, 0, 0, 0.65),
+    0 0 0 1px color-mix(in srgb, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 18%, transparent);
+  backdrop-filter: blur(28px) saturate(150%);
+  -webkit-backdrop-filter: blur(28px) saturate(150%);
+}
+
+.ade-liquid-glass::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  background:
+    radial-gradient(circle at top left, color-mix(in srgb, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 75%, transparent) 0%, transparent 40%),
+    linear-gradient(135deg, var(--chat-glass-highlight) 0%, transparent 28%, transparent 72%, color-mix(in srgb, var(--chat-liquid-sheen, var(--chat-glass-sheen)) 60%, transparent) 100%);
+  opacity: 0.9;
+}
+
+.ade-liquid-glass > * {
+  z-index: 1;
+}
+
+.ade-liquid-glass-strong {
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-panel-bg-strong) 92%, transparent) 0%, color-mix(in srgb, var(--chat-panel-bg) 94%, transparent) 100%);
+  border-color: color-mix(in srgb, var(--chat-glass-border) 120%, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 26%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 120%, transparent),
+    inset 0 -1px 0 color-mix(in srgb, var(--chat-glass-lowlight) 110%, transparent),
+    0 26px 64px -34px rgba(0, 0, 0, 0.72),
+    0 0 0 1px color-mix(in srgb, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 26%, transparent);
+}
+
+.ade-liquid-glass-menu {
+  border-radius: 16px;
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-panel-bg-strong) 96%, transparent) 0%, color-mix(in srgb, var(--chat-panel-bg) 94%, transparent) 100%);
+  border-color: color-mix(in srgb, var(--chat-glass-border) 120%, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 28%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 115%, transparent),
+    0 24px 56px -20px rgba(0, 0, 0, 0.58),
+    0 0 0 1px color-mix(in srgb, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 20%, transparent);
+}
+
+.ade-liquid-glass-pill {
+  position: relative;
+  overflow: hidden;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 110%, transparent);
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-glass-bg) 78%, transparent) 0%, color-mix(in srgb, var(--chat-panel-bg) 76%, transparent) 100%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 82%, transparent),
+    0 8px 22px -18px rgba(0, 0, 0, 0.48);
+  backdrop-filter: blur(20px) saturate(145%);
+  -webkit-backdrop-filter: blur(20px) saturate(145%);
+}
+
+.ade-chat-timeline-pane {
+  background:
+    radial-gradient(circle at top, color-mix(in srgb, var(--chat-liquid-sheen, var(--chat-glass-sheen)) 50%, transparent) 0%, transparent 26%),
+    linear-gradient(180deg, color-mix(in srgb, var(--color-bg) 96%, var(--chat-panel-bg-strong) 4%) 0%, color-mix(in srgb, var(--color-bg) 92%, var(--chat-panel-bg) 8%) 100%);
+}
+
+.ade-chat-message-card-user {
+  background:
+    linear-gradient(135deg, color-mix(in srgb, var(--chat-accent) 76%, #ffffff 6%) 0%, color-mix(in srgb, var(--chat-accent) 60%, #7c3aed 40%) 50%, color-mix(in srgb, var(--chat-accent) 58%, #4c1d95 42%) 100%);
+  border-color: color-mix(in srgb, var(--chat-accent) 26%, rgba(255, 255, 255, 0.14));
+  box-shadow:
+    inset 0 1px 0 rgba(255,255,255,0.12),
+    0 18px 28px -24px color-mix(in srgb, var(--chat-accent) 34%, transparent),
+    0 10px 26px -22px rgba(0, 0, 0, 0.52);
+}
+
+.ade-chat-message-card-assistant {
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-panel-bg-strong) 96%, transparent) 0%, color-mix(in srgb, var(--chat-panel-bg) 94%, transparent) 100%);
+  border-color: color-mix(in srgb, var(--chat-glass-border) 100%, transparent);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 72%, transparent),
+    0 16px 32px -26px rgba(0, 0, 0, 0.5);
+}
+
+.ade-chat-work-card {
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-panel-bg-strong) 78%, transparent) 0%, color-mix(in srgb, var(--chat-panel-bg) 74%, transparent) 100%);
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 90%, transparent);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 55%, transparent),
+    0 10px 24px -22px rgba(0,0,0,0.58);
+  backdrop-filter: blur(20px) saturate(140%);
+  -webkit-backdrop-filter: blur(20px) saturate(140%);
+}
+
+.ade-chat-recessed {
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--chat-code-bg) 92%, black 8%) 0%, color-mix(in srgb, var(--chat-code-bg) 84%, black 16%) 100%);
+  border: 1px solid color-mix(in srgb, var(--chat-code-border) 92%, transparent);
+  box-shadow:
+    inset 0 1px 0 rgba(255,255,255,0.03),
+    inset 0 -1px 0 rgba(0,0,0,0.16);
+}
+
+/* ═══════════════════════════════════════════════════════════
+   Work Tab: Liquid Glass Primitives
+   — follow Apple HIG: content leads, glass recedes, concentric radii
+   ═══════════════════════════════════════════════════════════ */
+
+/* Floating header bar — refracts content beneath, hairline bottom */
+.ade-work-glass-header {
+  position: relative;
+  background:
+    linear-gradient(180deg,
+      color-mix(in srgb, var(--chat-panel-bg-strong) 62%, transparent) 0%,
+      color-mix(in srgb, var(--chat-panel-bg) 42%, transparent) 100%);
+  border-bottom: 1px solid var(--work-pane-border);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 70%, transparent),
+    0 1px 0 rgba(0, 0, 0, 0.14);
+  backdrop-filter: blur(22px) saturate(150%);
+  -webkit-backdrop-filter: blur(22px) saturate(150%);
+}
+
+/* Session tile shell — very subtle so content stays primary */
+.ade-work-glass-tile {
+  position: relative;
+  overflow: hidden;
+  border-radius: 14px;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 75%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg) 18%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 10%, transparent) 100%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 40%, transparent),
+    0 8px 24px -20px rgba(0, 0, 0, 0.5);
+  transition: border-color 160ms ease, box-shadow 220ms ease;
+}
+
+.ade-work-glass-tile:hover {
+  border-color: color-mix(in srgb, var(--color-accent) 22%, var(--chat-glass-border));
+}
+
+/* Active tile — purple specular ring, no heavy fill */
+.ade-work-glass-tile-active {
+  border-color: color-mix(in srgb, var(--color-accent) 38%, var(--chat-glass-border));
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 40%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 26%, transparent) 100%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 80%, transparent),
+    0 0 0 1px color-mix(in srgb, var(--color-accent) 26%, transparent),
+    0 22px 46px -28px rgba(124, 58, 237, 0.32),
+    0 10px 24px -22px rgba(0, 0, 0, 0.55);
+}
+
+.ade-work-glass-tile-active::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  background: radial-gradient(
+    circle at top left,
+    color-mix(in srgb, var(--color-accent-glow-strong) 55%, transparent) 0%,
+    transparent 40%
+  );
+  opacity: 0.85;
+}
+
+.ade-work-glass-tile > *,
+.ade-work-glass-tile-active > * {
+  position: relative;
+  z-index: 1;
+}
+
+/* Thin header strip inside a tile */
+.ade-work-glass-tile-header {
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 55%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 30%, transparent) 100%);
+  border-bottom: 1px solid color-mix(in srgb, var(--chat-glass-border) 90%, transparent);
+  box-shadow: inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 60%, transparent);
+  backdrop-filter: blur(18px) saturate(145%);
+  -webkit-backdrop-filter: blur(18px) saturate(145%);
+}
+
+/* Tab-group container (lane or custom) */
+.ade-work-glass-group {
+  border-radius: 14px;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 100%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg) 30%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 18%, transparent) 100%);
+  box-shadow: inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 40%, transparent);
+  backdrop-filter: blur(14px) saturate(140%);
+  -webkit-backdrop-filter: blur(14px) saturate(140%);
+  transition: border-color 160ms ease, box-shadow 220ms ease;
+}
+
+.ade-work-glass-group-active {
+  border-color: color-mix(in srgb, var(--color-accent) 34%, var(--chat-glass-border));
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 70%, transparent),
+    0 0 0 1px color-mix(in srgb, var(--color-accent) 18%, transparent);
+}
+
+/* Active tab pill */
+.ade-work-tab-active {
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--color-accent) 22%, transparent) 0%,
+    color-mix(in srgb, var(--color-accent) 12%, transparent) 100%);
+  color: var(--color-fg);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, white 10%, transparent),
+    0 0 0 1px color-mix(in srgb, var(--color-accent) 28%, transparent);
+}
+
+/* Purple specular plus button ("New Chat") */
+.ade-work-new-chat-btn {
+  position: relative;
+  border: 1px solid color-mix(in srgb, var(--color-accent) 38%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--color-accent) 20%, transparent) 0%,
+    color-mix(in srgb, var(--color-accent) 10%, transparent) 100%);
+  color: color-mix(in srgb, var(--color-accent-bright) 85%, white);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, white 14%, transparent),
+    0 6px 18px -12px color-mix(in srgb, var(--color-accent) 50%, transparent);
+  transition: transform 160ms ease, box-shadow 200ms ease, background 180ms ease;
+  backdrop-filter: blur(12px) saturate(140%);
+  -webkit-backdrop-filter: blur(12px) saturate(140%);
+}
+
+.ade-work-new-chat-btn:hover {
+  transform: translateY(-0.5px);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, white 18%, transparent),
+    0 8px 22px -10px color-mix(in srgb, var(--color-accent) 58%, transparent);
+}
+
+/* Unified hero shell for the "start new conversation" surface */
+.ade-work-glass-hero {
+  position: relative;
+  isolation: isolate;
+  overflow: hidden;
+  border-radius: 22px;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 120%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 70%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 58%, transparent) 100%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 110%, transparent),
+    0 32px 72px -32px rgba(0, 0, 0, 0.58),
+    0 0 0 1px color-mix(in srgb, var(--color-accent) 14%, transparent);
+  backdrop-filter: blur(30px) saturate(160%);
+  -webkit-backdrop-filter: blur(30px) saturate(160%);
+}
+
+.ade-work-glass-hero::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  background:
+    radial-gradient(circle at 22% 0%,
+      color-mix(in srgb, var(--color-accent-glow-strong) 75%, transparent) 0%,
+      transparent 45%),
+    linear-gradient(160deg,
+      color-mix(in srgb, var(--chat-glass-highlight) 110%, transparent) 0%,
+      transparent 35%);
+  opacity: 0.9;
+}
+
+.ade-work-glass-hero > * {
+  position: relative;
+  z-index: 1;
+}
+
+/* Inline chat popovers / drawers — shared by attachment tray, slash menu, etc. */
+.ade-chat-drawer-glass {
+  position: relative;
+  overflow: hidden;
+  border-radius: 14px;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 110%, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 20%);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 92%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 88%, transparent) 100%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 95%, transparent),
+    inset 0 -1px 0 color-mix(in srgb, var(--chat-glass-lowlight) 90%, transparent),
+    0 22px 50px -26px rgba(0, 0, 0, 0.62),
+    0 0 0 1px color-mix(in srgb, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 22%, transparent);
+  backdrop-filter: blur(26px) saturate(150%);
+  -webkit-backdrop-filter: blur(26px) saturate(150%);
+}
+
+.ade-chat-drawer-glass::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  background: radial-gradient(circle at top left,
+    color-mix(in srgb, var(--chat-liquid-highlight, var(--chat-glass-sheen)) 60%, transparent) 0%,
+    transparent 45%);
+  opacity: 0.8;
+}
+
+.ade-chat-drawer-glass > * {
+  position: relative;
+  z-index: 1;
+}
+
+/* Row in a chat drawer — glass-on-glass avoidance: flat rows, accent on hover */
+.ade-chat-drawer-row {
+  transition: background 140ms ease, color 140ms ease;
+}
+
+.ade-chat-drawer-row:hover,
+.ade-chat-drawer-row[data-active="true"] {
+  background: color-mix(in srgb, var(--color-accent) 14%, transparent);
+  color: var(--color-fg);
+}
+
+/* ═══════════════════════════════════════════════════════════
+   Internal Chat Elements: Liquid Glass
+   — thinking, subagents, task rows, memory
+   ═══════════════════════════════════════════════════════════ */
+
+/* Reasoning/thinking block — violet-tinted glass with soft specular */
+.ade-chat-thinking-glass {
+  position: relative;
+  overflow: hidden;
+  border-radius: 14px;
+  border: 1px solid color-mix(in srgb, var(--color-accent) 18%, var(--chat-glass-border));
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 58%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 42%, transparent) 100%);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 60%, transparent),
+    0 10px 28px -22px color-mix(in srgb, var(--color-accent) 30%, transparent);
+  backdrop-filter: blur(22px) saturate(150%);
+  -webkit-backdrop-filter: blur(22px) saturate(150%);
+}
+
+.ade-chat-thinking-glass::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  background: radial-gradient(circle at 18% 0%,
+    color-mix(in srgb, var(--color-accent-glow-strong) 50%, transparent) 0%,
+    transparent 45%);
+  opacity: 0.7;
+}
+
+.ade-chat-thinking-glass > * {
+  position: relative;
+  z-index: 1;
+}
+
+/* Subagent card — idle glass, subtle border */
+.ade-chat-subagent-card {
+  position: relative;
+  border-radius: 14px;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 100%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 60%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 46%, transparent) 100%);
+  box-shadow: inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 50%, transparent);
+  backdrop-filter: blur(18px) saturate(145%);
+  -webkit-backdrop-filter: blur(18px) saturate(145%);
+  transition: border-color 160ms ease, box-shadow 200ms ease;
+}
+
+.ade-chat-subagent-card:hover {
+  border-color: color-mix(in srgb, var(--color-accent) 22%, var(--chat-glass-border));
+}
+
+/* Active subagent card — purple accent ring, no heavy fill */
+.ade-chat-subagent-card-active {
+  border-color: color-mix(in srgb, var(--color-accent) 36%, var(--chat-glass-border));
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 75%, transparent),
+    0 0 0 1px color-mix(in srgb, var(--color-accent) 22%, transparent),
+    0 14px 30px -22px color-mix(in srgb, var(--color-accent) 34%, transparent);
+}
+
+/* Task row — flat base, accent fill only when in-progress */
+.ade-chat-task-row {
+  position: relative;
+  border-radius: 8px;
+  transition: background 140ms ease, color 140ms ease;
+}
+
+.ade-chat-task-row:hover {
+  background: color-mix(in srgb, var(--color-accent) 8%, transparent);
+}
+
+.ade-chat-task-row-active {
+  background: linear-gradient(90deg,
+    color-mix(in srgb, var(--color-accent) 14%, transparent) 0%,
+    color-mix(in srgb, var(--color-accent) 4%, transparent) 100%);
+  box-shadow: inset 2px 0 0 var(--color-accent);
+}
+
+/* Memory chip — small purple specular pill for memory-related tool calls */
+.ade-memory-chip {
+  position: relative;
+  border-radius: 999px;
+  border: 1px solid color-mix(in srgb, var(--color-accent) 32%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--color-accent) 16%, transparent) 0%,
+    color-mix(in srgb, var(--color-accent) 8%, transparent) 100%);
+  color: color-mix(in srgb, var(--color-accent-bright) 85%, white);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, white 12%, transparent),
+    0 4px 14px -10px color-mix(in srgb, var(--color-accent) 40%, transparent);
+  backdrop-filter: blur(12px) saturate(145%);
+  -webkit-backdrop-filter: blur(12px) saturate(145%);
+}
+
+/* Tonal status pill — glass chip that tints with its semantic color */
+.ade-chat-status-pill {
+  position: relative;
+  border-radius: 999px;
+  border: 1px solid color-mix(in srgb, var(--chat-glass-border) 110%, transparent);
+  background: linear-gradient(180deg,
+    color-mix(in srgb, var(--chat-panel-bg-strong) 65%, transparent) 0%,
+    color-mix(in srgb, var(--chat-panel-bg) 48%, transparent) 100%);
+  box-shadow: inset 0 1px 0 color-mix(in srgb, var(--chat-glass-highlight) 55%, transparent);
+  backdrop-filter: blur(14px) saturate(140%);
+  -webkit-backdrop-filter: blur(14px) saturate(140%);
+}
+
 /* Animated timeline connector */
 .ade-timeline-line {
   background: linear-gradient(180deg,
diff --git a/apps/desktop/src/renderer/lib/aiDiscoveryCache.test.ts b/apps/desktop/src/renderer/lib/aiDiscoveryCache.test.ts
index 7a2a4f5e7..c881ddf0b 100644
--- a/apps/desktop/src/renderer/lib/aiDiscoveryCache.test.ts
+++ b/apps/desktop/src/renderer/lib/aiDiscoveryCache.test.ts
@@ -67,4 +67,52 @@ describe("aiDiscoveryCache", () => {
     expect(second).toHaveLength(1);
     expect(modelsMock).toHaveBeenCalledTimes(1);
   });
+
+  it("forwards explicit OpenCode inventory refresh requests", async () => {
+    getStatusMock.mockResolvedValueOnce({
+      mode: "subscription",
+      availableProviders: { claude: true, codex: true, cursor: false },
+      models: { claude: [], codex: [], cursor: [] },
+      features: [],
+    });
+
+    await getAiStatusCached({
+      projectRoot: "/project/a",
+      refreshOpenCodeInventory: true,
+    });
+
+    expect(getStatusMock).toHaveBeenCalledWith({
+      force: false,
+      refreshOpenCodeInventory: true,
+    });
+  });
+
+  it("does not let a warm generic status cache swallow an explicit OpenCode refresh", async () => {
+    getStatusMock
+      .mockResolvedValueOnce({
+        mode: "subscription",
+        availableProviders: { claude: true, codex: true, cursor: false },
+        models: { claude: [], codex: [], cursor: [] },
+        features: [],
+      })
+      .mockResolvedValueOnce({
+        mode: "subscription",
+        availableProviders: { claude: true, codex: true, cursor: false },
+        models: { claude: [], codex: [], cursor: [] },
+        features: [],
+        opencodeProviders: [{ id: "openai", name: "OpenAI", connected: true, modelCount: 1 }],
+      });
+
+    await getAiStatusCached({ projectRoot: "/project/a" });
+    await getAiStatusCached({
+      projectRoot: "/project/a",
+      refreshOpenCodeInventory: true,
+    });
+
+    expect(getStatusMock).toHaveBeenCalledTimes(2);
+    expect(getStatusMock).toHaveBeenNthCalledWith(2, {
+      force: false,
+      refreshOpenCodeInventory: true,
+    });
+  });
 });
diff --git a/apps/desktop/src/renderer/lib/aiDiscoveryCache.ts b/apps/desktop/src/renderer/lib/aiDiscoveryCache.ts
index 0b7272da3..6ebcc0eec 100644
--- a/apps/desktop/src/renderer/lib/aiDiscoveryCache.ts
+++ b/apps/desktop/src/renderer/lib/aiDiscoveryCache.ts
@@ -4,6 +4,8 @@ type StatusCacheEntry = {
   value: AiSettingsStatus | null;
   timestamp: number;
   inFlight: Promise<AiSettingsStatus> | null;
+  includesOpenCodeInventory: boolean;
+  inFlightIncludesOpenCodeInventory: boolean;
 };
 
 type ModelsCacheEntry = {
@@ -34,27 +36,43 @@ export async function getAiStatusCached(args: {
   projectRoot: string | null | undefined;
   force?: boolean;
   ttlMs?: number;
+  refreshOpenCodeInventory?: boolean;
 }): Promise<AiSettingsStatus> {
   const key = statusCacheKey(args.projectRoot);
   const ttlMs = args.ttlMs ?? DEFAULT_AI_STATUS_TTL_MS;
   const now = Date.now();
   const existing = aiStatusCache.get(key);
-
-  if (!args.force && existing?.value && now - existing.timestamp < ttlMs) {
+  const requiresOpenCodeInventory = args.refreshOpenCodeInventory === true;
+
+  if (
+    !args.force
+    && existing?.value
+    && now - existing.timestamp < ttlMs
+    && (!requiresOpenCodeInventory || existing.includesOpenCodeInventory)
+  ) {
     return existing.value;
   }
-  if (!args.force && existing?.inFlight) {
+  if (
+    !args.force
+    && existing?.inFlight
+    && (!requiresOpenCodeInventory || existing.inFlightIncludesOpenCodeInventory)
+  ) {
     return existing.inFlight;
   }
 
   let request: Promise<AiSettingsStatus> | null = null;
-  request = window.ade.ai.getStatus().then((status) => {
+  request = window.ade.ai.getStatus({
+    force: args.force === true,
+    refreshOpenCodeInventory: requiresOpenCodeInventory,
+  }).then((status) => {
     const current = aiStatusCache.get(key);
     if (current?.inFlight === request) {
       aiStatusCache.set(key, {
         value: status,
         timestamp: Date.now(),
         inFlight: null,
+        includesOpenCodeInventory: requiresOpenCodeInventory,
+        inFlightIncludesOpenCodeInventory: false,
       });
     }
     return status;
@@ -65,6 +83,8 @@ export async function getAiStatusCached(args: {
         value: current.value,
         timestamp: current.timestamp,
         inFlight: null,
+        includesOpenCodeInventory: current.includesOpenCodeInventory,
+        inFlightIncludesOpenCodeInventory: false,
       });
     }
     throw error;
@@ -74,6 +94,8 @@ export async function getAiStatusCached(args: {
     value: existing?.value ?? null,
     timestamp: existing?.timestamp ?? 0,
     inFlight: request,
+    includesOpenCodeInventory: existing?.includesOpenCodeInventory ?? false,
+    inFlightIncludesOpenCodeInventory: requiresOpenCodeInventory,
   });
 
   return request;
diff --git a/apps/desktop/src/shared/ipc.ts b/apps/desktop/src/shared/ipc.ts
index f01acdbd4..9217a7bbc 100644
--- a/apps/desktop/src/shared/ipc.ts
+++ b/apps/desktop/src/shared/ipc.ts
@@ -99,6 +99,7 @@ export const IPC = {
   lanesDiagnosticsEvent: "ade.lanes.diagnostics.event",
   sessionsList: "ade.sessions.list",
   sessionsGet: "ade.sessions.get",
+  sessionsDelete: "ade.sessions.delete",
   sessionsUpdateMeta: "ade.sessions.updateMeta",
   sessionsChanged: "ade.sessions.changed",
   sessionsReadTranscriptTail: "ade.sessions.readTranscriptTail",
@@ -116,6 +117,7 @@ export const IPC = {
   agentChatRespondToInput: "ade.agentChat.respondToInput",
   agentChatModels: "ade.agentChat.models",
   agentChatDispose: "ade.agentChat.dispose",
+  agentChatDelete: "ade.agentChat.delete",
   agentChatEvent: "ade.agentChat.event",
   agentChatUpdateSession: "ade.agentChat.updateSession",
   agentChatWarmupModel: "ade.agentChat.warmupModel",
@@ -392,6 +394,13 @@ export const IPC = {
   prsPipelineSettingsGet: "ade.prs.pipelineSettings.get",
   prsPipelineSettingsSave: "ade.prs.pipelineSettings.save",
   prsPipelineSettingsDelete: "ade.prs.pipelineSettings.delete",
+  prsGetDeployments: "ade.prs.getDeployments",
+  prsGetAiSummary: "ade.prs.getAiSummary",
+  prsRegenerateAiSummary: "ade.prs.regenerateAiSummary",
+  prsPostReviewComment: "ade.prs.postReviewComment",
+  prsSetReviewThreadResolved: "ade.prs.setReviewThreadResolved",
+  prsReactToComment: "ade.prs.reactToComment",
+  prsLaunchIssueResolutionFromThread: "ade.prs.launchIssueResolutionFromThread",
   rebaseScanNeeds: "ade.rebase.scanNeeds",
   rebaseGetNeed: "ade.rebase.getNeed",
   rebaseDismiss: "ade.rebase.dismiss",
@@ -555,7 +564,8 @@ export const IPC = {
   ctoStartLinearOAuth: "ade.cto.startLinearOAuth",
   ctoGetLinearOAuthSession: "ade.cto.getLinearOAuthSession",
   ctoRunProjectScan: "ade.cto.runProjectScan",
-  feedbackSubmit: "ade.feedback.submit",
+  feedbackPrepareDraft: "ade.feedback.prepareDraft",
+  feedbackSubmitDraft: "ade.feedback.submitDraft",
   feedbackList: "ade.feedback.list",
   feedbackOnUpdate: "ade.feedback.onUpdate",
   updateCheckForUpdates: "ade.update.checkForUpdates",
diff --git a/apps/desktop/src/shared/types/chat.ts b/apps/desktop/src/shared/types/chat.ts
index 1b70cd18a..80f669496 100644
--- a/apps/desktop/src/shared/types/chat.ts
+++ b/apps/desktop/src/shared/types/chat.ts
@@ -689,6 +689,10 @@ export type AgentChatDisposeArgs = {
   sessionId: string;
 };
 
+export type AgentChatDeleteArgs = {
+  sessionId: string;
+};
+
 export type AgentChatUpdateSessionArgs = {
   sessionId: string;
   title?: string | null;
diff --git a/apps/desktop/src/shared/types/feedback.ts b/apps/desktop/src/shared/types/feedback.ts
index 801f5abd8..901e8d80e 100644
--- a/apps/desktop/src/shared/types/feedback.ts
+++ b/apps/desktop/src/shared/types/feedback.ts
@@ -1,12 +1,73 @@
 export type FeedbackCategory = "bug" | "feature" | "enhancement" | "question";
 
+export type FeedbackGenerationMode = "ai_assisted" | "deterministic";
+
+type FeedbackDraftInputBase = {
+  summary: string;
+  additionalContext?: string | null;
+};
+
+export type FeedbackBugDraftInput = FeedbackDraftInputBase & {
+  category: "bug";
+  stepsToReproduce?: string | null;
+  expectedBehavior?: string | null;
+  actualBehavior?: string | null;
+  environment?: string | null;
+};
+
+export type FeedbackEnhancementDraftInput = FeedbackDraftInputBase & {
+  category: "feature" | "enhancement";
+  useCase?: string | null;
+  proposedSolution?: string | null;
+  alternativesConsidered?: string | null;
+};
+
+export type FeedbackQuestionDraftInput = FeedbackDraftInputBase & {
+  category: "question";
+  context?: string | null;
+  expectedGuidance?: string | null;
+};
+
+export type FeedbackDraftInput =
+  | FeedbackBugDraftInput
+  | FeedbackEnhancementDraftInput
+  | FeedbackQuestionDraftInput;
+
+export type FeedbackPreparedDraft = {
+  category: FeedbackCategory;
+  draftInput: FeedbackDraftInput;
+  userDescription: string;
+  modelId: string | null;
+  reasoningEffort?: string | null;
+  title: string;
+  body: string;
+  labels: string[];
+  generationMode: FeedbackGenerationMode;
+  generationWarning: string | null;
+};
+
+export type FeedbackPrepareDraftArgs = {
+  draftInput: FeedbackDraftInput;
+  modelId?: string | null;
+  reasoningEffort?: string | null;
+};
+
+export type FeedbackSubmitDraftArgs = {
+  draft: FeedbackPreparedDraft;
+  title: string;
+  body: string;
+  labels: string[];
+};
+
 export type FeedbackSubmission = {
   id: string;
   category: FeedbackCategory;
   userDescription: string;
-  modelId: string;
+  modelId: string | null;
   reasoningEffort?: string | null;
   status: "pending" | "generating" | "posting" | "posted" | "failed";
+  generationMode: FeedbackGenerationMode | null;
+  generationWarning: string | null;
   generatedTitle: string | null;
   generatedBody: string | null;
   issueUrl: string | null;
@@ -17,13 +78,6 @@ export type FeedbackSubmission = {
   completedAt: string | null;
 };
 
-export type FeedbackSubmitArgs = {
-  category: FeedbackCategory;
-  userDescription: string;
-  modelId: string;
-  reasoningEffort?: string | null;
-};
-
 export type FeedbackSubmissionEvent = {
   type: "feedback-submission-updated";
   submission: FeedbackSubmission;
diff --git a/apps/desktop/src/shared/types/lanes.ts b/apps/desktop/src/shared/types/lanes.ts
index 6e015c261..65a4729e7 100644
--- a/apps/desktop/src/shared/types/lanes.ts
+++ b/apps/desktop/src/shared/types/lanes.ts
@@ -120,6 +120,7 @@ export type CreateChildLaneArgs = {
   folder?: string;
   missionId?: string | null;
   laneRole?: MissionLaneRole | null;
+  baseBranchRef?: string;
 };
 
 export type CreateLaneFromUnstagedArgs = {
diff --git a/apps/desktop/src/shared/types/prs.ts b/apps/desktop/src/shared/types/prs.ts
index af284b869..343c16a5c 100644
--- a/apps/desktop/src/shared/types/prs.ts
+++ b/apps/desktop/src/shared/types/prs.ts
@@ -1193,3 +1193,172 @@ export type IssueInventorySnapshot = {
   convergence: ConvergenceStatus;
   runtime: ConvergenceRuntimeState;
 };
+
+// ---------------------------------------------------------------------------
+// PRs Tab — Timeline + Rails redesign (new)
+// ---------------------------------------------------------------------------
+
+export type PrDeploymentState =
+  | "pending"
+  | "in_progress"
+  | "queued"
+  | "success"
+  | "failure"
+  | "error"
+  | "inactive"
+  | "unknown";
+
+export type PrDeployment = {
+  id: string;
+  environment: string;
+  state: PrDeploymentState;
+  description: string | null;
+  /** The environment URL exposed by GitHub (public preview link, when available). */
+  environmentUrl: string | null;
+  /** GitHub log URL for the latest status update. */
+  logUrl: string | null;
+  sha: string | null;
+  ref: string | null;
+  creator: string | null;
+  createdAt: string | null;
+  updatedAt: string | null;
+};
+
+export type PrTimelineEventBase = {
+  id: string;
+  timestamp: string;
+  author: string | null;
+  avatarUrl: string | null;
+};
+
+export type PrTimelineEvent =
+  | (PrTimelineEventBase & {
+      type: "description";
+      body: string | null;
+    })
+  | (PrTimelineEventBase & {
+      type: "commit_push";
+      sha: string;
+      shortSha: string;
+      subject: string;
+      commitCount: number;
+      forcePushed: boolean;
+    })
+  | (PrTimelineEventBase & {
+      type: "review";
+      reviewId: string;
+      state: "pending" | "approved" | "changes_requested" | "commented" | "dismissed";
+      body: string | null;
+      isBot: boolean;
+    })
+  | (PrTimelineEventBase & {
+      type: "review_thread";
+      threadId: string;
+      path: string | null;
+      line: number | null;
+      startLine: number | null;
+      isResolved: boolean;
+      isOutdated: boolean;
+      commentCount: number;
+      firstCommentBody: string | null;
+    })
+  | (PrTimelineEventBase & {
+      type: "issue_comment";
+      commentId: string;
+      body: string | null;
+      isBot: boolean;
+    })
+  | (PrTimelineEventBase & {
+      type: "check_update";
+      checkName: string;
+      status: "queued" | "in_progress" | "completed";
+      conclusion: "success" | "failure" | "neutral" | "skipped" | "cancelled" | null;
+      detailsUrl: string | null;
+    })
+  | (PrTimelineEventBase & {
+      type: "deployment";
+      deploymentId: string;
+      environment: string;
+      state: PrDeploymentState;
+      environmentUrl: string | null;
+    })
+  | (PrTimelineEventBase & {
+      type: "label_change";
+      action: "added" | "removed";
+      label: string;
+      color: string | null;
+    })
+  | (PrTimelineEventBase & {
+      type: "merge";
+      mergeCommitSha: string | null;
+      method: MergeMethod | null;
+    });
+
+export type PrTimelineEventType = PrTimelineEvent["type"];
+
+/** AI-generated summary of a PR. Cached per (prId, headSha). */
+export type PrAiSummary = {
+  prId: string;
+  summary: string;
+  riskAreas: string[];
+  reviewerHotspots: string[];
+  unresolvedConcerns: string[];
+  generatedAt: string;
+  headSha: string;
+};
+
+export type PrReviewThreadReaction = {
+  id: string;
+  content: PrReactionContent;
+  user: string;
+};
+
+export type PrReactionContent =
+  | "+1"
+  | "-1"
+  | "laugh"
+  | "confused"
+  | "heart"
+  | "hooray"
+  | "rocket"
+  | "eyes";
+
+export type PostPrReviewCommentArgs = {
+  prId: string;
+  threadId: string;
+  body: string;
+};
+
+export type SetPrReviewThreadResolvedArgs = {
+  prId: string;
+  threadId: string;
+  resolved: boolean;
+};
+
+export type SetPrReviewThreadResolvedResult = {
+  threadId: string;
+  isResolved: boolean;
+};
+
+export type ReactToPrCommentArgs = {
+  prId: string;
+  commentId: string;
+  content: PrReactionContent;
+};
+
+export type LaunchPrIssueResolutionFromThreadArgs = {
+  prId: string;
+  threadId: string;
+  commentId?: string | null;
+  modelId?: string | null;
+  reasoning?: string | null;
+  permissionMode?: AiPermissionMode;
+  additionalInstructions?: string | null;
+  fileContext?: {
+    path: string | null;
+    line?: number | null;
+    startLine?: number | null;
+  } | null;
+};
+
+export type LaunchPrIssueResolutionFromThreadResult = PrIssueResolutionStartResult;
diff --git a/apps/desktop/src/shared/types/sessions.ts b/apps/desktop/src/shared/types/sessions.ts
index 325a8ff47..64f8472c8 100644
--- a/apps/desktop/src/shared/types/sessions.ts
+++ b/apps/desktop/src/shared/types/sessions.ts
@@ -120,7 +120,7 @@ export type PtyExitEvent = {
 
 export type TerminalSessionChangedEvent = {
   sessionId: string;
-  reason: "meta-updated";
+  reason: "meta-updated" | "deleted";
 };
 
 export type ListSessionsArgs = {
@@ -129,6 +129,10 @@ export type ListSessionsArgs = {
   limit?: number;
 };
 
+export type DeleteSessionArgs = {
+  sessionId: string;
+};
+
 export type UpdateSessionMetaArgs = {
   sessionId: string;
   pinned?: boolean;
diff --git a/apps/ios/ADE/Resources/DatabaseBootstrap.sql b/apps/ios/ADE/Resources/DatabaseBootstrap.sql
index e047c84ef..5bff154f5 100644
--- a/apps/ios/ADE/Resources/DatabaseBootstrap.sql
+++ b/apps/ios/ADE/Resources/DatabaseBootstrap.sql
@@ -373,6 +373,21 @@ create index if not exists idx_pull_requests_lane_id on pull_requests(lane_id);
 
 create index if not exists idx_pull_requests_project_id on pull_requests(project_id);
 
+alter table pull_requests add column last_polled_at text;
+
+alter table pull_requests add column head_sha text;
+
+create table if not exists pull_request_ai_summaries (
+      pr_id text not null,
+      head_sha text not null,
+      summary_json text not null,
+      generated_at text not null,
+      primary key(pr_id, head_sha),
+      foreign key(pr_id) references pull_requests(id)
+    );
+
+create index if not exists idx_pr_ai_summaries_pr_id on pull_request_ai_summaries(pr_id);
+
 create table if not exists pull_request_snapshots (
       pr_id text primary key,
       detail_json text,
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 14396d0ff..d183fbbb2 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -374,7 +374,7 @@ Every service lives under `apps/desktop/src/main/services/<domain>/`. Summary:
 | `devTools/` | `devToolsService.ts` | Probe for git + `gh` CLI availability. |
 | `diffs/` | `diffService.ts` | Diff computation for file panes. |
 | `externalMcp/` | `externalMcpService.ts`, `externalConnectionAuthService.ts` | External MCP server connections (opt-in). |
-| `feedback/` | `feedbackReporterService.ts` | In-app feedback reporting. |
+| `feedback/` | `feedbackReporterService.ts` | In-app feedback reporting. Two-stage: `prepareDraft` generates a structured issue title + labels (AI-assisted when a model is selected, deterministic fallback otherwise) so the user can review before posting; `submitPreparedDraft` files the GitHub issue. Each submission records `generationMode` and a `generationWarning` so the UI can flag deterministic drafts. |
 | `files/` | `fileService.ts`, `fileWatcherService.ts`, `fileSearchIndexService.ts` | Workspace file tree, read/write, watch, index. |
 | `git/` | `git.ts`, `gitOperationsService.ts`, `gitConflictState.ts` | Low-level git runner, high-level lane-scoped ops, conflict state queries. |
 | `github/` | `githubService.ts` | GitHub REST/GraphQL access; PR CRUD; checks; reviewers. |
@@ -384,14 +384,14 @@ Every service lives under `apps/desktop/src/main/services/<domain>/`. Summary:
 | `keybindings/` | `keybindingsService.ts` | User keybindings read/write. |
 | `lanes/` | `laneService.ts`, `laneEnvironmentService.ts`, `laneTemplateService.ts`, `laneProxyService.ts`, `portAllocationService.ts`, `autoRebaseService.ts`, `rebaseSuggestionService.ts`, `laneLaunchContext.ts`, `oauthRedirectService.ts`, `runtimeDiagnosticsService.ts` | Worktree lifecycle, env bootstrap, templates, reverse proxy, port leases, auto-rebase, suggestions, OAuth redirect, diagnostics. |
 | `logging/` | `logger.ts` | File-backed structured logger. |
-| `memory/` | `unifiedMemoryService.ts` (canonical; listed under `memory/memoryService.ts`), `memoryBriefingService.ts`, `memoryLifecycleService.ts`, `batchConsolidationService.ts`, `embeddingService.ts`, `embeddingWorkerService.ts`, `hybridSearchService.ts`, `episodicSummaryService.ts`, `knowledgeCaptureService.ts`, `humanWorkDigestService.ts`, `proceduralLearningService.ts`, `compactionFlushService.ts`, `skillRegistryService.ts`, `memoryFilesService.ts`, `memoryRepairService.ts`, `missionMemoryLifecycleService.ts` | Unified memory subsystem — see §10. |
+| `memory/` | `unifiedMemoryService.ts` (canonical; listed under `memory/memoryService.ts`), `memoryBriefingService.ts`, `memoryLifecycleService.ts`, `batchConsolidationService.ts`, `embeddingService.ts`, `embeddingWorkerService.ts`, `hybridSearchService.ts`, `episodicSummaryService.ts`, `knowledgeCaptureService.ts`, `humanWorkDigestService.ts`, `proceduralLearningService.ts`, `compactionFlushPrompt.ts`, `skillRegistryService.ts`, `memoryFilesService.ts`, `memoryRepairService.ts`, `missionMemoryLifecycleService.ts` | Unified memory subsystem — see §10. |
 | `missions/` | `missionService.ts`, `missionPreflightService.ts`, `phaseEngine.ts` | Mission CRUD, preflight validation, phase lifecycle. |
 | `onboarding/` | `onboardingService.ts` | First-run flow, defaults detection, existing lane discovery. |
 | `opencode/` | `openCodeRuntime.ts`, `openCodeServerManager.ts`, `openCodeBinaryManager.ts`, `openCodeInventory.ts`, `openCodeModelCatalog.ts` | OpenCode server spawn, binary resolution, model discovery. |
 | `orchestrator/` | See §4.5. | Deterministic mission runtime + intelligent coordinator. |
 | `processes/` | `processService.ts` | Managed-process lifecycle per lane, readiness probes, restart policies. |
 | `projects/` | `adeProjectService.ts`, `configReloadService.ts`, `projectService.ts`, `logIntegrityService.ts`, `recentProjectSummary.ts` | Project detection + `.ade` repair/bootstrap, reload on config change, recent-project metadata. |
-| `prs/` | `prService.ts`, `prPollingService.ts`, `queueLandingService.ts`, `issueInventoryService.ts`, `prIssueResolver.ts`, `prRebaseResolver.ts`, `integrationPlanning.ts`, `integrationValidation.ts` | PR CRUD, polling, stacked-queue landing, issue inventory, AI-assisted resolution, integration planning. |
+| `prs/` | `prService.ts`, `prPollingService.ts`, `prSummaryService.ts`, `queueLandingService.ts`, `issueInventoryService.ts`, `prIssueResolver.ts`, `prRebaseResolver.ts`, `integrationPlanning.ts`, `integrationValidation.ts` | PR CRUD, polling (with per-PR `last_polled_at` cursor), AI summary cache keyed by `(prId, head_sha)`, stacked-queue landing, issue inventory, AI-assisted resolution, integration planning. |
 | `pty/` | `ptyService.ts` | `node-pty` spawn, PTY I/O bridging, transcript writing. |
 | `runtime/` | `adeMcpLaunch.ts`, `tempCleanupService.ts` | MCP launch resolver (bundled proxy/headless/source), temp cleanup. |
 | `sessions/` | `sessionService.ts`, `sessionDeltaService.ts` | Terminal session CRUD, post-session delta computation. |
@@ -651,7 +651,7 @@ Services under `apps/desktop/src/main/services/memory/`:
 - `memoryFilesService.ts` — mirrors promoted project memory to `.ade/memory/MEMORY.md` + topic files.
 - `proceduralLearningService.ts` — identifies repeatable workflows from episode memories.
 - `batchConsolidationService.ts` — clusters similar memories (Jaccard threshold 0.7), merges via AI, archives originals.
-- `compactionFlushService.ts` — injects hidden "flush important observations" prompt before context compaction.
+- `compactionFlushPrompt.ts` — `DEFAULT_FLUSH_PROMPT` fed to the Claude SDK `PreCompact` hook so durable findings are saved before compaction. Claude-only; other providers don't currently expose an equivalent hook.
 
 Quality controls:
 
diff --git a/docs/features/agents/tool-registration.md b/docs/features/agents/tool-registration.md
index b9b8f6d5b..fbde99bf3 100644
--- a/docs/features/agents/tool-registration.md
+++ b/docs/features/agents/tool-registration.md
@@ -101,7 +101,10 @@ flow through the subprocess into the proxy. The proxy's job:
 2. Read `ADE_CHAT_SESSION_ID`, `ADE_MISSION_ID`, `ADE_RUN_ID`,
    `ADE_STEP_ID`, `ADE_ATTEMPT_ID`, `ADE_OWNER_ID`, `ADE_DEFAULT_ROLE`,
    and the `ADE_COMPUTER_USE_*` policy vars.
-3. Connect to the socket server.
+3. Connect to the socket server. Connect retries `ENOENT`/`ECONNREFUSED`
+   every 150 ms for up to 5 s so a CLI that spawns the proxy
+   fractionally before the desktop's socket server is listening still
+   succeeds; other socket errors fail fast.
 4. For each incoming JSON-RPC message, if it is an `initialize`
    request, inject the identity into `params.identity` via
    `injectIdentityIntoInitializePayload`. Otherwise pass through
diff --git a/docs/features/chat/README.md b/docs/features/chat/README.md
index 0d63f402d..383c5c8a5 100644
--- a/docs/features/chat/README.md
+++ b/docs/features/chat/README.md
@@ -17,7 +17,8 @@ machinery layered on top.
 | `apps/desktop/src/main/services/chat/sessionRecovery.ts` | Version-2 persisted-state reconstruction when sessions resume from disk. |
 | `apps/desktop/src/shared/chatTranscript.ts` | Pure JSON-lines parser for `AgentChatEventEnvelope` values. Used by both the main process and the renderer. |
 | `apps/desktop/src/shared/types/chat.ts` | All chat types: `AgentChatSession`, `AgentChatEvent` union, permission modes, pending input, completion reports. |
-| `apps/desktop/src/renderer/components/chat/AgentChatPane.tsx` | Top-level renderer surface: state derivation, IPC wiring, composer mount, message-list mount. |
+| `apps/desktop/src/renderer/components/chat/AgentChatPane.tsx` | Top-level renderer surface: state derivation, IPC wiring, composer mount, message-list mount, End/Delete chat controls in the header. Mounts `AgentQuestionModal` when the active pending input is a question/structured-question. |
+| `apps/desktop/src/renderer/components/chat/AgentQuestionModal.tsx` | Floating modal surface for question / structured-question pending inputs. Rendered above the transcript so the user can type or pick an option without losing the chat context. |
 | `apps/desktop/src/renderer/components/chat/chatTranscriptRows.ts` | Two-layer event-to-row pipeline (render events + grouped envelopes) that powers the message list. |
 | `apps/desktop/src/main/services/ai/tools/` | Tool tiers consumed by the service when it provisions a Claude/Codex/OpenCode runtime (see [Tool System](tool-system.md)). |
 | `apps/desktop/src/shared/ipc.ts` | `ade.agentChat.*` IPC channel constants. |
@@ -93,6 +94,8 @@ handlers live in `apps/desktop/src/main/services/ipc/registerIpc.ts`.
 | `ade.agentChat.interrupt` | invoke | Provider-specific interruption of the in-flight turn. |
 | `ade.agentChat.approve` | invoke | Legacy approval channel (pre-pending-input). |
 | `ade.agentChat.respondToInput` | invoke | Unified pending-input answer channel. |
+| `ade.agentChat.dispose` | invoke | End the runtime and persist final state ("End chat"). The row stays in `terminal_sessions` as `ended` so it remains resumable. |
+| `ade.agentChat.delete` | invoke | Permanently remove a chat session: disposes the runtime if still running, cancels any pending turn collector, resolves outstanding input waiters, removes the persisted JSON + transcript, and deletes the `terminal_sessions` row. Renderer surfaces this as "Delete chat" on ended sessions. |
 | `ade.agentChat.updateSession` | invoke | Mutate permission modes, `manuallyNamed`, capability mode. |
 | `ade.agentChat.warmupModel` | invoke | Preload a Claude V2 session for an eventual turn. |
 | `ade.agentChat.slashCommands` | invoke | List provider + local slash commands. |
@@ -132,6 +135,13 @@ handlers live in `apps/desktop/src/main/services/ipc/registerIpc.ts`.
   identity session undergoes context compaction, the service calls
   `refreshReconstructionContext()` to re-inject persona + core memory +
   protocols. Missing this path loses CTO identity mid-session.
+- **MCP approval bypass during auto-compaction.** The Claude runtime
+  sets `compactionInProgress` when the SDK `PreCompact` hook fires and
+  keeps it set for 60 s (the SDK emits no `PostCompact` signal). While
+  the flag is true, `canUseTool` auto-approves MCP tools (notably
+  `memory_add`) so the compaction flush can persist memories without
+  blocking on an approval prompt that no user is present to answer.
+  Non-MCP tools still go through the normal approval gate.
 - **Transcript persistence.** Sessions persist version-2 state under the
   `.ade` layout. Re-derivation goes through `sessionRecovery.ts`;
   changing the on-disk format without bumping the version silently
diff --git a/docs/features/lanes/README.md b/docs/features/lanes/README.md
index fe9adbace..bdaaf4a66 100644
--- a/docs/features/lanes/README.md
+++ b/docs/features/lanes/README.md
@@ -134,7 +134,10 @@ default from the Lanes list (see `isMissionLaneHiddenByDefault` in
    worktree path under `.ade/worktrees/<slug>/`, runs `git worktree
    add`, inserts the lane row, and returns a `LaneSummary`.
 2. **Create child** — same as create but with `parentLaneId`. Child's
-   base ref defaults to the parent's branch ref.
+   base ref defaults to the parent's branch ref. Callers can override
+   with `baseBranchRef` on `CreateChildLaneArgs` to fork from any local
+   or remote branch (the service resolves/tracks remote refs via
+   `resolveImportBranchTarget` before creating the worktree).
 3. **Create from unstaged** — `createFromUnstaged` rescues uncommitted
    work into a new child lane via `git stash` in the source worktree
    plus `git stash apply` in the child. Rolls back the child if apply
diff --git a/docs/features/memory/README.md b/docs/features/memory/README.md
index 7d4f559e0..7f82d73d4 100644
--- a/docs/features/memory/README.md
+++ b/docs/features/memory/README.md
@@ -19,7 +19,7 @@ background; agents and the user rarely touch the raw store.
 | `apps/desktop/src/main/services/memory/episodicSummaryService.ts` | Post-session episode extraction (what was attempted, what worked, what failed). |
 | `apps/desktop/src/main/services/memory/proceduralLearningService.ts` | Distills repeatable workflows from episodes into Procedures; exports skill files. |
 | `apps/desktop/src/main/services/memory/humanWorkDigestService.ts` | Generates change digests when the user commits outside ADE. |
-| `apps/desktop/src/main/services/memory/compactionFlushService.ts` | Injects a hidden memoryAdd prompt before chat context compaction. |
+| `apps/desktop/src/main/services/memory/compactionFlushPrompt.ts` | `DEFAULT_FLUSH_PROMPT` fed into the Claude SDK `PreCompact` hook so durable findings can be saved before compaction. |
 | `apps/desktop/src/main/services/memory/memoryBriefingService.ts` | Assembles briefings that get injected into agent prompts. |
 | `apps/desktop/src/main/services/memory/memoryFilesService.ts` | Generates `.ade/memory/MEMORY.md` and topic files from promoted memories. |
 | `apps/desktop/src/main/services/memory/memoryRepairService.ts` | Schema migrations and integrity repairs. |
diff --git a/docs/features/memory/compaction.md b/docs/features/memory/compaction.md
index e13c8e250..588942f65 100644
--- a/docs/features/memory/compaction.md
+++ b/docs/features/memory/compaction.md
@@ -8,7 +8,7 @@ that keep the memory store healthy.
 
 | Path | Role |
 |---|---|
-| `apps/desktop/src/main/services/memory/compactionFlushService.ts` | Hidden pre-compaction prompt injector. Runs before provider context compaction so durable findings are saved. |
+| `apps/desktop/src/main/services/memory/compactionFlushPrompt.ts` | `DEFAULT_FLUSH_PROMPT` — the text fed into the Claude SDK `PreCompact` hook so durable findings can be saved before compaction runs. |
 | `apps/desktop/src/main/services/memory/episodicSummaryService.ts` | Post-session episode extraction: task description, approach, outcome, patterns, gotchas, decisions, tools. |
 | `apps/desktop/src/main/services/memory/proceduralLearningService.ts` | Clusters episodes into procedures; tracks confidence via `memory_procedure_history`; exports skill files. |
 | `apps/desktop/src/main/services/memory/batchConsolidationService.ts` | Weekly batch AI-driven consolidation: merges clusters of similar entries into a single higher-quality entry. |
@@ -19,66 +19,65 @@ that keep the memory store healthy.
 
 ## Compaction flush
 
-When a chat session approaches its context window limit, the provider
-may compact (summarise + discard) earlier turns. Before that happens,
-ADE injects a hidden system prompt asking the agent to save durable
-findings via `memoryAdd`.
+When a Claude chat session approaches its context window limit, the
+Claude Agent SDK auto-compacts (summarises + discards) earlier turns.
+ADE nudges the agent to save durable findings before that happens by
+registering a `PreCompact` SDK hook that returns `DEFAULT_FLUSH_PROMPT`
+as a `systemMessage`. The hook runs inside the SDK's compaction flow,
+so the prompt never becomes a visible chat turn and does not consume
+conversation tokens.
 
 ### Flow
 
-1. `agentChatService` monitors conversation token count and compares
-   against `maxTokens - reserveTokensFloor`.
-2. When the threshold is crossed, `compactionFlushService.maybeFlush()`
-   runs.
-3. It appends a hidden `{ role: "system", content: <flush prompt>,
-   hidden: true }` message and invokes `flushTurn()` to run a
-   provider turn dedicated to saving memories.
-4. The prompt includes explicit SAVE / DO-NOT-SAVE guidance to keep
-   memory quality high (see `CompactionFlushConfig.flushPrompt`).
-5. After the flush completes (or fails), normal compaction proceeds.
-
-### Config
-
-```ts
-type CompactionFlushConfig = {
-  enabled?: boolean;                      // default true
-  reserveTokensFloor?: number;            // token safety margin
-  maxFlushTurnsPerSession?: number;       // cap; prevents runaway flushes
-  flushPrompt?: string;                   // override default prompt
-};
-```
-
-### State tracking
-
-`SessionFlushState` (per session):
-
-```ts
-type SessionFlushState = {
-  flushCount: number;
-  flushedBoundaries: Set<string>;
-};
-```
-
-Each compaction boundary gets a unique `boundaryId` (derived from the
-message count + timestamp). The service refuses to flush the same
-boundary twice; if the boundary budget is exceeded, the service logs
-`budget-exceeded` and skips.
-
-### Result
-
-`CompactionFlushResult.reason` can be:
-
-- `disabled` -- config disabled.
-- `below-threshold` -- token count below the flush threshold.
-- `flush-handler-unavailable` -- no `flushTurn` provided.
-- `already-flushed-boundary` -- same boundary seen before.
-- `max-flush-turns-reached` -- session budget exhausted.
-- `flushed` -- success.
-- `flush-failed` -- handler threw.
-- `flush-budget-exceeded` -- flush handler reported `budget_exceeded`.
-
-`proceedWithCompaction` is always `true` -- the caller should compact
-regardless of flush outcome.
+1. Claude SDK auto-compacts when approaching the context limit.
+2. The SDK fires `PreCompact` on the hook registered by
+   `buildClaudeSessionOpts` in `agentChatService.ts`.
+3. The hook returns `{ continue: true, systemMessage:
+   DEFAULT_FLUSH_PROMPT }`; the SDK folds the prompt into the
+   compaction step (best-effort — see "Caveats").
+4. The SDK then emits `system:compact_boundary`.
+   `agentChatService.ts` translates that into a `context_compact` chat
+   event rendered as the amber "Context compacted" badge.
+5. For CTO sessions, post-compaction identity re-injection runs
+   (`ctoStateService.appendContinuityCheckpoint` +
+   `refreshReconstructionContext`) to restore persona/memory context.
+
+### Where the prompt lives
+
+`apps/desktop/src/main/services/memory/compactionFlushPrompt.ts`
+exports `DEFAULT_FLUSH_PROMPT`. It encodes the quality bar (one
+actionable insight per memory, SAVE vs DO-NOT-SAVE lists, the
+`NO_DISCOVERIES` escape hatch) so Claude doesn't over-save.
+
+### Scope
+
+- **Claude** — `PreCompact` hook registered for non-lightweight
+  sessions. Boundary event `system:compact_boundary` translates to the
+  `context_compact` chat event.
+- **OpenCode** — auto-compacts at ~96% of context. The SDK emits
+  `session.compacted` (payload `{ sessionID }`) on the SSE stream; the
+  OpenCode runtime maps it to `context_compact`. No client-side
+  pre-compact hook; OpenCode's `experimental.session.compacting` is a
+  server-side plugin hook, not exposed to hosts.
+- **Codex** — auto-compacts around `model_auto_compact_token_limit`
+  (default ~64k). The app-server emits `item/started` +
+  `item/completed` where `item.type === "contextCompaction"`; the
+  Codex runtime emits `context_compact` on completion. Codex has no
+  pre-compact hook equivalent.
+- **Cursor / ACP** — no compaction signal. Neither the base ACP spec
+  nor Cursor's extensions define a compaction or summarization
+  notification. Cursor summarizes internally but keeps it hidden from
+  the protocol. No indicator possible today.
+
+### Caveats
+
+- `PreCompactHookInput.custom_instructions` is what the SDK feeds the
+  hook (e.g. text from a `/compact <instructions>` invocation); the
+  hook itself influences compaction via `SyncHookJSONOutput`. Routing
+  of `systemMessage` into the compaction prompt is SDK-internal — the
+  primary guarantee of this design is that the prompt never leaks as a
+  visible turn. Memory saving still happens opportunistically through
+  the MCP `memory_add` guidance already in the system prompt.
 
 ## Episodic summary
 
@@ -273,10 +272,11 @@ counts.
 
 ## Fragile and tricky wiring
 
-- **Compaction flush relies on the provider emitting a compaction
-  event.** Claude, Codex, and OpenCode all emit `context_compact`
-  events, but the thresholds differ. The service listens for the
-  common event; new providers must integrate the watcher.
+- **Pre-compact hook nudge is Claude-only.** Only the Claude Agent
+  SDK exposes a `PreCompact` hook that fires *before* compaction and
+  can influence it. Compaction *boundary events* are wired for
+  Claude, OpenCode, and Codex; Cursor/ACP has no signal to listen
+  for.
 - **Procedural learning clustering is text-similarity based.** If
   `normalizeText` drops too much signal (e.g., stripping numbers in a
   way that merges distinct procedures), procedures can get confused.
diff --git a/docs/features/pull-requests/README.md b/docs/features/pull-requests/README.md
index 682028e42..dcb4c505a 100644
--- a/docs/features/pull-requests/README.md
+++ b/docs/features/pull-requests/README.md
@@ -18,8 +18,9 @@ Main-process services (`apps/desktop/src/main/services/prs/`):
 
 | File | Responsibility |
 |------|---------------|
-| `prService.ts` | PR CRUD, GitHub sync, merge context, draft descriptions, check/review/comment hydration, integration proposals, merge bypass, post-merge cleanup |
-| `prPollingService.ts` | 60 s polling loop, fingerprint-based change detection, notification emission |
+| `prService.ts` | PR CRUD, GitHub sync, merge context, draft descriptions, check/review/comment hydration, integration proposals, merge bypass, post-merge cleanup, deployment listing, review-thread reply/resolve/react mutations for the timeline |
+| `prPollingService.ts` | 60 s polling loop, fingerprint-based change detection, notification emission. Writes `last_polled_at` per PR so callers can run delta polls on the next tick |
+| `prSummaryService.ts` | AI PR summary generator; caches `PrAiSummary` per `(prId, headSha)` in `pull_request_ai_summaries` so pushes invalidate the cache |
 | `queueLandingService.ts` | Merge queue state machine (`ALLOWED_TRANSITIONS`), landing loop, auto-resolve on conflicts |
 | `integrationPlanning.ts` | `buildIntegrationPreflight` — validates source lanes for an integration proposal |
 | `integrationValidation.ts` | `parseGitStatusPorcelain`, `hasMergeConflictMarkers` — shared helpers for integration flows |
@@ -43,7 +44,14 @@ Renderer components (`apps/desktop/src/renderer/components/prs/`):
 | `tabs/RebaseTab.tsx` | Lane rebase needs (base + queue + PR target) and attention items |
 | `tabs/WorkflowsTab.tsx` | Container for queue/integration/rebase sub-tabs |
 | `tabs/queueWorkflowModel.ts` | Pure model for queue tab rendering (active/history bucketing, guidance computation) |
-| `detail/PrDetailPane.tsx` | Selected PR detail pane: status, checks, reviews, comments, merge readiness, bypass, convergence, resolver modals |
+| `detail/PrDetailPane.tsx` | Selected PR detail pane: status, checks, reviews, comments, merge readiness, bypass, convergence, resolver modals. Switches the Overview tab between the legacy grid and the Timeline+Rails layout based on `prsTimelineRailsEnabled` |
+| `detail/PrDetailTimelineRails.tsx` | Timeline+Rails overview: merges timeline events, commit rail, status rail, deployment cards, AI summary, and command-palette navigation (`g c` / `g t` / `g f` and `[` / `]`) |
+| `shared/PrTimeline.tsx` | Timeline column: synthesises `PrTimelineEvent`s from detail data, handles per-PR filters (`PrTimelineFilters`), renders grouped events |
+| `shared/PrCommitRail.tsx`, `shared/PrStatusRail.tsx` | Right-hand rails on the timeline view: commit list, checks/reviews summary, deployment chips |
+| `shared/PrCommandPalettes.tsx` | `g c` (commits) / `g t` (threads) / `g f` (files) palettes opened by the keyboard chord and by the timeline toolbar |
+| `shared/PrAiSummaryCard.tsx` | AI summary card above the timeline; dismissible per PR (state in `PrsContext.dismissedAiSummaries`), with a "Regenerate" action wired to `prSummaryService.regenerateSummary` |
+| `shared/PrReviewThreadCard.tsx`, `shared/PrBotReviewCard.tsx` | Rich thread cards for the timeline (bot-review collapse, reply box, resolve/react actions) |
+| `shared/PrDeploymentCard.tsx` | Deployment row used in the status rail and on the timeline |
 | `shared/PrConvergencePanel.tsx` | Auto-converge slide-over panel with issue inventory, agent session embed, pipeline settings |
 | `shared/PrIssueResolverModal.tsx` | Launch issue resolution (checks/comments/both scopes) |
 | `shared/PrAiResolverPanel.tsx` | AI rebase launch controls in Rebase tab |
@@ -100,6 +108,10 @@ Selected channels exposed through `preload.ts`:
 - `ade.prs.getMergeContext`, `ade.prs.getStatus`, `ade.prs.getChecks`, `ade.prs.getReviews`, `ade.prs.getComments`, `ade.prs.getFiles`
 - `ade.prs.updateDescription`, `ade.prs.updateTitle`, `ade.prs.updateBody`, `ade.prs.setLabels`, `ade.prs.requestReviewers`, `ade.prs.submitReview`, `ade.prs.close`, `ade.prs.reopen`
 - `ade.prs.getReviewThreads`, `ade.prs.replyToReviewThread`, `ade.prs.resolveReviewThread`
+- `ade.prs.postReviewComment`, `ade.prs.setReviewThreadResolved`, `ade.prs.reactToComment` — GraphQL-backed mutations used by the timeline's thread cards
+- `ade.prs.getDeployments` — deployments for the PR's head SHA, with the latest status status URL and environment URL
+- `ade.prs.getAiSummary` / `ade.prs.regenerateAiSummary` — cached/forced `PrAiSummary` per `(prId, headSha)`
+- `ade.prs.launchIssueResolutionFromThread` — launch an agent chat pre-focused on a specific review thread (used by the thread card's "Resolve with agent" action)
 - `ade.prs.issueResolutionStart`, `ade.prs.issueResolutionPreview`
 - `ade.prs.rebaseResolutionStart`
 - `ade.prs.convergenceStateGet`, `ade.prs.convergenceStateSave`, `ade.prs.convergenceStateDelete`
@@ -239,15 +251,74 @@ The auto-converge poller waits for CI to finish and comments to
 stabilize (2 consecutive polls with same count) before starting the
 next round.
 
+## Timeline + Rails overview (PRs tab redesign)
+
+`PrDetailPane` renders two different layouts for the Overview tab
+depending on `prsTimelineRailsEnabled` in `PrsContext`:
+
+- **Legacy grid** — the original checks/reviews/comments cards.
+- **Timeline + Rails** — `PrDetailTimelineRails` with a central event
+  timeline (`PrTimeline`), a commit rail, a status/deployments rail,
+  and an AI summary card.
+
+Per-PR state (all persisted to `localStorage` under
+`ade:prs:timelineFiltersByPrId`, `ade:prs:dismissedAiSummaries`,
+`ade:prs:timelineRailsEnabled`):
+
+- `PrTimelineFilters` — which event types to show (description,
+  commits, reviews, threads, comments, checks, deployments, labels,
+  merges).
+- `dismissedAiSummaries[prId]` — whether the AI summary card is
+  collapsed for this PR.
+- `viewerLogin` — authenticated GitHub login used to highlight
+  reactions the viewer already placed.
+
+Deep linking: `prsRouteState` carries `eventId`, `threadId`, and
+`commitSha` in the URL. `PRsPage` preserves them as long as the URL
+still points at the selected PR and drops them when the PR changes.
+`PrDetailPane` reads them on mount to scroll / open the right card.
+
+Keyboard shortcuts (bound only when Timeline+Rails is active and the
+Overview tab is selected):
+
+| Chord | Action |
+|------|--------|
+| `g c` | Open the commit palette |
+| `g t` | Open the unresolved-threads palette |
+| `g f` | Open the changed-files palette |
+| `[` / `]` | Prev / next unresolved thread |
+
+## AI summary cache
+
+`prSummaryService` generates a `PrAiSummary` (summary text, risk
+areas, reviewer hotspots, unresolved concerns) via the AI integration
+service and caches it in `pull_request_ai_summaries` keyed by
+`(pr_id, head_sha)`. Pushing new commits advances `head_sha`
+(maintained by `prService.upsertFromGithub`) so the next read misses
+and the summary regenerates. `regenerateSummary` forces a rebuild
+regardless of cache state.
+
+## Delta polling cursor
+
+`prPollingService` writes `last_polled_at` on every PR after a
+successful tick. The cursor is exposed via `getLastPolledAt(prId)` so
+downstream services that hit GitHub with `since=` parameters (review
+threads, comments) can skip work they already saw. The cursor is
+best-effort — failures log a warning and do not abort the tick.
+
 ## Renderer wiring
 
 - `PRsPage` parses URL state via `parsePrsRouteState` and writes it
   back with `buildPrsRouteSearch`. Active tab, workflow sub-tab,
   selected PR, queue group, lane, and rebase item are all encoded.
 - `PrsContext` owns PR list, queue states, rebase needs, proposals,
-  and convergence runtime state. It caches convergence state per PR
-  and exposes `loadConvergenceState` / `saveConvergenceState` /
-  `resetConvergenceState`.
+  convergence runtime state, and the Timeline+Rails UI state
+  (`prsTimelineRailsEnabled`, `timelineFiltersByPrId`,
+  `dismissedAiSummaries`, `viewerLogin`, `detailReviewThreads`,
+  `detailDeployments`, `detailAiSummary`). It caches convergence state
+  per PR and exposes `loadConvergenceState` / `saveConvergenceState` /
+  `resetConvergenceState`, plus `setTimelineFilters`,
+  `setAiSummaryDismissed`, and `regeneratePrAiSummary`.
 - `PrDetailPane` is where most rich behavior concentrates:
   convergence panel (slide-over), issue resolver modal, rebase
   banner, check/review/comment sections with running indicators
diff --git a/docs/features/terminals-and-sessions/README.md b/docs/features/terminals-and-sessions/README.md
index 4bb4bd2b0..0a7f2f337 100644
--- a/docs/features/terminals-and-sessions/README.md
+++ b/docs/features/terminals-and-sessions/README.md
@@ -89,6 +89,8 @@ Renderer surfaces:
   flags.
 - `apps/desktop/src/renderer/components/terminals/SessionContextMenu.tsx`
   and `SessionInfoPopover.tsx` — right-click actions and info overlay.
+  Ended chat sessions get an additional "Delete chat" action wired to
+  `ade.agentChat.delete`.
 - `apps/desktop/src/renderer/lib/sessionListCache.ts` — shared renderer
   cache for `ade.sessions.list` calls, keyed by `projectRoot/laneId/status`.
 
@@ -174,9 +176,22 @@ See `apps/desktop/src/shared/types/sessions.ts` for the full shape.
    transcript history intact.
 
 7. **Reconcile** — on startup, `reconcileStaleRunningSessions` marks
-   orphaned `running` rows as `disposed`. An `excludeToolTypes` option
-   lets the caller keep chat sessions alive so they can be resumed via
-   their SDK rather than force-closed.
+   orphaned `running` rows as `disposed`. The service still accepts an
+   `excludeToolTypes` option, but `main.ts` no longer passes chat tool
+   types: chat runtimes always warm up afresh on app start, so leaving
+   stale `running` chat rows behind only causes UI confusion. Ended
+   chat sessions stay in the table and are resumable through the SDK
+   (or removable via `ade.agentChat.delete`).
+
+8. **Delete** — `sessionService.deleteSession(sessionId)` removes a
+   row outright and emits `terminalSessionChanged` with
+   `reason: "deleted"` so renderer caches drop it immediately.
+   `agentChatService.deleteSession` wraps this for chat rows: it
+   disposes a live runtime, cancels the pending turn collector,
+   rejects outstanding input waiters, deletes the persisted JSON and
+   transcript (path-safe under `.ade/`), and then calls the session
+   service. PTY rows use the same `deleteSession` as their deletion
+   primitive.
 
 ## Hot paths worth knowing
 
@@ -205,9 +220,11 @@ Sessions:
 | `ade.sessions.list` | list by lane/status; cached at renderer |
 | `ade.sessions.get` | single session detail including runtime state |
 | `ade.sessions.updateMeta` | rename (sets `manuallyNamed`), pin, edit goal, update resume metadata |
+| `ade.sessions.delete` | remove a row outright; emits `terminalSessionChanged` with `reason: "deleted"` |
 | `ade.sessions.readTranscriptTail` | tail bytes of transcript (raw or ANSI-stripped) |
 | `ade.sessions.getDelta` | `SessionDeltaSummary` |
-| `ade.sessions.changed` (event) | fired on meta updates |
+| `ade.sessions.changed` (event) | fired on meta updates and deletions (`reason: "meta-updated" \| "deleted"`) |
+| `ade.agentChat.delete` | delete a chat session: disposes the runtime, resolves waiters, wipes persisted JSON + transcript, then calls `sessions.delete` |
 
 PTY:
 
@@ -237,9 +254,11 @@ Processes (managed):
 - Chat sessions backed by the Claude/Codex SDK still insert a
   `terminal_sessions` row but they are not attached to a PTY. Guard
   UI code with `isChatToolType(toolType)` before calling PTY-only APIs.
-- `reconcileStaleRunningSessions` now accepts `excludeToolTypes`. If
-  you add a new chat-style tool type, add it to the exclusion list in
-  `main.ts` or chat sessions will be force-disposed on every startup.
+- `reconcileStaleRunningSessions` accepts `excludeToolTypes` but the
+  main-process startup no longer excludes chat tool types — stale
+  `running` chat rows are swept to `disposed` like any other orphaned
+  row. If you need a row to survive reconciliation, the caller has to
+  pass `excludeToolTypes` explicitly.
 - `transcriptPath` may be blank for untracked sessions (tracked=false)
   and for processes that died before their PTY opened — always
   null-check before reading.
diff --git a/docs/features/terminals-and-sessions/pty-and-processes.md b/docs/features/terminals-and-sessions/pty-and-processes.md
index 9b122d8b7..06c6f37ee 100644
--- a/docs/features/terminals-and-sessions/pty-and-processes.md
+++ b/docs/features/terminals-and-sessions/pty-and-processes.md
@@ -70,10 +70,16 @@ downstream code always sees a normalized command even for old rows.
 - `readTranscriptTail(transcriptPath, maxBytes, opts)` — async file
   read, can align to a line boundary and optionally strip ANSI.
 - `reconcileStaleRunningSessions({ endedAt?, status?, excludeToolTypes? })`
-  — on-startup cleanup. Accepts `excludeToolTypes` so chat sessions
-  survive a restart and can be resumed via their SDK.
-- `onChanged(listener)` — in-process event bus, fired only from
-  `updateMeta` with reason `"meta-updated"`.
+  — on-startup cleanup. `excludeToolTypes` is still accepted but
+  `main.ts` no longer passes chat tool types; chat runtimes restart
+  fresh on app launch, so leaving stale `running` chat rows behind is
+  a net negative.
+- `deleteSession(sessionId)` — remove a row outright. Emits
+  `terminalSessionChanged` with `reason: "deleted"`. Used by both PTY
+  cleanup and `agentChatService.deleteSession`.
+- `onChanged(listener)` — in-process event bus, fires from
+  `updateMeta` (`reason: "meta-updated"`) and `deleteSession`
+  (`reason: "deleted"`).
 
 ### Notes