@straiffi/archon 1.3.1 → 1.3.3

package/dist/server/lib/agent.js

@@ -182,8 +182,13 @@ const getErrorMessage = (error) => {
 };
 export const formatAgentErrorForTranscript = (error) => {
     const rawMessage = getErrorMessage(error);
-    const cleaned = rawMessage.replace(/^Agent exited with code \S+\n/, '').trim();
-    return cleaned || rawMessage;
+    const prefixMatch = rawMessage.match(/^(Agent exited with code \S+)\n(.*)/s);
+    if (!prefixMatch) {
+        return rawMessage;
+    }
+    const [, prefix, logContent] = prefixMatch;
+    const trimmedLog = logContent.trim();
+    return trimmedLog || prefix;
 };
 const getPersistedChatState = (chatSessionId) => {
     const row = db.prepare(GET_PERSISTED_CHAT_STATE_QUERY).get(chatSessionId);
@@ -915,9 +920,14 @@ const parseOpencodeJsonEvent = (event, cwd) => {
         };
     }
     if (event.type === 'error') {
-        const text = event.part?.text?.trim()
-            || (typeof event.error === 'string' ? event.error.trim() : '')
-            || '';
+        const errorText = typeof event.error === 'string'
+            ? event.error.trim()
+            : event.error && typeof event.error === 'object'
+                ? (event.error.data?.message?.trim()
+                    || event.error.message?.trim()
+                    || JSON.stringify(event.error))
+                : '';
+        const text = event.part?.text?.trim() || errorText || '';
         if (text) {
             return {
                 logFragment: `**Error:** ${text}`,
@@ -968,6 +978,18 @@ const parseOpencodeJsonLine = (line, cwd) => {
     }
     return { logFragment: null, responseFragment: null };
 };
+const buildResponseTiming = ({ startTime, firstFinalAnswerTime, isStopped, }) => {
+    if (!startTime) {
+        return null;
+    }
+    const totalMs = Date.now() - startTime;
+    if (isStopped || firstFinalAnswerTime === null) {
+        return { totalMs };
+    }
+    const thinkingMs = firstFinalAnswerTime - startTime;
+    const responseMs = Date.now() - firstFinalAnswerTime;
+    return { totalMs, thinkingMs, responseMs };
+};
 const isModelResolutionError = (message) => {
     if (typeof message !== 'string') {
         return false;
@@ -1095,6 +1117,8 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         let sessionLookupTimer = null;
         let hasResolvedOpencodeSessionId = Boolean(resumeSessionId);
         let settled = false;
+        let startTime = null;
+        let firstFinalAnswerTime = null;
         const buildState = trackBuildProcess
             ? { child: null, stopRequested: false, sessionLookupTimer: null }
             : null;
@@ -1161,7 +1185,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                         ]
                 ];
             })()
-            : ['opencode', ['run', ...(opencodeAgentMode === 'plan' ? ['--agent', 'plan'] : []), '--format', 'json', ...(opencodeAgentMode !== 'plan' ? ['--thinking'] : []), ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), prompt]];
+            : ['opencode', ['run', ...(opencodeAgentMode === 'plan' ? ['--agent', 'plan'] : []), '--format', 'json', '--thinking', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), prompt]];
         updateStatus(ticketId, 'running', null, io);
         if (tool === 'claude' && sessionId) {
             updateSessionId(ticketId, sessionId, sessionField, io);
@@ -1179,6 +1203,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             buildState.child = child;
             activeBuildProcesses.set(ticketId, buildState);
         }
