diff --git a/apps/desktop/src/renderer/components/app/AppShell.tsx b/apps/desktop/src/renderer/components/app/AppShell.tsx
index ae49627c2..cec81749a 100644
--- a/apps/desktop/src/renderer/components/app/AppShell.tsx
+++ b/apps/desktop/src/renderer/components/app/AppShell.tsx
@@ -406,8 +406,8 @@ export function AppShell({ children }: { children: React.ReactNode }) {
                 const laneId = aiFailure.laneId;
                 if (!laneId) return;
                 selectLane(laneId);
-                setLaneInspectorTab(laneId, "packs");
-                window.location.hash = `#/lanes?laneId=${encodeURIComponent(laneId)}&focus=single&inspectorTab=packs`;
+                setLaneInspectorTab(laneId, "context");
+                window.location.hash = `#/lanes?laneId=${encodeURIComponent(laneId)}&focus=single&inspectorTab=context`;
               }}
               title="Open lane packs"
             >
diff --git a/apps/desktop/src/renderer/components/history/HistoryPage.tsx b/apps/desktop/src/renderer/components/history/HistoryPage.tsx
index bdf6b14a4..b8d447f1f 100644
--- a/apps/desktop/src/renderer/components/history/HistoryPage.tsx
+++ b/apps/desktop/src/renderer/components/history/HistoryPage.tsx
@@ -334,10 +334,10 @@ export function HistoryPage() {
                 <Button
                   variant="outline"
                   size="sm"
-                  onClick={() => navigate(`/lanes?laneId=${encodeURIComponent(selected.laneId!)}&inspectorTab=packs`)}
-                  title="Open lane packs"
+                  onClick={() => navigate(`/lanes?laneId=${encodeURIComponent(selected.laneId!)}&inspectorTab=context`)}
+                  title="Open lane context"
                 >
-                  Open packs
+                  Open context
                 </Button>
               </div>
             ) : null}
diff --git a/apps/desktop/src/renderer/components/lanes/LaneInspectorPane.tsx b/apps/desktop/src/renderer/components/lanes/LaneInspectorPane.tsx
index a4856a727..4fbaba5f3 100644
--- a/apps/desktop/src/renderer/components/lanes/LaneInspectorPane.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LaneInspectorPane.tsx
@@ -6,26 +6,26 @@ import { LanePrPanel } from "../prs/LanePrPanel";
 import { LaneConflictsPanel } from "./LaneConflictsPanel";
 
 const tabTrigger =
