@straiffi/archon 1.8.14 → 1.8.16

package/dist/server/lib/agent.js

@@ -8,13 +8,14 @@ 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';
 import { formatGenericToolCall } from './genericToolCall.js';
 import { getSpecSession, updateSpecSessionResumeId, updateSpecSessionStatus, updateSpecSessionTitle, updateSpecSessionUsageSnapshot } from './specs.js';
 import { updateSpecReviewRunStatus, updateSpecReviewRunStreaming, updateSpecReviewRunUsage } from './specReviews.js';
-import { createAgentRun, emitAgentRunsUpdated, finalizeAgentRun, getNextAgentRunIndex, listAgentRunsForExecutionRun, listAgentRunsForParent, updateAgentRunLabel, updateAgentRunSessionId, updateAgentRunStatus } from './agentRuns.js';
+import { createAgentRun, emitAgentRunsUpdated, emitExecutionAgentRunsUpdated, finalizeAgentRun, getNextAgentRunIndex, listAgentRunsForExecutionRun, listAgentRunsForParent, updateAgentRunLabel, updateAgentRunSessionId, updateAgentRunStatus } from './agentRuns.js';
 import { markTicketDescriptionVisibleInBundle } from './ticketMessages.js';
 import { getTicket } from './tickets.js';
 import { createTranscriptRunSnapshots } from './transcriptRuns.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;
@@ -445,29 +447,29 @@ const createThrottledProgressUpdater = (flushUpdate) => {
         },
     };
 };
