agor-live 0.16.2 → 0.16.3

package/dist/executor/sdk-handlers/base/diff-enrichment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff-enrichment.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/base/diff-enrichment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAQH,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAa5D,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAeD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAC5E,IAAI,CAIN;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI,CAoBrE;AAMD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI,CAuBvE"}
+{"version":3,"file":"diff-enrichment.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/base/diff-enrichment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAQH,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAa5D,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA4ED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAC5E,IAAI,CAIN;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI,CAoBrE;AAMD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,YAAY,EAAE,EAC7B,OAAO,CAAC,EAAE,qBAAqB,GAC9B,IAAI,CAuBN"}

package/dist/executor/sdk-handlers/base/diff-enrichment.js

@@ -17,7 +17,7 @@
  *    Call `enrichContentBlocks()` which finds tool_use blocks and uses their input
  *    to enrich adjacent tool_result blocks in one pass.
  */
-import { execSync } from 'node:child_process';
+import { execFileSync, execSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { structuredPatch } from 'diff';
@@ -25,6 +25,60 @@ import { structuredPatch } from 'diff';
 const MAX_FILE_SIZE_BYTES = 1_048_576;
 /** Context lines around changes (same as Claude Code CLI) */
 const CONTEXT_LINES = 3;
+function isSafeRepoRelativePath(relativePath) {
+    const normalized = path.posix.normalize(relativePath.split(path.sep).join('/'));
+    return !(!normalized ||
+        normalized.startsWith('/') ||
+        normalized === '..' ||
+        normalized.startsWith('../') ||
+        normalized.includes('\0') ||
+        normalized.includes('\n') ||
+        normalized.includes('\r'));
+}
+function tryRealpath(p) {
+    try {
+        return fs.realpathSync(p);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Resolve a path to a git-repo-relative path, tolerating symlink prefix drift.
+ *
+ * In production we may receive absolute tool paths under a symlinked mount
+ * while git reports a canonical root under a different prefix. This helper
+ * tries lexical and canonicalized candidates and returns a safe repo-relative path.
+ */
+function resolveRepoRelativePath(gitRoot, absolutePath) {
+    const lexicalRelative = path.relative(gitRoot, absolutePath);
+    if (isSafeRepoRelativePath(lexicalRelative)) {
+        return lexicalRelative;
+    }
+    const gitRootReal = tryRealpath(gitRoot);
+    if (!gitRootReal)
+        return null;
+    const candidates = new Set();
+    candidates.add(absolutePath);
+    const absoluteReal = tryRealpath(absolutePath);
+    if (absoluteReal) {
+        candidates.add(absoluteReal);
+    }
+    else {
+        // File may not exist (e.g., delete). Resolve through parent directory.
+        const parentReal = tryRealpath(path.dirname(absolutePath));
+        if (parentReal) {
+            candidates.add(path.join(parentReal, path.basename(absolutePath)));
+        }
+    }
+    for (const candidate of candidates) {
+        const relativePath = path.relative(gitRootReal, candidate);
+        if (isSafeRepoRelativePath(relativePath)) {
+            return relativePath;
+        }
+    }
+    return null;
+}
 // ---------------------------------------------------------------------------
 // Pattern 1: Split messages (Claude)
 // ---------------------------------------------------------------------------
@@ -81,7 +135,7 @@ export function enrichToolResults(contentBlocks) {
  * Used by Codex, OpenCode, and Gemini handlers.
  * Mutates content blocks in-place. Best-effort.
  */
-export function enrichContentBlocks(contentBlocks) {
+export function enrichContentBlocks(contentBlocks, context) {
     // Build local map from tool_use blocks in this array
     const localToolUses = new Map();
     for (const block of contentBlocks) {
@@ -101,7 +155,7 @@ export function enrichContentBlocks(contentBlocks) {
         const toolUse = localToolUses.get(toolUseId);
         if (!toolUse)
             continue;
-        enrichBlock(block, toolUse.name, toolUse.input);
+        enrichBlock(block, toolUse.name, toolUse.input, context);
     }
 }
 // ---------------------------------------------------------------------------
@@ -111,7 +165,7 @@ export function enrichContentBlocks(contentBlocks) {
  * Enrich a single tool_result block with diff data.
  * Best-effort — swallows all errors.
  */
-function enrichBlock(block, toolName, toolInput) {
+function enrichBlock(block, toolName, toolInput, context) {
     try {
         // Normalize tool names across SDKs (Claude: "Edit", Codex: "edit", etc.)
         const normalized = toolName.toLowerCase();
@@ -122,7 +176,7 @@ function enrichBlock(block, toolName, toolInput) {
             enrichWriteResult(block, toolInput);
         }
         else if (normalized === 'edit_files') {
-            enrichEditFilesResult(block, toolInput);
+            enrichEditFilesResult(block, toolInput, context);
         }
     }
     catch {
@@ -234,16 +288,18 @@ function enrichWriteResult(block, input) {
  * No old/new content is provided — we reconstruct diffs by comparing
  * the current file (post-edit) against git HEAD.
  */
-function enrichEditFilesResult(block, input) {
+function enrichEditFilesResult(block, input, context) {
     const changes = input.changes;
     if (!changes || changes.length === 0)
         return;
+    const workingDirectory = context?.workingDirectory;
     // Find git root once for relative path resolution
     let gitRoot;
     try {
         gitRoot = execSync('git rev-parse --show-toplevel', {
             encoding: 'utf-8',
             timeout: 5000,
+            ...(workingDirectory ? { cwd: workingDirectory } : {}),
         }).trim();
     }
     catch {
@@ -255,13 +311,16 @@ function enrichEditFilesResult(block, input) {
             continue;
         const kind = (change.kind || 'update');
         const filePath = change.path;
+        const resolvedPath = path.isAbsolute(filePath)
+            ? filePath
+            : path.resolve(workingDirectory || gitRoot, filePath);
         try {
             if (kind === 'add') {
                 // New file — all additions
-                const stat = fs.statSync(filePath);
+                const stat = fs.statSync(resolvedPath);
                 if (stat.size > MAX_FILE_SIZE_BYTES)
                     continue;
-                const content = fs.readFileSync(filePath, 'utf-8');
+                const content = fs.readFileSync(resolvedPath, 'utf-8');
                 const patch = structuredPatch(filePath, filePath, '', content, '', '', {
                     context: 0,
                 });
@@ -271,11 +330,12 @@ function enrichEditFilesResult(block, input) {
             }
             else if (kind === 'delete') {
                 // Deleted file — get old content from git
-                const relativePath = path.relative(gitRoot, filePath);
-                const oldContent = execSync(`git show HEAD:${relativePath}`, {
-                    encoding: 'utf-8',
-                    timeout: 5000,
-                });
+                const relativePath = resolveRepoRelativePath(gitRoot, resolvedPath);
+                if (!relativePath)
+                    continue;
+                const oldContent = gitShowHeadFile(gitRoot, relativePath);
+                if (oldContent === null)
+                    continue;
                 const patch = structuredPatch(filePath, filePath, oldContent, '', '', '', {
                     context: CONTEXT_LINES,
                 });
@@ -285,19 +345,15 @@ function enrichEditFilesResult(block, input) {
             }
             else {
                 // Update — diff git HEAD vs current file
-                const stat = fs.statSync(filePath);
+                const stat = fs.statSync(resolvedPath);
                 if (stat.size > MAX_FILE_SIZE_BYTES)
                     continue;
-                const currentContent = fs.readFileSync(filePath, 'utf-8');
-                const relativePath = path.relative(gitRoot, filePath);
-                let oldContent;
-                try {
-                    oldContent = execSync(`git show HEAD:${relativePath}`, {
-                        encoding: 'utf-8',
-                        timeout: 5000,
-                    });
-                }
-                catch {
+                const currentContent = fs.readFileSync(resolvedPath, 'utf-8');
+                const relativePath = resolveRepoRelativePath(gitRoot, resolvedPath);
+                if (!relativePath)
+                    continue;
+                const oldContent = gitShowHeadFile(gitRoot, relativePath);
+                if (oldContent === null) {
                     // File may be new (not in HEAD) — treat as addition
                     const patch = structuredPatch(filePath, filePath, '', currentContent, '', '', {
                         context: 0,
@@ -327,3 +383,20 @@ function enrichEditFilesResult(block, input) {
         };
     }
 }
+function gitShowHeadFile(gitRoot, relativePath) {
+    // Ensure the ref path is safe and uses git's forward-slash separator.
+    const normalized = path.posix.normalize(relativePath.split(path.sep).join('/'));
+    if (!isSafeRepoRelativePath(normalized)) {
+        return null;
+    }
+    try {
+        return execFileSync('git', ['show', `HEAD:${normalized}`], {
+            encoding: 'utf-8',
+            timeout: 5000,
+            cwd: gitRoot,
+        });
+    }
+    catch {
+        return null;
+    }
+}

package/dist/executor/sdk-handlers/claude/claude-tool.d.ts

@@ -30,6 +30,12 @@ export interface TasksService {
     patch(id: string, data: Partial<any>): Promise<any>;
     emit(event: string, data: unknown): void;
 }
+export interface TasksStreamingService {
+    create(data: {
+        event: 'tool:start' | 'tool:complete' | 'thinking:chunk';
+        data: Record<string, unknown>;
+    }): Promise<unknown>;
+}
 /**
  * Service interface for updating sessions via FeathersJS
  * This ensures WebSocket events are emitted when sessions are updated (e.g., permission config)
@@ -42,13 +48,15 @@ export declare class ClaudeTool implements ITool {
     private sessionsRepo?;
     private messagesService?;
     private tasksService?;
+    private tasksStreamingService?;
     readonly toolType: "claude-code";
     readonly name = "Claude Code";
     private promptService?;
-    constructor(messagesRepo?: MessagesRepository | undefined, sessionsRepo?: SessionRepository | undefined, apiKey?: string, messagesService?: MessagesService | undefined, sessionMCPRepo?: SessionMCPServerRepository, mcpServerRepo?: MCPServerRepository, permissionService?: PermissionService, tasksService?: TasksService | undefined, sessionsService?: SessionsService, worktreesRepo?: WorktreeRepository, reposRepo?: RepoRepository, mcpEnabled?: boolean, _useNativeAuth?: boolean, // Claude supports `claude login` OAuth, but no special handling needed in tool
+    constructor(messagesRepo?: MessagesRepository | undefined, sessionsRepo?: SessionRepository | undefined, apiKey?: string, messagesService?: MessagesService | undefined, sessionMCPRepo?: SessionMCPServerRepository, mcpServerRepo?: MCPServerRepository, permissionService?: PermissionService, tasksService?: TasksService | undefined, tasksStreamingService?: TasksStreamingService | undefined, sessionsService?: SessionsService, worktreesRepo?: WorktreeRepository, reposRepo?: RepoRepository, mcpEnabled?: boolean, _useNativeAuth?: boolean, // Claude supports `claude login` OAuth, but no special handling needed in tool
     inputRequestService?: import('../../input-requests/input-request-service').InputRequestService, usersRepo?: import('../../db/feathers-repositories').UsersRepository);
     getCapabilities(): ToolCapabilities;
     checkInstalled(): Promise<boolean>;
+    private emitTaskEvent;
     importSession(sessionId: string, options?: ImportOptions): Promise<SessionData>;
     /**
      * Execute a prompt against a session WITH real-time streaming

package/dist/executor/sdk-handlers/claude/claude-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/claude-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/claude-tool.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/claude/claude-tool.js

@@ -70,15 +70,17 @@ export class ClaudeTool {
     sessionsRepo;
     messagesService;
     tasksService;
+    tasksStreamingService;
     toolType = 'claude-code';
     name = 'Claude Code';
     promptService;
-    constructor(messagesRepo, sessionsRepo, apiKey, messagesService, sessionMCPRepo, mcpServerRepo, permissionService, tasksService, sessionsService, worktreesRepo, reposRepo, mcpEnabled, _useNativeAuth, // Claude supports `claude login` OAuth, but no special handling needed in tool
+    constructor(messagesRepo, sessionsRepo, apiKey, messagesService, sessionMCPRepo, mcpServerRepo, permissionService, tasksService, tasksStreamingService, sessionsService, worktreesRepo, reposRepo, mcpEnabled, _useNativeAuth, // Claude supports `claude login` OAuth, but no special handling needed in tool
     inputRequestService, usersRepo) {
         this.messagesRepo = messagesRepo;
         this.sessionsRepo = sessionsRepo;
         this.messagesService = messagesService;
         this.tasksService = tasksService;
+        this.tasksStreamingService = tasksStreamingService;
         if (messagesRepo && sessionsRepo) {
             this.promptService = new ClaudePromptService(messagesRepo, sessionsRepo, apiKey, sessionMCPRepo, mcpServerRepo, permissionService, tasksService, sessionsService, worktreesRepo, reposRepo, messagesService, mcpEnabled, inputRequestService, usersRepo);
         }
@@ -105,6 +107,14 @@ export class ClaudeTool {
             return false;
         }
     }
+    async emitTaskEvent(event, data) {
+        if (this.tasksStreamingService) {
+            await this.tasksStreamingService.create({ event, data });
+            return;
+        }
+        // Fallback for environments that don't expose /tasks/streaming.
+        this.tasksService?.emit(event, data);
+    }
     async importSession(sessionId, options) {
         // Load session using existing transcript parser
         const session = await loadClaudeSession(sessionId, options?.projectDir);
@@ -240,8 +250,8 @@ export class ClaudeTool {
             }
             // Handle tool execution start
             if (event.type === 'tool_start') {
-                if (this.tasksService && taskId) {
-                    this.tasksService.emit('tool:start', {
+                if (taskId) {
+                    await this.emitTaskEvent('tool:start', {
                         task_id: taskId,
                         session_id: sessionId,
                         tool_use_id: event.toolUseId,
@@ -251,8 +261,8 @@ export class ClaudeTool {
             }
             // Handle tool execution complete
             if (event.type === 'tool_complete') {
-                if (this.tasksService && taskId) {
-                    this.tasksService.emit('tool:complete', {
+                if (taskId) {
+                    await this.emitTaskEvent('tool:complete', {
                         task_id: taskId,
                         session_id: sessionId,
                         tool_use_id: event.toolUseId,
@@ -305,8 +315,8 @@ export class ClaudeTool {
             // Handle thinking partial (streaming)
             if (event.type === 'thinking_partial') {
                 // Emit to tasks service for task-level tracking
-                if (this.tasksService && taskId) {
-                    this.tasksService.emit('thinking:chunk', {
+                if (taskId) {
+                    await this.emitTaskEvent('thinking:chunk', {
                         task_id: taskId,
                         session_id: sessionId,
                         chunk: event.thinkingChunk,

package/dist/executor/sdk-handlers/codex/codex-tool.d.ts

@@ -11,7 +11,7 @@ import type { NormalizedSdkResponse, RawSdkResponse } from '../../types/sdk-resp
 import type { TokenUsage } from '../../types/token-usage.js';
 import { type MessageID, type MessageSource, type PermissionMode, type SessionID, type TaskID } from '../../types.js';
 import type { ITool, StreamingCallbacks, ToolCapabilities } from '../base/index.js';
-import type { MessagesService, TasksService } from '../claude/claude-tool.js';
+import type { MessagesService, TasksService, TasksStreamingService } from '../claude/claude-tool.js';
 interface CodexExecutionResult {
     userMessageId: MessageID;
     assistantMessageIds: MessageID[];
@@ -28,12 +28,15 @@ export declare class CodexTool implements ITool {
     private promptService?;
     private messagesRepo?;
     private sessionsRepo?;
+    private worktreesRepo?;
     private messagesService?;
     private tasksService?;
-    constructor(messagesRepo?: MessagesRepository, sessionsRepo?: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository, worktreesRepo?: WorktreeRepository, reposRepo?: RepoRepository, apiKey?: string, messagesService?: MessagesService, tasksService?: TasksService, _useNativeAuth?: boolean, // Codex doesn't have OAuth fallback, but accept for interface consistency
+    private tasksStreamingService?;
+    constructor(messagesRepo?: MessagesRepository, sessionsRepo?: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository, worktreesRepo?: WorktreeRepository, reposRepo?: RepoRepository, apiKey?: string, messagesService?: MessagesService, tasksService?: TasksService, tasksStreamingService?: TasksStreamingService, _useNativeAuth?: boolean, // Codex doesn't have OAuth fallback, but accept for interface consistency
     mcpServerRepo?: MCPServerRepository, usersRepo?: UsersRepository);
     getCapabilities(): ToolCapabilities;
     checkInstalled(): Promise<boolean>;
+    private emitTaskEvent;
     /**
      * Execute a prompt against a session WITH real-time streaming
      *

package/dist/executor/sdk-handlers/codex/codex-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/codex-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/codex-tool.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/codex/codex-tool.js

@@ -18,14 +18,18 @@ export class CodexTool {
     promptService;
     messagesRepo;
     sessionsRepo;
+    worktreesRepo;
     messagesService;
     tasksService;
-    constructor(messagesRepo, sessionsRepo, sessionMCPServerRepo, worktreesRepo, reposRepo, apiKey, messagesService, tasksService, _useNativeAuth, // Codex doesn't have OAuth fallback, but accept for interface consistency
+    tasksStreamingService;
+    constructor(messagesRepo, sessionsRepo, sessionMCPServerRepo, worktreesRepo, reposRepo, apiKey, messagesService, tasksService, tasksStreamingService, _useNativeAuth, // Codex doesn't have OAuth fallback, but accept for interface consistency
     mcpServerRepo, usersRepo) {
         this.messagesRepo = messagesRepo;
         this.sessionsRepo = sessionsRepo;
+        this.worktreesRepo = worktreesRepo;
         this.messagesService = messagesService;
         this.tasksService = tasksService;
+        this.tasksStreamingService = tasksStreamingService;
         if (messagesRepo && sessionsRepo) {
             this.promptService = new CodexPromptService(messagesRepo, sessionsRepo, sessionMCPServerRepo, worktreesRepo, reposRepo, apiKey, mcpServerRepo, usersRepo);
         }
@@ -51,6 +55,14 @@ export class CodexTool {
             return false;
         }
     }
+    async emitTaskEvent(event, data) {
+        if (this.tasksStreamingService) {
+            await this.tasksStreamingService.create({ event, data });
+            return;
+        }
+        // Fallback for environments that don't expose /tasks/streaming.
+        this.tasksService?.emit(event, data);
+    }
     /**
      * Execute a prompt against a session WITH real-time streaming
      *
@@ -88,6 +100,15 @@ export class CodexTool {
         let rawSdkResponse;
         let streamStarted = false; // tracks whether onStreamStart succeeded (for safe onStreamEnd)
         let wasStopped = false;
+        let workingDirectory;
+        const pendingToolMessageIds = new Map();
+        if (this.sessionsRepo && this.worktreesRepo) {
+            const session = await this.sessionsRepo.findById(sessionId);
+            if (session) {
+                const worktree = await this.worktreesRepo.findById(session.worktree_id);
+                workingDirectory = worktree?.path;
+            }
+        }
         for await (const event of this.promptService.promptSessionStreaming(sessionId, prompt, taskId, permissionMode, abortController)) {
             // Detect if execution was stopped early
             if (event.type === 'stopped') {
@@ -104,6 +125,35 @@ export class CodexTool {
                     resolvedModel = event.resolvedModel;
                 }
             }
+            // Handle tool execution start (live UI indicator)
+            if (event.type === 'tool_start') {
+                if (taskId) {
+                    await this.emitTaskEvent('tool:start', {
+                        task_id: taskId,
+                        session_id: sessionId,
+                        tool_use_id: event.toolUse.id,
+                        tool_name: event.toolUse.name,
+                    });
+                }
+                // Create tool row immediately so UI shows "running" state.
+                const toolMessageId = generateId();
+                await this.createAssistantMessage(sessionId, toolMessageId, [
+                    {
+                        type: 'tool_use',
+                        id: event.toolUse.id,
+                        name: event.toolUse.name,
+                        input: event.toolUse.input,
+                    },
+                ], [
+                    {
+                        id: event.toolUse.id,
+                        name: event.toolUse.name,
+                        input: event.toolUse.input,
+                    },
+                ], taskId, nextIndex++, resolvedModel);
+                assistantMessageIds.push(toolMessageId);
+                pendingToolMessageIds.set(event.toolUse.id, toolMessageId);
+            }
             if (event.type === 'complete' && event.usage) {
                 tokenUsage = event.usage;
             }
@@ -169,8 +219,18 @@ export class CodexTool {
             }
             // Handle tool completion (create message immediately for live updates)
             else if (event.type === 'tool_complete') {
-                // Create a message for this tool use immediately
-                const toolMessageId = generateId();
+                if (taskId) {
+                    await this.emitTaskEvent('tool:complete', {
+                        task_id: taskId,
+                        session_id: sessionId,
+                        tool_use_id: event.toolUse.id,
+                    });
+                }
+                const toolResultContent = event.toolUse.output !== undefined
+                    ? event.toolUse.output
+                    : event.toolUse.status
+                        ? `[${event.toolUse.status}]`
+                        : '';
                 const toolContent = [
                     {
                         type: 'tool_use',
@@ -183,34 +243,50 @@ export class CodexTool {
                             {
                                 type: 'tool_result',
                                 tool_use_id: event.toolUse.id,
-                                content: event.toolUse.output || `[${event.toolUse.status}]`,
+                                content: toolResultContent,
                                 is_error: event.toolUse.status === 'failed' || event.toolUse.status === 'error',
                             },
                         ]
                         : []),
                 ];
                 // Best-effort diff enrichment for Edit/Write tool results
-                enrichContentBlocks(toolContent);
-                await this.createAssistantMessage(sessionId, toolMessageId, toolContent, [
-                    {
-                        id: event.toolUse.id,
-                        name: event.toolUse.name,
-                        input: event.toolUse.input,
-                    },
-                ], taskId, nextIndex++, resolvedModel);
-                assistantMessageIds.push(toolMessageId);
+                enrichContentBlocks(toolContent, { workingDirectory });
+                const existingToolMessageId = pendingToolMessageIds.get(event.toolUse.id);
+                if (existingToolMessageId) {
+                    await this.messagesService?.patch(existingToolMessageId, {
+                        content: toolContent,
+                        content_preview: typeof toolResultContent === 'string' ? toolResultContent.substring(0, 200) : '',
+                    });
+                    pendingToolMessageIds.delete(event.toolUse.id);
+                }
+                else {
+                    // Fallback path if start event wasn't observed.
+                    const toolMessageId = generateId();
+                    await this.createAssistantMessage(sessionId, toolMessageId, toolContent, [
+                        {
+                            id: event.toolUse.id,
+                            name: event.toolUse.name,
+                            input: event.toolUse.input,
+                        },
+                    ], taskId, nextIndex++, resolvedModel);
+                    assistantMessageIds.push(toolMessageId);
+                }
             }
             // Handle complete message (save to database)
             else if (event.type === 'complete' && event.content) {
                 const usageForMessage = event.usage ?? tokenUsage;
-                // Filter out tool_use and tool_result blocks (already saved via tool_complete events)
-                // But KEEP text blocks - these contain the response
-                const textOnlyContent = event.content.filter((block) => block.type === 'text' // Only keep text blocks
-                );
-                // Only create message if there's text content (not just tools)
-                if (textOnlyContent.length > 0) {
+                // Filter out tool_use and tool_result blocks (already saved via tool_complete events),
+                // but keep text + thinking blocks so Codex reasoning is visible in the UI.
+                const nonToolContent = event.content.filter((block) => block.type === 'text' || block.type === 'thinking');
+                // Only create message if there's non-tool content (not just tools)
+                if (nonToolContent.length > 0) {
                     // Extract full text for streaming callback
-                    const fullText = textOnlyContent
+                    const fullText = nonToolContent
+                        .filter((block) => block.type === 'text')
+                        .map((block) => block.text || '')
+                        .join('');
+                    const fullThinking = nonToolContent
+                        .filter((block) => block.type === 'thinking')
                         .map((block) => block.text || '')
                         .join('');
                     // Use existing message ID from streaming (if any) or generate new
@@ -247,8 +323,26 @@ export class CodexTool {
                             }
                         }
                     }
-                    // Create complete message in DB (text only, tools already saved)
-                    await this.createAssistantMessage(sessionId, assistantMessageId, textOnlyContent, undefined, // No tool uses in this message (already saved separately)
+                    // Codex reasoning is not token-streamed by SDK. Emit a synthetic single
+                    // thinking chunk so users see reasoning activity in real time.
+                    if (streamingCallbacks && fullThinking && !fullText) {
+                        try {
+                            if (streamingCallbacks.onThinkingStart) {
+                                await streamingCallbacks.onThinkingStart(assistantMessageId, {});
+                            }
+                            if (streamingCallbacks.onThinkingChunk) {
+                                await streamingCallbacks.onThinkingChunk(assistantMessageId, fullThinking);
+                            }
+                            if (streamingCallbacks.onThinkingEnd) {
+                                await streamingCallbacks.onThinkingEnd(assistantMessageId);
+                            }
+                        }
+                        catch (err) {
+                            console.error(`[Codex] Thinking callback failed for ${assistantMessageId}:`, err);
+                        }
+                    }
+                    // Create complete message in DB (non-tool content only, tools already saved)
+                    await this.createAssistantMessage(sessionId, assistantMessageId, nonToolContent, undefined, // No tool uses in this message (already saved separately)
                     taskId, nextIndex++, resolvedModel, usageForMessage);
                     assistantMessageIds.push(assistantMessageId);
                     // Reset for next message
@@ -321,10 +415,14 @@ export class CodexTool {
      * @private
      */
     async createAssistantMessage(sessionId, messageId, content, toolUses, taskId, nextIndex, resolvedModel, tokenUsage) {
-        // Extract text content for preview
+        // Extract preview text (prefer normal text, then thinking text)
         const textBlocks = content.filter((b) => b.type === 'text').map((b) => b.text || '');
         const fullTextContent = textBlocks.join('');
-        const contentPreview = fullTextContent.substring(0, 200);
+        const fallbackThinking = content
+            .filter((b) => b.type === 'thinking')
+            .map((b) => b.text || '')
+            .join('');
+        const contentPreview = (fullTextContent || fallbackThinking).substring(0, 200);
         const message = {
             message_id: messageId,
             session_id: sessionId,

package/dist/executor/sdk-handlers/codex/prompt-service.d.ts

@@ -61,7 +61,7 @@ export type CodexStreamEvent = {
         id: string;
         name: string;
         input: Record<string, unknown>;
-        output?: string;
+        output?: string | Array<Record<string, unknown>>;
         status?: string;
     };
     threadId?: string;
@@ -151,6 +151,12 @@ export declare class CodexPromptService {
      * @returns Number of MCP servers configured
      */
     private ensureCodexConfig;
+    /**
+     * Convert Codex todo_list items to TodoWrite-compatible payload.
+     * Codex only provides completed:boolean, so we infer a single in_progress
+     * item as the first remaining incomplete step for better UI parity.
+     */
+    private codexTodosToTodoWriteInput;
     /**
      * Convert Codex item to ToolUse format
      * Maps different Codex item types to Agor tool use schema

package/dist/executor/sdk-handlers/codex/prompt-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/prompt-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/prompt-service.ts"],"names":[],"mappings":"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"}