@straiffi/archon 1.11.14 → 1.11.16

package/dist/server/lib/agent.js

@@ -24,6 +24,7 @@ import { createTranscriptRunSnapshots } from './transcriptRuns.js';
 import { createHostLauncherEnvironment, createLegacyHostRuntimeEnvironment, createWorkspaceProcessEnvironment, } from './workspaceProcessEnvironment.js';
 import { OpencodeModelResolutionError, parseOpencodeStderrModelResolutionError, parseOpencodePermissionAutoReject, createOpencodePermissionAutoRejectTracker, } from './opencodeErrors.js';
 import { appendRestrictedFilePrompt } from './restrictedFilePrompt.js';
+import { createOpencodeApprovalClock, prepareOpencodeApprovalPrompt, resolveOpencodeApprovalContext } from './opencodeApprovalContext.js';
 import { decodeOpencodeStreamEvent, extractLeadingOpencodeJsonObjects, extractOpencodeStreamUsage, parseOpencodeStreamLine } from './opencodeStream.js';
 import { assertAgentSpawnPermit, AgentSpawnPermitRevokedError } from './agentSpawnPermits.js';
 import { buildClaudeStdinMessage } from './claudeStdin.js';
@@ -2034,6 +2035,8 @@ export const stopSpecReviewAgent = async (specReviewRunId) => {
     return true;
 };
 const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null, skills = [], resumeSessionId = null, sessionField = 'session_id', trackBuildProcess = false, reviewProcessState, emitSuccessUpdate = true, opencodeAgentMode, runStream, executionContext, persistSessionIdToTicket = false, spawnPermitId, executionProvider = hostExecutionEnvironment, executionTarget, executionLauncherEnvironment = createHostLauncherEnvironment(), executionRuntimeEnvironment = createLegacyHostRuntimeEnvironment(cwd, { PWD: cwd }), opencodeRuntimeIdentity = null, }) => {
+    const opencodeApprovalContext = resolveOpencodeApprovalContext({ tool, parentKind: 'ticket', parentId: ticketId, executionContext, io });
+    const approvalClock = createOpencodeApprovalClock(opencodeApprovalContext);
     const resolvedModel = resolveAgentModel(tool, model);
     const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
     const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
@@ -2108,7 +2111,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
         let reviewKillTimer = null;
         let reviewCompletionForced = false;
         let reviewInactivityTimeoutForced = false;
-        let lastOutputAt = Date.now();
+        let lastOutputAt = approvalClock.now();
         let executionCapableEventObserved = false;
         const buildState = trackBuildProcess
             ? activeBuildProcesses.get(ticketId) ?? registerBuildProcessPlaceholder(ticketId)
@@ -2172,7 +2175,8 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
         const streamingRequest = {
             cwd,
             skills,
-            prompt,
+            prompt: prepareOpencodeApprovalPrompt(prompt, opencodeApprovalContext),
+            opencodeApprovalContext,
             model: resolvedModel,
             variant,
             mode: opencodeAgentMode,
@@ -2239,6 +2243,10 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
                 };
                 void connection.sessionReady.then(providerThreadId => {
                     if (!settled && providerThreadId) {
+                        if (tool === 'opencode') {
+                            bindResolvedOpencodeSession(providerThreadId, true);
+                            return;
+                        }
                         sessionId = providerThreadId;
                         writeRunSessionId(providerThreadId);
                     }
@@ -2288,7 +2296,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
                     bindResolvedOpencodeSession(discoveredSessionId);
                 },
                 onActivity: () => {
-                    lastOutputAt = Date.now();
+                    lastOutputAt = approvalClock.now();
                 },
             });
             opencodeSubagentMonitor.start();
