@straiffi/archon 1.10.12 → 1.11.1

package/dist/server/workers/plan.js

@@ -4,10 +4,12 @@ import db from '../db.js';
 import config from '../lib/config.js';
 import { JiraApiError } from '../lib/integrations/jira.js';
 import { GitHubApiError } from '../lib/integrations/github.js';
-import { formatGenericToolCall } from '../lib/genericToolCall.js';
+import { formatCodexFileChange, formatCodexWebSearch, formatGenericToolCall } from '../lib/genericToolCall.js';
 import { PlanningReferenceError, resolveExternalPlanningDescription } from '../lib/integrations/planning.js';
 import { resolveExistingWorktreePath } from '../lib/git.js';
 import { getModelProvider, normalizeModelId } from '../lib/models.js';
+import { getAgentModelProvider, normalizeAgentModelId, requireExecutableAgent } from '../lib/agentCatalog.js';
+import { codexAgentProvider } from '../lib/codexAgentProvider.js';
 import { createOpencodeTaskSessionReader, parseOpencodeTaskEnvelope } from '../lib/opencodeTaskSessions.js';
 import { hostOpencodeSessionOperations } from '../lib/opencodeSessionOperations.js';
 import { markRetryableOpenCodeDatabaseLock, RetryableOpenCodeDatabaseLockError, retryOpenCodeDatabaseLocks } from '../lib/opencodeExecutionReliability.js';
@@ -81,9 +83,11 @@ const finalizePlanningInvocation = (invocation, status, evidence) => {
 };
 const activePlanProcesses = new Map();
 const activePlannerProcesses = new Set();