-export const readOpencodeUsageSnapshot = ({ sessionId, spawnTimestamp = null, }) => {
-    const snapshot = hostOpencodeSessionOperations.readUsageSnapshot(sessionId, spawnTimestamp);
+export const readOpencodeUsageSnapshot = async ({ sessionId, spawnTimestamp = null, sessionOperations = hostOpencodeSessionOperations, }) => {
+    const snapshot = await sessionOperations.readUsageSnapshot(sessionId, spawnTimestamp);
     if (!snapshot) {
         throw new Error('OpenCode usage snapshot read failed');
     }
     return snapshot;
 };
-const resolveOpencodeUsageSnapshot = ({ current, sessionId, spawnTimestamp = null, }) => {
+const resolveOpencodeUsageSnapshot = async ({ current, sessionId, spawnTimestamp = null, }) => {
     try {
-        return mergeChatUsageSnapshot(current, readOpencodeUsageSnapshot({ sessionId, spawnTimestamp }));
+        return mergeChatUsageSnapshot(current, await readOpencodeUsageSnapshot({ sessionId, spawnTimestamp }));
     }
     catch {
         return current;
     }
 };
-export const refreshChatSessionUsageSnapshot = (chatSessionId, options = {}) => {
+export const refreshChatSessionUsageSnapshot = async (chatSessionId, options = {}) => {
     const chatSession = getChatSession(chatSessionId, { includeMessages: options.includeMessages });
     if (!chatSession || chatSession.tool !== 'opencode' || !chatSession.opencode_session_id) {
         return chatSession;
     }
     let nextUsageSnapshot;
     try {
-        nextUsageSnapshot = readOpencodeUsageSnapshot({
+        nextUsageSnapshot = await readOpencodeUsageSnapshot({
             sessionId: chatSession.opencode_session_id,
         });
     }
@@ -480,14 +482,14 @@ export const refreshChatSessionUsageSnapshot = (chatSessionId, options = {}) =>
     updateChatSessionUsageSnapshot(chatSessionId, nextUsageSnapshot);
     return getChatSession(chatSessionId, { includeMessages: options.includeMessages });
 };
-export const refreshSpecSessionUsageSnapshot = (specSessionId, options = {}) => {
+export const refreshSpecSessionUsageSnapshot = async (specSessionId, options = {}) => {
     const specSession = getSpecSession(specSessionId, { includeMessages: options.includeMessages });
     if (!specSession || specSession.tool !== 'opencode' || !specSession.opencode_session_id) {
         return specSession;
     }
     let nextUsageSnapshot;
     try {
-        nextUsageSnapshot = readOpencodeUsageSnapshot({
+        nextUsageSnapshot = await readOpencodeUsageSnapshot({
             sessionId: specSession.opencode_session_id,
         });
     }
@@ -500,9 +502,9 @@ export const refreshSpecSessionUsageSnapshot = (specSessionId, options = {}) =>
     updateSpecSessionUsageSnapshot(specSessionId, nextUsageSnapshot);
     return getSpecSession(specSessionId, { includeMessages: options.includeMessages });
 };
-export const storeTicketUsageSnapshot = (ticketId, opencodeSessionId) => {
+export const storeTicketUsageSnapshot = async (ticketId, opencodeSessionId, sessionOperations = hostOpencodeSessionOperations) => {
     try {
-        const snapshot = readOpencodeUsageSnapshot({ sessionId: opencodeSessionId });
+        const snapshot = await readOpencodeUsageSnapshot({ sessionId: opencodeSessionId, sessionOperations });
         if (snapshot.usage_snapshot_total_tokens === null) {
             return;
         }
@@ -543,7 +545,7 @@ const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, in
         clearTimeout(lookupTimer);
         lookupTimer = null;
     };
-    const readCurrentSession = () => {
+    const readCurrentSession = async () => {
         if (knownSessionId) {
             return hostOpencodeSessionOperations.findSessionById(knownSessionId);
         }
@@ -552,12 +554,12 @@ const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, in
         }
         return hostOpencodeSessionOperations.findLatestSessionAfter(spawnTimestamp);
     };
-    const refresh = () => {
+    const refresh = async () => {
         if (stopped) {
             return { hasSession: false, hasResolvedTitle: false, sessionId: knownSessionId };
         }
         try {
-            const session = readCurrentSession();
+            const session = await readCurrentSession();
             if (!session) {
                 return { hasSession: false, hasResolvedTitle: false, sessionId: knownSessionId };
             }
@@ -583,10 +585,11 @@ const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, in
         }
         clearLookupTimer();
         lookupTimer = setTimeout(() => {
-            const result = refresh();
-            if (!result.hasResolvedTitle) {
-                scheduleRetry();
-            }
+            void refresh().then(result => {
+                if (!result.hasResolvedTitle) {
+                    scheduleRetry();
+                }
+            });
         }, OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS);
     };
     return {
@@ -611,7 +614,7 @@ const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp
         clearTimeout(lookupTimer);
         lookupTimer = null;
     };
-    const readCurrentSession = () => {
+    const readCurrentSession = async () => {
         if (knownSessionId) {
             return hostOpencodeSessionOperations.findSessionById(knownSessionId);
         }
@@ -620,12 +623,12 @@ const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp
         }
         return hostOpencodeSessionOperations.findLatestSessionAfter(spawnTimestamp);
     };
-    const refresh = () => {
+    const refresh = async () => {
         if (stopped) {
             return { hasSession: false, hasResolvedTitle: false, sessionId: knownSessionId };
         }
         try {
-            const session = readCurrentSession();
+            const session = await readCurrentSession();
             if (!session) {
                 return { hasSession: false, hasResolvedTitle: false, sessionId: knownSessionId };
             }
@@ -651,10 +654,11 @@ const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp
         }
         clearLookupTimer();
         lookupTimer = setTimeout(() => {
-            const result = refresh();
-            if (!result.hasResolvedTitle) {
-                scheduleRetry();
-            }
+            void refresh().then(result => {
+                if (!result.hasResolvedTitle) {
+                    scheduleRetry();
+                }
+            });
         }, OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS);
     };
     return {
@@ -1192,6 +1196,10 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
     const trackedRuns = [];
     let nextRunIndex = Math.max(executionContext ? getNextAgentRunIndex(executionContext.runId) : getNextAgentRunIndex(parentType, parentId), mainRun ? mainRun.runIndex + 1 : 1);
     const emitUpdate = () => {
+        if (executionContext) {
+            emitExecutionAgentRunsUpdated(io, parentType, parentId, executionContext.runId);
+            return;
+        }
         emitAgentRunsUpdated(io, parentType, parentId);
     };
     const updateMain = (log, response) => {
@@ -1471,13 +1479,13 @@ export const reconstructOpencodeSubagentTranscript = (parts, cwd) => {
     }
     return { log: log || null, response: response || null };
 };
-export const readOpencodeSessionTranscript = ({ sessionId, since, cwd, }) => {
+export const readOpencodeSessionTranscript = async ({ sessionId, since, cwd, }) => {
     const reader = createOpencodeTaskSessionReader();
     if (!reader) {
         return null;
     }
     try {
-        return reconstructOpencodeSubagentTranscript(reader.listSessionParts(sessionId, since), cwd);
+        return reconstructOpencodeSubagentTranscript(await reader.listSessionParts(sessionId, since), cwd);
     }
     catch {
         return null;
@@ -1486,7 +1494,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;
@@ -1524,24 +1532,27 @@ export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTim
             childSessionByCallId.set(stillUnmatchedInvocations[0].callId, stillUnmatchedChildren[0].id);
         }
     };
-    const refresh = () => {
+    let refreshInFlight = null;
+    const performRefresh = async () => {
         if (!reader) {
             return;
         }
         try {
-            if (!parentSessionId && discoverParentSession) {
-                setParentSessionId(reader.findParentSessionSince(spawnTimestamp));
+            if (!parentSessionId && discoverParentSession && Date.now() >= spawnTimestamp + parentDiscoveryDelayMs) {
+                setParentSessionId(await reader.findParentSessionSince(spawnTimestamp));
             }
             if (!parentSessionId) {
                 return;
             }
-            const invocations = reader.listTaskInvocations(parentSessionId, spawnTimestamp);
-            const children = reader.listChildSessions(parentSessionId, spawnTimestamp);
+            const [invocations, children] = await Promise.all([
+                reader.listTaskInvocations(parentSessionId, spawnTimestamp),
+                reader.listChildSessions(parentSessionId, spawnTimestamp),
+            ]);
             resolveChildSessions(invocations, children);
             for (const invocation of invocations) {
                 const childSessionId = childSessionByCallId.get(invocation.callId) ?? invocation.childSessionId;
                 const transcript = childSessionId
-                    ? reconstructOpencodeSubagentTranscript(reader.listSessionParts(childSessionId), cwd)
+                    ? reconstructOpencodeSubagentTranscript(await reader.listSessionParts(childSessionId), cwd)
                     : { log: null, response: null };
                 tracker.applySnapshot({
                     callId: invocation.callId,
@@ -1557,12 +1568,20 @@ export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTim
             // OpenCode persistence is a progressive enhancement; stdout remains the fallback.
         }
     };
+    const refresh = () => {
+        if (!refreshInFlight) {
+            refreshInFlight = performRefresh().finally(() => {
+                refreshInFlight = null;
+            });
+        }
+        return refreshInFlight;
+    };
     const start = () => {
         if (!reader || timer) {
             return;
         }
-        refresh();
-        timer = setInterval(refresh, 150);
+        void refresh();
+        timer = setInterval(() => void refresh(), OPENCODE_SUBAGENT_POLL_INTERVAL_MS);
         timer.unref?.();
     };
     const stop = () => {
@@ -1619,7 +1638,9 @@ const interruptProcess = (state, signal) => {
         return;
     }
     if (state.interrupt) {
-        state.interrupt(signal);
+        void Promise.resolve(state.interrupt(signal)).catch(() => {
+            // Durable sandbox execution records typed interruption failures through its lifecycle owner.
+        });
         return;
     }
     killProcess(state.child, signal);
@@ -1666,7 +1687,13 @@ export const registerChatProcessPlaceholder = (chatSessionId) => {
     return state;
 };
 export const registerBuildProcessPlaceholder = (ticketId) => {
-    const state = { child: null, interrupt: null, stopRequested: false, sessionLookupTimer: null };
+    const state = {
+        child: null,
+        interrupt: null,
+        abortController: new AbortController(),
+        stopRequested: false,
+        sessionLookupTimer: null,
+    };
     activeBuildProcesses.set(ticketId, state);
     return state;
 };
@@ -1764,11 +1791,12 @@ export const stopBuildAgent = async (ticketId) => {
         return false;
     }
     state.stopRequested = true;
+    state.abortController.abort(new Error('Build stop requested'));
     if (!state.child) {
         return true;
     }
     if (state.interrupt) {
-        state.interrupt('SIGTERM');
+        await state.interrupt('SIGTERM');
     }
     else {
         killProcess(state.child, 'SIGTERM');
@@ -1776,7 +1804,7 @@ export const stopBuildAgent = async (ticketId) => {
     await waitForProcessExit(state.child, 5000);
     if (isProcessAlive(state.child)) {
         if (state.interrupt) {
-            state.interrupt('SIGKILL');
+            await state.interrupt('SIGKILL');
         }
         else {
             killProcess(state.child, 'SIGKILL');
@@ -1864,8 +1892,9 @@ 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, executionTarget, }) => {
     const resolvedModel = resolveAgentModel(tool, model);
+    const opencodeSessionOperations = executionProvider.sessionOperations?.opencode ?? null;
     const subagentTracker = createSubagentRunTracker({
         parentType: 'ticket',
         parentId: ticketId,
@@ -1882,10 +1911,18 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             : {}),
         executionContext,
     });
+    const emitRunUpdate = () => {
+        const emitter = io;
+        if (executionContext) {
+            emitExecutionAgentRunsUpdated(emitter, 'ticket', ticketId, executionContext.runId);
+            return;
+        }
+        emitAgentRunsUpdated(emitter, 'ticket', ticketId);
+    };
     const writeRunStatus = (status, log, streamingResponse = null, options = {}) => {
         if (runStream) {
             updateAgentRunStatus(runStream.runId, status, log, streamingResponse);
-            emitAgentRunsUpdated(io, 'ticket', ticketId);
+            emitRunUpdate();
             return;
         }
         updateStatus(ticketId, status, log, io, streamingResponse, options);
@@ -1893,7 +1930,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
     const writeRunSessionId = (sessionId) => {
         if (runStream) {
             updateAgentRunSessionId(runStream.runId, sessionId);
-            emitAgentRunsUpdated(io, 'ticket', ticketId);
+            emitRunUpdate();
             if (persistSessionIdToTicket) {
                 updateSessionId(ticketId, sessionId, sessionField, io);
             }
@@ -1904,7 +1941,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
     const finalizeRun = (status, log, responseText, options = {}) => {
         if (runStream) {
             finalizeAgentRun(runStream.runId, status, responseText);
-            emitAgentRunsUpdated(io, 'ticket', ticketId);
+            emitRunUpdate();
             return subagentTracker.finalize(status, log, responseText);
         }
         updateStatus(ticketId, status, log, io, responseText, options);
@@ -1957,13 +1994,13 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 writeRunSessionId(normalized);
             }
         };
-        const attemptOpencodeSessionLookup = () => {
+        const attemptOpencodeSessionLookup = async () => {
             if (tool !== 'opencode' || hasResolvedOpencodeSessionId || spawnTimestamp === null) {
                 return hasResolvedOpencodeSessionId;
             }
             try {
-                const session = hostOpencodeSessionOperations.findLatestSessionAfter(spawnTimestamp);
-                if (session?.id) {
+                const session = await opencodeSessionOperations?.findLatestSessionAfter(spawnTimestamp, cwd);
+                if (!hasResolvedOpencodeSessionId && session?.id) {
                     bindResolvedOpencodeSession(session.id);
                 }
             }
@@ -1995,6 +2032,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         let child;
         let interrupt;
         let placementFailure;
+        let placementCompletion = Promise.resolve(null);
         try {
             if (buildState?.stopRequested) {
                 throw new AgentSpawnPermitRevokedError();
@@ -2003,12 +2041,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 assertAgentSpawnPermit(spawnPermitId, executionContext.runId);
             }
             const handle = executionProvider.execute({
-                target: {
-                    kind: 'worktree',
-                    id: ticketId,
-                    workspacePath: cwd,
-                    revision: 'working-tree',
-                },
+                target: executionTarget ?? null,
                 command: invocation.command,
                 args: invocation.args,
                 cwd,
@@ -2019,6 +2052,9 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             child = handle.child;
             interrupt = handle.interrupt;
             placementFailure = handle.placementFailure;
+            if (handle.placementIdentity) {
+                placementCompletion = placementFailure;
+            }
         }
         catch (error) {
             const resolvedError = agentProvider.classifyExecutionFailure(error);
@@ -2051,11 +2087,15 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         });
         startTime = Date.now();
         if (tool === 'opencode' && spawnTimestamp !== null) {
+            const taskSessionReader = opencodeSessionOperations
+                ? createOpencodeTaskSessionReader(opencodeSessionOperations)
+                : null;
             opencodeSubagentMonitor = createOpencodeSubagentMonitor({
                 initialParentSessionId: resumeSessionId,
                 spawnTimestamp,
                 cwd,
                 tracker: subagentTracker,
+                taskSessionReader,
                 discoverParentSession: false,
                 onParentSessionId: discoveredSessionId => {
                     bindResolvedOpencodeSession(discoveredSessionId);
@@ -2097,8 +2137,12 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 }
             });
             child.stderr?.on('data', (chunk) => stderrChunks.push(chunk));
-            child.on('close', code => {
+            child.on('close', async (code) => {
                 progressUpdater.cancel();
+                const finalPlacementFailure = await placementCompletion;
+                if (finalPlacementFailure || settled) {
+                    return;
+                }
                 if (remainder.trim()) {
                     usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
                     const parsed = parseClaudeStreamJsonLine(remainder, cwd);
@@ -2152,6 +2196,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         const logLines = [];
         const responseLines = [];
         const recoveryTracker = createOpencodeRecoveryTracker();
+        let usageSnapshot = EMPTY_CHAT_USAGE_SNAPSHOT;
         let remainder = '';
         const stderrChunks = [];
         const progressUpdater = createThrottledProgressUpdater(() => {
@@ -2162,6 +2207,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             const lines = text.split('\n');
             remainder = lines.pop() ?? '';
             for (const line of lines) {
+                usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                 if (firstFinalAnswerTime === null && startTime !== null) {
                     const trimmedLine = line.trim();
                     if (trimmedLine.startsWith('{')) {
@@ -2195,21 +2241,22 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         child.stderr?.on('data', (chunk) => stderrChunks.push(chunk));
         if (tool === 'opencode' && !resumeSessionId) {
             sessionLookupTimer = setTimeout(() => {
-                attemptOpencodeSessionLookup();
-                sessionLookupTimer = null;
+                void attemptOpencodeSessionLookup().finally(() => {
+                    sessionLookupTimer = null;
+                });
             }, 1500);
             if (trackBuildProcess && buildState) {
                 buildState.sessionLookupTimer = sessionLookupTimer;
             }
         }
-        child.on('close', code => {
+        child.on('close', async (code) => {
             progressUpdater.cancel();
-            const resolvedSessionOnClose = attemptOpencodeSessionLookup();
-            if (sessionLookupTimer && (resolvedSessionOnClose || hasResolvedOpencodeSessionId)) {
-                clearTimeout(sessionLookupTimer);
-                sessionLookupTimer = null;
+            const finalPlacementFailure = await placementCompletion;
+            if (finalPlacementFailure || settled) {
+                return;
             }
             if (remainder.trim()) {
+                usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
                 const parsed = parseOpencodeJsonLine(remainder);
                 const { subagentEvents, providerSessionId } = parsed;
                 if (isExecutionCapableParsedStreamLine(parsed)) {
@@ -2221,8 +2268,13 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                     firstFinalAnswerTime = null;
                 }
             }
+            const resolvedSessionOnClose = await attemptOpencodeSessionLookup();
+            if (sessionLookupTimer && (resolvedSessionOnClose || hasResolvedOpencodeSessionId)) {
+                clearTimeout(sessionLookupTimer);
+                sessionLookupTimer = null;
+            }
             const stderrOutput = Buffer.concat(stderrChunks).toString();
-            opencodeSubagentMonitor?.refresh();
+            await opencodeSubagentMonitor?.refresh();
             const log = logLines.join('\n\n') || stderrOutput;
             const recoveredResponse = recoveryTracker.getRecoveredResponse();
             const finalResponse = recoveryTracker.hasRecoveredFinalAnswer()
@@ -2232,18 +2284,25 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             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));
+                resolveOnce(withTranscriptRuns({ response: finalResponse, responseTiming: timing, usageSnapshot }, transcriptRuns));
                 return;
             }
             if (isSuccessfulOpencodeExit(code, stderrModelError, recoveryTracker)) {
                 const transcriptRuns = finalizeRun('done', log, finalResponse, { emit: emitSuccessUpdate });
-                resolveOnce(withTranscriptRuns({ response: finalResponse, responseTiming: timing }, transcriptRuns));
+                resolveOnce(withTranscriptRuns({ response: finalResponse, responseTiming: timing, usageSnapshot }, transcriptRuns));
                 return;
             }
             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 && !sessionId
+                ? markRetryableOpenCodeDatabaseLock(error)
+                : error;
+            if (retryableError instanceof RetryableOpenCodeDatabaseLockError) {
+                rejectOnce(retryableError);
+                return;
+            }
             const transcriptRuns = finalizeRun('error', log, finalResponse);
             rejectOnce(attachTranscriptRunsToError(error, transcriptRuns));
         });
@@ -2264,7 +2323,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',
@@ -2332,10 +2395,12 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
             });
             chatState.metadataRefresher = opencodeMetadataRefresher;
             if (resumeSessionId) {
-                const result = opencodeMetadataRefresher.refresh();
-                if (!result.hasResolvedTitle) {
-                    opencodeMetadataRefresher.scheduleRetry();
-                }
+                const metadataRefresher = opencodeMetadataRefresher;
+                void metadataRefresher.refresh().then(result => {
+                    if (!result.hasResolvedTitle) {
+                        metadataRefresher.scheduleRetry();
+                    }
+                });
             }
         }
         let child;
@@ -2555,7 +2620,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
         if (!resumeSessionId) {
             opencodeMetadataRefresher?.scheduleRetry();
         }
-        child.on('close', code => {
+        child.on('close', async (code) => {
             progressUpdater.cancel();
             if (remainder.trim()) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
@@ -2583,15 +2648,15 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                     response: finalResponse,
                 })
                 : null;
-            const metadataResult = opencodeMetadataRefresher?.refresh();
+            const metadataResult = await opencodeMetadataRefresher?.refresh();
             const resolvedOpencodeSessionId = metadataResult?.sessionId
                 ?? preservedOutput?.opencodeSessionId
                 ?? getChatSession(chatSessionId)?.opencode_session_id
                 ?? resumeSessionId;
-            opencodeSubagentMonitor?.refresh();
+            await opencodeSubagentMonitor?.refresh();
             if (chatState.stopRequested) {
                 if (resolvedOpencodeSessionId) {
-                    usageSnapshot = resolveOpencodeUsageSnapshot({
+                    usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
@@ -2615,7 +2680,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                     response: finalResponse,
                 });
                 if (resolvedOpencodeSessionId && spawnTimestamp !== null) {
-                    usageSnapshot = resolveOpencodeUsageSnapshot({
+                    usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
@@ -2631,11 +2696,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 +2737,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',
@@ -2732,10 +2808,12 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
             });
             specState.metadataRefresher = opencodeMetadataRefresher;
             if (resumeSessionId) {
-                const result = opencodeMetadataRefresher.refresh();
-                if (!result.hasResolvedTitle) {
-                    opencodeMetadataRefresher.scheduleRetry();
-                }
+                const metadataRefresher = opencodeMetadataRefresher;
+                void metadataRefresher.refresh().then(result => {
+                    if (!result.hasResolvedTitle) {
+                        metadataRefresher.scheduleRetry();
+                    }
+                });
             }
         }
         let child;
@@ -2931,9 +3009,9 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
         if (!resumeSessionId) {
             opencodeMetadataRefresher?.scheduleRetry();
         }
-        child.on('close', code => {
+        child.on('close', async (code) => {
             progressUpdater.cancel();
-            opencodeSubagentMonitor?.refresh();
+            await opencodeSubagentMonitor?.refresh();
             if (remainder.trim()) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
                 const parsed = parseOpencodeJsonLine(remainder, cwd);
@@ -2957,15 +3035,15 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     response: finalResponse,
                 })
                 : null;
-            const metadataResult = opencodeMetadataRefresher?.refresh();
+            const metadataResult = await opencodeMetadataRefresher?.refresh();
             const resolvedOpencodeSessionId = metadataResult?.sessionId
                 ?? preservedOutput?.opencodeSessionId
                 ?? getSpecSession(specSessionId)?.opencode_session_id
                 ?? resumeSessionId;
-            opencodeSubagentMonitor?.refresh();
+            await opencodeSubagentMonitor?.refresh();
             if (specState.stopRequested) {
                 if (resolvedOpencodeSessionId) {
-                    usageSnapshot = resolveOpencodeUsageSnapshot({
+                    usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
@@ -2989,7 +3067,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                     response: finalResponse,
                 });
                 if (resolvedOpencodeSessionId && spawnTimestamp !== null) {
-                    usageSnapshot = resolveOpencodeUsageSnapshot({
+                    usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
@@ -3005,10 +3083,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 +3122,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 +3136,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({
@@ -3100,12 +3190,7 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
             const invocation = buildOpencodeSpecReviewInvocation({ prompt, files, model: resolvedModel, variant });
             try {
                 const handle = hostExecutionEnvironment.execute({
-                    target: {
-                        kind: 'repository',
-                        id: cwd,
-                        workspacePath: cwd,
-                        revision: 'working-tree',
-                    },
+                    target: null,
                     command: invocation.command,
                     args: invocation.args,
                     cwd,
@@ -3150,6 +3235,7 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                 spawnTimestamp,
                 cwd,
                 tracker: subagentTracker,
+                parentDiscoveryDelayMs: OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS,
             });
             opencodeSubagentMonitor.start();
         }
@@ -3273,9 +3359,9 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
             }
         });
         child.stderr?.on('data', (chunk) => stderrChunks.push(chunk));
-        child.on('close', code => {
+        child.on('close', async (code) => {
             progressUpdater.cancel();
-            opencodeSubagentMonitor?.refresh();
+            await opencodeSubagentMonitor?.refresh();
             if (remainder.trim()) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
                 const parsed = parseOpencodeJsonLine(remainder, cwd);
@@ -3293,7 +3379,7 @@ export const runSpecReviewAgent = ({ specReviewRunId, specSessionId, tool, promp
                 ? recoveredResponse
                 : responseLines.join('\n\n') || stderrOutput;
             if (opencodeSessionId && spawnTimestamp !== null) {
-                usageSnapshot = resolveOpencodeUsageSnapshot({
+                usageSnapshot = await resolveOpencodeUsageSnapshot({
                     current: usageSnapshot,
                     sessionId: opencodeSessionId,
                     spawnTimestamp,
@@ -3322,9 +3408,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 +3444,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