@herbertgao/pi-subagents 0.15.3 → 0.15.5

package/src/ui/fleet-list.ts

@@ -19,7 +19,7 @@ import {
   truncateToWidth,
   visibleWidth,
 } from "@earendil-works/pi-tui"
-import { renderAgentName } from "../agent-color.js"
+import { hasAgentBadge, renderAgentName } from "../agent-color.js"
 import type { AgentManager } from "../agent-manager.js"
 import type { AgentRecord } from "../types.js"
 import { getLifetimeTotal } from "../usage.js"
@@ -476,15 +476,24 @@ export class FleetList {
     width: number,
     theme: Theme,
   ): string {
-    const left = `  ${this.bullet(rosterIndex, sel, theme)} ${renderAgentName(record.type, theme, { fallbackColor: "muted" })}  ${record.description}`
+    const selected = rosterIndex === sel
+    const name = renderAgentName(
+      record.type,
+      theme,
+      selected
+        ? { fallbackColor: "text", bold: hasAgentBadge(record.type) }
+        : { fallbackColor: "muted" },
+    )
+    const description = selected
+      ? theme.fg("text", record.description)
+      : record.description
+    const left = `  ${this.bullet(rosterIndex, sel, theme)} ${name}  ${description}`
     const tokens = getLifetimeTotal(
       this.agentActivity.get(record.id)?.lifetimeUsage ?? record.lifetimeUsage,
     )
     const elapsedMs = (record.completedAt ?? Date.now()) - record.startedAt // freezes once finished
-    const right = theme.fg(
-      "dim",
-      `${formatFleetElapsed(elapsedMs)} · ${formatFleetTokens(tokens)}`,
-    )
+    const stats = `${formatFleetElapsed(elapsedMs)} · ${formatFleetTokens(tokens)}`
+    const right = selected ? theme.fg("text", stats) : theme.fg("dim", stats)
     return rightAlign(left, right, width)
   }
 }

package/src/ui/schedule-menu.ts

@@ -11,6 +11,7 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent"
 import type { SubagentScheduler } from "../schedule.js"
 import type { ScheduledSubagent } from "../types.js"
+import { selectItem } from "./select-item.js"
 
 /** Format an ISO timestamp as relative time ("in 4h", "2d ago", "—"). */
 function relTime(iso: string | undefined, now = Date.now()): string {
@@ -88,16 +89,16 @@ export async function showSchedulesMenu(
     return
   }
 
-  const labels = jobs.map((j) => formatJob(j, scheduler))
-  const choice = await ctx.ui.select(
+  // Numbered + item-paired: two jobs whose names agree in the first 18
+  // characters format identically, and matching the returned string back
+  // against a parallel label array cancelled whichever came first.
+  const job = await selectItem(
+    ctx.ui,
     `Scheduled jobs (${jobs.length}) — select to cancel`,
-    labels,
+    jobs,
+    (j) => formatJob(j, scheduler),
   )
-  if (!choice) return
-
-  const idx = labels.indexOf(choice)
-  if (idx < 0) return
-  const job = jobs[idx]
+  if (!job) return
 
   const ok = await ctx.ui.confirm(
     `Cancel "${job.name}"?`,

package/src/ui/select-item.ts

@@ -0,0 +1,48 @@
+/**
+ * select-item.ts — pick an item from a list via `ctx.ui.select`, safely.
+ *
+ * Pi's dialog API is `select(title, options: string[]) => Promise<string | undefined>`:
+ * strings in, string out, with no index or value form. Callers therefore have to
+ * map the returned string back to the item it came from, and the obvious way —
+ * `labels.indexOf(choice)` over a parallel array — silently resolves to the
+ * FIRST match whenever two rows format identically. Row formatters here truncate
+ * (job names to 18 chars, agent descriptions to whatever fits), and the text they
+ * truncate is LLM-authored, so collisions are ordinary rather than exotic.
+ *
+ * This numbers every row, which makes the labels unique by construction — no
+ * data-dependent branch that only executes in the case nobody exercises — and
+ * keeps each label paired with its item so a later edit that sorts or filters
+ * between building and resolving cannot desync them.
+ */
+
+/** Minimal shape of the `ctx.ui` surface this needs. */
+export interface SelectUI {
+  select(title: string, options: string[]): Promise<string | undefined>
+}
+
+/**
+ * Show a numbered picker and return the chosen item (not its label).
+ *
+ * Returns undefined when the user escapes, or when the returned string is not
+ * one we offered.
+ */
+export async function selectItem<T>(
+  ui: SelectUI,
+  title: string,
+  items: readonly T[],
+  format: (item: T, index: number) => string,
+): Promise<T | undefined> {
+  // Pad the number so a 10+ item list keeps its columns aligned.
+  const width = String(items.length).length
+  const rows = items.map((item, i) => ({
+    item,
+    label: `${String(i + 1).padStart(width)}. ${format(item, i)}`,
+  }))
+
+  const choice = await ui.select(
+    title,
+    rows.map((r) => r.label),
+  )
+  if (!choice) return undefined
+  return rows.find((r) => r.label === choice)?.item
+}

package/src/worktree.ts

@@ -134,11 +134,15 @@ export function cleanupWorktree(
       // Truncate description for commit message (no shell sanitization needed — execFileSync uses argv)
       const safeDesc = agentDescription.slice(0, 200)
       const commitMsg = `pi-agent: ${safeDesc}`
-      execFileSync("git", ["commit", "--no-verify", "-m", commitMsg], {
-        cwd: worktree.path,
-        stdio: "pipe",
-        timeout: 10000,
-      })
+      execFileSync(
+        "git",
+        ["commit", "--no-verify", "--no-gpg-sign", "-m", commitMsg],
+        {
+          cwd: worktree.path,
+          stdio: "pipe",
+          timeout: 10000,
+        },
+      )
     } else {
       const currentSha = execFileSync("git", ["rev-parse", "HEAD"], {
         cwd: worktree.path,