@@ -2398,6 +2406,8 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
         });
         if (reviewProcessState && startTime !== null) {
             reviewWatchdog = createReviewAgentWatchdog({
+                isApprovalPending: approvalClock.isPending,
+                now: approvalClock.now,
                 getLastOutputAt: () => lastOutputAt,
                 checkForCompletion: async () => reviewFinalAnswerObserved && !subagentTracker.hasRunningSubagents(),
                 onTrigger: async (trigger) => {
@@ -2418,7 +2428,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
         const output = providerStdout ?? child.stdout;
         output?.on('data', (chunk) => {
             permissionAutoRejectTracker.consume(chunk);
-            lastOutputAt = Date.now();
+            lastOutputAt = approvalClock.now();
             const text = remainder + chunk.toString();
             const lines = text.split('\n');
             remainder = lines.pop() ?? '';
@@ -2625,6 +2635,7 @@ export const runAgent = (options) => {
     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 }), opencodeRuntimeIdentity = null, }) => {
+    const opencodeApprovalContext = resolveOpencodeApprovalContext({ tool, parentKind: 'chat', parentId: chatSessionId, executionContext, io });
     const resolvedModel = resolveAgentModel(tool, model);
     const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
     const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
@@ -2676,7 +2687,8 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
             cwd,
             files,
             skills,
-            prompt,
+            prompt: prepareOpencodeApprovalPrompt(prompt, opencodeApprovalContext),
+            opencodeApprovalContext,
             model: resolvedModel,
             variant,
             mode: opencodeAgentMode,
@@ -2763,7 +2775,11 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                 void connection.sessionReady.then(providerThreadId => {
                     if (!settled && providerThreadId) {
                         sessionId = providerThreadId;
-                        updateChatSessionId(chatSessionId, 'codex', providerThreadId, io);
+                        updateChatSessionId(chatSessionId, tool, providerThreadId, io);
+                        if (tool === 'opencode') {
+                            opencodeMetadataRefresher?.pinSessionId(providerThreadId);
+                            opencodeSubagentMonitor?.setParentSessionId(providerThreadId);
+                        }
                         subagentTracker.setMainSessionId(providerThreadId);
                     }
                 }).catch(() => { });
@@ -3126,6 +3142,7 @@ export const runChatAgent = (options) => {
     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 }), opencodeRuntimeIdentity = null, }) => {
+    const opencodeApprovalContext = resolveOpencodeApprovalContext({ tool, parentKind: 'spec', parentId: specSessionId, executionContext, io });
     const resolvedModel = resolveAgentModel(tool, model);
     const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
     const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
@@ -3177,7 +3194,8 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
             cwd,
             files,
             skills,
-            prompt,
+            prompt: prepareOpencodeApprovalPrompt(prompt, opencodeApprovalContext),
+            opencodeApprovalContext,
             model: resolvedModel,
             variant,
             mode: 'plan',
@@ -3258,7 +3276,11 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 void connection.sessionReady.then(providerThreadId => {
                     if (!settled && providerThreadId) {
                         sessionId = providerThreadId;
-                        updateSpecSessionIdLocal(specSessionId, 'codex', providerThreadId, io);
+                        updateSpecSessionIdLocal(specSessionId, tool, providerThreadId, io);
+                        if (tool === 'opencode') {
+                            opencodeMetadataRefresher?.pinSessionId(providerThreadId);
+                            opencodeSubagentMonitor?.setParentSessionId(providerThreadId);
+                        }
                         subagentTracker.setMainSessionId(providerThreadId);
                     }
                 }).catch(() => { });
@@ -3631,6 +3653,7 @@ export const runSpecAgent = (options) => {
  * the spec_sessions row is never touched by this path.
  */
 const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, skills = [], executionContext, executionProvider = hostExecutionEnvironment, executionTarget, executionLauncherEnvironment = createHostLauncherEnvironment(), executionRuntimeEnvironment = createLegacyHostRuntimeEnvironment(cwd, { PWD: cwd }), opencodeRuntimeIdentity = null, }) => {
+    const opencodeApprovalContext = resolveOpencodeApprovalContext({ tool, parentKind: 'spec', parentId: specSessionId, executionContext, io });
     const registeredState = activeSpecReviewProcesses.get(specReviewRunId);
     if (registeredState?.stopRequested) {
         return Promise.resolve({
@@ -3687,7 +3710,8 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
             cwd,
             files,
             skills,
-            prompt,
+            prompt: prepareOpencodeApprovalPrompt(prompt, opencodeApprovalContext),
+            opencodeApprovalContext,
             model: resolvedModel,
             variant,
             mode: 'plan',
@@ -3696,7 +3720,7 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
             opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
             opencodeCompatibility: resolvedOpencodeCompatibility,
         };
-        const invocation = tool === 'opencode'
+        const invocation = tool === 'opencode' && !opencodeApprovalContext
             ? buildOpencodeSpecReviewInvocation({
                 prompt,
                 files,
@@ -3742,6 +3766,15 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
                 void connection.ready.catch(error => {
                     rejectOnce(agentProvider.classifyExecutionFailure(error));
                 });
+                void connection.sessionReady.then(providerSessionId => {
+                    if (!settled && providerSessionId) {
+                        if (tool === 'opencode') {
+                            opencodeSessionId = providerSessionId;
+                            opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                        }
+                        subagentTracker.setMainSessionId(providerSessionId);
+                    }
+                }).catch(() => { });
             }
             void placementFailure.then(failure => {
                 if (failure) {