diff --git a/README.md b/README.md
index ced75a5..79e45ca 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ Use the two dashboard hints for common actions; press `?` for the expanded key r
 ### Attached
 
 - Press `Ctrl-\` to background the task and return to the dashboard.
+- Press `]` on the dashboard to mark a flagship task. Press `Ctrl-]` to attach to it, and again to return.
 - Other supported input is forwarded to the task's PTY.
 
 See [`docs/commands.md`](docs/commands.md#dashboard) for every key and launch flag, including the routing mechanics.
diff --git a/docs/commands.md b/docs/commands.md
index e58bbd1..1590d18 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -30,6 +30,8 @@ Choose the operating mode with launch arguments. Use keys to control the dashboa
 | `s` | Cycle grouping: by state / by directory / by custom group |
 | `m` | Tag the selected task "in use" (toggles) |
 | `M` | Select the next tagged task in dashboard order, wrapping at the end |
+| `]` | Mark the selected task as the [flagship](#the-flagship) (toggles; one at a time) |
+| `Ctrl-]` | Attach to the flagship |
 | `g` | Assign the selected task to a group (through the group picker) |
 | `R` | Rename the selected task: a display name shown in place of the command |
 | `r` | Rerun a finished task; use the captured resume command for supported agent tasks |
@@ -51,6 +53,9 @@ Choose the operating mode with launch arguments. Use keys to control the dashboa
 | `✓` | Completed, exit 0 |
 | `✗` | Completed, non-zero exit |
 | `◆` | Tagged "in use" |
+| `⚑` | The [flagship](#the-flagship) |
+
+Look for marks in the row's two leading columns, aligned left with `◆` before `⚑`.
 
 After 10 seconds without output, a task is marked `∙` and grouped under Idle.
 
@@ -68,6 +73,8 @@ Cursor keys are encoded according to the child's live cursor-key mode. In applic
 
 `Ctrl-\` is the physical chord. The same chord may be reported by Crossterm as `Ctrl-4`; both representations are accepted.
 
+Press `Ctrl-]` to attach to the [flagship](#the-flagship), then again to return to your previous task or the dashboard. As with `Ctrl-\`, you cannot send this key combination to a child: use another binding for tag-jump in `vim` or character search in readline. Both `Ctrl-]` and `Ctrl-5` are accepted; the latter is the Crossterm representation of the legacy encoding.
+
 #### Modified keys, paste, and mouse input
 
 These inputs cannot all be forwarded byte-for-byte. Their encoding and destination depend on the terminal and the attached child's modes.
@@ -134,6 +141,19 @@ Press `M` to select the next tagged task in dashboard order, wrapping after the
 
 In custom mode only, a new command is assigned the selected task's group, through both `n` and the `@` picker. The destination is shown in the spawn prompt as `❯ dir ▸ group ▸ command`, each segment present only when it applies: the dir segment for a non-default directory, the group segment when a group will be inherited. New tasks are unassigned in state and dir modes.
 
+#### The flagship
+
+Press `]` to mark the selected task as the flagship, shown as `⚑`; press it again to clear the mark. You can mark only one task at a time. Select another task and press `]` to move the mark. Finished tasks cannot be marked. Sorting is unchanged.
+
+Press `Ctrl-]` from the dashboard, peek, or an attached task to attach to the flagship, and again to go back:
+
+- From an attached task: back to that task, even if it has finished since. If it was removed, back to the dashboard.
+- From the dashboard or peek: back to the dashboard, with the selection on the same row. Peek is not reopened.
+
+After attaching to the flagship with `Enter`, press `Ctrl-]` to return to the dashboard.
+
+The flagship mark is cleared on task completion or removal and is not saved in sessions. Tags set with `m` are retained after task completion.
+
 #### Renaming
 
 Press `R` to rename the selected task, starting with its current name. Press `Enter` to save, or `Esc` to cancel. Leave the field empty to clear the name and display the command again. Use lowercase `r` to rerun.
@@ -188,7 +208,7 @@ A recovery row is formatted as `<age> ago · <tasks> task(s) · <label>`: the fi
 
 ## The `?` controls overlay
 
-Use the two dashboard hints for common actions: `↑↓ select · enter attach · space peek · ? controls` and `❯ n run · @ dir · / find · s sort`. Press `?` for the expanded reference, including dashboard actions and the attached-mode background chord.
+Use the two dashboard hints for common actions: `↑↓ select · enter attach · space peek · ? controls` and `❯ n run · @ dir · / find · s sort`. Press `?` for the expanded reference, including dashboard actions and the attached-mode background and flagship chords. With a flagship marked, look for `· Ctrl-] flagship` at the end of the first hint.
 
 Bindings are grouped by purpose in a centered, non-scrolling box. Press `?`, `Esc`, or `q` to return to the dashboard, or `Ctrl-C` to disconnect. Other keys are ignored.
 
@@ -204,7 +224,7 @@ Read the source of the row's dashboard preview in the footer's `preview:` segmen
 
 ## Attached
 
-Interact with the task in the terminal. The status bar is formatted as `[attached] <command>    Ctrl-\ background`, or `[attached] <name> · <command>` for a named task. Press `Ctrl-\` to return to the dashboard. Other supported input normally goes to the child; navigation keys are reserved in [scrollback](#scrollback).
+Interact with the task in the terminal. The status bar is formatted as `[attached] <command>    Ctrl-\ background`, or `[attached] <name> · <command>` for a named task. When you can navigate with `Ctrl-]`, look for `· Ctrl-] flagship`, `· Ctrl-] back to <task>`, or `· Ctrl-] back to dashboard` in the hint. Long titles are shortened with `…` to leave room for the hints. Press `Ctrl-\` to return to the dashboard. Other supported input is normally forwarded to the child; navigation keys are reserved in [scrollback](#scrollback).
 
 ## Connection loss
 
diff --git a/docs/img/controls.ansi b/docs/img/controls.ansi
index ce65772..ac61159 100644
--- a/docs/img/controls.ansi
+++ b/docs/img/controls.ansi
@@ -1 +1 @@
-]0;fleetcom[?2026h[?25l  fleetcom   12 running · 2 idle · 7 done      by state · dir · custom · 4/21                                                                                                                                           ~/Documents/Code/Rust/fleetcom                                                                             ✻ ◆Dashboard Refine           Scope small fixes for dashboard and CLI                                  2m  ✻ ◆Summary Refine             Inferring… · thinking with high effort                                   5m  ✻  Grok Language              Grok 4.5 (xhigh) · Responding…                                          12m  ✻  Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.… 18m  ✻  Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.… 24m  ✓  cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered… 12s  ✗  cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error   3m  ~                                                                                                          ✻  claude agents              2 awaiting input · claude agents                                         1h  ✻  Zellij                     Desktop ¦ Utility                                                        2h  ∙  python                     >>>                                                                     41m  ✓  brew update && brew upgra… Already up-to-date.                                                     13m  ~/Documents/Code/Apple/turret                                                                              ✻  Game Infra Review          Turret Game Codebase Organization and Ex… - grok                         8m  ✻  Missile Nerf               Tuning missile damage falloff                                           33m  ✻  EMP Nerf                   EMP arc balance pass                                                    35m  ~/Documents/Code/Rust/crabapple                                                                            ✓  cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s       17m  ~/Documents/Code/Rust/crabstep                                                                             ✓  cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s       21m  ~/Documents/Code/Rust/imessage-exporter                                                                    ✻  claude                     Review GitHub issue 780                                                  6m  ✓  cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s       19m  ~/Documents/Code/Rust/Logria                                                                               ✻  cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed            45s  ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls                                                       [?25l┌─ controls ────────────────────────────────────────────┐│  Navigate                                             ││    ↑↓ / kj   move selection  /         find a task    ││    Tab ⇧Tab  jump section    M         next tagged    ││  Act                                                  ││    enter     attach          r         rerun finished ││    space     peek            X         kill or remove ││  Organize                                             ││    m         tag in use      R         rename         ││    g         assign group    s         cycle grouping ││  Create                                               ││    n         run here        @         run in a dir   ││  Session                                              ││    w         save session    o         load session   ││  Leave                                                ││    q         detach          Q         quit and kill  ││  Attached                                             ││    Ctrl-\    background                               │└───────────────────────────────────────────────────────┘ ? esc close [?2026l
\ No newline at end of file
+]0;fleetcom[?2026h[?25l  fleetcom   12 running · 2 idle · 7 done      by state · dir · custom · 4/21                                                                                                                                           ~/Documents/Code/Rust/fleetcom                                                                           ◆ ✻ Dashboard Refine           Scope small fixes for dashboard and CLI                                   2m◆ ✻ Summary Refine             Inferring… · thinking with high effort                                    5m  ✻ Grok Language              Grok 4.5 (xhigh) · Responding…                                           12m  ✻ Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.5… 18m  ✻ Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.4… 24m  ✓ cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered … 12s  ✗ cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error    3m  ~                                                                                                          ✻ claude agents              2 awaiting input · claude agents                                          1h⚑ ✻ Zellij                     Desktop ¦ Utility                                                         2h  ∙ python                     >>>                                                                      41m  ✓ brew update && brew upgra… Already up-to-date.                                                      13m  ~/Documents/Code/Apple/turret                                                                              ✻ Game Infra Review          Turret Game Codebase Organization and Ex… - grok                          8m  ✻ Missile Nerf               Tuning missile damage falloff                                            33m  ✻ EMP Nerf                   EMP arc balance pass                                                     35m  ~/Documents/Code/Rust/crabapple                                                                            ✓ cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s        17m  ~/Documents/Code/Rust/crabstep                                                                             ✓ cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s        21m  ~/Documents/Code/Rust/imessage-exporter                                                                    ✻ claude                     Review GitHub issue 780                                                   6m  ✓ cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s        19m  ~/Documents/Code/Rust/Logria                                                                               ✻ cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed             45s  ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls · Ctrl-] flagship                                     [?25l┌─ controls ──────────────────────────────────────────────┐│  Navigate                                               ││    ↑↓ / kj   move selection   /         find a task     ││    Tab ⇧Tab  jump section     M         next tagged     ││  Act                                                    ││    enter     attach           r         rerun finished  ││    space     peek             X         kill or remove  ││  Organize                                               ││    m         tag in use       R         rename          ││    ]         flagship         s         cycle grouping  ││    g         assign group                               ││  Create                                                 ││    n         run here         @         run in a dir    ││  Session                                                ││    w         save session     o         load session    ││  Leave                                                  ││    q         detach           Q         quit and kill   ││  Attached                                               ││    Ctrl-\    background       Ctrl-]    flagship / back │└─────────────────────────────────────────────────────────┘ ? esc close [?2026l
\ No newline at end of file
diff --git a/docs/img/controls.png b/docs/img/controls.png
index b1178a0..e8c5f9e 100644
Binary files a/docs/img/controls.png and b/docs/img/controls.png differ
diff --git a/docs/img/groups.ansi b/docs/img/groups.ansi
index 8a7b8e9..4a87bb5 100644
--- a/docs/img/groups.ansi
+++ b/docs/img/groups.ansi
@@ -1 +1 @@
-]0;fleetcom[?2026h[?25l  fleetcom   12 running · 2 idle · 7 done      by state · dir · custom                                                                                                                                                  dashboard                                                                                                  ✻ ◆Dashboard Refine           Scope small fixes for dashboard and CLI                                  2m  ✻ ◆Summary Refine             Inferring… · thinking with high effort                                   5m  ✻  Grok Language              Grok 4.5 (xhigh) · Responding…                                          12m  ✻  Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.… 18m  ✻  Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.… 24m  desktop                                                                                                    ✻  claude agents              2 awaiting input · claude agents                                         1h  ✻  Zellij                     Desktop ¦ Utility                                                        2h  ✓  brew update && brew upgra… Already up-to-date.                                                     13m  tests                                                                                                      ✻  cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed            45s  ∙  cargo doc --open           Finished `dev` profile [unoptimized + debuginfo] target(s) in 3.41s     26m  ✓  cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s       17m  ✓  cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s       21m  ✓  cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered… 12s  ✗  cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error   3m  ✓  cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s       19m  ✓  cargo test                 test result: ok. 223 passed; 0 failed; 0 ignored; 0 measured; 0 filter… 31m  turret                                                                                                     ✻  Game Infra Review          Turret Game Codebase Organization and Ex… - grok                         8m  ✻  Missile Nerf               Tuning missile damage falloff                                           33m  ✻  EMP Nerf                   EMP arc balance pass                                                    35m  Unassigned                                                                                                 ∙  python                     >>>                                                                     41m  ✻  claude                     Review GitHub issue 780                                                  6m  ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls                                                       [?25l[?2026l
\ No newline at end of file
+]0;fleetcom[?2026h[?25l  fleetcom   12 running · 2 idle · 7 done      by state · dir · custom                                                                                                                                                  dashboard                                                                                                ◆ ✻ Dashboard Refine           Scope small fixes for dashboard and CLI                                   2m◆ ✻ Summary Refine             Inferring… · thinking with high effort                                    5m  ✻ Grok Language              Grok 4.5 (xhigh) · Responding…                                           12m  ✻ Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.5… 18m  ✻ Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.4… 24m  desktop                                                                                                    ✻ claude agents              2 awaiting input · claude agents                                          1h⚑ ✻ Zellij                     Desktop ¦ Utility                                                         2h  ✓ brew update && brew upgra… Already up-to-date.                                                      13m  tests                                                                                                      ✻ cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed             45s  ∙ cargo doc --open           Finished `dev` profile [unoptimized + debuginfo] target(s) in 3.41s      26m  ✓ cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s        17m  ✓ cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s        21m  ✓ cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered … 12s  ✗ cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error    3m  ✓ cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s        19m  ✓ cargo test                 test result: ok. 223 passed; 0 failed; 0 ignored; 0 measured; 0 filtere… 31m  turret                                                                                                     ✻ Game Infra Review          Turret Game Codebase Organization and Ex… - grok                          8m  ✻ Missile Nerf               Tuning missile damage falloff                                            33m  ✻ EMP Nerf                   EMP arc balance pass                                                     35m  Unassigned                                                                                                 ∙ python                     >>>                                                                      41m  ✻ claude                     Review GitHub issue 780                                                   6m  ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls · Ctrl-] flagship                                     [?25l[?2026l
\ No newline at end of file
diff --git a/docs/img/groups.png b/docs/img/groups.png
index c959244..8566150 100644
Binary files a/docs/img/groups.png and b/docs/img/groups.png differ
diff --git a/docs/img/home.ansi b/docs/img/home.ansi
index b73b7da..bea2246 100644
--- a/docs/img/home.ansi
+++ b/docs/img/home.ansi
@@ -1 +1 @@
-]0;fleetcom[?2026h[?25l  fleetcom   12 running · 2 idle · 7 done      by state · dir · custom · 4/21                                                                                                                                           ~/Documents/Code/Rust/fleetcom                                                                             ✻ ◆Dashboard Refine           Scope small fixes for dashboard and CLI                                  2m  ✻ ◆Summary Refine             Inferring… · thinking with high effort                                   5m  ✻  Grok Language              Grok 4.5 (xhigh) · Responding…                                          12m  ✻  Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.… 18m  ✻  Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.… 24m  ✓  cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered… 12s  ✗  cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error   3m  ~                                                                                                          ✻  claude agents              2 awaiting input · claude agents                                         1h  ✻  Zellij                     Desktop ¦ Utility                                                        2h  ∙  python                     >>>                                                                     41m  ✓  brew update && brew upgra… Already up-to-date.                                                     13m  ~/Documents/Code/Apple/turret                                                                              ✻  Game Infra Review          Turret Game Codebase Organization and Ex… - grok                         8m  ✻  Missile Nerf               Tuning missile damage falloff                                           33m  ✻  EMP Nerf                   EMP arc balance pass                                                    35m  ~/Documents/Code/Rust/crabapple                                                                            ✓  cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s       17m  ~/Documents/Code/Rust/crabstep                                                                             ✓  cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s       21m  ~/Documents/Code/Rust/imessage-exporter                                                                    ✻  claude                     Review GitHub issue 780                                                  6m  ✓  cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s       19m  ~/Documents/Code/Rust/Logria                                                                               ✻  cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed            45s  ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls                                                       [?25l[?2026l
\ No newline at end of file
+]0;fleetcom[?2026h[?25l  fleetcom   12 running · 2 idle · 7 done      by state · dir · custom · 4/21                                                                                                                                           ~/Documents/Code/Rust/fleetcom                                                                           ◆ ✻ Dashboard Refine           Scope small fixes for dashboard and CLI                                   2m◆ ✻ Summary Refine             Inferring… · thinking with high effort                                    5m  ✻ Grok Language              Grok 4.5 (xhigh) · Responding…                                           12m  ✻ Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.5… 18m  ✻ Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.4… 24m  ✓ cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered … 12s  ✗ cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error    3m  ~                                                                                                          ✻ claude agents              2 awaiting input · claude agents                                          1h⚑ ✻ Zellij                     Desktop ¦ Utility                                                         2h  ∙ python                     >>>                                                                      41m  ✓ brew update && brew upgra… Already up-to-date.                                                      13m  ~/Documents/Code/Apple/turret                                                                              ✻ Game Infra Review          Turret Game Codebase Organization and Ex… - grok                          8m  ✻ Missile Nerf               Tuning missile damage falloff                                            33m  ✻ EMP Nerf                   EMP arc balance pass                                                     35m  ~/Documents/Code/Rust/crabapple                                                                            ✓ cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s        17m  ~/Documents/Code/Rust/crabstep                                                                             ✓ cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s        21m  ~/Documents/Code/Rust/imessage-exporter                                                                    ✻ claude                     Review GitHub issue 780                                                   6m  ✓ cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s        19m  ~/Documents/Code/Rust/Logria                                                                               ✻ cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed             45s  ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls · Ctrl-] flagship                                     [?25l[?2026l
\ No newline at end of file
diff --git a/docs/img/home.png b/docs/img/home.png
index 92a6d42..7c3b0f4 100644
Binary files a/docs/img/home.png and b/docs/img/home.png differ
diff --git a/docs/img/quickpeek.ansi b/docs/img/quickpeek.ansi
index 2a86e02..18bdbd8 100644
--- a/docs/img/quickpeek.ansi
+++ b/docs/img/quickpeek.ansi
@@ -1 +1 @@
-]0;fleetcom[?2026h[?25l  fleetcom   1 running · 13 idle · 7 done      by state · dir · custom                                                                                                                                                  In use                                                                                                     ∙ ◆Dashboard Refine           Scope small fixes for dashboard and CLI                                 32s  ∙ ◆Summary Refine             Review fleetcom preview design document                                 13s  Running                                                                                                    ✻  Zellij                     Desktop ¦ Utility                                                       20m  Idle                                                                                                       ∙  claude agents              2 awaiting input · claude agents                                         1m  ∙  python                     >>>                                                                     20m  ∙  Game Infra Review          Turret Game Codebase Organization and Ex… - grok                         1m  ∙  Missile Nerf               Tuning missile damage falloff                                            1m  ∙  EMP Nerf                   EMP arc balance pass                                                     1m  ∙  Grok Language              Grok 4.5 (xhigh) · Responding…                                           1m  ∙  Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.5… 1m  ∙  Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.4… 1m  ∙  claude                     Review GitHub issue 780                                                  1m  ∙  cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed             2m  ∙  cargo doc --open           Finished `dev` profile [unoptimized + debuginfo] target(s) in 3.41s     28m  Completed                                                                                                  ✓  brew update && brew upgra… Already up-to-date.                                                     15m  ✓  cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s       19m  ✓  cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s       20m  ✓  cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered… 20m  ✗  cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error  21m  ✓  cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s       20m  ✓  cargo test                 test result: ok. 223 passed; 0 failed; 0 ignored; 0 measured; 0 filter… 20m                                                                                                             ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls                                                       [?25l┌─ cargo test ─────────────────────────────────────────────────────────────────┐│test util::sanitizers::tests::test_length_clean ... ok                        ││test util::sanitizers::tests::test_row_length_clean ... ok                    ││test util::sanitizers::tests::test_length_dirty ... ok                        ││test util::sanitizers::tests::test_length_wide_chars ... ok                   ││test util::sanitizers::tests::test_sanitize_filename_clean ... ok             ││test util::sanitizers::tests::test_row_length_dirty ... ok                    ││test util::sanitizers::tests::test_row_length_wide_chars ... ok               ││test util::sanitizers::tests::test_sanitize_filename_control_chars ... ok     ││test util::sanitizers::tests::test_sanitize_filename_trim ... ok              ││test util::sanitizers::tests::test_sanitize_filename_invalid_chars ... ok     ││test util::sanitizers::tests::test_sanitize_filename_long ... ok              ││                                                                              ││test result: ok. 223 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out;…││                                                                              │└──────────────────────────────────────────────────────────────────────────────┘ space/esc close · enter attach · preview: floor (frozen) [?2026l
\ No newline at end of file
+]0;fleetcom[?2026h[?25l  fleetcom   1 running · 13 idle · 7 done      by state · dir · custom                                                                                                                                                  In use                                                                                                   ◆ ∙ Dashboard Refine           Scope small fixes for dashboard and CLI                                  32s◆ ∙ Summary Refine             Review fleetcom preview design document                                  13s  Running                                                                                                  ⚑ ✻ Zellij                     Desktop ¦ Utility                                                        20m  Idle                                                                                                       ∙ claude agents              2 awaiting input · claude agents                                          1m  ∙ python                     >>>                                                                      20m  ∙ Game Infra Review          Turret Game Codebase Organization and Ex… - grok                          1m  ∙ Missile Nerf               Tuning missile damage falloff                                             1m  ∙ EMP Nerf                   EMP arc balance pass                                                      1m  ∙ Grok Language              Grok 4.5 (xhigh) · Responding…                                            1m  ∙ Codex Language             gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 387K used · 9.53… 1m  ∙ Codex Review               gpt-5.6-sol high · fleetcom · feat/cs/interface-fixes · 221K used · 4.41… 1m  ∙ claude                     Review GitHub issue 780                                                   1m  ∙ cargo watch -x test        [Running 'cargo test'] test result: ok. 223 passed; 0 failed              2m  ∙ cargo doc --open           Finished `dev` profile [unoptimized + debuginfo] target(s) in 3.41s      28m  Completed                                                                                                  ✓ brew update && brew upgra… Already up-to-date.                                                      15m  ✓ cargo test                 all doctests ran in 0.39s; merged doctests compilation took 0.38s        19m  ✓ cargo test                 all doctests ran in 0.83s; merged doctests compilation took 0.81s        20m  ✓ cargo test                 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered … 20m  ✗ cargo clippy               error: could not compile `fleetcom` (lib test) due to 1 previous error   21m  ✓ cargo test                 all doctests ran in 1.99s; merged doctests compilation took 1.95s        20m  ✓ cargo test                 test result: ok. 223 passed; 0 failed; 0 ignored; 0 measured; 0 filtere… 20m                                                                                                             ❯ n run · @ dir · / find · s sort                                                                          ↑↓ select · enter attach · space peek · ? controls · Ctrl-] flagship                                     [?25l┌─ cargo test ─────────────────────────────────────────────────────────────────┐│test util::sanitizers::tests::test_length_clean ... ok                        ││test util::sanitizers::tests::test_row_length_clean ... ok                    ││test util::sanitizers::tests::test_length_dirty ... ok                        ││test util::sanitizers::tests::test_length_wide_chars ... ok                   ││test util::sanitizers::tests::test_sanitize_filename_clean ... ok             ││test util::sanitizers::tests::test_row_length_dirty ... ok                    ││test util::sanitizers::tests::test_row_length_wide_chars ... ok               ││test util::sanitizers::tests::test_sanitize_filename_control_chars ... ok     ││test util::sanitizers::tests::test_sanitize_filename_trim ... ok              ││test util::sanitizers::tests::test_sanitize_filename_invalid_chars ... ok     ││test util::sanitizers::tests::test_sanitize_filename_long ... ok              ││                                                                              ││test result: ok. 223 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out;…││                                                                              │└──────────────────────────────────────────────────────────────────────────────┘ space/esc close · enter attach · preview: floor (frozen) [?2026l
\ No newline at end of file
diff --git a/docs/img/quickpeek.png b/docs/img/quickpeek.png
index e782120..a9761ce 100644
Binary files a/docs/img/quickpeek.png and b/docs/img/quickpeek.png differ
diff --git a/src/app.rs b/src/app.rs
index fce25b5..71ee4a3 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -173,6 +173,25 @@ pub enum Row {
     Task(usize),
 }
 
+/// Return destination after attaching to the flagship.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum Origin {
+    Dashboard,
+    Task(u64),
+}
+
+/// Destination for `Ctrl-]`, from `App::chord_target`. Use the same value for
+/// navigation and the attached-bar hint to keep them consistent.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Target {
+    /// Return to the previously attached task; the id is in `views`.
+    Task(u64),
+    /// Return to the dashboard: no previous task, or its id is absent from `views`.
+    Dashboard,
+    /// Jump to the flagship with this id.
+    Flagship(u64),
+}
+
 pub struct App {
     /// Connection to the task-owning core.
     transport: Box<dyn Transport>,
@@ -206,6 +225,11 @@ pub struct App {
     /// Id of the attached task, if any: by id (not index) so it survives the
     /// task list changing underneath it.
     pub focused_id: Option<u64>,
+    /// Return destination for `Ctrl-]`. Set on attachment only if the target
+    /// is marked as flagship in the current snapshot. Retain after the
+    /// flagship's exit so the user can still return. Clear on every exit from
+    /// attached mode and on reconnect: task ids are daemon-local.
+    return_to: Option<Origin>,
     /// Whether the host terminal window has focus. While unfocused, highlighted
     /// rows use a bright-black background.
     pub terminal_focused: bool,
@@ -394,6 +418,7 @@ impl App {
         self.watched = None;
         self.selected_id = None;
         self.pending_select = None;
+        self.return_to = None;
         self.mode = Mode::Dashboard;
     }
 
@@ -439,6 +464,7 @@ impl App {
             spawn_cwd: invocation_dir.clone(),
             spawn_group: None,
             focused_id: None,
+            return_to: None,
             terminal_focused: true,
             rows,
             cols,
@@ -849,13 +875,7 @@ impl App {
             self.set_watch(watch);
             self.sync();
 
-            // Replace an unreachable daemon's snapshot with the reconnect banner.
-            if self.mode != Mode::Disconnected && !self.transport.connected() {
-                self.mode = Mode::Disconnected;
-                self.focused_id = None;
-                self.status = None;
-                self.selection = None;
-            }
+            self.check_connection();
 
             if self.term_signal.load(Ordering::Relaxed) {
                 // Detach on a terminating signal; leave tasks running under the daemon.
@@ -866,13 +886,7 @@ impl App {
                 break;
             }
             self.resolve_selection();
-            // If the attached task is gone, fall back to the dashboard rather
-            // than pointing `focused_id` at nothing.
-            if self.mode == Mode::Attached && self.focused_task().is_none() {
-                self.mode = Mode::Dashboard;
-                self.focused_id = None;
-                self.selection = None;
-            }
+            self.check_attached_task();
 
             // Flush clipboard output and synchronize terminal input modes.
             self.flush_clipboard(out)?;
@@ -919,6 +933,28 @@ impl App {
         Ok(())
     }
 
+    /// Replace an unreachable daemon's snapshot with the reconnect banner.
+    fn check_connection(&mut self) {
+        if self.mode != Mode::Disconnected && !self.transport.connected() {
+            self.mode = Mode::Disconnected;
+            self.focused_id = None;
+            self.return_to = None;
+            self.status = None;
+            self.selection = None;
+        }
+    }
+
+    /// If the attached task is gone, fall back to the dashboard rather than
+    /// pointing `focused_id` at nothing.
+    fn check_attached_task(&mut self) {
+        if self.mode == Mode::Attached && self.focused_task().is_none() {
+            self.mode = Mode::Dashboard;
+            self.focused_id = None;
+            self.return_to = None;
+            self.selection = None;
+        }
+    }
+
     fn on_resize(&mut self, rows: u16, cols: u16) {
         // A terminal resize invalidates the selected pane coordinates.
         self.selection = None;
@@ -1170,6 +1206,15 @@ impl App {
             self.should_quit = true;
             return;
         }
+        // Reserve `Ctrl-]` from children, like `Ctrl-\`. Handle it before mode
+        // dispatch to avoid forwarding it through the scrollback catch-all in
+        // `on_key_attached`. Ignore it in other modes to preserve prompt input.
+        if is_chord_key(k) {
+            if matches!(self.mode, Mode::Dashboard | Mode::Peek | Mode::Attached) {
+                self.on_chord(out);
+            }
+            return;
+        }
         match self.mode {
             Mode::Dashboard => self.on_key_dashboard(k),
             Mode::Spawn => self.on_key_spawn(k),
@@ -1229,6 +1274,17 @@ impl App {
                 }
             }
             KeyCode::Char('M') => self.select_next_tagged(),
+            // Do not mark finished tasks: the mark would be cleared on the
+            // next daemon tick, before inclusion in a snapshot.
+            KeyCode::Char(']') => {
+                if let Some(i) = self.selected_task()
+                    && !matches!(self.views[i].lifecycle, Lifecycle::Ok | Lifecycle::Failed)
+                {
+                    let v = &self.views[i];
+                    let id = (!v.flagship).then_some(v.id);
+                    self.transport.send(Command::Flagship { id });
+                }
+            }
             KeyCode::Char('g') => self.open_group_picker(),
             KeyCode::Char('/') => self.open_find_palette(),
             // Uppercase R renames; lowercase r reruns.
@@ -1478,13 +1534,7 @@ impl App {
         let detach = k.modifiers.contains(KeyModifiers::CONTROL)
             && matches!(k.code, KeyCode::Char('\\') | KeyCode::Char('4'));
         if detach {
-            self.mode = Mode::Dashboard;
-            self.focused_id = None;
-            // Reset the task viewport on watch change.
-            self.view_scroll = false;
-            self.selection = None;
-            // Repaint from scratch next tick; wipe the child's screen now.
-            let _ = execute!(out, Clear(ClearType::All), MoveTo(0, 0));
+            self.detach(out);
             return;
         }
         // Keep one row of overlap between pages.
@@ -1743,14 +1793,78 @@ impl App {
         Ok(())
     }
 
+    /// Attach to the selected task from the dashboard or Peek.
     fn attach(&mut self) {
         if let Some(i) = self.selected_task() {
-            // All tasks already run at the client's content size, so there's no
-            // resize to do: just take focus. The screen arrives via `Watch`,
-            // sent from the run loop next tick.
-            self.focused_id = Some(self.views[i].id);
-            self.mode = Mode::Attached;
-            self.view_scroll = false;
+            self.attach_to(self.views[i].id, Origin::Dashboard);
+        }
+    }
+
+    /// Attach to task `id`. Record `origin` if the target is marked as flagship
+    /// in the current snapshot; otherwise clear `return_to`. After `]`, the
+    /// updated snapshot may not yet be available: handle attachment to the
+    /// flagship without a recorded origin in `chord_target`.
+    fn attach_to(&mut self, id: u64, origin: Origin) {
+        // No resize is needed: each task is already at the client's content
+        // size. Request its screen through `Watch` on the next run-loop tick.
+        let flagship = self.task_index(id).is_some_and(|i| self.views[i].flagship);
+        self.focused_id = Some(id);
+        self.mode = Mode::Attached;
+        self.view_scroll = false;
+        self.return_to = flagship.then_some(origin);
+    }
+
+    /// Background the attached task and return to the dashboard. Preserve the
+    /// selected row.
+    fn detach(&mut self, out: &mut Stdout) {
+        self.mode = Mode::Dashboard;
+        self.focused_id = None;
+        self.return_to = None;
+        // Reset the task viewport on watch change.
+        self.view_scroll = false;
+        self.selection = None;
+        // Repaint from scratch next tick; wipe the child's screen now.
+        let _ = execute!(out, Clear(ClearType::All), MoveTo(0, 0));
+    }
+
+    /// Return the destination for `Ctrl-]`, in priority order:
+    /// 1. With a recorded origin, return to that task if present in `views`,
+    ///    even if finished. Otherwise return to the dashboard.
+    /// 2. With a marked flagship, attach to it, or return to the dashboard if
+    ///    already attached to it.
+    /// 3. Without either, do nothing.
+    ///
+    /// If `]` then `Enter` are processed before the updated snapshot, no origin
+    /// is recorded. Check for attachment to the flagship in arm 2 to avoid
+    /// recording a return to the same task.
+    pub fn chord_target(&self) -> Option<Target> {
+        if let Some(origin) = self.return_to {
+            return Some(match origin {
+                Origin::Task(id) if self.task_index(id).is_some() => Target::Task(id),
+                _ => Target::Dashboard,
+            });
+        }
+        let id = self.views.iter().find(|v| v.flagship)?.id;
+        if self.mode == Mode::Attached && self.focused_id == Some(id) {
+            return Some(Target::Dashboard);
+        }
+        Some(Target::Flagship(id))
+    }
+
+    /// Navigate to `chord_target`. From the dashboard or Peek, record the
+    /// dashboard as the origin and close Peek. From an attached task, record
+    /// that task instead. On return to a non-flagship task, clear `return_to`.
+    fn on_chord(&mut self, out: &mut Stdout) {
+        let Some(target) = self.chord_target() else {
+            return;
+        };
+        let here = match (self.mode, self.focused_id) {
+            (Mode::Attached, Some(id)) => Origin::Task(id),
+            _ => Origin::Dashboard,
+        };
+        match target {
+            Target::Dashboard => self.detach(out),
+            Target::Task(id) | Target::Flagship(id) => self.attach_to(id, here),
         }
     }
 
@@ -1835,6 +1949,13 @@ fn key_event_to_key(ev: KeyEvent) -> Option<(Key, Mods)> {
     Some((code, mods))
 }
 
+/// Recognize `Ctrl-]` in kitty and legacy encodings. Accept Ctrl-5 for legacy
+/// 0x1D: in crossterm, 0x1C..=0x1F are mapped to Ctrl-'4'..=Ctrl-'7'.
+fn is_chord_key(k: KeyEvent) -> bool {
+    k.modifiers.contains(KeyModifiers::CONTROL)
+        && matches!(k.code, KeyCode::Char(']') | KeyCode::Char('5'))
+}
+
 /// Recognize either Shift-`/` event: `?`, or `/` with the Shift modifier.
 /// An unmodified `/` remains available to the find palette.
 fn is_controls_key(k: KeyEvent) -> bool {
diff --git a/src/app_readme_tests.rs b/src/app_readme_tests.rs
index be4fd22..0447db0 100644
--- a/src/app_readme_tests.rs
+++ b/src/app_readme_tests.rs
@@ -124,6 +124,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "claude".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: true,
+            flagship: false,
             group: Some("dashboard".to_string()),
             name: Some("Dashboard Refine".to_string()),
             lifecycle: Lifecycle::Active,
@@ -140,6 +141,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "claude".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: true,
+            flagship: false,
             group: Some("dashboard".to_string()),
             name: Some("Summary Refine".to_string()),
             lifecycle: Lifecycle::Active,
@@ -153,6 +155,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "grok".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: false,
+            flagship: false,
             group: Some("dashboard".to_string()),
             name: Some("Grok Language".to_string()),
             lifecycle: Lifecycle::Active,
@@ -166,6 +169,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "codex".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: false,
+            flagship: false,
             group: Some("dashboard".to_string()),
             name: Some("Codex Language".to_string()),
             lifecycle: Lifecycle::Active,
@@ -179,6 +183,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "codex".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: false,
+            flagship: false,
             group: Some("dashboard".to_string()),
             name: Some("Codex Review".to_string()),
             lifecycle: Lifecycle::Active,
@@ -192,6 +197,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo test".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Ok,
@@ -205,6 +211,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo clippy".to_string(),
             cwd: dirs.fleetcom.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Failed,
@@ -218,6 +225,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "claude".to_string(),
             cwd: dirs.home.clone(),
             tagged: false,
+            flagship: false,
             group: Some("desktop".to_string()),
             name: Some("claude agents".to_string()),
             lifecycle: Lifecycle::Active,
@@ -231,6 +239,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "zellij".to_string(),
             cwd: dirs.home.clone(),
             tagged: false,
+            flagship: true,
             group: Some("desktop".to_string()),
             name: Some("Zellij".to_string()),
             lifecycle: Lifecycle::Active,
@@ -244,6 +253,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "python".to_string(),
             cwd: dirs.home.clone(),
             tagged: false,
+            flagship: false,
             group: None,
             name: None,
             lifecycle: Lifecycle::Idle,
@@ -257,6 +267,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "brew update && brew upgrade".to_string(),
             cwd: dirs.home.clone(),
             tagged: false,
+            flagship: false,
             group: Some("desktop".to_string()),
             name: None,
             lifecycle: Lifecycle::Ok,
@@ -270,6 +281,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "grok".to_string(),
             cwd: dirs.turret.clone(),
             tagged: false,
+            flagship: false,
             group: Some("turret".to_string()),
             name: Some("Game Infra Review".to_string()),
             lifecycle: Lifecycle::Active,
@@ -283,6 +295,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "omp".to_string(),
             cwd: dirs.turret.clone(),
             tagged: false,
+            flagship: false,
             group: Some("turret".to_string()),
             name: Some("Missile Nerf".to_string()),
             lifecycle: Lifecycle::Active,
@@ -298,6 +311,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "omp".to_string(),
             cwd: dirs.turret.clone(),
             tagged: false,
+            flagship: false,
             group: Some("turret".to_string()),
             name: Some("EMP Nerf".to_string()),
             lifecycle: Lifecycle::Active,
@@ -313,6 +327,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo test".to_string(),
             cwd: dirs.crabapple.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Ok,
@@ -326,6 +341,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo test".to_string(),
             cwd: dirs.crabstep.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Ok,
@@ -339,6 +355,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "claude".to_string(),
             cwd: dirs.imessage.clone(),
             tagged: false,
+            flagship: false,
             group: None,
             name: None,
             lifecycle: Lifecycle::Active,
@@ -352,6 +369,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo test".to_string(),
             cwd: dirs.imessage.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Ok,
@@ -365,6 +383,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo test".to_string(),
             cwd: dirs.logria.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Ok,
@@ -378,6 +397,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo watch -x test".to_string(),
             cwd: dirs.logria.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Active,
@@ -391,6 +411,7 @@ fn live_fleet(dirs: &Dirs) -> Vec<TaskView> {
             command: "cargo doc --open".to_string(),
             cwd: dirs.logria.clone(),
             tagged: false,
+            flagship: false,
             group: Some("tests".to_string()),
             name: None,
             lifecycle: Lifecycle::Idle,
diff --git a/src/app_tests.rs b/src/app_tests.rs
index f33b352..92dee08 100644
--- a/src/app_tests.rs
+++ b/src/app_tests.rs
@@ -113,6 +113,7 @@ fn view(id: u64, cwd: PathBuf, tagged: bool, group: Option<&str>) -> TaskView {
         command: "true".to_string(),
         cwd,
         tagged,
+        flagship: false,
         group: group.map(str::to_string),
         name: None,
         lifecycle: Lifecycle::Active,
@@ -2673,13 +2674,13 @@ fn controls_overlay_drops_the_group_headers_before_any_entry() {
     );
 }
 
-/// At 12 rows, the overlay clips seven entries and reports the count.
+/// At 12 rows, show twelve of 21 controls and report nine hidden entries.
 #[test]
 fn controls_overlay_reports_clipped_entries_on_its_border() {
     let mut app = App::new_local(12, 100);
     app.on_key_dashboard(key(KeyCode::Char('?')));
     let f = painted(&mut app);
-    assert!(f.contains("? esc close · +7 more"), "{f:?}");
+    assert!(f.contains("? esc close · +9 more"), "{f:?}");
     assert!(!f.contains("save session"), "the tail is clipped: {f:?}");
 }
 
@@ -3967,5 +3968,504 @@ fn input_and_attached_echo_bypass_the_repaint_floor() {
     assert_eq!(wait_for_paint(false, Duration::ZERO), PAINT_MIN);
 }
 
+// --- flagship ----------------------------------------------------------------
+
+/// Simulate a disconnected core: discard commands and return false from `connected`.
+struct Unplugged;
+
+impl Transport for Unplugged {
+    fn send(&mut self, _cmd: Command) {}
+
+    fn poll(&mut self) -> Vec<Event> {
+        Vec::new()
+    }
+
+    fn connected(&self) -> bool {
+        false
+    }
+
+    fn shutdown(&mut self, _intent: ExitIntent) {}
+}
+
+/// Pass commands through to a real core and log each one.
+struct Recording {
+    inner: Box<dyn Transport>,
+    sent: Arc<std::sync::Mutex<Vec<Command>>>,
+}
+
+impl Transport for Recording {
+    fn send(&mut self, cmd: Command) {
+        self.sent.lock().unwrap().push(cmd.clone());
+        self.inner.send(cmd);
+    }
+
+    fn poll(&mut self) -> Vec<Event> {
+        self.inner.poll()
+    }
+
+    fn connected(&self) -> bool {
+        self.inner.connected()
+    }
+
+    fn shutdown(&mut self, intent: ExitIntent) {
+        self.inner.shutdown(intent);
+    }
+}
+
+impl App {
+    /// Wrap the transport in `Recording` and return its log.
+    fn record_sends(&mut self) -> Arc<std::sync::Mutex<Vec<Command>>> {
+        let sent = Arc::default();
+        let inner = std::mem::replace(&mut self.transport, Box::new(Unplugged));
+        self.transport = Box::new(Recording {
+            inner,
+            sent: Arc::clone(&sent),
+        });
+        sent
+    }
+
+    /// Dispatch `k` through `on_key`, the run loop's entry point.
+    fn hit(&mut self, k: KeyEvent) {
+        self.on_key(&mut io::stdout(), k);
+    }
+
+    /// Return the flagship id from the latest snapshot.
+    fn flagship(&self) -> Option<u64> {
+        self.views.iter().find(|v| v.flagship).map(|v| v.id)
+    }
+
+    /// Kill `id` and pump until its row is finished and unmarked.
+    fn finish(&mut self, id: u64) {
+        self.transport.send(Command::Kill { id });
+        assert!(
+            wait_until(Duration::from_secs(5), || {
+                self.pump();
+                self.views.iter().any(|v| {
+                    v.id == id
+                        && !v.flagship
+                        && matches!(v.lifecycle, Lifecycle::Ok | Lifecycle::Failed)
+                })
+            }),
+            "task {id} never finished"
+        );
+    }
+}
+
+/// The chord in its kitty encoding.
+fn chord() -> KeyEvent {
+    ctrl(KeyCode::Char(']'))
+}
+
+/// Two live tasks, A and Q, with Q marked through the daemon by `]` and the
+/// selection back on A.
+fn flagship_pair() -> (App, u64, u64) {
+    let mut app = App::new_local(30, 100);
+    let dir = app.invocation_dir.clone();
+    app.spawn_in("sleep 30", dir.clone());
+    app.spawn_in("sleep 30", dir);
+    let (a, q) = (app.views[0].id, app.views[1].id);
+    app.selected_id = Some(q);
+    app.hit(key(KeyCode::Char(']')));
+    app.pump();
+    assert_eq!(app.flagship(), Some(q), "premise: Q is marked");
+    app.selected_id = Some(a);
+    (app, a, q)
+}
+
+/// Mark the selected task with `]`, replacing the prior mark.
+#[test]
+fn bracket_marks_selected() {
+    let (mut app, a, _) = flagship_pair();
+    app.hit(key(KeyCode::Char(']')));
+    app.pump();
+    assert_eq!(app.flagship(), Some(a), "the mark moves to A");
+    assert!(app.mode == Mode::Dashboard);
+}
+
+/// Clear the mark with `]` on the flagship.
+#[test]
+fn bracket_on_flagship_clears() {
+    let (mut app, _, q) = flagship_pair();
+    app.selected_id = Some(q);
+    let sent = app.record_sends();
+    app.hit(key(KeyCode::Char(']')));
+    app.pump();
+    assert_eq!(app.flagship(), None);
+    assert_eq!(
+        *sent.lock().unwrap(),
+        vec![Command::Flagship { id: None }],
+        "a clear names no id"
+    );
+}
+
+/// Send no command for `]` on a finished row; preserve the existing mark.
+#[test]
+fn bracket_on_finished_row_noops() {
+    let (mut app, a, q) = flagship_pair();
+    app.finish(a);
+    let sent = app.record_sends();
+    app.hit(key(KeyCode::Char(']')));
+    app.pump();
+    assert!(sent.lock().unwrap().is_empty(), "no command for a dead row");
+    assert_eq!(app.flagship(), Some(q));
+}
+
+/// Send no command for `]` without a selected task.
+#[test]
+fn bracket_without_selection_noops() {
+    let mut app = App::new_local(30, 100);
+    let sent = app.record_sends();
+    app.hit(key(KeyCode::Char(']')));
+    assert!(sent.lock().unwrap().is_empty());
+    assert!(app.mode == Mode::Dashboard);
+}
+
+/// Handle `]` only on the dashboard; ignore it in Peek.
+#[test]
+fn bracket_in_peek_noops() {
+    let (mut app, _, q) = flagship_pair();
+    app.hit(key(KeyCode::Char(' ')));
+    assert!(app.mode == Mode::Peek, "premise: peeking at A");
+    let sent = app.record_sends();
+    app.hit(key(KeyCode::Char(']')));
+    app.pump();
+    assert!(sent.lock().unwrap().is_empty());
+    assert_eq!(app.flagship(), Some(q));
+    assert!(app.mode == Mode::Peek);
+}
+
+/// Without a flagship, ignore the chord on the dashboard and while attached.
+/// Do not forward it to the child.
+#[test]
+fn ctrl_bracket_noops_without_flagship() {
+    let (mut app, a) = App::attached(30, 100, "sleep 30");
+    assert_eq!(app.chord_target(), None);
+    let sent = app.record_sends();
+
+    app.hit(chord());
+    assert!(app.mode == Mode::Attached);
+    assert_eq!(app.focused_id, Some(a));
+
+    app.hit(ctrl(KeyCode::Char('\\')));
+    app.hit(chord());
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.focused_id, None);
+    assert!(sent.lock().unwrap().is_empty(), "nothing reaches the core");
+}
+
+/// Preserve the selected row after a dashboard → flagship → dashboard round trip.
+/// Return through `detach`.
+#[test]
+fn jump_from_dashboard_and_back() {
+    let (mut app, a, q) = flagship_pair();
+    let row = app.selected_row(&app.list_rows());
+    assert_eq!(app.chord_target(), Some(Target::Flagship(q)));
+
+    app.hit(chord());
+    assert!(app.mode == Mode::Attached);
+    assert_eq!(app.focused_id, Some(q));
+    assert_eq!(app.return_to, Some(Origin::Dashboard));
+    assert_eq!(app.selected_id, Some(a), "the jump leaves selection alone");
+    assert_eq!(app.chord_target(), Some(Target::Dashboard));
+
+    app.hit(chord());
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.focused_id, None);
+    assert!(!app.view_scroll);
+    assert_eq!(app.return_to, None);
+    assert_eq!(app.selected_id, Some(a));
+    assert_eq!(
+        app.selected_row(&app.list_rows()),
+        row,
+        "same row, same window"
+    );
+}
+
+/// Start a task → flagship → task round trip in scrollback. Switch to live
+/// output at each destination and do not forward the chord to the child.
+#[test]
+fn jump_from_task_and_back() {
+    let (mut app, a, q) = flagship_pair();
+    app.hit(key(KeyCode::Enter));
+    assert_eq!(app.focused_id, Some(a));
+    assert_eq!(app.return_to, None, "A is not the flagship");
+    app.hit(shift(KeyCode::PageUp));
+    assert!(app.view_scroll, "premise: scrollback on A");
+    let sent = app.record_sends();
+
+    app.hit(chord());
+    assert_eq!(
+        app.focused_id,
+        Some(q),
+        "the chord jumped, not just left scrollback"
+    );
+    assert!(!app.view_scroll);
+    assert_eq!(app.return_to, Some(Origin::Task(a)));
+    assert_eq!(app.chord_target(), Some(Target::Task(a)));
+
+    app.hit(chord());
+    assert!(app.mode == Mode::Attached);
+    assert_eq!(app.focused_id, Some(a));
+    assert!(!app.view_scroll);
+    assert_eq!(app.return_to, None);
+    assert!(
+        !sent
+            .lock()
+            .unwrap()
+            .iter()
+            .any(|c| matches!(c, Command::Key { .. })),
+        "no keystroke reaches a child"
+    );
+}
+
+/// Close Peek on attachment to the flagship; return to the dashboard.
+#[test]
+fn jump_from_peek_lands_on_dashboard() {
+    let (mut app, a, q) = flagship_pair();
+    app.hit(key(KeyCode::Char(' ')));
+    assert!(app.mode == Mode::Peek);
+
+    app.hit(chord());
+    assert!(app.mode == Mode::Attached);
+    assert_eq!(app.focused_id, Some(q));
+    assert_eq!(app.return_to, Some(Origin::Dashboard));
+
+    app.hit(chord());
+    assert!(
+        app.mode == Mode::Dashboard,
+        "back to the fleet view, not Peek"
+    );
+    assert_eq!(app.selected_id, Some(a));
+}
+
+/// Record the dashboard as the return destination on `Enter` attachment to the
+/// flagship, from both the dashboard and Peek.
+#[test]
+fn enter_onto_flagship_sets_dashboard_return() {
+    let (mut app, _, q) = flagship_pair();
+    app.selected_id = Some(q);
+    app.hit(key(KeyCode::Enter));
+    assert_eq!(app.focused_id, Some(q));
+    assert_eq!(app.return_to, Some(Origin::Dashboard));
+
+    app.hit(ctrl(KeyCode::Char('\\')));
+    app.hit(key(KeyCode::Char(' ')));
+    app.hit(key(KeyCode::Enter));
+    assert_eq!(app.focused_id, Some(q));
+    assert_eq!(app.return_to, Some(Origin::Dashboard));
+}
+
+/// Press `]` then `Enter` before the next snapshot to attach without a recorded
+/// origin. After synchronization, return to the dashboard with the chord;
+/// do not reattach to the flagship.
+#[test]
+fn mark_then_enter_before_snapshot_returns_to_dashboard() {
+    let mut app = App::new_local(30, 100);
+    let dir = app.invocation_dir.clone();
+    app.spawn_in("sleep 30", dir);
+    let q = app.views[0].id;
+    app.selected_id = Some(q);
+
+    // One input batch: no sync between the keys.
+    app.hit(key(KeyCode::Char(']')));
+    app.hit(key(KeyCode::Enter));
+    assert_eq!(app.return_to, None, "premise: the attach beat the mark");
+    app.pump();
+    assert_eq!(app.flagship(), Some(q), "premise: the mark has landed");
+
+    assert_eq!(app.chord_target(), Some(Target::Dashboard));
+    app.hit(chord());
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.focused_id, None);
+    assert_eq!(app.return_to, None);
+}
+
+/// Return to a finished origin task if it is still in `views`.
+#[test]
+fn return_to_finished_origin() {
+    let (mut app, a, q) = flagship_pair();
+    app.hit(key(KeyCode::Enter));
+    app.hit(chord());
+    assert_eq!(app.focused_id, Some(q));
+    app.finish(a);
+
+    assert_eq!(app.chord_target(), Some(Target::Task(a)));
+    app.hit(chord());
+    assert!(app.mode == Mode::Attached);
+    assert_eq!(app.focused_id, Some(a));
+    assert_eq!(app.return_to, None);
+}
+
+/// Return to the dashboard if the origin task is absent from `views`.
+#[test]
+fn return_to_removed_origin_degrades_to_dashboard() {
+    let (mut app, a, q) = flagship_pair();
+    app.hit(key(KeyCode::Enter));
+    app.hit(chord());
+    app.finish(a);
+    app.transport.send(Command::Remove { id: a });
+    app.pump();
+    assert!(app.task_index(a).is_none(), "premise: A is gone");
+
+    assert_eq!(app.chord_target(), Some(Target::Dashboard));
+    app.hit(chord());
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.focused_id, None);
+    assert_eq!(app.return_to, None);
+    assert!(app.task_index(q).is_some());
+}
+
+/// After the flagship's exit while attached, return to the origin with the
+/// chord. Ignore subsequent presses because no task is marked.
+#[test]
+fn dead_flagship_returns_then_noops() {
+    // Jumped from A.
+    let (mut app, a, q) = flagship_pair();
+    app.hit(key(KeyCode::Enter));
+    app.hit(chord());
+    assert_eq!(app.focused_id, Some(q));
+    app.finish(q);
+    assert_eq!(app.flagship(), None, "the daemon unmarks a dead flagship");
+    app.hit(chord());
+    assert_eq!(app.focused_id, Some(a));
+    assert_eq!(app.chord_target(), None);
+    app.hit(chord());
+    assert!(app.mode == Mode::Attached);
+    assert_eq!(app.focused_id, Some(a), "second press no-ops");
+
+    // Entered by `Enter`.
+    let (mut app, _, q) = flagship_pair();
+    app.selected_id = Some(q);
+    app.hit(key(KeyCode::Enter));
+    app.finish(q);
+    app.hit(chord());
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.chord_target(), None);
+    app.hit(chord());
+    assert!(app.mode == Mode::Dashboard, "second press no-ops");
+    assert_eq!(app.focused_id, None);
+}
+
+/// Clear the return destination on `Ctrl-\` detach.
+#[test]
+fn return_to_clears_on_detach() {
+    let (mut app, _, _) = flagship_pair();
+    app.hit(chord());
+    assert!(app.return_to.is_some());
+    app.hit(ctrl(KeyCode::Char('\\')));
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.return_to, None);
+}
+
+/// Clear the return destination when the attached task is no longer present.
+#[test]
+fn return_to_clears_on_vanish() {
+    let (mut app, a, q) = flagship_pair();
+    app.hit(key(KeyCode::Enter));
+    app.hit(chord());
+    assert_eq!(app.return_to, Some(Origin::Task(a)));
+    app.views.retain(|v| v.id != q);
+    app.check_attached_task();
+    assert!(app.mode == Mode::Dashboard);
+    assert_eq!(app.focused_id, None);
+    assert_eq!(app.return_to, None);
+}
+
+/// Clear the return destination on disconnect and during reconnect reset:
+/// the origin's id may be reused in a replacement daemon.
+#[test]
+fn return_to_clears_on_disconnect() {
+    let (mut app, _, _) = flagship_pair();
+    app.hit(chord());
+    assert!(app.return_to.is_some());
+    app.transport = Box::new(Unplugged);
+    app.check_connection();
+    assert!(app.mode == Mode::Disconnected);
+    assert_eq!(app.return_to, None);
+
+    app.return_to = Some(Origin::Task(1));
+    app.reset_for_reconnect();
+    assert_eq!(app.return_to, None);
+}
+
+/// Accept Ctrl-5, the crossterm representation of legacy 0x1D.
+#[test]
+fn ctrl_bracket_matches_legacy_ctrl_5() {
+    for k in [chord(), ctrl(KeyCode::Char('5'))] {
+        let (mut app, _, q) = flagship_pair();
+        app.hit(k);
+        assert_eq!(app.focused_id, Some(q), "{k:?} must jump");
+        app.hit(k);
+        assert!(app.mode == Mode::Dashboard, "{k:?} must return");
+    }
+}
+
+/// Handle the chord before the scrollback catch-all; do not forward it.
+#[test]
+fn ctrl_bracket_in_scrollback_is_not_forwarded() {
+    let (mut app, a) = App::attached(30, 100, "sleep 30");
+    app.hit(shift(KeyCode::PageUp));
+    assert!(app.view_scroll, "premise: scrollback");
+    let sent = app.record_sends();
+    app.hit(chord());
+    app.hit(ctrl(KeyCode::Char('5')));
+    assert!(app.view_scroll, "a no-op chord leaves scrollback alone");
+    assert_eq!(app.focused_id, Some(a));
+    assert!(
+        !sent
+            .lock()
+            .unwrap()
+            .iter()
+            .any(|c| matches!(c, Command::Key { .. })),
+        "the chord is reserved from children"
+    );
+}
+
+/// Do not navigate or change the mark in prompts, Controls, or Disconnected.
+/// Ignore the chord to preserve prompt input; accept `]` only as text or ignore it.
+#[test]
+fn flagship_keys_ignored_outside_navigation_modes() {
+    let (mut app, a, q) = flagship_pair();
+    let modes = [
+        Mode::Spawn,
+        Mode::PickDir,
+        Mode::PickGroup { target: a },
+        Mode::Find,
+        Mode::SaveSession,
+        Mode::Rename(a),
+        Mode::LoadSession,
+        Mode::Controls,
+        Mode::Disconnected,
+    ];
+    for mode in modes {
+        app.mode = mode;
+        for k in [key(KeyCode::Char(']')), chord(), ctrl(KeyCode::Char('5'))] {
+            app.hit(k);
+            app.pump();
+            assert!(app.mode == mode, "{k:?} changed the mode");
+            assert_eq!(app.focused_id, None, "{k:?} attached");
+            assert_eq!(app.return_to, None);
+            assert_eq!(app.flagship(), Some(q), "{k:?} moved the mark");
+        }
+    }
+}
+
+/// Prefer a recorded origin over the flagship; return to the dashboard if the
+/// origin task is absent.
+#[test]
+fn chord_target_arms() {
+    let (mut app, a, q) = flagship_pair();
+    assert_eq!(app.chord_target(), Some(Target::Flagship(q)));
+    app.return_to = Some(Origin::Dashboard);
+    assert_eq!(app.chord_target(), Some(Target::Dashboard));
+    app.return_to = Some(Origin::Task(a));
+    assert_eq!(app.chord_target(), Some(Target::Task(a)));
+    app.return_to = Some(Origin::Task(9999));
+    assert_eq!(app.chord_target(), Some(Target::Dashboard));
+    app.return_to = None;
+    app.views.iter_mut().for_each(|v| v.flagship = false);
+    assert_eq!(app.chord_target(), None);
+}
+
 #[path = "app_readme_tests.rs"]
 mod readme;
diff --git a/src/protocol.rs b/src/protocol.rs
index 6a87f6f..864bc8a 100644
--- a/src/protocol.rs
+++ b/src/protocol.rs
@@ -12,7 +12,7 @@ use base64::{Engine as _, engine::general_purpose::STANDARD as B64};
 use crate::frame::{KIND_CONTROL, KIND_HELLO, KIND_SCREEN};
 
 /// Wire-protocol version; mismatched peers are rejected during the handshake.
-pub const PROTOCOL_VERSION: u32 = 12;
+pub const PROTOCOL_VERSION: u32 = 13;
 
 /// Reserved dashboard label for tasks without a custom group.
 pub const UNASSIGNED: &str = "Unassigned";
@@ -66,6 +66,9 @@ pub enum Command {
     Restart { id: u64 },
     /// Set the manual "in use" tag.
     Tag { id: u64, on: bool },
+    /// Mark the flagship, displacing any prior mark, or clear it for `None`.
+    /// Clear the mark in the core after task completion or removal.
+    Flagship { id: Option<u64> },
     /// Set a task's group; clear to unassigned for `None`.
     SetGroup { id: u64, group: Option<String> },
     /// Set a task's display name; clear it for `None`.
@@ -328,6 +331,9 @@ pub struct TaskView {
     pub command: String,
     pub cwd: PathBuf,
     pub tagged: bool,
+    /// Whether this task is the flagship. True for at most one task per
+    /// snapshot, and never for a finished task.
+    pub flagship: bool,
     /// Dashboard group; `None` means unassigned.
     pub group: Option<String>,
     /// Custom display name; `None` means unnamed.
@@ -566,6 +572,8 @@ pub fn encode_command(cmd: &Command) -> (u8, Vec<u8>) {
         Command::Remove { id } => jzon::object! { "t": "remove", "id": *id },
         Command::Restart { id } => jzon::object! { "t": "restart", "id": *id },
         Command::Tag { id, on } => jzon::object! { "t": "tag", "id": *id, "on": *on },
+        // Preserve a cleared mark as JSON null.
+        Command::Flagship { id } => jzon::object! { "t": "flagship", "id": *id },
         Command::SetGroup { id, group } => {
             let mut o = jzon::object! { "t": "group", "id": *id };
             // Absence of `g` encodes an unassigned task.
@@ -703,6 +711,13 @@ pub fn decode_command(kind: u8, payload: &[u8]) -> Option<Command> {
             id: v["id"].as_u64()?,
             on: v["on"].as_bool()?,
         },
+        "flagship" => Command::Flagship {
+            id: if v["id"].is_null() {
+                None
+            } else {
+                Some(v["id"].as_u64()?)
+            },
+        },
         "group" => Command::SetGroup {
             id: v["id"].as_u64()?,
             group: opt_str(&v["g"])?,
@@ -833,6 +848,7 @@ pub fn encode_event(ev: &Event) -> (u8, Vec<u8>) {
                 let _ = o.insert("command", tv.command.as_str());
                 let _ = o.insert("cwd", path_b64(&tv.cwd));
                 let _ = o.insert("tagged", tv.tagged);
+                let _ = o.insert("flagship", tv.flagship);
                 // Group and name fields are present only when set.
                 insert_opt_str(&mut o, "group", &tv.group);
                 insert_opt_str(&mut o, "name", &tv.name);
@@ -925,6 +941,7 @@ pub fn decode_event(kind: u8, payload: &[u8]) -> Option<Event> {
                             command: tv["command"].as_str()?.to_string(),
                             cwd: path_from_b64(&tv["cwd"])?,
                             tagged: tv["tagged"].as_bool()?,
+                            flagship: tv["flagship"].as_bool()?,
                             // Missing and null both mean unassigned/unnamed.
                             group: opt_str(&tv["group"])?,
                             name: opt_str(&tv["name"])?,
diff --git a/src/protocol_tests.rs b/src/protocol_tests.rs
index 7e7f50b..b0a8546 100644
--- a/src/protocol_tests.rs
+++ b/src/protocol_tests.rs
@@ -29,6 +29,8 @@ fn command_round_trips() {
         Command::Remove { id: 3 },
         Command::Restart { id: 4 },
         Command::Tag { id: 2, on: true },
+        Command::Flagship { id: Some(2) },
+        Command::Flagship { id: None },
         Command::SetGroup {
             id: 2,
             group: Some("infra".into()),
@@ -163,9 +165,10 @@ fn command_round_trips() {
             Command::LoadRecovery { .. } => 15,
             Command::ListSessions => 16,
             Command::Shutdown => 17,
+            Command::Flagship { .. } => 18,
         }
     }
-    let mut seen = [false; 18];
+    let mut seen = [false; 19];
     for c in cases {
         seen[variant_index(&c)] = true;
         let (k, p) = encode_command(&c);
@@ -305,6 +308,7 @@ fn tv(id: u64) -> TaskView {
         command: "x".into(),
         cwd: PathBuf::from("/"),
         tagged: false,
+        flagship: false,
         group: None,
         name: None,
         lifecycle: Lifecycle::Ok,
@@ -334,11 +338,11 @@ fn mistyped_event_members_are_rejected() {
     for json in [
         r#"{"t":"tasks","tasks":[{"id":"nope"}]}"#,
         // The cwd must be a base64 string.
-        r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"/x","tagged":true,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#,
+        r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"/x","tagged":true,"flagship":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#,
         // A present group must be a string; only missing/null means unassigned.
-        r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":true,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0,"group":5}]}"#,
+        r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":true,"flagship":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0,"group":5}]}"#,
         // A present name must be a string.
-        r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":true,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0,"name":5}]}"#,
+        r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":true,"flagship":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0,"name":5}]}"#,
         r#"{"t":"tasks","tasks":["flat"]}"#,
         // Numeric member in `names`.
         r#"{"t":"sessions","names":["ok",5]}"#,
@@ -367,6 +371,7 @@ fn tasks_and_status_round_trip() {
             command: "vim".into(),
             cwd: PathBuf::from("/home/x"),
             tagged: true,
+            flagship: true,
             group: Some("x".into()),
             name: Some("editor".into()),
             lifecycle: Lifecycle::Idle,
@@ -468,7 +473,7 @@ fn set_name_wire_form() {
 #[test]
 fn tasks_frame_group_key_is_optional() {
     // "Lw==" is the base64 encoding of "/".
-    let ungrouped = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
+    let ungrouped = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"flagship":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
     match decode_event(KIND_CONTROL, ungrouped.as_bytes()) {
         Some(Event::Tasks(v)) => assert_eq!(v[0].group, None),
         other => panic!("expected tasks event, got {other:?}"),
@@ -477,7 +482,7 @@ fn tasks_frame_group_key_is_optional() {
     let (_, p) = encode_event(&Event::Tasks(vec![tv(1)]));
     assert_eq!(std::str::from_utf8(&p).unwrap(), ungrouped);
 
-    let grouped = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"group":"infra","life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
+    let grouped = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"flagship":false,"group":"infra","life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
     match decode_event(KIND_CONTROL, grouped.as_bytes()) {
         Some(Event::Tasks(v)) => assert_eq!(v[0].group.as_deref(), Some("infra")),
         other => panic!("expected tasks event, got {other:?}"),
@@ -489,7 +494,7 @@ fn tasks_frame_group_key_is_optional() {
 #[test]
 fn tasks_frame_name_key_is_optional() {
     // "Lw==" is the base64 encoding of "/".
-    let unnamed = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
+    let unnamed = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"flagship":false,"life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
     match decode_event(KIND_CONTROL, unnamed.as_bytes()) {
         Some(Event::Tasks(v)) => assert_eq!(v[0].name, None),
         other => panic!("expected tasks event, got {other:?}"),
@@ -498,7 +503,7 @@ fn tasks_frame_name_key_is_optional() {
     let (_, p) = encode_event(&Event::Tasks(vec![tv(1)]));
     assert_eq!(std::str::from_utf8(&p).unwrap(), unnamed);
 
-    let named = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"name":"build","life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
+    let named = r#"{"t":"tasks","tasks":[{"id":1,"command":"x","cwd":"Lw==","tagged":false,"flagship":false,"name":"build","life":"ok","preview":"","src":"floor","frozen":false,"started_ms":0}]}"#;
     match decode_event(KIND_CONTROL, named.as_bytes()) {
         Some(Event::Tasks(v)) => assert_eq!(v[0].name.as_deref(), Some("build")),
         other => panic!("expected tasks event, got {other:?}"),
@@ -778,6 +783,32 @@ fn watch_wire_form_requires_the_attached_flag() {
     }
 }
 
+/// Encode the flagship id as a number, or null to clear the mark.
+#[test]
+fn flagship_wire_form() {
+    let (k, p) = encode_command(&Command::Flagship { id: Some(5) });
+    assert_eq!(k, KIND_CONTROL);
+    assert_eq!(
+        std::str::from_utf8(&p).unwrap(),
+        r#"{"t":"flagship","id":5}"#
+    );
+    let (_, p) = encode_command(&Command::Flagship { id: None });
+    assert_eq!(
+        std::str::from_utf8(&p).unwrap(),
+        r#"{"t":"flagship","id":null}"#
+    );
+    for json in [
+        r#"{"t":"flagship","id":"5"}"#, // id must be a number
+        r#"{"t":"flagship","id":-1}"#,  // id must be unsigned
+    ] {
+        assert_eq!(
+            decode_command(KIND_CONTROL, json.as_bytes()),
+            None,
+            "should reject {json}"
+        );
+    }
+}
+
 /// `LoadRecovery` requires a string stem in its wire representation.
 #[test]
 fn load_recovery_wire_form() {
diff --git a/src/supervisor.rs b/src/supervisor.rs
index 3051970..042ec8c 100644
--- a/src/supervisor.rs
+++ b/src/supervisor.rs
@@ -171,11 +171,11 @@ fn affects_recipe(cmd: &Command) -> bool {
         | Command::SetName { .. }
         | Command::LoadSession { .. }
         | Command::LoadRecovery { .. } => true,
-        // `Kill` changes lifecycle and `Tag` changes dashboard state; neither
-        // changes the task set or serialized fields. The remaining variants
-        // also leave the recipe unchanged.
+        // Preserve the recipe for lifecycle (`Kill`) and dashboard-state
+        // (`Tag`, `Flagship`) updates, and for the remaining commands.
         Command::Kill { .. }
         | Command::Tag { .. }
+        | Command::Flagship { .. }
         | Command::Resize { .. }
         | Command::Watch { .. }
         | Command::Paste { .. }
@@ -248,6 +248,10 @@ pub struct Supervisor {
     watched: Option<u64>,
     /// Whether the current watch permits clipboard forwarding.
     watch_attached: bool,
+    /// The flagship task id, or `None`: at most one id is representable.
+    /// Clear in `tick` if the task is finished or absent, before including
+    /// the mark in a snapshot.
+    flagship: Option<u64>,
     /// The last emitted screen fingerprint. `lines` stays empty because only
     /// emitted copies carry them. Cleared when `watched` changes to force a
     /// fresh screen after attachment.
@@ -282,6 +286,7 @@ impl Supervisor {
             scrollback,
             watched: None,
             watch_attached: false,
+            flagship: None,
             last_screen: None,
             launch: None,
             events: Vec::new(),
@@ -365,6 +370,7 @@ impl Supervisor {
             }
             Command::Restart { id } => self.rerun(id),
             Command::Tag { id, on } => self.with_task(id, |t| t.tagged = on),
+            Command::Flagship { id } => self.flagship = id,
             Command::SetGroup { id, group } => {
                 self.with_task(id, |t| t.group = normalize_group(group))
             }
@@ -471,6 +477,15 @@ impl Supervisor {
     /// `drain`ed events, never a `Task`.
     pub fn tick(&mut self) {
         self.reap();
+        // Check current state rather than individual transitions to handle exit,
+        // removal, session load, and marks placed on already-finished tasks.
+        if let Some(id) = self.flagship
+            && self
+                .index_of(id)
+                .is_none_or(|i| self.tasks[i].finished.is_some())
+        {
+            self.flagship = None;
+        }
         let now = Instant::now();
         // vte re-checks its ?2026 sync timeout only when bytes arrive, so a
         // child that opens BSU and stalls would freeze its view. This tick is
@@ -500,6 +515,7 @@ impl Supervisor {
                     command: t.command.clone(),
                     cwd: t.cwd.clone(),
                     tagged: t.tagged,
+                    flagship: self.flagship == Some(t.id),
                     group: t.group.clone(),
                     name: t.name.clone(),
                     lifecycle: t.lifecycle(now, IDLE_AFTER),
@@ -834,6 +850,12 @@ impl Supervisor {
             self.status("rerun failed: task is still running");
             return;
         }
+        // Exit may have been latched just above, between ticks. Clear the mark
+        // before reusing the id for a live replacement. At the next tick, the
+        // replacement would be live and the mark would be retained.
+        if self.flagship == Some(id) {
+            self.flagship = None;
+        }
         let Some(launch) = self.launch_or_refuse() else {
             return;
         };
diff --git a/src/supervisor_tests.rs b/src/supervisor_tests.rs
index 6a5c6e3..35baa9e 100644
--- a/src/supervisor_tests.rs
+++ b/src/supervisor_tests.rs
@@ -2093,6 +2093,150 @@ fn recovery_arms_on_structural_mutations_not_tag() {
     assert!(take_dirty(&mut s), "Remove must arm");
 }
 
+/// Tick once and return the flagship ids from the snapshot.
+fn flagship_ids(s: &mut Supervisor) -> Vec<u64> {
+    s.tick();
+    s.drain()
+        .iter()
+        .find_map(|e| match e {
+            Event::Tasks(v) => Some(v.iter().filter(|t| t.flagship).map(|t| t.id).collect()),
+            _ => None,
+        })
+        .expect("expected a Tasks snapshot")
+}
+
+/// Take the id from the `Spawned` acknowledgement without calling `tick` or `reap`.
+fn spawned_id(s: &mut Supervisor) -> u64 {
+    s.drain()
+        .iter()
+        .find_map(|e| match e {
+            Event::Spawned { id } => Some(*id),
+            _ => None,
+        })
+        .expect("spawn must ack with Spawned")
+}
+
+/// Replace the mark when marking a second task; clear it for `None`.
+#[test]
+fn flagship_marks_at_most_one() {
+    let mut s = sup(24, 80);
+    spawn(&mut s, "sleep 30", here());
+    let a = spawned_id(&mut s);
+    spawn(&mut s, "sleep 30", here());
+    let b = spawned_id(&mut s);
+
+    s.apply(Command::Flagship { id: Some(a) });
+    assert_eq!(flagship_ids(&mut s), vec![a]);
+    s.apply(Command::Flagship { id: Some(b) });
+    assert_eq!(flagship_ids(&mut s), vec![b], "marking B must displace A");
+    s.apply(Command::Flagship { id: None });
+    assert_eq!(flagship_ids(&mut s), Vec::<u64>::new());
+}
+
+/// Clear the mark before the first snapshot after the flagship's exit.
+#[test]
+fn tick_clears_exited_flagship() {
+    let mut s = sup(24, 80);
+    spawn(&mut s, "sleep 30", here());
+    let id = spawned_id(&mut s);
+    s.apply(Command::Flagship { id: Some(id) });
+    assert_eq!(flagship_ids(&mut s), vec![id]);
+
+    s.apply(Command::Kill { id });
+    let finished = wait_until(Duration::from_secs(5), || {
+        let t = view_of(&mut s, id);
+        assert!(
+            !(t.flagship && t.finished_ago.is_some()),
+            "a snapshot showed a finished flagship"
+        );
+        t.finished_ago.is_some()
+    });
+    assert!(finished, "the killed task never finished");
+    assert_eq!(s.flagship, None);
+}
+
+/// Clear the stored flagship id after removal.
+#[test]
+fn tick_clears_removed_flagship() {
+    let mut s = sup(24, 80);
+    spawn(&mut s, "sleep 30", here());
+    let id = spawned_id(&mut s);
+    s.apply(Command::Flagship { id: Some(id) });
+    assert_eq!(flagship_ids(&mut s), vec![id]);
+
+    s.apply(Command::Remove { id });
+    assert_eq!(flagship_ids(&mut s), Vec::<u64>::new());
+    assert_eq!(s.flagship, None, "the removed id must not linger");
+}
+
+/// Exclude marks placed on already-finished tasks from snapshots.
+#[test]
+fn flagship_on_finished_task_never_surfaces() {
+    let mut s = sup(24, 80);
+    spawn(&mut s, "true", here());
+    let id = spawned_id(&mut s);
+    wait_for_lifecycle(&mut s, id, |l| l == crate::protocol::Lifecycle::Ok);
+
+    s.apply(Command::Flagship { id: Some(id) });
+    assert!(!view_of(&mut s, id).flagship);
+    assert_eq!(s.flagship, None);
+}
+
+/// Clear the flagship mark on `Restart`, even with exit latched in `rerun`
+/// and a live replacement by the next tick. In that case, cleanup in `tick`
+/// would be too late. Exit on the first run; on rerun, sleep after checking
+/// for the marker file.
+#[test]
+fn rerun_clears_flagship() {
+    use crate::protocol::Lifecycle;
+    let dir = scratch("rerun_flagship");
+    let marker = dir.join("ran");
+    let mut s = sup(24, 80);
+    spawn(
+        &mut s,
+        format!(
+            "test -f {m} || {{ touch {m}; exit 0; }}; sleep 30",
+            m = marker.display()
+        ),
+        dir.to_path_buf(),
+    );
+    let id = spawned_id(&mut s);
+    s.apply(Command::Flagship { id: Some(id) });
+
+    // Do not tick until the restart is accepted, so exit must be latched in
+    // `rerun`. Retry while the original task is still running.
+    let rerun = wait_until(Duration::from_secs(5), || {
+        s.apply(Command::Restart { id });
+        !s.drain()
+            .iter()
+            .any(|e| matches!(e, Event::Status(m) if m.contains("still running")))
+    });
+    assert!(rerun, "the first run never exited");
+
+    let t = view_of(&mut s, id);
+    assert!(
+        matches!(t.lifecycle, Lifecycle::Active | Lifecycle::Idle),
+        "the replacement must be alive, got {:?}",
+        t.lifecycle
+    );
+    assert!(!t.flagship, "rerun must clear the flagship");
+    assert_eq!(s.flagship, None);
+}
+
+/// Do not arm recovery when marking or clearing the flagship.
+#[test]
+fn flagship_does_not_affect_recipe() {
+    let mut s = sup(24, 80);
+    spawn(&mut s, "sleep 30", here());
+    let id = spawned_id(&mut s);
+    s.recovery.dirty = false; // Reset after spawning to test the mark in isolation.
+
+    s.apply(Command::Flagship { id: Some(id) });
+    assert!(!take_dirty(&mut s), "marking must not arm");
+    s.apply(Command::Flagship { id: None });
+    assert!(!take_dirty(&mut s), "clearing must not arm");
+}
+
 /// Session listings include recovery metadata in descending stem order.
 #[test]
 fn list_sessions_includes_recovery_snapshots_newest_first() {
diff --git a/src/ui.rs b/src/ui.rs
index 5020881..6f3a3e4 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -17,7 +17,7 @@ use crossterm::{
 use unicode_width::UnicodeWidthStr;
 
 use crate::{
-    app::{App, DirKind, GroupMode, Mode, Row, SessionPage},
+    app::{App, DirKind, GroupMode, Mode, Row, SessionPage, Target},
     editbuf::EditBuffer,
     format::{pad, rel_time, truncate},
     path,
@@ -216,7 +216,7 @@ fn render_dashboard(out: &mut impl Write, app: &App) -> io::Result<()> {
     dim(
         out,
         rows.saturating_sub(1),
-        "  ↑↓ select · enter attach · space peek · ? controls",
+        &dashboard_hint(app.chord_target()),
         cols,
     )?;
 
@@ -227,6 +227,16 @@ fn render_dashboard(out: &mut impl Write, app: &App) -> io::Result<()> {
     Ok(())
 }
 
+/// Build the dashboard's bottom key hint. Include `Ctrl-]` only with a
+/// flagship destination; omit the hint when no task is marked.
+fn dashboard_hint(chord: Option<Target>) -> String {
+    let mut hint = String::from("  ↑↓ select · enter attach · space peek · ? controls");
+    if let Some(Target::Flagship(_)) = chord {
+        hint.push_str(" · Ctrl-] flagship");
+    }
+    hint
+}
+
 /// Prefer an active notice over persistent status text.
 fn transient_line(notice: Option<&str>, status: Option<&str>) -> Option<String> {
     notice.or(status).map(|s| format!("  {s}"))
@@ -333,20 +343,35 @@ fn status_glyph(v: &TaskView) -> &'static str {
     }
 }
 
+/// Shared display-column budget for task labels in the dashboard title cell
+/// and the attached bar's `Ctrl-]` return hint. Truncate at the same point in both.
+fn title_width(cols: usize) -> usize {
+    26.min(cols / 3)
+}
+
 /// Split a task row into its leading, preview, and time cells so the preview
 /// can be styled independently. Each cell is padded to its display-column
 /// budget, and the budgets sum to `cols`.
 fn task_row_parts(v: &TaskView, cols: usize) -> (String, String, String) {
+    // Place marks at the left of the two-column indent, tag before flag.
+    // Pad unused columns to keep the status glyph and later cells aligned.
+    let marks: String = [(v.tagged, '◆'), (v.flagship, '⚑')]
+        .into_iter()
+        .filter_map(|(on, c)| on.then_some(c))
+        .collect();
     let glyph = status_glyph(v);
-    let tag = if v.tagged { "◆" } else { " " };
     let time = rel_time(row_age(v));
-    let title_w = 26.min(cols / 3);
+    let title_w = title_width(cols);
 
-    // indent(2) glyph(1) sp(1) tag(1) title(title_w) sp(1) preview(prev_w) sp(1) time
-    let used = 2 + 1 + 1 + 1 + title_w + 1 + 1 + time.width();
+    // marks(2) glyph(1) sp(1) title(title_w) sp(1) preview(prev_w) sp(1) time
+    let used = 2 + 1 + 1 + title_w + 1 + 1 + time.width();
     let prev_w = cols.saturating_sub(used);
     (
-        format!("  {glyph} {tag}{} ", pad(display_label(v), title_w)),
+        format!(
+            "{}{glyph} {} ",
+            pad(&marks, 2),
+            pad(display_label(v), title_w)
+        ),
         pad(&v.preview.text, prev_w),
         format!(" {time}"),
     )
@@ -518,7 +543,7 @@ impl Control {
 
 /// Controls-overlay entries. Place the first half of each group in the left column and
 /// the second half in the right.
-const CONTROLS: [Control; 19] = [
+const CONTROLS: [Control; 21] = [
     Control::new("↑↓ / kj", "move selection", "Navigate"),
     Control::new("Tab ⇧Tab", "jump section", "Navigate"),
     Control::new("/", "find a task", "Navigate"),
@@ -528,6 +553,7 @@ const CONTROLS: [Control; 19] = [
     Control::new("r", "rerun finished", "Act"),
     Control::new("X", "kill or remove", "Act"),
     Control::new("m", "tag in use", "Organize"),
+    Control::new("]", "flagship", "Organize"),
     Control::new("g", "assign group", "Organize"),
     Control::new("R", "rename", "Organize"),
     Control::new("s", "cycle grouping", "Organize"),
@@ -538,6 +564,7 @@ const CONTROLS: [Control; 19] = [
     Control::new("q", "detach", "Leave"),
     Control::new("Q", "quit and kill", "Leave"),
     Control::new("Ctrl-\\", "background", "Attached"),
+    Control::new("Ctrl-]", "flagship / back", "Attached"),
 ];
 
 /// Label `q` as quit in foreground mode: in-process tasks are stopped on exit.
@@ -944,7 +971,14 @@ fn render_attached(out: &mut impl Write, app: &App) -> io::Result<()> {
 
     let cols = app.cols as usize;
     let title = attached_title(v);
-    let bar = attached_bar(&title, screen.map_or(0, |s| s.scrollback), app.notice());
+    let chord = chord_hint(app.chord_target(), &app.views, cols);
+    let bar = attached_bar(
+        &title,
+        screen.map_or(0, |s| s.scrollback),
+        app.notice(),
+        chord.as_deref(),
+        cols,
+    );
     rev(
         out,
         app.rows.saturating_sub(1),
@@ -978,20 +1012,60 @@ fn selection_overlay<'a>(sel: Option<&Selection>, lines: &'a [String]) -> Vec<(u
         .collect()
 }
 
-/// Build the attached or scrollback bar. Replace key hints with an active notice in
-/// either view.
-fn attached_bar(title: &str, scrollback: usize, notice: Option<&str>) -> String {
-    match (scrollback, notice) {
-        (0, Some(n)) => format!("  [attached] {title}    {n}"),
-        (0, None) => format!("  [attached] {title}    Ctrl-\\ background"),
-        // Display an active notice in place of scrollback key hints until expiry.
-        (n, Some(msg)) => format!("  [scroll ↑{n}] {title}    {msg}"),
-        (n, None) => {
-            format!("  [scroll ↑{n}] {title}    Esc live · PgUp/PgDn move · Ctrl-\\ background")
-        }
+/// Build the attached bar's `Ctrl-]` hint, or return `None` without a destination.
+/// For a task destination, use `display_label` and the dashboard title budget
+/// to match the label and truncation in its row.
+fn chord_hint(chord: Option<Target>, views: &[TaskView], cols: usize) -> Option<String> {
+    match chord? {
+        Target::Flagship(_) => Some("Ctrl-] flagship".to_string()),
+        Target::Dashboard => Some("Ctrl-] back to dashboard".to_string()),
+        // For a `Task` destination from `chord_target`, the id is present in `views`.
+        Target::Task(id) => views.iter().find(|v| v.id == id).map(|v| {
+            format!(
+                "Ctrl-] back to {}",
+                truncate(display_label(v), title_width(cols))
+            )
+        }),
     }
 }
 
+/// Build the attached or scrollback bar. Show an active notice in place of key
+/// hints; otherwise append `chord` to the hints. Limit the bar to `cols` when
+/// the prefix, separator, and right-hand segment fit within that width.
+///
+/// Reserve space for the right-hand segment before truncating the title, so
+/// users can read the hints even with a long agent command line. If no space
+/// remains, omit the title and truncate to `cols` with `pad` at the call site.
+fn attached_bar(
+    title: &str,
+    scrollback: usize,
+    notice: Option<&str>,
+    chord: Option<&str>,
+    cols: usize,
+) -> String {
+    const SEP: &str = "    ";
+    let prefix = match scrollback {
+        0 => "  [attached] ".to_string(),
+        n => format!("  [scroll ↑{n}] "),
+    };
+    let right = match notice {
+        Some(msg) => msg.to_string(),
+        None => {
+            let mut hints = match scrollback {
+                0 => "Ctrl-\\ background".to_string(),
+                _ => "Esc live · PgUp/PgDn move · Ctrl-\\ background".to_string(),
+            };
+            if let Some(c) = chord {
+                hints.push_str(" · ");
+                hints.push_str(c);
+            }
+            hints
+        }
+    };
+    let room = cols.saturating_sub(prefix.width() + SEP.width() + right.width());
+    format!("{prefix}{}{SEP}{right}", truncate(title, room))
+}
+
 /// Visible `(start, count)` window that includes the selected list item.
 pub fn scroll_window(sel: usize, total: usize, max: usize) -> (usize, usize) {
     if total == 0 || max == 0 {
@@ -1175,6 +1249,7 @@ mod tests {
             command: "cargo test".into(),
             cwd: std::path::PathBuf::from("/tmp"),
             tagged: false,
+            flagship: false,
             group: None,
             name: name.map(str::to_string),
             lifecycle: Lifecycle::Active,
@@ -1231,7 +1306,9 @@ mod tests {
                     Lifecycle::Ok => "✓",
                     Lifecycle::Failed => "✗",
                 };
-                assert!(row.starts_with(&format!("  {glyph} ")), "{row:?}");
+                // Skip the two-column mark gutter before checking the glyph.
+                let body: String = row.chars().skip(2).collect();
+                assert!(body.starts_with(&format!("{glyph} ")), "{row:?}");
             }
         }
     }
@@ -1365,24 +1442,172 @@ mod tests {
     /// Replace key hints with an active notice in both bars.
     #[test]
     fn attached_bar_swaps_the_hint_for_an_active_notice() {
+        let chord = Some("Ctrl-] flagship");
         assert_eq!(
-            attached_bar("cargo test", 0, None),
+            attached_bar("cargo test", 0, None, None, 80),
             "  [attached] cargo test    Ctrl-\\ background"
         );
         assert_eq!(
-            attached_bar("cargo test", 0, Some("copied 5 chars")),
+            attached_bar("cargo test", 0, Some("copied 5 chars"), chord, 80),
             "  [attached] cargo test    copied 5 chars"
         );
         assert_eq!(
-            attached_bar("cargo test", 3, None),
+            attached_bar("cargo test", 3, None, None, 80),
             "  [scroll ↑3] cargo test    Esc live · PgUp/PgDn move · Ctrl-\\ background"
         );
         assert_eq!(
-            attached_bar("cargo test", 3, Some("copied 5 chars")),
+            attached_bar("cargo test", 3, Some("copied 5 chars"), chord, 80),
             "  [scroll ↑3] cargo test    copied 5 chars"
         );
     }
 
+    /// Show the corresponding hint for each destination in live and scrollback bars.
+    #[test]
+    fn attached_bar_appends_the_chord_segment_for_each_target() {
+        let origin = TaskView {
+            id: 7,
+            ..view(Some("api server"))
+        };
+        let views = [view(None), origin];
+        let cases = [
+            (None, None),
+            (Some(Target::Flagship(1)), Some("Ctrl-] flagship")),
+            (Some(Target::Task(7)), Some("Ctrl-] back to api server")),
+            (Some(Target::Dashboard), Some("Ctrl-] back to dashboard")),
+        ];
+        for (target, want) in cases {
+            let chord = chord_hint(target, &views, 120);
+            assert_eq!(chord.as_deref(), want, "{target:?}");
+            let tail = want.map_or(String::new(), |c| format!(" · {c}"));
+            assert_eq!(
+                attached_bar("cargo test", 0, None, chord.as_deref(), 120),
+                format!("  [attached] cargo test    Ctrl-\\ background{tail}")
+            );
+            assert_eq!(
+                attached_bar("cargo test", 3, None, chord.as_deref(), 120),
+                format!(
+                    "  [scroll ↑3] cargo test    Esc live · PgUp/PgDn move · Ctrl-\\ background{tail}"
+                )
+            );
+        }
+    }
+
+    /// Truncate the origin label at the same width as its dashboard row label.
+    #[test]
+    fn chord_hint_elides_the_origin_at_the_title_budget() {
+        let long = "a-very-long-origin-task-name-that-overruns";
+        let v = TaskView {
+            id: 7,
+            ..view(Some(long))
+        };
+        // 26 columns at 80 wide; cols / 3 below 78.
+        for (cols, budget) in [(80usize, 26usize), (60, 20)] {
+            let hint = chord_hint(Some(Target::Task(7)), std::slice::from_ref(&v), cols).unwrap();
+            let label = hint.strip_prefix("Ctrl-] back to ").unwrap();
+            assert_eq!(label.width(), budget, "cols {cols}: {hint:?}");
+            assert!(label.ends_with('…'), "{hint:?}");
+            assert!(task_row(&v, cols).contains(label), "row and hint disagree");
+        }
+        // Use the command for an unnamed task, consistent with `display_label`.
+        let hint = chord_hint(Some(Target::Task(1)), &[view(None)], 80);
+        assert_eq!(hint.as_deref(), Some("Ctrl-] back to cargo test"));
+    }
+
+    /// Truncate a long title to keep the hints visible within exactly `cols` columns.
+    #[test]
+    fn attached_bar_elides_the_title_before_the_hints() {
+        let title = format!(
+            "claude · {}",
+            "claude --dangerously-skip-permissions ".repeat(4)
+        );
+        // Allow 83 columns for the scrollback hints and chord before the title;
+        // use a wider terminal for that case.
+        for (scrollback, cols) in [(0, 80), (0, 100), (3, 100)] {
+            let bar = attached_bar(&title, scrollback, None, Some("Ctrl-] flagship"), cols);
+            assert!(
+                bar.ends_with("Ctrl-\\ background · Ctrl-] flagship"),
+                "{bar:?}"
+            );
+            assert!(bar.contains("…    "), "title not elided: {bar:?}");
+            assert_eq!(bar.width(), cols, "{bar:?}");
+            assert_eq!(pad(&bar, cols), bar);
+        }
+    }
+
+    /// Omit the title when the hints exceed the available width, then truncate
+    /// to `cols` with `pad` without panicking.
+    #[test]
+    fn attached_bar_degrades_at_narrow_widths() {
+        let chord = Some("Ctrl-] back to dashboard");
+        for cols in 0..=40usize {
+            for scrollback in [0, 3] {
+                let bar = attached_bar("cargo test", scrollback, None, chord, cols);
+                assert_eq!(pad(&bar, cols).width(), cols, "cols {cols}: {bar:?}");
+                if bar.width() > cols {
+                    assert!(!bar.contains("cargo"), "title kept at {cols}: {bar:?}");
+                }
+            }
+        }
+    }
+
+    /// Show the dashboard chord hint only with a flagship destination.
+    #[test]
+    fn dashboard_hint_names_the_chord_only_for_a_flagship() {
+        let base = "  ↑↓ select · enter attach · space peek · ? controls";
+        assert_eq!(dashboard_hint(None), base);
+        assert_eq!(
+            dashboard_hint(Some(Target::Flagship(3))),
+            format!("{base} · Ctrl-] flagship")
+        );
+        assert_eq!(dashboard_hint(Some(Target::Dashboard)), base);
+        assert_eq!(dashboard_hint(Some(Target::Task(3))), base);
+    }
+
+    /// Place marks at the left of the indent, tag before flag; preserve other cells.
+    #[test]
+    fn task_row_marks_occupy_the_indent_without_shifting() {
+        for cols in [40usize, 80] {
+            let plain = task_row(&timed_view(Lifecycle::Active, None, None), cols);
+            for (tagged, flagship) in [(false, false), (true, false), (false, true), (true, true)] {
+                let mut v = timed_view(Lifecycle::Active, None, None);
+                v.tagged = tagged;
+                v.flagship = flagship;
+                let row = task_row(&v, cols);
+                assert_eq!(row.width(), cols, "{row:?}");
+                let cells: Vec<char> = row.chars().collect();
+                let want = match (tagged, flagship) {
+                    (false, false) => [' ', ' '],
+                    (true, false) => ['◆', ' '],
+                    (false, true) => ['⚑', ' '],
+                    (true, true) => ['◆', '⚑'],
+                };
+                assert_eq!(cells[..2], want, "{row:?}");
+                assert_eq!(cells[2], '✻', "{row:?}");
+                // Compare all columns after the gutter with the unmarked row.
+                let rest = |r: &str| -> String {
+                    r.chars()
+                        .enumerate()
+                        .filter(|(i, _)| *i > 1)
+                        .map(|(_, c)| c)
+                        .collect()
+                };
+                assert_eq!(rest(&row), rest(&plain));
+            }
+        }
+    }
+
+    /// List both flagship keys in the controls overlay under their respective groups.
+    #[test]
+    fn controls_list_the_flagship_keys_in_their_groups() {
+        let group_of = |key: &str| CONTROLS.iter().find(|c| c.key == key).map(|c| c.group);
+        assert_eq!(group_of("]"), Some("Organize"));
+        assert_eq!(group_of("Ctrl-]"), Some("Attached"));
+        let keys: Vec<&str> = CONTROLS.iter().map(|c| c.key).collect();
+        let at = |k: &str| keys.iter().position(|x| *x == k).unwrap();
+        assert_eq!(at("]"), at("m") + 1);
+        assert_eq!(at("Ctrl-]"), at("Ctrl-\\") + 1);
+    }
+
     /// Prefer an active notice over status text in the dashboard command row.
     #[test]
     fn transient_line_prefers_the_notice_over_the_status() {
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index bb1f1a0..83cdff7 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -17,7 +17,7 @@ use std::{
 
 /// Protocol version used by this test suite; must match
 /// `protocol::PROTOCOL_VERSION`.
-pub const PROTOCOL_VERSION: u32 = 12;
+pub const PROTOCOL_VERSION: u32 = 13;
 
 /// One frame of the given kind: `[u32 len][kind][payload]`.
 pub fn frame(kind: u8, payload: &[u8]) -> Vec<u8> {