@ai-devkit/agent-manager 0.17.0 → 0.19.0

package/dist/terminal/TerminalFocusManager.js

@@ -81,11 +81,8 @@ export class TerminalFocusManager {
     }
     async findITerm2Session(tty) {
         try {
-            // Check if iTerm2 is running first to avoid launching it
-            await execFileAsync('pgrep', [
-                '-x',
-                'iTerm2'
-            ]);
+            // Check if iTerm2 is running first to avoid launching it.
+            if (!await this.isProcessRunning('iTerm2')) return null;
         } catch  {
             return null;
         }
@@ -123,10 +120,7 @@ export class TerminalFocusManager {
     async findTerminalAppWindow(tty) {
         try {
             // Check if Terminal.app is running
-            await execFileAsync('pgrep', [
-                '-x',
-                'Terminal'
-            ]);
+            if (!await this.isProcessRunning('Terminal')) return null;
         } catch  {
             return null;
         }
@@ -159,6 +153,13 @@ export class TerminalFocusManager {
         }
         return null;
     }
+    async isProcessRunning(name) {
+        const { stdout } = await execFileAsync('ps', [
+            '-Axo',
+            'comm'
+        ]);
+        return stdout.split('\n').map((line)=>line.trim()).some((command)=>command === name || command.endsWith(`/${name}`));
+    }
     async focusTmuxPane(identifier) {
         try {
             await execFileAsync('tmux', [

package/dist/terminal/TerminalFocusManager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/terminal/TerminalFocusManager.ts"],"sourcesContent":["import { execFile } from 'child_process';\nimport { promisify } from 'util';\nimport { getProcessTty } from '../utils/process.js';\nimport { escapeAppleScript } from '../utils/applescript.js';\n\nconst execFileAsync = promisify(execFile);\n\nexport enum TerminalType {\n    TMUX = 'tmux',\n    ITERM2 = 'iterm2',\n    TERMINAL_APP = 'terminal-app',\n    UNKNOWN = 'unknown',\n}\n\nexport interface TerminalLocation {\n    type: TerminalType;\n    identifier: string; // e.g., \"session:window.pane\" for tmux, or TTY for others\n    tty: string;        // e.g., \"/dev/ttys030\"\n}\n\nexport class TerminalFocusManager {\n    /**\n     * Find the terminal location (emulator info) for a given process ID\n     */\n    async findTerminal(pid: number): Promise<TerminalLocation | null> {\n        const ttyShort = getProcessTty(pid);\n\n        // If no TTY or invalid, we can't find the terminal\n        if (!ttyShort || ttyShort === '?') {\n            return null;\n        }\n\n        const fullTty = `/dev/${ttyShort}`;\n\n        // 1. Check tmux (most specific if running inside it)\n        const tmuxLocation = await this.findTmuxPane(fullTty);\n        if (tmuxLocation) return tmuxLocation;\n\n        // 2. Check iTerm2\n        const itermLocation = await this.findITerm2Session(fullTty);\n        if (itermLocation) return itermLocation;\n\n        // 3. Check Terminal.app\n        const terminalAppLocation = await this.findTerminalAppWindow(fullTty);\n        if (terminalAppLocation) return terminalAppLocation;\n\n        // 4. Fallback: we know the TTY but not the emulator wrapper\n        return {\n            type: TerminalType.UNKNOWN,\n            identifier: '',\n            tty: fullTty\n        };\n    }\n\n    /**\n     * Focus the terminal identified by the location\n     */\n    async focusTerminal(location: TerminalLocation): Promise<boolean> {\n        try {\n            switch (location.type) {\n                case TerminalType.TMUX:\n                    return await this.focusTmuxPane(location.identifier);\n                case TerminalType.ITERM2:\n                    return await this.focusITerm2Session(location.tty);\n                case TerminalType.TERMINAL_APP:\n                    return await this.focusTerminalAppWindow(location.tty);\n                default:\n                    return false;\n            }\n        } catch {\n            return false;\n        }\n    }\n\n    private async findTmuxPane(tty: string): Promise<TerminalLocation | null> {\n        try {\n            const { stdout } = await execFileAsync('tmux', [\n                'list-panes', '-a', '-F', '#{pane_tty}|#{session_name}:#{window_index}.#{pane_index}'\n            ]);\n\n            const lines = stdout.trim().split('\\n');\n            for (const line of lines) {\n                if (!line.trim()) continue;\n                const [paneTty, identifier] = line.split('|');\n                if (paneTty === tty && identifier) {\n                    return {\n                        type: TerminalType.TMUX,\n                        identifier,\n                        tty\n                    };\n                }\n            }\n        } catch {\n            // tmux might not be installed or running\n        }\n        return null;\n    }\n\n    private async findITerm2Session(tty: string): Promise<TerminalLocation | null> {\n        try {\n            // Check if iTerm2 is running first to avoid launching it\n            await execFileAsync('pgrep', ['-x', 'iTerm2']);\n        } catch {\n            return null;\n        }\n\n        try {\n            const escapedTty = escapeAppleScript(tty);\n            const script = `\n        tell application \"iTerm\"\n          repeat with w in windows\n            repeat with t in tabs of w\n              repeat with s in sessions of t\n                if tty of s is \"${escapedTty}\" then\n                  return \"found\"\n                end if\n              end repeat\n            end repeat\n          end repeat\n        end tell\n      `;\n\n            const { stdout } = await execFileAsync('osascript', ['-e', script]);\n            if (stdout.trim() === \"found\") {\n                return {\n                    type: TerminalType.ITERM2,\n                    identifier: tty,\n                    tty\n                };\n            }\n        } catch {\n            // iTerm2 script failed\n        }\n        return null;\n    }\n\n    private async findTerminalAppWindow(tty: string): Promise<TerminalLocation | null> {\n        try {\n            // Check if Terminal.app is running\n            await execFileAsync('pgrep', ['-x', 'Terminal']);\n        } catch {\n            return null;\n        }\n\n        try {\n            const escapedTty = escapeAppleScript(tty);\n            const script = `\n        tell application \"Terminal\"\n          repeat with w in windows\n            repeat with t in tabs of w\n              if tty of t is \"${escapedTty}\" then\n                return \"found\"\n              end if\n            end repeat\n          end repeat\n        end tell\n      `;\n\n            const { stdout } = await execFileAsync('osascript', ['-e', script]);\n            if (stdout.trim() === \"found\") {\n                return {\n                    type: TerminalType.TERMINAL_APP,\n                    identifier: tty,\n                    tty\n                };\n            }\n        } catch {\n            // Terminal.app script failed\n        }\n        return null;\n    }\n\n    private async focusTmuxPane(identifier: string): Promise<boolean> {\n        try {\n            await execFileAsync('tmux', ['switch-client', '-t', identifier]);\n            return true;\n        } catch {\n            return false;\n        }\n    }\n\n    private async focusITerm2Session(tty: string): Promise<boolean> {\n        const escapedTty = escapeAppleScript(tty);\n        const script = `\n       tell application \"iTerm\"\n         activate\n         repeat with w in windows\n           repeat with t in tabs of w\n             repeat with s in sessions of t\n               if tty of s is \"${escapedTty}\" then\n                 select s\n                 return \"true\"\n               end if\n             end repeat\n           end repeat\n         end repeat\n       end tell\n     `;\n        const { stdout } = await execFileAsync('osascript', ['-e', script]);\n        return stdout.trim() === \"true\";\n    }\n\n    private async focusTerminalAppWindow(tty: string): Promise<boolean> {\n        const escapedTty = escapeAppleScript(tty);\n        const script = `\n       tell application \"Terminal\"\n         activate\n         repeat with w in windows\n           repeat with t in tabs of w\n             if tty of t is \"${escapedTty}\" then\n               set index of w to 1\n               set selected tab of w to t\n               return \"true\"\n             end if\n           end repeat\n         end repeat\n       end tell\n    `;\n        const { stdout } = await execFileAsync('osascript', ['-e', script]);\n        return stdout.trim() === \"true\";\n    }\n}\n"],"names":["execFile","promisify","getProcessTty","escapeAppleScript","execFileAsync","TerminalType","TerminalFocusManager","findTerminal","pid","ttyShort","fullTty","tmuxLocation","findTmuxPane","itermLocation","findITerm2Session","terminalAppLocation","findTerminalAppWindow","type","identifier","tty","focusTerminal","location","focusTmuxPane","focusITerm2Session","focusTerminalAppWindow","stdout","lines","trim","split","line","paneTty","escapedTty","script"],"mappings":"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"}
+{"version":3,"sources":["../../src/terminal/TerminalFocusManager.ts"],"sourcesContent":["import { execFile } from 'child_process';\nimport { promisify } from 'util';\nimport { getProcessTty } from '../utils/process.js';\nimport { escapeAppleScript } from '../utils/applescript.js';\n\nconst execFileAsync = promisify(execFile);\n\nexport enum TerminalType {\n    TMUX = 'tmux',\n    ITERM2 = 'iterm2',\n    TERMINAL_APP = 'terminal-app',\n    UNKNOWN = 'unknown',\n}\n\nexport interface TerminalLocation {\n    type: TerminalType;\n    identifier: string; // e.g., \"session:window.pane\" for tmux, or TTY for others\n    tty: string;        // e.g., \"/dev/ttys030\"\n}\n\nexport class TerminalFocusManager {\n    /**\n     * Find the terminal location (emulator info) for a given process ID\n     */\n    async findTerminal(pid: number): Promise<TerminalLocation | null> {\n        const ttyShort = getProcessTty(pid);\n\n        // If no TTY or invalid, we can't find the terminal\n        if (!ttyShort || ttyShort === '?') {\n            return null;\n        }\n\n        const fullTty = `/dev/${ttyShort}`;\n\n        // 1. Check tmux (most specific if running inside it)\n        const tmuxLocation = await this.findTmuxPane(fullTty);\n        if (tmuxLocation) return tmuxLocation;\n\n        // 2. Check iTerm2\n        const itermLocation = await this.findITerm2Session(fullTty);\n        if (itermLocation) return itermLocation;\n\n        // 3. Check Terminal.app\n        const terminalAppLocation = await this.findTerminalAppWindow(fullTty);\n        if (terminalAppLocation) return terminalAppLocation;\n\n        // 4. Fallback: we know the TTY but not the emulator wrapper\n        return {\n            type: TerminalType.UNKNOWN,\n            identifier: '',\n            tty: fullTty\n        };\n    }\n\n    /**\n     * Focus the terminal identified by the location\n     */\n    async focusTerminal(location: TerminalLocation): Promise<boolean> {\n        try {\n            switch (location.type) {\n                case TerminalType.TMUX:\n                    return await this.focusTmuxPane(location.identifier);\n                case TerminalType.ITERM2:\n                    return await this.focusITerm2Session(location.tty);\n                case TerminalType.TERMINAL_APP:\n                    return await this.focusTerminalAppWindow(location.tty);\n                default:\n                    return false;\n            }\n        } catch {\n            return false;\n        }\n    }\n\n    private async findTmuxPane(tty: string): Promise<TerminalLocation | null> {\n        try {\n            const { stdout } = await execFileAsync('tmux', [\n                'list-panes', '-a', '-F', '#{pane_tty}|#{session_name}:#{window_index}.#{pane_index}'\n            ]);\n\n            const lines = stdout.trim().split('\\n');\n            for (const line of lines) {\n                if (!line.trim()) continue;\n                const [paneTty, identifier] = line.split('|');\n                if (paneTty === tty && identifier) {\n                    return {\n                        type: TerminalType.TMUX,\n                        identifier,\n                        tty\n                    };\n                }\n            }\n        } catch {\n            // tmux might not be installed or running\n        }\n        return null;\n    }\n\n    private async findITerm2Session(tty: string): Promise<TerminalLocation | null> {\n        try {\n            // Check if iTerm2 is running first to avoid launching it.\n            if (!await this.isProcessRunning('iTerm2')) return null;\n        } catch {\n            return null;\n        }\n\n        try {\n            const escapedTty = escapeAppleScript(tty);\n            const script = `\n        tell application \"iTerm\"\n          repeat with w in windows\n            repeat with t in tabs of w\n              repeat with s in sessions of t\n                if tty of s is \"${escapedTty}\" then\n                  return \"found\"\n                end if\n              end repeat\n            end repeat\n          end repeat\n        end tell\n      `;\n\n            const { stdout } = await execFileAsync('osascript', ['-e', script]);\n            if (stdout.trim() === \"found\") {\n                return {\n                    type: TerminalType.ITERM2,\n                    identifier: tty,\n                    tty\n                };\n            }\n        } catch {\n            // iTerm2 script failed\n        }\n        return null;\n    }\n\n    private async findTerminalAppWindow(tty: string): Promise<TerminalLocation | null> {\n        try {\n            // Check if Terminal.app is running\n            if (!await this.isProcessRunning('Terminal')) return null;\n        } catch {\n            return null;\n        }\n\n        try {\n            const escapedTty = escapeAppleScript(tty);\n            const script = `\n        tell application \"Terminal\"\n          repeat with w in windows\n            repeat with t in tabs of w\n              if tty of t is \"${escapedTty}\" then\n                return \"found\"\n              end if\n            end repeat\n          end repeat\n        end tell\n      `;\n\n            const { stdout } = await execFileAsync('osascript', ['-e', script]);\n            if (stdout.trim() === \"found\") {\n                return {\n                    type: TerminalType.TERMINAL_APP,\n                    identifier: tty,\n                    tty\n                };\n            }\n        } catch {\n            // Terminal.app script failed\n        }\n        return null;\n    }\n\n    private async isProcessRunning(name: string): Promise<boolean> {\n        const { stdout } = await execFileAsync('ps', ['-Axo', 'comm']);\n        return stdout\n            .split('\\n')\n            .map((line) => line.trim())\n            .some((command) => command === name || command.endsWith(`/${name}`));\n    }\n\n    private async focusTmuxPane(identifier: string): Promise<boolean> {\n        try {\n            await execFileAsync('tmux', ['switch-client', '-t', identifier]);\n            return true;\n        } catch {\n            return false;\n        }\n    }\n\n    private async focusITerm2Session(tty: string): Promise<boolean> {\n        const escapedTty = escapeAppleScript(tty);\n        const script = `\n       tell application \"iTerm\"\n         activate\n         repeat with w in windows\n           repeat with t in tabs of w\n             repeat with s in sessions of t\n               if tty of s is \"${escapedTty}\" then\n                 select s\n                 return \"true\"\n               end if\n             end repeat\n           end repeat\n         end repeat\n       end tell\n     `;\n        const { stdout } = await execFileAsync('osascript', ['-e', script]);\n        return stdout.trim() === \"true\";\n    }\n\n    private async focusTerminalAppWindow(tty: string): Promise<boolean> {\n        const escapedTty = escapeAppleScript(tty);\n        const script = `\n       tell application \"Terminal\"\n         activate\n         repeat with w in windows\n           repeat with t in tabs of w\n             if tty of t is \"${escapedTty}\" then\n               set index of w to 1\n               set selected tab of w to t\n               return \"true\"\n             end if\n           end repeat\n         end repeat\n       end tell\n    `;\n        const { stdout } = await execFileAsync('osascript', ['-e', script]);\n        return stdout.trim() === \"true\";\n    }\n}\n"],"names":["execFile","promisify","getProcessTty","escapeAppleScript","execFileAsync","TerminalType","TerminalFocusManager","findTerminal","pid","ttyShort","fullTty","tmuxLocation","findTmuxPane","itermLocation","findITerm2Session","terminalAppLocation","findTerminalAppWindow","type","identifier","tty","focusTerminal","location","focusTmuxPane","focusITerm2Session","focusTerminalAppWindow","stdout","lines","trim","split","line","paneTty","isProcessRunning","escapedTty","script","name","map","some","command","endsWith"],"mappings":"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"}

package/dist/utils/agents.d.ts

@@ -1,5 +1,5 @@
 import type { AgentType } from '../adapters/AgentAdapter.js';
-export type StartableAgentType = Extract<AgentType, 'claude' | 'codex' | 'gemini_cli' | 'opencode'>;
+export type StartableAgentType = Extract<AgentType, 'claude' | 'codex' | 'copilot' | 'gemini_cli' | 'opencode' | 'pi'>;
 export interface AgentConfig {
     /** Shell command to launch the agent (sent to tmux via `send-keys`). */
     command: string;

package/dist/utils/agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/utils/agents.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,GAAG,YAAY,GAAG,UAAU,CAAC,CAAC;AAEpG,MAAM,WAAW,WAAW;IACxB,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAC3C;AAED;;;;GAIG;AACH,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,WAAW,CAK1D,CAAC"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/utils/agents.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC;AAEvH,MAAM,WAAW,WAAW;IACxB,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAC3C;AAED;;;;GAIG;AACH,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,WAAW,CAO1D,CAAC"}

package/dist/utils/agents.js

@@ -12,13 +12,23 @@ import path from 'path';
         command: 'codex',
         matches: matchArgv0('codex')
     },
-    opencode: {
-        command: 'opencode',
-        matches: matchArgv0('opencode')
+    copilot: {
+        command: 'copilot',
+        matches: matchArgv0Name('copilot-cli')
     },
     gemini_cli: {
         command: 'gemini',
         matches: matchAnyToken('gemini')
+    },
+    opencode: {
+        command: 'opencode',
+        matches: matchArgv0('opencode')
+    },
+    pi: {
+        command: 'pi',
+        matches: matchAnyBasename([
+            'pi'
+        ])
     }
 };
 function matchArgv0(name) {
@@ -28,6 +38,13 @@ function matchArgv0(name) {
         return token ? path.basename(token).toLowerCase() === lower : false;
     };
 }
+function matchArgv0Name(name) {
+    const lower = name.toLowerCase();
+    return (psCommand)=>{
+        const token = psCommand.trim().split(/\s+/)[0];
+        return token ? token.toLowerCase().includes(lower) : false;
+    };
+}
 function matchAnyToken(name) {
     const lower = name.toLowerCase();
     return (psCommand)=>{
@@ -37,5 +54,14 @@ function matchAnyToken(name) {
         return false;
     };
 }
+function matchAnyBasename(names) {
+    const lowers = new Set(names.map((name)=>name.toLowerCase()));
+    return (psCommand)=>{
+        for (const token of psCommand.trim().split(/\s+/)){
+            if (lowers.has(path.basename(token).toLowerCase())) return true;
+        }
+        return false;
+    };
+}
 
 //# sourceMappingURL=agents.js.map

package/dist/utils/agents.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/agents.ts"],"sourcesContent":["import path from 'path';\nimport type { AgentType } from '../adapters/AgentAdapter.js';\n\nexport type StartableAgentType = Extract<AgentType, 'claude' | 'codex' | 'gemini_cli' | 'opencode'>;\n\nexport interface AgentConfig {\n    /** Shell command to launch the agent (sent to tmux via `send-keys`). */\n    command: string;\n    /** Returns true if the given `ps` command line belongs to this agent. */\n    matches: (psCommand: string) => boolean;\n}\n\n/**\n * Per-agent configuration: launch command plus a matcher that recognizes the\n * agent's process in `ps` output. Each matcher knows that agent's distribution\n * quirks (e.g. gemini ships as a Node script so its real binary is in argv[1..]).\n */\nexport const AGENTS: Record<StartableAgentType, AgentConfig> = {\n    claude:     { command: 'claude',   matches: matchArgv0('claude') },\n    codex:      { command: 'codex',    matches: matchArgv0('codex') },\n    opencode:   { command: 'opencode', matches: matchArgv0('opencode') },\n    gemini_cli: { command: 'gemini',   matches: matchAnyToken('gemini') },\n};\n\nfunction matchArgv0(name: string): (psCommand: string) => boolean {\n    const lower = name.toLowerCase();\n    return (psCommand) => {\n        const token = psCommand.trim().split(/\\s+/)[0];\n        return token ? path.basename(token).toLowerCase() === lower : false;\n    };\n}\n\nfunction matchAnyToken(name: string): (psCommand: string) => boolean {\n    const lower = name.toLowerCase();\n    return (psCommand) => {\n        for (const token of psCommand.trim().split(/\\s+/)) {\n            if (path.basename(token).toLowerCase() === lower) return true;\n        }\n        return false;\n    };\n}\n"],"names":["path","AGENTS","claude","command","matches","matchArgv0","codex","opencode","gemini_cli","matchAnyToken","name","lower","toLowerCase","psCommand","token","trim","split","basename"],"mappings":"AAAA,OAAOA,UAAU,OAAO;AAYxB;;;;CAIC,GACD,OAAO,MAAMC,SAAkD;IAC3DC,QAAY;QAAEC,SAAS;QAAYC,SAASC,WAAW;IAAU;IACjEC,OAAY;QAAEH,SAAS;QAAYC,SAASC,WAAW;IAAS;IAChEE,UAAY;QAAEJ,SAAS;QAAYC,SAASC,WAAW;IAAY;IACnEG,YAAY;QAAEL,SAAS;QAAYC,SAASK,cAAc;IAAU;AACxE,EAAE;AAEF,SAASJ,WAAWK,IAAY;IAC5B,MAAMC,QAAQD,KAAKE,WAAW;IAC9B,OAAO,CAACC;QACJ,MAAMC,QAAQD,UAAUE,IAAI,GAAGC,KAAK,CAAC,MAAM,CAAC,EAAE;QAC9C,OAAOF,QAAQd,KAAKiB,QAAQ,CAACH,OAAOF,WAAW,OAAOD,QAAQ;IAClE;AACJ;AAEA,SAASF,cAAcC,IAAY;IAC/B,MAAMC,QAAQD,KAAKE,WAAW;IAC9B,OAAO,CAACC;QACJ,KAAK,MAAMC,SAASD,UAAUE,IAAI,GAAGC,KAAK,CAAC,OAAQ;YAC/C,IAAIhB,KAAKiB,QAAQ,CAACH,OAAOF,WAAW,OAAOD,OAAO,OAAO;QAC7D;QACA,OAAO;IACX;AACJ"}
+{"version":3,"sources":["../../src/utils/agents.ts"],"sourcesContent":["import path from 'path';\nimport type { AgentType } from '../adapters/AgentAdapter.js';\n\nexport type StartableAgentType = Extract<AgentType, 'claude' | 'codex' | 'copilot' | 'gemini_cli' | 'opencode' | 'pi'>;\n\nexport interface AgentConfig {\n    /** Shell command to launch the agent (sent to tmux via `send-keys`). */\n    command: string;\n    /** Returns true if the given `ps` command line belongs to this agent. */\n    matches: (psCommand: string) => boolean;\n}\n\n/**\n * Per-agent configuration: launch command plus a matcher that recognizes the\n * agent's process in `ps` output. Each matcher knows that agent's distribution\n * quirks (e.g. gemini ships as a Node script so its real binary is in argv[1..]).\n */\nexport const AGENTS: Record<StartableAgentType, AgentConfig> = {\n    claude:     { command: 'claude',   matches: matchArgv0('claude') },\n    codex:      { command: 'codex',    matches: matchArgv0('codex') },\n    copilot:    { command: 'copilot',  matches: matchArgv0Name('copilot-cli') },\n    gemini_cli: { command: 'gemini',   matches: matchAnyToken('gemini') },\n    opencode:   { command: 'opencode', matches: matchArgv0('opencode') },\n    pi:         { command: 'pi',       matches: matchAnyBasename(['pi']) },\n};\n\nfunction matchArgv0(name: string): (psCommand: string) => boolean {\n    const lower = name.toLowerCase();\n    return (psCommand) => {\n        const token = psCommand.trim().split(/\\s+/)[0];\n        return token ? path.basename(token).toLowerCase() === lower : false;\n    };\n}\n\nfunction matchArgv0Name(name: string): (psCommand: string) => boolean {\n    const lower = name.toLowerCase();\n    return (psCommand) => {\n        const token = psCommand.trim().split(/\\s+/)[0];\n        return token ? token.toLowerCase().includes(lower) : false;\n    };\n}\n\nfunction matchAnyToken(name: string): (psCommand: string) => boolean {\n    const lower = name.toLowerCase();\n    return (psCommand) => {\n        for (const token of psCommand.trim().split(/\\s+/)) {\n            if (path.basename(token).toLowerCase() === lower) return true;\n        }\n        return false;\n    };\n}\n\nfunction matchAnyBasename(names: string[]): (psCommand: string) => boolean {\n    const lowers = new Set(names.map((name) => name.toLowerCase()));\n    return (psCommand) => {\n        for (const token of psCommand.trim().split(/\\s+/)) {\n            if (lowers.has(path.basename(token).toLowerCase())) return true;\n        }\n        return false;\n    };\n}\n"],"names":["path","AGENTS","claude","command","matches","matchArgv0","codex","copilot","matchArgv0Name","gemini_cli","matchAnyToken","opencode","pi","matchAnyBasename","name","lower","toLowerCase","psCommand","token","trim","split","basename","includes","names","lowers","Set","map","has"],"mappings":"AAAA,OAAOA,UAAU,OAAO;AAYxB;;;;CAIC,GACD,OAAO,MAAMC,SAAkD;IAC3DC,QAAY;QAAEC,SAAS;QAAYC,SAASC,WAAW;IAAU;IACjEC,OAAY;QAAEH,SAAS;QAAYC,SAASC,WAAW;IAAS;IAChEE,SAAY;QAAEJ,SAAS;QAAYC,SAASI,eAAe;IAAe;IAC1EC,YAAY;QAAEN,SAAS;QAAYC,SAASM,cAAc;IAAU;IACpEC,UAAY;QAAER,SAAS;QAAYC,SAASC,WAAW;IAAY;IACnEO,IAAY;QAAET,SAAS;QAAYC,SAASS,iBAAiB;YAAC;SAAK;IAAE;AACzE,EAAE;AAEF,SAASR,WAAWS,IAAY;IAC5B,MAAMC,QAAQD,KAAKE,WAAW;IAC9B,OAAO,CAACC;QACJ,MAAMC,QAAQD,UAAUE,IAAI,GAAGC,KAAK,CAAC,MAAM,CAAC,EAAE;QAC9C,OAAOF,QAAQlB,KAAKqB,QAAQ,CAACH,OAAOF,WAAW,OAAOD,QAAQ;IAClE;AACJ;AAEA,SAASP,eAAeM,IAAY;IAChC,MAAMC,QAAQD,KAAKE,WAAW;IAC9B,OAAO,CAACC;QACJ,MAAMC,QAAQD,UAAUE,IAAI,GAAGC,KAAK,CAAC,MAAM,CAAC,EAAE;QAC9C,OAAOF,QAAQA,MAAMF,WAAW,GAAGM,QAAQ,CAACP,SAAS;IACzD;AACJ;AAEA,SAASL,cAAcI,IAAY;IAC/B,MAAMC,QAAQD,KAAKE,WAAW;IAC9B,OAAO,CAACC;QACJ,KAAK,MAAMC,SAASD,UAAUE,IAAI,GAAGC,KAAK,CAAC,OAAQ;YAC/C,IAAIpB,KAAKqB,QAAQ,CAACH,OAAOF,WAAW,OAAOD,OAAO,OAAO;QAC7D;QACA,OAAO;IACX;AACJ;AAEA,SAASF,iBAAiBU,KAAe;IACrC,MAAMC,SAAS,IAAIC,IAAIF,MAAMG,GAAG,CAAC,CAACZ,OAASA,KAAKE,WAAW;IAC3D,OAAO,CAACC;QACJ,KAAK,MAAMC,SAASD,UAAUE,IAAI,GAAGC,KAAK,CAAC,OAAQ;YAC/C,IAAII,OAAOG,GAAG,CAAC3B,KAAKqB,QAAQ,CAACH,OAAOF,WAAW,KAAK,OAAO;QAC/D;QACA,OAAO;IACX;AACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-devkit/agent-manager",
-  "version": "0.17.0",
+  "version": "0.19.0",
   "type": "module",
   "description": "Standalone agent detection and management utilities for AI DevKit",
   "main": "dist/index.js",
@@ -29,6 +29,11 @@
   ],
   "author": "",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/codeaholicguy/ai-devkit.git",
+    "directory": "packages/agent-manager"
+  },
   "dependencies": {
     "better-sqlite3": "^12.6.2",
     "uuid": "14.0.0"

package/src/__tests__/adapters/CodexAdapter.test.ts

@@ -277,22 +277,73 @@ describe('CodexAdapter', () => {
 
             (adapter as any).codexSessionsDir = sessionsDir;
             mockedBatchGetSessionFileBirthtimes.mockReturnValue([]);
+            const collectAllSpy = vi.spyOn(adapter as any, 'collectAllSessionFiles');
 
-            const agents = await adapter.detectAgents();
+            try {
+                const agents = await adapter.detectAgents();
 
-            expect(mockedBatchGetSessionFileBirthtimes).not.toHaveBeenCalled();
-            expect(mockedMatchProcessesToSessions).not.toHaveBeenCalled();
-            expect(agents).toHaveLength(1);
-            expect(agents[0]).toMatchObject({
-                type: 'codex',
-                pid: 88018,
-                sessionId,
-                projectPath: '/repo-a',
-                sessionFilePath: sessionFile,
-            });
-            expect(agents[0].summary).toBe('resumed codex conversation');
+                expect(mockedBatchGetSessionFileBirthtimes).not.toHaveBeenCalled();
+                expect(mockedMatchProcessesToSessions).not.toHaveBeenCalled();
+                expect(collectAllSpy).not.toHaveBeenCalled();
+                expect(agents).toHaveLength(1);
+                expect(agents[0]).toMatchObject({
+                    type: 'codex',
+                    pid: 88018,
+                    sessionId,
+                    projectPath: '/repo-a',
+                    sessionFilePath: sessionFile,
+                });
+                expect(agents[0].summary).toBe('resumed codex conversation');
+            } finally {
+                collectAllSpy.mockRestore();
+                fs.rmSync(tmpDir, { recursive: true, force: true });
+            }
+        });
 
-            fs.rmSync(tmpDir, { recursive: true, force: true });
+        it('should fall back to all session files for non-time-sortable resume ids', async () => {
+            const sessionId = 'aaaaaaaa-bbbb-4ccc-dddd-eeeeeeeeeeee';
+            const processes: ProcessInfo[] = [
+                {
+                    pid: 88020,
+                    command: `codex resume ${sessionId}`,
+                    cwd: '/repo-a',
+                    tty: 'ttys001',
+                    startTime: new Date('2026-06-10T12:00:00.000Z'),
+                },
+            ];
+            mockedListAgentProcesses.mockReturnValue(processes);
+            mockedEnrichProcesses.mockReturnValue(processes);
+
+            const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-resume-v4-'));
+            const sessionsDir = path.join(tmpDir, 'sessions');
+            const dateDir = path.join(sessionsDir, '2026', '01', '02');
+            fs.mkdirSync(dateDir, { recursive: true });
+
+            const recentTs = new Date().toISOString();
+            const sessionFile = path.join(dateDir, `${sessionId}.jsonl`);
+            fs.writeFileSync(sessionFile, [
+                JSON.stringify({ type: 'session_meta', payload: { id: sessionId, timestamp: recentTs, cwd: '/repo-a' } }),
+                JSON.stringify({ type: 'event', timestamp: recentTs, payload: { type: 'agent_message', message: 'legacy id conversation' } }),
+            ].join('\n'));
+
+            (adapter as any).codexSessionsDir = sessionsDir;
+            mockedBatchGetSessionFileBirthtimes.mockReturnValue([]);
+            const collectAllSpy = vi.spyOn(adapter as any, 'collectAllSessionFiles');
+
+            try {
+                const agents = await adapter.detectAgents();
+
+                expect(collectAllSpy).toHaveBeenCalledOnce();
+                expect(agents).toHaveLength(1);
+                expect(agents[0]).toMatchObject({
+                    pid: 88020,
+                    sessionId,
+                    sessionFilePath: sessionFile,
+                });
+            } finally {
+                collectAllSpy.mockRestore();
+                fs.rmSync(tmpDir, { recursive: true, force: true });
+            }
         });
 
         it('should fall back to process-only when a resumed session becomes unreadable after direct matching', async () => {