agentp 2.1.0 → 2.1.1

package/README.md

@@ -352,11 +352,22 @@ the project found upward from `<directory>` (default: `$PWD`):
   and switches normally; `ESC`/`q` cancels back to the session list and returns
   the TUI to the stored session; deselecting down to a single session selects
   that remaining session. New selections open in the TUI for inspection.
-  Broadcast mode also has `h` help, `d` delete, and `m` to change the model for
-  every selected session.
+  Broadcast mode also has `h` help, `d` delete, `D` (Shift+d) to delete every
+  selected session at once (confirmation in the status bar), and `m` to change
+  the model for every selected session. The `Broadcast to sessions: …` line
+  caps itself to one row — up to 480 characters of names (or the terminal
+  width, whichever is smaller); past that the selection is truncated from the
+  beginning with a leading `...`, so the footer never wraps.
 - `n` create (name input) · `r` rename (edit in place) · `R` set a reminder ·
   `d` delete (confirm) · `a` switch agent · `m` switch model · `p` project
-  switcher (inspect-only by default) · `h` help · `q` quit
+  switcher (inspect-only by default) · `h` help · `q` quit. The `n`/`r`/`R`
+  prompts and the `d` confirmation take over the **status bar**, with their
+  essential keys on the right (`Enter: create/rename/save · Esc: cancel`,
+  `y: delete · n/Esc: cancel`). While a question is active the bar flips from
+  brown to the same **light yellow as the list pointer**, so the change of
+  state is obvious at a glance. Deleting the current session adopts the session
+  under the cursor as the new current (recorded, refreshed in the TUI, and
+  highlighted)
 - `m` opens the model list **sorted by provider** with the cursor already on the
   session's **current model** — also in broadcast mode, where it starts from the
   cursor session's model, so a bulk change begins where you are
@@ -366,7 +377,14 @@ the project found upward from `<directory>` (default: `$PWD`):
 - switching updates `.ocmux.json` and refreshes the project's dedicated TUI, or
   the shared TUI when no live dedicated one exists; silent on success. The file
   updated is always the one of the project being listed — your own project
-  unless ocmux was started with `--all-projects`
+  unless ocmux was started with `--all-projects`. Opening the picker in a
+  project also routes that project's TUI to its stored session (a TUI already
+  showing it is left untouched), so running `ocmux` from anywhere switches the
+  display even without picking a row
+- when `.ocmux.json`'s server is unreachable but the default server
+  (`$OCMUX_SERVER` or `http://localhost:4096`) answers, `ocmux` offers (on a TTY)
+  to repoint the project to the default and rewrites `server` in `.ocmux.json`
+  if you confirm
 - new sessions inherit the model of the previously selected session (v2
   sessions created via the API have no model and won't run a prompt until set)
 
@@ -387,8 +405,10 @@ Subcommands:
 - **`tui [--shared] [--server <url>] [dir]`** — register the current tmux pane and run OpenCode
   in it. Without `--shared`, the pane follows only that project. With
   `--shared`, it becomes the one fallback TUI for all projects and can reconnect
-  across server URLs as selections change. Re-registering a slot stops its old
-  wrapper without destroying the old pane. Closing the TUI unregisters it.
+  across server URLs as selections change; `--shared` also starts without a
+  `.ocmux.json`, defaulting to the default server. Re-registering a slot stops
+  its old wrapper without destroying the old pane. Closing the TUI unregisters
+  it.
   `tui --list` lists live registrations; `tui [--shared] --status` inspects a
   dedicated/shared slot; `tui [--shared] --detach` unregisters that slot without
   closing the pane or its current TUI.

package/bin/ocmux

@@ -113,6 +113,23 @@ function checkServer(server) {
   });
 }
 
