@a-t-h-i/bot-lobby 0.5.1 → 0.6.0

package/src/lobby/tabs/quickfix.ts

@@ -73,16 +73,13 @@ export function jobDetailLines(job: QuickFixJob, width: number, tick: number, no
   return lines;
 }
 
+/** Before the first fix: one sentence, then the agent and the model it runs on. */
 function intro(input: QuickFixTabInput, width: number, theme?: LobbyTheme): string[] {
   return [
-    bold(theme, "Make a direct change, the way you would ask pi."),
+    ...wrap(bold(theme, "Describe a small change below and one agent makes it now, beside any running task."), width),
     "",
-    "Type what you want below and press enter. One coding agent makes the change right away — no scouting, proposal, plan or review — while any bot-lobby task keeps running. Quick fixes run one at a time in the order you send them.",
-    "",
-    "Keep them small: a rename, a typo, a one-function fix. If it turns out bigger, the agent stops and says so, and you can plan it as a task.",
-    "",
-    paint(theme, "dim", `quick fix: ${input.profile} — esc, then m changes the model, thinking, time limit and instructions (alt+s: all settings)`),
-  ].flatMap((line) => wrap(line, width));
+    `${paint(theme, "mdCode", "QUICK FIX".padEnd(11))}${paint(theme, "muted", input.profile)}`,
+  ];
 }
 
 /** Jobs whose prompt, steps or report mention `query`. */
