@towles/tool 0.0.129 → 0.0.131

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towles/tool",
-  "version": "0.0.129",
+  "version": "0.0.131",
   "description": "One off quality of life scripts that I use on a daily basis.",
   "homepage": "https://github.com/ChrisTowles/towles-tool#readme",
   "bugs": {

package/packages/agentboard/apps/tui/src/components/SessionCard.tsx

@@ -1,6 +1,6 @@
 import { createSignal, For, Show, onCleanup } from "solid-js";
 import type { Accessor } from "solid-js";
-import type { AgentStatus, SessionData, Theme } from "@tt-agentboard/runtime";
+import type { SessionData, Theme } from "@tt-agentboard/runtime";
 import { truncate } from "@tt-agentboard/runtime";
 import { UNSEEN_ICON, BOLD, DIM, toneColor } from "../constants";
 import { DiffStats } from "./DiffStats";
@@ -9,16 +9,6 @@ import { formatElapsed } from "./elapsed";
 import { liveStatusIcon, unseenTerminalColor } from "./status-visuals";
 import { familyColor } from "./family-color";
 
-const STATUS_TEXT: Record<AgentStatus, string> = {
-  idle: "",
-  running: "running",
-  done: "done",
-  error: "error",
-  waiting: "waiting",
-  question: "question",
-  interrupted: "stopped",
-};
-
 export interface SessionCardProps {
   session: SessionData;
   isFocused: boolean;
@@ -77,7 +67,7 @@ export function SessionCard(props: SessionCardProps) {
   };
 
   const truncName = () => truncate(props.session.name, 18);
-  const truncBranch = () => (props.session.branch ? truncate(props.session.branch, 30) : "");
+  const truncBranch = () => (props.session.branch ? truncate(props.session.branch, 45) : "");
 
   const hasDiff = () => {
     const { linesAdded, linesRemoved, commitsDelta, filesChanged } = props.session;
@@ -128,7 +118,7 @@ export function SessionCard(props: SessionCardProps) {
         </Show>
 
         <box flexDirection="column" flexGrow={1} paddingRight={1}>
-          <box flexDirection="row">
+          <box flexDirection="row" height={1}>
             <text truncate flexGrow={1}>
               <span
                 style={{
@@ -139,25 +129,32 @@ export function SessionCard(props: SessionCardProps) {
                 {truncName()}
               </span>
             </text>
-            <Show when={statusIcon()}>
-              <text flexShrink={0}>
-                <span style={{ fg: statusColor() }}>
-                  {" "}
-                  {statusIcon()}
-                  {runningAgents() > 1 ? String(runningAgents()) : ""}
-                </span>
-              </text>
+            <Show when={hasDiff()}>
+              <box flexShrink={0} paddingLeft={1}>
+                <DiffStats session={props.session} palette={() => P()} />
+              </box>
             </Show>
+            <box width={3} flexShrink={0}>
+              <Show when={statusIcon()}>
+                <text>
+                  <span style={{ fg: statusColor() }}>
+                    {" "}
+                    {statusIcon()}
+                    {runningAgents() > 1 ? String(runningAgents()) : ""}
+                  </span>
+                </text>
+              </Show>
+            </box>
           </box>
 
           <Show when={props.session.branch}>
-            <text truncate>
-              <span style={{ fg: props.isFocused ? P().pink : P().overlay0 }}>{truncBranch()}</span>
-            </text>
-          </Show>
-
-          <Show when={hasDiff()}>
-            <DiffStats session={props.session} palette={() => P()} />
+            <box flexDirection="row" height={1}>
+              <text truncate flexShrink={1}>
+                <span style={{ fg: props.isFocused ? P().pink : P().overlay0 }}>
+                  {truncBranch()}
+                </span>
+              </text>
+            </box>
           </Show>
 
           <Show when={metaSummary()}>
@@ -184,8 +181,6 @@ export function SessionCard(props: SessionCardProps) {
           </For>
         </box>
       </box>
-
-      <box height={1} />
     </box>
   );
 }
@@ -230,7 +225,16 @@ function AgentRow(props: AgentRowProps) {
     return SC()[props.agent.status];
   };
 
-  const statusText = () => STATUS_TEXT[props.agent.status];
+  const cacheLabel = () => {
+    const details = props.agent.details;
+    if (!details) return null;
+    const expiresAt =
+      details.cacheExpiresAt ??
+      (details.lastActivityAt != null ? details.lastActivityAt + 60 * 60 * 1000 : null);
+    if (expiresAt == null) return null;
+    const minutesLeft = Math.ceil((expiresAt - props.now()) / 60_000);
+    return minutesLeft <= 0 ? "cache expired" : `cache ${minutesLeft}m`;
+  };
 
   let flashTimer: ReturnType<typeof setTimeout> | null = null;
   const triggerFlash = () => {
@@ -259,10 +263,20 @@ function AgentRow(props: AgentRowProps) {
         props.onFocusPane();
       }}
     >
-      <box flexDirection="row">
-        <text flexGrow={1} truncate>
+      <box flexDirection="row" height={1}>
+        <text flexShrink={0}>
           <span style={{ fg: color() }}>{icon()}</span>
-          <Show when={props.agent.status === "running" && props.agent.details?.lastActivityAt}>
+        </text>
+        <text flexGrow={1} flexShrink={1} truncate>
+          <Show when={props.agent.threadName}>
+            <span style={{ fg: isUnseen() ? color() : P().overlay0 }}>
+              {" "}
+              {truncate(props.agent.threadName!.replace(/\s+/g, " ").trim(), 40)}
+            </span>
+          </Show>
+        </text>
+        <Show when={props.agent.status === "running" && props.agent.details?.lastActivityAt}>
+          <text flexShrink={0}>
             <span
               style={{
                 fg: props.isKeyboardFocused ? P().subtext0 : P().overlay1,
@@ -272,11 +286,6 @@ function AgentRow(props: AgentRowProps) {
               {" "}
               {formatElapsed(props.now() - (props.agent.details?.lastActivityAt ?? props.now()))}
             </span>
-          </Show>
-        </text>
-        <Show when={!isUnseen()}>
-          <text flexShrink={0}>
-            <span style={{ fg: color(), attributes: DIM }}>{statusText()}</span>
           </text>
         </Show>
         <text
@@ -293,16 +302,6 @@ function AgentRow(props: AgentRowProps) {
         </text>
       </box>
 
-      <Show when={props.agent.threadName}>
-        <box height={2} flexShrink={0}>
-          <text>
-            <span style={{ fg: isUnseen() ? color() : P().overlay0 }}>
-              {truncate(props.agent.threadName!.replace(/\s+/g, " ").trim(), 60)}
-            </span>
-          </text>
-        </box>
-      </Show>
-
       <Show when={props.agent.status === "running" && props.agent.details}>
         {(d) => {
           const details = d();
@@ -324,6 +323,12 @@ function AgentRow(props: AgentRowProps) {
           );
         }}
       </Show>
+
+      <Show when={cacheLabel()}>
+        <text truncate>
+          <span style={{ fg: P().overlay0, attributes: DIM }}>{cacheLabel()}</span>
+        </text>
+      </Show>
     </box>
   );
 }

package/packages/agentboard/apps/tui/src/index.tsx

@@ -555,43 +555,53 @@ function App() {
       />
 
       {/* Session list */}
-      <scrollbox flexGrow={1} flexShrink={1} paddingTop={1}>
+      <scrollbox flexGrow={1} flexShrink={1} paddingTop={0}>
+        <box height={1}>
+          <text style={{ fg: P().overlay0 }}>{DIVIDER}</text>
+        </box>
         <For each={sessions}>
           {(session, i) => (
-            <SessionCard
-              session={session}
-              isFocused={isFocused(session.name)}
-              isCurrent={session.name === currentSession()}
-              spinIdx={spinIdx}
-              now={now}
-              theme={theme}
-              statusColors={S}
-              focusedAgentIdx={
-                isFocused(session.name) && panelFocus() === "agents" ? focusedAgentIdx() : -1
-              }
-              onSelect={() => {
-                setFocusedSession(session.name);
-                send({ type: "focus-session", name: session.name });
-                switchToSession(session.name);
-              }}
-              onDismissAgent={(agent) => {
-                send({
-                  type: "dismiss-agent",
-                  session: session.name,
-                  agent: agent.agent,
-                  threadId: agent.threadId,
-                });
-              }}
-              onFocusAgentPane={(agent) => {
-                send({
-                  type: "focus-agent-pane",
-                  session: session.name,
-                  agent: agent.agent,
-                  threadId: agent.threadId,
-                  threadName: agent.threadName,
-                });
-              }}
-            />
+            <box flexDirection="column" flexShrink={0}>
+              <Show when={i() > 0}>
+                <box height={1}>
+                  <text style={{ fg: P().surface2 }}>{DIVIDER}</text>
+                </box>
+              </Show>
+              <SessionCard
+                session={session}
+                isFocused={isFocused(session.name)}
+                isCurrent={session.name === currentSession()}
+                spinIdx={spinIdx}
+                now={now}
+                theme={theme}
+                statusColors={S}
+                focusedAgentIdx={
+                  isFocused(session.name) && panelFocus() === "agents" ? focusedAgentIdx() : -1
+                }
+                onSelect={() => {
+                  setFocusedSession(session.name);
+                  send({ type: "focus-session", name: session.name });
+                  switchToSession(session.name);
+                }}
+                onDismissAgent={(agent) => {
+                  send({
+                    type: "dismiss-agent",
+                    session: session.name,
+                    agent: agent.agent,
+                    threadId: agent.threadId,
+                  });
+                }}
+                onFocusAgentPane={(agent) => {
+                  send({
+                    type: "focus-agent-pane",
+                    session: session.name,
+                    agent: agent.agent,
+                    threadId: agent.threadId,
+                    threadName: agent.threadName,
+                  });
+                }}
+              />
+            </box>
           )}
         </For>
       </scrollbox>

package/packages/agentboard/packages/runtime/src/agents/tracker.test.ts

@@ -152,6 +152,109 @@ describe("AgentTracker", () => {
     });
   });
 
+  describe("pruneStale", () => {
+    const TWELVE_HOURS = 12 * 60 * 60 * 1000;
+
+    it("prunes waiting agents older than threshold", () => {
+      tracker.applyEvent(makeEvent({ status: "waiting", ts: Date.now() - TWELVE_HOURS - 1000 }));
+      tracker.pruneStale(TWELVE_HOURS);
+      expect(tracker.getState("main")).toBeNull();
+    });
+
+    it("prunes running agents older than threshold", () => {
+      tracker.applyEvent(makeEvent({ status: "running", ts: Date.now() - TWELVE_HOURS - 1000 }));
+      tracker.pruneStale(TWELVE_HOURS);
+      expect(tracker.getState("main")).toBeNull();
+    });
+
+    it("leaves fresh agents alone", () => {
+      tracker.applyEvent(makeEvent({ status: "waiting", ts: Date.now() - 1000 }));
+      tracker.pruneStale(TWELVE_HOURS);
+      expect(tracker.getState("main")).not.toBeNull();
+    });
+
+    it("respects pinned instances", () => {
+      tracker.applyEvent(makeEvent({ status: "waiting", ts: Date.now() - TWELVE_HOURS - 1000 }));
+      tracker.setPinnedInstances("main", ["claude-code"]);
+      tracker.pruneStale(TWELVE_HOURS);
+      expect(tracker.getState("main")).not.toBeNull();
+    });
+
+    it("uses details.lastActivityAt when present", () => {
+      tracker.applyEvent(
+        makeEvent({
+          status: "waiting",
+          ts: Date.now() - TWELVE_HOURS - 1000,
+          details: { lastActivityAt: Date.now() - 1000 },
+        }),
+      );
+      tracker.pruneStale(TWELVE_HOURS);
+      expect(tracker.getState("main")).not.toBeNull();
+    });
+
+    it("falls back to event.ts when lastActivityAt missing", () => {
+      tracker.applyEvent(makeEvent({ status: "waiting", ts: Date.now() - TWELVE_HOURS - 1000 }));
+      tracker.pruneStale(TWELVE_HOURS);
+      expect(tracker.getState("main")).toBeNull();
+    });
+  });
+
+  describe("pruneSupersededByPane", () => {
+    it("drops older instance when same agent reappears with new threadId in same pane", () => {
+      tracker.applyEvent(makeEvent({ threadId: "t1", status: "waiting", paneId: "%5", ts: 1000 }));
+      tracker.applyEvent(makeEvent({ threadId: "t2", status: "running", paneId: "%5", ts: 2000 }));
+      tracker.setPinnedInstances("main", ["claude-code:t2"]);
+      tracker.pruneSupersededByPane();
+      const agents = tracker.getAgents("main");
+      expect(agents).toHaveLength(1);
+      expect(agents[0]!.threadId).toBe("t2");
+    });
+
+    it("keeps both when instances are in different panes", () => {
+      tracker.applyEvent(makeEvent({ threadId: "t1", status: "waiting", paneId: "%5", ts: 1000 }));
+      tracker.applyEvent(makeEvent({ threadId: "t2", status: "running", paneId: "%7", ts: 2000 }));
+      tracker.pruneSupersededByPane();
+      expect(tracker.getAgents("main")).toHaveLength(2);
+    });
+
+    it("keeps both when they're different agent types in the same pane", () => {
+      tracker.applyEvent(makeEvent({ agent: "claude-code", paneId: "%5", ts: 1000 }));
+      tracker.applyEvent(makeEvent({ agent: "amp", paneId: "%5", ts: 2000 }));
+      tracker.pruneSupersededByPane();
+      expect(tracker.getAgents("main")).toHaveLength(2);
+    });
+
+    it("ignores instances without a paneId", () => {
+      tracker.applyEvent(makeEvent({ threadId: "t1", paneId: undefined, ts: 1000 }));
+      tracker.applyEvent(makeEvent({ threadId: "t2", paneId: undefined, ts: 2000 }));
+      tracker.pruneSupersededByPane();
+      expect(tracker.getAgents("main")).toHaveLength(2);
+    });
+
+    it("uses details.lastActivityAt for recency comparison", () => {
+      tracker.applyEvent(
+        makeEvent({
+          threadId: "t1",
+          paneId: "%5",
+          ts: 5000,
+          details: { lastActivityAt: 9000 },
+        }),
+      );
+      tracker.applyEvent(
+        makeEvent({
+          threadId: "t2",
+          paneId: "%5",
+          ts: 6000,
+          details: { lastActivityAt: 7000 },
+        }),
+      );
+      tracker.pruneSupersededByPane();
+      const agents = tracker.getAgents("main");
+      expect(agents).toHaveLength(1);
+      expect(agents[0]!.threadId).toBe("t1");
+    });
+  });
+
   describe("multi-thread support", () => {
     it("tracks multiple threads for the same agent", () => {
       tracker.applyEvent(makeEvent({ threadId: "t1", status: "running" }));

package/packages/agentboard/packages/runtime/src/agents/tracker.ts

@@ -148,6 +148,56 @@ export class AgentTracker {
     }
   }
 
+  /**
+   * When multiple instances of the same agent share a paneId, keep only the most recent.
+   * The currently-live instance is pinned by the pane scanner, so this only removes superseded
+   * predecessors (e.g. a Claude Code session that was /exited and replaced in the same pane).
+   */
+  pruneSupersededByPane(): void {
+    for (const [session, sessionInstances] of this.instances) {
+      const groups = new Map<string, { key: string; ts: number }[]>();
+      for (const [key, event] of sessionInstances) {
+        if (!event.paneId) continue;
+        const groupKey = `${event.paneId}\0${event.agent}`;
+        const ts = event.details?.lastActivityAt ?? event.ts;
+        const list = groups.get(groupKey) ?? [];
+        list.push({ key, ts });
+        groups.set(groupKey, list);
+      }
+      for (const list of groups.values()) {
+        if (list.length < 2) continue;
+        list.sort((a, b) => b.ts - a.ts);
+        for (let i = 1; i < list.length; i++) {
+          const k = list[i]!.key;
+          if (this.isPinned(session, k)) continue;
+          sessionInstances.delete(k);
+          this.unseenInstances.delete(this.unseenKey(session, k));
+        }
+      }
+      if (sessionInstances.size === 0) {
+        this.instances.delete(session);
+      }
+    }
+  }
+
+  /** Auto-prune any instance whose last activity is older than timeoutMs, regardless of status. Skips pinned. */
+  pruneStale(timeoutMs: number): void {
+    const now = Date.now();
+    for (const [session, sessionInstances] of this.instances) {
+      for (const [key, event] of sessionInstances) {
+        if (this.isPinned(session, key)) continue;
+        const lastSeen = event.details?.lastActivityAt ?? event.ts;
+        if (now - lastSeen > timeoutMs) {
+          sessionInstances.delete(key);
+          this.unseenInstances.delete(this.unseenKey(session, key));
+        }
+      }
+      if (sessionInstances.size === 0) {
+        this.instances.delete(session);
+      }
+    }
+  }
+
   /** Auto-prune terminal instances older than timeout, but only if instance is not unseen or pinned */
   pruneTerminal(): void {
     const now = Date.now();

package/packages/agentboard/packages/runtime/src/server/index.ts

@@ -23,6 +23,7 @@ import {
   PID_FILE,
   SERVER_IDLE_TIMEOUT_MS,
   STUCK_RUNNING_TIMEOUT_MS,
+  STALE_AGENT_TIMEOUT_MS,
 } from "../shared";
 import type { ServerState, SessionData, ClientCommand, FocusUpdate, MetadataTone } from "../shared";
 
@@ -391,6 +392,8 @@ export function startServer(
     invalidateCurrentSessionCache();
     tracker.pruneStuck(STUCK_RUNNING_TIMEOUT_MS);
     tracker.pruneTerminal();
+    tracker.pruneStale(STALE_AGENT_TIMEOUT_MS);
+    tracker.pruneSupersededByPane();
     lastState = computeState();
     syncGitWatchers(lastState.sessions, broadcastState);
     const msg = JSON.stringify(lastState);

package/packages/agentboard/packages/runtime/src/shared.ts

@@ -11,6 +11,7 @@ export const SERVER_HOST: string = process.env.TT_AGENTBOARD_HOST || DEFAULT_SER
 export const PID_FILE = "/tmp/agentboard.pid";
 export const SERVER_IDLE_TIMEOUT_MS = 30_000;
 export const STUCK_RUNNING_TIMEOUT_MS = 3 * 60 * 1000;
+export const STALE_AGENT_TIMEOUT_MS = 12 * 60 * 60 * 1000;
 export const JOURNAL_IDLE_TIMEOUT_MS = 120_000;
 
 export interface SessionData {

package/packages/core/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "tt",
   "description": "Core dev workflow commands and skills: interview-me, write-prd, prd-to-issues, tdd, improve-architecture, refine-text, task, parallel-slots, towles-tool.",
-  "version": "0.0.129",
+  "version": "0.0.131",
   "author": {
     "name": "Chris Towles"
   }

package/src/commands/graph/analyzer.test.ts

@@ -18,7 +18,13 @@ function textBlock(text: string): ContentBlock {
 }
 
 function toolUseBlock(name: string, input: Record<string, unknown>): ContentBlock {
-  return { type: "tool_use" as const, id: "tool-stub", name, input, caller: { type: "direct" } };
+  return {
+    type: "tool_use" as const,
+    id: "tool-stub",
+    name,
+    input,
+    caller: { type: "direct" },
+  } as unknown as ContentBlock;
 }
 
 function makeUsage(overrides: Partial<Usage> = {}): Usage {
@@ -32,7 +38,7 @@ function makeUsage(overrides: Partial<Usage> = {}): Usage {
     server_tool_use: null,
     service_tier: null,
     ...overrides,
-  };
+  } as unknown as Usage;
 }
 
 function makeEntry(overrides: Partial<JournalEntry> = {}): JournalEntry {

package/src/commands/graph.test.ts

@@ -16,7 +16,7 @@ function makeUsage(overrides: Partial<Usage> = {}): Usage {
     server_tool_use: null,
     service_tier: null,
     ...overrides,
-  };
+  } as unknown as Usage;
 }
 
 describe("graph --days filtering", () => {