@straiffi/archon 1.8.14 → 1.8.15

package/dist/server/lib/agent.js

@@ -8,6 +8,7 @@ import { normalizeClaudeModelId, normalizeModelId } from './models.js';
 import { createOpencodeTaskSessionReader, parseOpencodeTaskEnvelope } from './opencodeTaskSessions.js';
 import { hostOpencodeSessionOperations } from './opencodeSessionOperations.js';
 import { hostExecutionEnvironment } from './hostExecutionEnvironment.js';
+import { markRetryableOpenCodeDatabaseLock, RetryableOpenCodeDatabaseLockError, retryOpenCodeDatabaseLocks } from './opencodeExecutionReliability.js';
 import { claudeAgentProvider } from './claudeAgentProvider.js';
 import { buildOpencodeSpecReviewInvocation, createOpencodeExitError, createOpencodeRecoveryTracker, interpretOpencodeRecoveryEvent, isSuccessfulOpencodeExit, opencodeAgentProvider, } from './opencodeAgentProvider.js';
 import { appendClaudeHeadlessPlanPrompt, buildClaudeHeadlessPlanArgs } from './planModeQuestions.js';
@@ -49,6 +50,7 @@ export const getAgentErrorTranscriptRuns = (error) => {
 };
 const OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS = 1500;
 const AGENT_PROGRESS_UPDATE_INTERVAL_MS = 100;
+const OPENCODE_SUBAGENT_POLL_INTERVAL_MS = 750;
 const resolveAgentModel = (tool, model) => {
     if (tool === 'claude') {
         return normalizeClaudeModelId(model) || null;
@@ -1486,7 +1488,7 @@ export const readOpencodeSessionTranscript = ({ sessionId, since, cwd, }) => {
         reader.close();
     }
 };
-export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTimestamp, cwd, tracker, onParentSessionId, taskSessionReader, discoverParentSession = true, }) => {
+export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTimestamp, cwd, tracker, onParentSessionId, taskSessionReader, discoverParentSession = true, parentDiscoveryDelayMs = 0, }) => {
     const reader = taskSessionReader === undefined ? createOpencodeTaskSessionReader() : taskSessionReader;
     let parentSessionId = initialParentSessionId;
     let timer = null;
@@ -1529,7 +1531,7 @@ export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTim
             return;
         }
         try {
-            if (!parentSessionId && discoverParentSession) {
+            if (!parentSessionId && discoverParentSession && Date.now() >= spawnTimestamp + parentDiscoveryDelayMs) {
                 setParentSessionId(reader.findParentSessionSince(spawnTimestamp));
             }
             if (!parentSessionId) {
@@ -1562,7 +1564,7 @@ export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTim
             return;
         }
         refresh();
-        timer = setInterval(refresh, 150);
+        timer = setInterval(refresh, OPENCODE_SUBAGENT_POLL_INTERVAL_MS);
         timer.unref?.();
     };
     const stop = () => {
@@ -1864,7 +1866,7 @@ export const stopSpecReviewAgent = async (specReviewRunId) => {
     }
     return true;
 };
-export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = null, resumeSessionId = null, sessionField = 'session_id', trackBuildProcess = false, reviewProcessState, emitSuccessUpdate = true, opencodeAgentMode, runStream, executionContext, persistSessionIdToTicket = false, spawnPermitId, executionProvider = hostExecutionEnvironment, }) => {
+const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null, resumeSessionId = null, sessionField = 'session_id', trackBuildProcess = false, reviewProcessState, emitSuccessUpdate = true, opencodeAgentMode, runStream, executionContext, persistSessionIdToTicket = false, spawnPermitId, executionProvider = hostExecutionEnvironment, }) => {
     const resolvedModel = resolveAgentModel(tool, model);
     const subagentTracker = createSubagentRunTracker({
         parentType: 'ticket',
@@ -2244,6 +2246,13 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             const error = resumeSessionId && !executionCapableEventObserved && isTypedPreExecutionContinuationRejection(failureMessage)
                 ? new AgentContinuationRejectedError(failureMessage)
                 : createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
+            const retryableError = !executionCapableEventObserved && !sessionId
+                ? markRetryableOpenCodeDatabaseLock(error)
+                : error;
+            if (retryableError instanceof RetryableOpenCodeDatabaseLockError) {
+                rejectOnce(retryableError);
+                return;
+            }
             const transcriptRuns = finalizeRun('error', log, finalResponse);
             rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
         });
@@ -2264,7 +2273,11 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         });
     });
 };
