@straiffi/archon 1.11.2 → 1.11.4

package/dist/server/lib/agent.js

@@ -16,7 +16,7 @@ import { appendClaudeHeadlessPlanPrompt, buildClaudeHeadlessPlanArgs } from './p
 import { formatCodexFileChange, formatCodexWebSearch, formatGenericToolCall } from './genericToolCall.js';
 import { getSpecSession, updateSpecSessionResumeId, updateSpecSessionStatus, updateSpecSessionTitle, updateSpecSessionUsageSnapshot } from './specs.js';
 import { updateSpecReviewRunStatus, updateSpecReviewRunStreaming, updateSpecReviewRunUsage } from './specReviews.js';
-import { createAgentRun, emitAgentRunsUpdated, emitExecutionAgentRunsUpdated, finalizeAgentRun, getNextAgentRunIndex, listAgentRunsForExecutionRun, listAgentRunsForParent, updateAgentRunLabel, updateAgentRunSessionId, updateAgentRunStatus } from './agentRuns.js';
+import { createAgentRun, emitAgentRunsUpdated, emitExecutionAgentRunsUpdated, finalizeAgentRun, getNextAgentRunIndex, listAgentRunsForExecutionRun, listAgentRunsForParent, reconcileAgentRunSnapshot, updateAgentRunLabel, updateAgentRunSessionId, updateAgentRunStatus } from './agentRuns.js';
 import { markTicketDescriptionVisibleInBundle } from './ticketMessages.js';
 import { getTicket } from './tickets.js';
 import { createTranscriptRunSnapshots } from './transcriptRuns.js';
