@ai-devkit/agent-manager 0.3.0 → 0.4.0

package/dist/adapters/ClaudeCodeAdapter.js

@@ -1,10 +1,4 @@
 "use strict";
-/**
- * Claude Code Adapter
- *
- * Detects running Claude Code agents by reading session files
- * from ~/.claude/ directory and correlating with running processes.
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -42,337 +36,427 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClaudeCodeAdapter = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
 const AgentAdapter_1 = require("./AgentAdapter");
 const process_1 = require("../utils/process");
 const file_1 = require("../utils/file");
-var SessionEntryType;
-(function (SessionEntryType) {
-    SessionEntryType["ASSISTANT"] = "assistant";
-    SessionEntryType["USER"] = "user";
-    SessionEntryType["PROGRESS"] = "progress";
-    SessionEntryType["THINKING"] = "thinking";
-    SessionEntryType["SYSTEM"] = "system";
-    SessionEntryType["MESSAGE"] = "message";
-    SessionEntryType["TEXT"] = "text";
-})(SessionEntryType || (SessionEntryType = {}));
 /**
  * Claude Code Adapter
  *
  * Detects Claude Code agents by:
  * 1. Finding running claude processes
- * 2. Reading session files from ~/.claude/projects/
- * 3. Matching sessions to processes via CWD
- * 4. Extracting status from session JSONL
- * 5. Extracting summary from history.jsonl
+ * 2. Getting process start times for accurate session matching
+ * 3. Reading bounded session files from ~/.claude/projects/
+ * 4. Matching sessions to processes via CWD then start time ranking
+ * 5. Extracting summary from last user message in session JSONL
  */
 class ClaudeCodeAdapter {
     constructor() {
         this.type = 'claude';
         const homeDir = process.env.HOME || process.env.USERPROFILE || '';
-        this.claudeDir = path.join(homeDir, '.claude');
-        this.projectsDir = path.join(this.claudeDir, 'projects');
-        this.historyPath = path.join(this.claudeDir, 'history.jsonl');
+        this.projectsDir = path.join(homeDir, '.claude', 'projects');
     }
     /**
      * Check if this adapter can handle a given process
      */
     canHandle(processInfo) {
-        return processInfo.command.toLowerCase().includes('claude');
+        return this.isClaudeExecutable(processInfo.command);
+    }
+    isClaudeExecutable(command) {
+        const executable = command.trim().split(/\s+/)[0] || '';
+        const base = path.basename(executable).toLowerCase();
+        return base === 'claude' || base === 'claude.exe';
     }
     /**
      * Detect running Claude Code agents
      */
     async detectAgents() {
-        const claudeProcesses = (0, process_1.listProcesses)({ namePattern: 'claude' }).filter((processInfo) => this.canHandle(processInfo));
+        const claudeProcesses = this.listClaudeProcesses();
         if (claudeProcesses.length === 0) {
             return [];
         }
-        const sessions = this.readSessions();
-        const history = this.readHistory();
-        const historyByProjectPath = this.indexHistoryByProjectPath(history);
-        const historyBySessionId = new Map();
-        for (const entry of history) {
-            historyBySessionId.set(entry.sessionId, entry);
-        }
-        const sortedSessions = [...sessions].sort((a, b) => {
-            const timeA = a.lastActive?.getTime() || 0;
-            const timeB = b.lastActive?.getTime() || 0;
-            return timeB - timeA;
-        });
+        const processStartByPid = this.getProcessStartTimes(claudeProcesses.map((p) => p.pid));
+        const sessionScanLimit = this.calculateSessionScanLimit(claudeProcesses.length);
+        const sessions = this.readSessions(sessionScanLimit);
+        if (sessions.length === 0) {
+            return claudeProcesses.map((p) => this.mapProcessOnlyAgent(p, []));
+        }
+        const sortedSessions = [...sessions].sort((a, b) => b.lastActive.getTime() - a.lastActive.getTime());
         const usedSessionIds = new Set();
         const assignedPids = new Set();
         const agents = [];
-        this.assignSessionsForMode('cwd', claudeProcesses, sortedSessions, usedSessionIds, assignedPids, historyBySessionId, agents);
-        this.assignHistoryEntriesForExactProcessCwd(claudeProcesses, assignedPids, historyByProjectPath, usedSessionIds, agents);
-        this.assignSessionsForMode('project-parent', claudeProcesses, sortedSessions, usedSessionIds, assignedPids, historyBySessionId, agents);
+        const modes = ['cwd', 'missing-cwd', 'parent-child'];
+        for (const mode of modes) {
+            this.assignSessionsForMode(mode, claudeProcesses, sortedSessions, usedSessionIds, assignedPids, processStartByPid, agents);
+        }
         for (const processInfo of claudeProcesses) {
             if (assignedPids.has(processInfo.pid)) {
                 continue;
             }
             assignedPids.add(processInfo.pid);
-            agents.push(this.mapProcessOnlyAgent(processInfo, agents, historyByProjectPath, usedSessionIds));
+            agents.push(this.mapProcessOnlyAgent(processInfo, agents));
         }
         return agents;
     }
-    assignHistoryEntriesForExactProcessCwd(claudeProcesses, assignedPids, historyByProjectPath, usedSessionIds, agents) {
-        for (const processInfo of claudeProcesses) {
-            if (assignedPids.has(processInfo.pid)) {
-                continue;
-            }
-            const historyEntry = this.selectHistoryForProcess(processInfo.cwd || '', historyByProjectPath, usedSessionIds);
-            if (!historyEntry) {
-                continue;
-            }
-            assignedPids.add(processInfo.pid);
-            usedSessionIds.add(historyEntry.sessionId);
-            agents.push(this.mapHistoryToAgent(processInfo, historyEntry, agents));
-        }
+    listClaudeProcesses() {
+        return (0, process_1.listProcesses)({ namePattern: 'claude' }).filter((p) => this.canHandle(p));
+    }
+    calculateSessionScanLimit(processCount) {
+        return Math.min(Math.max(processCount * ClaudeCodeAdapter.SESSION_SCAN_MULTIPLIER, ClaudeCodeAdapter.MIN_SESSION_SCAN), ClaudeCodeAdapter.MAX_SESSION_SCAN);
     }
-    assignSessionsForMode(mode, claudeProcesses, sessions, usedSessionIds, assignedPids, historyBySessionId, agents) {
+    assignSessionsForMode(mode, claudeProcesses, sessions, usedSessionIds, assignedPids, processStartByPid, agents) {
         for (const processInfo of claudeProcesses) {
             if (assignedPids.has(processInfo.pid)) {
                 continue;
             }
-            const session = this.selectBestSession(processInfo, sessions, usedSessionIds, mode);
+            const session = this.selectBestSession(processInfo, sessions, usedSessionIds, processStartByPid, mode);
             if (!session) {
                 continue;
             }
             usedSessionIds.add(session.sessionId);
             assignedPids.add(processInfo.pid);
-            agents.push(this.mapSessionToAgent(session, processInfo, historyBySessionId, agents));
+            agents.push(this.mapSessionToAgent(session, processInfo, agents));
         }
     }
-    selectBestSession(processInfo, sessions, usedSessionIds, mode) {
-        const candidates = sessions.filter((session) => {
-            if (usedSessionIds.has(session.sessionId)) {
-                return false;
-            }
-            if (mode === 'cwd') {
-                return this.pathEquals(processInfo.cwd, session.lastCwd)
-                    || this.pathEquals(processInfo.cwd, session.projectPath);
-            }
-            if (mode === 'project-parent') {
-                return this.isChildPath(processInfo.cwd, session.projectPath)
-                    || this.isChildPath(processInfo.cwd, session.lastCwd);
-            }
-            return false;
-        });
-        if (candidates.length === 0) {
-            return null;
-        }
-        if (mode !== 'project-parent') {
-            return candidates[0];
-        }
-        return candidates.sort((a, b) => {
-            const depthA = Math.max(this.pathDepth(a.projectPath), this.pathDepth(a.lastCwd));
-            const depthB = Math.max(this.pathDepth(b.projectPath), this.pathDepth(b.lastCwd));
-            if (depthA !== depthB) {
-                return depthB - depthA;
-            }
-            const lastActiveA = a.lastActive?.getTime() || 0;
-            const lastActiveB = b.lastActive?.getTime() || 0;
-            return lastActiveB - lastActiveA;
-        })[0];
-    }
-    mapSessionToAgent(session, processInfo, historyBySessionId, existingAgents) {
-        const historyEntry = historyBySessionId.get(session.sessionId);
+    mapSessionToAgent(session, processInfo, existingAgents) {
         return {
             name: this.generateAgentName(session, existingAgents),
             type: this.type,
             status: this.determineStatus(session),
-            summary: historyEntry?.display || 'Session started',
+            summary: session.lastUserMessage || 'Session started',
             pid: processInfo.pid,
             projectPath: session.projectPath || processInfo.cwd || '',
             sessionId: session.sessionId,
             slug: session.slug,
-            lastActive: session.lastActive || new Date(),
+            lastActive: session.lastActive,
         };
     }
-    mapProcessOnlyAgent(processInfo, existingAgents, historyByProjectPath, usedSessionIds) {
-        const projectPath = processInfo.cwd || '';
-        const historyEntry = this.selectHistoryForProcess(projectPath, historyByProjectPath, usedSessionIds);
-        const sessionId = historyEntry?.sessionId || `pid-${processInfo.pid}`;
-        const lastActive = historyEntry ? new Date(historyEntry.timestamp) : new Date();
-        if (historyEntry) {
-            usedSessionIds.add(historyEntry.sessionId);
-        }
-        const processSession = {
-            sessionId,
-            projectPath,
-            lastCwd: projectPath,
-            sessionLogPath: '',
-            lastActive,
-        };
+    mapProcessOnlyAgent(processInfo, existingAgents) {
+        const processCwd = processInfo.cwd || '';
+        const projectName = path.basename(processCwd) || 'claude';
+        const hasDuplicate = existingAgents.some((a) => a.projectPath === processCwd);
         return {
-            name: this.generateAgentName(processSession, existingAgents),
+            name: hasDuplicate ? `${projectName} (pid-${processInfo.pid})` : projectName,
             type: this.type,
-            status: AgentAdapter_1.AgentStatus.RUNNING,
-            summary: historyEntry?.display || 'Claude process running',
+            status: AgentAdapter_1.AgentStatus.IDLE,
+            summary: 'Unknown',
             pid: processInfo.pid,
-            projectPath,
-            sessionId: processSession.sessionId,
-            lastActive: processSession.lastActive || new Date(),
+            projectPath: processCwd,
+            sessionId: `pid-${processInfo.pid}`,
+            lastActive: new Date(),
         };
     }
-    mapHistoryToAgent(processInfo, historyEntry, existingAgents) {
-        const projectPath = processInfo.cwd || historyEntry.project;
-        const historySession = {
-            sessionId: historyEntry.sessionId,
-            projectPath,
-            lastCwd: projectPath,
-            sessionLogPath: '',
-            lastActive: new Date(historyEntry.timestamp),
-        };
-        return {
-            name: this.generateAgentName(historySession, existingAgents),
-            type: this.type,
-            status: AgentAdapter_1.AgentStatus.RUNNING,
-            summary: historyEntry.display || 'Claude process running',
-            pid: processInfo.pid,
-            projectPath,
-            sessionId: historySession.sessionId,
-            lastActive: historySession.lastActive || new Date(),
-        };
+    selectBestSession(processInfo, sessions, usedSessionIds, processStartByPid, mode) {
+        const candidates = this.filterCandidateSessions(processInfo, sessions, usedSessionIds, mode);
+        if (candidates.length === 0) {
+            return undefined;
+        }
+        const processStart = processStartByPid.get(processInfo.pid);
+        if (!processStart) {
+            return candidates.sort((a, b) => b.lastActive.getTime() - a.lastActive.getTime())[0];
+        }
+        const best = this.rankCandidatesByStartTime(candidates, processStart)[0];
+        if (!best) {
+            return undefined;
+        }
+        // In early modes (cwd/missing-cwd), defer assignment when the best
+        // candidate is outside start-time tolerance — a closer match may
+        // exist in parent-child mode (e.g., worktree sessions).
+        if (mode !== 'parent-child') {
+            const diffMs = Math.abs(best.sessionStart.getTime() - processStart.getTime());
+            if (diffMs > ClaudeCodeAdapter.PROCESS_SESSION_TIME_TOLERANCE_MS) {
+                return undefined;
+            }
+        }
+        return best;
     }
-    indexHistoryByProjectPath(historyEntries) {
-        const grouped = new Map();
-        for (const entry of historyEntries) {
-            const key = this.normalizePath(entry.project);
-            const list = grouped.get(key) || [];
-            list.push(entry);
-            grouped.set(key, list);
-        }
-        for (const [key, list] of grouped.entries()) {
-            grouped.set(key, [...list].sort((a, b) => b.timestamp - a.timestamp));
-        }
-        return grouped;
+    filterCandidateSessions(processInfo, sessions, usedSessionIds, mode) {
+        return sessions.filter((session) => {
+            if (usedSessionIds.has(session.sessionId)) {
+                return false;
+            }
+            if (mode === 'cwd') {
+                return (this.pathEquals(processInfo.cwd, session.projectPath) ||
+                    this.pathEquals(processInfo.cwd, session.lastCwd));
+            }
+            if (mode === 'missing-cwd') {
+                return !session.projectPath;
+            }
+            // parent-child mode: match if process CWD equals, is under, or is
+            // a parent of session project/lastCwd.  This also catches exact CWD
+            // matches that were deferred from `cwd` mode due to start-time tolerance.
+            return (this.pathRelated(processInfo.cwd, session.projectPath) ||
+                this.pathRelated(processInfo.cwd, session.lastCwd));
+        });
     }
-    selectHistoryForProcess(processCwd, historyByProjectPath, usedSessionIds) {
-        if (!processCwd) {
-            return undefined;
+    rankCandidatesByStartTime(candidates, processStart) {
+        const toleranceMs = ClaudeCodeAdapter.PROCESS_SESSION_TIME_TOLERANCE_MS;
+        return candidates
+            .map((session) => {
+            const diffMs = Math.abs(session.sessionStart.getTime() - processStart.getTime());
+            const outsideTolerance = diffMs > toleranceMs ? 1 : 0;
+            return {
+                session,
+                rank: outsideTolerance,
+                diffMs,
+                recency: session.lastActive.getTime(),
+            };
+        })
+            .sort((a, b) => {
+            if (a.rank !== b.rank)
+                return a.rank - b.rank;
+            // Within tolerance (rank 0): prefer most recently active session.
+            // The exact diff is noise — a 6s vs 45s difference is meaningless,
+            // but the session with recent activity is more likely the real one.
+            if (a.rank === 0)
+                return b.recency - a.recency;
+            // Outside tolerance: prefer smallest time difference, then recency.
+            if (a.diffMs !== b.diffMs)
+                return a.diffMs - b.diffMs;
+            return b.recency - a.recency;
+        })
+            .map((ranked) => ranked.session);
+    }
+    getProcessStartTimes(pids) {
+        if (pids.length === 0 || process.env.JEST_WORKER_ID) {
+            return new Map();
         }
-        const candidates = historyByProjectPath.get(this.normalizePath(processCwd)) || [];
-        return candidates.find((entry) => !usedSessionIds.has(entry.sessionId));
+        try {
+            const output = (0, child_process_1.execSync)(`ps -o pid=,etime= -p ${pids.join(',')}`, { encoding: 'utf-8' });
+            const nowMs = Date.now();
+            const startTimes = new Map();
+            for (const rawLine of output.split('\n')) {
+                const line = rawLine.trim();
+                if (!line)
+                    continue;
+                const parts = line.split(/\s+/);
+                if (parts.length < 2)
+                    continue;
+                const pid = Number.parseInt(parts[0], 10);
+                const elapsedSeconds = this.parseElapsedSeconds(parts[1]);
+                if (!Number.isFinite(pid) || elapsedSeconds === null)
+                    continue;
+                startTimes.set(pid, new Date(nowMs - elapsedSeconds * 1000));
+            }
+            return startTimes;
+        }
+        catch {
+            return new Map();
+        }
+    }
+    parseElapsedSeconds(etime) {
+        const match = etime
+            .trim()
+            .match(/^(?:(\d+)-)?(?:(\d{1,2}):)?(\d{1,2}):(\d{2})$/);
+        if (!match) {
+            return null;
+        }
+        const days = Number.parseInt(match[1] || '0', 10);
+        const hours = Number.parseInt(match[2] || '0', 10);
+        const minutes = Number.parseInt(match[3] || '0', 10);
+        const seconds = Number.parseInt(match[4] || '0', 10);
+        return ((days * 24 + hours) * 60 + minutes) * 60 + seconds;
     }
     /**
-     * Read all Claude Code sessions
+     * Read Claude Code sessions with bounded scanning
      */
-    readSessions() {
+    readSessions(limit) {
+        const sessionFiles = this.findSessionFiles(limit);
+        const sessions = [];
+        for (const file of sessionFiles) {
+            try {
+                const session = this.readSession(file.filePath, file.projectPath);
+                if (session) {
+                    sessions.push(session);
+                }
+            }
+            catch (error) {
+                console.error(`Failed to parse Claude session ${file.filePath}:`, error);
+            }
+        }
+        return sessions;
+    }
+    /**
+     * Find session files bounded by mtime, sorted most-recent first
+     */
+    findSessionFiles(limit) {
         if (!fs.existsSync(this.projectsDir)) {
             return [];
         }
-        const sessions = [];
-        const projectDirs = fs.readdirSync(this.projectsDir);
-        for (const dirName of projectDirs) {
+        const files = [];
+        for (const dirName of fs.readdirSync(this.projectsDir)) {
             if (dirName.startsWith('.')) {
                 continue;
             }
             const projectDir = path.join(this.projectsDir, dirName);
-            if (!fs.statSync(projectDir).isDirectory()) {
-                continue;
-            }
-            // Read sessions-index.json to get original project path
-            const indexPath = path.join(projectDir, 'sessions-index.json');
-            if (!fs.existsSync(indexPath)) {
-                continue;
+            try {
+                if (!fs.statSync(projectDir).isDirectory())
+                    continue;
             }
-            const sessionsIndex = (0, file_1.readJson)(indexPath);
-            if (!sessionsIndex) {
-                console.error(`Failed to parse ${indexPath}`);
+            catch {
                 continue;
             }
-            const sessionFiles = fs.readdirSync(projectDir).filter(f => f.endsWith('.jsonl'));
-            for (const sessionFile of sessionFiles) {
-                const sessionId = sessionFile.replace('.jsonl', '');
-                const sessionLogPath = path.join(projectDir, sessionFile);
+            const indexPath = path.join(projectDir, 'sessions-index.json');
+            const index = (0, file_1.readJson)(indexPath);
+            const projectPath = index?.originalPath || '';
+            for (const entry of fs.readdirSync(projectDir)) {
+                if (!entry.endsWith('.jsonl')) {
+                    continue;
+                }
+                const filePath = path.join(projectDir, entry);
                 try {
-                    const sessionData = this.readSessionLog(sessionLogPath);
-                    sessions.push({
-                        sessionId,
-                        projectPath: sessionsIndex.originalPath,
-                        lastCwd: sessionData.lastCwd,
-                        slug: sessionData.slug,
-                        sessionLogPath,
-                        lastEntry: sessionData.lastEntry,
-                        lastActive: sessionData.lastActive,
+                    files.push({
+                        filePath,
+                        projectPath,
+                        mtimeMs: fs.statSync(filePath).mtimeMs,
                     });
                 }
-                catch (error) {
-                    console.error(`Failed to read session ${sessionId}:`, error);
+                catch {
                     continue;
                 }
             }
         }
-        return sessions;
+        // Ensure breadth: include at least the most recent session per project,
+        // then fill remaining slots with globally most-recent sessions.
+        const sorted = files.sort((a, b) => b.mtimeMs - a.mtimeMs);
+        const result = [];
+        const seenProjects = new Set();
+        // First pass: one most-recent session per project directory
+        for (const file of sorted) {
+            const projDir = path.dirname(file.filePath);
+            if (!seenProjects.has(projDir)) {
+                seenProjects.add(projDir);
+                result.push(file);
+            }
+        }
+        // Second pass: fill remaining slots with globally most-recent
+        if (result.length < limit) {
+            const resultSet = new Set(result.map((f) => f.filePath));
+            for (const file of sorted) {
+                if (result.length >= limit)
+                    break;
+                if (!resultSet.has(file.filePath)) {
+                    result.push(file);
+                }
+            }
+        }
+        return result.sort((a, b) => b.mtimeMs - a.mtimeMs).slice(0, limit);
     }
     /**
-     * Read a session JSONL file
-     * Only reads last 100 lines for performance with large files
+     * Parse a single session file into ClaudeSession
      */
-    readSessionLog(logPath) {
-        const lines = (0, file_1.readLastLines)(logPath, 100);
+    readSession(filePath, projectPath) {
+        const sessionId = path.basename(filePath, '.jsonl');
+        let content;
+        try {
+            content = fs.readFileSync(filePath, 'utf-8');
+        }
+        catch {
+            return null;
+        }
+        const allLines = content.trim().split('\n');
+        if (allLines.length === 0) {
+            return null;
+        }
+        // Parse first line for sessionStart.
+        // Claude Code may emit a "file-history-snapshot" as the first entry, which
+        // stores its timestamp inside "snapshot.timestamp" rather than at the root.
+        let sessionStart = null;
+        try {
+            const firstEntry = JSON.parse(allLines[0]);
+            const rawTs = firstEntry.timestamp || firstEntry.snapshot?.timestamp;
+            if (rawTs) {
+                const ts = new Date(rawTs);
+                if (!Number.isNaN(ts.getTime())) {
+                    sessionStart = ts;
+                }
+            }
+        }
+        catch {
+            /* skip */
+        }
+        // Parse all lines for session state (file already in memory)
         let slug;
-        let lastEntry;
+        let lastEntryType;
         let lastActive;
         let lastCwd;
-        for (const line of lines) {
+        let isInterrupted = false;
+        let lastUserMessage;
+        for (const line of allLines) {
             try {
                 const entry = JSON.parse(line);
+                if (entry.timestamp) {
+                    const ts = new Date(entry.timestamp);
+                    if (!Number.isNaN(ts.getTime())) {
+                        lastActive = ts;
+                    }
+                }
                 if (entry.slug && !slug) {
                     slug = entry.slug;
                 }
-                lastEntry = entry;
-                if (entry.timestamp) {
-                    lastActive = new Date(entry.timestamp);
-                }
                 if (typeof entry.cwd === 'string' && entry.cwd.trim().length > 0) {
                     lastCwd = entry.cwd;
                 }
+                if (entry.type && !this.isMetadataEntryType(entry.type)) {
+                    lastEntryType = entry.type;
+                    if (entry.type === 'user') {
+                        const msgContent = entry.message?.content;
+                        isInterrupted =
+                            Array.isArray(msgContent) &&
+                                msgContent.some((c) => (c.type === 'text' &&
+                                    c.text?.includes('[Request interrupted')) ||
+                                    (c.type === 'tool_result' &&
+                                        c.content?.includes('[Request interrupted')));
+                        // Extract user message text for summary fallback
+                        const text = this.extractUserMessageText(msgContent);
+                        if (text) {
+                            lastUserMessage = text;
+                        }
+                    }
+                    else {
+                        isInterrupted = false;
+                    }
+                }
             }
-            catch (error) {
+            catch {
                 continue;
             }
         }
-        return { slug, lastEntry, lastActive, lastCwd };
-    }
-    /**
-     * Read history.jsonl for user prompts
-     * Only reads last 100 lines for performance
-     */
-    readHistory() {
-        return (0, file_1.readJsonLines)(this.historyPath, 100);
+        return {
+            sessionId,
+            projectPath: projectPath || lastCwd || '',
+            lastCwd,
+            slug,
+            sessionStart: sessionStart || lastActive || new Date(),
+            lastActive: lastActive || new Date(),
+            lastEntryType,
+            isInterrupted,
+            lastUserMessage,
+        };
     }
     /**
-     * Determine agent status from session entry
+     * Determine agent status from session state
      */
     determineStatus(session) {
-        if (!session.lastEntry) {
+        if (!session.lastEntryType) {
             return AgentAdapter_1.AgentStatus.UNKNOWN;
         }
-        const entryType = session.lastEntry.type;
-        const lastActive = session.lastActive || new Date(0);
-        const ageMinutes = (Date.now() - lastActive.getTime()) / 1000 / 60;
-        if (ageMinutes > ClaudeCodeAdapter.IDLE_THRESHOLD_MINUTES) {
-            return AgentAdapter_1.AgentStatus.IDLE;
+        // No age-based IDLE override: every agent in the list is backed by
+        // a running process (found via ps), so the entry type is the best
+        // indicator of actual state.
+        if (session.lastEntryType === 'user') {
+            return session.isInterrupted
+                ? AgentAdapter_1.AgentStatus.WAITING
+                : AgentAdapter_1.AgentStatus.RUNNING;
         }
-        if (entryType === SessionEntryType.USER) {
-            // Check if user interrupted manually - this puts agent back in waiting state
-            const content = session.lastEntry.message?.content;
-            if (Array.isArray(content)) {
-                const isInterrupted = content.some(c => (c.type === SessionEntryType.TEXT && c.text?.includes('[Request interrupted')) ||
-                    (c.type === 'tool_result' && c.content?.includes('[Request interrupted')));
-                if (isInterrupted)
-                    return AgentAdapter_1.AgentStatus.WAITING;
-            }
+        if (session.lastEntryType === 'progress' ||
+            session.lastEntryType === 'thinking') {
             return AgentAdapter_1.AgentStatus.RUNNING;
         }
-        if (entryType === SessionEntryType.PROGRESS || entryType === SessionEntryType.THINKING) {
-            return AgentAdapter_1.AgentStatus.RUNNING;
-        }
-        else if (entryType === SessionEntryType.ASSISTANT) {
+        if (session.lastEntryType === 'assistant') {
             return AgentAdapter_1.AgentStatus.WAITING;
         }
-        else if (entryType === SessionEntryType.SYSTEM) {
+        if (session.lastEntryType === 'system') {
             return AgentAdapter_1.AgentStatus.IDLE;
         }
         return AgentAdapter_1.AgentStatus.UNKNOWN;
@@ -383,21 +467,22 @@ class ClaudeCodeAdapter {
      */
     generateAgentName(session, existingAgents) {
         const projectName = path.basename(session.projectPath) || 'claude';
-        const sameProjectAgents = existingAgents.filter(a => a.projectPath === session.projectPath);
+        const sameProjectAgents = existingAgents.filter((a) => a.projectPath === session.projectPath);
         if (sameProjectAgents.length === 0) {
             return projectName;
         }
-        // Multiple sessions for same project, append slug
         if (session.slug) {
-            // Use first word of slug for brevity (with safety check for format)
             const slugPart = session.slug.includes('-')
                 ? session.slug.split('-')[0]
                 : session.slug.slice(0, 8);
             return `${projectName} (${slugPart})`;
         }
-        // No slug available, use session ID prefix
         return `${projectName} (${session.sessionId.slice(0, 8)})`;
     }
+    /** Check if two paths are equal, or one is a parent/child of the other. */
+    pathRelated(a, b) {
+        return this.pathEquals(a, b) || this.isChildPath(a, b) || this.isChildPath(b, a);
+    }
     pathEquals(a, b) {
         if (!a || !b) {
             return false;
@@ -410,7 +495,73 @@ class ClaudeCodeAdapter {
         }
         const normalizedChild = this.normalizePath(child);
         const normalizedParent = this.normalizePath(parent);
-        return normalizedChild === normalizedParent || normalizedChild.startsWith(`${normalizedParent}${path.sep}`);
+        return normalizedChild.startsWith(`${normalizedParent}${path.sep}`);
+    }
+    /**
+     * Extract meaningful text from a user message content.
+     * Handles string and array formats, skill command expansion, and noise filtering.
+     */
+    extractUserMessageText(content) {
+        if (!content) {
+            return undefined;
+        }
+        let raw;
+        if (typeof content === 'string') {
+            raw = content.trim();
+        }
+        else if (Array.isArray(content)) {
+            for (const block of content) {
+                if (block.type === 'text' && block.text?.trim()) {
+                    raw = block.text.trim();
+                    break;
+                }
+            }
+        }
+        if (!raw) {
+            return undefined;
+        }
+        // Skill slash-command: extract /command-name and args
+        if (raw.startsWith('<command-message>')) {
+            return this.parseCommandMessage(raw);
+        }
+        // Expanded skill content: extract ARGUMENTS line if present, skip otherwise
+        if (raw.startsWith('Base directory for this skill:')) {
+            const argsMatch = raw.match(/\nARGUMENTS:\s*(.+)/);
+            return argsMatch?.[1]?.trim() || undefined;
+        }
+        // Filter noise
+        if (this.isNoiseMessage(raw)) {
+            return undefined;
+        }
+        return raw;
+    }
+    /**
+     * Parse a <command-message> string into "/command args" format.
+     */
+    parseCommandMessage(raw) {
+        const nameMatch = raw.match(/<command-name>([^<]+)<\/command-name>/);
+        const argsMatch = raw.match(/<command-args>([^<]+)<\/command-args>/);
+        const name = nameMatch?.[1]?.trim();
+        if (!name) {
+            return undefined;
+        }
+        const args = argsMatch?.[1]?.trim();
+        return args ? `${name} ${args}` : name;
+    }
+    /**
+     * Check if a message is noise (not a meaningful user intent).
+     */
+    isNoiseMessage(text) {
+        return (text.startsWith('[Request interrupted') ||
+            text === 'Tool loaded.' ||
+            text.startsWith('This session is being continued'));
+    }
+    /**
+     * Check if an entry type is metadata (not conversation state).
+     * These should not overwrite lastEntryType used for status determination.
+     */
+    isMetadataEntryType(type) {
+        return type === 'last-prompt' || type === 'file-history-snapshot';
     }
     normalizePath(value) {
         const resolved = path.resolve(value);
@@ -419,14 +570,12 @@ class ClaudeCodeAdapter {
         }
         return resolved;
     }
-    pathDepth(value) {
-        if (!value) {
-            return 0;
-        }
-        return this.normalizePath(value).split(path.sep).filter(Boolean).length;
-    }
 }
 exports.ClaudeCodeAdapter = ClaudeCodeAdapter;
-/** Threshold in minutes before considering a session idle */
-ClaudeCodeAdapter.IDLE_THRESHOLD_MINUTES = 5;
+/** Limit session parsing per run to keep list latency bounded. */
+ClaudeCodeAdapter.MIN_SESSION_SCAN = 12;
+ClaudeCodeAdapter.MAX_SESSION_SCAN = 40;
+ClaudeCodeAdapter.SESSION_SCAN_MULTIPLIER = 4;
+/** Matching tolerance between process start time and session start time. */
+ClaudeCodeAdapter.PROCESS_SESSION_TIME_TOLERANCE_MS = 2 * 60 * 1000;
 //# sourceMappingURL=ClaudeCodeAdapter.js.map