From 144b83b39e034b3250bf3e9ffa6a86c306679364 Mon Sep 17 00:00:00 2001
From: LHagfoss <lucas@paral.no>
Date: Sun, 15 Nov 2026 10:19:58 +0100
Subject: [PATCH 1/4] feat(desktop): trim settings text and put row status
 beside its action

---
 apps/desktop/src/acp/mock.ts              | 56 +++++++++++++++++++
 apps/desktop/src/ui/DiagnosticsPage.tsx   | 17 +++---
 apps/desktop/src/ui/MachinesPage.test.tsx |  7 ++-
 apps/desktop/src/ui/MachinesPage.tsx      | 66 +++++++++++++----------
 apps/desktop/src/ui/Settings.tsx          | 36 ++++++-------
 apps/desktop/src/ui/ThreadMirrorGroup.tsx | 48 +++++++++--------
 apps/desktop/src/ui/settingsIndex.ts      |  9 +---
 apps/desktop/src/ui/settingsKit.tsx       | 15 +++---
 8 files changed, 159 insertions(+), 95 deletions(-)

diff --git a/apps/desktop/src/acp/mock.ts b/apps/desktop/src/acp/mock.ts
index 5d67d4227..283c18b09 100644
--- a/apps/desktop/src/acp/mock.ts
+++ b/apps/desktop/src/acp/mock.ts
@@ -7016,6 +7016,8 @@ export class MockTransport implements Transport {
     if (command === "link_meta") return mockLinkMeta(String(args.url));
     if (command === "server_status") return this.serverStatus();
     if (command === "system_info") return MOCK_SYSTEM_INFO;
+    // Settings › About › System setup: a finished install, one step not needed.
+    if (command === "system_setup_status" || command === "system_setup_run") return MOCK_SYSTEM_SETUP;
     if (command === "resolve_binaries")
       return (args.names as string[]).map((name) =>
         ["codex", "claude-agent-acp", "gemini", "opencode"].includes(name)
@@ -7238,3 +7240,57 @@ function mockGit(threads: readonly { worktree?: MockWorktree }[], path: string):
   mockGitStates.set(path, state);
   return state;
 }
+
+/** Settings › About › System setup in the mock: the macOS steps of a finished install. */
+const MOCK_SYSTEM_SETUP = [
+  {
+    id: "quarantine",
+    title: "Clear the download quarantine flag",
+    about:
+      "macOS marks a downloaded app as quarantined, which can make its command line prompt or fail the first time. This clears the flag on RustCode.",
+    auto: true,
+    status: "done",
+    message: "No quarantine flag on RustCode.",
+    lastRun: "2026-11-14T09:00:00Z",
+  },
+  {
+    id: "signature",
+    title: "Keep one signature across updates",
+    about:
+      "Releases are signed ad hoc, so macOS sees every update as a new app and asks again for Keychain access and Background Items. A local certificate gives updates one identity.",
+    auto: true,
+    status: "done",
+    message: "RustCode has a signature that stays the same across updates.",
+    lastRun: "2026-11-14T09:00:00Z",
+  },
+  {
+    id: "cli-link",
+    title: "Put `rustcode` on your PATH",
+    about:
+      "Links `rustcode` into ~/.local/bin when no copy is on your PATH, so a terminal runs the same version as the app.",
+    auto: true,
+    status: "done",
+    message: "`rustcode` is at /Users/lars/.cargo/bin/rustcode.",
+    lastRun: "2026-11-14T09:00:00Z",
+  },
+  {
+    id: "shell-path",
+    title: "Check ~/.local/bin is on your shell's PATH",
+    about:
+      "Reads your login shell's PATH. RustCode never edits your shell profile; when the folder is missing it shows the line to add.",
+    auto: true,
+    status: "skipped",
+    message: "`rustcode` is not linked into ~/.local/bin, so there is nothing to add.",
+    lastRun: "2026-11-14T09:00:00Z",
+  },
+  {
+    id: "background-server",
+    title: "Run the RustCode server in the background",
+    about:
+      "Installs the server as a LaunchAgent, systemd user unit or logon task, so paired machines reach this computer with the app closed. See Machines.",
+    auto: false,
+    status: "done",
+    message: "The server starts when you log in.",
+    lastRun: "2026-11-14T09:00:00Z",
+  },
+];
diff --git a/apps/desktop/src/ui/DiagnosticsPage.tsx b/apps/desktop/src/ui/DiagnosticsPage.tsx
index 1f794d429..9a4a542b6 100644
--- a/apps/desktop/src/ui/DiagnosticsPage.tsx
+++ b/apps/desktop/src/ui/DiagnosticsPage.tsx
@@ -247,17 +247,19 @@ export function DiagnosticsPage() {
     <>
       <Group
         title="Debug report"
-        footer="Tokens, API keys, email addresses and your home folder are taken out. Read it before you post it."
         hint={`The server, the system, the harnesses, the last ${REPORT_LOG_LINES} server log lines and recent events, as Markdown.`}
       >
-        <Row title="Copy debug report" subtitle="This page in one block, to paste into a GitHub issue.">
+        <Row
+          title="For a GitHub issue"
+          subtitle="Secrets, emails and your home folder are taken out. Read it before you post."
+        >
           <Action onClick={() => void saveReport()}>
             <Download size={13} />
             Save…
           </Action>
           <Action prominent onClick={() => void copyReport()}>
             <Copy size={13} />
-            Copy debug report
+            Copy report
           </Action>
         </Row>
       </Group>
@@ -270,8 +272,8 @@ export function DiagnosticsPage() {
               {SERVER_STATE_LABEL[state]}
             </>
           }
-          subtitle="Runs every thread. The app starts it again when it crashes."
-          status={detail ?? TRANSPORT_LABEL[transport ?? ""]}
+          hint="Runs every thread. The app starts it again when it crashes."
+          subtitle={detail ?? TRANSPORT_LABEL[transport ?? ""]}
         >
           {shell && (
             <Action
@@ -345,7 +347,7 @@ export function DiagnosticsPage() {
         />
       </Group>
 
-      <Group title="Harnesses" footer="What Settings › Harnesses last detected, found on this app's PATH.">
+      <Group title="Harnesses" hint="What Settings › Harnesses last detected, found on this app's PATH.">
         {harnesses.length ? (
           harnesses.map((h) => (
             <div key={h.id}>
@@ -423,8 +425,7 @@ function ServerLog() {
   return (
     <Group
       title="Server log"
-      footer={`The server's stderr since the app started (the last ${SERVER_LOG_LINES} lines).`}
-      hint="Each thread also logs its turns to its own logs/debug.log. Copy and Save keep only the lines shown, with secrets and your home folder taken out."
+      hint={`The server's stderr since the app started (the last ${SERVER_LOG_LINES} lines). Each thread also logs its turns to its own logs/debug.log. Copy and Save keep only the lines shown, with secrets and your home folder taken out.`}
     >
       <div className={cx("flex flex-wrap items-center gap-2", rowInset)}>
         <Select
diff --git a/apps/desktop/src/ui/MachinesPage.test.tsx b/apps/desktop/src/ui/MachinesPage.test.tsx
index 7ce3037d3..160248843 100644
--- a/apps/desktop/src/ui/MachinesPage.test.tsx
+++ b/apps/desktop/src/ui/MachinesPage.test.tsx
@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import { Tooltip } from "radix-ui";
 import { renderToStaticMarkup } from "react-dom/server";
 import type { Machine } from "../state/machines";
 import { MachineRow } from "./MachinesPage";
@@ -22,7 +23,11 @@ const MACHINE: Machine = {
 };
 
 function render(machine: Machine): string {
-  return renderToStaticMarkup(<MachineRow machine={machine} count={2} now={Date.now()} local="1.29.1" />);
+  return renderToStaticMarkup(
+    <Tooltip.Provider>
+      <MachineRow machine={machine} count={2} now={Date.now()} local="1.29.1" />
+    </Tooltip.Provider>,
+  );
 }
 
 describe("an environment row", () => {
diff --git a/apps/desktop/src/ui/MachinesPage.tsx b/apps/desktop/src/ui/MachinesPage.tsx
index ca7e97ccb..b980017f7 100644
--- a/apps/desktop/src/ui/MachinesPage.tsx
+++ b/apps/desktop/src/ui/MachinesPage.tsx
@@ -52,6 +52,7 @@ import {
   setMachineIcon,
   threadCount,
   threadLabel,
+  updateAdvice,
   useLocalIdentity,
   useMachines,
   versionSkew,
@@ -131,8 +132,7 @@ export function MachinesPage() {
             Add environment
           </Action>
         }
-        footer="Choose where a thread runs under Run on when you start it."
-        hint="A LAN route is authenticated but not encrypted; Tailscale and VPN tunnels encrypt what they carry. Removing an environment forgets its pairing here; it keeps listing this computer until you revoke it there."
+        hint="Choose where a thread runs under Run on when you start it. A LAN route is authenticated but not encrypted; Tailscale and VPN tunnels encrypt what they carry. Removing an environment forgets its pairing here; it keeps listing this computer until you revoke it there."
       >
         <ThisComputer />
         {machines.map((machine) => (
@@ -191,6 +191,11 @@ function ThisComputer() {
         </>
       }
       subtitle={`Local server · ${open === 1 ? "1 thread" : `${open} threads`}`}
+      hint={
+        server?.gateway.remoteEnabled || server?.gateway.running
+          ? `Gateway: ${gatewayLine(server.gateway, server.installed)}`
+          : undefined
+      }
       status={
         <>
           <span className="tabular">Server: {serverLine(server)}</span>
@@ -202,8 +207,10 @@ function ThisComputer() {
           ) : null}
           {/* The gateway with the app closed: the server keeps it running, the
               app's own threads still end with the app (docs/remote.md). */}
-          {server?.gateway.remoteEnabled || server?.gateway.running ? (
-            <span className="block pt-0.5">Gateway: {gatewayLine(server.gateway, server.installed)}</span>
+          {server?.gateway.running ? (
+            <span className="tabular"> · Gateway on {server.gateway.address ?? "an unknown address"}</span>
+          ) : server?.gateway.remoteEnabled ? (
+            <span> · Gateway not running</span>
           ) : null}
           {server?.problems.map((problem) => (
             <span key={problem.code} className="block pt-0.5 text-warning">
@@ -318,8 +325,13 @@ export function MachineRow({
 }) {
   const platform = platformName(machine.platform);
   const threads = threadLabel(count);
-  const skew = versionSkew(machine.version, local, machine.platform);
   const outdated = environmentOutdated(machine.version, local);
+  // The facts already carry its version: the line says only what updates it.
+  const skew = outdated
+    ? `Update it there: ${updateAdvice(machine.platform ?? "")}`
+    : versionSkew(machine.version, local, machine.platform)
+      ? "Newer than this app: update RustCode here"
+      : null;
   const hint = machine.hint;
   const name = machineName(machine);
   const status = environmentStatus(machine);
@@ -339,42 +351,40 @@ export function MachineRow({
       stacked
       title={
         <>
-          <span
-            aria-hidden
-            data-status={status.kind}
-            className={`size-2 shrink-0 rounded-full ${
-              status.kind === "online"
-                ? "bg-success"
-                : status.kind === "attention"
-                  ? "bg-warning"
-                  : status.kind === "connecting"
-                    ? "animate-pulse bg-fg-muted"
-                    : "bg-fg-faint"
-            }`}
-          />
           <DeviceGlyphIcon glyph={machineGlyph(machine)} tint={machineTint(machine)} size={16} />
           {name}
           {outdated && <Chip tone="warn">Outdated</Chip>}
         </>
       }
+      hint={direction}
       subtitle={
         <>
-          <span className="block">{direction}</span>
-          {/* Online: where it is and how it travels. Otherwise what is wrong, then the route it tries. */}
-          <span className="selectable block">
-            {connected ? environmentRoute(machine) : machineLine(machine)}
-          </span>
-          {!connected && environmentAddress(machine) && (
+          {/* Online: where it is and how it travels. Otherwise what is wrong, cut to one line
+              (all of it on hover and when selected), then the route it tries. */}
+          {connected ? (
             <span className="selectable block">{environmentRoute(machine)}</span>
+          ) : (
+            <>
+              <span className="selectable block truncate" title={machineLine(machine)}>
+                {machineLine(machine)}
+              </span>
+              {environmentAddress(machine) && (
+                <span className="selectable block">{environmentRoute(machine)}</span>
+              )}
+            </>
           )}
-          {/* Who is older, and what updates it: the Mac Studio on 0.96 against a 1.28 app. */}
-          {skew && <span className="mt-1 block text-warning">{skew}</span>}
+          {/* What updates it, when it runs another version than this app. */}
+          {skew && <span className="block text-warning">{skew}</span>}
           {/* PR 3402's words for a route that does not answer while another does. */}
-          {hint && <span className="mt-1 block">{hint}</span>}
+          {hint && <span className="block">{hint}</span>}
         </>
       }
       status={facts.join(" · ")}
-      badge={<Chip tone={status.tone}>{status.label}</Chip>}
+      badge={
+        <span data-status={status.kind}>
+          <Chip tone={status.tone}>{status.label}</Chip>
+        </span>
+      }
     >
       {recovery === "pair" ? (
         <PairAgainAction machine={machine} />
diff --git a/apps/desktop/src/ui/Settings.tsx b/apps/desktop/src/ui/Settings.tsx
index 188e91374..546fbd82f 100644
--- a/apps/desktop/src/ui/Settings.tsx
+++ b/apps/desktop/src/ui/Settings.tsx
@@ -1559,7 +1559,7 @@ function RecordRequestBodiesGroup() {
   return (
     <Group
       title="Record request bodies"
-      footer="Redacted, clipped and dropped after 7 days. Off, only timing and status are kept."
+      hint="Redacted, clipped and dropped after 7 days. Off, only timing and status are kept."
     >
       <Row
         title="Provider requests (built-in harness)"
@@ -1608,17 +1608,9 @@ function AdvancedPage() {
   return (
     <>
       <RecordRequestBodiesGroup />
-      <Group title="Server status and logs" footer="The server's process, log and a debug report.">
-        <Row title="Diagnostics" subtitle="Moved to its own page.">
-          <Action onClick={() => openSettings("diagnostics")}>Open Diagnostics</Action>
-        </Row>
-      </Group>
       <Group title="Setup">
-        <Row
-          title="Set up your agents again"
-          subtitle="Find each harness, sign it in and check that it runs."
-        >
-          <Action onClick={() => setOnboarding(true)}>Run setup again</Action>
+        <Row title="Agent setup" subtitle="Find each harness, sign it in and check that it runs.">
+          <Action onClick={() => setOnboarding(true)}>Run setup</Action>
         </Row>
       </Group>
     </>
@@ -1628,7 +1620,7 @@ function AdvancedPage() {
 function AboutPage() {
   return (
     <>
-      <Group title="Version" footer="RustCode is open source; its licences ship in each release.">
+      <Group title="Version" hint="RustCode is open source; its licences ship in each release.">
         <AppVersion />
         <UpdateChannelRow />
         <AutoInstallRow />
@@ -1668,9 +1660,8 @@ function SystemSetupGroup() {
   return (
     <Group
       title="System setup"
-      footer={
-        error ?? "Runs after an install or an update. RustCode never asks for an administrator silently."
-      }
+      hint="Runs after an install or an update. RustCode never asks for an administrator silently."
+      footer={error ?? undefined}
       action={
         <Action disabled={running !== null} onClick={() => void run()}>
           {running === "all" ? <Spinner size={12} /> : null}
@@ -1688,8 +1679,8 @@ function SystemSetupGroup() {
             <Row
               key={step.id}
               title={step.title}
-              subtitle={step.about}
-              status={step.message}
+              subtitle={step.message}
+              hint={step.about}
               badge={<Chip tone={chip.tone}>{chip.label}</Chip>}
             >
               {command && (
@@ -1701,10 +1692,13 @@ function SystemSetupGroup() {
                   Copy command
                 </Action>
               )}
-              <Action disabled={running !== null} onClick={() => void run(step.id)}>
-                {running === step.id ? <Spinner size={12} /> : null}
-                {step.auto ? "Run again" : step.status === "done" ? "Check again" : "Set up"}
-              </Action>
+              {/* A step that stands needs no button of its own: the section's Run again checks it. */}
+              {(step.status === "pending" || step.status === "failed" || running === step.id) && (
+                <Action disabled={running !== null} onClick={() => void run(step.id)}>
+                  {running === step.id ? <Spinner size={12} /> : null}
+                  {step.status === "failed" ? "Try again" : "Set up"}
+                </Action>
+              )}
             </Row>
           );
         })
diff --git a/apps/desktop/src/ui/ThreadMirrorGroup.tsx b/apps/desktop/src/ui/ThreadMirrorGroup.tsx
index 81afe295c..8227145db 100644
--- a/apps/desktop/src/ui/ThreadMirrorGroup.tsx
+++ b/apps/desktop/src/ui/ThreadMirrorGroup.tsx
@@ -53,12 +53,12 @@ export function ThreadMirrorGroup() {
   return (
     <Group
       title="Thread copies"
-      footer="The environment that runs a thread stays its owner. A copy is read-only and never deleted when the original is."
+      hint="The environment that runs a thread stays its owner. A copy is read-only and never deleted when the original is."
     >
       <Row
         title="Keep a copy of other environments' threads"
-        subtitle="Their threads stay readable here when they are offline, wiped or removed."
-        status={loaded ? mirrorLine(status) : "Reading…"}
+        subtitle={loaded ? mirrorLine(status) : "Reading…"}
+        hint="Their threads stay readable here when they are offline, wiped or removed."
       >
         <Switch
           label="Keep a copy of other environments' threads"
@@ -66,26 +66,28 @@ export function ThreadMirrorGroup() {
           onChange={(enabled) => apply({ enabled })}
         />
       </Row>
-      <Row
-        title="Projects left out"
-        subtitle="One folder per line. Threads in these folders, or inside them, are not copied."
-        stacked
-      >
-        <textarea
-          aria-label="Projects left out of the copy"
-          className={`${fieldClass} h-20 w-full resize-y py-2 font-mono`}
-          placeholder="/Users/me/code/private"
-          value={projects}
-          disabled={!loaded || !status}
-          onChange={(event) => setProjects(event.target.value)}
-          onBlur={() => {
-            const next = parseProjects(projects);
-            if (JSON.stringify(next) !== JSON.stringify(status?.excludedProjects ?? [])) {
-              apply({ excludedProjects: next });
-            }
-          }}
-        />
-      </Row>
+      {status?.enabled !== false && (
+        <Row
+          title="Projects left out"
+          subtitle="One folder per line; threads in or under these are not copied."
+          stacked
+        >
+          <textarea
+            aria-label="Projects left out of the copy"
+            className={`${fieldClass} h-16 w-full resize-y py-2 font-mono`}
+            placeholder="/Users/me/code/private"
+            value={projects}
+            disabled={!loaded || !status}
+            onChange={(event) => setProjects(event.target.value)}
+            onBlur={() => {
+              const next = parseProjects(projects);
+              if (JSON.stringify(next) !== JSON.stringify(status?.excludedProjects ?? [])) {
+                apply({ excludedProjects: next });
+              }
+            }}
+          />
+        </Row>
+      )}
     </Group>
   );
 }
diff --git a/apps/desktop/src/ui/settingsIndex.ts b/apps/desktop/src/ui/settingsIndex.ts
index 5bc3f2ede..aef4f4730 100644
--- a/apps/desktop/src/ui/settingsIndex.ts
+++ b/apps/desktop/src/ui/settingsIndex.ts
@@ -457,13 +457,8 @@ export const SETTINGS_INDEX: SettingEntry[] = [
   },
   {
     section: "advanced",
-    title: "Set up your agents again",
-    keywords: "setup onboarding install sign in harness start over",
-  },
-  {
-    section: "advanced",
-    title: "Server status and logs",
-    keywords: "engine server diagnostics debug",
+    title: "Agent setup",
+    keywords: "setup onboarding install sign in harness start over run again",
   },
 
   // ------------------------------------------------------------ Diagnostics
diff --git a/apps/desktop/src/ui/settingsKit.tsx b/apps/desktop/src/ui/settingsKit.tsx
index 0d54c6591..75b05b3fa 100644
--- a/apps/desktop/src/ui/settingsKit.tsx
+++ b/apps/desktop/src/ui/settingsKit.tsx
@@ -262,9 +262,9 @@ export function Row({
   /** A live value shown under the description (a path, why a control is off). */
   status?: ReactNode;
   /**
-   * A row's short state at its top right (a `Chip`): the same place on every
-   * row, whether or not the row has controls under its text. A row with
-   * controls keeps them in their own row below.
+   * A row's short state (a `Chip`), just before its controls on the same line, so a
+   * state and the action that changes it read together. A stacked row keeps it at its
+   * top right, level with the title, and its controls in their own line below.
    */
   badge?: ReactNode;
   children?: ReactNode;
@@ -288,7 +288,7 @@ export function Row({
       className={cx("@container group/row relative", className)}
       data-setting={typeof title === "string" ? title : undefined}
     >
-      {badge && <div className="absolute end-4 top-3 flex items-center gap-2">{badge}</div>}
+      {badge && stacked && <div className="absolute end-4 top-3 flex items-center gap-2">{badge}</div>}
       <div
         className={cx(
           "flex min-h-12 flex-col gap-3",
@@ -299,7 +299,7 @@ export function Row({
         <div
           className={cx(
             "min-w-0 flex-1",
-            badge ? "pr-24" : undefined,
+            badge && stacked ? "pr-24" : undefined,
             reset && (stacked ? "pr-7" : "@max-[34rem]:pr-7"),
           )}
         >
@@ -314,8 +314,9 @@ export function Row({
           )}
           {status && <div className="pt-0.5 text-caption text-fg-muted">{status}</div>}
         </div>
-        {(children || reset) && (
-          <div className="flex shrink-0 items-center gap-2">
+        {(children || reset || (badge && !stacked)) && (
+          <div className="flex shrink-0 flex-wrap items-center gap-2">
+            {badge && !stacked && <div className="flex items-center gap-2">{badge}</div>}
             {/* Stacked, the reset leaves the flow for the row's top right: the control then
                 starts at the same left edge as every other stacked control. */}
             {reset && (

From 29720cf0d2b7fb4e2a106ba32e6455194fda40bb Mon Sep 17 00:00:00 2001
From: LHagfoss <lucas@paral.no>
Date: Sun, 15 Nov 2026 10:27:36 +0100
Subject: [PATCH 2/4] feat(desktop): name settings buttons by what they do and
 fold explanations into hints

---
 apps/desktop/src/ui/ChatBackgroundGroup.tsx |  2 +-
 apps/desktop/src/ui/DiagnosticsPage.tsx     |  4 +--
 apps/desktop/src/ui/LimitFallback.tsx       |  2 +-
 apps/desktop/src/ui/MachineSettingsPage.tsx |  4 +--
 apps/desktop/src/ui/NewThreadWidgets.tsx    |  2 +-
 apps/desktop/src/ui/OutsideAgentsPage.tsx   | 18 ++++++++-----
 apps/desktop/src/ui/PermissionsPage.tsx     |  4 +--
 apps/desktop/src/ui/ProjectGenerators.tsx   |  2 +-
 apps/desktop/src/ui/RemoteAccessPage.tsx    | 30 ++++++++++++---------
 apps/desktop/src/ui/Settings.tsx            | 10 +++----
 apps/desktop/src/ui/SettingsScope.tsx       | 22 +++++++++------
 apps/desktop/src/ui/ShortcutSettings.tsx    |  2 +-
 apps/desktop/src/ui/StatisticsPage.tsx      |  4 +--
 apps/desktop/src/ui/VoiceGroup.tsx          |  2 +-
 14 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/apps/desktop/src/ui/ChatBackgroundGroup.tsx b/apps/desktop/src/ui/ChatBackgroundGroup.tsx
index 9dbc1be7c..ea6f0bdf2 100644
--- a/apps/desktop/src/ui/ChatBackgroundGroup.tsx
+++ b/apps/desktop/src/ui/ChatBackgroundGroup.tsx
@@ -66,7 +66,7 @@ export function ChatBackgroundGroup() {
       >
         <div className="flex shrink-0 items-center gap-2">
           {banner.name && <Action onClick={() => void removeBanner()}>Remove</Action>}
-          <Action onClick={choose}>{banner.name ? "Change…" : "Choose image…"}</Action>
+          <Action onClick={choose}>{banner.name ? "Change image" : "Choose image"}</Action>
         </div>
       </Row>
       {banner.name && (
diff --git a/apps/desktop/src/ui/DiagnosticsPage.tsx b/apps/desktop/src/ui/DiagnosticsPage.tsx
index 9a4a542b6..6fb455a7a 100644
--- a/apps/desktop/src/ui/DiagnosticsPage.tsx
+++ b/apps/desktop/src/ui/DiagnosticsPage.tsx
@@ -255,7 +255,7 @@ export function DiagnosticsPage() {
         >
           <Action onClick={() => void saveReport()}>
             <Download size={13} />
-            Save…
+            Save to file
           </Action>
           <Action prominent onClick={() => void copyReport()}>
             <Copy size={13} />
@@ -476,7 +476,7 @@ function ServerLog() {
           }
         >
           <Download size={13} />
-          Save…
+          Save to file
         </Action>
       </div>
       <pre
diff --git a/apps/desktop/src/ui/LimitFallback.tsx b/apps/desktop/src/ui/LimitFallback.tsx
index 88f7f81c7..5adbe6dcd 100644
--- a/apps/desktop/src/ui/LimitFallback.tsx
+++ b/apps/desktop/src/ui/LimitFallback.tsx
@@ -133,7 +133,7 @@ function RuleForm({
   const [busy, setBusy] = useState(false);
   const error = ruleError(rules, form, initial?.from);
   const options = (current: string) => [
-    { value: "", label: "Choose…" },
+    { value: "", label: "Choose a harness" },
     ...harnesses.map((h) => ({ value: h.id, label: h.name })),
     ...(current && !harnesses.some((h) => h.id === current) ? [{ value: current, label: current }] : []),
   ];
diff --git a/apps/desktop/src/ui/MachineSettingsPage.tsx b/apps/desktop/src/ui/MachineSettingsPage.tsx
index 670e788e3..b8950bac7 100644
--- a/apps/desktop/src/ui/MachineSettingsPage.tsx
+++ b/apps/desktop/src/ui/MachineSettingsPage.tsx
@@ -175,7 +175,7 @@ function Access({ machine }: { machine: Machine }) {
   return (
     <Group
       title={`Access · ${access.label}`}
-      footer="The two directions are separate pairings. Ending one leaves the other as it is."
+      hint="The two directions are separate pairings. Ending one leaves the other as it is."
     >
       <Row title="This computer reaches it" subtitle={access.outboundText}>
         <Chip tone={access.outbound ? "ok" : "bad"}>{access.outbound ? "Allowed" : "Ended"}</Chip>
@@ -204,7 +204,7 @@ function Routes({ machine }: { machine: Machine }) {
           {probing ? "Testing…" : "Test routes"}
         </Action>
       }
-      footer="Test routes opens a plain connection to each address, with no sign-in, and shows whether it answers and how fast. The app tries the LAN first and the VPN when the LAN does not answer."
+      hint="Test routes opens a plain connection to each address, with no sign-in, and shows whether it answers and how fast. The app tries the LAN first and the VPN when the LAN does not answer."
     >
       {machine.routes.length === 0 && (
         <Row title="No route saved" subtitle="Pair the machine again to add one." />
diff --git a/apps/desktop/src/ui/NewThreadWidgets.tsx b/apps/desktop/src/ui/NewThreadWidgets.tsx
index cc9d05320..0bfb72fc3 100644
--- a/apps/desktop/src/ui/NewThreadWidgets.tsx
+++ b/apps/desktop/src/ui/NewThreadWidgets.tsx
@@ -301,7 +301,7 @@ function PullsCard({ project }: { project: string }) {
         <div className="flex flex-1 flex-col gap-2">
           <Nothing>Connect GitHub to see this project's pull requests.</Nothing>
           <Pill quiet size="sm" className="self-start" onClick={() => openSettings("connections")}>
-            Connections…
+            Connect GitHub
           </Pill>
         </div>
       ) : pulls === undefined ? (
diff --git a/apps/desktop/src/ui/OutsideAgentsPage.tsx b/apps/desktop/src/ui/OutsideAgentsPage.tsx
index aaca9f36c..9cbb53fa2 100644
--- a/apps/desktop/src/ui/OutsideAgentsPage.tsx
+++ b/apps/desktop/src/ui/OutsideAgentsPage.tsx
@@ -60,9 +60,8 @@ export function OutsideAgentsPage() {
   return (
     <>
       <p className="mb-5 max-w-[70ch] px-4 text-callout text-fg-muted">
-        Let another app use RustCode's threads: read them, start work, or message a thread. Each app gets a
-        token of its own with an access level you choose, and you can change or revoke it here at any time.
-        The token is only for RustCode's tools on this computer; it opens nothing else.
+        Let another app read, start or message RustCode threads. Each app gets its own token, only for
+        RustCode on this computer, and you can revoke it here.
       </p>
       {!status.available && (
         <Group title="Not available here">
@@ -100,7 +99,7 @@ export function OutsideAgentsPage() {
       )}
       <Group
         title="Connected apps"
-        footer="Read-only apps never ask. Above that, each change is put to you here first unless you turn that off for the app."
+        hint="Read-only apps never ask. Above that, each change is put to you here first unless you turn that off for the app."
       >
         {status.grants.length === 0 ? (
           <Row
@@ -119,7 +118,7 @@ export function OutsideAgentsPage() {
       />
       <Group
         title="Recent activity"
-        footer="Who called which tool and how it ended. Arguments and answers are not kept."
+        hint="Who called which tool and how it ended. Arguments and answers are not kept."
       >
         {status.recent.length === 0 ? (
           <Row title="Nothing yet" subtitle="Calls from connected apps appear here." />
@@ -225,7 +224,7 @@ function ConnectGroup({
   return (
     <Group
       title="Connect an app"
-      footer="Pick the app and what it may do. RustCode makes a token and the config to paste into that app; the token is shown once."
+      hint="Pick the app and what it may do. RustCode makes a token and the config to paste into that app; the token is shown once."
     >
       <Row title="App" subtitle="Which app will connect.">
         <Select
@@ -261,7 +260,12 @@ function ConnectGroup({
           <Switch label="Ask before changes" checked={ask} onChange={setAsk} />
         </Row>
       )}
-      <Row title="Connect" subtitle={full ? "The most apps are connected; revoke one first." : undefined}>
+      <Row
+        title="Create its token and config"
+        subtitle={
+          full ? "The most apps are connected; revoke one first." : "Shown once, to paste into that app."
+        }
+      >
         <Action prominent disabled={disabled || full || busy} onClick={() => void connect()}>
           <Plug size={14} />
           {busy ? "Connecting…" : "Connect app"}
diff --git a/apps/desktop/src/ui/PermissionsPage.tsx b/apps/desktop/src/ui/PermissionsPage.tsx
index 92755fdb4..b02d93897 100644
--- a/apps/desktop/src/ui/PermissionsPage.tsx
+++ b/apps/desktop/src/ui/PermissionsPage.tsx
@@ -54,7 +54,7 @@ export function PermissionsPage() {
       <RememberedGroup />
       <Group
         title="Still asks at Full access"
-        footer="Nothing else asks a Full-access thread. The card of each of these says why it appears."
+        hint="Nothing else asks a Full-access thread. The card of each of these says why it appears."
       >
         {ALWAYS_ASKS.map((item) => (
           <Row key={item.title} title={item.title} subtitle={item.why} />
@@ -230,7 +230,7 @@ function RememberedGroup() {
             className="text-accent hover:underline"
             onClick={() => openSettings("orchestration")}
           >
-            “Let delegates use my named accounts without asking” in Orchestration…
+            “Let delegates use my named accounts without asking” in Orchestration
           </button>
         </>
       }
diff --git a/apps/desktop/src/ui/ProjectGenerators.tsx b/apps/desktop/src/ui/ProjectGenerators.tsx
index 3372bda80..35bc4a018 100644
--- a/apps/desktop/src/ui/ProjectGenerators.tsx
+++ b/apps/desktop/src/ui/ProjectGenerators.tsx
@@ -114,7 +114,7 @@ export function ProjectGenerators({ project }: { project: { name: string; path:
   return (
     <Group
       title={`Text generation and voice in ${project.name}`}
-      footer="Fields left on the machine's value follow this machine's Text generation and Voice."
+      hint="Fields left on the machine's value follow this machine's Text generation and Voice."
     >
       <Row title="Text generator" subtitle="Writes titles, git drafts and dictation cleanup in this project.">
         <ScopedValue mixed={false} breakdown={[]} project={rowState("text-generator", "id")}>
diff --git a/apps/desktop/src/ui/RemoteAccessPage.tsx b/apps/desktop/src/ui/RemoteAccessPage.tsx
index 151780354..e1df5762b 100644
--- a/apps/desktop/src/ui/RemoteAccessPage.tsx
+++ b/apps/desktop/src/ui/RemoteAccessPage.tsx
@@ -178,11 +178,12 @@ export function RemoteAccessPage() {
 
       <Group
         title="Remote access"
-        footer="Shared with the RustCode app on your phone through the remote gateway (docs/remote.md). Plain LAN traffic is authenticated but not encrypted: use NetBird away from a trusted network."
+        hint="Shared with the RustCode app on your phone through the remote gateway (docs/remote.md). Plain LAN traffic is authenticated but not encrypted: use NetBird away from a trusted network."
       >
         <Row
           title="Network access"
-          subtitle="Starts the gateway and lets paired devices reach every thread on this computer, across all projects, not only the ones open here. Turning it off stops remote access for this computer, including a share a terminal started; paired devices stay paired."
+          subtitle="Let paired devices reach every thread on this computer."
+          hint="Starts the gateway, across all projects, not only the ones open here. Off stops remote access for this computer, including a share a terminal started; paired devices stay paired."
           status={status}
         >
           <Switch
@@ -194,12 +195,13 @@ export function RemoteAccessPage() {
         </Row>
         <Row
           title="RustCode server"
-          subtitle="Installs the RustCode server as a background service: it stays up when the app closes, and starts when you log in. It runs the remote gateway, so paired devices still reach this computer with the app closed. Threads that live in it keep running; the threads this app starts still run in its own engine and end with it, until RustCode uses the server. Turning network access on installs it when it is not installed."
+          subtitle="Keeps this computer reachable with the app closed. Starts when you log in."
+          hint="A background service that runs the remote gateway. Threads that live in it keep running; the threads this app starts still run in its own engine and end with it. Turning network access on installs it when it is not installed."
           status={
             <>
-              <span className="tabular">{serverLine(server)}</span>
+              {server && !server.installed ? <span className="tabular">{serverLine(server)}</span> : null}
               {server?.gateway.remoteEnabled || server?.gateway.running ? (
-                <span className="block pt-0.5">Gateway: {gatewayLine(server.gateway, server.installed)}</span>
+                <span className="block">Gateway: {gatewayLine(server.gateway, server.installed)}</span>
               ) : null}
               {server?.problems.map((problem) => (
                 <span key={problem.code} className="block pt-0.5 text-warning">
@@ -220,7 +222,8 @@ export function RemoteAccessPage() {
         </Row>
         <Row
           title="Gateway address"
-          subtitle="The address a phone on this network dials. The terminal's `/remote status` shows the same one."
+          subtitle="What a phone on this network dials."
+          hint="The terminal's `/remote status` shows the same address."
           status={
             gateway?.advertisedAddress ? (
               <span>
@@ -251,7 +254,8 @@ export function RemoteAccessPage() {
         </Row>
         <Row
           title="Pair a device"
-          subtitle={`Shows a QR code and an eight-digit code for the phone's Scan QR. The code lasts two minutes and works once; a new one replaces it. ${WRONG_CODES_ALLOWED} wrong codes are allowed.`}
+          subtitle="A phone or another computer scans the QR code or types the eight-digit code."
+          hint={`The code lasts two minutes and works once; a new one replaces it. ${WRONG_CODES_ALLOWED} wrong codes are allowed.`}
           status={
             unavailable
               ? "Remote access needs the remote gateway, which this host does not build."
@@ -264,7 +268,7 @@ export function RemoteAccessPage() {
         >
           <Action prominent disabled={unavailable || busy !== null} onClick={pair}>
             {busy === "pair" ? <Spinner /> : <Smartphone size={13} />}
-            Pair a device
+            Show pairing code
           </Action>
         </Row>
       </Group>
@@ -309,7 +313,7 @@ export function RemoteAccessPage() {
 
       <Group
         title={`Paired devices · ${devices.length}`}
-        footer="A pairing stays until you revoke it here, so a device does not have to pair again. Revoke disconnects it at once."
+        hint="A pairing stays until you revoke it here, so a device does not have to pair again. Revoke disconnects it at once."
       >
         {devices.length ? (
           devices.map((device) => (
@@ -317,7 +321,7 @@ export function RemoteAccessPage() {
               key={device.id}
               title={device.name}
               subtitle={`${deviceLabel(device.kind, device.platform)} · ${lastSeenLabel(device, now)}`}
-              status={connectionDirection(
+              hint={connectionDirection(
                 peerOutbound(device.hostId, machines),
                 device.connected === true,
                 device.name,
@@ -340,14 +344,14 @@ export function RemoteAccessPage() {
         ) : (
           <Row
             title="No devices paired yet"
-            subtitle="A phone or another computer's RustCode app appears here once it scans the QR code, enters the eight-digit code, or asks to connect and you accept."
+            subtitle="Scan the QR code or enter the eight-digit code on your phone to pair it."
           />
         )}
       </Group>
 
       <Group
         title="Routes"
-        footer="Your phone tries these addresses in order and keeps using the first that answers. It learns them here, so pairing once is enough to reconnect on another network. Plain LAN traffic is authenticated but not encrypted: prefer the VPN or host name away from a trusted network."
+        hint="Your phone tries these addresses in order and keeps using the first that answers. It learns them here, so pairing once is enough to reconnect on another network. Plain LAN traffic is authenticated but not encrypted: prefer the VPN or host name away from a trusted network."
       >
         {gateway?.routes && gateway.routes.length > 0 ? (
           gateway.routes.map((route) => (
@@ -410,7 +414,7 @@ export function RefusedConnectionsGroup({ refused }: { refused: RemoteRefusedCon
   return (
     <Group
       title="Refused connections"
-      footer="A device that could not get in is listed here for a quarter of an hour after it stopped trying. Nothing was shared with it: no thread, no prompt and no code was accepted."
+      hint="A device that could not get in is listed here for a quarter of an hour after it stopped trying. Nothing was shared with it: no thread, no prompt and no code was accepted."
     >
       {refused.map((entry) => {
         const copy = refusalCopy(entry);
diff --git a/apps/desktop/src/ui/Settings.tsx b/apps/desktop/src/ui/Settings.tsx
index 546fbd82f..6c6cc92ef 100644
--- a/apps/desktop/src/ui/Settings.tsx
+++ b/apps/desktop/src/ui/Settings.tsx
@@ -331,18 +331,18 @@ function GeneralPage() {
           status={defaultCwd || "None chosen"}
         >
           <Action onClick={() => void pickFolder(defaultCwd).then((p) => p && setDefaultCwd(p))}>
-            Choose…
+            {defaultCwd ? "Change folder" : "Choose folder"}
           </Action>
         </Row>
         <Row title="Harness, model and effort" subtitle="Which harness runs a new thread by default.">
-          <Action onClick={() => openSettings("agents")}>Harnesses…</Action>
+          <Action onClick={() => openSettings("agents")}>Open Harnesses</Action>
         </Row>
         <Row
           title="Access"
           subtitle="What threads may do without asking, by default and per project."
           status={permissionLabel(defaultAccess.value ?? SETTINGS_DEFAULTS.defaultPermissionMode)}
         >
-          <Action onClick={() => openSettings("permissions")}>Permissions…</Action>
+          <Action onClick={() => openSettings("permissions")}>Open Permissions</Action>
         </Row>
       </Group>
       <Group title="Threads">
@@ -679,7 +679,7 @@ function AgentsPage() {
               </Chip>
             ) : undefined
           }
-          footer="A thread can still switch harness and model from the composer."
+          hint="A thread can still switch harness and model from the composer."
         >
           {scoped.project && (
             <div className="px-4 pb-2">
@@ -1351,7 +1351,7 @@ function AppearancePage() {
               </Action>
             )}
             <Action quiet size="sm" onClick={() => setCreating(!creating)} aria-expanded={creating}>
-              <Plus size={12} /> New theme…
+              <Plus size={12} /> New theme
             </Action>
           </div>
         }
diff --git a/apps/desktop/src/ui/SettingsScope.tsx b/apps/desktop/src/ui/SettingsScope.tsx
index 83ee880b7..ca6a5e70f 100644
--- a/apps/desktop/src/ui/SettingsScope.tsx
+++ b/apps/desktop/src/ui/SettingsScope.tsx
@@ -18,7 +18,7 @@ import {
   useScopeProjects,
 } from "../state/settingsScope";
 import { Tooltip } from "./primitives";
-import { Action, Select } from "./settingsKit";
+import { Action, HintTip, Select } from "./settingsKit";
 
 const THIS = "this";
 const ALL = "all";
@@ -64,14 +64,20 @@ export function SettingsScopeBar({ machineOnly = false }: { machineOnly?: boolea
     <div className="mb-6 flex flex-col gap-2 rounded-xl bg-surface px-4 py-3">
       <div className="flex flex-wrap items-center gap-3">
         <div className="min-w-0 flex-1">
-          <div className="font-medium text-body text-fg">{machineOnly ? "Showing" : "Applying to"}</div>
-          <div className="max-w-[70ch] text-callout text-fg-muted">
-            {machineOnly
-              ? "These settings belong to the machine you pick."
-              : project
-                ? `Rows a project can set change for ${project.name} only. The rest apply to every project.`
-                : "Server settings change on the machine you pick. App preferences stay here."}
+          <div className="flex items-center gap-1.5 font-medium text-body text-fg">
+            {machineOnly ? "Showing" : "Applying to"}
+            <HintTip label={machineOnly ? "Showing" : "Applying to"}>
+              {machineOnly
+                ? "These settings belong to the machine you pick."
+                : "Server settings change on the machine you pick. App preferences stay on this computer. A project changes only the rows a project can set; the rest apply to every project."}
+            </HintTip>
           </div>
+          {/* Only a picked project changes what a row means, so only then is there a line to read. */}
+          {!machineOnly && project && (
+            <div className="max-w-[70ch] text-callout text-fg-muted">
+              Project rows change for {project.name} only.
+            </div>
+          )}
         </div>
         {!machineOnly && (
           <Select
diff --git a/apps/desktop/src/ui/ShortcutSettings.tsx b/apps/desktop/src/ui/ShortcutSettings.tsx
index 71d2178b9..3d198414e 100644
--- a/apps/desktop/src/ui/ShortcutSettings.tsx
+++ b/apps/desktop/src/ui/ShortcutSettings.tsx
@@ -91,7 +91,7 @@ export function ShortcutsPage() {
           />
         ))}
       </Group>
-      <Group title="While typing" footer="The message box and approvals keep these; they cannot be changed.">
+      <Group title="While typing" hint="The message box and approvals keep these; they cannot be changed.">
         {APP_COMMANDS.filter((command) => !command.remappable).map((command) => (
           <Row key={command.id} title={command.label}>
             <Kbd>{commandHint(command.binding, command)}</Kbd>
diff --git a/apps/desktop/src/ui/StatisticsPage.tsx b/apps/desktop/src/ui/StatisticsPage.tsx
index 932a64699..a08ca1d0b 100644
--- a/apps/desktop/src/ui/StatisticsPage.tsx
+++ b/apps/desktop/src/ui/StatisticsPage.tsx
@@ -744,10 +744,10 @@ function PlanLimits({ names }: { names: Map<string, string> }) {
       title="Usage limits"
       action={
         <Action quiet size="sm" onClick={() => openSettings("usage")}>
-          Usage…
+          Open Usage
         </Action>
       }
-      footer="Read from each subscription's own sign-in, as in Settings › Usage."
+      hint="Read from each subscription's own sign-in, as in Settings › Usage."
     >
       <div className="flex flex-col gap-4 px-4 py-4">
         {plans.map((plan) => {
diff --git a/apps/desktop/src/ui/VoiceGroup.tsx b/apps/desktop/src/ui/VoiceGroup.tsx
index 6170e5ca0..3e90f6888 100644
--- a/apps/desktop/src/ui/VoiceGroup.tsx
+++ b/apps/desktop/src/ui/VoiceGroup.tsx
@@ -64,7 +64,7 @@ export function VoiceGroup() {
           title={generators === null ? "Looking for a transcription provider…" : "No transcription provider"}
           subtitle="Add an OpenAI or custom OpenAI-compatible generator under Text generation first."
         >
-          <Action onClick={() => openSettings("agents")}>Text generation…</Action>
+          <Action onClick={() => openSettings("agents")}>Open Harnesses</Action>
         </Row>
       ) : (
         <>

From a229ef00ccf5319a01c8b296a0bfc5da50911205 Mon Sep 17 00:00:00 2001
From: LHagfoss <lucas@paral.no>
Date: Sun, 15 Nov 2026 10:28:43 +0100
Subject: [PATCH 3/4] feat(desktop): shorten the sidebar rows setting

---
 apps/desktop/src/ui/SidebarDensitySetting.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/ui/SidebarDensitySetting.tsx b/apps/desktop/src/ui/SidebarDensitySetting.tsx
index 585fbe871..faa729af4 100644
--- a/apps/desktop/src/ui/SidebarDensitySetting.tsx
+++ b/apps/desktop/src/ui/SidebarDensitySetting.tsx
@@ -10,7 +10,8 @@ export function SidebarDensitySetting() {
     <Row
       title="Sidebar rows"
       reset={density !== "detailed" ? () => setDensity("detailed") : undefined}
-      subtitle="Compact puts each thread on one line; hover a row for its project, branch and model."
+      subtitle="Compact shows one line per thread."
+      hint="Hover a compact row for its project, branch and model."
     >
       <Choice
         label="Sidebar rows"

From e02f9cf6c0fa87fb04e1394a962436fbaaead954 Mon Sep 17 00:00:00 2001
From: LHagfoss <lucas@paral.no>
Date: Sun, 15 Nov 2026 11:42:38 +0100
Subject: [PATCH 4/4] feat(desktop): add a merge button and trim the thread
 panel and header

---
 apps/desktop/src/acp/mock.ts                 |  10 +-
 apps/desktop/src/state/headerButtons.test.ts |  11 +-
 apps/desktop/src/state/headerButtons.ts      |  19 +-
 apps/desktop/src/state/pullMerge.test.ts     |  44 ++++
 apps/desktop/src/state/pullMerge.ts          | 124 +++++++++++
 apps/desktop/src/ui/OverviewDeliverables.tsx |   8 +-
 apps/desktop/src/ui/OverviewLog.tsx          |  25 ++-
 apps/desktop/src/ui/OverviewProperties.tsx   |  80 ++++---
 apps/desktop/src/ui/PullRequests.tsx         | 221 +++++++++++++++----
 docs/desktop.md                              |  21 +-
 10 files changed, 437 insertions(+), 126 deletions(-)
 create mode 100644 apps/desktop/src/state/pullMerge.test.ts
 create mode 100644 apps/desktop/src/state/pullMerge.ts

diff --git a/apps/desktop/src/acp/mock.ts b/apps/desktop/src/acp/mock.ts
index 283c18b09..a8c3234ba 100644
--- a/apps/desktop/src/acp/mock.ts
+++ b/apps/desktop/src/acp/mock.ts
@@ -3817,6 +3817,8 @@ export class MockEngine {
       case "_rustcode/pulls/merge/cancel":
         return { cancelled: false };
       case "_rustcode/pulls/merge":
+        // Long enough for the panel's "Waiting for checks" to show.
+        if (obj(params)?.mergeId) await new Promise((r) => setTimeout(r, 2500));
         return {
           merge: {
             number: num(obj(params)?.number) ?? 2790,
@@ -3991,7 +3993,8 @@ export class MockEngine {
             title: "feat(desktop): Tauri desktop app on every harness",
             author: "LHagfoss",
             state: "open",
-            draft: true,
+            // #2788 is the draft the list shows; any other opens ready to merge.
+            draft: params.number === 2788,
             checks: { passed: 5, failed: 0, pending: 1, skipped: 0 },
             headRef: "feat/desktop-tauri-harnesses",
             baseRef: "main",
@@ -4003,7 +4006,12 @@ export class MockEngine {
             body: "Adds `apps/desktop`: a Tauri shell around `rustcode --acp`.\n\n- Composer, approvals, harness pickers\n- Link chips and Smart UI",
             checkRuns: [
               { name: "desktop / check", status: "passed" },
+              { name: "lint", status: "passed" },
+              { name: "label", status: "passed" },
+              { name: "Desktop UI", status: "passed" },
               { name: "rust / test", status: "pending" },
+              // A matrix job GitHub skipped before it expanded: the template stays in its name.
+              { name: ["Desktop shell (", "$", "{{ matrix.name }})"].join(""), status: "pending" },
             ],
             files: [
               { path: "apps/desktop/src/ui/Composer.tsx", additions: 4, deletions: 2 },
diff --git a/apps/desktop/src/state/headerButtons.test.ts b/apps/desktop/src/state/headerButtons.test.ts
index 44f2756f6..2d307ae04 100644
--- a/apps/desktop/src/state/headerButtons.test.ts
+++ b/apps/desktop/src/state/headerButtons.test.ts
@@ -11,13 +11,10 @@ import {
 const ids = (...list: string[]) => list as HeaderButtonId[];
 
 describe("header buttons sanitising", () => {
-  test("pull requests are hidden by default: ⌘K holds that action", () => {
-    expect(DEFAULT_HEADER_BUTTONS).not.toContain("pulls");
-    expect(DEFAULT_HEADER_BUTTONS).toEqual(
-      ids("status", "plan", "git", "actions", "terminal", "details", "changes"),
-    );
-    // Still a button the setting lists, so it can be shown.
-    expect(HEADER_BUTTON_IDS).toContain("pulls");
+  test("the hand-driven git buttons are hidden by default", () => {
+    expect(DEFAULT_HEADER_BUTTONS).toEqual(ids("status", "plan", "terminal", "details"));
+    // Still buttons the setting lists, so each can be shown.
+    for (const id of ids("git", "actions", "pulls", "changes")) expect(HEADER_BUTTON_IDS).toContain(id);
   });
 
   test("a layout saved with Pull requests shown keeps it", () => {
diff --git a/apps/desktop/src/state/headerButtons.ts b/apps/desktop/src/state/headerButtons.ts
index 33725be25..d74766d80 100644
--- a/apps/desktop/src/state/headerButtons.ts
+++ b/apps/desktop/src/state/headerButtons.ts
@@ -22,13 +22,22 @@ export const HEADER_BUTTON_IDS = [
 export type HeaderButtonId = (typeof HEADER_BUTTON_IDS)[number];
 
 /**
- * What a fresh install and a reset start from: every button in registry order but Pull requests,
- * which ⌘K holds ("Open Git"; still one click away in Settings › Chat › Thread
- * header buttons). A layout the user saved is never touched by this: `sanitizeHeaderButtons` keeps
- * what was stored, so a user who shows the button keeps it.
+ * What a fresh install and a reset start from: status, plan, terminal and the
+ * panel. The buttons for driving git by hand stay one click away in Settings ›
+ * Chat › Thread header buttons: Git (commit, push, open a pull request: agents
+ * do that), Project actions, Changes (the panel's Changes tab holds them) and
+ * Pull requests (⌘K "Open Git", and the panel's tab). A layout the user saved
+ * is never touched by this: `sanitizeHeaderButtons` keeps what was stored.
  */
+export const HIDDEN_BY_DEFAULT: ReadonlySet<HeaderButtonId> = new Set<HeaderButtonId>([
+  "git",
+  "actions",
+  "pulls",
+  "changes",
+]);
+
 export const DEFAULT_HEADER_BUTTONS: readonly HeaderButtonId[] = HEADER_BUTTON_IDS.filter(
-  (id) => id !== "pulls",
+  (id) => !HIDDEN_BY_DEFAULT.has(id),
 );
 
 /** What `rustcode.headerButtons` holds. */
diff --git a/apps/desktop/src/state/pullMerge.test.ts b/apps/desktop/src/state/pullMerge.test.ts
new file mode 100644
index 000000000..6eb612a1e
--- /dev/null
+++ b/apps/desktop/src/state/pullMerge.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, test } from "bun:test";
+import { checkName, checksHeadline, mergeControl } from "./pullMerge";
+
+const checks = (passed = 0, failed = 0, pending = 0) => ({ passed, failed, pending, skipped: 0 });
+
+describe("merge control", () => {
+  test("follows where the pull stands", () => {
+    expect(mergeControl({ state: "open", draft: false, checks: checks(6) })).toEqual({ kind: "merge" });
+    expect(mergeControl({ state: "open", draft: false, checks: checks() })).toEqual({ kind: "merge" });
+    expect(mergeControl({ state: "open", draft: false, checks: checks(6, 0, 3) })).toEqual({
+      kind: "merge_when_green",
+      pending: 3,
+    });
+    expect(mergeControl({ state: "open", draft: false, checks: checks(6, 2, 1) })).toEqual({
+      kind: "blocked",
+      failed: 2,
+    });
+  });
+
+  test("offers nothing for a draft or a finished pull", () => {
+    expect(mergeControl({ state: "open", draft: true, checks: checks(6) })).toEqual({ kind: "none" });
+    expect(mergeControl({ state: "merged", draft: false, checks: checks(6) })).toEqual({ kind: "none" });
+    expect(mergeControl({ state: "closed", draft: false, checks: checks(6) })).toEqual({ kind: "none" });
+  });
+});
+
+describe("check names", () => {
+  // GitHub's expression syntax, built so it does not read as a template literal.
+  const expr = (name: string) => ["$", "{{ ", name, " }}"].join("");
+  test("drop an unexpanded matrix template", () => {
+    expect(checkName(`Desktop shell (${expr("matrix.name")})`)).toBe("Desktop shell");
+    expect(checkName(`${expr("matrix.name")} portability coverage`)).toBe("portability coverage");
+    expect(checkName(expr("matrix.os"))).toBe("Job");
+    expect(checkName("lint")).toBe("lint");
+  });
+
+  test("headline says what needs attention first", () => {
+    const run = (status: string) => ({ name: "x", status });
+    expect(checksHeadline([run("passed"), run("failed"), run("pending")])).toBe("1 check failed");
+    expect(checksHeadline([run("passed"), run("pending"), run("pending")])).toBe("2 checks running");
+    expect(checksHeadline([run("passed"), run("skipped")])).toBe("Checks passed");
+    expect(checksHeadline([])).toBe("No checks");
+  });
+});
diff --git a/apps/desktop/src/state/pullMerge.ts b/apps/desktop/src/state/pullMerge.ts
new file mode 100644
index 000000000..764a0619a
--- /dev/null
+++ b/apps/desktop/src/state/pullMerge.ts
@@ -0,0 +1,124 @@
+// Merging a pull request from its view in the right panel. The engine waits for
+// the checks and squash-merges (`_rustcode/pulls/merge`, the path agents use
+// through `merge_when_green`), with scripts/pr-merge.sh's rules: advisory jobs
+// are ignored and a failing check stops it. A merge outlives the panel: it is
+// kept here, by project and number, so the view shows it again when reopened.
+
+import { useSyncExternalStore } from "react";
+import { type PullRequest, parseMergeOutcome, parsePullError, pullErrorTitle } from "../acp/rustcode";
+import { Method } from "../acp/types";
+import { PULL_LIMIT, readPullDetail, readPullList } from "./pullQueries";
+import { request, toast } from "./store";
+
+/** How long a merge waits for checks: the same 25 minutes `merge_when_green` waits at most. */
+export const MERGE_WAIT_MS = 25 * 60_000;
+
+/**
+ * The view's one prominent control, from where the pull stands: nothing for a
+ * draft or a finished pull, "merge" once every check passed (or there are none),
+ * "merge_when_green" while checks run, and "blocked" with the failing count.
+ */
+export type MergeControl =
+  | { kind: "none" }
+  | { kind: "merge" }
+  | { kind: "merge_when_green"; pending: number }
+  | { kind: "blocked"; failed: number };
+
+export function mergeControl(pull: Pick<PullRequest, "state" | "draft" | "checks">): MergeControl {
+  if (pull.state !== "open" || pull.draft) return { kind: "none" };
+  if (pull.checks.failed > 0) return { kind: "blocked", failed: pull.checks.failed };
+  if (pull.checks.pending > 0) return { kind: "merge_when_green", pending: pull.checks.pending };
+  return { kind: "merge" };
+}
+
+/**
+ * A check's name as people read it. A job GitHub skipped before it expanded its
+ * matrix keeps the template in its name (`Desktop shell (${{ matrix.name }})`):
+ * the template goes, and a name that was only the template becomes "Job".
+ */
+export function checkName(name: string): string {
+  const cleaned = name
+    .replace(/\s*\(\s*\$\{\{[^}]*\}\}\s*\)/g, "")
+    .replace(/\$\{\{[^}]*\}\}\s*/g, "")
+    .replace(/\s+/g, " ")
+    .trim();
+  return cleaned || "Job";
+}
+
+type CheckRun = { name: string; status: string };
+
+/** The checks' headline: what needs the user first, then that everything passed. */
+export function checksHeadline(runs: readonly CheckRun[]): string {
+  const failed = runs.filter((c) => c.status === "failed").length;
+  const pending = runs.filter(
+    (c) => c.status !== "failed" && c.status !== "passed" && c.status !== "skipped",
+  ).length;
+  if (failed) return `${failed} ${failed === 1 ? "check failed" : "checks failed"}`;
+  if (pending) return `${pending} ${pending === 1 ? "check running" : "checks running"}`;
+  return runs.length ? "Checks passed" : "No checks";
+}
+
+const running = new Map<string, string>();
+const listeners = new Set<() => void>();
+let version = 0;
+
+const keyOf = (cwd: string, number: number) => `${cwd}#${number}`;
+const changed = () => {
+  version++;
+  for (const listener of listeners) listener();
+};
+const subscribe = (listener: () => void) => {
+  listeners.add(listener);
+  return () => listeners.delete(listener);
+};
+
+/** Whether a merge of this pull is waiting or running. */
+export function useMerging(cwd: string, number: number): boolean {
+  useSyncExternalStore(subscribe, () => version);
+  return running.has(keyOf(cwd, number));
+}
+
+/** Stops a merge still waiting for checks; one already merging finishes. */
+export function cancelMerge(cwd: string, number: number): void {
+  const mergeId = running.get(keyOf(cwd, number));
+  if (!mergeId) return;
+  void request(Method.pullMergeCancel, { mergeId }, 10_000).catch(() => {});
+}
+
+/** Waits for the pull's checks and squash-merges it, then reads it again; the outcome is a toast. */
+export async function mergePull(cwd: string, pull: Pick<PullRequest, "number" | "headRef">): Promise<void> {
+  const key = keyOf(cwd, pull.number);
+  if (running.has(key)) return;
+  const mergeId = `panel-${pull.number}-${Date.now().toString(36)}`;
+  running.set(key, mergeId);
+  changed();
+  try {
+    const result = await request(
+      Method.pullMerge,
+      { cwd, number: pull.number, branch: pull.headRef, timeoutMs: MERGE_WAIT_MS, mergeId },
+      MERGE_WAIT_MS + 120_000,
+    );
+    const error = parsePullError(result);
+    const outcome = error ? null : parseMergeOutcome(result);
+    if (error) toast(`${pullErrorTitle(error.code)}: ${error.message}`, "error", { persist: true });
+    else if (!outcome) toast(`#${pull.number} did not merge: no answer`, "error", { persist: true });
+    else if (outcome.merged) toast(`Merged #${pull.number}`, "success");
+    else if (outcome.failing.length)
+      toast(`#${pull.number} not merged: ${outcome.failing.join(", ")} failed`, "error", { persist: true });
+    else toast(outcome.message || `#${pull.number} not merged (${outcome.state})`, "info");
+  } catch (error) {
+    cancelMerge(cwd, pull.number);
+    toast(
+      `#${pull.number} did not merge: ${error instanceof Error ? error.message : String(error)}`,
+      "error",
+      {
+        persist: true,
+      },
+    );
+  } finally {
+    running.delete(key);
+    changed();
+    void readPullDetail(cwd, pull.number, { force: true });
+    void readPullList(cwd, "all", { limit: PULL_LIMIT, force: true });
+  }
+}
diff --git a/apps/desktop/src/ui/OverviewDeliverables.tsx b/apps/desktop/src/ui/OverviewDeliverables.tsx
index 389832552..d27352930 100644
--- a/apps/desktop/src/ui/OverviewDeliverables.tsx
+++ b/apps/desktop/src/ui/OverviewDeliverables.tsx
@@ -125,6 +125,9 @@ export function DeliverablesSection({
     writeDeliverableMode(next);
   };
 
+  // Nothing delivered yet: the section waits until there is something to show.
+  if (total === 0) return null;
+
   return (
     <OverviewSection
       id="deliverables"
@@ -180,11 +183,6 @@ export function DeliverablesSection({
           Show {hidden} more
         </Pill>
       )}
-      {total === 0 && (
-        <p className="px-2 py-1 text-callout text-fg-muted">
-          Nothing yet: the pictures its replies show and the files it writes land here.
-        </p>
-      )}
     </OverviewSection>
   );
 }
diff --git a/apps/desktop/src/ui/OverviewLog.tsx b/apps/desktop/src/ui/OverviewLog.tsx
index d957e59fc..48ec22ec8 100644
--- a/apps/desktop/src/ui/OverviewLog.tsx
+++ b/apps/desktop/src/ui/OverviewLog.tsx
@@ -1,5 +1,5 @@
 // The overview's Execution log: what the thread spent and how long it worked,
-// a bar for each turn, then the last few turns themselves — and, behind the
+// a bar for each turn once there are a few to compare, then the last few turns themselves — and, behind the
 // header's expand, the whole log with each turn's own waterfall (ui/TurnTrace.tsx)
 // where the app watched one. The turns come from the transcript the thread
 // already holds, so the panel reads no transcript again (ui/overview.ts).
@@ -12,13 +12,15 @@ import { formatDuration, formatTokens, type TranscriptItem } from "../state/thre
 import { HarnessIcon } from "./HarnessIcon";
 import { OverviewSection, SectionButton } from "./OverviewSection";
 import { logTotals, type TurnEntry, turnEntries, turnHasTrace } from "./overview";
-import { cx, Tooltip } from "./primitives";
+import { cx, Pill, Tooltip } from "./primitives";
 import { TurnTrace } from "./TurnTrace";
 
 /** How many turns the section lists before the header's expand shows them all. */
 export const LOG_ROWS = 3;
 /** How many bars the strip draws: a thread with a hundred turns keeps its shape, not every bar. */
 export const LOG_BARS = 24;
+/** Fewer turns than this draw no bars: one or two bars compare nothing. */
+export const MIN_BARS = 4;
 /** The turns' rows, before the full log is opened and needs them. */
 const NO_TURNS: Record<string, TranscriptItem[]> = {};
 
@@ -167,14 +169,13 @@ export function ExecutionLogSection({
       {turns.length > 0 ? (
         <>
           <div className="grid grid-cols-3 gap-2 px-2 pb-1">
-            <Stat
-              label="Spent"
-              value={totals.spent === undefined ? "—" : `${totals.spent.toFixed(2)} ${totals.currency}`}
-            />
-            <Stat label="Tokens" value={totals.tokens === undefined ? "—" : formatTokens(totals.tokens)} />
-            <Stat label="Agent time" value={totals.agentMs > 0 ? formatDuration(totals.agentMs) : "—"} />
+            {totals.spent !== undefined && (
+              <Stat label="Spent" value={`${totals.spent.toFixed(2)} ${totals.currency}`} />
+            )}
+            {totals.tokens !== undefined && <Stat label="Tokens" value={formatTokens(totals.tokens)} />}
+            {totals.agentMs > 0 && <Stat label="Agent time" value={formatDuration(totals.agentMs)} />}
           </div>
-          <TurnBars turns={turns} />
+          {turns.length >= MIN_BARS && <TurnBars turns={turns} />}
           <div className="pt-1">
             {shown.map((turn) => {
               const end = ends.get(turn.id);
@@ -193,9 +194,9 @@ export function ExecutionLogSection({
             })}
           </div>
           {!all && more && (
-            <p className="px-2 pt-0.5 text-caption text-fg-faint">
-              {turns.length - shown.length} more behind the expand.
-            </p>
+            <Pill quiet size="sm" className="mt-1 ml-2" onClick={() => setAll(true)}>
+              Show all {turns.length} turns
+            </Pill>
           )}
         </>
       ) : (
diff --git a/apps/desktop/src/ui/OverviewProperties.tsx b/apps/desktop/src/ui/OverviewProperties.tsx
index cd4908e6e..334ba040a 100644
--- a/apps/desktop/src/ui/OverviewProperties.tsx
+++ b/apps/desktop/src/ui/OverviewProperties.tsx
@@ -1,7 +1,8 @@
 // The overview's first section: what this thread is and where it works
 // (ui/ThreadDetails.tsx draws every section). A label/value list with a mark
 // for each fact — the status it is in, the agent and model it runs on, the
-// project and branch it works in, the effort and access it was given — and the
+// project and branch it works in, the effort and access it was given when it
+// chose them rather than a default — and the
 // rows that do something are the ones with an act behind them: the project
 // opens the file manager, the branch copies itself.
 
@@ -129,28 +130,31 @@ export function PropertiesSection({
 
   return (
     <OverviewSection id="properties" title="Properties" folded={folded} onToggle={onToggle}>
-      <Property
-        icon={<StatusIcon status={status} size={14} />}
-        label="Status"
-        title={
-          waiting
-            ? waitingTitle(waiting)
-              ? `${waitingLabel(waiting)}: ${waitingTitle(waiting)}`
-              : waitingLabel(waiting)
-            : undefined
-        }
-        value={
-          status !== "idle" ? (
-            <span className="inline-flex items-center">
-              <StatusChip status={status} />
-            </span>
-          ) : waiting ? (
-            <span className="text-fg-muted">Waiting</span>
-          ) : (
-            <span className="text-fg-faint">Idle</span>
-          )
-        }
-      />
+      {/* An idle thread says nothing here: the header's status already does. */}
+      {(status !== "idle" || waiting) && (
+        <Property
+          icon={<StatusIcon status={status} size={14} />}
+          label="Status"
+          title={
+            waiting
+              ? waitingTitle(waiting)
+                ? `${waitingLabel(waiting)}: ${waitingTitle(waiting)}`
+                : waitingLabel(waiting)
+              : undefined
+          }
+          value={
+            status !== "idle" ? (
+              <span className="inline-flex items-center">
+                <StatusChip status={status} />
+              </span>
+            ) : waiting ? (
+              <span className="text-fg-muted">Waiting</span>
+            ) : (
+              <span className="text-fg-faint">Idle</span>
+            )
+          }
+        />
+      )}
       {thread.harness && (
         <Property
           icon={<HarnessIcon id={thread.harness.id} name={harnessName} size={14} />}
@@ -184,25 +188,17 @@ export function PropertiesSection({
         />
       )}
       {base && <SubFact label="Based on" value={base} title={thread.worktree?.baseRef ?? base} />}
-      <Property
-        icon={<Gauge size={14} />}
-        label="Effort"
-        // A thread that sets none runs on the harness's own default, which reads quieter.
-        muted={!effort}
-        value={effort ?? "Default"}
-        title={effort ? undefined : "This thread sets no effort: its harness chooses."}
-      />
-      <Property
-        icon={<ShieldCheck size={14} />}
-        label="Access"
-        title={
-          inheritedAccess
-            ? "This thread keeps the default access from Settings › General."
-            : "Chosen for this thread, under its composer."
-        }
-        muted={inheritedAccess}
-        value={inheritedAccess ? `${modeLabel(mode)} (default)` : modeLabel(mode)}
-      />
+      {/* A thread that sets no effort runs on its harness's default: nothing to say. */}
+      {effort && <Property icon={<Gauge size={14} />} label="Effort" value={effort} />}
+      {/* Access shows when the thread chose its own; the default from Settings › General goes unsaid. */}
+      {!inheritedAccess && (
+        <Property
+          icon={<ShieldCheck size={14} />}
+          label="Access"
+          title="Chosen for this thread, under its composer."
+          value={modeLabel(mode)}
+        />
+      )}
     </OverviewSection>
   );
 }
diff --git a/apps/desktop/src/ui/PullRequests.tsx b/apps/desktop/src/ui/PullRequests.tsx
index fd88f0711..2fc6fc4c7 100644
--- a/apps/desktop/src/ui/PullRequests.tsx
+++ b/apps/desktop/src/ui/PullRequests.tsx
@@ -6,17 +6,22 @@
 
 import {
   ArrowLeft,
+  Bot,
+  ChevronRight,
   CircleCheck,
   CircleDashed,
   CirclePlus,
   CircleX,
   ExternalLink,
   GitBranchPlus,
+  GitMerge,
   GitPullRequest,
+  MessageSquare,
+  MoreHorizontal,
   RefreshCw,
 } from "lucide-react";
-import { Dialog } from "radix-ui";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { Dialog, DropdownMenu } from "radix-ui";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { JsonObject } from "../acp/jsonrpc";
 import {
   type PullDetail,
@@ -31,6 +36,14 @@ import { useIntentRest } from "../lib/intent";
 import { openExternal } from "../lib/native";
 import { count } from "../lib/plural";
 import { type FeedbackItem, feedbackItems, feedbackLocation, keepSelected } from "../lib/reviewFeedback";
+import {
+  cancelMerge,
+  checkName,
+  checksHeadline,
+  mergeControl,
+  mergePull,
+  useMerging,
+} from "../state/pullMerge";
 import {
   PULL_LIMIT,
   type PullListState,
@@ -67,11 +80,14 @@ import {
   Cluster,
   ClusterButton,
   cx,
+  MenuContent,
+  menuItem,
   noTextHelpers,
   Pill,
   Segments,
   Skeleton,
   Spinner,
+  Tooltip,
 } from "./primitives";
 
 /**
@@ -312,6 +328,118 @@ function FeedbackSection({ detail, pull }: { detail: PullDetail; pull: PullReque
   );
 }
 
+/** How long a pressed merge waits for the second press that confirms it. */
+const CONFIRM_MS = 4000;
+
+/**
+ * The view's one prominent control (state/pullMerge.ts): Merge once the checks
+ * passed, Merge when checks pass while they run, nothing for a draft or a
+ * finished pull. The first press arms it ("Confirm merge?"), the second merges;
+ * a waiting merge shows here, with a way to stop it, until it ends.
+ */
+function MergeButton({ cwd, pull }: { cwd: string; pull: PullRequest }) {
+  const merging = useMerging(cwd, pull.number);
+  const [armed, setArmed] = useState(false);
+  const timer = useRef<ReturnType<typeof setTimeout>>(undefined);
+  useEffect(() => () => clearTimeout(timer.current), []);
+  const control = mergeControl(pull);
+  if (merging)
+    return (
+      <span className="inline-flex items-center rounded-full bg-fill">
+        <span className="flex h-[26px] items-center gap-1.5 pl-3 pr-2 font-medium text-callout">
+          <Spinner size={12} />
+          {control.kind === "merge_when_green" ? "Waiting for checks" : "Merging"}
+        </span>
+        <Pill quiet className="rounded-l-none" onClick={() => cancelMerge(cwd, pull.number)}>
+          Cancel
+        </Pill>
+      </span>
+    );
+  if (control.kind === "none") return null;
+  if (control.kind === "blocked")
+    return (
+      <Tooltip label="A failing check stops the merge. Fix it, or merge on GitHub.">
+        <span className="inline-flex">
+          <Pill prominent disabled>
+            <GitMerge size={12} /> {count(control.failed, "check")} failed
+          </Pill>
+        </span>
+      </Tooltip>
+    );
+  const label = control.kind === "merge" ? "Merge" : "Merge when checks pass";
+  const press = () => {
+    clearTimeout(timer.current);
+    if (!armed) {
+      setArmed(true);
+      timer.current = setTimeout(() => setArmed(false), CONFIRM_MS);
+      return;
+    }
+    setArmed(false);
+    void mergePull(cwd, pull);
+  };
+  return (
+    <Tooltip
+      label={`Squash-merges into ${pull.baseRef} and deletes ${pull.headRef}${
+        control.kind === "merge_when_green" ? " once every check passes" : ""
+      }`}
+    >
+      <Pill prominent onClick={press} onBlur={() => setArmed(false)}>
+        <GitMerge size={12} /> {armed ? "Confirm merge?" : label}
+      </Pill>
+    </Tooltip>
+  );
+}
+
+/**
+ * The pull's checks under one headline. While something failed or runs, those
+ * rows show and the passed ones fold behind a line; when all passed, the list
+ * folds whole behind the headline.
+ */
+function ChecksSection({ runs }: { runs: PullDetail["checkRuns"] }) {
+  const [open, setOpen] = useState(false);
+  const attention = runs.filter((c) => c.status !== "passed" && c.status !== "skipped");
+  const rest = runs.filter((c) => c.status === "passed" || c.status === "skipped");
+  const shown = open ? [...attention, ...rest] : attention;
+  return (
+    <section className="mt-3">
+      <button
+        type="button"
+        onClick={() => setOpen((o) => !o)}
+        aria-expanded={open}
+        className="mb-1 flex items-center gap-1 font-semibold text-caption text-fg-muted hover:text-fg"
+      >
+        <ChevronRight size={11} className={cx("transition-transform", open && "rotate-90")} />
+        {checksHeadline(runs)}
+        {!open && rest.length > 0 && attention.length > 0 && (
+          <span className="font-normal text-fg-faint">· {rest.length} passed</span>
+        )}
+      </button>
+      {shown.map((c, i) => (
+        <div key={i} className="flex h-[22px] items-center gap-2 text-callout">
+          {c.status === "passed" ? (
+            <CircleCheck size={12} className="shrink-0 text-success" />
+          ) : c.status === "failed" ? (
+            <CircleX size={12} className="shrink-0 text-danger" />
+          ) : (
+            <CircleDashed size={12} className="shrink-0 text-fg-faint" />
+          )}
+          {c.url ? (
+            <button
+              type="button"
+              className="truncate text-left hover:underline"
+              onClick={() => openExternal(c.url!)}
+            >
+              {checkName(c.name)}
+            </button>
+          ) : (
+            <span className="truncate">{checkName(c.name)}</span>
+          )}
+        </div>
+      ))}
+    </section>
+  );
+}
+
 function PullView({
   cwd,
   host,
@@ -351,39 +479,50 @@ function PullView({
           <h2 className="selectable font-semibold text-title3">
             {summary.title} <span className="font-normal text-fg-muted">#{summary.number}</span>
           </h2>
-          <div className="mt-1 flex flex-wrap items-center gap-2 text-caption">
+          <div className="mt-1 flex flex-wrap items-center gap-x-2 gap-y-1 text-caption">
             <span className={STATE_TONE[pullState(summary)]}>{STATE_LABEL[pullState(summary)]}</span>
             <ChecksMark pull={summary} />
+            <Tooltip label={`${summary.author} wants to merge ${summary.headRef} into ${summary.baseRef}`}>
+              <span className="text-fg-muted">
+                {count(summary.changedFiles, "file")}{" "}
+                <span className="text-success">+{summary.additions}</span>{" "}
+                <span className="text-danger">−{summary.deletions}</span>
+              </span>
+            </Tooltip>
           </div>
-          <p className="mt-1 text-caption text-fg-muted">
-            {summary.author} wants to merge <span className="font-mono">{summary.headRef}</span> into{" "}
-            <span className="font-mono">{summary.baseRef}</span> · {summary.changedFiles} files{" "}
-            <span className="text-success">+{summary.additions}</span>{" "}
-            <span className="text-danger">−{summary.deletions}</span>
-          </p>
-          <div className="mt-2 flex flex-wrap gap-1.5">
-            {summary.url && (
-              <Pill onClick={() => openExternal(summary.url!)}>
-                <ExternalLink size={11} /> GitHub
-              </Pill>
-            )}
-            <Pill onClick={() => askAgent(summary)}>Ask the agent to review</Pill>
-            {!host && summary.state === "open" && (
-              <Pill onClick={() => setWorking(true)}>
-                <GitBranchPlus size={11} /> Work on this in a thread
-              </Pill>
-            )}
-            {!reviewing && (
-              <Pill
-                prominent
-                onClick={() => setReviewing(true)}
-                // A review names the head commit: it waits for a read this session,
-                // not for a row or a saved copy that may be behind the branch.
-                disabled={!live || !repositoryOf(summary.url) || pullState(summary) !== "open"}
-              >
-                Review…
-              </Pill>
-            )}
+          <div className="mt-2 flex flex-wrap items-center gap-1.5">
+            <MergeButton cwd={cwd} pull={summary} />
+            <DropdownMenu.Root modal={false}>
+              <DropdownMenu.Trigger asChild>
+                <Pill aria-label="More pull request actions" className="px-2">
+                  <MoreHorizontal size={13} />
+                </Pill>
+              </DropdownMenu.Trigger>
+              <MenuContent align="start" className="min-w-[200px]">
+                {summary.url && (
+                  <DropdownMenu.Item className={menuItem} onSelect={() => openExternal(summary.url!)}>
+                    <ExternalLink size={13} className="text-fg-muted" /> Open on GitHub
+                  </DropdownMenu.Item>
+                )}
+                <DropdownMenu.Item className={menuItem} onSelect={() => askAgent(summary)}>
+                  <Bot size={13} className="text-fg-muted" /> Ask an agent to review
+                </DropdownMenu.Item>
+                {!host && summary.state === "open" && (
+                  <DropdownMenu.Item className={menuItem} onSelect={() => setWorking(true)}>
+                    <GitBranchPlus size={13} className="text-fg-muted" /> Work on this in a thread
+                  </DropdownMenu.Item>
+                )}
+                <DropdownMenu.Item
+                  className={menuItem}
+                  // A review names the head commit: it waits for a read this session,
+                  // not for a row or a saved copy that may be behind the branch.
+                  disabled={reviewing || !live || !repositoryOf(summary.url) || pullState(summary) !== "open"}
+                  onSelect={() => setReviewing(true)}
+                >
+                  <MessageSquare size={13} className="text-fg-muted" /> Write a review
+                </DropdownMenu.Item>
+              </MenuContent>
+            </DropdownMenu.Root>
           </div>
           {reviewing && <ReviewForm cwd={cwd} pull={summary} onDone={() => setReviewing(false)} />}
           {working && (
@@ -421,23 +560,7 @@ function PullView({
               <Markdown text={detail.body} className="text-callout" />
             </div>
           )}
-          {detail.checkRuns.length > 0 && (
-            <section className="mt-3">
-              <h3 className="mb-1 font-semibold text-caption text-fg-muted">Checks</h3>
-              {detail.checkRuns.map((c, i) => (
-                <div key={i} className="flex h-[22px] items-center gap-2 text-callout">
-                  {c.status === "passed" ? (
-                    <CircleCheck size={12} className="text-success" />
-                  ) : c.status === "failed" ? (
-                    <CircleX size={12} className="text-danger" />
-                  ) : (
-                    <CircleDashed size={12} className="text-fg-faint" />
-                  )}
-                  <span className="truncate">{c.name}</span>
-                </div>
-              ))}
-            </section>
-          )}
+          {detail.checkRuns.length > 0 && <ChecksSection runs={detail.checkRuns} />}
           {detail.files.length > 0 && (
             <section className="mt-3">
               <h3 className="mb-1 font-semibold text-caption text-fg-muted">Files</h3>
diff --git a/docs/desktop.md b/docs/desktop.md
index 13598b4a0..469ec08b7 100644
--- a/docs/desktop.md
+++ b/docs/desktop.md
@@ -707,8 +707,18 @@ composer's keys stay outside the table.
   and each comment's side. *Add to chat* on a conversation, or *Add all
   unresolved*, puts the comments with their file, lines and author into the
   composer draft; nothing is sent. Replying and resolving from the app
-  (#3768) and `#`/`@` completion (#3769) are not there yet. "Ask the agent to review" starts a
-  thread draft naming the commit. *Work on this in a thread* (an open pull
+  (#3768) and `#`/`@` completion (#3769) are not there yet. The header's one
+  button merges (`state/pullMerge.ts`): *Merge* once every check passed,
+  *Merge when checks pass* while they run (the first press arms it, "Confirm
+  merge?", the second merges), a disabled "N checks failed" when one failed.
+  It calls `_rustcode/pulls/merge`, the path `merge_when_green` uses (waits up
+  to 25 minutes, squash-merges, deletes the branch, advisory jobs ignored);
+  the wait shows as *Waiting for checks · Cancel* and survives closing the
+  panel. Checks fold under a headline ("2 checks running · 4 passed"), with
+  only what needs attention listed, and a skipped matrix job's
+  `${{ matrix.name }}` is dropped from its name. The rest sits behind `…`:
+  Open on GitHub, *Ask an agent to review* (a thread draft naming the
+  commit), Work on this in a thread, Write a review. *Work on this in a thread* (an open pull
   request on this computer) opens a sheet: tick the description, the review
   comments still on the diff and the failing checks, edit the instruction
   ("Address the review comments and fix failing checks."), and *Start*. The
@@ -1238,9 +1248,10 @@ composer's keys stay outside the table.
   panel toggles (details, changes) always draw after the rest, in their kept
   order, so the panel's control is the header's last, rightmost one. The order
   is kept as `rustcode.headerButtons` (`{shown, known}`), so a button added
-  in a later release shows by default. Pull requests is hidden on a fresh
-  install and after Reset (Open Git in ⌘K holds it); a saved layout
-  that shows it keeps it.
+  in a later release shows by default. A fresh install and Reset show status,
+  plan, terminal and details: Git, Project actions, Pull requests and Changes
+  (driving git by hand; agents commit and open pull requests, and the panel's
+  tabs hold the rest) are hidden. A saved layout keeps what it shows.
 - **Settings** takes the whole window: the shell (sidebar, chat, right
   panel) stays mounted and laid out underneath, hidden and `inert`, so the
   thread comes back exactly where it was (scroll, drafts, open rows). A