@straiffi/archon 1.11.4 → 1.11.6

package/dist/server/lib/agent.js

@@ -6,6 +6,7 @@ import { getChatSession, updateChatSessionUsageSnapshot } from './chats.js';
 import { normalizeAgentModelId, requireExecutableAgent } from './agentCatalog.js';
 import { createOpencodeTaskSessionReader, parseOpencodeTaskEnvelope } from './opencodeTaskSessions.js';
 import { hostOpencodeSessionOperations } from './opencodeSessionOperations.js';
+import { getOpencodeCliCompatibility, inspectOpencodeRelease, requireSupportedOpencodeCompatibility } from './opencodeCli.js';
 import { hostExecutionEnvironment } from './hostExecutionEnvironment.js';
 import { markRetryableOpenCodeDatabaseLock, RetryableOpenCodeDatabaseLockError, retryOpenCodeDatabaseLocks } from './opencodeExecutionReliability.js';
 import { claudeAgentProvider } from './claudeAgentProvider.js';
@@ -22,7 +23,7 @@ import { getTicket } from './tickets.js';
 import { createTranscriptRunSnapshots } from './transcriptRuns.js';
 import { createHostLauncherEnvironment, createLegacyHostRuntimeEnvironment, createWorkspaceProcessEnvironment, } from './workspaceProcessEnvironment.js';
 import { OpencodeModelResolutionError, parseOpencodeStderrModelResolutionError, } from './opencodeErrors.js';
-import { extractLeadingOpencodeJsonObjects } from './opencodePromptOutput.js';
+import { decodeOpencodeStreamEvent, extractLeadingOpencodeJsonObjects, extractOpencodeStreamUsage, parseOpencodeStreamLine } from './opencodeStream.js';
 import { assertAgentSpawnPermit, AgentSpawnPermitRevokedError } from './agentSpawnPermits.js';
 import { buildClaudeStdinMessage } from './claudeStdin.js';
 import { enrichPromptWithPreview } from './agentPreview.js';
@@ -67,6 +68,23 @@ const getStreamingAgentProvider = (tool) => {
     }
     return opencodeAgentProvider;
 };
