@straiffi/archon 1.8.11 → 1.8.13

package/dist/server/lib/agent.js

@@ -17,6 +17,8 @@ import { markTicketDescriptionVisibleInBundle } from './ticketMessages.js';
 import { getTicket } from './tickets.js';
 import { createTranscriptRunSnapshots } from './transcriptRuns.js';
 import { createWorkspaceProcessEnvironment } from './workspaceProcessEnvironment.js';
+import { OpencodeModelResolutionError, parseOpencodeError, parseOpencodeStderrModelResolutionError, } from './opencodeErrors.js';
+import { extractLeadingOpencodeJsonObjects } from './opencodePromptOutput.js';
 import { assertAgentSpawnPermit, AgentSpawnPermitRevokedError } from './agentSpawnPermits.js';
 const withTranscriptRuns = (value, transcriptRuns) => {
     return transcriptRuns ? { ...value, transcriptRuns } : value;
@@ -25,6 +27,8 @@ const createOpencodeRecoveryTracker = () => {
     let sawError = false;
     let latestEvent = null;
     let recoveredFinalAnswerFragments = [];
+    let latestError = null;
+    let modelResolutionError = null;
     return {
         consume: events => {
             let shouldResetResponse = false;
@@ -32,6 +36,10 @@ const createOpencodeRecoveryTracker = () => {
                 latestEvent = event.type;
                 if (event.type === 'error') {
                     sawError = true;
+                    latestError = event.error;
+                    if (event.error?.isModelResolutionError) {
+                        modelResolutionError = event.error;
+                    }
                     recoveredFinalAnswerFragments = [];
                     shouldResetResponse = true;
                     continue;
@@ -46,12 +54,21 @@ const createOpencodeRecoveryTracker = () => {
             && latestEvent === 'final_answer'
             && recoveredFinalAnswerFragments.length > 0),
         hasUnrecoveredError: () => latestEvent === 'error',
+        getModelResolutionError: () => modelResolutionError,
+        getUnrecoveredError: () => latestEvent === 'error' ? latestError : null,
         getRecoveredResponse: () => recoveredFinalAnswerFragments.join('\n\n'),
     };
 };
-const isSuccessfulOpencodeExit = (code, modelError, recoveryTracker) => (!modelError
+const isSuccessfulOpencodeExit = (code, stderrModelError, recoveryTracker) => (!stderrModelError
+    && !recoveryTracker.getModelResolutionError()
     && !recoveryTracker.hasUnrecoveredError()
     && (code === 0 || recoveryTracker.hasRecoveredFinalAnswer()));
+const createOpencodeExitError = (message, stderrModelError, recoveryTracker) => {
+    const structuredError = recoveryTracker.getModelResolutionError() ?? recoveryTracker.getUnrecoveredError();
+    return structuredError?.isModelResolutionError || stderrModelError
+        ? new OpencodeModelResolutionError(message)
+        : new Error(message);
+};
 export class AgentContinuationRejectedError extends Error {
     constructor(message) {
         super(message);
@@ -284,7 +301,7 @@ export const mergeUsageFromJsonLine = (current, line) => {
     if (!trimmedLine.startsWith('{')) {
         return current;
     }
-    const { jsonObjects } = extractLeadingJsonObjects(trimmedLine);
+    const { jsonObjects } = extractLeadingOpencodeJsonObjects(trimmedLine);
     let next = current;
     for (const jsonObject of jsonObjects) {
         try {
@@ -956,6 +973,7 @@ const emptyParsedStreamLine = () => ({
     responseFragment: null,
     subagentEvents: [],
     providerSessionId: null,
+    modelResolutionError: false,
 });
 const isExecutionCapableParsedStreamLine = (parsed) => (parsed.logFragment !== null
     || parsed.responseFragment !== null
@@ -1067,62 +1085,6 @@ const formatOpencodeStepTitle = (event) => {
     const title = event.part?.title?.trim();
     return title || null;
 };
-const extractLeadingJsonObject = (line) => {
-    if (!line.startsWith('{')) {
-        return null;
-    }
-    let depth = 0;
-    let inString = false;
-    let escaping = false;
-    for (let index = 0; index < line.length; index += 1) {
-        const char = line[index];
-        if (inString) {
-            if (escaping) {
-                escaping = false;
-                continue;
-            }
-            if (char === '\\') {
-                escaping = true;
-                continue;
-            }
-            if (char === '"') {
-                inString = false;
-            }
-            continue;
-        }
-        if (char === '"') {
-            inString = true;
-            continue;
-        }
-        if (char === '{') {
-            depth += 1;
-            continue;
-        }
-        if (char === '}') {
-            depth -= 1;
-            if (depth === 0) {
-                return line.slice(0, index + 1);
-            }
-        }
-    }
-    return null;
-};
-const extractLeadingJsonObjects = (line) => {
-    const jsonObjects = [];
-    let remaining = line.trim();
-    while (remaining.startsWith('{')) {
-        const jsonObject = extractLeadingJsonObject(remaining);
-        if (!jsonObject) {
-            break;
-        }
-        jsonObjects.push(jsonObject);
-        remaining = remaining.slice(jsonObject.length).trim();
-    }
-    return {
-        jsonObjects,
-        remainder: remaining,
-    };
-};
 const parseOpencodeJsonEvent = (event, cwd) => {
     const providerSessionId = event.sessionID?.trim()
         || event.sessionId?.trim()
@@ -1137,6 +1099,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             responseFragment: text && (!phase || phase === 'final_answer') ? text : null,
             subagentEvents: [],
             providerSessionId,
+            modelResolutionError: false,
             recoveryEvents: text && phase === 'final_answer'
                 ? [{ type: 'final_answer', text }]
                 : [],
@@ -1149,6 +1112,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
+            modelResolutionError: false,
         };
     }
     if (event.type === 'tool' || event.type === 'tool_use' || event.type === 'tool_result') {
@@ -1188,6 +1152,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
                         : []),
                 ],
                 providerSessionId,
+                modelResolutionError: false,
             };
         }
         if (!isToolInvocation) {
@@ -1199,6 +1164,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
+            modelResolutionError: false,
         };
     }
     if (event.type === 'step_start') {
@@ -1207,6 +1173,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
+            modelResolutionError: false,
         };
     }
     if (event.type === 'step_finish') {
@@ -1215,23 +1182,18 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
+            modelResolutionError: false,
         };
     }
     if (event.type === 'error') {
-        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 || '';
+        const parsedError = parseOpencodeError(event.error, event.part?.text);
+        const text = parsedError?.message ?? '';
         return {
             logFragment: text ? `**Error:** ${text}` : null,
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
-            recoveryEvents: [{ type: 'error' }],
+            recoveryEvents: [{ type: 'error', error: parsedError }],
         };
     }
     return emptyParsedStreamLine();
@@ -1241,7 +1203,7 @@ const parseOpencodeJsonLine = (line, cwd) => {
     if (!trimmed) {
         return emptyParsedStreamLine();
     }
-    const { jsonObjects, remainder } = extractLeadingJsonObjects(trimmed);
+    const { jsonObjects, remainder } = extractLeadingOpencodeJsonObjects(trimmed);
     if (jsonObjects.length === 0) {
         if (trimmed.startsWith('{')) {
             return emptyParsedStreamLine();
@@ -1259,13 +1221,14 @@ const parseOpencodeJsonLine = (line, cwd) => {
                     }],
             };
         }
-        return { logFragment: trimmed, responseFragment: trimmed, subagentEvents: [], providerSessionId: null };
+        return { logFragment: trimmed, responseFragment: trimmed, subagentEvents: [], providerSessionId: null, modelResolutionError: false };
     }
     const logFragments = [];
     const responseFragments = [];
     const subagentEvents = [];
     const recoveryEvents = [];
     let providerSessionId = null;
+    let modelResolutionError = false;
     for (const jsonObject of jsonObjects) {
         let event;
         try {
@@ -1278,6 +1241,7 @@ const parseOpencodeJsonLine = (line, cwd) => {
         const { logFragment, responseFragment } = parsedEvent;
         subagentEvents.push(...parsedEvent.subagentEvents);
         recoveryEvents.push(...(parsedEvent.recoveryEvents ?? []));
+        modelResolutionError ||= Boolean(parsedEvent.modelResolutionError);
         providerSessionId = providerSessionId ?? parsedEvent.providerSessionId;
         if (logFragment !== null) {
             logFragments.push(logFragment);
@@ -1308,6 +1272,7 @@ const parseOpencodeJsonLine = (line, cwd) => {
             responseFragment: responseFragments.length > 0 ? responseFragments.join('\n\n') : null,
             subagentEvents,
             providerSessionId,
+            modelResolutionError,
             recoveryEvents,
         };
     }
@@ -1731,12 +1696,7 @@ const buildResponseTiming = ({ startTime, firstFinalAnswerTime, isStopped, }) =>
     const responseMs = Date.now() - firstFinalAnswerTime;
     return { totalMs, thinkingMs, responseMs };
 };
-const isModelResolutionError = (message) => {
-    if (typeof message !== 'string') {
-        return false;
-    }
-    return /ProviderModelNotFoundError|Model not found/i.test(message);
-};
+const isLegacyModelResolutionError = (message) => (typeof message === 'string' && /ProviderModelNotFoundError|Model not found/i.test(message));
 const isProcessAlive = (proc) => {
     if (!proc) {
         return false;
@@ -2221,7 +2181,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 const errOutput = Buffer.concat(stderrChunks).toString();
                 const finalLog = logLines.join('\n\n') || errOutput;
                 const finalResponse = responseLines.join('\n\n') || errOutput;
-                const modelError = isModelResolutionError(finalLog);
+                const modelError = isLegacyModelResolutionError(errOutput);
                 const timing = startTime ? { totalMs: Date.now() - startTime } : null;
                 if (buildState?.stopRequested || reviewProcessState?.stopRequested) {
                     const transcriptRuns = finalizeRun('stopped', finalLog, finalResponse);
@@ -2331,14 +2291,14 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             const finalResponse = recoveryTracker.hasRecoveredFinalAnswer()
                 ? recoveredResponse
                 : responseLines.join('\n\n') || stderrOutput;
-            const modelError = isModelResolutionError(log);
+            const stderrModelError = parseOpencodeStderrModelResolutionError(stderrOutput);
             const timing = buildResponseTiming({ startTime, firstFinalAnswerTime, isStopped: Boolean(buildState?.stopRequested || reviewProcessState?.stopRequested) });
             if (buildState?.stopRequested || reviewProcessState?.stopRequested) {
                 const transcriptRuns = finalizeRun('stopped', log, finalResponse);
                 resolveOnce(withTranscriptRuns({ response: finalResponse, responseTiming: timing }, transcriptRuns));
                 return;
             }
-            if (isSuccessfulOpencodeExit(code, modelError, recoveryTracker)) {
+            if (isSuccessfulOpencodeExit(code, stderrModelError, recoveryTracker)) {
                 const transcriptRuns = finalizeRun('done', log, finalResponse, { emit: emitSuccessUpdate });
                 resolveOnce(withTranscriptRuns({ response: finalResponse, responseTiming: timing }, transcriptRuns));
                 return;
@@ -2346,7 +2306,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
             const error = resumeSessionId && !executionCapableEventObserved && isTypedPreExecutionContinuationRejection(failureMessage)
                 ? new AgentContinuationRejectedError(failureMessage)
-                : new Error(failureMessage);
+                : createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
             const transcriptRuns = finalizeRun('error', log, finalResponse);
             rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
         });
@@ -2555,7 +2515,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                     }, transcriptRuns));
                     return;
                 }
-                const modelError = isModelResolutionError(finalLog);
+                const modelError = isLegacyModelResolutionError(errOutput);
                 if (code === 0 && !modelError) {
                     const finalOutput = getPreservedChatOutput({
                         chatSessionId,
@@ -2709,8 +2669,8 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                 }, transcriptRuns));
                 return;
             }
-            const modelError = isModelResolutionError(log);
-            if (isSuccessfulOpencodeExit(code, modelError, recoveryTracker)) {
+            const stderrModelError = parseOpencodeStderrModelResolutionError(stderrOutput);
+            if (isSuccessfulOpencodeExit(code, stderrModelError, recoveryTracker)) {
                 const finalOutput = getPreservedChatOutput({
                     chatSessionId,
                     log,
@@ -2737,7 +2697,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
             const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
             const error = resumeSessionId && !executionCapableEventObserved && isTypedPreExecutionContinuationRejection(failureMessage)
                 ? new AgentContinuationRejectedError(failureMessage)
-                : new Error(failureMessage);
+                : createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
             const transcriptRuns = subagentTracker.finalize('error', log, finalResponse);
             rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
         });
@@ -2938,7 +2898,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     }, transcriptRuns));
                     return;
                 }
-                const modelError = isModelResolutionError(finalLog);
+                const modelError = isLegacyModelResolutionError(errOutput);
                 if (code === 0 && !modelError) {
                     const finalOutput = getPreservedSpecOutput({
                         specSessionId,
@@ -3083,8 +3043,8 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                 }, transcriptRuns));
                 return;
             }