+// Ask a yes/no question on stderr. Only meaningful on a TTY; resolves false on
+// EOF/close so a non-answer never silently changes state.
+function askYesNo(question) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+    let done = false;
+    const settle = (value) => {
+      if (done) return;
+      done = true;
+      try { rl.close(); } catch {}
+      resolve(value);
+    };
+    rl.question(question, (answer) => settle(/^y(es)?$/i.test((answer || '').trim())));
+    rl.on('close', () => settle(false));
+  });
+}
+
 function refreshTui(directory, server, session) {
   const result = switchTui(directory, server, session, path.resolve(process.argv[1]));
   if (!result.ok && result.reason === 'failed') {
@@ -195,6 +212,7 @@ function padLeft(s, w) {
 const BROWN = '\x1b[33m';            // text: brown/dark-yellow
 const BAR_BG = '\x1b[30;43m';        // title/status bar: black on brown
 const LIGHT_YELLOW = '\x1b[1;33m';   // text: light-yellow (bold brown)
+const QUESTION_BG = '\x1b[30;103m';  // question/input bar: black on light-yellow
 
 // ── '/' incremental search for interactive lists ──────────────────────────
 // Filter `items` by `pattern`: case-insensitive, space-separated tokens that
@@ -453,9 +471,11 @@ function sessionInfoLines(s, runningIds, modelContext, cols, highlight = false)
 //   footer     -> status bar (brown background), key hints right-aligned
 //                 (left-aligned when footerLeft is set — used by the search line)
 //   footerRight-> optional hint pinned to the right end of a left-aligned footer
+//   footerBg   -> background for the footer bar (default: BAR_BG; question bars
+//                 pass QUESTION_BG so an active prompt stands out)
 //   infoLines  -> details below the status bar (colours supplied by the caller)
 // A "(start-end/total)" range is appended to the heading when scrolling.
-function renderList({ title, items, cursor, row, footer, infoLines = [], extraLines = [], cols: colsArg, rows: rowsArg, footerLeft = false, footerRight = null }) {
+function renderList({ title, items, cursor, row, footer, infoLines = [], extraLines = [], cols: colsArg, rows: rowsArg, footerLeft = false, footerRight = null, footerBg = BAR_BG }) {
   const cols = colsArg || process.stdout.columns || 80;
   const termRows = rowsArg || process.stdout.rows || 24;
   const extras = (extraLines || []).filter((l) => l != null && l !== '');
@@ -512,7 +532,7 @@ function renderList({ title, items, cursor, row, footer, infoLines = [], extraLi
   } else {
     hint = padLeft(footer, cols);
   }
-  out += BAR_BG + hint + '\x1b[0m\n';
+  out += footerBg + hint + '\x1b[0m\n';
   for (const l of infos) out += l + '\n';
   return out.replace(/\n$/, '');
 }
@@ -534,6 +554,7 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
     let cursor = 0;
     let mode = 'normal';        // 'normal' | 'help' | 'confirm' | 'input'
     let confirmDel = null;
+    let confirmAll = false;     // 'D' deletes every broadcast-selected session
     let input = null;           // { label, value, kind, caret }
     let list = null;            // { title, items, format, onEnter }
     let listCursor = 0;
@@ -557,6 +578,7 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
       'R (Shift+r)      set a REMINDER for the selected session (sent in front of',
       '                  every agentp prompt; blank clears)',
       'd                delete the selected session (then y/N to confirm)',
+      'D (Shift+d)      in BROADCAST: delete ALL selected sessions (then y/N)',
       'a                switch the AGENT of the selected session',
       'm                switch the MODEL of the selected session',
       'p                open the project switcher',
@@ -605,6 +627,7 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
           out += '  Enter            keep the broadcast selection; switch TUI to cursor\n';
           out += '  m                switch the model for ALL selected sessions\n';
           out += '  d                delete the cursor session (with confirmation)\n';
+          out += '  D (Shift+d)      delete ALL selected sessions (with confirmation)\n';
           out += '  j / k, arrows    move the cursor (selecting shows it in the TUI)\n';
           out += '  /                search/filter the session list\n';
           out += '  ESC / q          cancel broadcast mode (back to the session list)\n';
@@ -648,24 +671,55 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
       );
       const inBc = mode === 'broadcast' || mode === 'broadcast-confirm';
       const extras = [...notices];
-      if ((mode === 'confirm' || mode === 'broadcast-confirm') && confirmDel) {
-        extras.push(`Delete session "${confirmDel.title || confirmDel.id || ''}"? (y/N) `);
-      } else if (mode === 'input' && input) {
-        extras.push(`${input.label} ${renderInputValue(input.value)}`);
-      }
       if (search.active && view.length === 0) extras.push(`No sessions match "${search.value}"`);
       const selected = view[cursor];
       let infoLines = [];
       let footer = 'Enter: switch · Space: broadcast · /: search · h: help · q: quit';
+      let footerLeft = search.active;
+      let footerRight = search.active ? SEARCH_HINT : null;
       if (inBc) {
-        const names = rows.filter(r => broadcastSel.has(String(r.id))).map(r => r.title || r.id).join(', ');
-        infoLines = [`Broadcast to sessions: ${names}`];
-        footer = 'Enter: switch · Space: toggle · d: delete · m: model · /: search · h: help · q: cancel · Ctrl+C: quit';
+        // List every selected session, capped so the info line never wraps. On
+        // overflow the head is trimmed and marked with '...' — the picker lists
+        // most-recently-viewed first, so the trimmed head is the most recently
+        // viewed part of the selection.
+        let names = rows.filter(r => broadcastSel.has(String(r.id))).map(r => r.title || r.id).join(', ');
+        const bcHead = 'Broadcast to sessions: ';
+        const budget = Math.max(8, Math.min(480, cols - bcHead.length));
+        if (names.length > budget) {
+          let keep = names.slice(-(budget - 4)); // 3 for '...', 1 for the space
+          const at = keep.indexOf(', ');
+          if (at > 0) keep = keep.slice(at + 2);
+          names = '... ' + keep;
+        }
+        infoLines = [bcHead + names];
+        footer = 'Enter: switch · Space: toggle · d: delete · D: delete all · m: model · /: search · h: help · q: cancel · Ctrl+C: quit';
       } else {
         const selIsCurrent = !!(selected && String(selected.id) === String(current));
         infoLines = sessionInfoLines(selected, runningIds, modelContext, cols, selIsCurrent);
       }
-      footer = searchFooter(search, footer);
+      // 'd'/n/r/R prompts take over the status bar (previously an easy-to-miss
+      // line at the bottom of the list) with their essential keys on the right.
+      // A prompt also flips the bar to light yellow, matching the list pointer,
+      // so the change of state is obvious at a glance.
+      let questionBar = false;
+      if ((mode === 'confirm' || mode === 'broadcast-confirm') && confirmDel) {
+        questionBar = true;
+        if (confirmAll) {
+          const n = broadcastSel.size;
+          footer = `Delete all ${n} selected session${n === 1 ? '' : 's'}?`;
+        } else {
+          footer = `Delete session "${confirmDel.title || confirmDel.id || ''}"?`;
+        }
+        footerLeft = true;
+        footerRight = 'y: delete · n/Esc: cancel';
+      } else if (mode === 'input' && input) {
+        questionBar = true;
+        footer = `${input.prompt} ${renderInputValue(input.value)}`;
+        footerLeft = true;
+        footerRight = input.hint;
+      } else {
+        footer = searchFooter(search, footer);
+      }
       process.stderr.write(renderList({
         // The project name heads the title so you always know which project's
         // sessions are listed (matters when --all-projects moves you around).
@@ -684,15 +738,16 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
           return String(s.id) === String(current) ? `${BROWN}${text}\x1b[0m` : text;
         },
         footer,
-        footerLeft: search.active,
-        footerRight: search.active ? SEARCH_HINT : null,
+        footerLeft,
+        footerRight,
+        footerBg: questionBar ? QUESTION_BG : BAR_BG,
         infoLines,
         extraLines: extras,
       }));
     };
 
-    const startInput = (label, value, kind) => {
-      input = { label, value, kind, caret: value.length };
+    const startInput = (prompt, hint, value, kind) => {
+      input = { prompt, hint, value, kind, caret: value.length };
       mode = 'input';
       draw();
     };
@@ -735,10 +790,12 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
         }
         inspected = false;
         confirmDel = null;
+        confirmAll = false;
         draw();
       }).catch((err) => {
         process.stderr.write(`\nError: ${err.message}\n`);
         confirmDel = null;
+        confirmAll = false;
         draw();
       });
     };
