@straiffi/archon 1.8.5 → 1.8.7

package/dist/server/lib/agent.js

@@ -2025,14 +2025,16 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         };
         const resolveOnce = settle(resolve);
         const rejectOnce = settle(reject);
-        const bindResolvedOpencodeSession = (sessionId) => {
-            const normalized = sessionId?.trim();
+        const bindResolvedOpencodeSession = (resolvedId) => {
+            const normalized = resolvedId?.trim();
             if (!normalized) {
                 return;
             }
+            const shouldPersist = sessionId !== normalized;
+            sessionId = normalized;
+            hasResolvedOpencodeSessionId = true;
             opencodeSubagentMonitor?.setParentSessionId(normalized);
-            if (!hasResolvedOpencodeSessionId) {
-                hasResolvedOpencodeSessionId = true;
+            if (shouldPersist) {
                 writeRunSessionId(normalized);
             }
         };
@@ -2112,6 +2114,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 },
             });
             opencodeSubagentMonitor.start();
+            bindResolvedOpencodeSession(resumeSessionId);
         }
         if (tool === 'claude') {
             const logLines = [];
@@ -2215,7 +2218,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 }
                 const parsed = parseOpencodeJsonLine(line);
                 const { logFragment, responseFragment, subagentEvents, providerSessionId } = parsed;
-                opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                bindResolvedOpencodeSession(providerSessionId);
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
                     firstFinalAnswerTime = null;
@@ -2245,7 +2248,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
             if (remainder.trim()) {
                 const parsed = parseOpencodeJsonLine(remainder);
                 const { subagentEvents, providerSessionId } = parsed;
-                opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                bindResolvedOpencodeSession(providerSessionId);
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
                     firstFinalAnswerTime = null;