agentp 2.1.1 → 2.1.3

package/README.md

@@ -114,6 +114,7 @@ Arguments:
 
 - `url`: OpenCode server URL or port number (defaults to `4096`). Examples: `4096`, `http://localhost:4096`, `http://192.168.1.50:4096`
 - Omit it and agentp resolves the project itself: the nearest `.ocmux.json` (upward from the working directory) supplies the server URL, the project directory, and the target session id. `agentp $(ocmux)` still works as an override, but is no longer needed.
+- When a registered TUI pane exists for the project, `agentp` routes it to the session the prompt went to (normal and `--defer`), so the answer streams in view; re-submitting a deferred ticket does the same for the ticket's session. Best-effort and silent when no pane is registered — broadcast prompts are left untouched (no single session to show).
 
 ## Examples
 
@@ -218,6 +219,8 @@ The ticket is `agentp_ticket` followed by a JSON object with these fields:
 - `server` — OpenCode server URL used by the deferred job.
 - `sessionId` — OpenCode session ID used by a normal deferred job.
 - `sessionIds` — array of OpenCode session IDs used by a **broadcast** deferred job (replaces `sessionId`).
+- `sessionName` — the session's current title, display-only: routing always keys on `sessionId`. Refreshed on every ticket print, so a session renamed while a job is running shows its up-to-date name.
+- `sessionNames` — map of session ID → current title for **broadcast** tickets (display-only, refreshed on every print).
 - `elapsed` — seconds since `ctime`, included only when the ticket is re-printed (not on first print).
 - `defer` — the timeout requested at submission, included only when it was > 0.
 - `cancelled` — always present (defaults to `false`). Set it to `true` and pipe the ticket back to cancel the running job (see below).
@@ -348,10 +351,15 @@ the project found upward from `<directory>` (default: `$PWD`):
   it, and `Backspace` on an already-empty search also exits it. The same `/`
   search works in the model/agent pickers and the project switcher.
 - `Enter` switches (menu stays open). `Space` over a different session enters
-  **broadcast mode**: Space selects/deselects sessions; `Enter` keeps the list
-  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**: Space selects/deselects sessions; `Enter` switches to the
+  cursor session and ends broadcast; `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. Ending broadcast (`Enter`/`ESC`/`q`,
+  or any later session switch) clears the stored selection. Reopening `ocmux`
+  while a valid selection is stored starts directly in broadcast mode; a stale
+  or invalid stored list (fewer than two sessions, or ids that no longer exist)
+  is cleared first, so the picker always shows the real state. New selections
+  open in the TUI for inspection.
   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
@@ -368,6 +376,33 @@ the project found upward from `<directory>` (default: `$PWD`):
   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)
+- **pending-answer awareness**: while the picker is open, ocmux re-checks the
+  project every 2 seconds and marks sessions that are waiting on the agent.
+  Two independent marker columns: ❓ = pending agent **question** (a form),
+  🔒 = pending **permission** request (each always reserves its slot so rows
+  stay aligned). A 🔔 leads the **status bar** when any listed session is
+  waiting, and the cursor session's marker columns are pinned to the **top-right
+  corner of the info panel**. The same markers appear in the project switcher,
+  per session and — when folded — aggregated over the project.
+- **live activity**: sessions with a running turn show an **animated spinner**
+  next to their row (and `BUSY` in the info panel). While the picker is open
+  ocmux re-checks activity every second, so the spinner appears when a session
+  starts a turn and disappears when it finishes — no re-opening needed.
+- `A` answers the pending **question(s)** of the selected session (only when it
+  shows a ❓ marker). Answer mode
+  lists the form's fields and options: `Space`/`Enter` selects (`(•)`), extra
+  rows toggle on multi-select fields, and "Type your own answer" / free-text
+  rows open the status-bar input. Fields gated by `when` conditions appear and
+  disappear live as you answer their gate. The final **Submit answers** row
+  sends the whole form in one request; the server's message shows in the status
+  bar on rejection (400), an already-answered form (409) reports and returns to
+  the list, and multi-form sessions advance form to form. `h` toggles the
+  answer-mode help, `q`/`ESC` cancels without answering.
+- `P` answers the pending **permission request(s)** of the selected session
+  (only when it shows a 🔒 marker). Each request is shown with its action,
+  resources and optional message; `o`/`1` allow **once**, `a` allow **always**
+  (remembered), `r` **reject** — each posts the decision and advances to the
+  next pending request (`h` help, `q`/`ESC` leaves them pending).
 - `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