-export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io, model, variant = null, resumeSessionId = null, opencodeAgentMode = 'build', executionContext, mainRun, spawnPermitId, }) => {
+export const runAgent = (options) => {
+    const run = () => runAgentOnce(options);
+    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+};
+const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, model, variant = null, resumeSessionId = null, opencodeAgentMode = 'build', executionContext, mainRun, spawnPermitId, }) => {
     const resolvedModel = resolveAgentModel(tool, model);
     const subagentTracker = createSubagentRunTracker({
         parentType: 'chat',
@@ -2631,11 +2644,18 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                 }, transcriptRuns));
                 return;
             }
-            updateChatSessionStatus(chatSessionId, 'error', log, io, finalResponse);
             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)
                 : createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
+            const retryableError = !executionCapableEventObserved
+                ? markRetryableOpenCodeDatabaseLock(error)
+                : error;
+            if (retryableError instanceof RetryableOpenCodeDatabaseLockError) {
+                rejectOnce(retryableError);
+                return;
+            }
+            updateChatSessionStatus(chatSessionId, 'error', log, io, finalResponse);
             const transcriptRuns = subagentTracker.finalize('error', log, finalResponse);
             rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
         });
@@ -2665,7 +2685,11 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
         });
     });
 };
-export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, resumeSessionId = null, executionContext, mainRun, }) => {
+export const runChatAgent = (options) => {
+    const run = () => runChatAgentOnce(options);
+    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+};
+const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, resumeSessionId = null, executionContext, mainRun, }) => {
     const resolvedModel = resolveAgentModel(tool, model);
     const subagentTracker = createSubagentRunTracker({
         parentType: 'spec',
@@ -3005,10 +3029,18 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                 }, transcriptRuns));
                 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
+                ? markRetryableOpenCodeDatabaseLock(error)
+                : error;
+            if (retryableError instanceof RetryableOpenCodeDatabaseLockError) {
+                rejectOnce(retryableError);
+                return;
+            }
             updateSpecSessionStatusLocal(specSessionId, 'error', log, io, finalResponse);
             const transcriptRuns = subagentTracker.finalize('error', log, finalResponse);
-            const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
-            rejectOnce(attachTranscriptRunsToError(createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker), transcriptRuns));
+            rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
         });
         child.on('error', err => {
             progressUpdater.cancel();
@@ -3036,6 +3068,10 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
         });
     });
 };
+export const runSpecAgent = (options) => {
+    const run = () => runSpecAgentOnce(options);
+    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+};
 /**
  * Focused, decoupled runner for a one-shot Spec Review.
  *
@@ -3046,7 +3082,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
  * updateSpecReviewRunStatus / updateSpecReviewRunStreaming / updateSpecReviewRunUsage —
  * the spec_sessions row is never touched by this path.
  */
-export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, executionContext, }) => {
+const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, executionContext, }) => {
     const registeredState = activeSpecReviewProcesses.get(specReviewRunId);
     if (registeredState?.stopRequested) {
         return Promise.resolve({
@@ -3150,6 +3186,7 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                 spawnTimestamp,
                 cwd,
                 tracker: subagentTracker,
+                parentDiscoveryDelayMs: OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS,
             });
             opencodeSubagentMonitor.start();
         }
@@ -3322,9 +3359,17 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                 });
                 return;
             }
-            subagentTracker.finalize('error', log || null, finalResponse || null);
             const failureMessage = `Agent exited with code ${code ?? 'null'}\n${log}${stderrOutput !== log && stderrOutput ? '\n\n' + stderrOutput : ''}`;
-            rejectOnce(createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker));
+            const error = createOpencodeExitError(failureMessage, stderrModelError, recoveryTracker);
+            const retryableError = logLines.length === 0 && responseLines.length === 0 && !opencodeSessionId
+                ? markRetryableOpenCodeDatabaseLock(error)
+                : error;
+            if (retryableError instanceof RetryableOpenCodeDatabaseLockError) {
+                rejectOnce(retryableError);
+                return;
+            }
+            subagentTracker.finalize('error', log || null, finalResponse || null);
+            rejectOnce(error);
         });
         child.on('error', err => {
             progressUpdater.cancel();
@@ -3350,4 +3395,8 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
         });
     });
 };
+export const runSpecReviewAgent = (options) => {
+    const run = () => runSpecReviewAgentOnce(options);
+    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+};
 //# sourceMappingURL=agent.js.map