@ai-devkit/agent-manager 0.3.0 → 0.5.0

package/src/adapters/ClaudeCodeAdapter.ts

@@ -1,61 +1,46 @@
-/**
- * Claude Code Adapter
- * 
- * Detects running Claude Code agents by reading session files
- * from ~/.claude/ directory and correlating with running processes.
- */
-
 import * as fs from 'fs';
 import * as path from 'path';
 import type { AgentAdapter, AgentInfo, ProcessInfo } from './AgentAdapter';
 import { AgentStatus } from './AgentAdapter';
-import { listProcesses } from '../utils/process';
-import { readLastLines, readJsonLines, readJson } from '../utils/file';
-
-/**
- * Structure of ~/.claude/projects/{path}/sessions-index.json
- */
-interface SessionsIndex {
-    originalPath: string;
-}
-
-enum SessionEntryType {
-    ASSISTANT = 'assistant',
-    USER = 'user',
-    PROGRESS = 'progress',
-    THINKING = 'thinking',
-    SYSTEM = 'system',
-    MESSAGE = 'message',
-    TEXT = 'text',
-}
-
+import { listAgentProcesses, enrichProcesses } from '../utils/process';
+import { batchGetSessionFileBirthtimes } from '../utils/session';
+import type { SessionFile } from '../utils/session';
+import { matchProcessesToSessions, generateAgentName } from '../utils/matching';
 /**
  * Entry in session JSONL file
  */
 interface SessionEntry {
-    type?: SessionEntryType;
+    type?: string;
     timestamp?: string;
     slug?: string;
     cwd?: string;
-    sessionId?: string;
     message?: {
-        content?: Array<{
+        content?: string | Array<{
             type?: string;
             text?: string;
             content?: string;
         }>;
     };
-    [key: string]: unknown;
 }
 
 /**
- * Entry in ~/.claude/history.jsonl
+ * Entry in ~/.claude/sessions/<pid>.json written by Claude Code
  */
-interface HistoryEntry {
-    display: string;
-    timestamp: number;
-    project: string;
+interface PidFileEntry {
+    pid: number;
     sessionId: string;
+    cwd: string;
+    startedAt: number; // epoch milliseconds
+    kind: string;
+    entrypoint: string;
+}
+
+/**
+ * A process directly matched to a session via PID file (authoritative path)
+ */
+interface DirectMatch {
+    process: ProcessInfo;
+    sessionFile: SessionFile;
 }
 
 /**
@@ -66,466 +51,386 @@ interface ClaudeSession {
     projectPath: string;
     lastCwd?: string;
     slug?: string;
-    sessionLogPath: string;
-    lastEntry?: SessionEntry;
-    lastActive?: Date;
+    sessionStart: Date;
+    lastActive: Date;
+    lastEntryType?: string;
+    isInterrupted: boolean;
+    lastUserMessage?: string;
 }
 
-type SessionMatchMode = 'cwd' | 'project-parent';
-
 /**
  * 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
+ * 1. Finding running claude processes via shared listAgentProcesses()
+ * 2. Enriching with CWD and start times via shared enrichProcesses()
+ * 3. Attempting authoritative PID-file matching via ~/.claude/sessions/<pid>.json
+ * 4. Falling back to CWD+birthtime heuristic (matchProcessesToSessions) for processes without a PID file
+ * 5. Extracting summary from last user message in session JSONL
  */
 export class ClaudeCodeAdapter implements AgentAdapter {
     readonly type = 'claude' as const;
 
-    /** Threshold in minutes before considering a session idle */
-    private static readonly IDLE_THRESHOLD_MINUTES = 5;
-
-    private claudeDir: string;
     private projectsDir: string;
-    private historyPath: string;
+    private sessionsDir: string;
 
     constructor() {
         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');
+        this.sessionsDir = path.join(homeDir, '.claude', 'sessions');
     }
 
     /**
      * Check if this adapter can handle a given process
      */
     canHandle(processInfo: ProcessInfo): boolean {
-        return processInfo.command.toLowerCase().includes('claude');
+        return this.isClaudeExecutable(processInfo.command);
+    }
+
+    private isClaudeExecutable(command: string): boolean {
+        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(): Promise<AgentInfo[]> {
-        const claudeProcesses = listProcesses({ namePattern: 'claude' }).filter((processInfo) =>
-            this.canHandle(processInfo),
-        );
-
-        if (claudeProcesses.length === 0) {
+        const processes = enrichProcesses(listAgentProcesses('claude'));
+        if (processes.length === 0) {
             return [];
         }
 
-        const sessions = this.readSessions();
-        const history = this.readHistory();
-        const historyByProjectPath = this.indexHistoryByProjectPath(history);
-        const historyBySessionId = new Map<string, HistoryEntry>();
-        for (const entry of history) {
-            historyBySessionId.set(entry.sessionId, entry);
-        }
+        // Step 1: try authoritative PID-file matching for every process
+        const { direct, fallback } = this.tryPidFileMatching(processes);
+
+        // Step 2: run legacy CWD+birthtime matching only for processes without a PID file
+        const legacySessions = this.discoverSessions(fallback);
+        const legacyMatches =
+            fallback.length > 0 && legacySessions.length > 0
+                ? matchProcessesToSessions(fallback, legacySessions)
+                : [];
 
-        const sortedSessions = [...sessions].sort((a, b) => {
-            const timeA = a.lastActive?.getTime() || 0;
-            const timeB = b.lastActive?.getTime() || 0;
-            return timeB - timeA;
-        });
+        const matchedPids = new Set([
+            ...direct.map((d) => d.process.pid),
+            ...legacyMatches.map((m) => m.process.pid),
+        ]);
 
-        const usedSessionIds = new Set<string>();
-        const assignedPids = new Set<number>();
         const agents: AgentInfo[] = [];
 
-        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,
-        );
-        for (const processInfo of claudeProcesses) {
-            if (assignedPids.has(processInfo.pid)) {
-                continue;
+        // Build agents from direct (PID-file) matches
+        for (const { process: proc, sessionFile } of direct) {
+            const sessionData = this.readSession(sessionFile.filePath, sessionFile.resolvedCwd);
+            if (sessionData) {
+                agents.push(this.mapSessionToAgent(sessionData, proc, sessionFile));
+            } else {
+                matchedPids.delete(proc.pid);
+            }
+        }
+
+        // Build agents from legacy matches
+        for (const match of legacyMatches) {
+            const sessionData = this.readSession(
+                match.session.filePath,
+                match.session.resolvedCwd,
+            );
+            if (sessionData) {
+                agents.push(this.mapSessionToAgent(sessionData, match.process, match.session));
+            } else {
+                matchedPids.delete(match.process.pid);
             }
+        }
 
-            assignedPids.add(processInfo.pid);
-            agents.push(this.mapProcessOnlyAgent(processInfo, agents, historyByProjectPath, usedSessionIds));
+        // Any process with no match (direct or legacy) appears as IDLE
+        for (const proc of processes) {
+            if (!matchedPids.has(proc.pid)) {
+                agents.push(this.mapProcessOnlyAgent(proc));
+            }
         }
 
         return agents;
     }
 
-    private assignHistoryEntriesForExactProcessCwd(
-        claudeProcesses: ProcessInfo[],
-        assignedPids: Set<number>,
-        historyByProjectPath: Map<string, HistoryEntry[]>,
-        usedSessionIds: Set<string>,
-        agents: AgentInfo[],
-    ): void {
-        for (const processInfo of claudeProcesses) {
-            if (assignedPids.has(processInfo.pid)) {
-                continue;
-            }
+    /**
+     * Discover session files for the given processes.
+     *
+     * For each unique process CWD, encodes it to derive the expected
+     * ~/.claude/projects/<encoded>/ directory, then gets session file birthtimes
+     * via a single batched stat call across all directories.
+     */
+    private discoverSessions(processes: ProcessInfo[]): SessionFile[] {
+        // Collect valid project dirs and map them back to their CWD
+        const dirToCwd = new Map<string, string>();
+
+        for (const proc of processes) {
+            if (!proc.cwd) continue;
+
+            const projectDir = this.getProjectDir(proc.cwd);
+            if (dirToCwd.has(projectDir)) continue;
 
-            const historyEntry = this.selectHistoryForProcess(processInfo.cwd || '', historyByProjectPath, usedSessionIds);
-            if (!historyEntry) {
+            try {
+                if (!fs.statSync(projectDir).isDirectory()) continue;
+            } catch {
                 continue;
             }
 
-            assignedPids.add(processInfo.pid);
-            usedSessionIds.add(historyEntry.sessionId);
-            agents.push(this.mapHistoryToAgent(processInfo, historyEntry, agents));
+            dirToCwd.set(projectDir, proc.cwd);
         }
-    }
 
-    private assignSessionsForMode(
-        mode: SessionMatchMode,
-        claudeProcesses: ProcessInfo[],
-        sessions: ClaudeSession[],
-        usedSessionIds: Set<string>,
-        assignedPids: Set<number>,
-        historyBySessionId: Map<string, HistoryEntry>,
-        agents: AgentInfo[],
-    ): void {
-        for (const processInfo of claudeProcesses) {
-            if (assignedPids.has(processInfo.pid)) {
-                continue;
-            }
+        if (dirToCwd.size === 0) return [];
 
-            const session = this.selectBestSession(processInfo, sessions, usedSessionIds, mode);
-            if (!session) {
-                continue;
-            }
+        // Single batched stat call across all directories
+        const files = batchGetSessionFileBirthtimes([...dirToCwd.keys()]);
 
-            usedSessionIds.add(session.sessionId);
-            assignedPids.add(processInfo.pid);
-            agents.push(this.mapSessionToAgent(session, processInfo, historyBySessionId, agents));
+        // Set resolvedCwd based on which project dir the file belongs to
+        for (const file of files) {
+            file.resolvedCwd = dirToCwd.get(file.projectDir) || '';
         }
-    }
 
-    private selectBestSession(
-        processInfo: ProcessInfo,
-        sessions: ClaudeSession[],
-        usedSessionIds: Set<string>,
-        mode: SessionMatchMode,
-    ): ClaudeSession | null {
-        const candidates = sessions.filter((session) => {
-            if (usedSessionIds.has(session.sessionId)) {
-                return false;
-            }
+        return files;
+    }
 
-            if (mode === 'cwd') {
-                return this.pathEquals(processInfo.cwd, session.lastCwd)
-                    || this.pathEquals(processInfo.cwd, session.projectPath);
-            }
+    /**
+     * Attempt to match each process to its session via ~/.claude/sessions/<pid>.json.
+     *
+     * Returns:
+     *   direct  — processes matched authoritatively via PID file
+     *   fallback — processes with no valid PID file (sent to legacy matching)
+     *
+     * Per-process fallback triggers on: file absent, malformed JSON,
+     * stale startedAt (>60 s from proc.startTime), or missing JSONL.
+     */
+    private tryPidFileMatching(processes: ProcessInfo[]): {
+        direct: DirectMatch[];
+        fallback: ProcessInfo[];
+    } {
+        const direct: DirectMatch[] = [];
+        const fallback: ProcessInfo[] = [];
 
-            if (mode === 'project-parent') {
-                return this.isChildPath(processInfo.cwd, session.projectPath)
-                    || this.isChildPath(processInfo.cwd, session.lastCwd);
-            }
+        for (const proc of processes) {
+            const pidFilePath = path.join(this.sessionsDir, `${proc.pid}.json`);
+            try {
+                const entry = JSON.parse(
+                    fs.readFileSync(pidFilePath, 'utf-8'),
+                ) as PidFileEntry;
+
+                // Stale-file guard: reject PID files from a previous process with the same PID
+                if (proc.startTime) {
+                    const deltaMs = Math.abs(proc.startTime.getTime() - entry.startedAt);
+                    if (deltaMs > 60000) {
+                        fallback.push(proc);
+                        continue;
+                    }
+                }
 
-            return false;
-        });
+                const projectDir = this.getProjectDir(entry.cwd);
+                const jsonlPath = path.join(projectDir, `${entry.sessionId}.jsonl`);
 
-        if (candidates.length === 0) {
-            return null;
-        }
+                if (!fs.existsSync(jsonlPath)) {
+                    fallback.push(proc);
+                    continue;
+                }
 
-        if (mode !== 'project-parent') {
-            return candidates[0];
+                direct.push({
+                    process: proc,
+                    sessionFile: {
+                        sessionId: entry.sessionId,
+                        filePath: jsonlPath,
+                        projectDir,
+                        birthtimeMs: entry.startedAt,
+                        resolvedCwd: entry.cwd,
+                    },
+                });
+            } catch {
+                // PID file absent, unreadable, or malformed — fall back per-process
+                fallback.push(proc);
+            }
         }
 
-        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;
-            }
+        return { direct, fallback };
+    }
 
-            const lastActiveA = a.lastActive?.getTime() || 0;
-            const lastActiveB = b.lastActive?.getTime() || 0;
-            return lastActiveB - lastActiveA;
-        })[0];
+    /**
+     * Derive the Claude Code project directory for a given CWD.
+     *
+     * Claude Code encodes paths by replacing '/' with '-':
+     * /Users/foo/bar → ~/.claude/projects/-Users-foo-bar/
+     */
+    private getProjectDir(cwd: string): string {
+        const encoded = cwd.replace(/\//g, '-');
+        return path.join(this.projectsDir, encoded);
     }
 
     private mapSessionToAgent(
         session: ClaudeSession,
         processInfo: ProcessInfo,
-        historyBySessionId: Map<string, HistoryEntry>,
-        existingAgents: AgentInfo[],
+        sessionFile: SessionFile,
     ): AgentInfo {
-        const historyEntry = historyBySessionId.get(session.sessionId);
-
         return {
-            name: this.generateAgentName(session, existingAgents),
+            name: generateAgentName(processInfo.cwd, processInfo.pid),
             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,
+            projectPath: sessionFile.resolvedCwd || processInfo.cwd || '',
+            sessionId: sessionFile.sessionId,
             slug: session.slug,
-            lastActive: session.lastActive || new Date(),
-        };
-    }
-
-    private mapProcessOnlyAgent(
-        processInfo: ProcessInfo,
-        existingAgents: AgentInfo[],
-        historyByProjectPath: Map<string, HistoryEntry[]>,
-        usedSessionIds: Set<string>,
-    ): AgentInfo {
-        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: ClaudeSession = {
-            sessionId,
-            projectPath,
-            lastCwd: projectPath,
-            sessionLogPath: '',
-            lastActive,
-        };
-
-        return {
-            name: this.generateAgentName(processSession, existingAgents),
-            type: this.type,
-            status: AgentStatus.RUNNING,
-            summary: historyEntry?.display || 'Claude process running',
-            pid: processInfo.pid,
-            projectPath,
-            sessionId: processSession.sessionId,
-            lastActive: processSession.lastActive || new Date(),
+            lastActive: session.lastActive,
         };
     }
 
-    private mapHistoryToAgent(
-        processInfo: ProcessInfo,
-        historyEntry: HistoryEntry,
-        existingAgents: AgentInfo[],
-    ): AgentInfo {
-        const projectPath = processInfo.cwd || historyEntry.project;
-        const historySession: ClaudeSession = {
-            sessionId: historyEntry.sessionId,
-            projectPath,
-            lastCwd: projectPath,
-            sessionLogPath: '',
-            lastActive: new Date(historyEntry.timestamp),
-        };
-
+    private mapProcessOnlyAgent(processInfo: ProcessInfo): AgentInfo {
         return {
-            name: this.generateAgentName(historySession, existingAgents),
+            name: generateAgentName(processInfo.cwd || '', processInfo.pid),
             type: this.type,
-            status: AgentStatus.RUNNING,
-            summary: historyEntry.display || 'Claude process running',
+            status: AgentStatus.IDLE,
+            summary: 'Unknown',
             pid: processInfo.pid,
-            projectPath,
-            sessionId: historySession.sessionId,
-            lastActive: historySession.lastActive || new Date(),
+            projectPath: processInfo.cwd || '',
+            sessionId: `pid-${processInfo.pid}`,
+            lastActive: new Date(),
         };
     }
 
-    private indexHistoryByProjectPath(historyEntries: HistoryEntry[]): Map<string, HistoryEntry[]> {
-        const grouped = new Map<string, HistoryEntry[]>();
-
-        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;
-    }
-
-    private selectHistoryForProcess(
-        processCwd: string,
-        historyByProjectPath: Map<string, HistoryEntry[]>,
-        usedSessionIds: Set<string>,
-    ): HistoryEntry | undefined {
-        if (!processCwd) {
-            return undefined;
-        }
-
-        const candidates = historyByProjectPath.get(this.normalizePath(processCwd)) || [];
-        return candidates.find((entry) => !usedSessionIds.has(entry.sessionId));
-    }
-
     /**
-     * Read all Claude Code sessions
+     * Parse a single session file into ClaudeSession
      */
-    private readSessions(): ClaudeSession[] {
-        if (!fs.existsSync(this.projectsDir)) {
-            return [];
-        }
-
-        const sessions: ClaudeSession[] = [];
-        const projectDirs = fs.readdirSync(this.projectsDir);
-
-        for (const dirName of projectDirs) {
-            if (dirName.startsWith('.')) {
-                continue;
-            }
-
-            const projectDir = path.join(this.projectsDir, dirName);
-            if (!fs.statSync(projectDir).isDirectory()) {
-                continue;
-            }
+    private readSession(
+        filePath: string,
+        projectPath: string,
+    ): ClaudeSession | null {
+        const sessionId = path.basename(filePath, '.jsonl');
 
-            // Read sessions-index.json to get original project path
-            const indexPath = path.join(projectDir, 'sessions-index.json');
-            if (!fs.existsSync(indexPath)) {
-                continue;
-            }
+        let content: string;
+        try {
+            content = fs.readFileSync(filePath, 'utf-8');
+        } catch {
+            return null;
+        }
 
-            const sessionsIndex = readJson<SessionsIndex>(indexPath);
-            if (!sessionsIndex) {
-                console.error(`Failed to parse ${indexPath}`);
-                continue;
-            }
+        const allLines = content.trim().split('\n');
+        if (allLines.length === 0) {
+            return null;
+        }
 
-            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);
-
-                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,
-                    });
-                } catch (error) {
-                    console.error(`Failed to read session ${sessionId}:`, error);
-                    continue;
+        // 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: Date | null = null;
+        try {
+            const firstEntry = JSON.parse(allLines[0]);
+            const rawTs: string | undefined =
+                firstEntry.timestamp || firstEntry.snapshot?.timestamp;
+            if (rawTs) {
+                const ts = new Date(rawTs);
+                if (!Number.isNaN(ts.getTime())) {
+                    sessionStart = ts;
                 }
             }
+        } catch {
+            /* skip */
         }
 
-        return sessions;
-    }
-
-    /**
-     * Read a session JSONL file
-     * Only reads last 100 lines for performance with large files
-     */
-    private readSessionLog(logPath: string): {
-        slug?: string;
-        lastEntry?: SessionEntry;
-        lastActive?: Date;
-        lastCwd?: string;
-    } {
-        const lines = readLastLines(logPath, 100);
-
+        // Parse all lines for session state (file already in memory)
         let slug: string | undefined;
-        let lastEntry: SessionEntry | undefined;
+        let lastEntryType: string | undefined;
         let lastActive: Date | undefined;
         let lastCwd: string | undefined;
+        let isInterrupted = false;
+        let lastUserMessage: string | undefined;
 
-        for (const line of lines) {
+        for (const line of allLines) {
             try {
                 const entry: SessionEntry = JSON.parse(line);
 
-                if (entry.slug && !slug) {
-                    slug = entry.slug;
+                if (entry.timestamp) {
+                    const ts = new Date(entry.timestamp);
+                    if (!Number.isNaN(ts.getTime())) {
+                        lastActive = ts;
+                    }
                 }
 
-                lastEntry = entry;
-
-                if (entry.timestamp) {
-                    lastActive = new Date(entry.timestamp);
+                if (entry.slug && !slug) {
+                    slug = entry.slug;
                 }
 
                 if (typeof entry.cwd === 'string' && entry.cwd.trim().length > 0) {
                     lastCwd = entry.cwd;
                 }
-            } catch (error) {
+
+                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 {
                 continue;
             }
         }
 
-        return { slug, lastEntry, lastActive, lastCwd };
-    }
-
-    /**
-     * Read history.jsonl for user prompts
-     * Only reads last 100 lines for performance
-     */
-    private readHistory(): HistoryEntry[] {
-        return readJsonLines<HistoryEntry>(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
      */
     private determineStatus(session: ClaudeSession): AgentStatus {
-        if (!session.lastEntry) {
+        if (!session.lastEntryType) {
             return AgentStatus.UNKNOWN;
         }
 
-        const entryType = session.lastEntry.type;
-        const lastActive = session.lastActive || new Date(0);
-        const ageMinutes = (Date.now() - lastActive.getTime()) / 1000 / 60;
+        // 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 (ageMinutes > ClaudeCodeAdapter.IDLE_THRESHOLD_MINUTES) {
-            return AgentStatus.IDLE;
+        if (session.lastEntryType === 'user') {
+            return session.isInterrupted
+                ? AgentStatus.WAITING
+                : 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 AgentStatus.WAITING;
-            }
+        if (
+            session.lastEntryType === 'progress' ||
+            session.lastEntryType === 'thinking'
+        ) {
             return AgentStatus.RUNNING;
         }
 
-        if (entryType === SessionEntryType.PROGRESS || entryType === SessionEntryType.THINKING) {
-            return AgentStatus.RUNNING;
-        } else if (entryType === SessionEntryType.ASSISTANT) {
+        if (session.lastEntryType === 'assistant') {
             return AgentStatus.WAITING;
-        } else if (entryType === SessionEntryType.SYSTEM) {
+        }
+
+        if (session.lastEntryType === 'system') {
             return AgentStatus.IDLE;
         }
 
@@ -533,65 +438,83 @@ export class ClaudeCodeAdapter implements AgentAdapter {
     }
 
     /**
-     * Generate unique agent name
-     * Uses project basename, appends slug if multiple sessions for same project
+     * Extract meaningful text from a user message content.
+     * Handles string and array formats, skill command expansion, and noise filtering.
      */
-    private generateAgentName(session: ClaudeSession, existingAgents: AgentInfo[]): string {
-        const projectName = path.basename(session.projectPath) || 'claude';
+    private extractUserMessageText(
+        content: string | Array<{ type?: string; text?: string }> | undefined,
+    ): string | undefined {
+        if (!content) {
+            return undefined;
+        }
 
-        const sameProjectAgents = existingAgents.filter(
-            a => a.projectPath === session.projectPath
-        );
+        let raw: string | undefined;
 
-        if (sameProjectAgents.length === 0) {
-            return projectName;
+        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;
+                }
+            }
         }
 
-        // 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})`;
+        if (!raw) {
+            return undefined;
         }
 
-        // No slug available, use session ID prefix
-        return `${projectName} (${session.sessionId.slice(0, 8)})`;
-    }
-
-    private pathEquals(a?: string, b?: string): boolean {
-        if (!a || !b) {
-            return false;
+        // Skill slash-command: extract /command-name and args
+        if (raw.startsWith('<command-message>')) {
+            return this.parseCommandMessage(raw);
         }
 
-        return this.normalizePath(a) === this.normalizePath(b);
-    }
+        // 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;
+        }
 
-    private isChildPath(child?: string, parent?: string): boolean {
-        if (!child || !parent) {
-            return false;
+        // Filter noise
+        if (this.isNoiseMessage(raw)) {
+            return undefined;
         }
 
-        const normalizedChild = this.normalizePath(child);
-        const normalizedParent = this.normalizePath(parent);
-        return normalizedChild === normalizedParent || normalizedChild.startsWith(`${normalizedParent}${path.sep}`);
+        return raw;
     }
 
-    private normalizePath(value: string): string {
-        const resolved = path.resolve(value);
-        if (resolved.length > 1 && resolved.endsWith(path.sep)) {
-            return resolved.slice(0, -1);
+    /**
+     * Parse a <command-message> string into "/command args" format.
+     */
+    private parseCommandMessage(raw: string): string | undefined {
+        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;
         }
-        return resolved;
+        const args = argsMatch?.[1]?.trim();
+        return args ? `${name} ${args}` : name;
     }
 
-    private pathDepth(value?: string): number {
-        if (!value) {
-            return 0;
-        }
+    /**
+     * Check if a message is noise (not a meaningful user intent).
+     */
+    private isNoiseMessage(text: string): boolean {
+        return (
+            text.startsWith('[Request interrupted') ||
+            text === 'Tool loaded.' ||
+            text.startsWith('This session is being continued')
+        );
+    }
 
-        return this.normalizePath(value).split(path.sep).filter(Boolean).length;
+    /**
+     * Check if an entry type is metadata (not conversation state).
+     * These should not overwrite lastEntryType used for status determination.
+     */
+    private isMetadataEntryType(type: string): boolean {
+        return type === 'last-prompt' || type === 'file-history-snapshot';
     }
 
 }