@@ -394,7 +429,12 @@ prepends a session's reminder to every prompt sent to it.
 Broadcast selections are stored in `.ocmux.json` as `broadcast`. `agentp`
 sends a prompt to all selected sessions (waiting for busy sessions to go idle),
 and prints a labeled answer section for each. Errors/incomplete targets are
-reported individually with session name, id, error, and timestamp.
+reported individually with session name, id, error, and timestamp. Leaving
+broadcast mode (`Enter`/`ESC`/`q`) or picking a session in the normal switcher
+removes the stored `broadcast`, so a stale selection never keeps broadcasting.
+Opening `ocmux` reads it back: a valid list opens the picker directly in
+broadcast mode, while a stale or invalid list is cleared and the picker shows
+the (real) normal state.
 
 Subcommands:
 

package/bin/agentp

@@ -21,6 +21,7 @@ const {
   getActiveSessions,
 } = require('../lib/opencode');
 const projectState = require('../lib/project-state');
+const ocmuxLib = require('../lib/ocmux');
 
 const TGAGENTP_PORT_FILE = '/tmp/tgagentp-port';
 
@@ -177,9 +178,21 @@ function parseDeferredTicketInput(text) {
     cancelled: data.cancelled === true,
     followupText,
   };
+  // Display-only name(s): carried through for fallback when a refresh fails,
+  // never used for routing (which keys on sessionId/sessionIds).
+  if (typeof data.sessionName === 'string' && data.sessionName) {
+    ticket.sessionName = data.sessionName;
+  }
   if (Array.isArray(data.sessionIds)) {
     ticket.sessionIds = data.sessionIds.filter(x => typeof x === 'string' && x);
   }
+  if (data.sessionNames && typeof data.sessionNames === 'object' && !Array.isArray(data.sessionNames)) {
+    const names = {};
+    for (const [k, v] of Object.entries(data.sessionNames)) {
+      if (typeof v === 'string' && v) names[k] = v;
+    }
+    if (Object.keys(names).length > 0) ticket.sessionNames = names;
+  }
   return ticket;
 }
 