@@ -104,7 +101,7 @@ export function renderQuickFix(input: QuickFixTabInput, width: number, height: n
   const jobs = newestFirst(filterJobs(input.jobs, input.query));
   if (jobs.length === 0) {
     const content = input.query && input.jobs.length > 0 ? [paint(theme, "dim", `No quick fix mentions "${input.query}".`)] : intro(input, width - 4, theme);
-    return box(width, height, content, { title: "Quick fix", right: input.profile, theme });
+    return box(width, height, content, { title: "Quick fix", ...(input.query ? { right: input.profile } : {}), theme });
   }
   const selected = Math.min(Math.max(0, input.selected), jobs.length - 1);
   const { list: listWidth, detail: detailWidth, wide } = quickFixWidths(width);

package/src/lobby/tabs/tasks.ts

@@ -11,10 +11,13 @@ import { planChecklist } from "../../pi/zen.ts";
 import { persistedRuns } from "../../pi/ui.ts";
 import { describeRun, runFromLog } from "../../pi/run-summary.ts";
 import { pendingApprovals } from "../../workflow/approvals.ts";
-import { ago, beside, bold, box, detailWindow, fill, markdownLines, notePane, paint, position, rule, selectRow, since, windowStart, wrap, wrapHanging, type LobbyTheme, type PaneLayout } from "../layout.ts";
+import { ago, beside, bold, box, detailWindow, fill, markdownLines, notePane, paint, position, rule, selectRow, since, spread, strike, windowStart, wrap, wrapHanging, type LobbyColor, type LobbyTheme, type PaneLayout } from "../layout.ts";
 
 export type TaskSection = "mine" | "others" | "pending" | "recent";
 
+/** How a row is ticked off: still to do (a plan, or a task under way), completed, or abandoned. */
+export type CheckState = "open" | "done" | "dropped";
+
 export interface TaskRow {
   kind: "task" | "plan";
   id: string;
@@ -22,17 +25,44 @@ export interface TaskRow {
   section: TaskSection;
   /** Task state, or `pending` for a saved plan. */
   status: string;
-  /** Right-hand note: progress, owner or issue. */
-  meta: string;
+  paused?: boolean;
+  check: CheckState;
+  /** Plan steps done, once the task has a plan. */
+  progress?: { done: number; total: number };
+  /** Who drives it, for tasks other sessions own. */
+  owner?: string;
+  /** How long ago it finished (finished tasks) or was saved (plans), as `3h`. */
+  age?: string;
+  /** The GitHub issue a plan came from. */
+  issue?: number;
+  /** Auto mode is on: the oracle drives it without asking. */
+  auto?: boolean;
+}
+
+/** What the lobby knows about sessions beyond this one: background sessions' names, tasks in auto mode. */
+export interface RowContext {
+  /** Background sessions this window started, by pi session id. */
+  names?: ReadonlyMap<string, string>;
+  /** Tasks with auto mode on. */
+  auto?: ReadonlySet<string>;
 }
 
 export const SECTION_TITLES: Record<TaskSection, string> = {
   mine: "THIS SESSION",
   others: "OTHER SESSIONS",
-  pending: "PENDING (planned)",
-  recent: "RECENT",
+  pending: "PENDING",
+  recent: "FINISHED",
 };
 
+/** The box each row wears: empty while there is work to do, ticked when completed, crossed when abandoned. */
+export const CHECK_MARKS: Record<CheckState, string> = { open: "☐", done: "☑", dropped: "☒" };
+
+export function checkState(task: Task): CheckState {
+  if (task.state === "completed") return "done";
+  if (task.state === "abandoned") return "dropped";
+  return "open";
+}
+
 /** Finished tasks listed under RECENT. */
 export const RECENT_LIMIT = 8;
 
@@ -44,65 +74,153 @@ export function taskProgress(task: Task): { done: number; total: number } | unde
   return { done: steps.filter((step) => step.status === "done").length, total: steps.length };
 }
 
-function ownerLabel(task: Task, sessionId: string | undefined): string {
+function ownerLabel(task: Task, sessionId: string | undefined, names?: ReadonlyMap<string, string>): string {
   if (!task.ownerSessionId) return "no owner";
   if (task.ownerSessionId === sessionId) return "this session";
+  const name = names?.get(task.ownerSessionId);
+  // A background session is named after its task, so the row's title already says which one.
+  if (name) return name === task.title ? "background" : `background · ${name}`;
   return `session ${task.ownerSessionId.slice(0, 8)}`;
 }
 
 /** Rows in display order: this session's task, other sessions', pending plans, then recent finished tasks. */
-export function taskRows(tasks: readonly Task[], plans: readonly PlannedTask[], sessionId: string | undefined, now: number): TaskRow[] {
+export function taskRows(tasks: readonly Task[], plans: readonly PlannedTask[], sessionId: string | undefined, now: number, context: RowContext = {}): TaskRow[] {
   const active = tasks.filter((task) => !TERMINAL_STATES.includes(task.state));
   const row = (task: Task, section: TaskSection): TaskRow => {
-    const progress = taskProgress(task);
-    const meta = section === "recent" ? ago(now - Date.parse(task.updatedAt)) : progress ? `${progress.done}/${progress.total}` : section === "others" ? ownerLabel(task, sessionId) : "";
-    return { kind: "task", id: task.id, title: task.title, section, status: task.paused ? `${task.state} (paused)` : task.state, meta };
+    const progress = section === "recent" ? undefined : taskProgress(task);
+    const auto = section !== "recent" && context.auto?.has(task.id);
+    return {
+      kind: "task",
+      id: task.id,
+      title: task.title,
+      section,
+      status: task.state,
+      ...(task.paused && section !== "recent" ? { paused: true } : {}),
+      check: checkState(task),
+      ...(progress ? { progress } : {}),
+      ...(section === "others" ? { owner: ownerLabel(task, sessionId, context.names) } : {}),
+      ...(section === "recent" ? { age: ago(now - Date.parse(task.updatedAt)) } : {}),
+      ...(auto ? { auto: true } : {}),
+    };
   };
   return [
     ...active.filter((task) => sessionId && task.ownerSessionId === sessionId).map((task) => row(task, "mine")),
     ...active.filter((task) => !sessionId || task.ownerSessionId !== sessionId).map((task) => row(task, "others")),
     ...plans.filter((plan) => plan.status === "pending").map((plan): TaskRow => ({
-      kind: "plan", id: plan.id, title: plan.title, section: "pending", status: "pending", meta: plan.issue ? `#${plan.issue.number}` : "",
+      kind: "plan",
+      id: plan.id,
+      title: plan.title,
+      section: "pending",
+      status: "pending",
+      check: "open",
+      ...(plan.createdAt ? { age: ago(now - Date.parse(plan.createdAt)) } : {}),
+      ...(plan.issue ? { issue: plan.issue.number } : {}),
     })),
     ...tasks.filter((task) => TERMINAL_STATES.includes(task.state)).slice(0, RECENT_LIMIT).map((task) => row(task, "recent")),
   ];
 }
 
-const STATE_COLORS: Record<string, "success" | "warning" | "error" | "accent" | "muted" | "dim"> = {
+type StateColor = Extract<LobbyColor, "success" | "warning" | "error" | "accent" | "muted" | "dim">;
+
+const STATE_COLORS: Record<string, StateColor> = {
   completed: "success",
   abandoned: "dim",
   blocked: "error",
   awaiting_approval: "warning",
+  planning: "accent",
   implementing: "accent",
   reviewing: "accent",
   pending: "muted",
 };
 
-function statusColor(status: string): "success" | "warning" | "error" | "accent" | "muted" | "dim" {
-  return STATE_COLORS[status.replace(/ \(paused\)$/, "")] ?? "muted";
+function statusColor(status: string): StateColor {
+  return STATE_COLORS[status] ?? "muted";
+}
+
+/** A task's state in words: `awaiting approval`, `implementing · paused`. */
+function stateWords(status: string, paused?: boolean): string {
+  return `${status.replace(/_/g, " ")}${paused ? " · paused" : ""}`;
+}
+
+/** The row's box, coloured by what it says: the state's colour while open, green when done, dim when dropped. */
+export function checkMark(row: Pick<TaskRow, "check" | "status" | "paused">, theme?: LobbyTheme): string {
+  const color: StateColor = row.check === "done" ? "success" : row.check === "dropped" ? "dim" : row.paused ? "warning" : statusColor(row.status);
+  return paint(theme, color, CHECK_MARKS[row.check]);
+}
+
+/** A title as its box says: struck through and dim once abandoned, bold while selected. */
+function rowTitle(row: TaskRow, selected: boolean, theme?: LobbyTheme): string {
+  if (row.check === "dropped") return paint(theme, "dim", strike(theme, row.title));
+  if (row.check === "done") return selected ? bold(theme, row.title) : paint(theme, "muted", row.title);
+  return selected ? bold(theme, row.title) : row.title;
+}
+
+/** Progress as pips, `cells` wide: filled for the share done, hollow for the rest. */
+export function pips(done: number, total: number, cells: number, theme?: LobbyTheme): string {
+  if (cells <= 0 || total <= 0) return "";
+  const filled = Math.min(cells, Math.round((Math.max(0, done) / total) * cells));
+  return `${paint(theme, done >= total ? "success" : "accent", "▰".repeat(filled))}${paint(theme, "borderMuted", "▱".repeat(cells - filled))}`;
+}
+
+/** Plan progress on a row: a pip per step (up to eight) and `3/5`. */
+function progressText(progress: TaskRow["progress"], theme?: LobbyTheme): string {
+  if (!progress) return "";
+  return `${pips(progress.done, progress.total, Math.min(progress.total, 8), theme)} ${paint(theme, "muted", `${progress.done}/${progress.total}`)}`;
+}
+
+/** The line under an open row's title: its state, who drives it and whether auto mode is on; a plan's age and issue. */
+function detailsLine(row: TaskRow, theme?: LobbyTheme): string {
+  const dot = paint(theme, "dim", " · ");
+  if (row.kind === "plan") {
+    return [paint(theme, "muted", "planned"), row.age ? paint(theme, "dim", row.age === "now" ? "saved just now" : `saved ${row.age} ago`) : "", row.issue ? paint(theme, "dim", `#${row.issue}`) : ""].filter(Boolean).join(dot);
+  }
+  return [
+    paint(theme, row.paused ? "warning" : statusColor(row.status), stateWords(row.status, row.paused)),
+    row.auto ? paint(theme, "success", "⟳ auto") : "",
+    row.owner ? paint(theme, "dim", row.owner) : "",
+  ].filter(Boolean).join(dot);
 }
 
-/** List lines with section headers, plus which line holds the selected row. */
+/**
+ * List lines with a rule over each section, plus which line holds the
+ * selected row. A task or plan still to do takes two lines — its box and
+ * title (with plan progress on the right), then its state, owner and auto
+ * mode; a finished one takes one, ticked or struck through, with its age.
+ */
 export function listLines(rows: readonly TaskRow[], selected: number, width: number, focused: boolean, theme?: LobbyTheme): { lines: string[]; selectedLine: number } {
   const lines: string[] = [];
   let selectedLine = 0;
   let section: TaskSection | undefined;
+  const counts = new Map<TaskSection, number>();
+  for (const row of rows) counts.set(row.section, (counts.get(row.section) ?? 0) + 1);
   rows.forEach((row, index) => {
     if (row.section !== section) {
       section = row.section;
       if (lines.length > 0) lines.push("");
-      lines.push(paint(theme, "dim", SECTION_TITLES[section]));
+      lines.push(rule(width, SECTION_TITLES[section], theme, String(counts.get(section) ?? 0)));
+    }
+    const chosen = index === selected;
+    const marker = chosen ? paint(theme, "accent", "▸") : " ";
+    const head = `${marker} ${checkMark(row, theme)} ${rowTitle(row, chosen, theme)}`;
+    if (chosen) selectedLine = lines.length;
+    if (row.check !== "open") {
+      lines.push(selectRow(theme, spread(head, row.age ? paint(theme, "dim", row.age) : "", width), width, chosen, focused));
+      return;
     }
-    const marker = index === selected ? paint(theme, "accent", "▸ ") : "  ";
-    const status = paint(theme, statusColor(row.status), row.status.replace(/_/g, " "));
-    const meta = row.meta ? ` ${paint(theme, "dim", row.meta)}` : "";
-    const title = index === selected ? bold(theme, row.title) : row.title;
-    if (index === selected) selectedLine = lines.length;
-    lines.push(selectRow(theme, `${marker}${title} ${paint(theme, "dim", "·")} ${status}${meta}`, width, index === selected, focused));
+    lines.push(selectRow(theme, spread(head, progressText(row.progress, theme), width), width, chosen, focused));
+    lines.push(selectRow(theme, `    ${detailsLine(row, theme)}`, width, chosen, focused));
   });
   return { lines, selectedLine };
 }
 
+/** The list pane's right-hand count: what is open and what is finished, or how many rows match a search. */
+export function listCount(rows: readonly TaskRow[], query?: string): string {
+  if (query) return `${rows.length} match${rows.length === 1 ? "" : "es"}`;
+  const open = rows.filter((row) => row.check === "open").length;
+  const finished = rows.length - open;
+  return [open ? `${open} open` : "", finished ? `${finished} finished` : ""].filter(Boolean).join(" · ") || "0";
+}
+
 const COMMENT_MARKS: Record<PlanComment["status"], string> = { open: "○", delivered: "◐", addressed: "✓" };
 const COMMENT_WORDS: Record<PlanComment["status"], string> = { open: "waiting for the owning session", delivered: "sent to the oracle", addressed: "plan amended" };
 
@@ -113,31 +231,44 @@ function section(title: string, width: number, theme?: LobbyTheme, right = ""):
 /** Detail lines for a task: header, plan with progress, comments, amendments, waits and runs. */
 export function taskDetailLines(task: Task, comments: readonly PlanComment[], sessionId: string | undefined, width: number, now: number, theme?: LobbyTheme): string[] {
   const lines: string[] = [];
-  lines.push(...wrap(bold(theme, `${task.title}`), width));
+  const check = checkState(task);
+  const row = { check, status: task.state, ...(task.paused ? { paused: true } : {}) };
+  const title = check === "dropped" ? paint(theme, "dim", strike(theme, task.title)) : bold(theme, task.title);
+  lines.push(...wrapHanging(`${checkMark(row, theme)} `, title, width));
+  const dot = paint(theme, "dim", " · ");
+  const finished = TERMINAL_STATES.includes(task.state);
   const facts = [
-    paint(theme, statusColor(task.state), `${task.state.replace(/_/g, " ")}${task.paused ? " (paused)" : ""}`),
-    ownerLabel(task, sessionId),
-    `started ${since(now - Date.parse(task.createdAt))}`,
-    task.domains.length > 0 ? task.domains.join(", ") : "",
+    bold(theme, paint(theme, task.paused ? "warning" : statusColor(task.state), stateWords(task.state, task.paused))),
+    finished ? "" : paint(theme, "muted", ownerLabel(task, sessionId)),
+    paint(theme, "muted", `started ${since(now - Date.parse(task.createdAt))}`),
+    finished ? paint(theme, "muted", `${task.state === "abandoned" ? "dropped" : "done"} ${since(now - Date.parse(task.updatedAt))}`) : "",
   ].filter(Boolean);
-  lines.push(paint(theme, "dim", task.id), facts.join(paint(theme, "dim", " · ")));
+  lines.push(...wrapHanging("  ", facts.join(dot), width));
+  lines.push(...wrapHanging("  ", paint(theme, "dim", [task.id, task.domains.length > 0 ? task.domains.join(", ") : ""].filter(Boolean).join(" · ")), width));
+  const steps = task.plan ? planChecklist(task.plan, persistedRuns(task)) : [];
+  const done = steps.filter((step) => step.status === "done").length;
+  if (steps.length > 0) {
+    const cells = Math.max(4, Math.min(24, width - 20));
+    lines.push("", `  ${pips(done, steps.length, cells, theme)} ${paint(theme, "muted", `${done} of ${steps.length} steps`)}`);
+  }
   const request = taskRequest(task);
   if (request && request !== task.title) lines.push(...section("Request", width, theme), ...wrap(paint(theme, "muted", request), width));
   if (task.plan) {
-    const steps = planChecklist(task.plan, persistedRuns(task));
-    const done = steps.filter((step) => step.status === "done").length;
-    lines.push(...section("Approved plan", width, theme, steps.length > 0 ? `${done}/${steps.length} steps` : ""));
-    for (const [index, step] of steps.entries()) {
-      const mark = step.status === "done" ? paint(theme, "success", "✓") : step.status === "current" ? paint(theme, "accent", "▸") : paint(theme, "dim", "○");
-      const text = step.status === "pending" ? paint(theme, "muted", step.text) : step.text;
-      lines.push(...wrapHanging(`${mark} ${index + 1}. `, text, width));
+    if (steps.length > 0) {
+      lines.push(...section("Progress", width, theme, `${done}/${steps.length} steps`));
+      for (const [index, step] of steps.entries()) {
+        const mark = step.status === "done" ? paint(theme, "success", CHECK_MARKS.done) : paint(theme, step.status === "current" ? "accent" : "dim", CHECK_MARKS.open);
+        const text = step.status === "done" ? paint(theme, "muted", step.text) : step.status === "current" ? bold(theme, step.text) : paint(theme, "muted", step.text);
+        const current = step.status === "current" ? ` ${paint(theme, "accent", "◂ now")}` : "";
+        lines.push(...wrapHanging(`${mark} ${paint(theme, "dim", `${index + 1}.`)} `, `${text}${current}`, width));
+      }
     }
-    if (steps.length > 0) lines.push("");
+    lines.push(...section("Approved plan", width, theme));
     lines.push(...markdownLines(task.plan, width, theme));
   } else if (task.proposal) {
-    lines.push(...section("Proposal (no plan yet)", width, theme), ...markdownLines(task.proposal, width, theme));
+    lines.push(...section(TERMINAL_STATES.includes(task.state) ? "Proposal" : "Proposal (no plan yet)", width, theme), ...markdownLines(task.proposal, width, theme));
   } else {
-    lines.push(...section("Plan", width, theme), paint(theme, "dim", "No proposal or plan yet — the oracle is still clarifying or scouting."));
+    lines.push(...section("Plan", width, theme), paint(theme, "dim", TERMINAL_STATES.includes(task.state) ? "It ended before a plan was made." : "No proposal or plan yet — the oracle is still clarifying or scouting."));
   }
   const open = comments.filter((comment) => comment.status !== "addressed").length;
   lines.push(...section("Comments", width, theme, open > 0 ? `${open} open` : ""));
@@ -166,13 +297,15 @@ export function taskDetailLines(task: Task, comments: readonly PlanComment[], se
 
 /** Detail lines for a saved plan waiting to start. */
 export function planDetailLines(plan: PlannedTask, width: number, now: number, theme?: LobbyTheme): string[] {
+  const dot = paint(theme, "dim", " · ");
   const lines = [
-    ...wrap(bold(theme, plan.title), width),
-    paint(theme, "dim", plan.id),
-    [paint(theme, "muted", "pending"), `saved ${since(now - Date.parse(plan.createdAt))}`].join(paint(theme, "dim", " · ")),
+    ...wrapHanging(`${checkMark({ check: "open", status: "pending" }, theme)} `, bold(theme, plan.title), width),
+    ...wrapHanging("  ", [bold(theme, paint(theme, "muted", "pending")), paint(theme, "muted", `saved ${since(now - Date.parse(plan.createdAt))}`)].join(dot), width),
+    ...wrapHanging("  ", paint(theme, "dim", plan.id), width),
   ];
-  if (plan.issue) lines.push(...wrap(`from issue #${plan.issue.number} — ${plan.issue.title}${plan.issue.url ? ` ${paint(theme, "dim", plan.issue.url)}` : ""}`, width));
-  lines.push("", paint(theme, "dim", "s starts it as a task in this session · d discards it"));
+  if (plan.issue) lines.push(...wrapHanging("  ", `from issue #${plan.issue.number} — ${plan.issue.title}${plan.issue.url ? ` ${paint(theme, "dim", plan.issue.url)}` : ""}`, width));
+  const key = (text: string) => paint(theme, "accent", text);
+  lines.push("", ...wrapHanging("  ", [`${key("s")} ${paint(theme, "muted", "start it in a new session")}`, `${key("h")} ${paint(theme, "muted", "start it here")}`, `${key("d d")} ${paint(theme, "muted", "discard it")}`].join(paint(theme, "dim", "   ")), width));
   lines.push(...section("Agreed plan", width, theme), ...markdownLines(plan.brief, width, theme));
   return lines;
 }
@@ -230,7 +363,7 @@ export function renderTasks(input: TasksInput, width: number, height: number, th
   const list = listLines(input.rows, input.selected, listWidth - 4, input.focus === "list", theme);
   const rows = Math.max(0, bodyHeight - 2);
   const listStart = windowStart(list.selectedLine, list.lines.length, rows);
-  const count = input.query ? `${input.rows.length} match${input.rows.length === 1 ? "" : "es"}` : `${input.rows.length}`;
+  const count = listCount(input.rows, input.query);
   const listPane = box(listWidth, bodyHeight, list.lines.slice(listStart), { title: "Tasks", right: count, focused: input.focus === "list", scroll: { total: list.lines.length, start: listStart }, theme });
   const detailStart = detailWindow(input.detail.length, rows, input.detailOffset);
   const detailPane = box(detailWidth, bodyHeight, input.detail.slice(detailStart), { title: "Detail", ...(input.detail.length > rows ? { right: position(detailStart, rows, input.detail.length) } : {}), focused: input.focus === "detail", scroll: { total: input.detail.length, start: detailStart }, theme });