-  "px-2.5 py-1.5 text-xs font-semibold rounded-lg text-muted-fg transition-colors data-[state=active]:text-fg data-[state=active]:bg-accent/10";
+  "px-3 py-1.5 text-xs font-semibold rounded-md cursor-pointer select-none text-muted-fg border border-transparent transition-all hover:text-fg hover:bg-white/5 data-[state=active]:text-fg data-[state=active]:bg-accent/15 data-[state=active]:border-border/30 data-[state=active]:shadow-sm";
 
 export function LaneInspectorPane({
   laneId,
   defaultTab
 }: {
   laneId: string | null;
-  defaultTab?: "packs" | "pr" | "conflicts";
+  defaultTab?: "context" | "pr" | "conflicts";
 }) {
-  const [tab, setTab] = useState<"packs" | "pr" | "conflicts">(defaultTab ?? "packs");
+  const [tab, setTab] = useState<"context" | "pr" | "conflicts">(defaultTab ?? "context");
 
   return (
     <Tabs.Root
       value={tab}
-      onValueChange={(v) => setTab(v as "packs" | "pr" | "conflicts")}
+      onValueChange={(v) => setTab(v as "context" | "pr" | "conflicts")}
       className="flex h-full flex-col"
     >
       <Tabs.List className="flex gap-1 border-b border-border/10 px-2 shrink-0">
-        <Tabs.Trigger className={cn(tabTrigger)} value="packs">
-          Packs
+        <Tabs.Trigger className={cn(tabTrigger)} value="context">
+          Context
         </Tabs.Trigger>
         <Tabs.Trigger className={cn(tabTrigger)} value="pr">
           PR
@@ -35,7 +35,7 @@ export function LaneInspectorPane({
         </Tabs.Trigger>
       </Tabs.List>
       <div className="flex-1 min-h-0 p-2">
-        <Tabs.Content value="packs" className="h-full overflow-auto">
+        <Tabs.Content value="context" className="h-full overflow-auto">
           <PackViewer laneId={laneId} />
         </Tabs.Content>
         <Tabs.Content value="pr" className="h-full overflow-auto">
diff --git a/apps/desktop/src/renderer/components/lanes/LaneTerminalsPanel.tsx b/apps/desktop/src/renderer/components/lanes/LaneTerminalsPanel.tsx
index 60507e742..8266a4b63 100644
--- a/apps/desktop/src/renderer/components/lanes/LaneTerminalsPanel.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LaneTerminalsPanel.tsx
@@ -506,7 +506,7 @@ export function LaneTerminalsPanel({ overrideLaneId }: { overrideLaneId?: string
 
       <Dialog.Root open={settingsOpen} onOpenChange={setSettingsOpen}>
         <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/40 backdrop-blur-sm" />
+          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/5 backdrop-blur-md" />
           <Dialog.Content className="fixed left-1/2 top-[12%] z-50 w-[min(880px,calc(100vw-24px))] -translate-x-1/2 rounded border border-border bg-card p-4 shadow-2xl focus:outline-none">
             <div className="mb-3 flex items-center justify-between gap-3">
               <Dialog.Title className="text-sm font-semibold">Terminal Settings</Dialog.Title>
diff --git a/apps/desktop/src/renderer/components/lanes/LanesPage.tsx b/apps/desktop/src/renderer/components/lanes/LanesPage.tsx
index b5805e556..3e00f31b2 100644
--- a/apps/desktop/src/renderer/components/lanes/LanesPage.tsx
+++ b/apps/desktop/src/renderer/components/lanes/LanesPage.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { useNavigate, useSearchParams } from "react-router-dom";
 import * as Dialog from "@radix-ui/react-dialog";
 import { Group, Panel } from "react-resizable-panels";
-import { Check, ChevronDown, FileCode2, GitBranch, Home, Layers3, Link2, Maximize2, Pin, Play, Plus, Search, Terminal, X } from "lucide-react";
+import { Check, ChevronDown, FileCode2, GitBranch, Home, Layers3, Link2, Maximize2, Pin, Plus, Search, Terminal, X } from "lucide-react";
 import { useAppStore } from "../../state/appStore";
 import { EmptyState } from "../ui/EmptyState";
 import { cn } from "../ui/cn";
@@ -95,16 +95,6 @@ function mergeUnique(...lists: string[][]): string[] {
   return out;
 }
 
-function toggleFilterToken(query: string, token: string): string {
-  const normalizedToken = token.toLowerCase().trim();
-  if (!normalizedToken.length) return query;
-  const tokens = query.trim().split(/\s+/).map((part) => part.toLowerCase()).filter(Boolean);
-  const next = new Set(tokens);
-  if (next.has(normalizedToken)) next.delete(normalizedToken);
-  else next.add(normalizedToken);
-  return Array.from(next).join(" ");
-}
-
 function matchesLaneFilterToken(lane: LaneSummary, isPinned: boolean, token: string): boolean {
   const normalized = token.trim().toLowerCase();
   if (!normalized.length) return true;
@@ -281,6 +271,9 @@ export function LanesPage() {
   const [branchCheckoutError, setBranchCheckoutError] = useState<string | null>(null);
   const branchDropdownRef = useRef<HTMLDivElement>(null);
 
+  const [addLaneDropdownOpen, setAddLaneDropdownOpen] = useState(false);
+  const addLaneDropdownRef = useRef<HTMLDivElement>(null);
+
   const [lanePaneDetails, setLanePaneDetails] = useState<Record<string, LanePaneDetailSelection>>({});
   const [laneContextMenu, setLaneContextMenu] = useState<{ laneId: string; x: number; y: number } | null>(null);
   const [expandedLaneId, setExpandedLaneId] = useState<string | null>(null);
@@ -344,6 +337,17 @@ export function LanesPage() {
     return () => document.removeEventListener("mousedown", handler);
   }, [branchDropdownOpen]);
 
+  useEffect(() => {
+    if (!addLaneDropdownOpen) return;
+    const handler = (e: MouseEvent) => {
+      if (addLaneDropdownRef.current && !addLaneDropdownRef.current.contains(e.target as Node)) {
+        setAddLaneDropdownOpen(false);
+      }
+    };
+    document.addEventListener("mousedown", handler);
+    return () => document.removeEventListener("mousedown", handler);
+  }, [addLaneDropdownOpen]);
+
   /* ---- Conflict loading ---- */
 
   const loadConflictStatuses = useCallback(async () => {
@@ -401,7 +405,7 @@ export function LanesPage() {
     const inspectorTab = params.get("inspectorTab");
     if (laneId) {
       selectLane(laneId);
-      if (inspectorTab === "terminals" || inspectorTab === "packs" || inspectorTab === "stack" || inspectorTab === "merge") {
+      if (inspectorTab === "terminals" || inspectorTab === "context" || inspectorTab === "stack" || inspectorTab === "merge") {
         setLaneInspectorTab(laneId, inspectorTab);
       }
       if (params.get("focus") === "single") {
@@ -552,10 +556,6 @@ export function LanesPage() {
 
   /* ---- Lane management actions ---- */
 
-  const activeFilterTokens = useMemo(() => {
-    return new Set(laneFilter.trim().toLowerCase().split(/\s+/).filter(Boolean));
-  }, [laneFilter]);
-
   const currentPrimaryBranch = useMemo(
     () => primaryBranches.find((branch) => branch.isCurrent)?.name ?? primaryLane?.branchRef ?? "",
     [primaryBranches, primaryLane?.branchRef]
@@ -927,93 +927,57 @@ export function LanesPage() {
               </button>
             ) : null}
           </div>
-          <Button
-            size="sm"
-            variant={activeFilterTokens.has("is:dirty") ? "primary" : "outline"}
-            className="h-7 px-2 text-[11px]"
-            onClick={() => setLaneFilter((prev) => toggleFilterToken(prev, "is:dirty"))}
-          >
-            dirty
-          </Button>
-          <Button
-            size="sm"
-            variant={activeFilterTokens.has("is:pinned") ? "primary" : "outline"}
-            className="h-7 px-2 text-[11px]"
-            onClick={() => setLaneFilter((prev) => toggleFilterToken(prev, "is:pinned"))}
-          >
-            pinned
-          </Button>
-          <Button
-            size="sm"
-            variant={activeFilterTokens.has("type:worktree") ? "primary" : "outline"}
-            className="h-7 px-2 text-[11px]"
-            onClick={() => setLaneFilter((prev) => toggleFilterToken(prev, "type:worktree"))}
-          >
-            worktree
-          </Button>
-          <Button
-            size="sm"
-            variant="outline"
-            className="h-7"
-            disabled={!canManageLane}
-            onClick={() => {
-              setLaneActionError(null);
-              setDeleteForce(false);
-              setDeleteMode("worktree");
-              setDeleteRemoteName("origin");
-              setDeleteConfirmText("");
-              setManageOpen(true);
-            }}
-            title={canManageLane ? `Manage ${managedLane?.name}` : "Select a non-primary lane to manage"}
-          >
-            Manage lane
-          </Button>
-
-          <div className="h-4 w-px bg-border/20" />
-
-          <Button size="sm" variant="outline" className="h-7 px-2 text-[11px]" disabled={!canCreateLane} onClick={() => {
-            setCreateLaneName("");
-            setCreateParentLaneId("");
-            setCreateAsChild(false);
-            setCreateBaseBranch("");
-            const primary = lanes.find((l) => l.laneType === "primary");
-            if (primary) {
-              window.ade.git.listBranches({ laneId: primary.id })
-                .then((branches) => {
-                  setCreateBranches(branches);
-                  const current = branches.find((b) => b.isCurrent && !b.isRemote);
-                  if (current) setCreateBaseBranch(current.name);
-                })
-                .catch(() => {});
-            }
-            setCreateOpen(true);
-          }}>
-            <Plus className="h-3 w-3 mr-0.5" /> Lane
-          </Button>
-          <Button size="sm" variant="outline" className="h-7 px-2 text-[11px]" disabled={!canCreateLane} onClick={() => { setAttachName(""); setAttachPath(""); setAttachOpen(true); }}>
-            <Link2 className="h-3 w-3 mr-0.5" /> Attach
-          </Button>
-          <Button
-            size="sm"
-            variant="primary"
-            className="h-7 px-2 text-[11px]"
-            disabled={!selectedLaneId}
-            onClick={() => {
-              if (!selectedLaneId) return;
-              window.ade.pty
-                .create({ laneId: selectedLaneId, cols: 100, rows: 30, title: "Shell" })
-                .then(({ sessionId }) => {
-                  focusSession(sessionId);
-                  navigate(`/lanes?laneId=${encodeURIComponent(selectedLaneId)}&sessionId=${encodeURIComponent(sessionId)}`);
-                })
-                .catch(() => {});
-            }}
-          >
-            <Play className="h-3 w-3 mr-0.5" /> Terminal
-          </Button>
+          {/* Add Lane dropdown */}
+          <div className="relative" ref={addLaneDropdownRef}>
+            <Button size="sm" variant="outline" className="h-7 px-2 text-[11px]" disabled={!canCreateLane} onClick={() => setAddLaneDropdownOpen((prev) => !prev)}>
+              <Plus className="h-3 w-3 mr-0.5" /> Lane <ChevronDown className="h-3 w-3 ml-0.5 opacity-60" />
+            </Button>
+            {addLaneDropdownOpen ? (
+              <div className="absolute left-0 top-full z-50 mt-1 w-56 rounded-xl border border-border/60 bg-[--color-surface-overlay] py-1 shadow-float backdrop-blur-xl">
+                <button
+                  type="button"
+                  className="flex w-full items-center gap-2 px-3 py-1.5 text-left text-xs hover:bg-muted/50"
+                  onClick={() => {
+                    setAddLaneDropdownOpen(false);
+                    setCreateLaneName("");
+                    setCreateParentLaneId("");
+                    setCreateAsChild(false);
+                    setCreateBaseBranch("");
+                    const primary = lanes.find((l) => l.laneType === "primary");
+                    if (primary) {
+                      window.ade.git.listBranches({ laneId: primary.id })
+                        .then((branches) => {
+                          setCreateBranches(branches);
+                          const current = branches.find((b) => b.isCurrent && !b.isRemote);
+                          if (current) setCreateBaseBranch(current.name);
+                        })
+                        .catch(() => {});
+                    }
+                    setCreateOpen(true);
+                  }}
+                >
+                  <Plus className="h-3.5 w-3.5" />
+                  Create new lane
+                </button>
+                <button
+                  type="button"
+                  className="flex w-full items-center gap-2 px-3 py-1.5 text-left text-xs hover:bg-muted/50"
+                  onClick={() => {
+                    setAddLaneDropdownOpen(false);
+                    setAttachName("");
+                    setAttachPath("");
+                    setAttachOpen(true);
+                  }}
+                >
+                  <Link2 className="h-3.5 w-3.5" />
+                  Add existing worktree as lane
+                </button>
+              </div>
+            ) : null}
+          </div>
 
           <div className="ml-auto text-[11px] text-muted-fg">
-            {filteredLanes.length}/{sortedLanes.length} · shift-click split · j/k move · [ ] cycle · / filter
+            {filteredLanes.length}/{sortedLanes.length} · shift-click split
           </div>
         </div>
       </div>
@@ -1035,7 +999,7 @@ export function LanesPage() {
               key={lane.id}
               type="button"
               className={cn(
-                "inline-flex max-w-[320px] shrink-0 items-center gap-1 rounded-xl px-2 py-1 text-xs transition-colors",
+                "group inline-flex max-w-[320px] shrink-0 items-center gap-1 rounded-xl px-2 py-1 text-xs transition-colors",
                 isSelected
                   ? "bg-accent/20 text-fg shadow-card ring-1 ring-accent/40 font-semibold"
                   : isVisible
@@ -1055,9 +1019,7 @@ export function LanesPage() {
             >
               {isPrimary ? (
                 <Home className="h-3.5 w-3.5 text-emerald-700" />
-              ) : (
-                <Pin className={cn("h-3.5 w-3.5", isPinned ? "text-amber-700" : "text-muted-fg/60")} />
-              )}
+              ) : null}
               <span className={cn("h-2.5 w-2.5 rounded-full", conflictDotClass(conflictStatus?.status))} />
               <span className="truncate">{lane.name}</span>
               {isPrimary ? <span className="rounded-lg bg-emerald-500/15 px-1 text-[10px] text-emerald-700">{lane.branchRef}</span> : null}
@@ -1078,8 +1040,10 @@ export function LanesPage() {
               {!isPrimary ? (
                 <span
                   className={cn(
-                    "inline-flex h-4 w-4 items-center justify-center rounded-lg",
-                    isPinned ? "bg-amber-100 text-amber-800" : "text-muted-fg hover:text-fg"
+                    "inline-flex h-4 w-4 items-center justify-center rounded-lg transition-opacity",
+                    isPinned
+                      ? "bg-amber-100 text-amber-800 opacity-100"
+                      : "text-muted-fg hover:text-fg opacity-0 group-hover:opacity-100"
                   )}
                   onClick={(event) => {
                     event.stopPropagation();
@@ -1208,18 +1172,20 @@ export function LanesPage() {
 
       {/* Fullscreen lane overlay */}
       {expandedLaneId && lanesById.has(expandedLaneId) ? (
-        <div className="fixed inset-0 z-[80] bg-bg flex flex-col">
-          <div className="flex items-center justify-between gap-2 border-b border-border px-3 py-2 shrink-0">
-            <div className="flex items-center gap-2">
-              <span className="text-sm font-semibold">{lanesById.get(expandedLaneId)?.name}</span>
-              <span className="text-xs text-muted-fg">Fullscreen</span>
-            </div>
-            <Button variant="ghost" size="sm" onClick={() => setExpandedLaneId(null)} title="Exit fullscreen (Esc)">
+        <div className="fixed inset-0 z-[100] bg-bg flex flex-col">
+          <div className="absolute top-2 right-3 z-10">
+            <Button
+              variant="ghost"
+              size="sm"
+              className="rounded-xl bg-bg/80 backdrop-blur-sm shadow-card hover:bg-muted/60"
+              onClick={() => setExpandedLaneId(null)}
+              title="Exit fullscreen (Esc)"
+            >
               <X className="h-4 w-4" />
             </Button>
           </div>
           <PaneTilingLayout
-            layoutId={`lanes:tiling:v3:fullscreen:${expandedLaneId}`}
+            layoutId={`lanes:tiling:v3:${expandedLaneId}`}
             tree={LANES_TILING_TREE}
             panes={getPaneConfigs(expandedLaneId)}
             className="flex-1 min-h-0"
@@ -1248,6 +1214,19 @@ export function LanesPage() {
                 }}>Copy Path</button>
               </>
             ) : null}
+            {ctxLane && ctxLane.laneType !== "primary" ? (
+              <button className="block w-full rounded px-2 py-1 text-left text-xs hover:bg-muted/60" onClick={() => {
+                const ctxLaneId = laneContextMenu.laneId;
+                setLaneContextMenu(null);
+                selectLane(ctxLaneId);
+                setLaneActionError(null);
+                setDeleteForce(false);
+                setDeleteMode("worktree");
+                setDeleteRemoteName("origin");
+                setDeleteConfirmText("");
+                setManageOpen(true);
+              }}>Manage Lane</button>
+            ) : null}
           </div>
         );
       })() : null}
@@ -1255,7 +1234,7 @@ export function LanesPage() {
       {/* Manage Lane dialog */}
       <Dialog.Root open={manageOpen} onOpenChange={setManageOpen}>
         <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/40 backdrop-blur-sm" />
+          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/5 backdrop-blur-md" />
           <Dialog.Content className="fixed left-1/2 top-[14%] z-50 w-[min(720px,calc(100vw-24px))] -translate-x-1/2 rounded-2xl bg-card/95 backdrop-blur-xl p-4 shadow-float focus:outline-none">
             <div className="mb-4 flex items-center justify-between gap-3">
               <Dialog.Title className="text-lg font-semibold">Manage lane</Dialog.Title>
@@ -1326,7 +1305,7 @@ export function LanesPage() {
       {/* Create Lane dialog */}
       <Dialog.Root open={createOpen} onOpenChange={setCreateOpen}>
         <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/40 backdrop-blur-sm" />
+          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/5 backdrop-blur-md" />
           <Dialog.Content className="fixed left-1/2 top-[18%] z-50 w-[min(560px,calc(100vw-24px))] -translate-x-1/2 rounded-2xl bg-bg/95 backdrop-blur-xl p-3 shadow-float focus:outline-none">
             <div className="flex items-center justify-between gap-3">
               <Dialog.Title className="text-sm font-semibold">Create lane</Dialog.Title>
@@ -1437,7 +1416,7 @@ export function LanesPage() {
       {/* Attach Lane dialog */}
       <Dialog.Root open={attachOpen} onOpenChange={setAttachOpen}>
         <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/40 backdrop-blur-sm" />
+          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/5 backdrop-blur-md" />
           <Dialog.Content className="fixed left-1/2 top-[18%] z-50 w-[min(640px,calc(100vw-24px))] -translate-x-1/2 rounded-2xl bg-bg/95 backdrop-blur-xl p-3 shadow-float focus:outline-none">
             <div className="flex items-center justify-between gap-3">
               <Dialog.Title className="text-sm font-semibold">Attach lane</Dialog.Title>
diff --git a/apps/desktop/src/renderer/components/packs/PackViewer.tsx b/apps/desktop/src/renderer/components/packs/PackViewer.tsx
index b41e06f26..dc3e2df82 100644
--- a/apps/desktop/src/renderer/components/packs/PackViewer.tsx
+++ b/apps/desktop/src/renderer/components/packs/PackViewer.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
-import * as Dialog from "@radix-ui/react-dialog";
-import { RefreshCw, Sparkles } from "lucide-react";
-import type { HostedBootstrapConfig, HostedJobStatusResult, HostedStatus, PackEvent, PackSummary, PackVersionSummary } from "../../../shared/types";
+import { RefreshCw } from "lucide-react";
+import type { HostedBootstrapConfig, HostedJobStatusResult, HostedStatus, PackSummary } from "../../../shared/types";
 import { useAppStore } from "../../state/appStore";
 import { Button } from "../ui/Button";
 import { EmptyState } from "../ui/EmptyState";
@@ -41,52 +40,6 @@ function PackBody({ pack }: { pack: PackSummary | null }) {
   );
 }
 
-function formatPackEvent(ev: PackEvent): { title: string; detail: string; tone: "neutral" | "good" | "warn" | "bad" } {
-  const payload = ev.payload ?? {};
-  const trigger = typeof payload.trigger === "string" ? payload.trigger : typeof payload.reason === "string" ? payload.reason : null;
-  const providerMode = typeof payload.providerMode === "string" ? payload.providerMode : null;
-  const error = typeof payload.error === "string" ? payload.error : null;
-  const jobId = typeof payload.jobId === "string" ? (payload.jobId as string) : null;
-  const jobStatus = typeof payload.status === "string" ? (payload.status as string) : null;
-
-  if (ev.eventType === "refresh_triggered") {
-    return { title: "Pack refreshed", detail: trigger ? `trigger: ${trigger}` : "deterministic refresh", tone: "good" };
-  }
-  if (ev.eventType === "narrative_requested") {
-    return {
-      title: "AI update requested",
-      detail: `${providerMode ? `provider: ${providerMode}` : "provider: ?"}${jobId ? ` · job ${shortId(jobId)}` : ""}${jobStatus ? ` · ${jobStatus}` : ""}${trigger ? ` · trigger: ${trigger}` : ""}`,
-      tone: "neutral"
-    };
-  }
-  if (ev.eventType === "narrative_update") {
-    const provider = typeof payload.provider === "string" ? payload.provider : null;
-    const model = typeof payload.model === "string" ? payload.model : null;
-    const jobId = typeof payload.jobId === "string" ? payload.jobId : null;
-    const suffix = provider || model ? `${provider ?? "hosted"}${model ? ` · ${model}` : ""}` : jobId ? `job ${jobId}` : "updated";
-    if (provider === "mock") {
-      return {
-        title: "AI details updated (mock)",
-        detail: "Hosted backend is in mock mode. Configure the hosted LLM secret/env to enable Gemini Flash.",
-        tone: "warn"
-      };
-    }
-    return { title: "AI details updated", detail: suffix, tone: "good" };
-  }
-  if (ev.eventType === "narrative_failed") {
-    const suffix = `${jobId ? `job ${shortId(jobId)} · ` : ""}${error ?? "unknown error"}`;
-    return { title: "AI update failed", detail: suffix, tone: "bad" };
-  }
-  if (ev.eventType === "version_created") {
-    const vn = payload.versionNumber;
-    return { title: `Version saved${typeof vn === "number" ? ` (v${vn})` : ""}`, detail: "snapshot recorded", tone: "neutral" };
-  }
-  if (ev.eventType === "checkpoint") {
-    return { title: "Checkpoint recorded", detail: "session boundary captured", tone: "neutral" };
-  }
-  return { title: ev.eventType, detail: "", tone: "neutral" };
-}
-
 function hostedReadiness(
   status: HostedStatus | null,
   error: string | null,
@@ -117,6 +70,8 @@ function hostedReadiness(
   return null;
 }
 
+const AI_COOLDOWN_MS = 30_000;
+
 export function PackViewer({ laneId }: { laneId: string | null }) {
   const navigate = useNavigate();
   const providerMode = useAppStore((s) => s.providerMode);
@@ -126,7 +81,6 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
   const [projectPack, setProjectPack] = useState<PackSummary | null>(null);
 
   const [refreshBusy, setRefreshBusy] = useState(false);
-  const [aiBusy, setAiBusy] = useState(false);
   const [aiQueued, setAiQueued] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [aiError, setAiError] = useState<string | null>(null);
@@ -137,25 +91,13 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
 
   const [aiJob, setAiJob] = useState<AiJobState | null>(null);
 
-  const [versionsDialogOpen, setVersionsDialogOpen] = useState(false);
-  const [versionsLoading, setVersionsLoading] = useState(false);
-  const [versions, setVersions] = useState<PackVersionSummary[]>([]);
-  const [fromVersionId, setFromVersionId] = useState<string | null>(null);
-  const [toVersionId, setToVersionId] = useState<string | null>(null);
-  const [diffBusy, setDiffBusy] = useState(false);
-  const [diffText, setDiffText] = useState<string | null>(null);
-
-  const [eventsDialogOpen, setEventsDialogOpen] = useState(false);
-  const [eventsLoading, setEventsLoading] = useState(false);
-  const [events, setEvents] = useState<PackEvent[]>([]);
-
   const activePack = scope === "project" ? projectPack : lanePack;
-  const activePackKey = activePack?.packKey ?? null;
   const activeMeta = (activePack?.metadata ?? null) as Record<string, unknown> | null;
 
   const lanePackKey = laneId ? `lane:${laneId}` : null;
 
   const refreshTimers = useRef<{ lane?: number | null; project?: number | null }>({});
+  const lastAiTriggerRef = useRef<number>(0);
 
   const fetchLanePack = async () => {
     if (!laneId) return;
@@ -185,7 +127,7 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
     }, 120);
   };
 
-  const refreshDeterministic = async () => {
+  const refreshCombined = async () => {
     setRefreshBusy(true);
     setError(null);
     try {
@@ -196,8 +138,23 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
         if (!laneId) return;
         const pack = await window.ade.packs.refreshLanePack(laneId);
         setLanePack(pack);
-        // Manual lane refresh also refreshes project pack in main.
         await fetchProjectPack().catch(() => {});
+
+        // Rate-limited AI narrative
+        const now = Date.now();
+        if (providerMode !== "guest" && now - lastAiTriggerRef.current >= AI_COOLDOWN_MS) {
+          lastAiTriggerRef.current = now;
+          setAiQueued(true);
+          setAiError(null);
+          try {
+            const aiPack = await window.ade.packs.generateNarrative(laneId);
+            setLanePack(aiPack);
+          } catch (err) {
+            setAiError(err instanceof Error ? err.message : String(err));
+          } finally {
+            setAiQueued(false);
+          }
+        }
       }
     } catch (err) {
       setError(err instanceof Error ? err.message : String(err));
@@ -206,74 +163,6 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
     }
   };
 
-  const updateWithAi = async () => {
-    if (!laneId) return;
-    setAiBusy(true);
-    setAiQueued(true);
-    setAiError(null);
-    setError(null);
-    try {
-      const pack = await window.ade.packs.generateNarrative(laneId);
-      setLanePack(pack);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      setAiError(message);
-    } finally {
-      setAiBusy(false);
-      setAiQueued(false);
-    }
-  };
-
-  const openVersions = async () => {
-    if (!activePackKey) return;
-    setVersionsDialogOpen(true);
-    setVersionsLoading(true);
-    setDiffText(null);
-    setError(null);
-    try {
-      const list = await window.ade.packs.listVersions({ packKey: activePackKey, limit: 60 });
-      setVersions(list);
-      setFromVersionId(list[1]?.id ?? list[0]?.id ?? null);
-      setToVersionId(list[0]?.id ?? null);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err));
-      setVersions([]);
-    } finally {
-      setVersionsLoading(false);
-    }
-  };
-
-  const runDiff = async () => {
-    if (!fromVersionId || !toVersionId) return;
-    if (fromVersionId === toVersionId) return;
-    setDiffBusy(true);
-    setError(null);
-    try {
-      const out = await window.ade.packs.diffVersions({ fromId: fromVersionId, toId: toVersionId });
-      setDiffText(out.trim().length ? out : "(no diff)");
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err));
-    } finally {
-      setDiffBusy(false);
-    }
-  };
-
-  const openActivity = async () => {
-    if (!activePackKey) return;
-    setEventsDialogOpen(true);
-    setEventsLoading(true);
-    setError(null);
-    try {
-      const list = await window.ade.packs.listEvents({ packKey: activePackKey, limit: 120 });
-      setEvents(list);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err));
-      setEvents([]);
-    } finally {
-      setEventsLoading(false);
-    }
-  };
-
   useEffect(() => {
     setLanePack(null);
     setProjectPack(null);
@@ -404,9 +293,6 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
     if (providerMode === "hosted") {
       const ready = hostedReadiness(hostedStatus, hostedError, aiJob);
       if (ready) return ready;
-      if (aiBusy && !aiJob) {
-        return { tone: "neutral" as const, message: "Submitting job…" };
-      }
       if (aiJob?.jobId) {
         const elapsedSec = Math.max(0, Math.floor((Date.now() - aiJob.statusSinceMs) / 1000));
         if (aiJob.status === "queued") {
@@ -423,18 +309,18 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
         }
       }
       if (aiQueued) {
-        return { tone: "neutral" as const, message: "AI update queued… (this will update automatically after pack refresh)." };
+        return { tone: "neutral" as const, message: "AI update queued…" };
       }
-      return { tone: "neutral" as const, message: "AI details update automatically after pack refresh. Use the button to re-run on demand." };
+      return null;
     }
     if (providerMode === "byok") {
       if (aiQueued) {
-        return { tone: "neutral" as const, message: "AI update queued… (this will update automatically after pack refresh)." };
+        return { tone: "neutral" as const, message: "AI update queued…" };
       }
-      return { tone: "neutral" as const, message: "BYOK enabled. AI details update automatically after pack refresh (if configured). Use the button to re-run on demand." };
+      return null;
     }
     return null;
-  }, [scope, providerMode, hostedStatus, hostedError, aiQueued, aiJob, aiBusy]);
+  }, [scope, providerMode, hostedStatus, hostedError, aiQueued, aiJob]);
 
   const aiMetaHint = useMemo(() => {
     if (scope !== "lane") return null;
@@ -514,10 +400,10 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
     <div className="space-y-3">
       <div className="flex items-center justify-between gap-2">
         <div className="flex items-center gap-2">
-          <div className="flex items-center rounded-lg bg-muted/30 p-0.5">
+          <div className="flex items-center rounded-lg border border-border/40 bg-card/50 p-0.5">
             <button
               type="button"
-              className={cn(scopeTrigger, scope === "lane" ? "bg-muted text-fg shadow-sm" : "text-muted-fg hover:bg-muted/50 hover:text-fg")}
+              className={cn(scopeTrigger, scope === "lane" ? "bg-muted text-fg shadow-sm border border-accent/40" : "text-muted-fg hover:bg-muted/50 hover:text-fg border border-transparent")}
               onClick={() => setScope("lane")}
               title="Lane pack"
             >
@@ -525,7 +411,7 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
             </button>
             <button
               type="button"
-              className={cn(scopeTrigger, scope === "project" ? "bg-muted text-fg shadow-sm" : "text-muted-fg hover:bg-muted/50 hover:text-fg")}
+              className={cn(scopeTrigger, scope === "project" ? "bg-muted text-fg shadow-sm border border-accent/40" : "text-muted-fg hover:bg-muted/50 hover:text-fg border border-transparent")}
               onClick={() => setScope("project")}
               title="Project pack"
             >
@@ -536,29 +422,12 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
         </div>
 
         <div className="flex items-center gap-2">
-          <Button variant="ghost" size="sm" title="Refresh deterministic pack" onClick={() => refreshDeterministic().catch(() => {})}>
+          <Button variant="ghost" size="sm" title="Refresh pack (includes AI narrative)" onClick={() => refreshCombined().catch(() => {})} disabled={refreshBusy}>
             <RefreshCw className={cn("h-4 w-4", refreshBusy && "animate-spin")} />
             {refreshBusy ? "Refreshing" : "Refresh"}
           </Button>
-
-          {scope === "lane" ? (
-            <Button
-              variant="outline"
-              size="sm"
-              disabled={aiBusy || aiQueued || providerMode === "guest"}
-              title={providerMode === "guest" ? "Enable Hosted/BYOK to use AI details" : "Update pack details with AI"}
-              onClick={() => void updateWithAi()}
-            >
-              <Sparkles className={cn("h-4 w-4", (aiBusy || aiQueued) && "animate-pulse")} />
-              {aiBusy || aiQueued ? "Updating…" : "Update pack details with AI"}
-            </Button>
-          ) : null}
-
-          <Button variant="outline" size="sm" disabled={!activePackKey} onClick={() => void openActivity()}>
-            Activity
-          </Button>
-          <Button variant="outline" size="sm" disabled={!activePackKey} onClick={() => void openVersions()}>
-            Versions
+          <Button variant="outline" size="sm" onClick={() => navigate("/context")}>
+            Open Context Tab
           </Button>
         </div>
       </div>
@@ -657,145 +526,6 @@ export function PackViewer({ laneId }: { laneId: string | null }) {
 
       <PackBody pack={activePack} />
       {activePack?.path ? <div className="truncate text-[11px] text-muted-fg">{activePack.path}</div> : null}
-
-      <Dialog.Root open={versionsDialogOpen} onOpenChange={(open) => setVersionsDialogOpen(open)}>
-        <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/40 backdrop-blur-sm" />
-          <Dialog.Content className="fixed left-1/2 top-[8%] z-50 w-[min(980px,calc(100vw-24px))] -translate-x-1/2 rounded-2xl bg-card/95 p-4 shadow-float backdrop-blur-xl focus:outline-none">
-            <div className="mb-3 flex items-center justify-between gap-2">
-              <Dialog.Title className="text-sm font-semibold">Pack Versions</Dialog.Title>
-              <Dialog.Close asChild>
-                <Button variant="ghost" size="sm">
-                  Close
-                </Button>
-              </Dialog.Close>
-            </div>
-            {versionsLoading ? (
-              <div className="rounded-lg bg-muted/20 p-3 text-xs text-muted-fg">Loading versions…</div>
-            ) : (
-              <div className="grid min-h-0 grid-cols-[320px_1fr] gap-3">
-                <div className="max-h-[65vh] overflow-auto rounded-lg bg-card/30 p-2">
-                  {versions.length === 0 ? (
-                    <div className="p-2 text-xs text-muted-fg">No versions recorded yet.</div>
-                  ) : (
-                    <div className="space-y-2">
-                      {versions.map((v) => (
-                        <div key={v.id} className="rounded-lg bg-muted/20 p-2 text-xs">
-                          <div className="flex items-center justify-between gap-2">
-                            <div className="font-semibold text-fg">v{v.versionNumber}</div>
-                            <div className="text-[11px] text-muted-fg">{new Date(v.createdAt).toLocaleString()}</div>
-                          </div>
-                          <div className="mt-1 text-[11px] text-muted-fg font-mono break-all">{v.contentHash.slice(0, 12)}</div>
-                          <div className="mt-2 grid grid-cols-2 gap-2">
-                            <label className="flex items-center gap-2 text-[11px] text-muted-fg">
-                              <input type="radio" name="fromVersion" checked={fromVersionId === v.id} onChange={() => setFromVersionId(v.id)} />
-                              from
-                            </label>
-                            <label className="flex items-center gap-2 text-[11px] text-muted-fg">
-                              <input type="radio" name="toVersion" checked={toVersionId === v.id} onChange={() => setToVersionId(v.id)} />
-                              to
-                            </label>
-                          </div>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
-                <div className="max-h-[65vh] overflow-auto rounded-lg bg-card/30 p-3">
-                  <div className="flex items-center justify-between gap-2">
-                    <div className="text-xs text-muted-fg">Diff</div>
-                    <Button
-                      size="sm"
-                      variant="outline"
-                      disabled={diffBusy || !fromVersionId || !toVersionId || fromVersionId === toVersionId}
-                      onClick={() => void runDiff()}
-                    >
-                      {diffBusy ? "Diffing…" : "Run Diff"}
-                    </Button>
-                  </div>
-                  {diffText ? (
-                    <pre className="mt-2 max-h-[52vh] overflow-auto whitespace-pre-wrap rounded-lg bg-muted/20 p-2 text-[11px] leading-relaxed text-fg">
-                      {diffText}
-                    </pre>
-                  ) : (
-                    <div className="mt-2 text-xs text-muted-fg">Select two versions and run diff.</div>
-                  )}
-                </div>
-              </div>
-            )}
-          </Dialog.Content>
-        </Dialog.Portal>
-      </Dialog.Root>
-
-      <Dialog.Root open={eventsDialogOpen} onOpenChange={(open) => setEventsDialogOpen(open)}>
-        <Dialog.Portal>
-          <Dialog.Overlay className="fixed inset-0 z-50 bg-black/40 backdrop-blur-sm" />
-          <Dialog.Content className="fixed left-1/2 top-[8%] z-50 w-[min(980px,calc(100vw-24px))] -translate-x-1/2 rounded-2xl bg-card/95 p-4 shadow-float backdrop-blur-xl focus:outline-none">
-            <div className="mb-3 flex items-center justify-between gap-2">
-              <Dialog.Title className="text-sm font-semibold">Activity</Dialog.Title>
-              <Dialog.Close asChild>
-                <Button variant="ghost" size="sm">
-                  Close
-                </Button>
-              </Dialog.Close>
-            </div>
-            {eventsLoading ? (
-              <div className="rounded-lg bg-muted/20 p-3 text-xs text-muted-fg">Loading activity…</div>
-            ) : events.length === 0 ? (
-              <div className="rounded-lg bg-muted/20 p-3 text-xs text-muted-fg">No activity recorded yet.</div>
-            ) : (
-              <div className="max-h-[70vh] overflow-auto rounded-lg bg-card/30">
-                <div className="divide-y divide-border/10">
-                  {events.map((ev) => {
-                    const formatted = formatPackEvent(ev);
-                    const opId = typeof ev.payload?.operationId === "string" ? (ev.payload.operationId as string) : null;
-                    return (
-                      <div key={ev.id} className="px-3 py-2 text-xs">
-                        <div className="flex items-start justify-between gap-2">
-                          <div className="min-w-0">
-                            <div
-                              className={cn(
-                                "font-semibold",
-                                formatted.tone === "bad"
-                                  ? "text-red-200"
-                                  : formatted.tone === "warn"
-                                    ? "text-amber-200"
-                                    : formatted.tone === "good"
-                                      ? "text-emerald-200"
-                                      : "text-fg"
-                              )}
-                            >
-                              {formatted.title}
-                            </div>
-                            {formatted.detail ? <div className="mt-0.5 text-[11px] text-muted-fg">{formatted.detail}</div> : null}
-                          </div>
-                          <div className="shrink-0 text-right text-[11px] text-muted-fg">
-                            <div>{new Date(ev.createdAt).toLocaleString()}</div>
-                            {opId ? (
-                              <Button
-                                variant="ghost"
-                                size="sm"
-                                className="mt-1 h-6 px-2 text-[11px]"
-                                onClick={() => {
-                                  setEventsDialogOpen(false);
-                                  navigate(`/history?operationId=${encodeURIComponent(opId)}`);
-                                }}
-                                title="View operation in History"
-                              >
-                                View operation
-                              </Button>
-                            ) : null}
-                          </div>
-                        </div>
-                      </div>
-                    );
-                  })}
-                </div>
-              </div>
-            )}
-          </Dialog.Content>
-        </Dialog.Portal>
-      </Dialog.Root>
     </div>
   );
 }
diff --git a/apps/desktop/src/renderer/components/prs/LanePrPanel.tsx b/apps/desktop/src/renderer/components/prs/LanePrPanel.tsx
index 8554c0d7e..e4892a669 100644
--- a/apps/desktop/src/renderer/components/prs/LanePrPanel.tsx
+++ b/apps/desktop/src/renderer/components/prs/LanePrPanel.tsx
@@ -417,6 +417,9 @@ export function LanePrPanel({ laneId }: { laneId: string | null }) {
             <Button size="sm" variant="outline" className="h-7" onClick={() => void window.ade.prs.openInGitHub(pr.id)}>
               Open in GitHub
             </Button>
+            <Button size="sm" variant="outline" className="h-7" onClick={() => navigate("/prs")}>
+              Open PRs Tab
+            </Button>
           </div>
           <div className="flex gap-2">
             <Button size="sm" variant="outline" className="h-7" onClick={() => void updateDescription()} disabled={loading}>
diff --git a/apps/desktop/src/renderer/components/terminals/TerminalView.tsx b/apps/desktop/src/renderer/components/terminals/TerminalView.tsx
index 446d6716f..9ed3ec55e 100644
--- a/apps/desktop/src/renderer/components/terminals/TerminalView.tsx
+++ b/apps/desktop/src/renderer/components/terminals/TerminalView.tsx
@@ -132,6 +132,8 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
       return true;
     };
 
+    let hasFittedOnce = false;
+
     const doFit = () => {
       if (cancelled) return;
       if (!ensureOpen()) return;
@@ -145,11 +147,18 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
       }
       const next = { cols: term.cols, rows: term.rows };
       if (!Number.isFinite(next.cols) || !Number.isFinite(next.rows) || next.cols <= 0 || next.rows <= 0) return;
+      hasFittedOnce = true;
       const prev = lastDimsRef.current;
       if (!prev || prev.cols !== next.cols || prev.rows !== next.rows) {
         lastDimsRef.current = next;
         window.ade.pty.resize({ ptyId, cols: next.cols, rows: next.rows }).catch(() => {});
       }
+      // Force xterm to redraw all visible rows to prevent stale/garbled content.
+      try {
+        term.refresh(0, term.rows - 1);
+      } catch {
+        // Ignore if terminal was disposed.
+      }
     };
 
     const scheduleFit = () => {
@@ -161,25 +170,44 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
       });
     };
 
-    // Allow layout to settle before first fit (helps in StrictMode/dev + tab switching).
+    // Allow layout to settle before first fit. Use staggered delays to
+    // handle complex layouts (PaneTilingLayout, route transitions) that
+    // may not have final dimensions on the first animation frame.
+    let settleTimer1: ReturnType<typeof setTimeout> | null = null;
+    let settleTimer2: ReturnType<typeof setTimeout> | null = null;
     initialRafId = requestAnimationFrame(() => {
       initialRafId = null;
-      scheduleFit();
+      requestAnimationFrame(() => {
+        doFit();
+        // Additional delayed fits to catch late layout settling after route changes.
+        settleTimer1 = setTimeout(() => { settleTimer1 = null; doFit(); }, 120);
+        settleTimer2 = setTimeout(() => { settleTimer2 = null; doFit(); }, 350);
+      });
     });
 
-    // Try to hydrate recent output so switching tabs doesn't feel like losing context.
-    window.ade.sessions
-      .readTranscriptTail({ sessionId, maxBytes: 80_000 })
-      .then((text) => {
-        if (cancelled) return;
-        if (!text.trim().length) return;
-        try {
-          term.write(text);
-        } catch {
-          // Ignore writes after disposal/unmount.
-        }
-      })
-      .catch(() => {});
+    // Hydrate recent output AFTER initial fit so text wraps to correct column width.
+    // We wait until the first successful fit (hasFittedOnce) before writing, retrying
+    // briefly if layout hasn't settled yet.
+    const hydrateTranscript = () => {
+      window.ade.sessions
+        .readTranscriptTail({ sessionId, maxBytes: 80_000 })
+        .then((text) => {
+          if (cancelled) return;
+          if (!text.trim().length) return;
+          try {
+            term.write(text);
+            // Redraw after hydration to ensure correct rendering.
+            requestAnimationFrame(() => {
+              try { term.refresh(0, term.rows - 1); } catch { /* ignore */ }
+            });
+          } catch {
+            // Ignore writes after disposal/unmount.
+          }
+        })
+        .catch(() => {});
+    };
+    // Wait a short moment for the initial fit to complete before hydrating.
+    const hydrateTimer = setTimeout(() => { if (!cancelled) hydrateTranscript(); }, 180);
 
     const dataSub = term.onData((data) => {
       if (cancelled) return;
@@ -191,8 +219,10 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
       const mod = isMac ? ev.metaKey : ev.ctrlKey;
       const key = ev.key.toLowerCase();
 
+      if (ev.type !== "keydown") return true;
+
       // Cmd+V: handle paste
-      if (mod && key === "v" && ev.type === "keydown") {
+      if (mod && key === "v") {
         navigator.clipboard
           .readText()
           .then((text) => {
@@ -204,7 +234,7 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
       }
 
       // Cmd+C: copy if selection exists, otherwise let xterm handle (SIGINT)
-      if (mod && key === "c" && ev.type === "keydown") {
+      if (mod && key === "c") {
         const selection = term.getSelection();
         if (selection) {
           navigator.clipboard.writeText(selection).catch(() => {});
@@ -214,6 +244,27 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
         return true;
       }
 
+      // Shift+Enter: send newline (same as Enter)
+      if (ev.shiftKey && ev.key === "Enter") {
+        ev.preventDefault();
+        window.ade.pty.write({ ptyId, data: "\r" }).catch(() => {});
+        return false;
+      }
+
+      // Option+Backspace (Mac): delete previous word
+      if (isMac && ev.altKey && ev.key === "Backspace") {
+        ev.preventDefault();
+        window.ade.pty.write({ ptyId, data: "\x1b\x7f" }).catch(() => {});
+        return false;
+      }
+
+      // Cmd+Backspace (Mac): delete to beginning of line
+      if (isMac && ev.metaKey && ev.key === "Backspace") {
+        ev.preventDefault();
+        window.ade.pty.write({ ptyId, data: "\x15" }).catch(() => {});
+        return false;
+      }
+
       // Let ALL other keys pass through to xterm
       return true;
     });
@@ -242,32 +293,62 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
 
     const intObs = new IntersectionObserver((entries) => {
       for (const entry of entries) {
-        if (entry.isIntersecting) scheduleFit();
+        if (entry.isIntersecting) {
+          // Double-RAF to let layout fully settle before refitting.
+          requestAnimationFrame(() => {
+            requestAnimationFrame(() => { doFit(); });
+          });
+        }
       }
     });
     intObs.observe(el);
 
-    // Watch for visibility changes via CSS class toggling (invisible/pointer-events-none)
+    // Re-fit when app regains focus or document becomes visible again
+    // (handles navigating away from the tab and coming back).
+    const onVisibilityChange = () => {
+      if (cancelled || document.hidden) return;
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => { doFit(); });
+      });
+    };
+    const onWindowFocus = () => {
+      if (cancelled) return;
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => { doFit(); });
+      });
+    };
+    document.addEventListener("visibilitychange", onVisibilityChange);
+    window.addEventListener("focus", onWindowFocus);
+
+    // Watch for visibility changes via CSS class toggling (invisible/pointer-events-none).
+    // Walk up to 4 ancestor levels to catch visibility toggling at any wrapper level
+    // (e.g. PaneTilingLayout panels, tab content wrappers, route containers).
     const mutObs = new MutationObserver(() => {
       if (cancelled) return;
-      // Check if our container is currently visible
-      const parentEl = el.parentElement;
-      if (!parentEl) return;
-      const isHidden = parentEl.classList.contains('invisible');
-      if (!isHidden && el.isConnected && el.clientWidth > 0 && el.clientHeight > 0) {
-        // Terminal just became visible - schedule a double-RAF fit
+      // Check if our container is currently visible (no ancestor has 'invisible')
+      let ancestor: HTMLElement | null = el.parentElement;
+      while (ancestor) {
+        if (ancestor.classList.contains('invisible')) return; // still hidden
+        ancestor = ancestor.parentElement;
+        // Only walk a few levels to avoid perf cost
+        if (ancestor && ancestor === document.body) break;
+      }
+      if (el.isConnected && el.clientWidth > 0 && el.clientHeight > 0) {
+        // Terminal just became visible - schedule a staggered fit
         requestAnimationFrame(() => {
-          requestAnimationFrame(() => {
-            doFit();
-          });
+          requestAnimationFrame(() => { doFit(); });
         });
       }
     });
 
-    // Observe the parent element for class changes
-    const parentEl = el.parentElement;
-    if (parentEl) {
-      mutObs.observe(parentEl, { attributes: true, attributeFilter: ['class'] });
+    // Observe up to 4 ancestor elements for class changes to catch visibility toggling
+    // at any wrapper level in the component hierarchy.
+    const observedAncestors: HTMLElement[] = [];
+    let ancestor: HTMLElement | null = el.parentElement;
+    for (let depth = 0; depth < 4 && ancestor; depth++) {
+      observedAncestors.push(ancestor);
+      mutObs.observe(ancestor, { attributes: true, attributeFilter: ['class', 'style'] });
+      ancestor = ancestor.parentElement;
     }
 
     termRef.current = term;
@@ -276,40 +357,20 @@ export function TerminalView({ ptyId, sessionId, className }: { ptyId: string; s
 
     return () => {
       cancelled = true;
-      if (initialRafId != null) {
-        cancelAnimationFrame(initialRafId);
-      }
-      if (fitRafId != null) {
-        cancelAnimationFrame(fitRafId);
-      }
-      try {
-        unsubData();
-        unsubExit();
-      } catch {
-        // ignore
-      }
-      try {
-        dataSub.dispose();
-      } catch {
-        // ignore
-      }
-      try {
-        obs.disconnect();
-      } catch {
-        // ignore
-      }
-      try {
-        intObs.disconnect();
-      } catch {
-        // ignore
-      }
+      if (initialRafId != null) cancelAnimationFrame(initialRafId);
+      if (fitRafId != null) cancelAnimationFrame(fitRafId);
+      if (settleTimer1 != null) clearTimeout(settleTimer1);
+      if (settleTimer2 != null) clearTimeout(settleTimer2);
+      clearTimeout(hydrateTimer);
+      document.removeEventListener("visibilitychange", onVisibilityChange);
+      window.removeEventListener("focus", onWindowFocus);
+      try { unsubData(); unsubExit(); } catch { /* ignore */ }
+      try { dataSub.dispose(); } catch { /* ignore */ }
+      try { obs.disconnect(); } catch { /* ignore */ }
+      try { intObs.disconnect(); } catch { /* ignore */ }
       try { mutObs.disconnect(); } catch { /* ignore */ }
       cancelViewportRaf(term);
-      try {
-        term.dispose();
-      } catch {
-        // ignore
-      }
+      try { term.dispose(); } catch { /* ignore */ }
       termRef.current = null;
       fitRef.current = null;
       resizeObsRef.current = null;
diff --git a/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx b/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx
index 38f7dee05..0155b2438 100644
--- a/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx
+++ b/apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx
@@ -455,11 +455,11 @@ export function TerminalsPage() {
                     size="sm"
                     onClick={() => {
                       selectLane(selectedSession.laneId);
-                      navigate(`/lanes?laneId=${encodeURIComponent(selectedSession.laneId)}&inspectorTab=packs`);
+                      navigate(`/lanes?laneId=${encodeURIComponent(selectedSession.laneId)}&inspectorTab=context`);
                     }}
-                    title="Open lane pack"
+                    title="Open lane context"
                   >
-                    Packs
+                    Context
                   </Button>
                 </div>
               </div>
diff --git a/apps/desktop/src/renderer/state/appStore.ts b/apps/desktop/src/renderer/state/appStore.ts
index 869f5a449..8ebaf5a0f 100644
--- a/apps/desktop/src/renderer/state/appStore.ts
+++ b/apps/desktop/src/renderer/state/appStore.ts
@@ -49,7 +49,7 @@ type AppState = {
   switchProjectToPath: (rootPath: string) => Promise<void>;
 };
 
-export type LaneInspectorTab = "terminals" | "packs" | "stack" | "merge";
+export type LaneInspectorTab = "terminals" | "context" | "stack" | "merge";
 
 export const useAppStore = create<AppState>((set, get) => ({
   project: null,