@@ -197,7 +210,15 @@ function formatTicket(ticket, elapsed, compact) {
   const fields = { ctime: ticket.ctime, path: ticket.path };
   if (ticket.server) fields.server = ticket.server;
   if (ticket.sessionId) fields.sessionId = ticket.sessionId;
-  if (Array.isArray(ticket.sessionIds) && ticket.sessionIds.length > 0) fields.sessionIds = ticket.sessionIds;
+  // Session name(s) are display-only convenience (ids are hard to read for a
+  // human); the actual routing always keys on `sessionId` / `sessionIds`.
+  if (ticket.sessionName) fields.sessionName = ticket.sessionName;
+  if (Array.isArray(ticket.sessionIds) && ticket.sessionIds.length > 0) {
+    fields.sessionIds = ticket.sessionIds;
+    if (ticket.sessionNames && Object.keys(ticket.sessionNames).length > 0) {
+      fields.sessionNames = ticket.sessionNames;
+    }
+  }
   if (elapsed !== undefined) fields.elapsed = elapsed;
   if (ticket.defer > 0) fields.defer = ticket.defer;
   // Always present so it can be flipped to true and piped back to cancel.
@@ -223,15 +244,76 @@ async function cancelTicket(ticket) {
   process.exit(0);
 }
 
-// Print a deferred ticket (with elapsed) and exit — used for the interrupt path.
-function printTicketAndExit(ticket, onlineTicket) {
-  const elapsed = ticket && ticket.ctime
-    ? Math.max(0, Math.floor((Date.now() - Date.parse(ticket.ctime)) / 1000))
+// Re-fetch the display name(s) of a ticket's target session(s) right before
+// printing, so a session renamed since the ticket was created shows its
+// current title. Display-only: routing always keys on `sessionId`/`sessionIds`.
+// Failures keep the last known name (carried in the parsed ticket) rather than
+// dropping it.
+async function refreshTicketSessionNames(ticket) {
+  if (!ticket || !ticket.server) return ticket;
+  const out = { ...ticket };
+  if (out.sessionId) {
+    try {
+      const s = await getSession(out.server, out.sessionId);
+      if (s && (s.title || s.id)) out.sessionName = s.title || s.id;
+    } catch { /* keep the last known name */ }
+  }
+  if (Array.isArray(out.sessionIds) && out.sessionIds.length > 0) {
+    const names = {};
+    if (out.sessionNames && typeof out.sessionNames === 'object') {
+      for (const [k, v] of Object.entries(out.sessionNames)) if (v) names[k] = v;
+    }
+    for (const id of out.sessionIds) {
+      try {
+        const s = await getSession(out.server, id);
+        if (s && (s.title || s.id)) names[String(id)] = s.title || s.id;
+      } catch { /* keep the last known name for this id */ }
+    }
+    const kept = {};
+    for (const id of out.sessionIds) {
+      const k = String(id);
+      if (names[k]) kept[k] = names[k];
+    }
+    if (Object.keys(kept).length > 0) out.sessionNames = kept;
+    else delete out.sessionNames;
+  }
+  return out;
+}
+
+// Print a deferred ticket (with refreshed session name and elapsed) and exit —
+// used for the interrupt path.
+async function printTicketAndExit(ticket, onlineTicket) {
+  const fresh = await refreshTicketSessionNames(ticket);
+  const elapsed = fresh && fresh.ctime
+    ? Math.max(0, Math.floor((Date.now() - Date.parse(fresh.ctime)) / 1000))
     : 0;
-  process.stdout.write(formatTicket(ticket, elapsed, onlineTicket) + '\n');
+  process.stdout.write(formatTicket(fresh, elapsed, onlineTicket) + '\n');
   process.exit(0);
 }
 
+// Route a registered TUI (if any) to the session a ticket refers to, so
+// re-sending a ticket brings that session into view while it works. Tickets
+// carry no project directory — it is derived from the session's own location.
+// Best-effort: a missing directory, server hiccup or absent registered pane is
+// silently ignored, and broadcast tickets are skipped (no single session to
+// show).
+async function routeTuiToTicketSession(ticket) {
+  if (!ticket || !ticket.server || !ticket.sessionId) return;
+  let directory = null;
+  try {
+    const s = await getSession(ticket.server, ticket.sessionId);
+    directory = s && s.location && s.location.directory ? s.location.directory : null;
+  } catch {
+    return;
+  }
+  if (!directory) return;
+  try {
+    ocmuxLib.switchTui(directory, ticket.server, ticket.sessionId);
+  } catch {
+    // TUI routing is best-effort; never fail the retrieval because of it.
+  }
+}
+
 async function resolveTargetSession(serverBase, sessionName, newSession, opts = {}) {
   // opts: { directory, preferredSession } — v2 project/session resolution from
   // the nearest .ocmux.json. `directory` scopes the listing to the project;
@@ -912,6 +994,9 @@ async function main() {
       // ignored; the ticket's own "defer" timeout is used instead (default 0).
       const deferredPath = ticket.path;
 
+      // Bring the ticket's session into view in any registered TUI (best-effort).
+      await routeTuiToTicketSession(ticket);
+
       if (ticket.cancelled) {
         await cancelTicket(ticket);
       }
@@ -970,10 +1055,12 @@ async function main() {
       }
 
       // Answer not available yet — re-print the ticket with updated elapsed
-      const elapsed = ticket.ctime
-        ? Math.max(0, Math.floor((Date.now() - Date.parse(ticket.ctime)) / 1000))
+      // and a freshly resolved session name (it may have been renamed).
+      const freshTicket = await refreshTicketSessionNames(ticket);
+      const elapsed = freshTicket.ctime
+        ? Math.max(0, Math.floor((Date.now() - Date.parse(freshTicket.ctime)) / 1000))
         : 0;
-      process.stdout.write(formatTicket(ticket, elapsed, onlineTicket) + '\n');
+      process.stdout.write(formatTicket(freshTicket, elapsed, onlineTicket) + '\n');
       process.exit(0);
     }
 
@@ -996,6 +1083,13 @@ async function main() {
       }
     }
 
+    // Route the project's registered TUI (if any) to the target session so the
+    // prompt streams in view while the deferred child works. Best-effort and
+    // skipped for broadcasts (no single session to show).
+    try {
+      if (projectDir && targetSessionId) ocmuxLib.switchTui(projectDir, serverBase, targetSessionId);
+    } catch {}
+
     const newTicket = spawnDeferredChild({
       promptText,
       serverBase,
@@ -1026,8 +1120,10 @@ async function main() {
       }
     }
 
-    // Output the deferred ticket
-    process.stdout.write(formatTicket(newTicket, undefined, onlineTicket) + '\n');
+    // Output the deferred ticket with the session name resolved for display
+    // (ids are hard to remember; the name is fetch-and-forget, never routed on).
+    const freshTicket = await refreshTicketSessionNames(newTicket);
+    process.stdout.write(formatTicket(freshTicket, undefined, onlineTicket) + '\n');
     process.exit(0);
   }
 
@@ -1041,6 +1137,9 @@ async function main() {
       // re-print the ticket only if the user interrupts with Ctrl+C.
       const deferredPath = ticket.path;
 
+      // Bring the ticket's session into view in any registered TUI (best-effort).
+      await routeTuiToTicketSession(ticket);
+
       if (ticket.cancelled) {
         await cancelTicket(ticket);
       }
@@ -1075,7 +1174,7 @@ async function main() {
       }
 
       const wait = await waitForDeferredResultForever(deferredPath);
-      if (wait.interrupted) printTicketAndExit(ticket, onlineTicket);
+      if (wait.interrupted) await printTicketAndExit(ticket, onlineTicket);
       outputReadyResult(deferredPath, wait.result, qaMode, unusedFollowup, await ticketHeader(ticket, qaMode));
     }
 
@@ -1096,6 +1195,13 @@ async function main() {
       }
     }
 
+    // Route the project's registered TUI (if any) to the target session so the
+    // answer streams in view. Best-effort and skipped for broadcasts (no single
+    // session to show).
+    try {
+      if (projectDir && targetSessionId) ocmuxLib.switchTui(projectDir, serverBase, targetSessionId);
+    } catch {}
+
     const newTicket = spawnDeferredChild({
       promptText,
       serverBase,
@@ -1110,7 +1216,7 @@ async function main() {
     });
 
     const wait = await waitForDeferredResultForever(newTicket.path);
-    if (wait.interrupted) printTicketAndExit(newTicket, onlineTicket);
+    if (wait.interrupted) await printTicketAndExit(newTicket, onlineTicket);
 
     // Answer ready — output it and clean up.
     try {
@@ -1171,8 +1277,8 @@ async function main() {
         preferredSession,
       });
 
-      // Prepend the session's annotation (if any) to the prompt. TUI routing is
-      // owned by explicit ocmux session switches, not by prompt submission.
+      // Prepend the session's annotation (if any) to the prompt. (The parent
+      // already routed the project's TUI to this session before spawning us.)
       let prompt = actualPromptText;
       try {
         if (ctx && ctx.statefile) {
@@ -1281,4 +1387,4 @@ if (require.main === module) {
   });
 }
 
-module.exports = { main, notifyAgentpGateway, readAllStdin, parseDeferredTicket, parseDeferredTicketInput, formatTicket, waitForDeferredResult, waitForDeferredResultForever, runBroadcastSend, buildBroadcastSection, formatBroadcastResults, isBroadcastActive };
+module.exports = { main, notifyAgentpGateway, readAllStdin, parseDeferredTicket, parseDeferredTicketInput, formatTicket, refreshTicketSessionNames, waitForDeferredResult, waitForDeferredResultForever, runBroadcastSend, buildBroadcastSection, formatBroadcastResults, isBroadcastActive };