loopsy 1.0.4 → 1.0.6

package/dist/daemon/routes/pair.js

@@ -87,8 +87,21 @@ export function registerPairRoutes(app, ctx) {
         return response;
     });
     // POST /api/v1/pair/confirm — Both sides confirm the SAS matches
+    // This is called by both the waiter (Machine A, via daemon request) and the
+    // initiator (Machine B, via direct HTTP). Accept confirm on already-completed
+    // sessions to avoid a race condition where the first confirmer clears state
+    // before the second can confirm.
+    let completedPeerName = null;
+    let completedAt = 0;
     app.post('/api/v1/pair/confirm', async (request, reply) => {
         const body = request.body;
+        // Accept confirm on recently-completed sessions (race condition fix)
+        if ((!session || session.state === 'completed') && completedPeerName && body.confirmed) {
+            // Session was already confirmed by the other side — return success
+            if (Date.now() - completedAt < 60_000) {
+                return { success: true, message: `Paired with ${completedPeerName}` };
+            }
+        }
         if (!session || session.state !== 'key_exchanged') {
             return reply.status(404).send({ error: 'No pairing session awaiting confirmation' });
         }
@@ -97,6 +110,7 @@ export function registerPairRoutes(app, ctx) {
             session = null;
             sessionEcdh = null;
             pendingPeer = null;
+            completedPeerName = null;
             return { success: false, message: 'Pairing cancelled' };
         }
         if (!pendingPeer) {
@@ -105,14 +119,15 @@ export function registerPairRoutes(app, ctx) {
         // Write peer to config
         await addPeerToConfig(pendingPeer.hostname, pendingPeer.apiKey, pendingPeer.certFingerprint, ctx.dataDir);
         session.state = 'completed';
-        const completedPeer = pendingPeer.hostname;
-        // Cleanup
+        completedPeerName = pendingPeer.hostname;
+        completedAt = Date.now();
+        // Cleanup session but keep completedPeerName for late confirmers
         session = null;
         sessionEcdh = null;
         pendingPeer = null;
         if (sessionTimeout)
             clearTimeout(sessionTimeout);
-        return { success: true, message: `Paired with ${completedPeer}` };
+        return { success: true, message: `Paired with ${completedPeerName}` };
     });
     // GET /api/v1/pair/status — Check current pairing session state
     app.get('/api/v1/pair/status', async () => {

package/dist/daemon/routes/pair.js.map

@@ -1 +1 @@
-{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../src/routes/pair.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../src/routes/pair.ts"],"names":[],"mappings":"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"}

package/dist/daemon/services/ai-task-manager.d.ts

@@ -14,6 +14,16 @@ export declare class AiTaskManager {
     private daemonPort;
     private apiKey;
     constructor(config: AiTaskManagerConfig);
+    /** Auto-detect the first available agent CLI */
+    private detectAgent;
+    /** Build CLI args for Claude */
+    private buildClaudeArgs;
+    /** Build CLI args for Gemini CLI */
+    private buildGeminiArgs;
+    /** Build CLI args for Codex CLI */
+    private buildCodexArgs;
+    /** Build a sanitized env for the given agent */
+    private buildEnv;
     dispatch(params: AiTaskParams, fromNodeId: string): Promise<AiTaskInfo>;
     /**
      * Register a permission request from the hook script.
@@ -50,6 +60,8 @@ export declare class AiTaskManager {
     getHookScriptPath(): string;
     get activeCount(): number;
     private handleClaudeEvent;
+    private handleGeminiEvent;
+    private handleCodexEvent;
     private emit;
 }
 export {};

package/dist/daemon/services/ai-task-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-task-manager.d.ts","sourceRoot":"","sources":["../../src/services/ai-task-manager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAGV,sBAAsB,EACtB,iBAAiB,EACjB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAS1B,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;AA0BxD,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,WAAW,CAA6E;IAChG,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,mBAAmB,CAA8C;IACzE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,mBAAmB;IAMjC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA6O7E;;;OAGG;IACH,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,OAAO;IAmCjH;;;OAGG;IACH,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;IAmClG;;;OAGG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,uBAAuB,GAAG,IAAI;IAMxF;;OAEG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAIzF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAc/B,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAQ/C,WAAW,IAAI,UAAU,EAAE;IAM3B,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE;IAQnD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI;IAOvE,SAAS,IAAI,IAAI;IAQjB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IASnC;;;OAGG;IACH,iBAAiB,IAAI,MAAM;IAO3B,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,OAAO,CAAC,iBAAiB;IAuDzB,OAAO,CAAC,IAAI;CAWb"}
+{"version":3,"file":"ai-task-manager.d.ts","sourceRoot":"","sources":["../../src/services/ai-task-manager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAGV,sBAAsB,EACtB,iBAAiB,EAEjB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAU1B,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;AA2BxD,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,WAAW,CAA6E;IAChG,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,mBAAmB,CAA8C;IACzE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,mBAAmB;IAMvC,gDAAgD;YAClC,WAAW;IAWzB,gCAAgC;IAChC,OAAO,CAAC,eAAe;IA4BvB,oCAAoC;IACpC,OAAO,CAAC,eAAe;IAkBvB,mCAAmC;IACnC,OAAO,CAAC,cAAc;IAmBtB,gDAAgD;IAChD,OAAO,CAAC,QAAQ;IA4BV,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAmP7E;;;OAGG;IACH,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,OAAO;IAmCjH;;;OAGG;IACH,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;IAmClG;;;OAGG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,uBAAuB,GAAG,IAAI;IAMxF;;OAEG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAIzF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAyB/B,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAQ/C,WAAW,IAAI,UAAU,EAAE;IAM3B,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE;IAQnD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI;IAOvE,SAAS,IAAI,IAAI;IAWjB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IASnC;;;OAGG;IACH,iBAAiB,IAAI,MAAM;IAO3B,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,OAAO,CAAC,iBAAiB;IAuDzB,OAAO,CAAC,iBAAiB;IAoCzB,OAAO,CAAC,gBAAgB;IAqCxB,OAAO,CAAC,IAAI;CAWb"}

package/dist/daemon/services/ai-task-manager.js

@@ -3,6 +3,7 @@ import { realpathSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 import { tmpdir, homedir } from 'node:os';
+import { spawn } from 'node:child_process';
 import * as pty from 'node-pty';
 import { which } from '../utils/which.js';
 import { LoopsyError, LoopsyErrorCode, MAX_CONCURRENT_AI_TASKS, DEFAULT_AI_TASK_TIMEOUT, AI_TASK_EVENT_BUFFER_SIZE, } from '@loopsy/protocol';
@@ -34,19 +35,17 @@ export class AiTaskManager {
         this.daemonPort = config.daemonPort;
         this.apiKey = config.apiKey;
     }
-    async dispatch(params, fromNodeId) {
-        const activeCount = Array.from(this.tasks.values()).filter((t) => t.info.status === 'running' || t.info.status === 'waiting_approval').length;
-        if (activeCount >= this.maxConcurrent) {
-            throw new LoopsyError(LoopsyErrorCode.AI_TASK_MAX_CONCURRENT, `Max concurrent AI tasks (${this.maxConcurrent}) reached`);
-        }
-        // Find claude CLI
-        const claudePath = await which('claude');
-        if (!claudePath) {
-            throw new LoopsyError(LoopsyErrorCode.AI_TASK_CLAUDE_NOT_FOUND, 'Claude CLI not found in PATH. Install claude-code first.');
+    /** Auto-detect the first available agent CLI */
+    async detectAgent() {
+        for (const agent of ['claude', 'gemini', 'codex']) {
+            const path = await which(agent);
+            if (path)
+                return agent;
         }
-        const taskId = randomUUID();
-        const now = Date.now();
-        // Build CLI args
+        throw new LoopsyError(LoopsyErrorCode.AI_TASK_AGENT_NOT_FOUND, 'No AI agent CLI found in PATH. Install claude-code, gemini-cli, or codex-cli.');
+    }
+    /** Build CLI args for Claude */
+    buildClaudeArgs(params) {
         const args = ['-p', params.prompt, '--output-format', 'stream-json', '--verbose'];
         if (params.permissionMode) {
             args.push('--permission-mode', params.permissionMode);
@@ -69,34 +68,112 @@ export class AiTaskManager {
         if (params.additionalArgs?.length) {
             args.push(...params.additionalArgs);
         }
-        // Strip all Claude-related env vars to avoid nesting detection
+        return args;
+    }
+    /** Build CLI args for Gemini CLI */
+    buildGeminiArgs(params) {
+        const args = ['-p', params.prompt, '--output-format', 'stream-json'];
+        if (params.permissionMode === 'bypassPermissions') {
+            args.push('--yolo');
+        }
+        else if (params.permissionMode === 'acceptEdits') {
+            args.push('--approval-mode', 'auto_edit');
+        }
+        if (params.model) {
+            args.push('-m', params.model);
+        }
+        if (params.additionalArgs?.length) {
+            args.push(...params.additionalArgs);
+        }
+        return args;
+    }
+    /** Build CLI args for Codex CLI */
+    buildCodexArgs(params) {
+        const args = ['exec', params.prompt, '--json'];
+        if (params.permissionMode === 'bypassPermissions' || params.permissionMode === 'acceptEdits') {
+            args.push('--full-auto');
+        }
+        if (params.model) {
+            args.push('-m', params.model);
+        }
+        if (params.cwd) {
+            args.push('--cd', params.cwd);
+        }
+        if (params.additionalArgs?.length) {
+            args.push(...params.additionalArgs);
+        }
+        return args;
+    }
+    /** Build a sanitized env for the given agent */
+    buildEnv(agent, taskId) {
         const env = {};
         for (const [key, val] of Object.entries(process.env)) {
             if (val === undefined)
                 continue;
-            if (key.startsWith('CLAUDE') || key.startsWith('ANTHROPIC_') || key.startsWith('OTEL_') || key === 'MCP_') {
-                continue;
+            // Per-agent env stripping
+            switch (agent) {
+                case 'claude':
+                    if (key.startsWith('CLAUDE') || key.startsWith('ANTHROPIC_') || key.startsWith('OTEL_') || key === 'MCP_')
+                        continue;
+                    break;
+                case 'gemini':
+                    if (key.startsWith('GEMINI_') && key !== 'GEMINI_API_KEY')
+                        continue;
+                    break;
+                case 'codex':
+                    if (key.startsWith('CODEX_') && key !== 'CODEX_API_KEY')
+                        continue;
+                    break;
             }
             env[key] = val;
         }
-        // Set env vars for the permission hook script (also available via CLI args)
+        // Loopsy task env vars
         env.LOOPSY_TASK_ID = taskId;
         env.LOOPSY_DAEMON_PORT = String(this.daemonPort);
         env.LOOPSY_API_KEY = this.apiKey;
+        return env;
+    }
+    async dispatch(params, fromNodeId) {
+        const activeCount = Array.from(this.tasks.values()).filter((t) => t.info.status === 'running' || t.info.status === 'waiting_approval').length;
+        if (activeCount >= this.maxConcurrent) {
+            throw new LoopsyError(LoopsyErrorCode.AI_TASK_MAX_CONCURRENT, `Max concurrent AI tasks (${this.maxConcurrent}) reached`);
+        }
+        // Resolve agent
+        const agentParam = params.agent || 'auto';
+        const resolvedAgent = agentParam === 'auto'
+            ? await this.detectAgent()
+            : agentParam;
+        // Find CLI binary
+        const cliPath = await which(resolvedAgent);
+        if (!cliPath) {
+            const errorCode = resolvedAgent === 'claude'
+                ? LoopsyErrorCode.AI_TASK_CLAUDE_NOT_FOUND
+                : LoopsyErrorCode.AI_TASK_AGENT_NOT_FOUND;
+            throw new LoopsyError(errorCode, `${resolvedAgent} CLI not found in PATH`);
+        }
+        const taskId = randomUUID();
+        const now = Date.now();
+        // Build per-agent CLI args
+        let args;
+        switch (resolvedAgent) {
+            case 'claude':
+                args = this.buildClaudeArgs(params);
+                break;
+            case 'gemini':
+                args = this.buildGeminiArgs(params);
+                break;
+            case 'codex':
+                args = this.buildCodexArgs(params);
+                break;
+        }
+        // Build sanitized env
+        const env = this.buildEnv(resolvedAgent, taskId);
         const isBypass = params.permissionMode === 'bypassPermissions';
         const taskCwd = params.cwd || homedir();
         const taskTmpDir = join(tmpdir(), `loopsy-task-${taskId}`);
         let spawnCwd;
-        if (isBypass) {
-            // Bypass mode: no hook needed — run directly in the actual cwd.
-            // The hook would register permission requests that nobody approves,
-            // causing a deadlock. Skip it entirely.
-            mkdirSync(taskTmpDir, { recursive: true }); // still needed for cleanup tracking
-            spawnCwd = taskCwd;
-        }
-        else {
-            // Hook mode: cwd = taskTmpDir so Claude discovers .claude/settings.local.json
-            // containing the PreToolUse hook config with task-specific args baked in.
+        // Permission hook setup — Claude only, non-bypass mode
+        if (resolvedAgent === 'claude' && !isBypass) {
             const hookScriptPath = this.getHookScriptPath();
             const claudeSettingsDir = join(taskTmpDir, '.claude');
             mkdirSync(claudeSettingsDir, { recursive: true });
@@ -112,43 +189,57 @@ export class AiTaskManager {
                         }],
                 },
             }, null, 2));
-            // Write a CLAUDE.md that tells Claude the actual working directory
             writeFileSync(join(taskTmpDir, 'CLAUDE.md'), `Your actual working directory is: ${taskCwd}\n` +
                 `Always use absolute paths rooted at ${taskCwd} for all file operations.\n`);
-            // Grant access to the actual cwd and user's home directory
             args.push('--add-dir', taskCwd);
             if (homedir() !== taskCwd) {
                 args.push('--add-dir', homedir());
             }
             spawnCwd = taskTmpDir;
         }
-        // Use node-pty to spawn with a pseudo-TTY
-        // Claude CLI (Bun runtime) buffers stdout when connected to a pipe;
-        // a PTY ensures real-time streaming output
-        let spawnFile;
-        let spawnArgs;
-        if (process.platform === 'win32') {
-            // On Windows, .cmd files must be spawned via cmd.exe for ConPTY to work
-            spawnFile = 'cmd.exe';
-            spawnArgs = ['/c', claudePath, ...args];
-        }
         else {
-            // On macOS/Linux, resolve symlinks for node-pty
-            try {
-                spawnFile = realpathSync(claudePath);
+            mkdirSync(taskTmpDir, { recursive: true });
+            spawnCwd = taskCwd;
+        }
+        // Spawn the process
+        let ptyProcess;
+        let childProcess;
+        let pid;
+        if (resolvedAgent === 'claude') {
+            // Claude needs PTY (Bun runtime buffers stdout on pipes)
+            let spawnFile;
+            let spawnArgs;
+            if (process.platform === 'win32') {
+                spawnFile = 'cmd.exe';
+                spawnArgs = ['/c', cliPath, ...args];
             }
-            catch {
-                spawnFile = claudePath;
+            else {
+                try {
+                    spawnFile = realpathSync(cliPath);
+                }
+                catch {
+                    spawnFile = cliPath;
+                }
+                spawnArgs = args;
             }
-            spawnArgs = args;
-        }
-        const proc = pty.spawn(spawnFile, spawnArgs, {
-            name: 'xterm-256color',
-            cols: process.platform === 'win32' ? 9999 : 32000, // ConPTY needs wide cols to avoid JSON line wrapping
-            rows: 50,
-            cwd: spawnCwd,
-            env,
-        });
+            ptyProcess = pty.spawn(spawnFile, spawnArgs, {
+                name: 'xterm-256color',
+                cols: process.platform === 'win32' ? 9999 : 32000,
+                rows: 50,
+                cwd: spawnCwd,
+                env,
+            });
+            pid = ptyProcess.pid;
+        }
+        else {
+            // Gemini and Codex use child_process.spawn
+            childProcess = spawn(cliPath, args, {
+                cwd: spawnCwd,
+                env,
+                stdio: ['ignore', 'pipe', 'pipe'],
+            });
+            pid = childProcess.pid;
+        }
         const info = {
             taskId,
             prompt: params.prompt,
@@ -156,12 +247,14 @@ export class AiTaskManager {
             startedAt: now,
             updatedAt: now,
             fromNodeId,
-            pid: proc.pid,
+            pid,
             model: params.model,
+            agent: resolvedAgent,
         };
         const task = {
             info,
-            ptyProcess: proc,
+            ptyProcess,
+            childProcess,
             eventBuffer: [],
             subscribers: new Set(),
         };
@@ -171,58 +264,57 @@ export class AiTaskManager {
             this.cancel(taskId);
             this.emit(task, { type: 'error', taskId, timestamp: Date.now(), data: 'Task timed out' });
         }, DEFAULT_AI_TASK_TIMEOUT);
-        // Buffer for incomplete lines from PTY
+        // Buffer for incomplete lines
         let lineBuffer = '';
-        // Parse PTY output — data arrives as chunks that may contain partial lines
-        proc.onData((data) => {
-            // Debug: log raw PTY data
+        const processLine = (line) => {
+            if (!line)
+                return;
+            if (process.env.LOOPSY_DEBUG_PTY) {
+                console.log(`[${resolvedAgent.toUpperCase()} ${taskId.slice(0, 8)}] line(${line.length}): ${line.slice(0, 100)}...`);
+            }
+            try {
+                const parsed = JSON.parse(line);
+                switch (resolvedAgent) {
+                    case 'claude':
+                        this.handleClaudeEvent(task, parsed);
+                        break;
+                    case 'gemini':
+                        this.handleGeminiEvent(task, parsed);
+                        break;
+                    case 'codex':
+                        this.handleCodexEvent(task, parsed);
+                        break;
+                }
+            }
+            catch (err) {
+                if (process.env.LOOPSY_DEBUG_PTY) {
+                    console.log(`[${resolvedAgent.toUpperCase()} ${taskId.slice(0, 8)}] JSON parse fail: ${err.message}, line starts: ${JSON.stringify(line.slice(0, 80))}`);
+                }
+                if (line.length > 0) {
+                    this.emit(task, { type: 'text', taskId, timestamp: Date.now(), data: line });
+                }
+            }
+        };
+        const processChunk = (data, needsAnsiStrip) => {
             if (process.env.LOOPSY_DEBUG_PTY) {
-                console.log(`[PTY ${taskId.slice(0, 8)}] raw(${data.length}): ${JSON.stringify(data.slice(0, 300))}`);
+                console.log(`[${resolvedAgent.toUpperCase()} ${taskId.slice(0, 8)}] raw(${data.length}): ${JSON.stringify(data.slice(0, 300))}`);
             }
-            // Strip ANSI before buffering to prevent escape sequences splitting JSON
-            const cleaned = stripAnsi(data);
+            const cleaned = needsAnsiStrip ? stripAnsi(data) : data;
             lineBuffer += cleaned;
             const lines = lineBuffer.split('\n');
-            // Keep the last element (may be incomplete)
             lineBuffer = lines.pop() || '';
             for (const rawLine of lines) {
                 const line = rawLine.trim();
-                if (!line)
-                    continue;
-                if (process.env.LOOPSY_DEBUG_PTY) {
-                    console.log(`[PTY ${taskId.slice(0, 8)}] line(${line.length}): ${line.slice(0, 100)}...`);
-                }
-                try {
-                    const parsed = JSON.parse(line);
-                    this.handleClaudeEvent(task, parsed);
-                }
-                catch (err) {
-                    if (process.env.LOOPSY_DEBUG_PTY) {
-                        console.log(`[PTY ${taskId.slice(0, 8)}] JSON parse fail: ${err.message}, line starts: ${JSON.stringify(line.slice(0, 80))}`);
-                    }
-                    // Non-JSON line — forward as text
-                    if (line.length > 0) {
-                        this.emit(task, { type: 'text', taskId, timestamp: Date.now(), data: line });
-                    }
-                }
+                if (line)
+                    processLine(line);
             }
-        });
-        // Handle process exit
-        proc.onExit(({ exitCode, signal }) => {
-            // Process any remaining buffered data
+        };
+        const handleExit = (exitCode, signal) => {
+            // Process remaining buffer
             if (lineBuffer.trim()) {
-                const line = stripAnsi(lineBuffer).trim();
-                if (line) {
-                    try {
-                        const parsed = JSON.parse(line);
-                        this.handleClaudeEvent(task, parsed);
-                    }
-                    catch {
-                        if (line.length > 0) {
-                            this.emit(task, { type: 'text', taskId, timestamp: Date.now(), data: line });
-                        }
-                    }
-                }
+                const line = (resolvedAgent === 'claude' ? stripAnsi(lineBuffer) : lineBuffer).trim();
+                if (line)
+                    processLine(line);
                 lineBuffer = '';
             }
             if (task.timeoutTimer)
@@ -236,15 +328,32 @@ export class AiTaskManager {
                 info.error = signal ? `Killed by signal ${signal}` : `Exit code ${exitCode}`;
             }
             this.emit(task, { type: 'exit', taskId, timestamp: Date.now(), data: { exitCode, signal } });
-            // Move to completed tasks (preserve event buffer) — kept until explicitly deleted
             this.recentTasks.set(taskId, { info: { ...info }, eventBuffer: [...task.eventBuffer] });
             this.tasks.delete(taskId);
-            // Clean up per-task temp directory
             try {
                 rmSync(taskTmpDir, { recursive: true, force: true });
             }
             catch { }
-        });
+        };
+        if (ptyProcess) {
+            // PTY data handler (Claude)
+            ptyProcess.onData((data) => processChunk(data, true));
+            ptyProcess.onExit(({ exitCode, signal }) => handleExit(exitCode, signal));
+        }
+        else if (childProcess) {
+            // child_process data handler (Gemini/Codex)
+            childProcess.stdout.on('data', (data) => processChunk(data.toString(), false));
+            childProcess.stderr.on('data', (data) => {
+                const text = data.toString().trim();
+                if (text) {
+                    this.emit(task, { type: 'text', taskId, timestamp: Date.now(), data: text });
+                }
+            });
+            childProcess.on('exit', (code, signal) => {
+                const sigNum = signal ? ({ SIGTERM: 15, SIGKILL: 9 }[signal] || 1) : null;
+                handleExit(code ?? null, sigNum);
+            });
+        }
         // Emit initial status
         this.emit(task, { type: 'status', taskId, timestamp: now, data: { status: 'running' } });
         return { ...info };
@@ -338,15 +447,28 @@ export class AiTaskManager {
             return false;
         task.info.status = 'cancelled';
         task.info.updatedAt = Date.now();
-        task.ptyProcess.kill('SIGTERM');
-        setTimeout(() => {
-            if (this.tasks.has(taskId)) {
-                try {
-                    task.ptyProcess.kill('SIGKILL');
+        if (task.ptyProcess) {
+            task.ptyProcess.kill('SIGTERM');
+            setTimeout(() => {
+                if (this.tasks.has(taskId)) {
+                    try {
+                        task.ptyProcess.kill('SIGKILL');
+                    }
+                    catch { }
                 }
-                catch { }
-            }
-        }, 5000);
+            }, 5000);
+        }
+        else if (task.childProcess) {
+            task.childProcess.kill('SIGTERM');
+            setTimeout(() => {
+                if (this.tasks.has(taskId)) {
+                    try {
+                        task.childProcess.kill('SIGKILL');
+                    }
+                    catch { }
+                }
+            }, 5000);
+        }
         return true;
     }
     getTask(taskId) {
@@ -382,7 +504,10 @@ export class AiTaskManager {
     cancelAll() {
         for (const [id, task] of this.tasks) {
             try {
-                task.ptyProcess.kill('SIGKILL');
+                if (task.ptyProcess)
+                    task.ptyProcess.kill('SIGKILL');
+                else if (task.childProcess)
+                    task.childProcess.kill('SIGKILL');
             }
             catch { }
             if (task.timeoutTimer)
@@ -473,6 +598,92 @@ export class AiTaskManager {
             this.emit(task, { type: 'text', taskId, timestamp: ts, data: JSON.stringify(parsed) });
         }
     }
+    handleGeminiEvent(task, parsed) {
+        const taskId = task.info.taskId;
+        const ts = Date.now();
+        const cliType = parsed.type;
+        if (cliType === 'init') {
+            this.emit(task, { type: 'system', taskId, timestamp: ts, data: parsed });
+        }
+        else if (cliType === 'message') {
+            // Extract text from content blocks
+            const content = parsed.content || parsed.message?.content || [];
+            if (Array.isArray(content)) {
+                for (const block of content) {
+                    if (block.type === 'text' || block.text) {
+                        this.emit(task, { type: 'text', taskId, timestamp: ts, data: block.text || '' });
+                    }
+                }
+            }
+            else if (typeof content === 'string') {
+                this.emit(task, { type: 'text', taskId, timestamp: ts, data: content });
+            }
+            else if (parsed.text) {
+                this.emit(task, { type: 'text', taskId, timestamp: ts, data: parsed.text });
+            }
+        }
+        else if (cliType === 'tool_use') {
+            this.emit(task, { type: 'tool_use', taskId, timestamp: ts, data: { name: parsed.name, input: parsed.input } });
+        }
+        else if (cliType === 'tool_result') {
+            this.emit(task, { type: 'tool_result', taskId, timestamp: ts, data: { name: parsed.name, content: parsed.content, output: parsed.output } });
+        }
+        else if (cliType === 'result') {
+            this.emit(task, { type: 'result', taskId, timestamp: ts, data: { text: parsed.response || parsed.result, cost: parsed.stats?.cost, duration: parsed.stats?.duration_ms } });
+        }
+        else if (cliType === 'error') {
+            task.info.error = parsed.message || parsed.error || JSON.stringify(parsed);
+            this.emit(task, { type: 'error', taskId, timestamp: ts, data: parsed.message || parsed.error || parsed });
+        }
+        else {
+            // Forward unknown events as text
+            this.emit(task, { type: 'text', taskId, timestamp: ts, data: JSON.stringify(parsed) });
+        }
+    }
+    handleCodexEvent(task, parsed) {
+        const taskId = task.info.taskId;
+        const ts = Date.now();
+        const cliType = parsed.type;
+        if (cliType === 'thread.started') {
+            this.emit(task, { type: 'system', taskId, timestamp: ts, data: parsed });
+        }
+        else if (cliType === 'item.completed') {
+            const item = parsed.item || parsed;
+            const itemType = item.type || item.item_type;
+            if (itemType === 'agent_message' || itemType === 'message') {
+                const text = item.content || item.text || '';
+                if (text)
+                    this.emit(task, { type: 'text', taskId, timestamp: ts, data: text });
+            }
+            else if (itemType === 'reasoning') {
+                const text = item.content || item.text || '';
+                if (text)
+                    this.emit(task, { type: 'thinking', taskId, timestamp: ts, data: text });
+            }
+            else if (itemType === 'command_execution') {
+                this.emit(task, { type: 'tool_use', taskId, timestamp: ts, data: { name: 'command', input: { command: item.command || item.input } } });
+                if (item.output || item.result) {
+                    this.emit(task, { type: 'tool_result', taskId, timestamp: ts, data: { name: 'command', content: item.output || item.result } });
+                }
+            }
+            else if (itemType === 'file_change') {
+                this.emit(task, { type: 'tool_use', taskId, timestamp: ts, data: { name: 'file_change', input: { file: item.file || item.path, action: item.action } } });
+            }
+            else if (itemType === 'mcp_tool_call') {
+                this.emit(task, { type: 'tool_use', taskId, timestamp: ts, data: { name: item.tool_name || item.name, input: item.input || item.arguments } });
+            }
+        }
+        else if (cliType === 'error') {
+            task.info.error = parsed.message || parsed.error || JSON.stringify(parsed);
+            this.emit(task, { type: 'error', taskId, timestamp: ts, data: parsed.message || parsed.error || parsed });
+        }
+        else if (cliType === 'turn.completed') {
+            // Ignore — exit event handles completion
+        }
+        else {
+            this.emit(task, { type: 'text', taskId, timestamp: ts, data: JSON.stringify(parsed) });
+        }
+    }
     emit(task, event) {
         // Buffer event
         task.eventBuffer.push(event);