-            const modelError = isModelResolutionError(log);
-            if (isSuccessfulOpencodeExit(code, modelError, recoveryTracker)) {
+            const stderrModelError = parseOpencodeStderrModelResolutionError(stderrOutput);
+            if (isSuccessfulOpencodeExit(code, stderrModelError, recoveryTracker)) {
                 const finalOutput = getPreservedSpecOutput({
                     specSessionId,
                     log,
@@ -3109,7 +3069,8 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
             }
             updateSpecSessionStatusLocal(specSessionId, 'error', log, io, finalResponse);
             const transcriptRuns = subagentTracker.finalize('error', log, finalResponse);
-            rejectOnce(attachTranscriptRunsToError(new Error(`Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`), transcriptRuns));
+            const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
+            rejectOnce(attachTranscriptRunsToError(createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker), transcriptRuns));
         });
         child.on('error', err => {
             progressUpdater.cancel();
@@ -3272,7 +3233,7 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                     });
                     return;
                 }
-                const modelError = isModelResolutionError(finalLog);
+                const modelError = isLegacyModelResolutionError(errOutput);
                 if (code === 0 && !modelError) {
                     updateSpecReviewRunStreaming(specReviewRunId, finalResponse || null);
                     subagentTracker.finalize('done', finalLog || null, finalResponse || null);
@@ -3365,8 +3326,8 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                 });
                 return;
             }
-            const modelError = isModelResolutionError(log);
-            if (isSuccessfulOpencodeExit(code, modelError, recoveryTracker)) {
+            const stderrModelError = parseOpencodeStderrModelResolutionError(stderrOutput);
+            if (isSuccessfulOpencodeExit(code, stderrModelError, recoveryTracker)) {
                 updateSpecReviewRunStreaming(specReviewRunId, finalResponse || null);
                 subagentTracker.finalize('done', log || null, finalResponse || null);
                 resolveOnce({
@@ -3378,7 +3339,8 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                 return;
             }
             subagentTracker.finalize('error', log || null, finalResponse || null);
-            rejectOnce(new Error(`Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`));
+            const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
+            rejectOnce(createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker));
         });
         child.on('error', err => {
             progressUpdater.cancel();