@@ -25,6 +25,7 @@ import { OpencodeModelResolutionError, parseOpencodeStderrModelResolutionError,
 import { extractLeadingOpencodeJsonObjects } from './opencodePromptOutput.js';
 import { assertAgentSpawnPermit, AgentSpawnPermitRevokedError } from './agentSpawnPermits.js';
 import { buildClaudeStdinMessage } from './claudeStdin.js';
+import { enrichPromptWithPreview } from './agentPreview.js';
 import { createReviewAgentWatchdog, resolveWithin, REVIEW_AGENT_CLOSE_ENRICHMENT_TIMEOUT_MS, REVIEW_AGENT_INACTIVITY_TIMEOUT_MS, REVIEW_AGENT_KILL_GRACE_MS, } from './reviewAgentWatchdog.js';
 const withTranscriptRuns = (value, transcriptRuns) => {
     return transcriptRuns ? { ...value, transcriptRuns } : value;
@@ -865,6 +866,9 @@ const getSubagentCompletionStatus = (state, isError = false) => {
     if (isError || normalizedState === 'failed' || normalizedState === 'error') {
         return 'error';
     }
+    if (normalizedState === 'running' || normalizedState === 'pending') {
+        return 'running';
+    }
     return normalizedState === 'stopped' ? 'stopped' : 'done';
 };
 const emptyParsedStreamLine = () => ({
@@ -990,6 +994,24 @@ const parseOpencodeJsonEvent = (event, cwd) => {
         || event.part?.sessionID?.trim()
         || event.part?.sessionId?.trim()
         || null;
+    if (event.type === 'subagent_snapshot') {
+        const sessionId = typeof event.part?.state?.metadata?.sessionId === 'string'
+            ? event.part.state.metadata.sessionId
+            : null;
+        return {
+            ...emptyParsedStreamLine(),
+            providerSessionId,
+            subagentEvents: [{
+                    kind: 'snapshot',
+                    callId: event.part?.callID ?? null,
+                    label: event.part?.title?.trim() || 'Subagent',
+                    sessionId,
+                    status: getSubagentCompletionStatus(event.part?.state?.status),
+                    log: event.part?.state?.log ?? null,
+                    response: event.part?.state?.response ?? null,
+                }],
+        };
+    }
     if (event.type === 'plan' && event.part?.type === 'text' && event.part.text) {
         return {
             logFragment: event.part.text,
@@ -1068,6 +1090,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
                         ? [{
                                 kind: outputKind,
                                 callId: event.part?.callID ?? null,
+                                label: `Subagent: ${description}`,
                                 ...(output ? { text: output } : {}),
                                 sessionId: childSessionId,
                                 status: completionStatus,
@@ -1279,6 +1302,10 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
         }
         emitAgentRunsUpdated(io, parentType, parentId);
     };
+    const formatLabel = (label) => {
+        const normalized = label?.trim().replace(/^Subagent:\s*/i, '') || 'Subagent';
+        return normalized.toLowerCase() === 'subagent' ? 'Subagent' : `Subagent: ${normalized}`;
+    };
     const updateMain = (log, response) => {
         if (!mainRun) {
             return;
@@ -1311,8 +1338,11 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
         updateAgentRunSessionId(run.id, normalized);
     };
     const updateLabel = (run, label) => {
-        const normalized = label?.trim() || null;
-        if (!normalized || normalized === run.label) {
+        if (!label?.trim()) {
+            return;
+        }
+        const normalized = formatLabel(label);
+        if (normalized === run.label) {
             return;
         }
         run.label = normalized;
@@ -1334,7 +1364,7 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
                     parentType,
                     parentId,
                     ...(!executionContext ? { runIndex } : {}),
-                    label: event.label?.trim() || 'Subagent',
+                    label: formatLabel(event.label),
                     role: 'subagent',
                 });
                 nextRunIndex = runIndex + 1;
@@ -1346,7 +1376,7 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
                     response: '',
                     status: 'running',
                     sessionId: null,
-                    label: event.label?.trim() || 'Subagent',
+                    label: formatLabel(event.label),
                     createdAt: new Date().toISOString(),
                 };
                 trackedRuns.push(run);
@@ -1355,19 +1385,29 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
                 continue;
             }
             let run = findRun(event.callId, event.sessionId);
-            if (!run && event.kind === 'complete' && !event.callId) {
+            if (!run && (event.kind === 'snapshot' || (event.kind === 'complete' && !event.callId))) {
                 handle([{
                         kind: 'start',
                         callId: event.callId,
-                        label: 'Subagent',
+                        label: event.label ?? 'Subagent',
                         sessionId: event.sessionId,
                     }]);
                 run = findRun(event.callId, event.sessionId);
             }
-            if (!run || run.status !== 'running') {
+            if (!run || (run.status !== 'running' && event.kind !== 'snapshot')) {
                 continue;
             }
             bindSessionId(run, event.sessionId);
+            updateLabel(run, event.label);
+            if (event.kind === 'snapshot') {
+                run.log = event.log?.trim() ?? '';
+                run.response = event.response?.trim() ?? '';
+                const snapshotStatus = event.status ?? run.status;
+                run.status = snapshotStatus;
+                reconcileAgentRunSnapshot(run.id, snapshotStatus, run.log || null, run.response || null);
+                emitUpdate();
+                continue;
+            }
             if (event.text) {
                 if (event.kind === 'fragment') {
                     run.log = appendTranscriptText(run.log, event.text);
@@ -2622,8 +2662,13 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
 };
 export const runAgent = (options) => {
     requireExecutableAgent(options.tool);
-    const run = () => runAgentOnce(options);
-    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    const launch = (prompt) => {
+        const preparedOptions = { ...options, prompt };
+        const run = () => runAgentOnce(preparedOptions);
+        return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    };
+    const enrichedPrompt = enrichPromptWithPreview(options.prompt, options.executionContext, options.executionTarget);
+    return typeof enrichedPrompt === 'string' ? launch(enrichedPrompt) : enrichedPrompt.then(launch);
 };
 const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, model, variant = null, skills = [], resumeSessionId = null, opencodeAgentMode = 'build', executionContext, mainRun, spawnPermitId, executionProvider = hostExecutionEnvironment, executionTarget, executionLauncherEnvironment = createHostLauncherEnvironment(), executionRuntimeEnvironment = createLegacyHostRuntimeEnvironment(cwd, { PWD: cwd }), }) => {
     const resolvedModel = resolveAgentModel(tool, model);
@@ -3102,8 +3147,13 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
 };
 export const runChatAgent = (options) => {
     requireExecutableAgent(options.tool);
-    const run = () => runChatAgentOnce(options);
-    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    const launch = (prompt) => {
+        const preparedOptions = { ...options, prompt };
+        const run = () => runChatAgentOnce(preparedOptions);
+        return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    };
+    const enrichedPrompt = enrichPromptWithPreview(options.prompt, options.executionContext, options.executionTarget);
+    return typeof enrichedPrompt === 'string' ? launch(enrichedPrompt) : enrichedPrompt.then(launch);
 };
 const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, skills = [], resumeSessionId = null, executionContext, mainRun, executionProvider = hostExecutionEnvironment, executionTarget, executionLauncherEnvironment = createHostLauncherEnvironment(), executionRuntimeEnvironment = createLegacyHostRuntimeEnvironment(cwd, { PWD: cwd }), }) => {
     const resolvedModel = resolveAgentModel(tool, model);
@@ -3569,8 +3619,13 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
 };
 export const runSpecAgent = (options) => {
     requireExecutableAgent(options.tool);
-    const run = () => runSpecAgentOnce(options);
-    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    const launch = (prompt) => {
+        const preparedOptions = { ...options, prompt };
+        const run = () => runSpecAgentOnce(preparedOptions);
+        return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    };
+    const enrichedPrompt = enrichPromptWithPreview(options.prompt, options.executionContext, options.executionTarget);
+    return typeof enrichedPrompt === 'string' ? launch(enrichedPrompt) : enrichedPrompt.then(launch);
 };
 /**
  * Focused, decoupled runner for a one-shot Spec Review.
@@ -3930,7 +3985,12 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
 };
 export const runSpecReviewAgent = (options) => {
     requireExecutableAgent(options.tool);
-    const run = () => runSpecReviewAgentOnce(options);
-    return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    const launch = (prompt) => {
+        const preparedOptions = { ...options, prompt };
+        const run = () => runSpecReviewAgentOnce(preparedOptions);
+        return options.tool === 'opencode' ? retryOpenCodeDatabaseLocks(run) : run();
+    };
+    const enrichedPrompt = enrichPromptWithPreview(options.prompt, options.executionContext, options.executionTarget);
+    return typeof enrichedPrompt === 'string' ? launch(enrichedPrompt) : enrichedPrompt.then(launch);
 };
 //# sourceMappingURL=agent.js.map