diff --git a/package-lock.json b/package-lock.json
index c914ee9..295d4cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4594,6 +4594,7 @@
       },
       "devDependencies": {
         "@get-bb/plugin-sdk": "0.6.15",
+        "@radix-ui/react-dropdown-menu": "^2.1.20",
         "@testing-library/react": "^16.3.3",
         "@types/better-sqlite3": "^7.6.12",
         "@types/node": "^22.0.0",
diff --git a/plugins/follow-up/PLUGIN_OVERVIEW.md b/plugins/follow-up/PLUGIN_OVERVIEW.md
index b365d39..83c0cce 100644
--- a/plugins/follow-up/PLUGIN_OVERVIEW.md
+++ b/plugins/follow-up/PLUGIN_OVERVIEW.md
@@ -4,9 +4,10 @@ normally live in one reply and are gone by the next turn. This keeps them.
 
 ## What you get
 
-A banner above the composer listing what the current thread accumulated. Each
-row can be pushed into the composer, handed to a new thread in the same
-checkout, reordered, marked done, or dismissed. Marking a row done or
+A banner above the composer listing what the current thread accumulated, laid
+out like bb's Queue card. Each row leads with one action (hand off for
+out-of-scope work, put in the composer for the rest), drags to reorder, and
+has a ⋯ menu that edits the text in place, marks it done, or dismisses it. Marking a row done or
 dismissing it takes its pill back out of your draft. A dismissed row stays
 gone: an agent that notices the same thing again cannot re-add it.
 
diff --git a/plugins/follow-up/README.md b/plugins/follow-up/README.md
index a1e0500..fbe64ce 100644
--- a/plugins/follow-up/README.md
+++ b/plugins/follow-up/README.md
@@ -21,9 +21,13 @@ correct as the plugin releases and `bb plugin update` follows it.
 
 ## What it does
 
-**The banner.** Above the composer, listing what this thread accumulated. Each
-row can be pushed into the composer, handed to a new thread in the same
-checkout, dragged into a different order, marked done, or dismissed.
+**The banner.** Above the composer, listing what this thread accumulated, laid
+out like bb's own Queue card beneath it. Each row shows one action and keeps the
+rest in its ⋯ menu. An out-of-scope row leads with handing it to a new thread in
+the same checkout; every other row leads with pushing it into the composer. The
+menu also edits the text in place (Enter saves, Escape puts it back), describes
+a row that has no detail, opens it in the panel for the detail, file and reason,
+marks it done, or dismisses it. Drag the handle to reorder.
 
 A row pushed into the composer goes in as a pill, and the row is marked as in
 the composer for as long as that pill is in your draft. Mark the row done or
@@ -156,7 +160,7 @@ declare as a hint. With `--json`, a failure also prints
 `{"ok": false, "error": {"code", "message", "hint"}}` on stdout, while stderr
 keeps the readable message.
 
-`dismiss` is the same action as the banner's x, exposed so the tombstone path is
+`dismiss` is the same action as the banner's Dismiss, exposed so the tombstone path is
 testable without a browser. `clear` empties the list without dismissing
 anything. `forget` drops the *dismissal* record — use it when you deleted
 something and want agents to be able to raise it again.
diff --git a/plugins/follow-up/components/ui/dropdown-menu.tsx b/plugins/follow-up/components/ui/dropdown-menu.tsx
new file mode 100644
index 0000000..e8b95b9
--- /dev/null
+++ b/plugins/follow-up/components/ui/dropdown-menu.tsx
@@ -0,0 +1,66 @@
+// A small dropdown menu over Radix, for the banner rows' ⋯ menu.
+//
+// `@radix-ui/react-dropdown-menu` is one of the packages bb shims at runtime,
+// so this bundles none of it: the menu is bb's own Radix copy, and it is a
+// type-only devDependency here (`bb plugin types` keeps it at the host's
+// version). The content portals out of the card, so it carries the plugin's
+// portal-scope attributes for theming, as the detail tooltip does.
+import type { ComponentProps } from "react";
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import { usePortalScopeProps } from "@/lib/portal-scope";
+import { cn } from "@/lib/utils";
+
+export const DropdownMenu = DropdownMenuPrimitive.Root;
+export const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
+
+export function DropdownMenuContent({
+  className,
+  sideOffset = 4,
+  ...props
+}: ComponentProps<typeof DropdownMenuPrimitive.Content>) {
+  const portalProps = usePortalScopeProps();
+  return (
+    <DropdownMenuPrimitive.Portal>
+      <DropdownMenuPrimitive.Content
+        {...portalProps}
+        sideOffset={sideOffset}
+        className={cn(
+          "z-[60] min-w-44 overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md",
+          className,
+        )}
+        {...props}
+      />
+    </DropdownMenuPrimitive.Portal>
+  );
+}
+
+export function DropdownMenuItem({
+  className,
+  destructive = false,
+  ...props
+}: ComponentProps<typeof DropdownMenuPrimitive.Item> & { destructive?: boolean }) {
+  return (
+    <DropdownMenuPrimitive.Item
+      className={cn(
+        "relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none",
+        "data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground",
+        "data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+        destructive && "text-destructive data-[highlighted]:text-destructive",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export function DropdownMenuSeparator({
+  className,
+  ...props
+}: ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
+  return (
+    <DropdownMenuPrimitive.Separator
+      className={cn("-mx-1 my-1 h-px bg-border", className)}
+      {...props}
+    />
+  );
+}
diff --git a/plugins/follow-up/lib/followups.ts b/plugins/follow-up/lib/followups.ts
index b12e7ae..6ed78af 100644
--- a/plugins/follow-up/lib/followups.ts
+++ b/plugins/follow-up/lib/followups.ts
@@ -11,6 +11,19 @@ export const REASONS = [
 
 export type Reason = (typeof REASONS)[number];
 
+/** The one action a banner row shows inline; the rest are in its ⋯ menu. */
+export type RowMainAction = "insert" | "handoff";
+
+/**
+ * A guess at a row's likely next step, from why it was skipped. Out-of-scope
+ * work belongs in another thread, so it leads with Hand off. Everything else
+ * leads with putting it in the composer, cleanup included until there is a
+ * "queue it after this turn" action for it to lead with instead.
+ */
+export function mainActionFor(reason: Reason | null): RowMainAction {
+  return reason === "out-of-scope" ? "handoff" : "insert";
+}
+
 export type HandoffState = "running" | "finished" | "failed";
 
 export interface FollowUp {
diff --git a/plugins/follow-up/package-lock.json b/plugins/follow-up/package-lock.json
index be28bdd..45ae0a6 100644
--- a/plugins/follow-up/package-lock.json
+++ b/plugins/follow-up/package-lock.json
@@ -20,6 +20,7 @@
       },
       "devDependencies": {
         "@get-bb/plugin-sdk": "0.6.15",
+        "@radix-ui/react-dropdown-menu": "^2.1.20",
         "@testing-library/react": "^16.3.3",
         "@types/better-sqlite3": "^7.6.12",
         "@types/node": "^22.0.0",
@@ -350,6 +351,48 @@
         }
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.8.0.tgz",
+      "integrity": "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.12"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.8.0.tgz",
+      "integrity": "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.8.0",
+        "@floating-ui/utils": "^0.2.12"
+      }
+    },
+    "node_modules/@floating-ui/react-dom": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.9.tgz",
+      "integrity": "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.8.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.12.tgz",
+      "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@get-bb/plugin-sdk": {
       "version": "0.6.15",
       "resolved": "https://registry.npmjs.org/@get-bb/plugin-sdk/-/plugin-sdk-0.6.15.tgz",
@@ -450,6 +493,64 @@
         "url": "https://github.com/sponsors/oxc-project"
       }
     },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.7.tgz",
