agenttop 0.9.1 → 0.9.2

package/dist/index.js

@@ -660,16 +660,7 @@ var SessionList = React2.memo(
 import React3 from "react";
 import { Box as Box3, Text as Text3 } from "ink";
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
-var TAG_COLORS = [
-  "#61AFEF",
-  "#98C379",
-  "#C678DD",
-  "#E5C07B",
-  "#E06C75",
-  "#56B6C2",
-  "#D19A66",
-  "#BE5046"
-];
+var TAG_COLORS = ["#61AFEF", "#98C379", "#C678DD", "#E5C07B", "#E06C75", "#56B6C2", "#D19A66", "#BE5046"];
 var formatTime = (ts) => {
   const d = new Date(ts);
   return d.toLocaleTimeString("en-GB", { hour12: false });
@@ -1938,7 +1929,7 @@ var SplitPanel = React14.memo(
 );
 
 // src/ui/hooks/useSessions.ts
-import { useState as useState8, useEffect as useEffect5, useCallback as useCallback2, useRef as useRef3 } from "react";
+import { useState as useState8, useEffect as useEffect5, useCallback as useCallback2, useRef as useRef3, useMemo as useMemo2 } from "react";
 var ACTIVE_POLL_MS = 1e4;
 var IDLE_POLL_MS = 3e4;
 var getDisplayName = (session) => {
@@ -1953,21 +1944,32 @@ var getDisplayName = (session) => {
   }
   return session.slug;
 };
+var getGroupKey = (session) => {
+  if (session.cwd) {
+    const parts = session.cwd.replace(/\/+$/, "").split("/");
+    return parts[parts.length - 1] || session.slug;
+  }
+  if (session.project) {
+    const parts = session.project.replace(/\/+$/, "").split("/");
+    return parts[parts.length - 1] || session.slug;
+  }
+  return session.slug;
+};
 var buildGroups = (sessions, expandedKeys) => {
-  const byName = /* @__PURE__ */ new Map();
+  const byKey = /* @__PURE__ */ new Map();
   for (const s of sessions) {
-    const name = getDisplayName(s);
-    const list = byName.get(name);
-    if (list) list.push(s);
-    else byName.set(name, [s]);
+    const key = getGroupKey(s);
+    const existing = byKey.get(key);
+    if (existing) {
+      existing.sessions.push(s);
+    } else {
+      byKey.set(key, { displayName: getDisplayName(s), sessions: [s] });
+    }
   }
   const groups = [];
-  for (const [key, list] of byName) {
+  for (const [key, { displayName, sessions: list }] of byKey) {
     list.sort((a, b) => b.lastActivity - a.lastActivity);
-    const totalIn = list.reduce(
-      (sum, s) => sum + s.usage.inputTokens + s.usage.cacheReadTokens,
-      0
-    );
+    const totalIn = list.reduce((sum, s) => sum + s.usage.inputTokens + s.usage.cacheReadTokens, 0);
     const totalOut = list.reduce((sum, s) => sum + s.usage.outputTokens, 0);
     groups.push({
       key,
@@ -2045,14 +2047,16 @@ var useSessions = (allUsers, filter, archivedIds, viewingArchive) => {
     const interval = setInterval(refresh, pollMs);
     return () => clearInterval(interval);
   }, [refresh, sessions.length > 0]);
-  const groups = buildGroups(sessions, expandedKeys);
-  const visibleItems = buildVisibleItems(groups);
+  const groups = useMemo2(() => buildGroups(sessions, expandedKeys), [sessions, expandedKeys]);
+  const visibleItems = useMemo2(() => buildVisibleItems(groups), [groups]);
+  const itemCountRef = useRef3(visibleItems.length);
+  itemCountRef.current = visibleItems.length;
   const selectedItem = visibleItems[selectedIndex] ?? null;
   const selectedSession = selectedItem?.type === "ungrouped" ? selectedItem.session : selectedItem?.type === "session" ? selectedItem.session : null;
   const selectedGroup = selectedItem?.type === "group" ? selectedItem.group : null;
   const selectNext = useCallback2(() => {
-    setSelectedIndex((i) => Math.min(i + 1, Math.max(0, visibleItems.length - 1)));
-  }, [visibleItems.length]);
+    setSelectedIndex((i) => Math.min(i + 1, Math.max(0, itemCountRef.current - 1)));
+  }, []);
   const selectPrev = useCallback2(() => {
     setSelectedIndex((i) => Math.max(i - 1, 0));
   }, []);
@@ -2137,7 +2141,7 @@ var useActivityStream = (session, allUsers) => {
 };
 
 // src/ui/hooks/useFilteredEvents.ts
-import { useMemo as useMemo2 } from "react";
+import { useMemo as useMemo3 } from "react";
 var applyFilter = (events, filter) => {
   if (!filter) return events;
   const lower = filter.toLowerCase();
@@ -2145,7 +2149,7 @@ var applyFilter = (events, filter) => {
     (e) => e.toolName.toLowerCase().includes(lower) || JSON.stringify(e.toolInput).toLowerCase().includes(lower)
   );
 };
-var useFilteredEvents = (rawEvents, filter) => useMemo2(() => applyFilter(rawEvents, filter), [rawEvents, filter]);
+var useFilteredEvents = (rawEvents, filter) => useMemo3(() => applyFilter(rawEvents, filter), [rawEvents, filter]);
 
 // src/ui/hooks/useAlerts.ts
 import { useState as useState10, useEffect as useEffect7, useRef as useRef5 } from "react";
@@ -2859,14 +2863,30 @@ var App = ({ options, config: initialConfig, version, firstRun }) => {
   const [updateStatus, setUpdateStatus] = useState15("");
   const [showDetail, setShowDetail] = useState15(false);
   const [viewingArchive, setViewingArchive] = useState15(false);
-  const [confirmAction, setConfirmAction] = useState15(null);
+  const [confirmAction, setConfirmAction] = useState15(
+    null
+  );
   const [archivedIds, setArchivedIds] = useState15(() => new Set(Object.keys(getArchived())));
   const refreshArchived = useCallback6(() => setArchivedIds(new Set(Object.keys(getArchived()))), []);
-  const updateInfo = useUpdateChecker(options.noUpdates, setup.liveConfig.updates.checkOnLaunch, setup.liveConfig.updates.checkInterval);
+  const updateInfo = useUpdateChecker(
+    options.noUpdates,
+    setup.liveConfig.updates.checkOnLaunch,
+    setup.liveConfig.updates.checkInterval
+  );
   useEffect9(() => {
     applyTheme(resolveTheme(setup.liveConfig.theme, setup.liveConfig.customThemes));
   }, [setup.liveConfig.theme, setup.liveConfig.customThemes]);
-  const { sessions, visibleItems, selectedSession, selectedGroup, selectedIndex, selectNext, selectPrev, toggleExpand, refresh } = useSessions(options.allUsers, filter || void 0, archivedIds, viewingArchive);
+  const {
+    sessions,
+    visibleItems,
+    selectedSession,
+    selectedGroup,
+    selectedIndex,
+    selectNext,
+    selectPrev,
+    toggleExpand,
+    refresh
+  } = useSessions(options.allUsers, filter || void 0, archivedIds, viewingArchive);
   const activityTarget = split.splitMode ? null : selectedGroup ? selectedGroup.sessions : selectedSession;
   const rawEvents = useActivityStream(activityTarget, options.allUsers);
   const leftRawEvents = useActivityStream(split.splitMode ? split.leftSession : null, options.allUsers);
@@ -2911,7 +2931,10 @@ var App = ({ options, config: initialConfig, version, firstRun }) => {
   const alertHeight = options.noSecurity ? 0 : 6;
   const mainHeight = termHeight - 3 - alertHeight - 1 - (inputMode !== "normal" ? 1 : 0);
   const viewportRows = mainHeight - 2;
-  const switchPanel = useCallback6((dir) => split.switchPanel(dir, setActivePanel), [split.switchPanel]);
+  const switchPanel = useCallback6(
+    (dir) => split.switchPanel(dir, setActivePanel),
+    [split.switchPanel]
+  );
   const clearSplitState = useCallback6(() => {
     split.clearSplitState();
     setActivePanel("sessions");
@@ -3018,8 +3041,18 @@ var App = ({ options, config: initialConfig, version, firstRun }) => {
   });
   if (setup.showSetup) {
     const steps = [
-      ...setup.liveConfig.prompts.hook === "pending" ? [{ title: "Install Claude Code hook?", description: "Adds a PostToolUse hook that blocks prompt injection attempts in real-time." }] : [],
-      ...setup.liveConfig.prompts.mcp === "pending" ? [{ title: "Install MCP server?", description: "Registers agenttop as an MCP server so Claude Code can query session status and alerts." }] : []
+      ...setup.liveConfig.prompts.hook === "pending" ? [
+        {
+          title: "Install Claude Code hook?",
+          description: "Adds a PostToolUse hook that blocks prompt injection attempts in real-time."
+        }
+      ] : [],
+      ...setup.liveConfig.prompts.mcp === "pending" ? [
+        {
+          title: "Install MCP server?",
+          description: "Registers agenttop as an MCP server so Claude Code can query session status and alerts."
+        }
+      ] : []
     ];
     if (steps.length === 0) {
       setup.setShowSetup(false);
@@ -3027,20 +3060,85 @@ var App = ({ options, config: initialConfig, version, firstRun }) => {
     }
     return /* @__PURE__ */ jsx15(SetupModal, { steps, onComplete: setup.handleSetupComplete });
   }
-  if (setup.showThemePicker) return /* @__PURE__ */ jsx15(ThemePickerModal, { onSelect: setup.handleThemePickerSelect, onSkip: setup.handleThemePickerSkip, onDismiss: setup.handleThemePickerDismiss });
+  if (setup.showThemePicker)
+    return /* @__PURE__ */ jsx15(
+      ThemePickerModal,
+      {
+        onSelect: setup.handleThemePickerSelect,
+        onSkip: setup.handleThemePickerSkip,
+        onDismiss: setup.handleThemePickerDismiss
+      }
+    );
   if (setup.showTour) return /* @__PURE__ */ jsx15(GuidedTour, { onComplete: setup.handleTourComplete, onSkip: setup.handleTourSkip });
   if (setup.showThemeMenu) return /* @__PURE__ */ jsx15(ThemeMenu, { config: setup.liveConfig, onClose: setup.handleThemeMenuClose });
-  if (setup.showSettings) return /* @__PURE__ */ jsx15(SettingsMenu, { config: setup.liveConfig, onClose: setup.handleSettingsClose, onOpenThemeMenu: setup.handleOpenThemeMenu });
+  if (setup.showSettings)
+    return /* @__PURE__ */ jsx15(
+      SettingsMenu,
+      {
+        config: setup.liveConfig,
+        onClose: setup.handleSettingsClose,
+        onOpenThemeMenu: setup.handleOpenThemeMenu
+      }
+    );
   if (confirmAction) {
-    return /* @__PURE__ */ jsx15(Box15, { flexDirection: "column", height: termHeight, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx15(ConfirmModal, { title: confirmAction.title, message: confirmAction.message, onConfirm: confirmAction.onConfirm, onCancel: () => setConfirmAction(null) }) });
+    return /* @__PURE__ */ jsx15(Box15, { flexDirection: "column", height: termHeight, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx15(
+      ConfirmModal,
+      {
+        title: confirmAction.title,
+        message: confirmAction.message,
+        onConfirm: confirmAction.onConfirm,
+        onCancel: () => setConfirmAction(null)
+      }
+    ) });
   }
   const activitySlug = selectedGroup ? selectedGroup.key : selectedSession?.slug ?? null;
   const isMerged = selectedGroup !== null;
-  const rightPanel = split.splitMode ? /* @__PURE__ */ jsx15(SplitPanel, { activePanel, leftSession: split.leftSession, rightSession: split.rightSession, leftEvents, rightEvents, leftScroll: split.leftScroll, rightScroll: split.rightScroll, leftFilter: split.leftFilter, rightFilter: split.rightFilter, leftShowDetail: split.leftShowDetail, rightShowDetail: split.rightShowDetail, height: mainHeight }) : showDetail && selectedSession ? /* @__PURE__ */ jsx15(SessionDetail, { session: selectedSession, focused: activePanel === "activity", height: mainHeight }) : /* @__PURE__ */ jsx15(ActivityFeed, { events, sessionSlug: activitySlug, sessionId: selectedSession?.sessionId, isActive: selectedGroup ? selectedGroup.isActive : selectedSession ? selectedSession.pid !== null : void 0, focused: activePanel === "activity", height: mainHeight, scrollOffset: activityScroll, filter: activityFilter || void 0, merged: isMerged, mergedSessions: selectedGroup?.sessions });
+  const rightPanel = split.splitMode ? /* @__PURE__ */ jsx15(
+    SplitPanel,
+    {
+      activePanel,
+      leftSession: split.leftSession,
+      rightSession: split.rightSession,
+      leftEvents,
+      rightEvents,
+      leftScroll: split.leftScroll,
+      rightScroll: split.rightScroll,
+      leftFilter: split.leftFilter,
+      rightFilter: split.rightFilter,
+      leftShowDetail: split.leftShowDetail,
+      rightShowDetail: split.rightShowDetail,
+      height: mainHeight
+    }
+  ) : showDetail && selectedSession ? /* @__PURE__ */ jsx15(SessionDetail, { session: selectedSession, focused: activePanel === "activity", height: mainHeight }) : /* @__PURE__ */ jsx15(
+    ActivityFeed,
+    {
+      events,
+      sessionSlug: activitySlug,
+      sessionId: selectedSession?.sessionId,
+      isActive: selectedGroup ? selectedGroup.isActive : selectedSession ? selectedSession.pid !== null : void 0,
+      focused: activePanel === "activity",
+      height: mainHeight,
+      scrollOffset: activityScroll,
+      filter: activityFilter || void 0,
+      merged: isMerged,
+      mergedSessions: selectedGroup?.sessions
+    }
+  );
   return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", height: termHeight, children: [
     /* @__PURE__ */ jsx15(StatusBar, { sessionCount: sessions.length, alertCount: alerts.length, version, updateInfo }),
     /* @__PURE__ */ jsxs15(Box15, { flexGrow: 1, height: mainHeight, children: [
-      /* @__PURE__ */ jsx15(SessionList, { visibleItems, selectedIndex, focused: activePanel === "sessions", height: mainHeight, filter: filter || void 0, viewingArchive, totalSessions: sessions.length }),
+      /* @__PURE__ */ jsx15(
+        SessionList,
+        {
+          visibleItems,
+          selectedIndex,
+          focused: activePanel === "sessions",
+          height: mainHeight,
+          filter: filter || void 0,
+          viewingArchive,
+          totalSessions: sessions.length
+        }
+      ),
       rightPanel
     ] }),
     !options.noSecurity && /* @__PURE__ */ jsx15(AlertBar, { alerts }),
@@ -3055,7 +3153,15 @@ var App = ({ options, config: initialConfig, version, firstRun }) => {
       /* @__PURE__ */ jsx15(Text14, { color: colors.bright, children: filterInput.value }),
       /* @__PURE__ */ jsx15(Text14, { color: colors.muted, children: "_" })
     ] }),
-    inputMode === "normal" && /* @__PURE__ */ jsx15(FooterBar, { keybindings: kb, updateStatus, viewingArchive, splitMode: split.splitMode })
+    inputMode === "normal" && /* @__PURE__ */ jsx15(
+      FooterBar,
+      {
+        keybindings: kb,
+        updateStatus,
+        viewingArchive,
+        splitMode: split.splitMode
+      }
+    )
   ] });
 };