+const plannerProtocolInterrupts = new Map();
 const createPlannerRecoveryTracker = () => {
     let sawError = false;
     let latestEvent = null;
+    let latestError = '';
     let finalAnswerFragments = [];
     return {
         consume: (events) => {
@@ -92,6 +96,7 @@ const createPlannerRecoveryTracker = () => {
                 latestEvent = event.type;
                 if (event.type === 'error') {
                     sawError = true;
+                    latestError = event.message?.trim() ?? '';
                     finalAnswerFragments = [];
                     shouldResetResponse = true;
                     continue;
@@ -106,6 +111,7 @@ const createPlannerRecoveryTracker = () => {
             && latestEvent === 'final_answer'
             && finalAnswerFragments.length > 0),
         hasUnrecoveredError: () => latestEvent === 'error',
+        getUnrecoveredError: () => latestEvent === 'error' ? latestError : '',
         getRecoveredResponse: () => finalAnswerFragments.join('\n\n'),
     };
 };
@@ -254,8 +260,18 @@ const formatPlannerWriteToolCall = (input) => {
     lines.push('[[/archon-apply-patch]]');
     return lines.join('\n');
 };
-const formatPlannerToolCall = (name, input) => {
+const formatPlannerToolCall = (name, input, cwd) => {
     const normalized = normalizeToolName(name);
+    if (normalized === 'filechange') {
+        const formatted = formatCodexFileChange(input, cwd);
+        if (formatted !== null) {
+            return formatted;
+        }
+        return formatGenericToolCall(name, input);
+    }
+    if (normalized === 'websearch') {
+        return formatCodexWebSearch(input);
+    }
     if (normalized === 'edit') {
         const formatted = formatPlannerEditToolCall(input);
         if (formatted !== null) {
@@ -367,25 +383,39 @@ const parseClaudePlannerStreamJsonLine = (line) => {
     }
     return emptyParsedPlannerStreamLine();
 };
-const formatPlannerOpencodeToolUse = (event) => {
+const formatPlannerOpencodeToolUse = (event, cwd) => {
     const toolName = event.part?.tool;
     if (!toolName) {
         return null;
     }
-    return formatPlannerToolCall(toolName, event.part?.state?.input);
+    return formatPlannerToolCall(toolName, event.part?.state?.input, cwd);
 };
 const formatPlannerStepTitle = (event) => {
     const title = event.part?.title?.trim();
     return title || null;
 };
-const parseOpencodePlannerJsonEvent = (event) => {
+const parseOpencodePlannerJsonEvent = (event, cwd) => {
     const providerSessionId = event.sessionID?.trim()
         || event.sessionId?.trim()
         || event.part?.sessionID?.trim()
         || event.part?.sessionId?.trim()
         || null;
+    if (event.type === 'plan' && event.part?.type === 'text' && event.part.text) {
+        return {
+            logFragment: event.part.text,
+            responseFragment: null,
+            subagentEvents: [],
+            providerSessionId,
+            concatenateFragments: event.part.metadata?.codex?.delta === true,
+            replaceFragment: event.part.metadata?.codex?.snapshot === true,
+            fragmentGroup: event.part.metadata?.codex?.fragmentGroup
+                ?? event.part.metadata?.codex?.itemId
+                ?? null,
+        };
+    }
     if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
-        const text = event.part.text.trim();
+        const concatenateFragments = event.part.metadata?.codex?.delta === true;
+        const text = concatenateFragments ? event.part.text : event.part.text.trim();
         const phase = event.part.metadata?.openai?.phase;
         return {
             logFragment: text || null,
@@ -396,15 +426,24 @@ const parseOpencodePlannerJsonEvent = (event) => {
             recoveryEvents: text && phase === 'final_answer'
                 ? [{ type: 'final_answer', text }]
                 : [],
+            concatenateFragments,
+            fragmentGroup: event.part.metadata?.codex?.fragmentGroup
+                ?? event.part.metadata?.codex?.itemId
+                ?? null,
         };
     }
     if (event.type === 'reasoning' && event.part?.type === 'reasoning') {
-        const text = event.part.text?.trim() ?? '';
+        const concatenateFragments = event.part.metadata?.codex?.delta === true;
+        const text = concatenateFragments ? event.part.text ?? '' : event.part.text?.trim() ?? '';
         return {
             logFragment: text || null,
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
+            concatenateFragments,
+            fragmentGroup: event.part.metadata?.codex?.fragmentGroup
+                ?? event.part.metadata?.codex?.itemId
+                ?? null,
         };
     }
     if (event.type === 'tool' || event.type === 'tool_use' || event.type === 'tool_result') {
@@ -416,6 +455,7 @@ const parseOpencodePlannerJsonEvent = (event) => {
             const envelope = parseOpencodeTaskEnvelope(rawOutput);
             const output = envelope?.result ?? rawOutput;
             const taskStatus = event.part?.state?.status?.toLowerCase() ?? envelope?.state?.toLowerCase();
+            const isTerminal = Boolean(taskStatus && taskStatus !== 'running' && taskStatus !== 'pending');
             const childSessionId = envelope?.childSessionId
                 ?? (typeof event.part?.state?.metadata?.sessionID === 'string' ? event.part.state.metadata.sessionID : null)
                 ?? (typeof event.part?.state?.metadata?.sessionId === 'string' ? event.part.state.metadata.sessionId : null);
@@ -431,13 +471,15 @@ const parseOpencodePlannerJsonEvent = (event) => {
                                 sessionId: childSessionId,
                             }]
                         : []),
-                    ...(output
+                    ...(output || isTerminal
                         ? [{
-                                kind: taskStatus === 'running' || taskStatus === 'pending' ? 'fragment' : 'complete',
+                                kind: isTerminal ? 'complete' : 'fragment',
                                 callId: event.part?.callID ?? null,
-                                text: output,
+                                ...(output ? { text: output } : {}),
                                 sessionId: childSessionId,
-                                status: taskStatus === 'error' || taskStatus === 'failed' ? 'error' : 'done',
+                                status: taskStatus === 'error' || taskStatus === 'failed'
+                                    ? 'error'
+                                    : taskStatus === 'stopped' ? 'stopped' : 'done',
                             }]
                         : []),
                 ],
@@ -448,7 +490,7 @@ const parseOpencodePlannerJsonEvent = (event) => {
             return { ...emptyParsedPlannerStreamLine(), providerSessionId };
         }
         return {
-            logFragment: formatPlannerOpencodeToolUse(event),
+            logFragment: formatPlannerOpencodeToolUse(event, cwd),
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
@@ -474,12 +516,12 @@ const parseOpencodePlannerJsonEvent = (event) => {
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
-            recoveryEvents: [{ type: 'error' }],
+            recoveryEvents: [{ type: 'error', message: text }],
         };
     }
     return { ...emptyParsedPlannerStreamLine(), providerSessionId };
 };
-const parseOpencodePlannerJsonLine = (line) => {
+const parseOpencodePlannerJsonLine = (line, cwd) => {
     const trimmedLine = line.trim();
     if (!trimmedLine) {
         return emptyParsedPlannerStreamLine();
@@ -510,6 +552,9 @@ const parseOpencodePlannerJsonLine = (line) => {
     const recoveryEvents = [];
     let providerSessionId = null;
     let hasFinalAnswer = false;
+    let concatenateFragments;
+    let replaceFragment;
+    let fragmentGroup;
     for (const jsonObject of jsonObjects) {
         let event;
         try {
@@ -518,7 +563,7 @@ const parseOpencodePlannerJsonLine = (line) => {
         catch {
             continue;
         }
-        const parsedEvent = parseOpencodePlannerJsonEvent(event);
+        const parsedEvent = parseOpencodePlannerJsonEvent(event, cwd);
         const eventRecoveryEvents = parsedEvent.recoveryEvents ?? [];
         if (eventRecoveryEvents.some(recoveryEvent => recoveryEvent.type === 'error')) {
             responseFragments.length = 0;
@@ -533,6 +578,11 @@ const parseOpencodePlannerJsonLine = (line) => {
         recoveryEvents.push(...eventRecoveryEvents);
         providerSessionId = providerSessionId ?? parsedEvent.providerSessionId;
         hasFinalAnswer ||= parsedEvent.hasFinalAnswer === true;
+        if (jsonObjects.length === 1) {
+            concatenateFragments = parsedEvent.concatenateFragments;
+            replaceFragment = parsedEvent.replaceFragment;
+            fragmentGroup = parsedEvent.fragmentGroup;
+        }
     }
     if (remainder) {
         const envelope = parseOpencodeTaskEnvelope(remainder);
@@ -557,6 +607,9 @@ const parseOpencodePlannerJsonLine = (line) => {
         providerSessionId,
         recoveryEvents,
         hasFinalAnswer,
+        concatenateFragments,
+        replaceFragment,
+        fragmentGroup,
     };
 };
 const attachPlannerTranscriptRuns = (error, transcriptRuns) => {
@@ -950,12 +1003,10 @@ const resolvePlannerCwd = (project, branch) => {
     }
     return resolveExistingWorktreePath(branch, project) ?? project.repo_path;
 };
-export const updatePlanningSessionId = (ticketId, sessionId, io, sessionOperations) => {
-    const existing = getTicket(ticketId);
-    const resolvedTool = resolveTicketTool(existing, config.tool ?? 'opencode');
-    db.prepare('UPDATE tickets SET planning_session_id = ?, tool = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(sessionId, resolvedTool, ticketId);
+export const updatePlanningSessionId = (ticketId, sessionId, tool, io, sessionOperations) => {
+    db.prepare('UPDATE tickets SET planning_session_id = ?, tool = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(sessionId, tool, ticketId);
     const ticket = getTicket(ticketId);
-    if (ticket && resolveTicketTool(ticket, config.tool ?? 'opencode') === 'opencode') {
+    if (ticket && tool === 'opencode') {
         if (sessionOperations) {
             void storeTicketUsageSnapshot(ticket.id, sessionId, sessionOperations);
         }
@@ -1001,9 +1052,15 @@ const killPlannerProcess = (proc, signal) => {
     }
 };
 export const stopPlannerProcesses = async (children) => {
-    for (const child of children) {
-        killPlannerProcess(child, 'SIGTERM');
-    }
+    await Promise.all(children.map(async (child) => {
+        const protocolInterrupt = plannerProtocolInterrupts.get(child);
+        if (protocolInterrupt) {
+            await protocolInterrupt().catch(() => killPlannerProcess(child, 'SIGTERM'));
+        }
+        else {
+            killPlannerProcess(child, 'SIGTERM');
+        }
+    }));
     const deadline = Date.now() + PLANNER_KILL_GRACE_MS;
     while (children.some(isPlannerProcessAlive) && Date.now() < deadline) {
         await new Promise(resolve => setTimeout(resolve, 100));
@@ -1013,7 +1070,7 @@ export const stopPlannerProcesses = async (children) => {
     }
 };
 const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) => {
-    const resolvedModel = normalizeModelId(model);
+    const resolvedModel = normalizeAgentModelId(tool, model);
     const finalPrompt = tool === 'claude'
         ? appendClaudeHeadlessPlanPrompt(prompt)
         : prompt;
@@ -1025,10 +1082,10 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
     let spawnTimestamp = null;
     let sessionLookupTimer = null;
     let hasResolvedSessionId = Boolean(sessionTracking?.resumeSessionId);
-    const [cmd, args] = tool === 'claude'
+    const [cmd, args, stdio] = tool === 'claude'
         ? (() => {
             if (!sessionTracking) {
-                return ['claude', [...buildClaudeHeadlessPlanArgs(), '--print', '--verbose', '--output-format', 'stream-json', finalPrompt]];
+                return ['claude', [...buildClaudeHeadlessPlanArgs(), '--print', '--verbose', '--output-format', 'stream-json', finalPrompt], ['ignore', 'pipe', 'pipe']];
             }
             sessionId = sessionTracking.resumeSessionId || randomUUID();
             return [
@@ -1043,22 +1100,38 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                     sessionId,
                     finalPrompt,
                 ],
+                ['ignore', 'pipe', 'pipe'],
             ];
         })()
-        : [
-            'opencode',
-            [
-                'run',
-                '--agent',
-                'plan',
-                '--format',
-                'json',
-                ...(sessionTracking?.resumeSessionId ? ['--session', sessionTracking.resumeSessionId] : []),
-                ...(resolvedModel ? ['--model', resolvedModel] : []),
-                ...(variant ? ['--variant', variant] : []),
-                finalPrompt,
-            ],
-        ];
+        : tool === 'codex'
+            ? (() => {
+                const invocation = codexAgentProvider.buildStreamingInvocation({
+                    cwd: cwd ?? process.cwd(),
+                    prompt: finalPrompt,
+                    model: resolvedModel || null,
+                    variant,
+                    skills: options.skills,
+                    mode: 'plan',
+                    resumeSessionId: sessionTracking?.resumeSessionId ?? null,
+                    sessionId: randomUUID(),
+                });
+                return [invocation.command, [...invocation.args], invocation.stdio];
+            })()
+            : [
+                'opencode',
+                [
+                    'run',
+                    '--agent',
+                    'plan',
+                    '--format',
+                    'json',
+                    ...(sessionTracking?.resumeSessionId ? ['--session', sessionTracking.resumeSessionId] : []),
+                    ...(resolvedModel ? ['--model', resolvedModel] : []),
+                    ...(variant ? ['--variant', variant] : []),
+                    finalPrompt,
+                ],
+                ['ignore', 'pipe', 'pipe'],
+            ];
     return new Promise((resolve, reject) => {
         let settled = false;
         let completionForced = false;
@@ -1118,7 +1191,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             }
             if (sessionTracking && !hasResolvedSessionId) {
                 hasResolvedSessionId = true;
-                updatePlanningSessionId(sessionTracking.ticketId, normalized, sessionTracking.io, opencodeSessionOperations ?? undefined);
+                updatePlanningSessionId(sessionTracking.ticketId, normalized, tool, sessionTracking.io, opencodeSessionOperations ?? undefined);
             }
         };
         const attemptOpencodeSessionLookup = async () => {
@@ -1140,6 +1213,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             spawnTimestamp = Date.now();
         }
         let child;
+        let providerStdout = null;
         let placementFailure = Promise.resolve(null);
         try {
             if (options.executionProvider) {
@@ -1148,7 +1222,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                     target: options.executionTarget ?? null,
                     command: cmd,
                     args,
-                    stdio: ['ignore', 'pipe', 'pipe'],
+                    stdio,
                     launcherEnvironment: options.executionLauncherEnvironment ?? createHostLauncherEnvironment(),
                     runtimeEnvironment: options.executionRuntimeEnvironment ?? createLegacyHostRuntimeEnvironment(cwd ?? process.cwd(), cwd ? { PWD: cwd } : {}),
                     detached: process.platform !== 'win32',
@@ -1164,7 +1238,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             }
             else {
                 child = spawn(cmd, args, {
-                    stdio: ['ignore', 'pipe', 'pipe'],
+                    stdio,
                     env: cwd ? createWorkspaceProcessEnvironment(cwd, { PWD: cwd }) : process.env,
                     detached: process.platform !== 'win32',
                     ...(cwd ? { cwd } : {}),
@@ -1178,6 +1252,28 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             return;
         }
         activePlannerProcesses.add(child);
+        if (tool === 'codex') {
+            const connection = codexAgentProvider.connectStreamingInvocation?.(child, {
+                cwd: cwd ?? process.cwd(),
+                prompt: finalPrompt,
+                model: resolvedModel || null,
+                variant,
+                skills: options.skills,
+                mode: 'plan',
+                resumeSessionId: sessionTracking?.resumeSessionId ?? null,
+                sessionId: randomUUID(),
+            }, {
+                runtimeEnvironmentKind: options.executionRuntimeEnvironment?.kind ?? 'host',
+            });
+            if (connection) {
+                providerStdout = connection.stdout;
+                plannerProtocolInterrupts.set(child, connection.interrupt);
+                void connection.sessionReady.then(bindResolvedProviderSession).catch(() => { });
+                if (options.cancellationState?.stopRequested) {
+                    void connection.interrupt().catch(() => killPlannerProcess(child, 'SIGTERM'));
+                }
+            }
+        }
         if (options.cancellationState) {
             options.cancellationState.researchChildren.add(child);
             if (options.cancellationState.stopRequested) {
@@ -1224,6 +1320,9 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
         let usageSnapshot = EMPTY_CHAT_USAGE_SNAPSHOT;
         let remainder = '';
         let insideHiddenBlock = false;
+        let concatenatingLogGroup;
+        let concatenatingResponseGroup;
+        const logIndexesByGroup = new Map();
         const startTime = Date.now();
         let firstFinalAnswerTime = null;
         const emitProgress = () => {
@@ -1236,25 +1335,27 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
         };
         const isHiddenOpenTag = /^\s*<archon-[a-z0-9-]+>\s*$/i;
         const isHiddenCloseTag = /^\s*<\/archon-[a-z0-9-]+>\s*$/i;
-        child.stdout?.on('data', (chunk) => {
+        const outputStream = providerStdout ?? child.stdout;
+        outputStream?.on('data', (chunk) => {
             stdoutChunks.push(chunk);
             lastStdoutAt = Date.now();
             const text = remainder + chunk.toString();
             const lines = text.split('\n');
             remainder = lines.pop() ?? '';
             for (const line of lines) {
-                if (tool === 'claude') {
+                if (tool === 'claude' || tool === 'codex') {
                     usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                 }
                 const parsedLine = tool === 'claude'
                     ? parseClaudePlannerStreamJsonLine(line)
-                    : parseOpencodePlannerJsonLine(line);
+                    : parseOpencodePlannerJsonLine(line, cwd);
                 const { logFragment, responseFragment, subagentEvents, providerSessionId } = parsedLine;
-                if (tool === 'opencode' && recoveryTracker.consume(parsedLine.recoveryEvents)) {
+                if ((tool === 'opencode' || tool === 'codex') && recoveryTracker.consume(parsedLine.recoveryEvents)) {
                     responseLines.length = 0;
+                    concatenatingResponseGroup = undefined;
                     firstFinalAnswerTime = null;
                 }
-                if (tool === 'opencode' && firstFinalAnswerTime === null && parsedLine.hasFinalAnswer) {
+                if ((tool === 'opencode' || tool === 'codex') && firstFinalAnswerTime === null && parsedLine.hasFinalAnswer) {
                     firstFinalAnswerTime = Date.now();
                 }
                 subagentTracker?.handle(subagentEvents);
@@ -1268,11 +1369,35 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                     insideHiddenBlock = false;
                 }
                 if (logFragment !== null) {
-                    logLines.push(logFragment);
+                    if (parsedLine.replaceFragment && parsedLine.fragmentGroup) {
+                        const index = logIndexesByGroup.get(parsedLine.fragmentGroup);
+                        if (index === undefined) {
+                            logIndexesByGroup.set(parsedLine.fragmentGroup, logLines.push(logFragment) - 1);
+                        }
+                        else {
+                            logLines[index] = logFragment;
+                        }
+                    }
+                    else if (parsedLine.concatenateFragments && concatenatingLogGroup === parsedLine.fragmentGroup && logLines.length > 0) {
+                        logLines[logLines.length - 1] += logFragment;
+                    }
+                    else {
+                        const index = logLines.push(logFragment) - 1;
+                        if (parsedLine.fragmentGroup) {
+                            logIndexesByGroup.set(parsedLine.fragmentGroup, index);
+                        }
+                    }
+                    concatenatingLogGroup = parsedLine.concatenateFragments ? parsedLine.fragmentGroup ?? null : undefined;
                 }
                 const isHiddenTagLine = isHiddenOpenTag.test(line) || isHiddenCloseTag.test(line);
                 if (responseFragment !== null && !isHiddenTagLine && !insideHiddenBlock) {
-                    responseLines.push(responseFragment);
+                    if (parsedLine.concatenateFragments && concatenatingResponseGroup === parsedLine.fragmentGroup && responseLines.length > 0) {
+                        responseLines[responseLines.length - 1] += responseFragment;
+                    }
+                    else {
+                        responseLines.push(responseFragment);
+                    }
+                    concatenatingResponseGroup = parsedLine.concatenateFragments ? parsedLine.fragmentGroup ?? null : undefined;
                 }
                 if (logFragment !== null || responseFragment !== null) {
                     emitProgress();
@@ -1282,6 +1407,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
         child.stderr?.on('data', (chunk) => stderrChunks.push(chunk));
         child.on('close', async (code) => {
             activePlannerProcesses.delete(child);
+            plannerProtocolInterrupts.delete(child);
             options.cancellationState?.researchChildren.delete(child);
             clearWatchdogTimer();
             const placementError = await placementFailure;
@@ -1290,18 +1416,19 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                 return;
             }
             if (remainder.trim()) {
-                if (tool === 'claude') {
+                if (tool === 'claude' || tool === 'codex') {
                     usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
                 }
                 const parsedLine = tool === 'claude'
                     ? parseClaudePlannerStreamJsonLine(remainder)
-                    : parseOpencodePlannerJsonLine(remainder);
+                    : parseOpencodePlannerJsonLine(remainder, cwd);
                 const { logFragment, responseFragment, subagentEvents, providerSessionId } = parsedLine;
-                if (tool === 'opencode' && recoveryTracker.consume(parsedLine.recoveryEvents)) {
+                if ((tool === 'opencode' || tool === 'codex') && recoveryTracker.consume(parsedLine.recoveryEvents)) {
                     responseLines.length = 0;
+                    concatenatingResponseGroup = undefined;
                     firstFinalAnswerTime = null;
                 }
-                if (tool === 'opencode' && firstFinalAnswerTime === null && parsedLine.hasFinalAnswer) {
+                if ((tool === 'opencode' || tool === 'codex') && firstFinalAnswerTime === null && parsedLine.hasFinalAnswer) {
                     firstFinalAnswerTime = Date.now();
                 }
                 subagentTracker?.handle(subagentEvents);
@@ -1309,11 +1436,35 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                     bindResolvedProviderSession(providerSessionId);
                 }
                 if (logFragment !== null) {
-                    logLines.push(logFragment);
+                    if (parsedLine.replaceFragment && parsedLine.fragmentGroup) {
+                        const index = logIndexesByGroup.get(parsedLine.fragmentGroup);
+                        if (index === undefined) {
+                            logIndexesByGroup.set(parsedLine.fragmentGroup, logLines.push(logFragment) - 1);
+                        }
+                        else {
+                            logLines[index] = logFragment;
+                        }
+                    }
+                    else if (parsedLine.concatenateFragments && concatenatingLogGroup === parsedLine.fragmentGroup && logLines.length > 0) {
+                        logLines[logLines.length - 1] += logFragment;
+                    }
+                    else {
+                        const index = logLines.push(logFragment) - 1;
+                        if (parsedLine.fragmentGroup) {
+                            logIndexesByGroup.set(parsedLine.fragmentGroup, index);
+                        }
+                    }
+                    concatenatingLogGroup = parsedLine.concatenateFragments ? parsedLine.fragmentGroup ?? null : undefined;
                 }
                 const remainderIsHiddenTagLine = isHiddenOpenTag.test(remainder) || isHiddenCloseTag.test(remainder);
                 if (responseFragment !== null && !remainderIsHiddenTagLine && !insideHiddenBlock) {
-                    responseLines.push(responseFragment);
+                    if (parsedLine.concatenateFragments && concatenatingResponseGroup === parsedLine.fragmentGroup && responseLines.length > 0) {
+                        responseLines[responseLines.length - 1] += responseFragment;
+                    }
+                    else {
+                        responseLines.push(responseFragment);
+                    }
+                    concatenatingResponseGroup = parsedLine.concatenateFragments ? parsedLine.fragmentGroup ?? null : undefined;
                 }
             }
             opencodeSubagentMonitor?.refresh();
@@ -1321,9 +1472,10 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             const errorOutput = Buffer.concat(stderrChunks).toString().trim();
             const recoveredResponse = recoveryTracker.getRecoveredResponse();
             const parsedResponse = responseLines.join('\n\n').trim();
-            const streamedOutput = tool === 'opencode' && recoveryTracker.hasRecoveredFinalAnswer()
+            const isStructuredStream = tool === 'opencode' || tool === 'codex';
+            const streamedOutput = isStructuredStream && recoveryTracker.hasRecoveredFinalAnswer()
                 ? recoveredResponse
-                : tool === 'opencode'
+                : isStructuredStream
                     ? parsedResponse || (rawOutput.startsWith('{') ? '' : rawOutput)
                     : !rawOutput.startsWith('{')
                         ? rawOutput
@@ -1379,7 +1531,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             const fallbackError = code === 0
                 ? 'Planner did not return a usable plan.'
                 : `Process exited with code ${code}`;
-            const error = new Error(output || errorOutput || fallbackError);
+            const error = new Error(output || errorOutput || recoveryTracker.getUnrecoveredError() || fallbackError);
             const retryableError = tool === 'opencode' && stdoutChunks.length === 0
                 ? markRetryableOpenCodeDatabaseLock(error)
                 : error;
@@ -1393,6 +1545,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
         });
         child.on('error', err => {
             activePlannerProcesses.delete(child);
+            plannerProtocolInterrupts.delete(child);
             options.cancellationState?.researchChildren.delete(child);
             clearWatchdogTimer();
             if (sessionLookupTimer && hasResolvedSessionId) {
@@ -1702,11 +1855,12 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
     if (linkedProjects.length === 0) {
         return [];
     }
-    const tool = options.tool ?? config.tool ?? 'opencode';
+    const tool = requireExecutableAgent(options.tool ?? config.tool ?? 'opencode');
     let decision;
     const selectionInvocation = createPlanningInvocation(options, 'Linked Research Selection', 'research-selection');
     try {
         const { output } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, buildLinkedProjectSelectionPrompt(taskDescription, project, linkedProjects), cwd, {
+            skills: options.skills,
             agentRunParent: resolvePlannerAgentRunParent(options),
             executionContext: options.executionContext,
             cancellationState: options.cancellationState,
@@ -1738,6 +1892,7 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
             const legacyInvocation = createPlanningInvocation(options, `Linked Research: ${linkedProject.name}`, 'research');
             try {
                 const { output } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, prependSkillPromptBlock(buildLinkedProjectResearchPrompt(project, linkedProject, request), options.skills ?? []), linkedProject.repo_path, {
+                    skills: options.skills,
                     agentRunParent: resolvePlannerAgentRunParent(options),
                     cancellationState: options.cancellationState,
                     ...(legacyInvocation ? { mainRun: legacyInvocation } : {}),
@@ -1800,6 +1955,7 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
                 skills: options.skills ?? [],
                 target: executionTarget,
                 workload: 'plan',
+                signal: options.cancellationState?.abortController?.signal,
             });
             const invocationId = createAgentRun({
                 executionRunId: childContext.runId,
@@ -1821,6 +1977,7 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
                 role: invocationRun.role,
             };
             const { output } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, prependSkillPromptBlock(buildLinkedProjectResearchPrompt(project, linkedProject, request), options.skills ?? []), resolvedTarget.workspacePath, {
+                skills: options.skills,
                 agentRunParent: options.agentRunParent
                     ? { parentType: 'planning', parentId: linkedProject.id, io: options.agentRunParent.io }
                     : undefined,
@@ -1867,7 +2024,7 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
     return linkedResearch.filter((result) => result !== null);
 };
 export const generatePlanText = (title, description, options = {}) => {
-    const tool = options.tool ?? config.tool ?? 'opencode';
+    const tool = requireExecutableAgent(options.tool ?? config.tool ?? 'opencode');
     const project = options.projectId ? getProjectById(options.projectId) : null;
     return (async () => {
         const invocation = createPlanningInvocation(options, 'Ticket Planning', 'planning');
@@ -1882,6 +2039,7 @@ export const generatePlanText = (title, description, options = {}) => {
         });
         const { output: plannerOutput, responseTiming: plannerTiming, usageSnapshot, transcriptRuns } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, prependSkillPromptBlock(buildSingleTicketPrompt(title, description, linkedResearchContext, projectMemoryBlock, Boolean(project?.memory_enabled), Boolean(options.ticketId)), options.skills ?? []), options.cwd ?? resolvePlannerCwd(project, options.branch), {
             onProgress: options.onProgress,
+            skills: options.skills,
             ...(options.ticketId && options.io
                 ? {
                     sessionTracking: {
@@ -1949,7 +2107,7 @@ export const generatePlanText = (title, description, options = {}) => {
     })();
 };
 export const generatePlanningTicketOutline = async (description, options = {}) => {
-    const tool = options.tool ?? config.tool ?? 'opencode';
+    const tool = requireExecutableAgent(options.tool ?? config.tool ?? 'opencode');
     const project = options.projectId ? getProjectById(options.projectId) : null;
     const invocation = createPlanningInvocation(options, 'Planning Outline', 'planning-outline');
     try {
@@ -1963,6 +2121,7 @@ export const generatePlanningTicketOutline = async (description, options = {}) =
             ...(invocation ? { invocation: { parentType: invocation.parentType, parentId: invocation.parentId, agentRunId: invocation.id } } : {}),
         });
         const { output } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, prependSkillPromptBlock(buildPlanningAgentOutlinePrompt(description, linkedResearchContext, projectMemoryBlock), options.skills ?? []), options.cwd ?? resolvePlannerCwd(project, options.branch), {
+            skills: options.skills,
             agentRunParent: resolvePlannerAgentRunParent(options),
             executionContext: options.executionContext,
             ...plannerExecutionOptions(options),
@@ -1978,7 +2137,7 @@ export const generatePlanningTicketOutline = async (description, options = {}) =
     }
 };
 export const expandPlanningTicketOutline = async (description, outline, options = {}) => {
-    const tool = options.tool ?? config.tool ?? 'opencode';
+    const tool = requireExecutableAgent(options.tool ?? config.tool ?? 'opencode');
     const project = options.projectId ? getProjectById(options.projectId) : null;
     const invocation = createPlanningInvocation(options, 'Planning Expansion', 'planning-expansion');
     try {
@@ -1992,6 +2151,7 @@ export const expandPlanningTicketOutline = async (description, outline, options
             ...(invocation ? { invocation: { parentType: invocation.parentType, parentId: invocation.parentId, agentRunId: invocation.id } } : {}),
         });
         const { output } = await runPlannerPrompt(tool, options.model ?? null, options.variant ?? null, prependSkillPromptBlock(buildPlanningAgentExpansionPrompt(description, outline, linkedResearchContext, projectMemoryBlock), options.skills ?? []), options.cwd ?? resolvePlannerCwd(project, options.branch), {
+            skills: options.skills,
             agentRunParent: resolvePlannerAgentRunParent(options),
             executionContext: options.executionContext,
             ...plannerExecutionOptions(options),
@@ -2056,7 +2216,7 @@ export const startPlan = (ticket, io, options = {}) => {
     };
     const targetBundleId = options.targetBundleId === undefined ? ticket.worktree_bundle_id : options.targetBundleId;
     const targetBranch = options.branch === undefined ? resolveTicketBranch(ticket) : options.branch;
-    const runTool = resolveTicketTool(ticket, config.tool ?? 'opencode');
+    const runTool = requireExecutableAgent(resolveTicketTool(ticket, config.tool ?? 'opencode'));
     const runSkills = options.skills ?? ticket.skills ?? [];
     const executionRun = createExecutionRun({
         projectId: project.id,
@@ -2087,7 +2247,11 @@ export const startPlan = (ticket, io, options = {}) => {
         projectId: executionRun.project_id,
         kind: executionRun.kind,
     };
-    const cancellationState = { researchChildren: new Set(), stopRequested: false };
+    const cancellationState = {
+        researchChildren: new Set(),
+        stopRequested: false,
+        abortController: new AbortController(),
+    };
     activePlanProcesses.set(ticket.id, cancellationState);
     let queuedJob;
     try {
@@ -2153,6 +2317,7 @@ export const startPlan = (ticket, io, options = {}) => {
                     skills: runSkills,
                     target: executionTarget,
                     workload: 'plan',
+                    signal: cancellationState.abortController?.signal,
                 });
                 const planningSessionId = options.providerContinuation === 'fresh' ? null : ticket.planning_session_id;
                 if (planningSessionId) {
@@ -2163,7 +2328,7 @@ export const startPlan = (ticket, io, options = {}) => {
                         parentId: ticket.id,
                         sessionId: planningSessionId,
                         agent: runTool,
-                        modelProvider: runTool === 'claude' ? 'anthropic' : getModelProvider(ticket.model),
+                        modelProvider: getAgentModelProvider(runTool, ticket.model),
                         authority: workloadEnvironment.runAuthority,
                     });
                 }
@@ -2202,7 +2367,7 @@ export const startPlan = (ticket, io, options = {}) => {
                     }, io);
                     return;
                 }
-                const resolvedTool = resolveTicketTool(ticket, config.tool ?? 'opencode');
+                const resolvedTool = requireExecutableAgent(resolveTicketTool(ticket, config.tool ?? 'opencode'));
                 if (resolvedTool === 'opencode') {
                     const freshTicket = getTicket(ticket.id);
                     if (freshTicket?.planning_session_id) {
@@ -2215,7 +2380,7 @@ export const startPlan = (ticket, io, options = {}) => {
                         }
                     }
                 }
-                else if (resolvedTool === 'claude' && planned.usageSnapshot) {
+                else if ((resolvedTool === 'claude' || resolvedTool === 'codex') && planned.usageSnapshot) {
                     const freshTicket = getTicket(ticket.id);
                     if (freshTicket) {
                         storeTicketUsageSnapshotDirect(freshTicket.id, planned.usageSnapshot);
@@ -2409,6 +2574,7 @@ export const stopPlan = async (ticketId) => {
         return false;
     }
     state.stopRequested = true;
+    state.abortController?.abort();
     const children = [...state.researchChildren];
     await stopPlannerProcesses(children);
     return true;
@@ -2416,6 +2582,7 @@ export const stopPlan = async (ticketId) => {
 export const stopAllPlanAgents = async () => {
     for (const state of activePlanProcesses.values()) {
         state.stopRequested = true;
+        state.abortController?.abort();
     }
     await stopPlannerProcesses([...activePlannerProcesses]);
 };