+        startTime = Date.now();
         if (tool === 'claude') {
             const logLines = [];
             const responseLines = [];
@@ -1220,24 +1245,25 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 const finalLog = logLines.join('\n\n') || errOutput;
                 const finalResponse = responseLines.join('\n\n') || errOutput;
                 const modelError = isModelResolutionError(finalLog);
+                const timing = startTime ? { totalMs: Date.now() - startTime } : null;
                 if (buildState?.stopRequested) {
                     updateStatus(ticketId, 'stopped', finalLog, io, finalResponse);
-                    resolveOnce(finalResponse);
+                    resolveOnce({ response: finalResponse, responseTiming: timing });
                     return;
                 }
                 if (code === 0 && !modelError) {
                     updateStatus(ticketId, 'done', finalLog, io, finalResponse, { emit: emitSuccessUpdate });
-                    resolveOnce(finalResponse);
+                    resolveOnce({ response: finalResponse, responseTiming: timing });
                     return;
                 }
                 updateStatus(ticketId, 'error', finalLog + (errOutput ? '\n\n' + errOutput : ''), io, finalResponse);
-                rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}`));
+                rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}${errOutput !== finalLog && errOutput ? '\n\n' + errOutput : ''}`));
             });
             child.on('error', err => {
                 progressUpdater.cancel();
                 if (buildState?.stopRequested) {
                     updateStatus(ticketId, 'stopped', null, io);
-                    resolveOnce(null);
+                    resolveOnce({ response: null, responseTiming: null });
                     return;
                 }
                 updateStatus(ticketId, 'error', getErrorMessage(err), io);
@@ -1257,6 +1283,21 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             const lines = text.split('\n');
             remainder = lines.pop() ?? '';
             for (const line of lines) {
+                if (firstFinalAnswerTime === null && startTime !== null) {
+                    const trimmedLine = line.trim();
+                    if (trimmedLine.startsWith('{')) {
+                        try {
+                            const event = JSON.parse(trimmedLine);
+                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
+                                const phase = event.part.metadata?.openai?.phase;
+                                if (!phase || phase === 'final_answer') {
+                                    firstFinalAnswerTime = Date.now();
+                                }
+                            }
+                        }
+                        catch { /* best-effort timing */ }
+                    }
+                }
                 const { logFragment, responseFragment } = parseOpencodeJsonLine(line);
                 if (logFragment !== null) {
                     logLines.push(logFragment);
@@ -1299,18 +1340,19 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             const log = logLines.join('\n\n') || stderrOutput;
             const finalResponse = responseLines.join('\n\n') || stderrOutput;
             const modelError = isModelResolutionError(log);
+            const timing = buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: Boolean(buildState?.stopRequested) });
             if (buildState?.stopRequested) {
                 updateStatus(ticketId, 'stopped', log, io, finalResponse);
-                resolveOnce(finalResponse);
+                resolveOnce({ response: finalResponse, responseTiming: timing });
                 return;
             }
             if (code === 0 && !modelError) {
                 updateStatus(ticketId, 'done', log, io, finalResponse, { emit: emitSuccessUpdate });
-                resolveOnce(finalResponse);
+                resolveOnce({ response: finalResponse, responseTiming: timing });
                 return;
             }
             updateStatus(ticketId, 'error', log, io, finalResponse);
-            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}`));
+            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`));
         });
         child.on('error', err => {
             progressUpdater.cancel();
@@ -1320,7 +1362,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             }
             if (buildState?.stopRequested) {
                 updateStatus(ticketId, 'stopped', null, io);
-                resolveOnce(null);
+                resolveOnce({ response: null, responseTiming: null });
                 return;
             }
             updateStatus(ticketId, 'error', getErrorMessage(err), io);
@@ -1335,6 +1377,8 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
         let spawnTimestamp = null;
         let opencodeMetadataRefresher = null;
         let settled = false;
+        let startTime = null;
+        let firstFinalAnswerTime = null;
         let usageSnapshot = EMPTY_CHAT_USAGE_SNAPSHOT;
         const chatState = {
             child: null,
@@ -1383,7 +1427,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                         ]
                 ];
             })()
-            : ['opencode', ['run', ...(opencodeAgentMode === 'plan' ? ['--agent', 'plan'] : []), '--format', 'json', ...(opencodeAgentMode === 'build' ? ['--thinking'] : []), ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
+            : ['opencode', ['run', ...(opencodeAgentMode === 'plan' ? ['--agent', 'plan'] : []), '--format', 'json', '--thinking', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
         updateChatSessionStatus(chatSessionId, 'running', null, io);
         if (tool === 'claude' && sessionId) {
             updateChatSessionId(chatSessionId, tool, sessionId, io);
@@ -1412,6 +1456,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
         });
         chatState.child = child;
         activeChatProcesses.set(chatSessionId, chatState);
+        startTime = Date.now();
         if (tool === 'claude') {
             const logLines = [];
             const responseLines = [];
@@ -1465,6 +1510,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                         completionStatus: 'stopped',
                         finalResponse: preservedOutput.response,
                         usageSnapshot,
+                        responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                     });
                     return;
                 }
@@ -1480,11 +1526,12 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                         completionStatus: 'done',
                         finalResponse: finalOutput.response,
                         usageSnapshot,
+                        responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: false }),
                     });
                     return;
                 }
                 updateChatSessionStatus(chatSessionId, 'error', finalLog + (errOutput ? '\n\n' + errOutput : ''), io, finalResponse);
-                rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}`));
+                rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}${errOutput !== finalLog && errOutput ? '\n\n' + errOutput : ''}`));
             });
             child.on('error', err => {
                 progressUpdater.cancel();
@@ -1501,6 +1548,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                         completionStatus: 'stopped',
                         finalResponse: preservedOutput.response,
                         usageSnapshot,
+                        responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                     });
                     return;
                 }
@@ -1522,6 +1570,21 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
             remainder = lines.pop() ?? '';
             for (const line of lines) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