+const resolveOpencodeCompatibility = (tool, executionProvider, runtimeIdentity) => {
+    if (tool !== 'opencode') {
+        return null;
+    }
+    if (executionProvider.kind !== 'docker_sandbox') {
+        const compatibility = requireSupportedOpencodeCompatibility(getOpencodeCliCompatibility({ force: true }));
+        if (runtimeIdentity && (compatibility.runtimeIdentity.version !== runtimeIdentity.version
+            || compatibility.runtimeIdentity.major !== runtimeIdentity.major)) {
+            throw new Error('The selected host OpenCode runtime no longer matches its resolved compatibility evidence.');
+        }
+        return compatibility;
+    }
+    if (!runtimeIdentity) {
+        throw new Error('The selected OpenCode execution environment has no validated runtime compatibility.');
+    }
+    return requireSupportedOpencodeCompatibility(inspectOpencodeRelease(runtimeIdentity.version));
+};
 const getAgentStderr = (tool, chunks) => {
     const stderr = Buffer.concat(chunks).toString();
     return tool === 'codex' ? redactCodexDiagnostic(stderr) : stderr;
@@ -113,30 +131,6 @@ export const EMPTY_CHAT_USAGE_SNAPSHOT = {
     usage_snapshot_reasoning_tokens: null,
     usage_snapshot_cost: null,
 };
-const toFiniteNumber = (value) => {
-    return typeof value === 'number' && Number.isFinite(value)
-        ? value
-        : null;
-};
-const getValueAtPath = (value, path) => {
-    let current = value;
-    for (const segment of path) {
-        if (!current || typeof current !== 'object' || !(segment in current)) {
-            return null;
-        }
-        current = current[segment];
-    }
-    return current;
-};
-const getNumberAtPaths = (value, paths) => {
-    for (const path of paths) {
-        const candidate = toFiniteNumber(getValueAtPath(value, path));
-        if (candidate !== null) {
-            return candidate;
-        }
-    }
-    return null;
-};
 const mergeChatUsageSnapshot = (current, next) => {
     return {
         usage_snapshot_context_window: next.usage_snapshot_context_window ?? current.usage_snapshot_context_window,
@@ -149,105 +143,8 @@ const mergeChatUsageSnapshot = (current, next) => {
         usage_snapshot_cost: next.usage_snapshot_cost ?? current.usage_snapshot_cost,
     };
 };
-const extractChatUsageSnapshot = (value) => {
-    if (!value || typeof value !== 'object') {
-        return {};
-    }
-    return {
-        usage_snapshot_context_window: getNumberAtPaths(value, [
-            ['contextWindow'],
-            ['context_window'],
-            ['result', 'contextWindow'],
-            ['result', 'context_window'],
-            ['limit', 'context'],
-            ['limits', 'context'],
-        ]),
-        usage_snapshot_max_output_tokens: getNumberAtPaths(value, [
-            ['maxOutputTokens'],
-            ['max_output_tokens'],
-            ['result', 'maxOutputTokens'],
-            ['result', 'max_output_tokens'],
-            ['limit', 'output'],
-            ['limits', 'output'],
-        ]),
-        usage_snapshot_total_tokens: getNumberAtPaths(value, [
-            ['tokens', 'total'],
-            ['usage', 'tokens', 'total'],
-            ['usage', 'total'],
-            ['usage', 'totalTokens'],
-            ['result', 'tokens', 'total'],
-            ['result', 'usage', 'tokens', 'total'],
-            ['result', 'usage', 'total'],
-            ['result', 'usage', 'totalTokens'],
-        ]),
-        usage_snapshot_input_tokens: getNumberAtPaths(value, [
-            ['message', 'usage', 'input_tokens'],
-            ['usage', 'input_tokens'],
-            ['tokens', 'input'],
-            ['usage', 'tokens', 'input'],
-            ['usage', 'input'],
-            ['usage', 'inputTokens'],
-            ['result', 'tokens', 'input'],
-            ['result', 'usage', 'tokens', 'input'],
-            ['result', 'usage', 'input'],
-            ['result', 'usage', 'inputTokens'],
-        ]),
-        usage_snapshot_output_tokens: getNumberAtPaths(value, [
-            ['message', 'usage', 'output_tokens'],
-            ['usage', 'output_tokens'],
-            ['tokens', 'output'],
-            ['usage', 'tokens', 'output'],
-            ['usage', 'output'],
-            ['usage', 'outputTokens'],
-            ['result', 'tokens', 'output'],
-            ['result', 'usage', 'tokens', 'output'],
-            ['result', 'usage', 'output'],
-            ['result', 'usage', 'outputTokens'],
-        ]),
-        usage_snapshot_cache_read_tokens: getNumberAtPaths(value, [
-            ['message', 'usage', 'cache_read_input_tokens'],
-            ['usage', 'cache_read_input_tokens'],
-            ['tokens', 'cache', 'read'],
-            ['usage', 'tokens', 'cacheRead'],
-            ['usage', 'cacheRead'],
-            ['usage', 'cacheReadTokens'],
-            ['result', 'tokens', 'cache', 'read'],
-            ['result', 'usage', 'tokens', 'cacheRead'],
-            ['result', 'usage', 'cacheRead'],
-            ['result', 'usage', 'cacheReadTokens'],
-        ]),
-        usage_snapshot_reasoning_tokens: getNumberAtPaths(value, [
-            ['tokens', 'reasoning'],
-            ['usage', 'tokens', 'reasoning'],
-            ['usage', 'reasoning'],
-            ['usage', 'reasoningTokens'],
-            ['result', 'tokens', 'reasoning'],
-            ['result', 'usage', 'tokens', 'reasoning'],
-            ['result', 'usage', 'reasoning'],
-            ['result', 'usage', 'reasoningTokens'],
-        ]),
-        usage_snapshot_cost: getNumberAtPaths(value, [
-            ['total_cost_usd'],
-            ['cost'],
-            ['result', 'cost'],
-        ]),
-    };
-};
-export const mergeUsageFromJsonLine = (current, line) => {
-    const trimmedLine = line.trim();
-    if (!trimmedLine.startsWith('{')) {
-        return current;
-    }
-    const { jsonObjects } = extractLeadingOpencodeJsonObjects(trimmedLine);
+const completeUsageTotal = (current) => {
     let next = current;
-    for (const jsonObject of jsonObjects) {
-        try {
-            next = mergeChatUsageSnapshot(next, extractChatUsageSnapshot(JSON.parse(jsonObject)));
-        }
-        catch {
-            continue;
-        }
-    }
     if (next.usage_snapshot_total_tokens === null) {
         const components = [
             next.usage_snapshot_input_tokens,
@@ -264,6 +161,43 @@ export const mergeUsageFromJsonLine = (current, line) => {
     }
     return next;
 };
+const mergeStreamUsage = (current, usage) => mergeChatUsageSnapshot(current, {
+    usage_snapshot_context_window: usage.contextWindow,
+    usage_snapshot_max_output_tokens: usage.maxOutputTokens,
+    usage_snapshot_total_tokens: usage.totalTokens,
+    usage_snapshot_input_tokens: usage.inputTokens,
+    usage_snapshot_output_tokens: usage.outputTokens,
+    usage_snapshot_cache_read_tokens: usage.cacheReadTokens,
+    usage_snapshot_reasoning_tokens: usage.reasoningTokens,
+    usage_snapshot_cost: usage.cost,
+});
+export const mergeUsageFromJsonLine = (current, line) => {
+    const trimmedLine = line.trim();
+    if (!trimmedLine.startsWith('{')) {
+        return current;
+    }
+    let next = current;
+    for (const event of parseOpencodeStreamLine(trimmedLine).events) {
+        next = mergeStreamUsage(next, event.usage);
+    }
+    return completeUsageTotal(next);
+};
+const mergeClaudeUsageFromJsonLine = (current, line) => {
+    const { jsonObjects } = extractLeadingOpencodeJsonObjects(line);
+    let next = current;
+    for (const jsonObject of jsonObjects) {
+        try {
+            const event = JSON.parse(jsonObject);
+            if (event.type === 'assistant' || event.type === 'result') {
+                next = mergeStreamUsage(next, extractOpencodeStreamUsage(event));
+            }
+        }
+        catch {
+            // Stream parsing handles malformed output separately.
+        }
+    }
+    return completeUsageTotal(next);
+};
 const hasMatchingUsageSnapshot = (current, next) => {
     return current.usage_snapshot_context_window === next.usage_snapshot_context_window
         && current.usage_snapshot_max_output_tokens === next.usage_snapshot_max_output_tokens
@@ -525,7 +459,7 @@ const updateChatSessionOpencodeMetadata = (chatSessionId, sessionId, title, io)
         io.emit('chat-session:updated', chatSession);
     }
 };
-const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, initialSessionId = null, sessionOperations = hostOpencodeSessionOperations, }) => {
+const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, cwd, initialSessionId = null, sessionOperations, }) => {
     let lookupTimer = null;
     let stopped = false;
     let knownSessionId = initialSessionId;
@@ -545,7 +479,19 @@ const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, in
         if (spawnTimestamp === null) {
             return null;
         }
-        return sessionOperations.findLatestSessionAfter(spawnTimestamp);
+        return sessionOperations.findLatestSessionAfter(spawnTimestamp, { directory: cwd });
+    };
+    const pinSessionId = (sessionId) => {
+        const normalized = sessionId?.trim();
+        if (!normalized) {
+            return;
+        }
+        knownSessionId = normalized;
+        if (normalized !== lastAppliedSessionId) {
+            updateChatSessionOpencodeMetadata(chatSessionId, normalized, null, io);
+            lastAppliedSessionId = normalized;
+            lastAppliedTitle = null;
+        }
     };
     const refresh = async () => {
         if (stopped) {
@@ -586,6 +532,7 @@ const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, in
         }, OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS);
     };
     return {
+        pinSessionId,
         refresh,
         scheduleRetry,
         stop: () => {
@@ -594,7 +541,7 @@ const createOpencodeMetadataRefresher = ({ chatSessionId, io, spawnTimestamp, in
         },
     };
 };
-const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp, initialSessionId = null, }) => {
+const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp, cwd, initialSessionId = null, sessionOperations, }) => {
     let lookupTimer = null;
     let stopped = false;
     let knownSessionId = initialSessionId;
@@ -609,12 +556,24 @@ const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp
     };
     const readCurrentSession = async () => {
         if (knownSessionId) {
-            return hostOpencodeSessionOperations.findSessionById(knownSessionId);
+            return sessionOperations.findSessionById(knownSessionId);
         }
         if (spawnTimestamp === null) {
             return null;
         }
-        return hostOpencodeSessionOperations.findLatestSessionAfter(spawnTimestamp);
+        return sessionOperations.findLatestSessionAfter(spawnTimestamp, { directory: cwd });
+    };
+    const pinSessionId = (sessionId) => {
+        const normalized = sessionId?.trim();
+        if (!normalized) {
+            return;
+        }
+        knownSessionId = normalized;
+        if (normalized !== lastAppliedSessionId) {
+            updateSpecSessionOpencodeMetadata(specSessionId, normalized, null, io);
+            lastAppliedSessionId = normalized;
+            lastAppliedTitle = null;
+        }
     };
     const refresh = async () => {
         if (stopped) {
@@ -655,6 +614,7 @@ const createSpecOpencodeMetadataRefresher = ({ specSessionId, io, spawnTimestamp
         }, OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS);
     };
     return {
+        pinSessionId,
         refresh,
         scheduleRetry,
         stop: () => {
@@ -977,60 +937,40 @@ const parseClaudeStreamJsonLine = (line, cwd) => {
     }
     return emptyParsedStreamLine();
 };
-const formatOpencodeToolUse = (event, cwd) => {
-    const toolName = event.part?.tool;
-    if (!toolName) {
-        return null;
-    }
-    return formatToolCall(toolName, event.part?.state?.input, cwd);
-};
-const formatOpencodeStepTitle = (event) => {
-    const title = event.part?.title?.trim();
-    return title || null;
-};
 const parseOpencodeJsonEvent = (event, cwd) => {
-    const providerSessionId = event.sessionID?.trim()
-        || event.sessionId?.trim()
-        || event.part?.sessionID?.trim()
-        || event.part?.sessionId?.trim()
-        || null;
+    const providerSessionId = event.sessionId;
     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,
+                    callId: event.tool.callId,
+                    label: event.tool.title || 'Subagent',
+                    sessionId: event.tool.childSessionId,
+                    status: getSubagentCompletionStatus(event.tool.status),
+                    log: event.tool.log,
+                    response: event.tool.response,
                 }],
         };
     }