@@ -747,11 +804,31 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
       const s = confirmDel;
       if (!s || !onDelete) return;
       const wasBroadcast = mode === 'broadcast-confirm';
-      Promise.resolve(onDelete(s)).then(() => {
-        rows = rows.filter(r => r.id !== s.id);
+      const deletingAll = confirmAll;
+      // 'D' removes every session in the broadcast selection; 'd' removes just
+      // the cursor row.
+      const targets = deletingAll
+        ? rows.filter(r => broadcastSel.has(String(r.id)))
+        : [s];
+      confirmDel = null;
+      confirmAll = false;
+      Promise.resolve(Promise.all(targets.map(t => onDelete(t)))).then(() => {
+        const removed = new Set(targets.map(t => String(t.id)));
+        rows = rows.filter(r => !removed.has(String(r.id)));
         applySearch();
         if (cursor >= view.length && cursor > 0) cursor = view.length - 1;
-        confirmDel = null;
+        if (deletingAll) {
+          // Deleting the whole broadcast selection ends broadcast mode; adopt
+          // the row now under the cursor as the new current (state + TUI +
+          // highlight) so the list and the TUI agree on the new selection.
+          persistBroadcast([]);
+          broadcastSel = new Set();
+          mode = 'normal';
+          const next = view[cursor];
+          if (next) applyPick(next);
+          else { current = null; draw(); }
+          return;
+        }
         if (wasBroadcast) {
           broadcastSel.delete(String(s.id));
           if (broadcastSel.size < 2) {
@@ -767,15 +844,32 @@ function sessionMenu(sessions, currentSession, annotations, server, { onPick, on
           } else {
             persistBroadcast([...broadcastSel]);
             mode = 'broadcast';
+            // Keep the anchor session pointing at something that still exists
+            // (the cursor row when it is one of the remaining selections).
+            if (String(s.id) === String(current)) {
+              const next = view[cursor];
+              current = (next && broadcastSel.has(String(next.id))) ? next.id : ([...broadcastSel][0] || null);
+            }
             draw();
           }
         } else {
           mode = 'normal';
-          draw();
+          if (String(s.id) === String(current)) {
+            // The highlighted session was deleted: adopt the row now under the
+            // cursor as the new current. applyPick records it in .ocmux.json
+            // and refreshes the TUI, so the list highlight and the display
+            // agree on the new selection.
+            const next = view[cursor];
+            if (next) applyPick(next);
+            else { current = null; draw(); }
+          } else {
+            draw();
+          }
         }
       }).catch((err) => {
         process.stderr.write(`\nError: ${err.message}\n`);
         confirmDel = null;
+        confirmAll = false;
         mode = wasBroadcast ? 'broadcast' : 'normal';
         draw();
       });
@@ -883,6 +977,7 @@ const toggleBroadcast = (idx) => {
         if (key.name === 'y') return applyDelete();
         if (key.name === 'n' || key.name === 'escape' || key.name === 'q' || key.name === 'return') {
           confirmDel = null;
+          confirmAll = false;
           mode = mode === 'broadcast-confirm' ? 'broadcast' : 'normal';
           draw();
         }
@@ -987,6 +1082,15 @@ const toggleBroadcast = (idx) => {
           draw();
         } else if (key.name === 'space') {
           if (cursor < view.length) toggleBroadcast(cursor);
+        } else if (str === 'D') {
+          // Shift+d: delete ALL broadcast-selected sessions at once (with
+          // confirmation), handy to drop a whole selection you no longer want.
+          if (broadcastSel.size > 0) {
+            confirmAll = true;
+            confirmDel = { all: true };
+            mode = 'broadcast-confirm';
+            draw();
+          }
         } else if (key.name === 'd') {
           if (cursor < view.length) {
             confirmDel = view[cursor];
@@ -1020,18 +1124,18 @@ const toggleBroadcast = (idx) => {
         return;
       }
       if (key.name === 'n') {
-        startInput('New session name (blank for auto; ESC cancels):', '', 'create');
+        startInput('New session name (blank = auto):', 'Enter: create · Esc: cancel', '', 'create');
         return;
       }
       // Shift+r → Reminder; lowercase r → Rename.
       if (str === 'R') {
         const row = view[cursor];
         const note = (row && annotations && annotations[row.id]) || '';
-        startInput('Reminder for this session (blank clears; ESC cancels):', note, 'reminder');
+        startInput('Reminder (blank clears):', 'Enter: save · Esc: cancel', note, 'reminder');
         return;
       }
       if (key.name === 'r' && cursor < view.length) {
-        startInput('Rename to (ESC cancels):', view[cursor].title || '', 'rename');
+        startInput('Rename to:', 'Enter: rename · Esc: cancel', view[cursor].title || '', 'rename');
         return;
       }
       if (key.name === 'a') {
@@ -1367,7 +1471,7 @@ async function cmdSessionSwitch(targetDir, directRef, allProjects = false) {
       process.exit(1);
     }
     const state = projectState.readProjectState(sf);
-    const server = state.server;
+    let server = state.server;
     if (!server) {
       console.error(`Error: ${sf} does not record a server.`);
       console.error(`Run 'ocmux serve --server <url>' to set it up, or add "server" to the file.`);
@@ -1375,7 +1479,19 @@ async function cmdSessionSwitch(targetDir, directRef, allProjects = false) {
     }
     const dir = state.directory;
 
-    const alive = await checkServer(server);
+    // If the recorded server is down, offer to repoint the project to the
+    // default server — but only after confirming the default actually answers.
+    let alive = await checkServer(server);
+    if (!alive && process.stdin.isTTY && server !== DEFAULT_SERVER
+      && await checkServer(DEFAULT_SERVER)) {
+      const useDefault = await askYesNo(
+        `OpenCode server not reachable at ${server}. Use the default ${DEFAULT_SERVER} instead? [y/N] `);
+      if (useDefault) {
+        projectState.writeProjectState(sf, { server: DEFAULT_SERVER });
+        server = DEFAULT_SERVER;
+        alive = true;
+      }
+    }
     if (!alive) {
       console.error(`Error: OpenCode server not reachable at ${server}.`);
       console.error(`Start it with 'opencode serve' (or your usual launcher) first.`);
@@ -1438,6 +1554,12 @@ async function cmdSessionSwitch(targetDir, directRef, allProjects = false) {
     // model of the previously selected session); r renames; R sets a reminder;
     // d deletes; a switches agent; m switches model; p switches project; q quits.
     let lastRef = (state.session && mainSessions.find(s => String(s.id) === String(state.session))) || mainSessions[0] || null;
+    // Opening the picker in a project routes its applicable TUI to the stored
+    // session, so merely running `ocmux` here switches the pane. (Respawn is
+    // skipped when the TUI is already showing that project/session.)
+    if (state.session && mainSessions.some(s => String(s.id) === String(state.session))) {
+      refreshTui(dir, server, state.session);
+    }
     const result = await new Promise((resolve) => {
       sessionMenu(mainSessions, state.session, annotations, server, {
         dir,
@@ -1622,20 +1744,22 @@ async function cmdTui(targetDir, serverArg, shared, sessionArg) {
     process.exit(1);
   }
   const sf = findParentStatefile(targetDir);
-  if (!sf) {
+  const state = sf ? projectState.readProjectState(sf) : null;
+  if (!state && !shared) {
     console.error(`Error: no .ocmux.json found in ${targetDir} or any of its parents.`);
     console.error("Run 'ocmux serve' first.");
     process.exit(1);
   }
-  const state = projectState.readProjectState(sf);
-  const directory = state.directory;
-  const server = serverArg || state.server || DEFAULT_SERVER;
+  // The shared TUI is a cross-project fallback, so it can run without a project
+  // state file (defaulting to the configured/default server).
+  const directory = state ? state.directory : targetDir;
+  const server = serverArg || (state && state.server) || DEFAULT_SERVER;
   if (!await checkServer(server)) {
     console.error(`Error: OpenCode server not reachable at ${server}.`);
     process.exit(1);
   }
 
-  let session = sessionArg || state.session;
+  let session = sessionArg || (state && state.session) || null;
   if (session) {
     try {
       const found = await getSession(server, session);
@@ -1648,7 +1772,7 @@ async function cmdTui(targetDir, serverArg, shared, sessionArg) {
     const sessions = await listSessions(server, directory);
     session = newestSessionId(sessions);
     if (!session) session = (await createSessionWithModel(server, undefined, directory, sessions)).id;
-    projectState.writeProjectState(sf, { session, server });
+    if (sf) projectState.writeProjectState(sf, { session, server });
   }
 
   const registration = tuiRegistry.register({
@@ -1807,10 +1931,14 @@ function printHelp() {
   console.error('sessions are listed. In the picker:');
   console.error('  Enter switch · n new · r rename · R remind · d delete · a agents · m model');
   console.error('  p projects · h help · q quit');
+  console.error('  In BROADCAST: Space toggles a session · d deletes cursor · D deletes all');
   console.error('Selecting updates .ocmux.json and refreshes a dedicated TUI, falling');
-  console.error('back to the shared TUI. Silent on success. (p opens projects; by');
+  console.error('back to the shared TUI. Opening the picker also routes that project\'s');
+  console.error('TUI to its stored session. Silent on success. (p opens projects; by');
   console.error('default it only inspects other projects and never modifies any');
   console.error('.ocmux.json — see --all-projects.)');
+  console.error('If the recorded server is down but the default server answers, ocmux');
+  console.error('offers to repoint the project to the default.');
   console.error('');
   console.error('Subcommands:');
   console.error('  serve     Initialize project state for <directory> (default: $PWD).');
@@ -1821,7 +1949,8 @@ function printHelp() {
   console.error('  tui [--shared] [--server <url>] [directory]');
   console.error('            Register the current tmux pane and run its OpenCode TUI.');
   console.error('            Without --shared it is dedicated to the current project;');
-  console.error('            --shared makes it the single fallback for every project.');
+  console.error('            --shared makes it the single fallback for every project and');
+  console.error('            runs even without .ocmux.json (using the default server).');
   console.error('            --list lists all live registrations; --status inspects one;');
   console.error('            --detach unregisters one without closing its pane or TUI.');
   console.error('            With --status/--detach, --shared targets the shared slot;');
@@ -2071,4 +2200,4 @@ if (require.main === module) {
   main();
 }
 
-module.exports = { main, checkServer, newestSessionId, configuredProjects, refreshTui, cmdTui, cmdTuiList, cmdTuiStatus, cmdTuiDetach, cmdList, cmdMigrate, windowFor, renderList, fmtClock, fmtDuration, fmtTokens, fmtCost, layoutCells, sessionInfoLines, centerIn, filterByPattern, newSearchState, handleSearch, searchFooter, sessionMenu, switchMenu, SWITCH_QUIT, SEARCH_HINT, sortModels, indexOfModel, BROWN, BAR_BG, LIGHT_YELLOW };
+module.exports = { main, checkServer, askYesNo, newestSessionId, configuredProjects, refreshTui, cmdTui, cmdTuiList, cmdTuiStatus, cmdTuiDetach, cmdList, cmdMigrate, windowFor, renderList, fmtClock, fmtDuration, fmtTokens, fmtCost, layoutCells, sessionInfoLines, centerIn, filterByPattern, newSearchState, handleSearch, searchFooter, sessionMenu, switchMenu, SWITCH_QUIT, SEARCH_HINT, sortModels, indexOfModel, BROWN, BAR_BG, LIGHT_YELLOW, QUESTION_BG };

package/docs/specification_v2.md

@@ -59,6 +59,8 @@ Each instance records:
 - tmux socket and pane ID;
 - dedicated/shared mode;
 - last directory, server, and session;
+- the directory and session currently displayed (so routing can skip a
+  respawn that would change nothing);
 - foreground wrapper PID and current child PID (diagnostic only);
 - registration/update timestamps.
 
@@ -95,7 +97,9 @@ a different server, the same pane reconnects to that server.
 `ocmux tui [--shared] [directory]`:
 
 1. Requires `$TMUX` and `$TMUX_PANE`.
-2. Resolves `.ocmux.json`, server, directory, and session.
+2. Resolves `.ocmux.json`, server, directory, and session. A shared TUI may run
+   without a state file, in which case it uses the current directory and the
+   default server (`$OCMUX_SERVER` or `http://localhost:4096`).
 3. Health-checks the server and validates the session, creating one with a
    model when necessary.
 4. Marks and registers the current pane.
@@ -127,6 +131,10 @@ The new `ocmux tui` process re-registers the pane and hosts the new OpenCode
 child. Server-side session execution continues while the old client disconnects.
 Client-local state—draft prompt, scroll position, dialogs, and tabs—is lost.
 
+Routing is idempotent: the registry records the directory and session the pane
+currently displays, so a switch to the same project/session is skipped without
+respawning.
+
 Native TUI navigation is temporary inspection and is not observable through
 the OpenCode HTTP API. The next ocmux selection restores the canonical target.
 
@@ -142,7 +150,8 @@ or creating one with a model. It creates no tmux session, window, or pane.
 
 Registers and hosts a dedicated or shared TUI as described above. `--shared`
 is valid only for this command. `--server` overrides the project's recorded
-server for the launched wrapper. Management modes are:
+server for the launched wrapper; when `--shared` runs without a state file it
+falls back to the default server. Management modes are:
 
 - `ocmux tui --list` — prune stale entries and print every live registration;
 - `ocmux tui [dir] --status` — inspect the dedicated slot for that project;
@@ -156,9 +165,25 @@ destroy the pane. Management modes do not require running inside tmux.
 ### `ocmux`
 
 Opens the current project's session picker. Picking writes that project's
-session and refreshes its routed TUI. Session creation, rename/delete,
+session and refreshes its routed TUI. Merely opening the picker also routes the
+applicable TUI to the project's stored session (skipped when it already shows
+it), so starting `ocmux` in a project switches the display even without picking
+a row. When the recorded server is unreachable but the default server answers,
+`ocmux` offers on a TTY to repoint the project to the default and rewrites
+`server`. Session creation, rename/delete,
 annotations, agent/model choice, broadcast selection, search, and project
-inspection operate through OpenCode's API.
+inspection operate through OpenCode's API. Deleting the session currently
+selected adopts the session under the cursor as the new current (state write,
+TUI refresh, and list highlight); deleting any other session leaves the current
+selection unchanged. In broadcast mode `d` deletes just the cursor session
+while `D` (Shift+d) deletes every selected session at once — after confirming,
+broadcast mode ends and the row under the cursor becomes the new current.
+Interactive prompts (create/rename/reminder/delete/delete-all) take over the
+status bar and flip its background from brown to light yellow — the same color
+as the session-list pointer — so an active question is immediately visible.
+The broadcast info line (`Broadcast to sessions: …`) never wraps: it holds up
+to 480 characters of names (or the terminal width, whichever is smaller), and
+an oversized selection is truncated from the beginning with a leading `...`.
 
 ### `ocmux session <id|title> [dir]`
 

package/lib/ocmux.js

@@ -18,7 +18,15 @@ function tuiArgs(server, session, directory) {
 function switchTui(directory, server, session, executable) {
   const target = registry.resolve(directory);
   if (!target) return { ok: false, reason: 'none' };
-  const result = registry.respawn(target.instance, {
+  // Skip the respawn when the routed pane already shows this project/session,
+  // so merely opening ocmux does not restart a TUI that is already correct.
+  const instance = target.instance;
+  if (instance.activeDirectory
+    && path.resolve(instance.activeDirectory) === path.resolve(directory)
+    && String(instance.activeSession || '') === String(session || '')) {
+    return { ok: true, kind: target.kind, instance, unchanged: true };
+  }
+  const result = registry.respawn(instance, {
     executable: executable || path.resolve(__dirname, '..', 'bin', 'ocmux'),
     directory,
     server,
@@ -28,7 +36,7 @@ function switchTui(directory, server, session, executable) {
     registry.pruneDead();
     return { ok: false, reason: 'failed', kind: target.kind, error: result.error };
   }
-  return { ok: true, kind: target.kind, instance: target.instance };
+  return { ok: true, kind: target.kind, instance };
 }
 
 module.exports = {

package/lib/tui-registry.js

@@ -171,6 +171,10 @@ function register({ socket, pane, shared, directory, server, session, pid }) {
     directory: directory ? path.resolve(directory) : null,
     server: server || null,
     session: session || null,
+    // What the pane is currently displaying. `respawn()` refreshes these so a
+    // caller (ocmux) can skip restarting a TUI that already shows the target.
+    activeDirectory: directory ? path.resolve(directory) : null,
+    activeSession: session || null,
     pid: Number(pid) || process.pid,
     registeredAt: now,
     updatedAt: now,
@@ -276,6 +280,10 @@ function respawn(instance, { executable, directory, server, session }) {
   if (result.status !== 0) {
     return { ok: false, error: (result.stderr || '').trim() || `failed to respawn ${instance.pane}` };
   }
+  updateInstance(instance.id, instance.token, {
+    activeDirectory: directory ? path.resolve(directory) : null,
+    activeSession: session || null,
+  });
   return { ok: true };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentp",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Pipe prompts into a running OpenCode TUI session and stream the final answer",
   "bin": {
     "agentp": "bin/agentp",