+                if (firstFinalAnswerTime === null && startTime !== null) {
+                    const trimmedLine = line.trim();
+                    if (trimmedLine.startsWith('{')) {
+                        try {
+                            const event = JSON.parse(trimmedLine);
+                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
+                                const phase = event.part.metadata?.openai?.phase;
+                                if (!phase || phase === 'final_answer') {
+                                    firstFinalAnswerTime = Date.now();
+                                }
+                            }
+                        }
+                        catch { /* best-effort timing */ }
+                    }
+                }
                 const { logFragment, responseFragment } = parseOpencodeJsonLine(line, cwd);
                 if (logFragment !== null) {
                     logLines.push(logFragment);
@@ -1578,6 +1641,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                     completionStatus: 'stopped',
                     finalResponse: preservedOutput?.response ?? null,
                     usageSnapshot,
+                    responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                 });
                 return;
             }
@@ -1600,11 +1664,12 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                     completionStatus: 'done',
                     finalResponse: finalOutput.response,
                     usageSnapshot,
+                    responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: false }),
                 });
                 return;
             }
             updateChatSessionStatus(chatSessionId, 'error', log, io, finalResponse);
-            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}`));
+            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`));
         });
         child.on('error', err => {
             progressUpdater.cancel();
@@ -1621,6 +1686,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                     completionStatus: 'stopped',
                     finalResponse: preservedOutput.response,
                     usageSnapshot,
+                    responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                 });
                 return;
             }
@@ -1636,6 +1702,8 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
         let spawnTimestamp = null;
         let opencodeMetadataRefresher = null;
         let settled = false;
+        let startTime = null;
+        let firstFinalAnswerTime = null;
         let usageSnapshot = EMPTY_CHAT_USAGE_SNAPSHOT;
         const specState = {
             child: null,
@@ -1673,7 +1741,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     ],
                 ];
             })()
-            : ['opencode', ['run', '--agent', 'plan', '--format', 'json', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
+            : ['opencode', ['run', '--agent', 'plan', '--format', 'json', '--thinking', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
         updateSpecSessionStatusLocal(specSessionId, 'running', null, io);
         if (tool === 'claude' && sessionId) {
             updateSpecSessionIdLocal(specSessionId, tool, sessionId, io);
@@ -1702,6 +1770,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
         });
         specState.child = child;
         activeSpecProcesses.set(specSessionId, specState);
+        startTime = Date.now();
         if (tool === 'claude') {
             const logLines = [];
             const responseLines = [];
@@ -1755,6 +1824,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                         completionStatus: 'stopped',
                         finalResponse: preservedOutput.response,
                         usageSnapshot,
+                        responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                     });
                     return;
                 }
@@ -1770,11 +1840,12 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                         completionStatus: 'done',
                         finalResponse: finalOutput.response,
                         usageSnapshot,
+                        responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: false }),
                     });
                     return;
                 }
                 updateSpecSessionStatusLocal(specSessionId, 'error', finalLog + (errOutput ? '\n\n' + errOutput : ''), io, finalResponse);
-                rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}`));
+                rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}${errOutput !== finalLog && errOutput ? '\n\n' + errOutput : ''}`));
             });
             child.on('error', err => {
                 progressUpdater.cancel();
@@ -1791,6 +1862,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                         completionStatus: 'stopped',
                         finalResponse: preservedOutput.response,
                         usageSnapshot,
+                        responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                     });
                     return;
                 }
@@ -1812,6 +1884,21 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
             remainder = lines.pop() ?? '';
             for (const line of lines) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
+                if (firstFinalAnswerTime === null && startTime !== null) {
+                    const trimmedLine = line.trim();
+                    if (trimmedLine.startsWith('{')) {
+                        try {
+                            const event = JSON.parse(trimmedLine);
+                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
+                                const phase = event.part.metadata?.openai?.phase;
+                                if (!phase || phase === 'final_answer') {
+                                    firstFinalAnswerTime = Date.now();
+                                }
+                            }
+                        }
+                        catch { /* best-effort timing */ }
+                    }
+                }
                 const { logFragment, responseFragment } = parseOpencodeJsonLine(line, cwd);
                 if (logFragment !== null) {
                     logLines.push(logFragment);
@@ -1868,6 +1955,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     completionStatus: 'stopped',
                     finalResponse: preservedOutput?.response ?? null,
                     usageSnapshot,
+                    responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                 });
                 return;
             }
@@ -1890,11 +1978,12 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     completionStatus: 'done',
                     finalResponse: finalOutput.response,
                     usageSnapshot,
+                    responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: false }),
                 });
                 return;
             }
             updateSpecSessionStatusLocal(specSessionId, 'error', log, io, finalResponse);
-            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}`));
+            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`));
         });
         child.on('error', err => {
             progressUpdater.cancel();
@@ -1911,6 +2000,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     completionStatus: 'stopped',
                     finalResponse: preservedOutput.response,
                     usageSnapshot,
+                    responseTiming: buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: true }),
                 });
                 return;
             }