@ai-devkit/agent-manager 0.5.0 → 0.6.1

package/src/adapters/CodexAdapter.ts

@@ -12,7 +12,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import type { AgentAdapter, AgentInfo, ProcessInfo } from './AgentAdapter';
+import type { AgentAdapter, AgentInfo, ProcessInfo, ConversationMessage } from './AgentAdapter';
 import { AgentStatus } from './AgentAdapter';
 import { listAgentProcesses, enrichProcesses } from '../utils/process';
 import { batchGetSessionFileBirthtimes } from '../utils/session';
@@ -78,7 +78,7 @@ export class CodexAdapter implements AgentAdapter {
             const cachedContent = contentCache.get(match.session.filePath);
             const sessionData = this.parseSession(cachedContent, match.session.filePath);
             if (sessionData) {
-                agents.push(this.mapSessionToAgent(sessionData, match.process));
+                agents.push(this.mapSessionToAgent(sessionData, match.process, match.session.filePath));
             } else {
                 matchedPids.delete(match.process.pid);
             }
@@ -234,7 +234,7 @@ export class CodexAdapter implements AgentAdapter {
         };
     }
 
-    private mapSessionToAgent(session: CodexSession, processInfo: ProcessInfo): AgentInfo {
+    private mapSessionToAgent(session: CodexSession, processInfo: ProcessInfo, filePath: string): AgentInfo {
         return {
             name: generateAgentName(session.projectPath || processInfo.cwd || '', processInfo.pid),
             type: this.type,
@@ -244,6 +244,7 @@ export class CodexAdapter implements AgentAdapter {
             projectPath: session.projectPath || processInfo.cwd || '',
             sessionId: session.sessionId,
             lastActive: session.lastActive,
+            sessionFilePath: filePath,
         };
     }
 
@@ -316,4 +317,59 @@ export class CodexAdapter implements AgentAdapter {
         const base = path.basename(executable).toLowerCase();
         return base === 'codex' || base === 'codex.exe';
     }
+
+    /**
+     * Read the full conversation from a Codex session JSONL file.
+     *
+     * Codex entries use payload.type to indicate message role and payload.message for content.
+     */
+    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 lines = content.trim().split('\n');
+        const messages: ConversationMessage[] = [];
+
+        for (const line of lines) {
+            let entry: CodexEventEntry;
+            try {
+                entry = JSON.parse(line);
+            } catch {
+                continue;
+            }
+
+            if (entry.type === 'session_meta') continue;
+
+            const payloadType = entry.payload?.type;
+            if (!payloadType) continue;
+
+            let role: ConversationMessage['role'];
+            if (payloadType === 'user_message') {
+                role = 'user';
+            } else if (payloadType === 'agent_message' || payloadType === 'task_complete') {
+                role = 'assistant';
+            } else if (verbose) {
+                role = 'system';
+            } else {
+                continue;
+            }
+
+            const text = entry.payload?.message?.trim();
+            if (!text) continue;
+
+            messages.push({
+                role,
+                content: text,
+                timestamp: entry.timestamp,
+            });
+        }
+
+        return messages;
+    }
 }

package/src/index.ts

@@ -3,7 +3,7 @@ export { AgentManager } from './AgentManager';
 export { ClaudeCodeAdapter } from './adapters/ClaudeCodeAdapter';
 export { CodexAdapter } from './adapters/CodexAdapter';
 export { AgentStatus } from './adapters/AgentAdapter';
-export type { AgentAdapter, AgentType, AgentInfo, ProcessInfo } from './adapters/AgentAdapter';
+export type { AgentAdapter, AgentType, AgentInfo, ProcessInfo, ConversationMessage } from './adapters/AgentAdapter';
 
 export { TerminalFocusManager, TerminalType } from './terminal/TerminalFocusManager';
 export type { TerminalLocation } from './terminal/TerminalFocusManager';

package/src/terminal/TtyWriter.ts

@@ -46,25 +46,47 @@ export class TtyWriter {
     }
 
     private static async sendViaTmux(identifier: string, message: string): Promise<void> {
-        await execFileAsync('tmux', ['send-keys', '-t', identifier, message, 'Enter']);
+        // Send text and Enter as two separate calls so that Enter arrives
+        // outside of bracketed paste mode. When the inner application (e.g.
+        // Claude Code) has bracketed paste enabled, tmux wraps the send-keys
+        // payload in paste brackets — if Enter is included, it gets swallowed
+        // as part of the paste instead of acting as a submit action.
+        await execFileAsync('tmux', ['send-keys', '-t', identifier, '-l', message]);
+        await new Promise((resolve) => setTimeout(resolve, 150));
+        await execFileAsync('tmux', ['send-keys', '-t', identifier, 'Enter']);
     }
 
     private static async sendViaITerm2(tty: string, message: string): Promise<void> {
         const escaped = escapeAppleScript(message);
+        // Send text WITHOUT a trailing newline to avoid the newline being swallowed
+        // by bracketed paste mode. Then simulate pressing Return separately so that
+        // Claude Code (and other interactive TUIs) treat it as a real submit action.
         const script = `
 tell application "iTerm"
+  set targetSession to missing value
   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
-          tell s to write text "${escaped}"
-          return "ok"
+          set targetSession to s
+          exit repeat
         end if
       end repeat
+      if targetSession is not missing value then exit repeat
     end repeat
+    if targetSession is not missing value then exit repeat
   end repeat
+  if targetSession is missing value then return "not_found"
+  tell targetSession to write text "${escaped}" newline no
 end tell
-return "not_found"`;
+tell application "iTerm" to activate
+delay 0.15
+tell application "System Events"
+  tell process "iTerm2"
+    key code 36
+  end tell
+end tell
+return "ok"`;
 
         const { stdout } = await execFileAsync('osascript', ['-e', script]);
         if (stdout.trim() !== 'ok') {
@@ -77,6 +99,9 @@ return "not_found"`;
         // Use System Events keystroke to type into the foreground process,
         // NOT Terminal.app's "do script" which runs a new shell command.
         // First activate Terminal and select the correct tab, then type via System Events.
+        // Send the text first, then wait for the paste/input to complete before pressing
+        // Return separately — this ensures interactive TUIs (like Claude Code) see the
+        // Return as a real submit action, not part of a bracketed paste.
         const script = `
 tell application "Terminal"
   set targetFound to false
@@ -99,6 +124,11 @@ delay 0.1
 tell application "System Events"
   tell process "Terminal"
     keystroke "${escaped}"
+  end tell
+end tell
+delay 0.15
+tell application "System Events"
+  tell process "Terminal"
     key code 36
   end tell
 end tell

package/src/utils/matching.ts

@@ -84,9 +84,13 @@ export function matchProcessesToSessions(
 /**
  * Generate a deterministic agent name from CWD and PID.
  *
- * Format: "folderName (pid)"
+ * Format: "folder-name-pid" (lowercase kebab-case)
  */
 export function generateAgentName(cwd: string, pid: number): string {
     const folderName = path.basename(cwd) || 'unknown';
-    return `${folderName} (${pid})`;
+    const kebab = folderName
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-+|-+$/g, '');
+    return `${kebab || 'unknown'}-${pid}`;
 }