+      "integrity": "sha512-rqWnm76nYT8HoNNqEjpgJ7Pw/DrBj5iBTrmEPo6HTX5+VJyBNOqTdv4g89G63HuR5g0AaENoAcH7Is5fF2kZ8Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-arrow": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.15.tgz",
+      "integrity": "sha512-v4zggRcjadnI+ClKDuijlQEW4tw3NoaeHc/PwpKnLoLLKNUG4InLegkstooLcRIUWCs+8L22dGURCVuFfOKfnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collection": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.15.tgz",
+      "integrity": "sha512-9W+B9NPF0NaaPh/1NJd3+KqsnlLqU9H7T2rvww+fp+T/evVXdNAyYcnfRQZFOjkR1ajQp3yORlqnI8soawLvNA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-slot": "1.3.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-compose-refs": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.5.tgz",
@@ -465,6 +566,338 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.2.2.tgz",
+      "integrity": "sha512-RHCUGwKHDr0hDGg4X7ma4JG4/+12qxw8rkh5QKdDldlCvtja6nUx1Ef/8HVrJze81lEsgLQlqjzjGNHantgnQA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-direction": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.4.tgz",
+      "integrity": "sha512-5pzg4FGQNpExhnhT2zlrP1wZFaYCd1K0nYWoFAdcYoYK868IEigqMX3B3f8yIoRlAhAeDWciLI6ZdCKHF9P4Vg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.19.tgz",
+      "integrity": "sha512-8g4pfOL9HoKKLWGiypT+dphVqjFfmcXO5GBnhsG6zI+lxAx/8feQpr+1LSN8Re3hiZ+XkLNS4O9ztK11/LzQ6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-effect-event": "0.0.5"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dropdown-menu": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.24.tgz",
+      "integrity": "sha512-geq8l2rJkxvkXsT9RMgtUE3P8pITFpTsvYpbySi1IH4fZEABD/Gp85myayFgxk0ktljGMJnCbeFkyTusvSvv7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-menu": "2.1.24",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-guards": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.6.tgz",
+      "integrity": "sha512-RNOJjfZMTyBM6xYmV3IVGXkPjIhcBAuv48POevAXwrGJhkWZ9p1rFoIS1JFooPuT193AZmRsCPhpoVJxx6OPoQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.16.tgz",
+      "integrity": "sha512-wmRZ2WWLvmt6KHy2rNPOdPUjwq5xOHY02+m+udwJTn0aNIox/rkskAvJTyTLGhPK6KgrUjlJUJpgmx/+wFiFIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-id": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.4.tgz",
+      "integrity": "sha512-TMQp2llA+RYn7JcjnrMnz7wN4pcVttPZnRZo52PLQsoLVKzNlVwUeHmfePgTgRluXFvlD3GD5g5MOVVTJCO0qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-menu": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.24.tgz",
+      "integrity": "sha512-uW7RVuU6Lp/ZtfeY4b3kL32zccgEWvPv1+cf17ubYzHa9cL8AHokmk36cG/XEiH/smbQvumnieXX9j/e9RqJWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-focus-guards": "1.1.6",
+        "@radix-ui/react-focus-scope": "1.1.16",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-popper": "1.3.7",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-roving-focus": "1.1.19",
+        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.7.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popper": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.3.7.tgz",
+      "integrity": "sha512-UsJrrd7w4wuKKTdvd/DNERVlwSlUcyXzjhyDwBk+3aPOsCjOY6ZSbxuw8E6lZTjjfP8Cpd0J8VVkrYUWyGYXyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.0.0",
+        "@radix-ui/react-arrow": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
+        "@radix-ui/react-use-rect": "1.1.4",
+        "@radix-ui/react-use-size": "1.1.4",
+        "@radix-ui/rect": "1.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-portal": {
+      "version": "1.1.17",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.17.tgz",
+      "integrity": "sha512-vKQLcWypUnwZVvfV7UkGahH2g6ySe8M8R+zYBwPrv5byZ9QAW6cQVvNKo7GgmD+p8aYb6D9JBuvy8/WhOno2wQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-presence": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.10.tgz",
+      "integrity": "sha512-3wyzCQ6+ubRA+D4uv9m95JYLXxmOHp05qjrkjeA7uKHHtjpPggQzc6DAb0URl7j67oR0K2foO4ip27TiX037Bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.10.tgz",
+      "integrity": "sha512-MucOnzh6hR5mid6VpkbglRAMYMjKLqRnGBbjXkzjK52fuQDd1qbkx78a5P40mkcnVXJdEVxm26E9OPAiUq7nBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.3.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-roving-focus": {
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.19.tgz",
+      "integrity": "sha512-V9jI6hDjT7l3jsCQD9bLNvDLM3tH/gdbOTp7Tefp3hbbgCGQoK7tUvrWiRlcoBHIZ809ElXwNQwVo0B98LuTXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-is-hydrated": "0.1.3",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-slot": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.3.tgz",
@@ -483,6 +916,139 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.4.tgz",
+      "integrity": "sha512-R6OUY2e2fA6Yn6s+VSx5KBV6Nx8LQEhu+cz7LCej18rQ1HLyg9PSC9jP/ZNx0o6FAIK9c0F1kHylzSxKsdlkrQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.6.tgz",
+      "integrity": "sha512-uEQJGT97ZA/TgP/Hydw47lHu+/vQj6z/0jA+WeTbK1o9Rx45GImjpD0tc3W5ad3D6XTSR6e1yEO0FvGq6WQfVQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-use-effect-event": "0.0.5",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-effect-event": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.5.tgz",
+      "integrity": "sha512-7cshFL8HGS/7HEiHH+9kL9HBwp2sa9yX18Knwek6KYWmXwM7pegMgta2AXMQKI+rq3JnfSj9x8wYqFMTdG1Jgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-is-hydrated": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.3.tgz",
+      "integrity": "sha512-umO/aJ+82CpOnhDZUTbILCQf7kU/g0iv+oGs/Q8jw7IkhWBzaEP4sA268PhFAJTFetbwp3ICc6ktpI4TqtxcIw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.4.tgz",
+      "integrity": "sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-rect": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.4.tgz",
+      "integrity": "sha512-cSOCh6JlkmfjLyNcLiu2nB4v+nm+dkZ+Q5KHWk/soo4U7ZLiEQFKHK9/YmtBHjfCEaU43IBKQOc4/uJmCaiCTQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/rect": "1.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-size": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.4.tgz",
+      "integrity": "sha512-D3anSY15EJoxrihpsXI6SMrmmonnQtR2ni7arO+Lfdg3O95b9hNXxONk8jA5C8ANdF/h5HMAxejgs8PWJ6rlhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/rect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.3.tgz",
+      "integrity": "sha512-JtyZR+mqgBibTo8xea3B6ZRmzZiM/YeVBtUkas6zMuXjAlfIFIW2FgqeM9eLyvEaYX66vr6DJMK+4U6LV0KhNw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@rolldown/binding-android-arm-eabi": {
       "version": "1.2.12",
       "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.12.tgz",
@@ -964,6 +1530,19 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/aria-hidden": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+      "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/aria-query": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
@@ -1237,6 +1816,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/detect-node-es": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/dom-accessibility-api": {
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
@@ -1353,6 +1939,16 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/get-nonce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+      "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -2081,6 +2677,78 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/react-remove-scroll": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
+      "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "react-remove-scroll-bar": "^2.3.7",
+        "react-style-singleton": "^2.2.3",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.3",
+        "use-sidecar": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-remove-scroll-bar": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
+      "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "react-style-singleton": "^2.2.2",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-style-singleton": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
+      "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-nonce": "^1.0.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -2486,6 +3154,51 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/use-callback-ref": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
+      "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-sidecar": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
+      "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/plugins/follow-up/package.json b/plugins/follow-up/package.json
index 0511adb..93436e9 100644
--- a/plugins/follow-up/package.json
+++ b/plugins/follow-up/package.json
@@ -48,6 +48,7 @@
   },
   "devDependencies": {
     "@get-bb/plugin-sdk": "0.6.15",
+    "@radix-ui/react-dropdown-menu": "^2.1.20",
     "@testing-library/react": "^16.3.3",
     "@types/better-sqlite3": "^7.6.12",
     "@types/node": "^22.0.0",
diff --git a/plugins/follow-up/src/banner.tsx b/plugins/follow-up/src/banner.tsx
index e11020b..fb2f36b 100644
--- a/plugins/follow-up/src/banner.tsx
+++ b/plugins/follow-up/src/banner.tsx
@@ -15,6 +15,8 @@ import {
   isExpanding,
   expansionGaveUp,
   isFollowUpInDraft,
+  mainActionFor,
+  TEXT_MAX,
   type FollowUp,
   type Reason,
 } from "../lib/followups.ts";
@@ -31,9 +33,19 @@ import { threadIdFromScope } from "./scope.ts";
 import { stripPill } from "./insert-pill.ts";
 import { commitOrder as commitRowOrder, insertRow } from "./reorder.ts";
 import { useFollowUps } from "./use-follow-ups.ts";
-import { HandoffAction } from "./handoff.tsx";
+import { HandoffAction, useHandoff } from "./handoff.tsx";
 import { EmptyState } from "./empty-state.tsx";
+import { HugeiconsIcon } from "@hugeicons/react";
+import { ArrowLeftRightIcon } from "@hugeicons/core-free-icons";
+import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 import { Icon, type IconName } from "@/components/ui/icon";
 import { useIsCompactViewport } from "@/components/ui/hooks/use-compact-viewport";
 import { usePortalScopeProps } from "@/lib/portal-scope";
@@ -52,6 +64,14 @@ const REASON_ICON: Record<Reason, IconName> = {
   cleanup: "Clean",
 };
 
+/** Why an inline edit did not take, for the outcomes that are refusals. */
+const AMEND_REFUSAL: Partial<Record<string, string>> = {
+  duplicate: "Another follow-up on this thread already says that.",
+  dismissed: "You dismissed that wording earlier, so it cannot come back.",
+  "not-found": "That follow-up no longer exists.",
+  forbidden: "That follow-up cannot be edited.",
+};
+
 /**
  * The detail tooltip, in its own component so the entry flag resets each time
  * it opens rather than once for the life of the banner.
@@ -99,6 +119,75 @@ function PeekCard({
   );
 }
 
+function growToFit(field: HTMLTextAreaElement): void {
+  field.style.height = "auto";
+  field.style.height = `${field.scrollHeight}px`;
+}
+
+/**
+ * A row's text, edited in place the way bb's Queue card edits a queued
+ * message. Enter or leaving the field saves; Escape puts the text back. Text
+ * only: the detail, file and reason have no room on a row, so ⋯ → Open in the
+ * panel is where those are edited.
+ */
+function RowTextEditor({
+  text,
+  onSave,
+  onCancel,
+}: {
+  text: string;
+  onSave: (text: string) => void;
+  onCancel: () => void;
+}) {
+  const [value, setValue] = useState(text);
+  const field = useRef<HTMLTextAreaElement>(null);
+  // Enter saves and the blur that follows must not save a second time.
+  const settled = useRef(false);
+
+  useEffect(() => {
+    const node = field.current;
+    if (node === null) return;
+    node.focus();
+    node.setSelectionRange(node.value.length, node.value.length);
+    growToFit(node);
+  }, []);
+
+  const finish = (save: boolean) => {
+    if (settled.current) return;
+    settled.current = true;
+    const next = value.trim();
+    if (save && next !== "") onSave(next);
+    else onCancel();
+  };
+
+  return (
+    <textarea
+      ref={field}
+      value={value}
+      rows={1}
+      maxLength={TEXT_MAX}
+      // A follow-up is one line, so a pasted newline becomes a space.
+      onChange={(event) => {
+        setValue(event.target.value.replace(/\r?\n/g, " "));
+        growToFit(event.target);
+      }}
+      onKeyDown={(event) => {
+        if (event.key === "Enter" && !event.shiftKey && !event.nativeEvent.isComposing) {
+          event.preventDefault();
+          finish(true);
+        } else if (event.key === "Escape") {
+          event.preventDefault();
+          event.stopPropagation();
+          finish(false);
+        }
+      }}
+      onBlur={() => finish(true)}
+      aria-label={`Edit "${text}"`}
+      className="min-w-0 flex-1 resize-none rounded border border-border bg-background px-1.5 py-0.5 text-sm leading-[1.4] outline-none focus-visible:ring-1 focus-visible:ring-ring"
+    />
+  );
+}
+
 function FollowUpRow({
   row,
   threadId,
@@ -113,7 +202,8 @@ function FollowUpRow({
   active,
   onEnter,
   onPeek,
-  onEdit,
+  onOpenInPanel,
+  onAmend,
   onCancelExpand,
   onExpand,
 }: {
@@ -124,6 +214,8 @@ function FollowUpRow({
   onInsert: () => void;
   onDismiss: () => void;
   onDone: () => void;
+  /** Save new text for the row; the banner reports any refusal. */
+  onAmend: (text: string) => Promise<void>;
   busy: boolean;
   inserted: boolean;
   /** True for one beat after this row becomes in progress. */
@@ -133,11 +225,19 @@ function FollowUpRow({
   active: boolean;
   onEnter: (id: string | null) => void;
   onPeek: (row: FollowUp | null) => void;
-  onEdit: () => void;
+  onOpenInPanel: () => void;
 }) {
   const { setNodeRef, style, handleProps, isDragging, anyDragging } = useSortableRow(
     row.id,
   );
+  const handoff = useHandoff();
+  const main = mainActionFor(row.reason);
+  const [editing, setEditing] = useState(false);
+  // A detail tooltip scheduled before editing began would still open over the
+  // field; clearing it on entry cancels that timer too.
+  useEffect(() => {
+    if (editing) onPeek(null);
+  }, [editing, onPeek]);
   // Null unless this row was recorded on a child thread and carried up.
   const inheritedFrom = row.inheritedFrom ?? null;
   const expanding = isExpanding(row);
@@ -151,7 +251,8 @@ function FollowUpRow({
   // No detail tooltip mid-drag: the rows are moving, so it would describe
   // whichever row happened to slide under the cursor.
   const hasDetail =
-    showDetail && !anyDragging && row.detail !== null && row.detail !== "";
+    showDetail && !anyDragging && !editing && row.detail !== null && row.detail !== "";
+  const canDescribe = offerDescribe && !expanding && (row.detail === null || row.detail === "");
 
   return (
     <li
@@ -310,146 +411,195 @@ function FollowUpRow({
           )}
         </span>
       )}
-      <span
-        className={cn(
-          "min-w-0 flex-1 break-words text-sm leading-[1.4]",
-          inserted && "text-muted-foreground",
-          hasDetail && "cursor-help",
-        )}
-        tabIndex={hasDetail ? 0 : undefined}
-      >
-        {row.text}
-        {row.file !== null && (
-          <span className="ml-1.5 break-words text-xs text-muted-foreground">
-            {row.file}
-          </span>
-        )}
-      </span>
+      {editing ? (
+        <RowTextEditor
+          text={row.text}
+          onCancel={() => setEditing(false)}
+          onSave={(text) => {
+            setEditing(false);
+            if (text !== row.text) void onAmend(text);
+          }}
+        />
+      ) : (
+        <span
+          className={cn(
+            "min-w-0 flex-1 break-words text-sm leading-[1.4]",
+            inserted && "text-muted-foreground",
+            hasDetail && "cursor-help",
+          )}
+          tabIndex={hasDetail ? 0 : undefined}
+        >
+          {row.text}
+          {row.file !== null && (
+            <span className="ml-1.5 break-words text-xs text-muted-foreground">
+              {row.file}
+            </span>
+          )}
+        </span>
+      )}
       {/* Driven by a single hovered-row state rather than CSS `group-hover`.
           With group-hover several rows kept their actions up at once and then
           cleared together on the next render — the browser was holding stale
           :hover on rows the pointer had left. One state value cannot describe
           two rows, so that cannot happen. `focus-within` still covers keyboard,
           and touch keeps them permanently visible. */}
-      <span
-        className={cn(
-          "flex shrink-0 items-center gap-0.5 focus-within:opacity-100",
-          hoverActions ? (active ? "opacity-100" : "opacity-0") : "opacity-60",
-        )}
-      >
-        {/* Button deliberately omits `title`, so the native tooltip lives on a
-            wrapper. The glyph says what happens — the row joins the message
-            being written — rather than which way it travels to get there. */}
-        {/* One slot, two states: describe this, or stop describing it. Offered
-            only on a row with no detail — that is what an expansion is for, and
-            a sixth permanent action on every row would cost more than it
-            returns. A row a helper gave up on has no detail by definition, so
-            it keeps the button and can be asked again. */}
-        {offerDescribe && !expanding && (row.detail === null || row.detail === "") && (
-          <span title="Describe this in more detail" className="inline-flex">
-            <Button
-              variant="ghost"
-              size="icon"
-              className="size-6 text-muted-foreground"
-              disabled={busy}
-              onMouseDown={(event) => event.preventDefault()}
-              onClick={(event) => {
-                event.stopPropagation();
-                onExpand();
-              }}
-              aria-label={`Describe "${row.text}" in more detail`}
-            >
-              <Icon name="Brain" className="size-3.5" />
-            </Button>
-          </span>
-        )}
-        {expanding && (
-          <span title="Stop describing this" className="inline-flex">
-            <Button
-              variant="ghost"
-              size="icon"
-              className="size-6 text-muted-foreground hover:text-destructive"
-              onMouseDown={(event) => event.preventDefault()}
-              onClick={(event) => {
-                event.stopPropagation();
-                onCancelExpand();
-              }}
-              aria-label={`Stop describing "${row.text}"`}
-            >
-              <Icon name="Square" className="size-3.5" />
-            </Button>
-          </span>
-        )}
-        <span
-          title={
-            inserted
-              ? "Already in the composer — send to hand it to the agent"
-              : "Put this in the composer"
-          }
-          className="inline-flex"
-        >
-          <Button
-            variant="ghost"
-            size="icon"
-            className="size-6"
-            disabled={busy || inserted}
-            onMouseDown={(event) => event.preventDefault()}
-            onClick={onInsert}
-            aria-label={
-              inserted
-                ? `"${row.text}" is already in the composer`
-                : `Put "${row.text}" in the composer`
-            }
-          >
-            <Icon name="MessageSquarePlus" className="size-3.5" />
-          </Button>
-        </span>
-        <HandoffAction row={row} />
-        {/* Editing happens in the panel: a 240-character text and its detail
-            do not fit a row this size, and the panel already renders both. */}
-        <span title="Edit in the panel" className="inline-flex">
-          <Button
-            variant="ghost"
-            size="icon"
-            className="size-6"
-            disabled={busy}
-            onMouseDown={(event) => event.preventDefault()}
-            onClick={onEdit}
-            aria-label={`Edit "${row.text}" in the panel`}
-          >
-            <Icon name="Edit" className="size-3.5" />
-          </Button>
-        </span>
-        <span title="Mark done" className="inline-flex">
-          <Button
-            variant="ghost"
-            size="icon"
-            className="size-6"
-            disabled={busy}
-            onMouseDown={(event) => event.preventDefault()}
-            onClick={onDone}
-            aria-label={`Mark "${row.text}" done`}
-          >
-            <Icon name="Check" className="size-3.5" />
-          </Button>
-        </span>
+      {/* One verb on the row and the rest behind ⋯, the way bb's own Queue card
+          lays out its rows: six icons per row read as a toolbar, not a list.
+          Which verb stays is `mainActionFor`'s guess from the reason. */}
+      {!editing && (
         <span
-          title="Dismiss — it will not be recorded again on this thread"
-          className="inline-flex"
+          className={cn(
+            "flex shrink-0 items-center gap-0.5 focus-within:opacity-100",
+            hoverActions ? (active ? "opacity-100" : "opacity-0") : "opacity-60",
+          )}
         >
-          <Button
-            variant="ghost"
-            size="icon"
-            className="size-6 text-muted-foreground"
-            disabled={busy}
-            onMouseDown={(event) => event.preventDefault()}
-            onClick={onDismiss}
-            aria-label={`Dismiss "${row.text}" — it will not be recorded again on this thread`}
+          {/* Stopping a running helper stays inline: it is the way out of
+              something already happening, not one more option. */}
+          {expanding && (
+            <span title="Stop describing this" className="inline-flex">
+              <Button
+                variant="ghost"
+                size="icon"
+                className="size-6 text-muted-foreground hover:text-destructive"
+                onMouseDown={(event) => event.preventDefault()}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  onCancelExpand();
+                }}
+                aria-label={`Stop describing "${row.text}"`}
+              >
+                <Icon name="Square" className="size-3.5" />
+              </Button>
+            </span>
+          )}
+          {main === "handoff" ? (
+            <HandoffAction row={row} />
+          ) : (
+            <span
+              title={
+                inserted
+                  ? "Already in the composer — send to hand it to the agent"
+                  : "Put this in the composer"
+              }
+              className="inline-flex"
+            >
+              <Button
+                variant="ghost"
+                size="icon"
+                className="size-6"
+                disabled={busy || inserted}
+                onMouseDown={(event) => event.preventDefault()}
+                onClick={onInsert}
+                aria-label={
+                  inserted
+                    ? `"${row.text}" is already in the composer`
+                    : `Put "${row.text}" in the composer`
+                }
+              >
+                <Icon name="MessageSquarePlus" className="size-3.5" />
+              </Button>
+            </span>
+          )}
+          <DropdownMenu
+            modal={false}
+            // The detail tooltip would otherwise sit over the timeline for as
+            // long as the menu is open, since the pointer never left the row.
+            onOpenChange={(open) => open && onPeek(null)}
           >
-            <Icon name="X" className="size-3.5" />
-          </Button>
+            <span title="More actions" className="inline-flex">
+              <DropdownMenuTrigger asChild>
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  className="size-6 text-muted-foreground"
+                  onMouseDown={(event) => event.preventDefault()}
+                  aria-label={`More actions for "${row.text}"`}
+                >
+                  <Icon name="MoreHorizontal" className="size-3.5" />
+                </Button>
+              </DropdownMenuTrigger>
+            </span>
+            <DropdownMenuContent
+              align="end"
+              // Focus goes to the text editor when Edit is picked; Radix
+              // would otherwise pull it back to this trigger as it closes.
+              onCloseAutoFocus={(event) => event.preventDefault()}
+            >
+              {main !== "insert" && (
+                <DropdownMenuItem
+                  disabled={busy || inserted}
+                  onSelect={onInsert}
+                  aria-label={
+                    inserted
+                      ? `"${row.text}" is already in the composer`
+                      : `Put "${row.text}" in the composer`
+                  }
+                >
+                  <Icon name="MessageSquarePlus" className="size-3.5" aria-hidden />
+                  Put in composer
+                </DropdownMenuItem>
+              )}
+              {main !== "handoff" && (
+                <DropdownMenuItem
+                  onSelect={() => handoff(row)}
+                  aria-label={`Hand off "${row.text}" in a new thread`}
+                >
+                  <HugeiconsIcon icon={ArrowLeftRightIcon} className="size-3.5" aria-hidden />
+                  Hand off…
+                </DropdownMenuItem>
+              )}
+              <DropdownMenuItem
+                disabled={busy}
+                onSelect={() => setEditing(true)}
+                aria-label={`Edit "${row.text}"`}
+              >
+                <Icon name="Edit" className="size-3.5" aria-hidden />
+                Edit
+              </DropdownMenuItem>
+              {/* Offered only on a row with no detail — that is what describing
+                  is for. A row a helper gave up on has none by definition, so it
+                  can be asked again. */}
+              {canDescribe && (
+                <DropdownMenuItem
+                  disabled={busy}
+                  onSelect={onExpand}
+                  aria-label={`Describe "${row.text}" in more detail`}
+                >
+                  <Icon name="Brain" className="size-3.5" aria-hidden />
+                  Describe in more detail
+                </DropdownMenuItem>
+              )}
+              {/* The full editor, for the detail, file and reason a row this
+                  size has no room for. */}
+              <DropdownMenuItem
+                onSelect={onOpenInPanel}
+                aria-label={`Open "${row.text}" in the panel`}
+              >
+                <Icon name="ArrowUpRight" className="size-3.5" aria-hidden />
+                Open in the panel
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem
+                disabled={busy}
+                onSelect={onDone}
+                aria-label={`Mark "${row.text}" done`}
+              >
+                <Icon name="Check" className="size-3.5" aria-hidden />
+                Mark done
+              </DropdownMenuItem>
+              <DropdownMenuItem
+                destructive
+                disabled={busy}
+                onSelect={onDismiss}
+                aria-label={`Dismiss "${row.text}" — it will not be recorded again on this thread`}
+              >
+                <Icon name="X" className="size-3.5" aria-hidden />
+                Dismiss
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
         </span>
-      </span>
+      )}
     </li>
   );
 }
@@ -862,6 +1012,32 @@ export function FollowUpBanner() {
     [reload, composer],
   );
 
+  // Inline edits change the text only. A refusal is reported in a toast, since
+  // the editor has already closed by the time the answer arrives.
+  const amend = useCallback(
+    async (row: FollowUp, text: string) => {
+      const target = threadIdRef.current;
+      if (target === null) return;
+      setBusy(true);
+      try {
+        const result = await rpcRef.current.call("followups_amend", {
+          threadId: target,
+          id: row.id,
+          text,
+        });
+        if (threadIdRef.current === target) setRows(target, result.followUps, result.done);
+        const refusal = AMEND_REFUSAL[result.outcome];
+        if (refusal !== undefined) toast.error(refusal);
+      } catch {
+        toast.error("The edit was not saved. Try again.");
+        reload();
+      } finally {
+        setBusy(false);
+      }
+    },
+    [reload],
+  );
+
   const clearDone = useCallback(async () => {
     const target = threadIdRef.current;
     if (target === null) return;
@@ -932,52 +1108,27 @@ export function FollowUpBanner() {
             hover that is keeping it open — and, now that it sits above the whole
             card, from swallowing clicks meant for the timeline behind it. */}
         {peeked !== null && <PeekCard peek={peeked} portalProps={portalProps} />}
-        {/* Siblings, not nested: a Button inside the header button would be
-            invalid HTML. The summary text stays clickable, and the chevron is the
-            explicit affordance. */}
+        {/* Laid out like bb's Queue card, which stacks right under this one:
+            a label and a count on the left, the disclosure on the right. The
+            summary text is the toggle, with the chevron as its explicit
+            affordance; siblings rather than nested, since a button inside the
+            header button would be invalid HTML. */}
         <div className="flex w-full min-w-0 shrink-0 items-center gap-1.5 px-1">
-          {/* Leading, before the plugin's own glyph: this is a disclosure
-              triangle, and a disclosure triangle sits at the start of the row it
-              opens. Trailing, among the action buttons, it read as one more
-              action rather than the row's own state. Right when closed, down
-              when open — the same pair the done section below already uses, and
-              the reason it is no longer up/down is that there is nothing above
-              to point at. */}
-          <span title={collapsed ? "Show" : "Collapse"} className="inline-flex shrink-0">
-            <Button
-              variant="ghost"
-              size="icon"
-              className="size-5"
-              onMouseDown={(event) => event.preventDefault()}
-              onClick={(event) => {
-                event.stopPropagation();
-                // Expanding needs the screen the keyboard is occupying.
-                if (isCompact && collapsed) dismissKeyboard();
-                toggleCollapsed(threadId);
-              }}
-              aria-expanded={!collapsed}
-              aria-label={`${collapsed ? "Show" : "Hide"} the follow-up list`}
-            >
-              <Icon
-                name={collapsed ? "ChevronRight" : "ChevronDown"}
-                className="size-3.5 text-muted-foreground"
-              />
-            </Button>
-          </span>
-          <Icon name="TextWrap" className="size-3 shrink-0 text-muted-foreground" />
           <button
             type="button"
             onMouseDown={(event) => event.preventDefault()}
             onClick={(event) => {
               event.stopPropagation();
+              // Expanding needs the screen the keyboard is occupying.
               if (isCompact && collapsed) dismissKeyboard();
               toggleCollapsed(threadId);
             }}
             className="flex min-w-0 flex-1 items-baseline gap-1.5 text-left"
             aria-label={`${collapsed ? "Show" : "Hide"} the follow-up list`}
           >
-            <span className="shrink-0 text-xs font-medium text-muted-foreground">
-              {rows.length} follow-up{rows.length === 1 ? "" : "s"}
+            <span className="shrink-0 text-xs font-medium text-foreground">Follow-ups</span>
+            <span className="shrink-0 text-[11px] tabular-nums text-muted-foreground">
+              {rows.length}
             </span>
             {/* The rollup was a `title` on the old composer pill: invisible until
                 hover, and unreachable on touch. A full-width summary line has the
@@ -1059,6 +1210,28 @@ export function FollowUpBanner() {
               <Icon name="ArrowUpRight" className="size-3.5 text-muted-foreground" />
             </Button>
           </span>
+          {/* Up to grow the list over the timeline, down to fold it back toward
+              the composer, as on bb's Queue card. */}
+          <span title={collapsed ? "Show" : "Collapse"} className="inline-flex shrink-0">
+            <Button
+              variant="ghost"
+              size="icon"
+              className="size-6"
+              onMouseDown={(event) => event.preventDefault()}
+              onClick={(event) => {
+                event.stopPropagation();
+                if (isCompact && collapsed) dismissKeyboard();
+                toggleCollapsed(threadId);
+              }}
+              aria-expanded={!collapsed}
+              aria-label={`${collapsed ? "Show" : "Hide"} the follow-up list`}
+            >
+              <Icon
+                name={collapsed ? "ChevronUp" : "ChevronDown"}
+                className="size-3.5 text-muted-foreground"
+              />
+            </Button>
+          </span>
         </div>
         {/* Collapse animates as a grid row going 1fr → 0fr, not as height going
             to auto: `height: auto` is not interpolable without `interpolate-size`,
@@ -1120,7 +1293,8 @@ export function FollowUpBanner() {
               onPeek={schedulePeek}
               onCancelExpand={() => void cancelExpand(row)}
               onExpand={() => void expandRow(row)}
-              onEdit={() => {
+              onAmend={(text) => amend(row, text)}
+              onOpenInPanel={() => {
                 dismissKeyboard();
                 // Same reasoning as the header's panel button: every route from
                 // this banner into the panel hands the list over to it.
diff --git a/plugins/follow-up/src/handoff.tsx b/plugins/follow-up/src/handoff.tsx
index be6525b..80cffe5 100644
--- a/plugins/follow-up/src/handoff.tsx
+++ b/plugins/follow-up/src/handoff.tsx
@@ -12,6 +12,7 @@
 // The two destinations still exist; they moved into that view, beside the
 // draft, because "does this thread still own the work" is a decision about what
 // you have just written rather than a mode to set before writing it.
+import { useCallback } from "react";
 import { useBbNavigate } from "@get-bb/plugin-sdk/app";
 import { HugeiconsIcon } from "@hugeicons/react";
 import { ArrowLeftRightIcon } from "@hugeicons/core-free-icons";
@@ -23,8 +24,24 @@ import { HANDOFF_PANEL_ACTION } from "./panel-ids.ts";
 
 export { HANDOFF_PANEL_ACTION };
 
-export function HandoffAction({ row }: { row: FollowUp }) {
+/** Open the Hand off tab on a row: the button below, and the banner's ⋯ menu. */
+export function useHandoff(): (row: FollowUp) => void {
   const navigate = useBbNavigate();
+  return useCallback(
+    (row: FollowUp) => {
+      // The panel takes the screen; the keyboard should not fight it.
+      dismissKeyboard();
+      navigate.openThreadPanel({
+        actionId: HANDOFF_PANEL_ACTION,
+        params: { id: row.id },
+      });
+    },
+    [navigate],
+  );
+}
+
+export function HandoffAction({ row }: { row: FollowUp }) {
+  const handoff = useHandoff();
 
   return (
     <span title="Hand off — compose it in a new thread" className="inline-flex">
@@ -35,12 +52,7 @@ export function HandoffAction({ row }: { row: FollowUp }) {
         onMouseDown={(event) => event.preventDefault()}
         onClick={(event) => {
           event.stopPropagation();
-          // The panel takes the screen; the keyboard should not fight it.
-          dismissKeyboard();
-          navigate.openThreadPanel({
-            actionId: HANDOFF_PANEL_ACTION,
-            params: { id: row.id },
-          });
+          handoff(row);
         }}
         aria-label={`Hand off "${row.text}" in a new thread`}
       >
diff --git a/plugins/follow-up/tests/followups.test.ts b/plugins/follow-up/tests/followups.test.ts
index d1d4c6e..4b99a85 100644
--- a/plugins/follow-up/tests/followups.test.ts
+++ b/plugins/follow-up/tests/followups.test.ts
@@ -29,6 +29,7 @@ import {
 } from "../lib/followups.ts";
 import { expansionExecutionSchema } from "../lib/expansion-execution.ts";
 import type { ComposerMention } from "@get-bb/plugin-sdk/app";
+import { mainActionFor } from "../lib/followups.ts";
 import { backfillRequest, expansionPrompt, fileMentionOf, isExpanding, expansionGaveUp, contextAround, rowsEqual, houseStyleBlock, EXPANSION_TURNS, EXPANSION_WORD_CAP, CAP_CEILING } from "../lib/followups.ts";
 
 function row(text: string, overrides: Partial<FollowUp> = {}): FollowUp {
@@ -1244,3 +1245,10 @@ test("the cap ceiling is above the shipped default", () => {
   // Otherwise the setting could only ever narrow, which is not what it is for.
   assert.ok(CAP_CEILING > MAX_PER_THREAD);
 });
+
+test("an out-of-scope row leads with Hand off, every other row with the composer", () => {
+  assert.equal(mainActionFor("out-of-scope"), "handoff");
+  for (const reason of ["blocked", "deferred", "risk", "cleanup", null] as const) {
+    assert.equal(mainActionFor(reason), "insert", String(reason));
+  }
+});
diff --git a/plugins/follow-up/tests/ui/banner-actions.test.tsx b/plugins/follow-up/tests/ui/banner-actions.test.tsx
new file mode 100644
index 0000000..a15866e
--- /dev/null
+++ b/plugins/follow-up/tests/ui/banner-actions.test.tsx
@@ -0,0 +1,185 @@
+import { describe, expect, it, vi } from "vitest";
+import { fireEvent, waitFor } from "@testing-library/react";
+import { renderSlot } from "@get-bb/plugin-sdk/testing/app";
+import { toast } from "sonner";
+import { FollowUpBanner } from "../../src/banner.tsx";
+import type { FollowUp, Reason } from "../../lib/followups.ts";
+
+// Each banner row shows one action inline, chosen by its reason, and keeps the
+// rest in a ⋯ menu, the way bb's Queue card lays out its rows. Editing the text
+// happens in place.
+
+vi.mock("sonner", () => ({ toast: { success: vi.fn(), error: vi.fn() } }));
+
+const row = (id: string, text: string, reason: Reason | null): FollowUp => ({
+  id,
+  text,
+  reason,
+  file: null,
+  detail: null,
+  createdAt: "2026-10-01T00:00:00.000Z",
+});
+
+/** A server holding the rows; `amendOutcome` decides how an edit is answered. */
+function renderBanner(threadId: string, rows: FollowUp[], amendOutcome = "amended") {
+  const state = { open: [...rows] };
+  const lists = () => ({ followUps: state.open, done: [] });
+  const handlers = {
+    followups_list: async () => ({ ...lists(), everRecorded: true }),
+    followups_amend: async ({ id, text }: { id: string; text: string }) => {
+      if (amendOutcome === "amended") {
+        state.open = state.open.map((entry) => (entry.id === id ? { ...entry, text } : entry));
+      }
+      return { outcome: amendOutcome, ...lists() };
+    },
+  };
+  const slot = renderSlot({ component: FollowUpBanner }, {}, {
+    composer: { text: "", mentions: [], scope: { kind: "thread", threadId } },
+    rpc: handlers as never,
+  });
+  return slot;
+}
+
+type Slot = ReturnType<typeof renderSlot>;
+
+async function openMenu(slot: Slot, text: string) {
+  fireEvent.keyDown(await slot.findByRole("button", { name: `More actions for "${text}"` }), {
+    key: "Enter",
+  });
+  await slot.findByRole("menu");
+}
+
+const menuItems = (slot: Slot) =>
+  slot.getAllByRole("menuitem").map((item) => item.textContent?.trim());
+
+const amendCalls = (slot: Slot) =>
+  slot.inspection.rpcCalls.filter((call) => call.method === "followups_amend");
+
+describe("each row's one inline action", () => {
+  const away = row("r1", "Move the docs site", "out-of-scope");
+  const later = row("r2", "Tidy the config loader", "deferred");
+  const mine = row("r3", "Ask about the release date", null);
+
+  it("an out-of-scope row leads with Hand off", async () => {
+    const slot = renderBanner("thr_main", [away, later, mine]);
+    await slot.findByRole("button", { name: `Hand off "${away.text}" in a new thread` });
+    expect(slot.queryByRole("button", { name: `Put "${away.text}" in the composer` })).toBeNull();
+  });
+
+  it("every other row leads with Put in composer", async () => {
+    const slot = renderBanner("thr_main2", [away, later, mine]);
+    for (const entry of [later, mine]) {
+      await slot.findByRole("button", { name: `Put "${entry.text}" in the composer` });
+      expect(
+        slot.queryByRole("button", { name: `Hand off "${entry.text}" in a new thread` }),
+      ).toBeNull();
+    }
+  });
+
+  it("a cleanup row leads with Put in composer too, until there is a Queue action", async () => {
+    const tidy = row("r4", "Delete the old fixtures", "cleanup");
+    const slot = renderBanner("thr_cleanup", [tidy]);
+    await slot.findByRole("button", { name: `Put "${tidy.text}" in the composer` });
+  });
+});
+
+describe("the ⋯ menu", () => {
+  it("offers the action the row does not show inline, and the rest", async () => {
+    const away = row("r1", "Move the docs site", "out-of-scope");
+    const slot = renderBanner("thr_menu", [away]);
+    await openMenu(slot, away.text);
+    expect(menuItems(slot)).toEqual([
+      "Put in composer",
+      "Edit",
+      "Describe in more detail",
+      "Open in the panel",
+      "Mark done",
+      "Dismiss",
+    ]);
+  });
+
+  it("offers Hand off on a row that leads with Put in composer", async () => {
+    const later = row("r2", "Tidy the config loader", "deferred");
+    const slot = renderBanner("thr_menu2", [later]);
+    await openMenu(slot, later.text);
+    expect(menuItems(slot)).toContain("Hand off…");
+    expect(menuItems(slot)).not.toContain("Put in composer");
+  });
+});
+
+describe("editing a row in place", () => {
+  const later = row("r2", "Tidy the config loader", "deferred");
+
+  async function startEditing(slot: Slot) {
+    await openMenu(slot, later.text);
+    fireEvent.click(slot.getByRole("menuitem", { name: `Edit "${later.text}"` }));
+    return slot.findByRole("textbox", { name: `Edit "${later.text}"` });
+  }
+
+  it("Enter saves the new text", async () => {
+    const slot = renderBanner("thr_edit", [later]);
+    const field = await startEditing(slot);
+    fireEvent.change(field, { target: { value: "Tidy the config loader and its tests" } });
+    fireEvent.keyDown(field, { key: "Enter" });
+    await waitFor(() =>
+      expect(amendCalls(slot).map((call) => call.input)).toEqual([
+        { threadId: "thr_edit", id: "r2", text: "Tidy the config loader and its tests" },
+      ]),
+    );
+    expect(await slot.findByText("Tidy the config loader and its tests")).toBeDefined();
+  });
+
+  it("Escape puts the text back without saving", async () => {
+    const slot = renderBanner("thr_escape", [later]);
+    const field = await startEditing(slot);
+    fireEvent.change(field, { target: { value: "Something else" } });
+    fireEvent.keyDown(field, { key: "Escape" });
+    expect(await slot.findByText(later.text)).toBeDefined();
+    expect(slot.queryByRole("textbox")).toBeNull();
+    expect(amendCalls(slot)).toEqual([]);
+  });
+
+  it("leaving the text unchanged saves nothing", async () => {
+    const slot = renderBanner("thr_same", [later]);
+    const field = await startEditing(slot);
+    fireEvent.keyDown(field, { key: "Enter" });
+    await waitFor(() => expect(slot.queryByRole("textbox")).toBeNull());
+    expect(amendCalls(slot)).toEqual([]);
+  });
+
+  it("a row being edited shows no detail tooltip", async () => {
+    const detailed = { ...later, id: "r5", detail: "The loader reads three files and caches none." };
+    const slot = renderBanner("thr_peek", [detailed]);
+    await openMenu(slot, detailed.text);
+    fireEvent.click(slot.getByRole("menuitem", { name: `Edit "${detailed.text}"` }));
+    const field = await slot.findByRole("textbox", { name: `Edit "${detailed.text}"` });
+    fireEvent.mouseEnter(field.closest("li")!);
+    await new Promise((resolve) => setTimeout(resolve, 800));
+    expect(slot.queryByRole("tooltip")).toBeNull();
+  });
+
+  it("a refused edit says why", async () => {
+    vi.mocked(toast.error).mockClear();
+    const slot = renderBanner("thr_refused", [later], "duplicate");
+    const field = await startEditing(slot);
+    fireEvent.change(field, { target: { value: "Something already recorded" } });
+    fireEvent.keyDown(field, { key: "Enter" });
+    await waitFor(() =>
+      expect(toast.error).toHaveBeenCalledWith(
+        "Another follow-up on this thread already says that.",
+      ),
+    );
+  });
+});
+
+describe("the header", () => {
+  it("reads like bb's Queue card: a label and a count", async () => {
+    const slot = renderBanner("thr_header", [
+      row("r1", "One", null),
+      row("r2", "Two", "risk"),
+    ]);
+    const toggle = (await slot.findAllByRole("button", { name: "Hide the follow-up list" }))[0]!;
+    expect(toggle.textContent).toContain("Follow-ups");
+    expect(toggle.textContent).toContain("2");
+  });
+});
diff --git a/plugins/follow-up/tests/ui/pill-removal.test.tsx b/plugins/follow-up/tests/ui/pill-removal.test.tsx
index c50fbcd..36b54ce 100644
--- a/plugins/follow-up/tests/ui/pill-removal.test.tsx
+++ b/plugins/follow-up/tests/ui/pill-removal.test.tsx
@@ -73,12 +73,21 @@ function renderBanner(threadId: string, rows: FollowUp[]) {
 const pillIds = (slot: ReturnType<typeof renderSlot>) =>
   slot.inspection.composer.draft.mentions.map((mention) => (mention as { id: string }).id);
 
+/** The banner keeps Done and Dismiss in each row's ⋯ menu. */
+const menuTrigger = (slot: ReturnType<typeof renderSlot>, text: string) =>
+  slot.findByRole("button", { name: `More actions for "${text}"` });
+
+async function pickFromRowMenu(slot: ReturnType<typeof renderSlot>, text: string, item: string) {
+  fireEvent.keyDown(await menuTrigger(slot, text), { key: "Enter" });
+  fireEvent.click(await slot.findByRole("menuitem", { name: item }));
+}
+
 describe("the banner's own done and dismiss", () => {
   it("marking a row done removes its pill and leaves the others", async () => {
     const first = row("r1", "Fix the flaky test");
     const second = row("r2", "Update the docs");
     const { slot } = renderBanner("thr_done", [first, second]);
-    fireEvent.click(await slot.findByRole("button", { name: `Mark "${first.text}" done` }));
+    await pickFromRowMenu(slot, first.text, `Mark "${first.text}" done`);
     await waitFor(() => expect(pillIds(slot)).toEqual(["thr_done.r2"]));
     expect(slot.inspection.composer.text).toBe(`please ${second.text} today`);
   });
@@ -86,10 +95,10 @@ describe("the banner's own done and dismiss", () => {
   it("dismissing a row removes its pill", async () => {
     const only = row("r1", "Fix the flaky test");
     const { slot } = renderBanner("thr_dismiss", [only]);
-    fireEvent.click(
-      await slot.findByRole("button", {
-        name: `Dismiss "${only.text}" — it will not be recorded again on this thread`,
-      }),
+    await pickFromRowMenu(
+      slot,
+      only.text,
+      `Dismiss "${only.text}" — it will not be recorded again on this thread`,
     );
     await waitFor(() => expect(pillIds(slot)).toEqual([]));
     expect(slot.inspection.composer.text).toBe("please today");
@@ -98,14 +107,14 @@ describe("the banner's own done and dismiss", () => {
   it("a row that leaves through realtime keeps its pill in the draft", async () => {
     const only = row("r1", "Fix the flaky test");
     const { slot, backend } = renderBanner("thr_realtime", [only]);
-    await slot.findByRole("button", { name: `Mark "${only.text}" done` });
+    await menuTrigger(slot, only.text);
     // An agent's complete_follow_up, the CLI or another window: the server
     // moves the row and announces it; this banner did nothing itself.
     backend.state.done = [{ ...only, doneAt: "2026-10-02T00:00:00.000Z" }];
     backend.state.open = [];
     await slot.behavior.emitRealtime("followups-changed", { threadId: "thr_realtime" });
     await waitFor(() =>
-      expect(slot.queryByRole("button", { name: `Mark "${only.text}" done` })).toBeNull(),
+      expect(slot.queryByRole("button", { name: `More actions for "${only.text}"` })).toBeNull(),
     );
     expect(pillIds(slot)).toEqual(["thr_realtime.r1"]);
   });