@ai-devkit/agent-manager 0.9.0 → 0.11.0

package/src/adapters/CodexAdapter.ts

@@ -12,10 +12,17 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import type { AgentAdapter, AgentInfo, ProcessInfo, ConversationMessage } from './AgentAdapter';
+import type {
+    AgentAdapter,
+    AgentInfo,
+    ProcessInfo,
+    ConversationMessage,
+    SessionSummary,
+    ListSessionsOptions,
+} from './AgentAdapter';
 import { AgentStatus } from './AgentAdapter';
 import { listAgentProcesses, enrichProcesses } from '../utils/process';
-import { batchGetSessionFileBirthtimes } from '../utils/session';
+import { batchGetSessionFileBirthtimes, isDirectory, safeReadFile, safeReaddir, safeStat } from '../utils/session';
 import type { SessionFile } from '../utils/session';
 import { matchProcessesToSessions, generateAgentName } from '../utils/matching';
 
@@ -326,12 +333,8 @@ export class CodexAdapter implements AgentAdapter {
     getConversation(sessionFilePath: string, options?: { verbose?: boolean }): ConversationMessage[] {
         const verbose = options?.verbose ?? false;
 
-        let content: string;
-        try {
-            content = fs.readFileSync(sessionFilePath, 'utf-8');
-        } catch {
-            return [];
-        }
+        const content = safeReadFile(sessionFilePath);
+        if (content === undefined) return [];
 
         const lines = content.trim().split('\n');
         const messages: ConversationMessage[] = [];
@@ -372,4 +375,119 @@ export class CodexAdapter implements AgentAdapter {
 
         return messages;
     }
+
+    async listSessions(opts?: ListSessionsOptions): Promise<SessionSummary[]> {
+        if (!isDirectory(this.codexSessionsDir)) return [];
+
+        const files = this.collectAllSessionFiles();
+        const summaries: SessionSummary[] = [];
+
+        for (const filePath of files) {
+            const summary = this.fileToSessionSummary(filePath);
+            if (!summary) continue;
+            if (opts?.cwd !== undefined && summary.cwd !== opts.cwd) continue;
+            summaries.push(summary);
+        }
+
+        return summaries;
+    }
+
+    /**
+     * Walk every YYYY/MM/DD directory under `codexSessionsDir` and return
+     * absolute paths of `.jsonl` files. Tolerates malformed layouts
+     * (skips entries that aren't directories at the expected depth).
+     */
+    private collectAllSessionFiles(): string[] {
+        const out: string[] = [];
+
+        for (const yearEntry of safeReaddir(this.codexSessionsDir)) {
+            const yearDir = path.join(this.codexSessionsDir, yearEntry);
+            if (!isDirectory(yearDir)) continue;
+
+            for (const monthEntry of safeReaddir(yearDir)) {
+                const monthDir = path.join(yearDir, monthEntry);
+                if (!isDirectory(monthDir)) continue;
+
+                for (const dayEntry of safeReaddir(monthDir)) {
+                    const dayDir = path.join(monthDir, dayEntry);
+                    if (!isDirectory(dayDir)) continue;
+
+                    for (const fileEntry of safeReaddir(dayDir)) {
+                        if (!fileEntry.endsWith('.jsonl')) continue;
+                        out.push(path.join(dayDir, fileEntry));
+                    }
+                }
+            }
+        }
+
+        return out;
+    }
+
+    /**
+     * Read a Codex session JSONL file and produce a {@link SessionSummary}.
+     * Returns null when the file is unreadable, has no `session_meta`, or
+     * lacks a session id.
+     */
+    private fileToSessionSummary(filePath: string): SessionSummary | null {
+        const content = safeReadFile(filePath);
+        if (content === undefined) return null;
+
+        const allLines = content.trim().split('\n');
+        if (!allLines[0]) return null;
+
+        let metaEntry: CodexEventEntry;
+        try {
+            metaEntry = JSON.parse(allLines[0]);
+        } catch {
+            return null;
+        }
+
+        if (metaEntry.type !== 'session_meta' || !metaEntry.payload?.id) {
+            return null;
+        }
+
+        let firstUserMessage = '';
+        let lastTimestamp: Date | null = null;
+
+        for (let i = 1; i < allLines.length; i++) {
+            let entry: CodexEventEntry;
+            try {
+                entry = JSON.parse(allLines[i]);
+            } catch {
+                continue;
+            }
+
+            const ts = this.parseTimestamp(entry.timestamp);
+            if (ts) lastTimestamp = ts;
+
+            if (
+                !firstUserMessage &&
+                entry.payload?.type === 'user_message' &&
+                typeof entry.payload.message === 'string' &&
+                entry.payload.message.trim().length > 0
+            ) {
+                firstUserMessage = entry.payload.message.trim();
+            }
+        }
+
+        const stat = safeStat(filePath);
+
+        const startedAt =
+            this.parseTimestamp(metaEntry.payload.timestamp) ||
+            lastTimestamp ||
+            stat?.birthtime ||
+            stat?.mtime ||
+            new Date();
+        const lastActive = lastTimestamp || startedAt;
+
+        return {
+            type: 'codex',
+            sessionId: metaEntry.payload.id,
+            cwd: metaEntry.payload.cwd || '',
+            firstUserMessage,
+            lastActive,
+            startedAt,
+            sessionFilePath: filePath,
+        };
+    }
 }

package/src/adapters/GeminiCliAdapter.ts

@@ -13,9 +13,17 @@
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
-import type { AgentAdapter, AgentInfo, ProcessInfo, ConversationMessage } from './AgentAdapter';
+import type {
+    AgentAdapter,
+    AgentInfo,
+    ProcessInfo,
+    ConversationMessage,
+    SessionSummary,
+    ListSessionsOptions,
+} from './AgentAdapter';
 import { AgentStatus } from './AgentAdapter';
 import { listAgentProcesses, enrichProcesses } from '../utils/process';
+import { isDirectory, safeReadFile, safeReaddir, safeStat } from '../utils/session';
 import type { SessionFile } from '../utils/session';
 import { matchProcessesToSessions, generateAgentName } from '../utils/matching';
 
@@ -441,12 +449,8 @@ export class GeminiCliAdapter implements AgentAdapter {
     getConversation(sessionFilePath: string, options?: { verbose?: boolean }): ConversationMessage[] {
         const verbose = options?.verbose ?? false;
 
-        let content: string;
-        try {
-            content = fs.readFileSync(sessionFilePath, 'utf-8');
-        } catch {
-            return [];
-        }
+        const content = safeReadFile(sessionFilePath);
+        if (content === undefined) return [];
 
         let parsed: GeminiSessionFile;
         try {
@@ -485,4 +489,95 @@ export class GeminiCliAdapter implements AgentAdapter {
 
         return messages;
     }
+
+    async listSessions(opts?: ListSessionsOptions): Promise<SessionSummary[]> {
+        if (!isDirectory(this.geminiTmpDir)) return [];
+
+        const summaries: SessionSummary[] = [];
+
+        for (const shortId of safeReaddir(this.geminiTmpDir)) {
+            const chatsDir = path.join(
+                this.geminiTmpDir,
+                shortId,
+                GeminiCliAdapter.CHATS_DIR_NAME,
+            );
+            if (!isDirectory(chatsDir)) continue;
+
+            for (const fileName of safeReaddir(chatsDir)) {
+                if (
+                    !fileName.startsWith(GeminiCliAdapter.SESSION_FILE_PREFIX) ||
+                    !fileName.endsWith('.json')
+                ) {
+                    continue;
+                }
+
+                const filePath = path.join(chatsDir, fileName);
+                const summary = this.fileToSessionSummary(filePath);
+                if (!summary) continue;
+                if (opts?.cwd !== undefined && summary.cwd !== opts.cwd) continue;
+                summaries.push(summary);
+            }
+        }
+
+        return summaries;
+    }
+
+    /**
+     * Read a Gemini session JSON file and produce a {@link SessionSummary}.
+     * Returns null when the file is unreadable, the JSON doesn't parse,
+     * or the body lacks a sessionId.
+     */
+    private fileToSessionSummary(filePath: string): SessionSummary | null {
+        const content = safeReadFile(filePath);
+        if (content === undefined) return null;
+
+        let parsed: GeminiSessionFile;
+        try {
+            parsed = JSON.parse(content);
+        } catch {
+            return null;
+        }
+
+        if (!parsed.sessionId) return null;
+
+        const messages = Array.isArray(parsed.messages) ? parsed.messages : [];
+        const firstUserMessage = this.extractFirstUserMessage(messages);
+
+        const cwd =
+            Array.isArray(parsed.directories) && parsed.directories.length > 0
+                ? parsed.directories[0]
+                : '';
+
+        const stat = safeStat(filePath);
+
+        const lastEntryTimestamp = this.parseTimestamp(
+            messages.length > 0 ? messages[messages.length - 1]?.timestamp : undefined,
+        );
+        const lastActive =
+            this.parseTimestamp(parsed.lastUpdated) ||
+            lastEntryTimestamp ||
+            stat?.mtime ||
+            new Date();
+        const startedAt =
+            this.parseTimestamp(parsed.startTime) || stat?.birthtime || stat?.mtime || lastActive;
+
+        return {
+            type: 'gemini_cli',
+            sessionId: parsed.sessionId,
+            cwd,
+            firstUserMessage,
+            lastActive,
+            startedAt,
+            sessionFilePath: filePath,
+        };
+    }
+
+    private extractFirstUserMessage(messages: GeminiMessageEntry[]): string {
+        for (const entry of messages) {
+            if (entry?.type !== 'user') continue;
+            const text = this.messageText(entry).trim();
+            if (text) return text;
+        }
+        return '';
+    }
 }

package/src/index.ts

@@ -4,7 +4,15 @@ export { ClaudeCodeAdapter } from './adapters/ClaudeCodeAdapter';
 export { CodexAdapter } from './adapters/CodexAdapter';
 export { GeminiCliAdapter } from './adapters/GeminiCliAdapter';
 export { AgentStatus } from './adapters/AgentAdapter';
-export type { AgentAdapter, AgentType, AgentInfo, ProcessInfo, ConversationMessage } from './adapters/AgentAdapter';
+export type {
+    AgentAdapter,
+    AgentType,
+    AgentInfo,
+    ProcessInfo,
+    ConversationMessage,
+    SessionSummary,
+    ListSessionsOptions,
+} from './adapters/AgentAdapter';
 
 export { TerminalFocusManager, TerminalType } from './terminal/TerminalFocusManager';
 export type { TerminalLocation } from './terminal/TerminalFocusManager';

package/src/terminal/TerminalFocusManager.ts

@@ -1,8 +1,8 @@
-import { exec, execFile } from 'child_process';
+import { execFile } from 'child_process';
 import { promisify } from 'util';
 import { getProcessTty } from '../utils/process';
+import { escapeAppleScript } from '../utils/applescript';
 
-const execAsync = promisify(exec);
 const execFileAsync = promisify(execFile);
 
 export enum TerminalType {
@@ -67,17 +67,16 @@ export class TerminalFocusManager {
                 default:
                     return false;
             }
-        } catch (error) {
+        } catch {
             return false;
         }
     }
 
     private async findTmuxPane(tty: string): Promise<TerminalLocation | null> {
         try {
-            // List all panes with their TTYs and identifiers
-            // Format: /dev/ttys001|my-session:1.1
-            // using | as separator to handle spaces in session names
-            const { stdout } = await execAsync("tmux list-panes -a -F '#{pane_tty}|#{session_name}:#{window_index}.#{pane_index}'");
+            const { stdout } = await execFileAsync('tmux', [
+                'list-panes', '-a', '-F', '#{pane_tty}|#{session_name}:#{window_index}.#{pane_index}'
+            ]);
 
             const lines = stdout.trim().split('\n');
             for (const line of lines) {
@@ -91,7 +90,7 @@ export class TerminalFocusManager {
                     };
                 }
             }
-        } catch (error) {
+        } catch {
             // tmux might not be installed or running
         }
         return null;
@@ -100,15 +99,19 @@ export class TerminalFocusManager {
     private async findITerm2Session(tty: string): Promise<TerminalLocation | null> {
         try {
             // Check if iTerm2 is running first to avoid launching it
-            const { stdout: isRunning } = await execAsync('pgrep -x iTerm2 || echo "no"');
-            if (isRunning.trim() === "no") return null;
+            await execFileAsync('pgrep', ['-x', 'iTerm2']);
+        } catch {
+            return null;
+        }
 
+        try {
+            const escapedTty = escapeAppleScript(tty);
             const script = `
         tell application "iTerm"
           repeat with w in windows
             repeat with t in tabs of w
               repeat with s in sessions of t
-                if tty of s is "${tty}" then
+                if tty of s is "${escapedTty}" then
                   return "found"
                 end if
               end repeat
@@ -117,7 +120,7 @@ export class TerminalFocusManager {
         end tell
       `;
 
-            const { stdout } = await execAsync(`osascript -e '${script}'`);
+            const { stdout } = await execFileAsync('osascript', ['-e', script]);
             if (stdout.trim() === "found") {
                 return {
                     type: TerminalType.ITERM2,
@@ -125,23 +128,27 @@ export class TerminalFocusManager {
                     tty
                 };
             }
-        } catch (error) {
-            // iTerm2 not found or script failed
+        } catch {
+            // iTerm2 script failed
         }
         return null;
     }
 
     private async findTerminalAppWindow(tty: string): Promise<TerminalLocation | null> {
         try {
-            // Check if Terminal is running
-            const { stdout: isRunning } = await execAsync('ps -eo pid=,comm= | grep "Terminal.app" || echo "no"');
-            if (isRunning.trim() === "no") return null;
+            // Check if Terminal.app is running
+            await execFileAsync('pgrep', ['-x', 'Terminal']);
+        } catch {
+            return null;
+        }
 
+        try {
+            const escapedTty = escapeAppleScript(tty);
             const script = `
         tell application "Terminal"
           repeat with w in windows
             repeat with t in tabs of w
-              if tty of t is "${tty}" then
+              if tty of t is "${escapedTty}" then
                 return "found"
               end if
             end repeat
@@ -149,7 +156,7 @@ export class TerminalFocusManager {
         end tell
       `;
 
-            const { stdout } = await execAsync(`osascript -e '${script}'`);
+            const { stdout } = await execFileAsync('osascript', ['-e', script]);
             if (stdout.trim() === "found") {
                 return {
                     type: TerminalType.TERMINAL_APP,
@@ -157,8 +164,8 @@ export class TerminalFocusManager {
                     tty
                 };
             }
-        } catch (error) {
-            // Terminal not found or script failed
+        } catch {
+            // Terminal.app script failed
         }
         return null;
     }
@@ -167,19 +174,20 @@ export class TerminalFocusManager {
         try {
             await execFileAsync('tmux', ['switch-client', '-t', identifier]);
             return true;
-        } catch (error) {
+        } catch {
             return false;
         }
     }
 
     private async focusITerm2Session(tty: string): Promise<boolean> {
+        const escapedTty = escapeAppleScript(tty);
         const script = `
        tell application "iTerm"
          activate
          repeat with w in windows
            repeat with t in tabs of w
              repeat with s in sessions of t
-               if tty of s is "${tty}" then
+               if tty of s is "${escapedTty}" then
                  select s
                  return "true"
                end if
@@ -188,17 +196,18 @@ export class TerminalFocusManager {
          end repeat
        end tell
      `;
-        const { stdout } = await execAsync(`osascript -e '${script}'`);
+        const { stdout } = await execFileAsync('osascript', ['-e', script]);
         return stdout.trim() === "true";
     }
 
     private async focusTerminalAppWindow(tty: string): Promise<boolean> {
+        const escapedTty = escapeAppleScript(tty);
         const script = `
        tell application "Terminal"
          activate
          repeat with w in windows
            repeat with t in tabs of w
-             if tty of t is "${tty}" then
+             if tty of t is "${escapedTty}" then
                set index of w to 1
                set selected tab of w to t
                return "true"
@@ -207,7 +216,7 @@ export class TerminalFocusManager {
          end repeat
        end tell
     `;
-        const { stdout } = await execAsync(`osascript -e '${script}'`);
+        const { stdout } = await execFileAsync('osascript', ['-e', script]);
         return stdout.trim() === "true";
     }
 }

package/src/terminal/TtyWriter.ts

@@ -2,20 +2,10 @@ import { execFile } from 'child_process';
 import { promisify } from 'util';
 import type { TerminalLocation } from './TerminalFocusManager';
 import { TerminalType } from './TerminalFocusManager';
+import { escapeAppleScript } from '../utils/applescript';
 
 const execFileAsync = promisify(execFile);
 
-/**
- * Escape a string for safe use inside an AppleScript double-quoted string.
- * Backslashes, double quotes, and newlines must be escaped.
- */
-function escapeAppleScript(text: string): string {
-    return text
-        .replace(/\\/g, '\\\\')
-        .replace(/"/g, '\\"')
-        .replace(/\r\n|\r|\n/g, '\\n');
-}
-
 export class TtyWriter {
     /**
      * Send a message as keyboard input to a terminal session.