@tryinget/pi-activity-strip 0.3.0 → 0.4.0

package/examples/simulate-sessions.mjs

@@ -65,5 +65,5 @@ await publishSessionSnapshot(sessions[1]);
 
 await delay(2000);
 for (const session of sessions) {
-  await removeSession(session.sessionId);
+  await removeSession({ sessionId: session.sessionId, publisherId: session.publisherId });
 }

package/extensions/activity-strip.js

@@ -194,8 +194,8 @@ export default function activityStripExtension(pi) {
     telemetry.onToolExecutionEnd(event);
   });
 
-  pi.on("turn_end", async () => {
-    telemetry.onTurnEnd();
+  pi.on("turn_end", async (event) => {
+    telemetry.onTurnEnd(event);
   });
 
   pi.on("agent_settled", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryinget/pi-activity-strip",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "pi extension package for activity-strip workflows in monorepo runtime",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",
@@ -35,9 +35,9 @@
     "quality:ci": "bash ./scripts/quality-gate.sh ci",
     "check": "npm run quality:ci",
     "test": "npm run quality:ci",
-    "docs:list": "bash ./scripts/docs-list.sh",
-    "docs:list:workspace": "bash ./scripts/docs-list.sh --workspace --discover",
-    "docs:list:json": "bash ./scripts/docs-list.sh --json",
+    "docs:list": "node ~/ai-society/core/agent-scripts/scripts/docs-list.mjs",
+    "docs:list:workspace": "node ~/ai-society/core/agent-scripts/scripts/docs-list.mjs --workspace --discover",
+    "docs:list:json": "node ~/ai-society/core/agent-scripts/scripts/docs-list.mjs --json",
     "release:check": "bash ./scripts/release-check.sh",
     "release:check:quick": "SKIP_PI_SMOKE=1 bash ./scripts/release-check.sh",
     "strip:open": "node ./bin/pi-activity-strip.mjs open",
@@ -76,15 +76,16 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.4",
-    "@earendil-works/pi-ai": "0.83.0",
-    "@earendil-works/pi-coding-agent": "0.83.0",
+    "@earendil-works/pi-agent-core": "0.84.3",
+    "@earendil-works/pi-ai": "0.84.3",
+    "@earendil-works/pi-coding-agent": "0.84.3",
     "@types/node": "22.14.0",
     "@typescript/native-preview": "7.0.0-dev.20260417.1",
     "typebox": "1.3.7",
     "typescript": "5.9.2"
   },
   "overrides": {
-    "fast-xml-parser": "5.3.6"
+    "fast-xml-parser": "5.7.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",

package/src/broker/server.mjs

@@ -152,7 +152,7 @@ export class ActivityStripBroker extends EventEmitter {
         }, 20);
         return;
       case "remove":
-        this.store.remove(message.sessionId);
+        this.store.remove(String(message.sessionId ?? ""), String(message.publisherId ?? ""));
         this.emitSnapshot();
         return;
       case "upsert":

package/src/broker/session-store.mjs

@@ -11,6 +11,16 @@ import { normalizeSessionSnapshot, sortSessions } from "../common/protocol.mjs";
 /** @typedef {import("../common/contracts.ts").SessionStoreOptions} SessionStoreOptions */
 /** @typedef {import("../common/contracts.ts").BrokerSnapshot} BrokerSnapshot */
 
+/**
+ * Stable store key. Sessions resumed into a second process keep publishing under
+ * their own publisherId so two live processes never fight over one card; legacy
+ * publishers without a publisherId keep the bare sessionId key.
+ * @param {SessionSnapshot} session
+ */
+function sessionKey(session) {
+  return session.publisherId ? `${session.sessionId}|${session.publisherId}` : session.sessionId;
+}
+
 export class SessionStore {
   /** @param {SessionStoreOptions} [options] */
   constructor(options = {}) {
@@ -23,13 +33,17 @@ export class SessionStore {
   upsert(session) {
     const normalized = normalizeSessionSnapshot(session);
     if (!normalized.sessionId) return false;
-    this.sessions.set(normalized.sessionId, normalized);
+    this.sessions.set(sessionKey(normalized), normalized);
     return true;
   }
 
-  /** @param {string} sessionId */
-  remove(sessionId) {
-    return this.sessions.delete(String(sessionId ?? ""));
+  /** @param {string} sessionId @param {string} [publisherId] */
+  remove(sessionId, publisherId) {
+    const id = String(sessionId ?? "");
+    if (!id) return false;
+    return publisherId
+      ? this.sessions.delete(`${id}|${String(publisherId)}`)
+      : this.sessions.delete(id);
   }
 
   /** @param {number} [now] */

package/src/client/broker-client.mjs

@@ -115,7 +115,21 @@ export async function publishSessionSnapshot(session, options = {}) {
   await sendBrokerMessage(makeMessage("upsert", { session }), options);
 }
 
-/** @param {string} sessionId @param {BrokerClientOptions} [options] */
-export async function removeSession(sessionId, options = {}) {
-  await sendBrokerMessage(makeMessage("remove", { sessionId }), options);
+/** @param {{ sessionId: string; publisherId: string }} session @param {BrokerClientOptions} [options] */
+export async function removeSession(session, options = {}) {
+  /** @type {Record<string, unknown>} */
+  let record = {};
+  let fallbackId = "";
+  if (session && typeof session === "object") {
+    record = session;
+  } else {
+    fallbackId = String(session ?? "");
+  }
+  await sendBrokerMessage(
+    makeMessage("remove", {
+      sessionId: String(record.sessionId ?? fallbackId),
+      publisherId: String(record.publisherId ?? ""),
+    }),
+    options,
+  );
 }

package/src/client/session-telemetry.mjs

@@ -5,6 +5,7 @@
 // ---
 
 /** @typedef {import("../common/contracts.ts").SessionSnapshot} SessionSnapshot */
+/** @typedef {import("../common/contracts.ts").TurnEndEventLike} TurnEndEventLike */
 /** @typedef {import("../common/contracts.ts").SessionTelemetryOptions} SessionTelemetryOptions */
 /** @typedef {import("../common/contracts.ts").SessionStartContextLike} SessionStartContextLike */
 /** @typedef {import("../common/contracts.ts").BeforeAgentStartEventLike} BeforeAgentStartEventLike */
@@ -12,6 +13,7 @@
 /** @typedef {import("../common/contracts.ts").MessageUpdateEventLike} MessageUpdateEventLike */
 /** @typedef {import("../common/contracts.ts").ToolExecutionEventLike} ToolExecutionEventLike */
 import {
+  ACTIVITY_STRIP_FLUSH_RETRY_DELAYS_MS,
   ACTIVITY_STRIP_HEARTBEAT_MS,
   ACTIVITY_STRIP_SEND_THROTTLE_MS,
 } from "../common/constants.mjs";
@@ -41,7 +43,14 @@ function extractAssistantDelta(event) {
 }
 
 /** @param {SessionTelemetryOptions} [options] */
-export function createSessionTelemetry({ pi, cwd = process.cwd(), sessionName = "" } = {}) {
+export function createSessionTelemetry({
+  pi,
+  cwd = process.cwd(),
+  sessionName = "",
+  transport,
+} = {}) {
+  const publish = transport?.publish ?? publishSessionSnapshot;
+  const removePublisher = transport?.remove ?? removeSession;
   /** @type {SessionSnapshot} */
   let snapshot = createInitialSnapshot({ cwd, sessionName });
   /** @type {NodeJS.Timeout | null} */
@@ -50,20 +59,52 @@ export function createSessionTelemetry({ pi, cwd = process.cwd(), sessionName =
   let flushTimer = null;
   let disposed = false;
   let pendingAssistant = "";
+  let lastStopReason = "";
+  let confirmedSignature = "";
+  let retryIndex = 0;
+
+  /** Signature of the display-relevant fields, used to detect lost transitions. */
+  function publishSignature() {
+    return [
+      snapshot.sessionId,
+      snapshot.state,
+      snapshot.phase,
+      snapshot.detail,
+      snapshot.agentActive,
+      snapshot.turnIndex,
+      snapshot.toolName,
+      snapshot.toolTarget,
+      snapshot.errorMessage,
+    ].join("\u001f");
+  }
 
   async function flush() {
     flushTimer = null;
     if (disposed) return;
+    // Heartbeat republish refreshes transport liveness only; lastEventAt stays
+    // pinned to the last real lifecycle event so stalled streams stay visible.
     snapshot.updatedAt = now();
     snapshot.repoLabel = formatRepoLabel(
       snapshot.cwd,
       pi?.getSessionName?.() ?? snapshot.sessionName,
     );
     snapshot.sessionName = compactWhitespace(pi?.getSessionName?.() ?? snapshot.sessionName);
+    const signature = publishSignature();
     try {
-      await publishSessionSnapshot(snapshot);
+      await publish(snapshot);
+      confirmedSignature = signature;
+      retryIndex = 0;
     } catch {
-      // Broker is optional at runtime; silent failure keeps pi stable.
+      // Broker is optional at runtime; silent failure keeps pi stable. Retry a
+      // bounded number of times when a state transition may not have landed so
+      // a transient connect failure cannot freeze the displayed state.
+      if (
+        signature !== confirmedSignature &&
+        retryIndex < ACTIVITY_STRIP_FLUSH_RETRY_DELAYS_MS.length
+      ) {
+        scheduleFlush(ACTIVITY_STRIP_FLUSH_RETRY_DELAYS_MS[retryIndex]);
+        retryIndex += 1;
+      }
     }
   }
 
@@ -95,6 +136,7 @@ export function createSessionTelemetry({ pi, cwd = process.cwd(), sessionName =
       ...snapshot,
       ...partial,
       updatedAt: now(),
+      lastEventAt: now(),
     };
     scheduleFlush();
   }
@@ -185,8 +227,32 @@ export function createSessionTelemetry({ pi, cwd = process.cwd(), sessionName =
         toolName,
       });
     },
-    onTurnEnd() {
+    /** @param {TurnEndEventLike} event */
+    onTurnEnd(event) {
       if (!snapshot.agentActive) return;
+      const rawMessage = event?.message;
+      const message =
+        rawMessage && typeof rawMessage === "object"
+          ? /** @type {Record<string, unknown>} */ (rawMessage)
+          : null;
+      const stopReason = String(message?.stopReason ?? "");
+      if (stopReason) lastStopReason = stopReason;
+      if (stopReason === "error") {
+        const errorText = previewText(message?.errorMessage, 104) || "Provider error";
+        update({
+          state: "error",
+          phase: "Needs attention",
+          detail: errorText,
+          errorMessage: errorText,
+        });
+        return;
+      }
+      if (stopReason === "aborted") {
+        update({
+          detail: snapshot.assistantPreview || snapshot.detail || "Stopped",
+        });
+        return;
+      }
       update({
         state: snapshot.errorMessage ? "error" : "thinking",
         phase: snapshot.errorMessage ? "Needs attention" : "Thinking",
@@ -196,11 +262,12 @@ export function createSessionTelemetry({ pi, cwd = process.cwd(), sessionName =
     onAgentSettled() {
       const detail =
         snapshot.errorMessage || snapshot.assistantPreview || snapshot.lastPromptPreview || "Done";
+      const aborted = !snapshot.errorMessage && lastStopReason === "aborted";
       update({
         agentActive: false,
         agentStartedAt: null,
         state: snapshot.errorMessage ? "error" : "success",
-        phase: snapshot.errorMessage ? "Stopped" : "Done",
+        phase: snapshot.errorMessage ? "Stopped" : aborted ? "Stopped" : "Done",
         detail,
         toolName: "",
         toolTarget: "",
@@ -214,7 +281,10 @@ export function createSessionTelemetry({ pi, cwd = process.cwd(), sessionName =
         flushTimer = null;
       }
       try {
-        await removeSession(snapshot.sessionId);
+        await removePublisher({
+          sessionId: snapshot.sessionId,
+          publisherId: snapshot.publisherId,
+        });
       } catch {
         // ignore broker absence on shutdown
       }

package/src/common/card-display.mjs

@@ -0,0 +1,48 @@
+// ---
+// summary: "derives card display facts that depend on more than one session field"
+// read_when:
+//   - "changing stalled-session detection, duplicate label disambiguation, or card label rendering"
+// ---
+
+/**
+ * A session is stalled when it claims to be mid-activity but no lifecycle
+ * event has arrived for longer than the stall threshold. Wedged streams keep
+ * heartbeating liveness, so only real event time can expose them.
+ * @param {Record<string, unknown>} session
+ * @param {number} nowMs
+ * @param {number} stallMs
+ */
+export function isStalledSession(session, nowMs, stallMs) {
+  if (!session.agentActive) return false;
+  const state = String(session.state ?? "");
+  if (state !== "thinking" && state !== "tool" && state !== "waiting") return false;
+  const anchor = Number(session.lastEventAt || session.updatedAt || 0);
+  return anchor > 0 && nowMs - anchor > stallMs;
+}
+
+/**
+ * @param {Array<Record<string, unknown>>} sessions
+ * @returns {Set<string>}
+ */
+export function findDuplicateLabels(sessions) {
+  const counts = new Map();
+  for (const session of sessions) {
+    const label = String(session.repoLabel || "pi session");
+    counts.set(label, (counts.get(label) || 0) + 1);
+  }
+  return new Set([...counts.entries()].filter(([, count]) => count > 1).map(([label]) => label));
+}
+
+/**
+ * Two live processes can share one repo label; append a short process suffix
+ * so their cards stay distinguishable at a glance.
+ * @param {Record<string, unknown>} session
+ * @param {Set<string>} duplicateLabels
+ */
+export function disambiguatedRepoLabel(session, duplicateLabels) {
+  const label = String(session.repoLabel || "pi session");
+  const processId = Number(session.processId ?? 0);
+  return duplicateLabels.has(label) && processId > 0
+    ? `${label} · ${String(processId).slice(-4)}`
+    : label;
+}

package/src/common/constants.mjs

@@ -43,3 +43,5 @@ export const DEFAULT_ELECTRON_CANDIDATES = [
   "electron32",
   "electron31",
 ];
+export const ACTIVITY_STRIP_EVENT_STALL_MS = 15 * 60_000;
+export const ACTIVITY_STRIP_FLUSH_RETRY_DELAYS_MS = [250, 750];

package/src/common/contracts.d.ts

@@ -8,6 +8,7 @@ export type SessionState = "idle" | "thinking" | "tool" | "waiting" | "success"
 
 export interface SessionSnapshot {
   sessionId: string;
+  publisherId: string;
   processId: number;
   cwd: string;
   repoLabel: string;
@@ -20,6 +21,7 @@ export interface SessionSnapshot {
   state: SessionState;
   turnIndex: number;
   updatedAt: number;
+  lastEventAt: number;
   startedAt: number;
   agentStartedAt: number | null;
   agentActive: boolean;
@@ -71,7 +73,7 @@ export interface ActivityStripBrokerOptions {
   store?: {
     snapshot(): BrokerSnapshot;
     upsert(session: Partial<SessionSnapshot> | Record<string, unknown>): boolean;
-    remove(sessionId: string): boolean;
+    remove(sessionId: string, publisherId?: string): boolean;
   };
   getRuntimeStatus?: () => ActivityStripRuntimeStatus | undefined;
   focusSession?: (sessionId: string) => Promise<{ ok: boolean; error?: string; windowId?: number }>;
@@ -115,6 +117,11 @@ export interface TurnStartEventLike {
   turnIndex?: number;
 }
 
+export interface TurnEndEventLike {
+  turnIndex?: number;
+  message?: unknown;
+}
+
 export interface AssistantMessageEventLike {
   type?: string;
   delta?: unknown;
@@ -136,6 +143,10 @@ export interface SessionTelemetryOptions {
   pi?: TelemetryPiLike;
   cwd?: string;
   sessionName?: string;
+  transport?: {
+    publish: (session: SessionSnapshot) => Promise<unknown>;
+    remove: (session: { sessionId: string; publisherId: string }) => Promise<unknown>;
+  };
 }
 
 export interface ActivityStripCompatibilityReport {

package/src/common/contracts.ts

@@ -8,6 +8,7 @@ export type SessionState = "idle" | "thinking" | "tool" | "waiting" | "success"
 
 export interface SessionSnapshot {
   sessionId: string;
+  publisherId: string;
   processId: number;
   cwd: string;
   repoLabel: string;
@@ -20,6 +21,7 @@ export interface SessionSnapshot {
   state: SessionState;
   turnIndex: number;
   updatedAt: number;
+  lastEventAt: number;
   startedAt: number;
   agentStartedAt: number | null;
   agentActive: boolean;
@@ -71,7 +73,7 @@ export interface ActivityStripBrokerOptions {
   store?: {
     snapshot(): BrokerSnapshot;
     upsert(session: Partial<SessionSnapshot> | Record<string, unknown>): boolean;
-    remove(sessionId: string): boolean;
+    remove(sessionId: string, publisherId?: string): boolean;
   };
   getRuntimeStatus?: () => ActivityStripRuntimeStatus | undefined;
   focusSession?: (sessionId: string) => Promise<{ ok: boolean; error?: string; windowId?: number }>;
@@ -115,6 +117,11 @@ export interface TurnStartEventLike {
   turnIndex?: number;
 }
 
+export interface TurnEndEventLike {
+  turnIndex?: number;
+  message?: unknown;
+}
+
 export interface AssistantMessageEventLike {
   type?: string;
   delta?: unknown;
@@ -136,6 +143,10 @@ export interface SessionTelemetryOptions {
   pi?: TelemetryPiLike;
   cwd?: string;
   sessionName?: string;
+  transport?: {
+    publish: (session: SessionSnapshot) => Promise<unknown>;
+    remove: (session: { sessionId: string; publisherId: string }) => Promise<unknown>;
+  };
 }
 
 export interface ActivityStripCompatibilityReport {

package/src/common/protocol.mjs

@@ -25,6 +25,7 @@ export function makeMessage(type, payload = {}) {
 export function normalizeSessionSnapshot(session = {}) {
   const now = Date.now();
   const updatedAt = Number(session.updatedAt ?? now) || now;
+  const lastEventAt = Number(session.lastEventAt ?? updatedAt) || updatedAt;
   const startedAt = Number(session.startedAt ?? updatedAt) || updatedAt;
   const agentStartedAt =
     session.agentStartedAt == null ? null : Number(session.agentStartedAt) || null;
@@ -36,6 +37,7 @@ export function normalizeSessionSnapshot(session = {}) {
 
   return {
     sessionId: String(session.sessionId ?? ""),
+    publisherId: String(session.publisherId ?? ""),
     processId: Number(session.processId ?? 0) || 0,
     cwd: String(session.cwd ?? ""),
     repoLabel: String(session.repoLabel ?? "pi session"),
@@ -48,6 +50,7 @@ export function normalizeSessionSnapshot(session = {}) {
     state,
     turnIndex: Number(session.turnIndex ?? 0) || 0,
     updatedAt,
+    lastEventAt,
     startedAt,
     agentStartedAt,
     agentActive: Boolean(session.agentActive),

package/src/common/telemetry.mjs

@@ -67,15 +67,17 @@ export function createSessionId() {
   return `${os.hostname()}-${process.pid}-${Date.now()}-${randomUUID().slice(0, 6)}`;
 }
 
-/** @param {{ cwd?: string; sessionName?: string; sessionId?: string }} [options] @returns {SessionSnapshot} */
+/** @param {{ cwd?: string; sessionName?: string; sessionId?: string; publisherId?: string }} [options] @returns {SessionSnapshot} */
 export function createInitialSnapshot({
   cwd = process.cwd(),
   sessionName = "",
   sessionId = "",
+  publisherId = "",
 } = {}) {
   const now = Date.now();
   return {
     sessionId: sessionId.trim() || createSessionId(),
+    publisherId: publisherId.trim() || randomUUID(),
     processId: process.pid,
     cwd,
     repoLabel: formatRepoLabel(cwd, sessionName),
@@ -88,6 +90,7 @@ export function createInitialSnapshot({
     state: "idle",
     turnIndex: 0,
     updatedAt: now,
+    lastEventAt: now,
     startedAt: now,
     agentStartedAt: null,
     agentActive: false,

package/src/ui/strip-html.mjs

@@ -10,7 +10,15 @@ import {
   moveOrderItem,
   reconcileActivityOrder,
 } from "../common/activity-order.mjs";
-import { ACTIVITY_STRIP_ORDER_REFRESH_MS } from "../common/constants.mjs";
+import {
+  disambiguatedRepoLabel,
+  findDuplicateLabels,
+  isStalledSession,
+} from "../common/card-display.mjs";
+import {
+  ACTIVITY_STRIP_EVENT_STALL_MS,
+  ACTIVITY_STRIP_ORDER_REFRESH_MS,
+} from "../common/constants.mjs";
 
 const ORDER_RUNTIME = [
   'const ACTIVE_STATES = new Set(["thinking", "tool", "waiting"]);',
@@ -18,6 +26,9 @@ const ORDER_RUNTIME = [
   isMonitoringSession.toString(),
   reconcileActivityOrder.toString(),
   moveOrderItem.toString(),
+  isStalledSession.toString(),
+  findDuplicateLabels.toString(),
+  disambiguatedRepoLabel.toString(),
 ].join("\n");
 
 export function shouldRetainExpandedCard({ hovered, activeElement, documentFocused }) {
@@ -184,6 +195,7 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
       .placeholder__title { color: var(--text); font-size: 14px; font-weight: 650; }
       .placeholder__copy { color: var(--muted); font-size: 11px; line-height: 1.35; }
       .sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0,0,0,0); white-space: nowrap; border: 0; }
+      .card[data-stalled="true"] { opacity: 0.72; } .card[data-stalled="true"] .card__phase { text-decoration: line-through; }
 
       @media (prefers-reduced-motion: reduce) {
         .card { transition: none; }
@@ -208,6 +220,7 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
       ${ORDER_RUNTIME}
       ${INTERACTION_RUNTIME}
       const ORDER_REFRESH_MS = ${ACTIVITY_STRIP_ORDER_REFRESH_MS};
+      const EVENT_STALL_MS = ${ACTIVITY_STRIP_EVENT_STALL_MS};
       const meta = document.getElementById("meta");
       const cards = document.getElementById("cards");
       const announcer = document.getElementById("announcer");
@@ -236,7 +249,7 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
         return formatDuration(Math.max(0, Math.floor((Date.now() - anchor) / 1000)));
       }
       function formatLastSeen(session) {
-        const anchor = Number(session.updatedAt || snapshot.generatedAt || Date.now());
+        const anchor = Number(session.lastEventAt || session.updatedAt || snapshot.generatedAt || Date.now());
         return formatDuration(Math.max(0, Math.floor((Date.now() - anchor) / 1000)));
       }
       function sessionById(sessionId) {
@@ -271,11 +284,13 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
         ].join("");
         return card;
       }
-      function updateCard(card, session) {
-        const stateColor = STATE_COLORS[session.state] || "var(--accent)";
-        const stateLabel = STATE_LABELS[session.state] || session.state || "idle";
+      function updateCard(card, session, duplicateLabels) {
+        const stalled = isStalledSession(session, Date.now(), EVENT_STALL_MS);
+        const stateColor = stalled ? "var(--waiting)" : STATE_COLORS[session.state] || "var(--accent)";
+        const stateLabel = stalled ? "stalled" : STATE_LABELS[session.state] || session.state || "idle";
         const isCurrent = session.sessionId === snapshot.focusedSessionId;
         card.style.setProperty("--state-color", stateColor);
+        card.dataset.stalled = stalled ? "true" : "false";
         card.dataset.group = isMonitoringSession(session)
           ? "monitoring"
           : isActiveSession(session)
@@ -284,9 +299,9 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
         card.dataset.current = isCurrent ? "true" : "false";
         if (isCurrent) card.setAttribute("aria-current", "true");
         else card.removeAttribute("aria-current");
-        card.setAttribute("aria-label", (isCurrent ? "Current terminal, " : "") + (session.repoLabel || "Pi session") + ", " + (session.phase || "Idle") + ". Press Enter to focus its Ghostty window.");
+        card.setAttribute("aria-label", (stalled ? "Stalled, " : isCurrent ? "Current terminal, " : "") + (session.repoLabel || "Pi session") + ", " + (stalled ? "no events recently" : session.phase || "Idle") + ". Press Enter to focus its Ghostty window.");
         card.title = (isCurrent ? "Current terminal · " : "Focus ") + (session.repoLabel || "Pi session");
-        setText(card, ".card__repo", session.repoLabel || "pi session");
+        setText(card, ".card__repo", disambiguatedRepoLabel(session, duplicateLabels));
         setText(card, ".card__phase", session.phase || "Idle");
         setText(card, ".card__state", stateLabel);
         setText(card, ".tool", session.toolName || session.toolTarget || "monitoring");
@@ -332,6 +347,7 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
           setExpanded(null, false).catch(() => {});
         }
         let targetIndex = 0;
+        const duplicateLabels = findDuplicateLabels(sessions);
         for (const sessionId of orderedIds) {
           const session = byId.get(sessionId);
           if (!session) continue;
@@ -340,7 +356,7 @@ export function createStripHtml({ interactive = true, initiallyVisible = true }
             card = cardTemplate(sessionId);
             cardById.set(sessionId, card);
           }
-          updateCard(card, session);
+          updateCard(card, session, duplicateLabels);
           const nodeAtTarget = cards.children[targetIndex] ?? null;
           if (nodeAtTarget !== card) cards.insertBefore(card, nodeAtTarget);
           targetIndex += 1;