@straiffi/archon 1.10.6 → 1.10.8

package/dist/server/lib/agent.js

@@ -367,7 +367,9 @@ const updateChatSessionId = (chatSessionId, tool, sessionId, io) => {
 };
 const updateSpecSessionStatusLocal = (specSessionId, status, log, io, streamingResponse = null) => {
     updateSpecSessionStatus(specSessionId, status, log, streamingResponse);
-    const specSession = getSpecSession(specSessionId, { includeMessages: true });
+    const specSession = getSpecSession(specSessionId, status === 'running'
+        ? { skipTargetResolution: true }
+        : { includeMessages: true });
     if (specSession) {
         io.emit('spec-session:updated', specSession);
     }
@@ -2556,6 +2558,9 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
             subagentTracker.setMainSessionId(sessionId);
         }
         if (tool === 'opencode') {
+            if (resumeSessionId) {
+                subagentTracker.setMainSessionId(resumeSessionId);
+            }
             spawnTimestamp = Date.now();
             opencodeMetadataRefresher = createOpencodeMetadataRefresher({
                 chatSessionId,
@@ -2958,6 +2963,7 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
         let startTime = null;
         let firstFinalAnswerTime = null;
         let usageSnapshot = EMPTY_CHAT_USAGE_SNAPSHOT;
+        let executionCapableEventObserved = false;
         const specState = activeSpecProcesses.get(specSessionId) ?? registerSpecProcessPlaceholder(specSessionId);
         const settle = (handler) => (value) => {
             if (settled) {
@@ -2997,6 +3003,9 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
             subagentTracker.setMainSessionId(sessionId);
         }
         if (tool === 'opencode') {
+            if (resumeSessionId) {
+                subagentTracker.setMainSessionId(resumeSessionId);
+            }
             spawnTimestamp = Date.now();
             opencodeMetadataRefresher = createSpecOpencodeMetadataRefresher({
                 specSessionId,
@@ -3079,7 +3088,11 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 const lines = text.split('\n');
                 remainder = lines.pop() ?? '';
                 for (const line of lines) {
-                    const { logFragment, responseFragment, subagentEvents } = parseClaudeStreamJsonLine(line);
+                    const parsed = parseClaudeStreamJsonLine(line);
+                    const { logFragment, responseFragment, subagentEvents } = parsed;
+                    if (isExecutionCapableParsedStreamLine(parsed)) {
+                        executionCapableEventObserved = true;
+                    }
                     subagentTracker.handle(subagentEvents);
                     usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                     if (logFragment !== null) {
@@ -3103,7 +3116,11 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 }
                 if (remainder.trim()) {
                     usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
-                    const { logFragment, responseFragment, subagentEvents } = parseClaudeStreamJsonLine(remainder);
+                    const parsed = parseClaudeStreamJsonLine(remainder);
+                    const { logFragment, responseFragment, subagentEvents } = parsed;
+                    if (isExecutionCapableParsedStreamLine(parsed)) {
+                        executionCapableEventObserved = true;
+                    }
                     subagentTracker.handle(subagentEvents);
                     if (logFragment !== null) {
                         logLines.push(logFragment);
@@ -3148,9 +3165,13 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                     }, transcriptRuns));
                     return;
                 }
+                const failureMessage = `Agent exited with code ${code ?? 'null'}\n${finalLog}${errOutput !== finalLog && errOutput ? '\n\n' + errOutput : ''}`;
+                const error = resumeSessionId && !executionCapableEventObserved && isTypedPreExecutionContinuationRejection(failureMessage)
+                    ? new AgentContinuationRejectedError(failureMessage)
+                    : new Error(failureMessage);
                 updateSpecSessionStatusLocal(specSessionId, 'error', finalLog + (errOutput ? '\n\n' + errOutput : ''), io, finalResponse);
                 const transcriptRuns = subagentTracker.finalize('error', finalLog, finalResponse);
-                rejectOnce(attachTranscriptRunsToError(new Error(`Agent exited with code ${code ?? 'null'}\n${finalLog}${errOutput !== finalLog && errOutput ? '\n\n' + errOutput : ''}`), transcriptRuns));
+                rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
             });
             child.on('error', err => {
                 progressUpdater.cancel();
@@ -3212,6 +3233,9 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 }
                 const parsed = parseOpencodeJsonLine(line, cwd);
                 const { logFragment, responseFragment, subagentEvents, providerSessionId } = parsed;
+                if (isExecutionCapableParsedStreamLine(parsed)) {
+                    executionCapableEventObserved = true;
+                }
                 opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
@@ -3238,6 +3262,9 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
                 const parsed = parseOpencodeJsonLine(remainder, cwd);
                 const { subagentEvents, providerSessionId } = parsed;
+                if (isExecutionCapableParsedStreamLine(parsed)) {
+                    executionCapableEventObserved = true;
+                }
                 opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
@@ -3306,8 +3333,10 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 return;
             }
             const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
-            const error = createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
-            const retryableError = logLines.length === 0 && responseLines.length === 0
+            const error = resumeSessionId && !executionCapableEventObserved && isTypedPreExecutionContinuationRejection(failureMessage)
+                ? new AgentContinuationRejectedError(failureMessage)
+                : createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
+            const retryableError = !executionCapableEventObserved
                 ? markRetryableOpenCodeDatabaseLock(error)
                 : error;
             if (retryableError instanceof RetryableOpenCodeDatabaseLockError) {