-    if (event.type === 'plan' && event.part?.type === 'text' && event.part.text) {
+    if (event.type === 'plan' && event.text) {
         return {
-            logFragment: event.part.text,
+            logFragment: event.text,
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
             modelResolutionError: false,
-            concatenateFragments: event.part.metadata?.codex?.delta === true,
-            replaceFragment: event.part.metadata?.codex?.snapshot === true,
-            fragmentGroup: event.part.metadata?.codex?.fragmentGroup
-                ?? event.part.metadata?.codex?.itemId
-                ?? null,
+            concatenateFragments: event.metadata.delta,
+            replaceFragment: event.metadata.snapshot,
+            fragmentGroup: event.metadata.fragmentGroup ?? event.metadata.itemId,
         };
     }
-    if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
-        const concatenateFragments = event.part.metadata?.codex?.delta === true;
-        const text = concatenateFragments ? event.part.text : event.part.text.trim();
-        const phase = event.part.metadata?.openai?.phase;
-        const recoveryEvent = interpretOpencodeRecoveryEvent(event.type, event.error, text, phase);
+    if (event.type === 'text' && event.text) {
+        const concatenateFragments = event.metadata.delta;
+        const text = concatenateFragments ? event.text : event.text.trim();
+        const phase = event.metadata.phase;
+        const recoveryEvent = interpretOpencodeRecoveryEvent(event.type, undefined, text, phase);
         return {
             logFragment: text || null,
             responseFragment: text && (!phase || phase === 'final_answer') ? text : null,
@@ -1039,14 +979,12 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             modelResolutionError: false,
             recoveryEvents: recoveryEvent ? [recoveryEvent] : [],
             concatenateFragments,
-            fragmentGroup: event.part.metadata?.codex?.fragmentGroup
-                ?? event.part.metadata?.codex?.itemId
-                ?? null,
+            fragmentGroup: event.metadata.fragmentGroup ?? event.metadata.itemId,
         };
     }
-    if (event.type === 'reasoning' && event.part?.type === 'reasoning') {
-        const concatenateFragments = event.part.metadata?.codex?.delta === true;
-        const text = concatenateFragments ? event.part.text ?? '' : event.part.text?.trim() ?? '';
+    if (event.type === 'reasoning') {
+        const concatenateFragments = event.metadata.delta;
+        const text = concatenateFragments ? event.text : event.text.trim();
         return {
             logFragment: text || null,
             responseFragment: null,
@@ -1054,26 +992,22 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             providerSessionId,
             modelResolutionError: false,
             concatenateFragments,
-            fragmentGroup: event.part.metadata?.codex?.fragmentGroup
-                ?? event.part.metadata?.codex?.itemId
-                ?? null,
+            fragmentGroup: event.metadata.fragmentGroup ?? event.metadata.itemId,
         };
     }
-    if (event.type === 'tool' || event.type === 'tool_use' || event.type === 'tool_result') {
-        const isToolInvocation = event.type === 'tool' || event.type === 'tool_use';
-        const toolName = event.part?.tool;
+    if (event.type === 'tool_use' || event.type === 'tool_result') {
+        const isToolInvocation = event.type === 'tool_use';
+        const toolName = event.tool.name;
         if (toolName && isSubagentTool(toolName)) {
-            const description = getSubagentDescription(event.part?.state?.input, toolName);
-            const rawOutput = event.part?.state?.output?.trim();
+            const description = getSubagentDescription(event.tool.input, toolName);
+            const rawOutput = event.tool.output?.trim();
             const envelope = parseOpencodeTaskEnvelope(rawOutput);
             const output = envelope ? envelope.result : rawOutput;
-            const taskStatus = event.part?.state?.status?.toLowerCase() ?? envelope?.state?.toLowerCase();
+            const taskStatus = event.tool.status?.toLowerCase() ?? envelope?.state?.toLowerCase();
             const isTerminal = Boolean(taskStatus && taskStatus !== 'running' && taskStatus !== 'pending');
             const outputKind = isTerminal ? 'complete' : 'fragment';
             const completionStatus = getSubagentCompletionStatus(taskStatus);
-            const childSessionId = envelope?.childSessionId
-                ?? (typeof event.part?.state?.metadata?.sessionID === 'string' ? event.part.state.metadata.sessionID : null)
-                ?? (typeof event.part?.state?.metadata?.sessionId === 'string' ? event.part.state.metadata.sessionId : null);
+            const childSessionId = envelope?.childSessionId ?? event.tool.childSessionId;
             return {
                 logFragment: isToolInvocation ? `Subagent: ${description}` : null,
                 responseFragment: null,
@@ -1081,7 +1015,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
                     ...(isToolInvocation
                         ? [{
                                 kind: 'start',
-                                callId: event.part?.callID ?? null,
+                                callId: event.tool.callId,
                                 label: `Subagent: ${description}`,
                                 sessionId: childSessionId,
                             }]
@@ -1089,7 +1023,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
                     ...(output || isTerminal
                         ? [{
                                 kind: outputKind,
-                                callId: event.part?.callID ?? null,
+                                callId: event.tool.callId,
                                 label: `Subagent: ${description}`,
                                 ...(output ? { text: output } : {}),
                                 sessionId: childSessionId,
@@ -1104,7 +1038,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
         if (!isToolInvocation) {
             return { ...emptyParsedStreamLine(), providerSessionId };
         }
-        const toolFragment = formatOpencodeToolUse(event, cwd);
+        const toolFragment = formatToolCall(toolName, event.tool.input, cwd);
         return {
             logFragment: toolFragment,
             responseFragment: null,
@@ -1115,7 +1049,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
     }
     if (event.type === 'step_start') {
         return {
-            logFragment: formatOpencodeStepTitle(event),
+            logFragment: event.title,
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
@@ -1132,7 +1066,7 @@ const parseOpencodeJsonEvent = (event, cwd) => {
         };
     }
     if (event.type === 'error') {
-        const recoveryEvent = interpretOpencodeRecoveryEvent(event.type, event.error, event.part?.text, undefined);
+        const recoveryEvent = interpretOpencodeRecoveryEvent(event.type, event.error, event.fallbackText ?? undefined, undefined);
         const parsedError = recoveryEvent?.type === 'error' ? recoveryEvent.error : null;
         const text = parsedError?.message ?? '';
         return {
@@ -1143,15 +1077,16 @@ const parseOpencodeJsonEvent = (event, cwd) => {
             recoveryEvents: recoveryEvent ? [recoveryEvent] : [],
         };
     }
-    return emptyParsedStreamLine();
+    return { ...emptyParsedStreamLine(), providerSessionId };
 };
 const parseOpencodeJsonLine = (line, cwd) => {
     const trimmed = line.trim();
     if (!trimmed) {
         return emptyParsedStreamLine();
     }
-    const { jsonObjects, remainder } = extractLeadingOpencodeJsonObjects(trimmed);
-    if (jsonObjects.length === 0) {
+    const normalizedLine = parseOpencodeStreamLine(trimmed);
+    const { events, remainder } = normalizedLine;
+    if (!normalizedLine.structured) {
         if (trimmed.startsWith('{')) {
             return emptyParsedStreamLine();
         }
@@ -1179,21 +1114,14 @@ const parseOpencodeJsonLine = (line, cwd) => {
     let concatenateFragments;
     let replaceFragment;
     let fragmentGroup;
-    for (const jsonObject of jsonObjects) {
-        let event;
-        try {
-            event = JSON.parse(jsonObject);
-        }
-        catch {
-            continue;
-        }
+    for (const event of events) {
         const parsedEvent = parseOpencodeJsonEvent(event, cwd);
         const { logFragment, responseFragment } = parsedEvent;
         subagentEvents.push(...parsedEvent.subagentEvents);
         recoveryEvents.push(...(parsedEvent.recoveryEvents ?? []));
         modelResolutionError ||= Boolean(parsedEvent.modelResolutionError);
         providerSessionId = providerSessionId ?? parsedEvent.providerSessionId;
-        if (jsonObjects.length === 1) {
+        if (events.length === 1) {
             concatenateFragments = parsedEvent.concatenateFragments;
             replaceFragment = parsedEvent.replaceFragment;
             fragmentGroup = parsedEvent.fragmentGroup;
@@ -1236,6 +1164,7 @@ const parseOpencodeJsonLine = (line, cwd) => {
     }
     return emptyParsedStreamLine();
 };
+const hasOpencodeFinalAnswer = (line) => parseOpencodeStreamLine(line).events.some(event => (event.type === 'text' && Boolean(event.text) && (!event.metadata.phase || event.metadata.phase === 'final_answer')));
 const appendTranscriptText = (current, fragment) => {
     const trimmed = fragment.trim();
     if (!trimmed) {
@@ -1289,7 +1218,7 @@ const appendOpencodeTranscriptLine = ({ parsed, logLines, responseLines, recover
     }
     return shouldResetResponse;
 };
-export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, executionContext, deferMainFinalization = false, }) => {
+export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, executionContext, deferMainFinalization = false, opencodeRuntimeIdentity = null, }) => {
     const trackedRuns = [];
     let nextRunIndex = Math.max(executionContext ? getNextAgentRunIndex(executionContext.runId) : getNextAgentRunIndex(parentType, parentId), mainRun ? mainRun.runIndex + 1 : 1);
     const emitUpdate = () => {
@@ -1335,7 +1264,7 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
             return;
         }
         run.sessionId = normalized;
-        updateAgentRunSessionId(run.id, normalized);
+        updateAgentRunSessionId(run.id, normalized, opencodeRuntimeIdentity);
     };
     const updateLabel = (run, label) => {
         if (!label?.trim()) {
@@ -1507,6 +1436,8 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
                 response_text: run.response || null,
                 failure_message: persistedRun?.failure_message ?? null,
                 session_id: run.sessionId,
+                opencode_session_runtime_major: persistedRun?.opencode_session_runtime_major ?? null,
+                opencode_session_runtime_version: persistedRun?.opencode_session_runtime_version ?? null,
                 completed_at: persistedRun?.completed_at ?? timestamp,
                 created_at: persistedRun?.created_at ?? run.createdAt,
                 updated_at: persistedRun?.updated_at ?? timestamp,
@@ -1538,6 +1469,8 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
                 response_text: parentResponse,
                 failure_message: persistedMainRun?.failure_message ?? null,
                 session_id: persistedMainRun?.session_id ?? null,
+                opencode_session_runtime_major: persistedMainRun?.opencode_session_runtime_major ?? null,
+                opencode_session_runtime_version: persistedMainRun?.opencode_session_runtime_version ?? null,
                 completed_at: persistedMainRun?.completed_at ?? timestamp,
                 created_at: persistedMainRun?.created_at ?? timestamp,
                 updated_at: persistedMainRun?.updated_at ?? timestamp,
@@ -1565,6 +1498,8 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
                 response_text: parentResponse,
                 failure_message: null,
                 session_id: null,
+                opencode_session_runtime_major: null,
+                opencode_session_runtime_version: null,
                 completed_at: timestamp,
                 created_at: timestamp,
                 updated_at: timestamp,
@@ -1575,7 +1510,7 @@ export const createSubagentRunTracker = ({ parentType, parentId, io, mainRun, ex
     const setMainSessionId = (sessionId) => {
         const normalized = sessionId?.trim();
         if (mainRun && normalized) {
-            updateAgentRunSessionId(mainRun.id, normalized);
+            updateAgentRunSessionId(mainRun.id, normalized, opencodeRuntimeIdentity);
         }
     };
     return { applySnapshot, handle, finalize, hasRunningSubagents, setMainSessionId, updateMain };
@@ -1598,7 +1533,7 @@ export const reconstructOpencodeSubagentTranscript = (parts, cwd) => {
                 : partType === 'step-finish'
                     ? 'step_finish'
                     : partType;
-        const parsed = parseOpencodeJsonEvent({ type: eventType, part }, cwd);
+        const parsed = parseOpencodeJsonEvent(decodeOpencodeStreamEvent({ type: eventType, part }), cwd);
         if (parsed.logFragment && parsed.logFragment !== parsed.responseFragment) {
             log = appendTranscriptText(log, parsed.logFragment);
         }
@@ -1620,7 +1555,7 @@ export const reconstructOpencodeSubagentTranscript = (parts, cwd) => {
     return { finalResponse: finalResponse || null, log: log || null, response: response || null };
 };
 export const readOpencodeSessionTranscript = async ({ sessionId, since, cwd, sessionOperations = hostOpencodeSessionOperations, }) => {
-    const reader = createOpencodeTaskSessionReader(sessionOperations);
+    const reader = createOpencodeTaskSessionReader(sessionOperations, { directory: cwd });
     if (!reader) {
         return null;
     }
@@ -1635,7 +1570,9 @@ export const readOpencodeSessionTranscript = async ({ sessionId, since, cwd, ses
     }
 };
 export const createOpencodeSubagentMonitor = ({ initialParentSessionId, spawnTimestamp, cwd, tracker, onParentSessionId, onActivity, taskSessionReader, discoverParentSession = true, parentDiscoveryDelayMs = 0, }) => {
-    const reader = taskSessionReader === undefined ? createOpencodeTaskSessionReader() : taskSessionReader;
+    const reader = taskSessionReader === undefined
+        ? createOpencodeTaskSessionReader(hostOpencodeSessionOperations, { directory: cwd })
+        : taskSessionReader;
     let parentSessionId = initialParentSessionId;
     let timer = null;
     const childSessionByCallId = new Map();
@@ -2079,8 +2016,10 @@ 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 }), }) => {
+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 resolvedModel = resolveAgentModel(tool, model);
+    const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
+    const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
     const opencodeSessionOperations = executionProvider.sessionOperations?.opencode ?? null;
     const subagentTracker = createSubagentRunTracker({
         parentType: 'ticket',
@@ -2097,6 +2036,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
             }
             : {}),
         executionContext,
+        opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
     });
     const emitRunUpdate = () => {
         const emitter = io;
@@ -2116,7 +2056,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
     };
     const writeRunSessionId = (sessionId) => {
         if (runStream) {
-            updateAgentRunSessionId(runStream.runId, sessionId);
+            updateAgentRunSessionId(runStream.runId, sessionId, resolvedOpencodeRuntimeIdentity);
             emitRunUpdate();
             if (persistSessionIdToTicket) {
                 updateSessionId(ticketId, sessionId, sessionField, io);
@@ -2201,7 +2141,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
                 return hasResolvedOpencodeSessionId;
             }
             try {
-                const session = await opencodeSessionOperations?.findLatestSessionAfter(spawnTimestamp, cwd);
+                const session = await opencodeSessionOperations?.findLatestSessionAfter(spawnTimestamp, { directory: cwd });
                 if (!hasResolvedOpencodeSessionId && session?.id) {
                     bindResolvedOpencodeSession(session.id);
                 }
@@ -2221,6 +2161,8 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
             mode: opencodeAgentMode,
             resumeSessionId,
             sessionId: randomUUID(),
+            opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
+            opencodeCompatibility: resolvedOpencodeCompatibility,
         };
         const invocation = agentProvider.buildStreamingInvocation(streamingRequest);
         sessionId = invocation.sessionId;
@@ -2316,7 +2258,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
         startTime = Date.now();
         if (tool === 'opencode' && spawnTimestamp !== null) {
             const taskSessionReader = opencodeSessionOperations
-                ? createOpencodeTaskSessionReader(opencodeSessionOperations)
+                ? createOpencodeTaskSessionReader(opencodeSessionOperations, { directory: cwd })
                 : null;
             opencodeSubagentMonitor = createOpencodeSubagentMonitor({
                 initialParentSessionId: resumeSessionId,
@@ -2349,7 +2291,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
                 const lines = text.split('\n');
                 remainder = lines.pop() ?? '';
                 for (const line of lines) {
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, line);
                     const parsed = parseClaudeStreamJsonLine(line, cwd);
                     const { logFragment, responseFragment, subagentEvents } = parsed;
                     if (isExecutionCapableParsedStreamLine(parsed)) {
@@ -2375,7 +2317,7 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
                     return;
                 }
                 if (remainder.trim()) {
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, remainder);
                     const parsed = parseClaudeStreamJsonLine(remainder, cwd);
                     const { logFragment, responseFragment, subagentEvents } = parsed;
                     if (isExecutionCapableParsedStreamLine(parsed)) {
@@ -2464,18 +2406,8 @@ const runAgentOnce = ({ ticketId, tool, prompt, cwd, io, model, variant = null,
             for (const line of lines) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                 if (firstFinalAnswerTime === null && startTime !== null) {
-                    const trimmedLine = line.trim();
-                    if (trimmedLine.startsWith('{')) {
-                        try {
-                            const event = JSON.parse(trimmedLine);
-                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
-                                const phase = event.part.metadata?.openai?.phase;
-                                if (!phase || phase === 'final_answer') {
-                                    firstFinalAnswerTime = Date.now();
-                                }
-                            }
-                        }
-                        catch { /* best-effort timing */ }
+                    if (hasOpencodeFinalAnswer(line)) {
+                        firstFinalAnswerTime = Date.now();
                     }
                 }
                 const parsed = parseOpencodeJsonLine(line);
@@ -2670,8 +2602,10 @@ export const runAgent = (options) => {
     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 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 resolvedModel = resolveAgentModel(tool, model);
+    const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
+    const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
     const opencodeSessionOperations = executionProvider.sessionOperations?.opencode ?? null;
     const subagentTracker = createSubagentRunTracker({
         parentType: 'chat',
@@ -2680,6 +2614,7 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
         executionContext,
         mainRun,
         deferMainFinalization: true,
+        opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
     });
     return new Promise((resolve, reject) => {
         let sessionId = null;
@@ -2725,6 +2660,8 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
             mode: opencodeAgentMode,
             resumeSessionId,
             sessionId: randomUUID(),
+            opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
+            opencodeCompatibility: resolvedOpencodeCompatibility,
         };
         const invocation = agentProvider.buildStreamingInvocation(streamingRequest);
         sessionId = invocation.sessionId;
@@ -2739,15 +2676,18 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                 subagentTracker.setMainSessionId(resumeSessionId);
             }
             spawnTimestamp = Date.now();
-            opencodeMetadataRefresher = createOpencodeMetadataRefresher({
-                chatSessionId,
-                io,
-                spawnTimestamp,
-                initialSessionId: resumeSessionId,
-                ...(opencodeSessionOperations ? { sessionOperations: opencodeSessionOperations } : {}),
-            });
-            chatState.metadataRefresher = opencodeMetadataRefresher;
-            if (resumeSessionId) {
+            if (opencodeSessionOperations) {
+                opencodeMetadataRefresher = createOpencodeMetadataRefresher({
+                    chatSessionId,
+                    io,
+                    spawnTimestamp,
+                    cwd,
+                    initialSessionId: resumeSessionId,
+                    sessionOperations: opencodeSessionOperations,
+                });
+                chatState.metadataRefresher = opencodeMetadataRefresher;
+            }
+            if (resumeSessionId && opencodeMetadataRefresher) {
                 const metadataRefresher = opencodeMetadataRefresher;
                 void metadataRefresher.refresh().then(result => {
                     if (!result.hasResolvedTitle) {
@@ -2834,7 +2774,7 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                 cwd,
                 tracker: subagentTracker,
                 taskSessionReader: opencodeSessionOperations
-                    ? createOpencodeTaskSessionReader(opencodeSessionOperations)
+                    ? createOpencodeTaskSessionReader(opencodeSessionOperations, { directory: cwd })
                     : null,
                 discoverParentSession: false,
                 onParentSessionId: discoveredSessionId => {
@@ -2866,7 +2806,7 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                         executionCapableEventObserved = true;
                     }
                     subagentTracker.handle(subagentEvents);
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, line);
                     if (logFragment !== null) {
                         logLines.push(logFragment);
                     }
@@ -2886,7 +2826,7 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                     return;
                 }
                 if (remainder.trim()) {
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, remainder);
                     const parsed = parseClaudeStreamJsonLine(remainder);
                     const { logFragment, responseFragment, subagentEvents } = parsed;
                     if (isExecutionCapableParsedStreamLine(parsed)) {
@@ -2989,18 +2929,8 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
             for (const line of lines) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                 if (firstFinalAnswerTime === null && startTime !== null) {
-                    const trimmedLine = line.trim();
-                    if (trimmedLine.startsWith('{')) {
-                        try {
-                            const event = JSON.parse(trimmedLine);
-                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
-                                const phase = event.part.metadata?.openai?.phase;
-                                if (!phase || phase === 'final_answer') {
-                                    firstFinalAnswerTime = Date.now();
-                                }
-                            }
-                        }
-                        catch { /* best-effort timing */ }
+                    if (hasOpencodeFinalAnswer(line)) {
+                        firstFinalAnswerTime = Date.now();
                     }
                 }
                 const parsed = parseOpencodeJsonLine(line, cwd);
@@ -3008,7 +2938,16 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                 if (isExecutionCapableParsedStreamLine(parsed)) {
                     executionCapableEventObserved = true;
                 }
-                opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                if (providerSessionId) {
+                    if (opencodeMetadataRefresher) {
+                        opencodeMetadataRefresher.pinSessionId(providerSessionId);
+                    }
+                    else {
+                        updateChatSessionId(chatSessionId, 'opencode', providerSessionId, io);
+                    }
+                    opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                    subagentTracker.setMainSessionId(providerSessionId);
+                }
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
                     firstFinalAnswerTime = null;
@@ -3035,7 +2974,16 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                 if (isExecutionCapableParsedStreamLine(parsed)) {
                     executionCapableEventObserved = true;
                 }
-                opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                if (providerSessionId) {
+                    if (opencodeMetadataRefresher) {
+                        opencodeMetadataRefresher.pinSessionId(providerSessionId);
+                    }
+                    else {
+                        updateChatSessionId(chatSessionId, 'opencode', providerSessionId, io);
+                    }
+                    opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                    subagentTracker.setMainSessionId(providerSessionId);
+                }
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
                     firstFinalAnswerTime = null;
@@ -3061,12 +3009,12 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                 ?? resumeSessionId;
             await opencodeSubagentMonitor?.refresh();
             if (chatState.stopRequested) {
-                if (resolvedOpencodeSessionId) {
+                if (resolvedOpencodeSessionId && opencodeSessionOperations) {
                     usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
-                        ...(opencodeSessionOperations ? { sessionOperations: opencodeSessionOperations } : {}),
+                        sessionOperations: opencodeSessionOperations,
                     });
                 }
                 updateChatSessionStatus(chatSessionId, 'running', preservedOutput?.log ?? null, io, preservedOutput?.response ?? null);
@@ -3086,12 +3034,12 @@ const runChatAgentOnce = ({ chatSessionId, tool, prompt, files = [], cwd, io, mo
                     log,
                     response: finalResponse,
                 });
-                if (resolvedOpencodeSessionId && spawnTimestamp !== null) {
+                if (resolvedOpencodeSessionId && spawnTimestamp !== null && opencodeSessionOperations) {
                     usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
-                        ...(opencodeSessionOperations ? { sessionOperations: opencodeSessionOperations } : {}),
+                        sessionOperations: opencodeSessionOperations,
                     });
                 }
                 updateChatSessionStatus(chatSessionId, 'running', finalOutput.log, io, finalOutput.response);
@@ -3155,8 +3103,11 @@ export const runChatAgent = (options) => {
     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 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 resolvedModel = resolveAgentModel(tool, model);
+    const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
+    const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
+    const opencodeSessionOperations = executionProvider.sessionOperations?.opencode ?? null;
     const subagentTracker = createSubagentRunTracker({
         parentType: 'spec',
         parentId: specSessionId,
@@ -3164,6 +3115,7 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
         executionContext,
         mainRun,
         deferMainFinalization: true,
+        opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
     });
     return new Promise((resolve, reject) => {
         let sessionId = null;
@@ -3209,6 +3161,8 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
             mode: 'plan',
             resumeSessionId,
             sessionId: randomUUID(),
+            opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
+            opencodeCompatibility: resolvedOpencodeCompatibility,
         };
         const invocation = agentProvider.buildStreamingInvocation(streamingRequest);
         sessionId = invocation.sessionId;
@@ -3223,14 +3177,18 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 subagentTracker.setMainSessionId(resumeSessionId);
             }
             spawnTimestamp = Date.now();
-            opencodeMetadataRefresher = createSpecOpencodeMetadataRefresher({
-                specSessionId,
-                io,
-                spawnTimestamp,
-                initialSessionId: resumeSessionId,
-            });
-            specState.metadataRefresher = opencodeMetadataRefresher;
-            if (resumeSessionId) {
+            if (opencodeSessionOperations) {
+                opencodeMetadataRefresher = createSpecOpencodeMetadataRefresher({
+                    specSessionId,
+                    io,
+                    spawnTimestamp,
+                    cwd,
+                    initialSessionId: resumeSessionId,
+                    sessionOperations: opencodeSessionOperations,
+                });
+                specState.metadataRefresher = opencodeMetadataRefresher;
+            }
+            if (resumeSessionId && opencodeMetadataRefresher) {
                 const metadataRefresher = opencodeMetadataRefresher;
                 void metadataRefresher.refresh().then(result => {
                     if (!result.hasResolvedTitle) {
@@ -3307,6 +3265,9 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 spawnTimestamp,
                 cwd,
                 tracker: subagentTracker,
+                taskSessionReader: opencodeSessionOperations
+                    ? createOpencodeTaskSessionReader(opencodeSessionOperations, { directory: cwd })
+                    : null,
                 discoverParentSession: false,
                 onParentSessionId: discoveredSessionId => {
                     updateSpecSessionIdLocal(specSessionId, 'opencode', discoveredSessionId, io);
@@ -3337,7 +3298,7 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                         executionCapableEventObserved = true;
                     }
                     subagentTracker.handle(subagentEvents);
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, line);
                     if (logFragment !== null) {
                         logLines.push(logFragment);
                     }
@@ -3358,7 +3319,7 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                     return;
                 }
                 if (remainder.trim()) {
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, remainder);
                     const parsed = parseClaudeStreamJsonLine(remainder);
                     const { logFragment, responseFragment, subagentEvents } = parsed;
                     if (isExecutionCapableParsedStreamLine(parsed)) {
@@ -3461,18 +3422,8 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
             for (const line of lines) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                 if (firstFinalAnswerTime === null && startTime !== null) {
-                    const trimmedLine = line.trim();
-                    if (trimmedLine.startsWith('{')) {
-                        try {
-                            const event = JSON.parse(trimmedLine);
-                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
-                                const phase = event.part.metadata?.openai?.phase;
-                                if (!phase || phase === 'final_answer') {
-                                    firstFinalAnswerTime = Date.now();
-                                }
-                            }
-                        }
-                        catch { /* best-effort timing */ }
+                    if (hasOpencodeFinalAnswer(line)) {
+                        firstFinalAnswerTime = Date.now();
                     }
                 }
                 const parsed = parseOpencodeJsonLine(line, cwd);
@@ -3480,7 +3431,16 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 if (isExecutionCapableParsedStreamLine(parsed)) {
                     executionCapableEventObserved = true;
                 }
-                opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                if (providerSessionId) {
+                    if (opencodeMetadataRefresher) {
+                        opencodeMetadataRefresher.pinSessionId(providerSessionId);
+                    }
+                    else {
+                        updateSpecSessionIdLocal(specSessionId, 'opencode', providerSessionId, io);
+                    }
+                    opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                    subagentTracker.setMainSessionId(providerSessionId);
+                }
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
                     firstFinalAnswerTime = null;
@@ -3509,7 +3469,16 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 if (isExecutionCapableParsedStreamLine(parsed)) {
                     executionCapableEventObserved = true;
                 }
-                opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                if (providerSessionId) {
+                    if (opencodeMetadataRefresher) {
+                        opencodeMetadataRefresher.pinSessionId(providerSessionId);
+                    }
+                    else {
+                        updateSpecSessionIdLocal(specSessionId, 'opencode', providerSessionId, io);
+                    }
+                    opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                    subagentTracker.setMainSessionId(providerSessionId);
+                }
                 subagentTracker.handle(subagentEvents);
                 if (appendOpencodeTranscriptLine({ parsed, logLines, responseLines, recoveryTracker })) {
                     firstFinalAnswerTime = null;
@@ -3535,11 +3504,12 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                 ?? resumeSessionId;
             await opencodeSubagentMonitor?.refresh();
             if (specState.stopRequested) {
-                if (resolvedOpencodeSessionId) {
+                if (resolvedOpencodeSessionId && opencodeSessionOperations) {
                     usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
+                        sessionOperations: opencodeSessionOperations,
                     });
                 }
                 updateSpecSessionStatusLocal(specSessionId, 'running', preservedOutput?.log ?? null, io, preservedOutput?.response ?? null);
@@ -3559,11 +3529,12 @@ const runSpecAgentOnce = ({ specSessionId, tool, prompt, files = [], cwd, io, mo
                     log,
                     response: finalResponse,
                 });
-                if (resolvedOpencodeSessionId && spawnTimestamp !== null) {
+                if (resolvedOpencodeSessionId && spawnTimestamp !== null && opencodeSessionOperations) {
                     usageSnapshot = await resolveOpencodeUsageSnapshot({
                         current: usageSnapshot,
                         sessionId: resolvedOpencodeSessionId,
                         spawnTimestamp,
+                        sessionOperations: opencodeSessionOperations,
                     });
                 }
                 updateSpecSessionStatusLocal(specSessionId, 'running', finalOutput.log, io, finalOutput.response);
@@ -3637,7 +3608,7 @@ export const runSpecAgent = (options) => {
  * updateSpecReviewRunStatus / updateSpecReviewRunStreaming / updateSpecReviewRunUsage —
  * 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 }), }) => {
+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 registeredState = activeSpecReviewProcesses.get(specReviewRunId);
     if (registeredState?.stopRequested) {
         return Promise.resolve({
@@ -3648,11 +3619,15 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
         });
     }
     const resolvedModel = resolveAgentModel(tool, model);
+    const resolvedOpencodeCompatibility = resolveOpencodeCompatibility(tool, executionProvider, opencodeRuntimeIdentity);
+    const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
+    const opencodeSessionOperations = executionProvider.sessionOperations?.opencode ?? null;
     const subagentTracker = createSubagentRunTracker({
         parentType: 'spec',
         parentId: specSessionId,
         io,
         executionContext,
+        opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
     });
     return new Promise((resolve, reject) => {
         let spawnTimestamp = null;
@@ -3696,9 +3671,18 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
             mode: 'plan',
             resumeSessionId: null,
             sessionId: randomUUID(),
+            opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
+            opencodeCompatibility: resolvedOpencodeCompatibility,
         };
         const invocation = tool === 'opencode'
-            ? buildOpencodeSpecReviewInvocation({ prompt, files, model: resolvedModel, variant })
+            ? buildOpencodeSpecReviewInvocation({
+                prompt,
+                files,
+                model: resolvedModel,
+                variant,
+                opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
+                opencodeCompatibility: resolvedOpencodeCompatibility,
+            })
             : agentProvider.buildStreamingInvocation(streamingRequest);
         try {
             const handle = executionProvider.execute({
@@ -3763,6 +3747,9 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
                 spawnTimestamp,
                 cwd,
                 tracker: subagentTracker,
+                taskSessionReader: opencodeSessionOperations
+                    ? createOpencodeTaskSessionReader(opencodeSessionOperations, { directory: cwd })
+                    : null,
                 parentDiscoveryDelayMs: OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS,
             });
             opencodeSubagentMonitor.start();
@@ -3780,7 +3767,7 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
                 const lines = text.split('\n');
                 remainder = lines.pop() ?? '';
                 for (const line of lines) {
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, line);
                     const { logFragment, responseFragment, subagentEvents } = parseClaudeStreamJsonLine(line);
                     subagentTracker.handle(subagentEvents);
                     if (logFragment !== null) {
@@ -3803,7 +3790,7 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
                     return;
                 }
                 if (remainder.trim()) {
-                    usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, remainder);
+                    usageSnapshot = mergeClaudeUsageFromJsonLine(usageSnapshot, remainder);
                     const { logFragment, responseFragment, subagentEvents } = parseClaudeStreamJsonLine(remainder);
                     subagentTracker.handle(subagentEvents);
                     if (logFragment !== null) {
@@ -3865,18 +3852,8 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
             for (const line of lines) {
                 usageSnapshot = mergeUsageFromJsonLine(usageSnapshot, line);
                 if (firstFinalAnswerTime === null && startTime !== null) {
-                    const trimmedLine = line.trim();
-                    if (trimmedLine.startsWith('{')) {
-                        try {
-                            const event = JSON.parse(trimmedLine);
-                            if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
-                                const phase = event.part.metadata?.openai?.phase;
-                                if (!phase || phase === 'final_answer') {
-                                    firstFinalAnswerTime = Date.now();
-                                }
-                            }
-                        }
-                        catch { /* best-effort timing */ }
+                    if (hasOpencodeFinalAnswer(line)) {
+                        firstFinalAnswerTime = Date.now();
                     }
                 }
                 const parsed = parseOpencodeJsonLine(line, cwd);
@@ -3917,11 +3894,12 @@ const runSpecReviewAgentOnce = ({ specReviewRunId, specSessionId, tool, prompt,
             const finalResponse = recoveryTracker.hasRecoveredFinalAnswer()
                 ? recoveredResponse
                 : responseLines.join('\n\n') || stderrOutput;
-            if (opencodeSessionId && spawnTimestamp !== null) {
+            if (opencodeSessionId && spawnTimestamp !== null && opencodeSessionOperations) {
                 usageSnapshot = await resolveOpencodeUsageSnapshot({
                     current: usageSnapshot,
                     sessionId: opencodeSessionId,
                     spawnTimestamp,
+                    sessionOperations: opencodeSessionOperations,
                 });
             }
             if (reviewState.stopRequested) {