@straiffi/archon 1.11.5 → 1.11.7

package/dist/server/workers/plan.js

@@ -10,9 +10,14 @@ import { resolveExistingWorktreePath } from '../lib/git.js';
 import { getModelProvider, normalizeModelId } from '../lib/models.js';
 import { getAgentModelProvider, normalizeAgentModelId, requireExecutableAgent } from '../lib/agentCatalog.js';
 import { codexAgentProvider } from '../lib/codexAgentProvider.js';
+import { opencodeAgentProvider } from '../lib/opencodeAgentProvider.js';
 import { createOpencodeTaskSessionReader, parseOpencodeTaskEnvelope } from '../lib/opencodeTaskSessions.js';
+import { parseOpencodeStreamLine } from '../lib/opencodeStream.js';
+import { parseOpencodeError } from '../lib/opencodeErrors.js';
 import { hostOpencodeSessionOperations } from '../lib/opencodeSessionOperations.js';
+import { getOpencodeCliCompatibility, inspectOpencodeRelease, requireSupportedOpencodeCompatibility } from '../lib/opencodeCli.js';
 import { markRetryableOpenCodeDatabaseLock, RetryableOpenCodeDatabaseLockError, retryOpenCodeDatabaseLocks } from '../lib/opencodeExecutionReliability.js';
+import { appendAgentOutputLanguagePrompt } from '../lib/agentOutputLanguage.js';
 import { appendClaudeHeadlessPlanPrompt, appendPlanModeQuestionPromptRules, buildClaudeHeadlessPlanArgs } from '../lib/planModeQuestions.js';
 import { persistProjectMemorySuggestions } from '../lib/projectMemory.js';
 import { getProjectMemoryPromptBlock } from '../lib/projectMemoryPrompt.js';
@@ -27,7 +32,8 @@ import { createTicketMessage, upsertTicketDescriptionMessage } from '../lib/tick
 import { createAskQuestionMetadata, extractAskQuestionFromOutput, formatAskQuestionMessage } from '../lib/planQuestions.js';
 import { getTicket, resolveTicketBranch, resolveTicketTool, resolveTicketWorkerKey } from '../lib/tickets.js';
 import { createOpencodeSubagentMonitor, createSubagentRunTracker, formatAgentErrorForTranscript, getAgentErrorTranscriptRuns, readOpencodeSessionTranscript, storeTicketUsageSnapshot, storeTicketUsageSnapshotDirect, mergeUsageFromJsonLine, EMPTY_CHAT_USAGE_SNAPSHOT } from '../lib/agent.js';
-import { createAgentRun, emitAgentRunsUpdated, finalizeAgentRun, getAgentRun, getNextAgentRunIndex, terminalizeAgentRunsForExecutionRun, updateAgentRunSessionId } from '../lib/agentRuns.js';
+import { createAgentRun, emitAgentRunsUpdated, finalizeAgentRun, getAgentRun, getNextAgentRunIndex, resolveHistoricalProviderSessionForParent, terminalizeAgentRunsForExecutionRun, updateAgentRunSessionId } from '../lib/agentRuns.js';
+import { shouldStartFreshProviderSession } from '../lib/opencodeSessionProvenance.js';
 import { addExecutionRunLink, createExecutionRun, transitionExecutionRun } from '../lib/executionRuns.js';
 import { assertProviderSessionAuthorityMatches, createExecutionProfileSelectionMetadata } from '../lib/executionRunAuthority.js';
 import { classifyTicketExecutionTarget, resolveExecutionTarget, resolveProjectRootExecutionTarget } from '../lib/executionTargets.js';
@@ -50,6 +56,7 @@ const plannerExecutionOptions = (options) => ({
     executionTarget: options.executionTarget,
     executionLauncherEnvironment: options.executionLauncherEnvironment,
     executionRuntimeEnvironment: options.executionRuntimeEnvironment,
+    opencodeRuntimeIdentity: options.opencodeRuntimeIdentity,
 });
 const createPlanningInvocation = (options, label, role) => {
     const parentType = options.agentRunParent?.parentType ?? (options.ticketId ? 'ticket' : options.projectId ? 'planning' : null);
@@ -116,59 +123,6 @@ const createPlannerRecoveryTracker = () => {
         getRecoveredResponse: () => finalAnswerFragments.join('\n\n'),
     };
 };
-const extractLeadingJsonObject = (line) => {
-    if (!line.startsWith('{')) {
-        return null;
-    }
-    let depth = 0;
-    let inString = false;
-    let escaping = false;
-    for (let index = 0; index < line.length; index += 1) {
-        const char = line[index];
-        if (inString) {
-            if (escaping) {
-                escaping = false;
-                continue;
-            }
-            if (char === '\\') {
-                escaping = true;
-                continue;
-            }
-            if (char === '"') {
-                inString = false;
-            }
-            continue;
-        }
-        if (char === '"') {
-            inString = true;
-            continue;
-        }
-        if (char === '{') {
-            depth += 1;
-            continue;
-        }
-        if (char === '}') {
-            depth -= 1;
-            if (depth === 0) {
-                return line.slice(0, index + 1);
-            }
-        }
-    }
-    return null;
-};
-const extractLeadingJsonObjects = (line) => {
-    const jsonObjects = [];
-    let remainder = line.trim();
-    while (remainder.startsWith('{')) {
-        const jsonObject = extractLeadingJsonObject(remainder);
-        if (!jsonObject) {
-            break;
-        }
-        jsonObjects.push(jsonObject);
-        remainder = remainder.slice(jsonObject.length).trim();
-    }
-    return { jsonObjects, remainder };
-};
 const normalizeToolName = (name) => name.toLowerCase().replace(/[^a-z0-9]/g, '');
 const isPlannerSubagentTool = (name) => {
     const normalized = normalizeToolName(name);
@@ -384,61 +338,41 @@ const parseClaudePlannerStreamJsonLine = (line) => {
     }
     return emptyParsedPlannerStreamLine();
 };
-const formatPlannerOpencodeToolUse = (event, cwd) => {
-    const toolName = event.part?.tool;
-    if (!toolName) {
-        return null;
-    }
-    return formatPlannerToolCall(toolName, event.part?.state?.input, cwd);
-};
-const formatPlannerStepTitle = (event) => {
-    const title = event.part?.title?.trim();
-    return title || null;
-};
 const parseOpencodePlannerJsonEvent = (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;
-        const status = event.part?.state?.status;
+        const status = event.tool.status;
         return {
             ...emptyParsedPlannerStreamLine(),
             providerSessionId,
             subagentEvents: [{
                     kind: 'snapshot',
-                    callId: event.part?.callID ?? null,
-                    label: event.part?.title?.trim() || 'Subagent',
-                    sessionId,
+                    callId: event.tool.callId,
+                    label: event.tool.title || 'Subagent',
+                    sessionId: event.tool.childSessionId,
                     status: status === 'error' || status === 'failed'
                         ? 'error'
                         : status === 'stopped' || status === 'interrupted' ? 'stopped' : status === 'running' ? 'running' : 'done',
-                    log: event.part?.state?.log ?? null,
-                    response: event.part?.state?.response ?? null,
+                    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,
-            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;
+    if (event.type === 'text' && event.text) {
+        const concatenateFragments = event.metadata.delta;
+        const text = concatenateFragments ? event.text : event.text.trim();
+        const phase = event.metadata.phase;
         return {
             logFragment: text || null,
             responseFragment: text && (!phase || phase === 'final_answer') ? text : null,
@@ -449,38 +383,32 @@ const parseOpencodePlannerJsonEvent = (event, cwd) => {
                 ? [{ type: 'final_answer', text }]
                 : [],
             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,
             subagentEvents: [],
             providerSessionId,
             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 && isPlannerSubagentTool(toolName)) {
-            const description = getPlannerSubagentDescription(event.part?.state?.input, toolName);
-            const rawOutput = event.part?.state?.output?.trim();
+            const description = getPlannerSubagentDescription(event.tool.input, toolName);
+            const rawOutput = event.tool.output?.trim();
             const envelope = parseOpencodeTaskEnvelope(rawOutput);
             const output = 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 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,
@@ -488,7 +416,7 @@ const parseOpencodePlannerJsonEvent = (event, cwd) => {
                     ...(isToolInvocation
                         ? [{
                                 kind: 'start',
-                                callId: event.part?.callID ?? null,
+                                callId: event.tool.callId,
                                 label: `Subagent: ${description}`,
                                 sessionId: childSessionId,
                             }]
@@ -496,7 +424,7 @@ const parseOpencodePlannerJsonEvent = (event, cwd) => {
                     ...(output || isTerminal
                         ? [{
                                 kind: isTerminal ? 'complete' : 'fragment',
-                                callId: event.part?.callID ?? null,
+                                callId: event.tool.callId,
                                 label: `Subagent: ${description}`,
                                 ...(output ? { text: output } : {}),
                                 sessionId: childSessionId,
@@ -513,7 +441,7 @@ const parseOpencodePlannerJsonEvent = (event, cwd) => {
             return { ...emptyParsedPlannerStreamLine(), providerSessionId };
         }
         return {
-            logFragment: formatPlannerOpencodeToolUse(event, cwd),
+            logFragment: formatPlannerToolCall(toolName, event.tool.input, cwd),
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
@@ -521,19 +449,14 @@ const parseOpencodePlannerJsonEvent = (event, cwd) => {
     }
     if (event.type === 'step_start') {
         return {
-            logFragment: formatPlannerStepTitle(event),
+            logFragment: event.title,
             responseFragment: null,
             subagentEvents: [],
             providerSessionId,
         };
     }
     if (event.type === 'error') {
-        const errorText = typeof event.error === 'string'
-            ? event.error.trim()
-            : event.error?.data?.message?.trim()
-                || event.error?.message?.trim()
-                || (event.error ? JSON.stringify(event.error) : '');
-        const text = event.part?.text?.trim() || errorText;
+        const text = parseOpencodeError(event.error, event.fallbackText ?? undefined)?.message ?? '';
         return {
             logFragment: text ? `**Error:** ${text}` : null,
             responseFragment: null,
@@ -549,8 +472,9 @@ const parseOpencodePlannerJsonLine = (line, cwd) => {
     if (!trimmedLine) {
         return emptyParsedPlannerStreamLine();
     }
-    const { jsonObjects, remainder } = extractLeadingJsonObjects(trimmedLine);
-    if (jsonObjects.length === 0) {
+    const normalizedLine = parseOpencodeStreamLine(trimmedLine);
+    const { events, remainder } = normalizedLine;
+    if (!normalizedLine.structured) {
         if (trimmedLine.startsWith('{')) {
             return emptyParsedPlannerStreamLine();
         }
@@ -578,14 +502,7 @@ const parseOpencodePlannerJsonLine = (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 = parseOpencodePlannerJsonEvent(event, cwd);
         const eventRecoveryEvents = parsedEvent.recoveryEvents ?? [];
         if (eventRecoveryEvents.some(recoveryEvent => recoveryEvent.type === 'error')) {
@@ -601,7 +518,7 @@ const parseOpencodePlannerJsonLine = (line, cwd) => {
         recoveryEvents.push(...eventRecoveryEvents);
         providerSessionId = providerSessionId ?? parsedEvent.providerSessionId;
         hasFinalAnswer ||= parsedEvent.hasFinalAnswer === true;
-        if (jsonObjects.length === 1) {
+        if (events.length === 1) {
             concatenateFragments = parsedEvent.concatenateFragments;
             replaceFragment = parsedEvent.replaceFragment;
             fragmentGroup = parsedEvent.fragmentGroup;
@@ -672,10 +589,6 @@ const MEMORY_SUGGESTION_RULES = [
 const getPlanningMemorySuggestionRules = (memoryEnabled) => {
     return memoryEnabled ? MEMORY_SUGGESTION_RULES : '';
 };
-const ENGLISH_OUTPUT_RULES = [
-    '- Always write the output in English regardless of the language used in the source description, ticket, or linked materials.',
-    '- Translate or restate non-English input into clear natural English for titles, summaries, descriptions, constraints, acceptance criteria, implementation steps, and open questions.',
-].join('\n');
 const EXPANDED_TICKET_EXAMPLE = [
     '{',
     '  "key": "header-hello-world",',
@@ -810,7 +723,7 @@ Primary implementation scope:
 Linked project findings:
 ${researchBlocks}`;
 };
-const buildPlanPrompt = (title, description, linkedResearchContext = '') => `You are helping plan a software development ticket. Based on the title and brief description below, write a detailed ticket description that is specific enough for a separate AI agent to implement the feature end-to-end without needing any further context or clarification.
+const buildPlanPrompt = (title, description, linkedResearchContext = '') => appendAgentOutputLanguagePrompt(`You are helping plan a software development ticket. Based on the title and brief description below, write a detailed ticket description that is specific enough for a separate AI agent to implement the feature end-to-end without needing any further context or clarification.
 
 Include:
 ${IMPLEMENTATION_READY_DESCRIPTION_REQUIREMENTS}
@@ -822,15 +735,13 @@ Brief description: ${description}
 ${linkedResearchContext}
 
 Additional rules:
-- Language rules:
-${ENGLISH_OUTPUT_RULES}
 - The downstream build agent will only work in the active project repo.
 - If linked-project findings are relevant, embed the required external contract details directly in the ticket.
 - Do not instruct the implementer to inspect linked projects or linked files.
 - Preserve any user-provided URLs, Figma links, docs, tickets, or other external resources that are needed during implementation.
 - Include those resources verbatim in the final ticket description instead of replacing them with vague summaries.
 
-Write only the expanded description in markdown, formatted to be readable by both humans and agents. No preamble or meta-commentary.`;
+Write only the expanded description in markdown, formatted to be readable by both humans and agents. No preamble or meta-commentary.`);
 const buildSingleTicketPrompt = (title, description, linkedResearchContext = '', projectMemoryBlock = '', memoryEnabled = false, interactiveQuestions = false) => {
     const prompt = `You are helping plan a single software development ticket.
 
@@ -858,8 +769,6 @@ Rules:
 - Use the key \`main-ticket\`.
 - Use the provided title exactly.
 - Return an empty dependencies array.
-- Language rules:
-${ENGLISH_OUTPUT_RULES}
 - The description must be valid markdown and include:
 ${IMPLEMENTATION_READY_DESCRIPTION_REQUIREMENTS}
 ${INDENTED_IMPLEMENTATION_READY_DESCRIPTION_SECTION_TEMPLATE}
@@ -877,7 +786,6 @@ ${IMPLEMENTATION_BODY_DEDUPLICATION_RULES}
 ${PLANNING_QUESTIONS_RULES}
 - Memory suggestion rules:${getPlanningMemorySuggestionRules(memoryEnabled) ? `
 ${getPlanningMemorySuggestionRules(memoryEnabled)}` : ' Omit memory suggestions entirely when project memory is disabled.'}
-- Write the natural-language update in English.
 - Keep the natural-language update to 1-3 short sentences focused on what changed in the plan.
 - Wrap the JSON object in <archon-plan-output>...</archon-plan-output> tags after the natural-language update.
 - Do not wrap the JSON in markdown fences.
@@ -889,9 +797,10 @@ ${projectMemoryBlock ? `${projectMemoryBlock}
 
 ` : ''}
 ${linkedResearchContext}`;
-    return interactiveQuestions ? appendPlanModeQuestionPromptRules(prompt) : prompt;
+    const languagePrompt = appendAgentOutputLanguagePrompt(prompt);
+    return interactiveQuestions ? appendPlanModeQuestionPromptRules(languagePrompt) : languagePrompt;
 };
-const buildPlanningAgentOutlinePrompt = (description, linkedResearchContext = '', projectMemoryBlock = '') => `You are helping break down a software development initiative into implementation tickets for a kanban board.
+const buildPlanningAgentOutlinePrompt = (description, linkedResearchContext = '', projectMemoryBlock = '') => appendAgentOutputLanguagePrompt(`You are helping break down a software development initiative into implementation tickets for a kanban board.
 
 This is pass 1 of 2. Your job is to decide the best ticket split and dependency graph, not to fully expand implementation details yet.
 
@@ -928,8 +837,6 @@ Rules:
 - Each ticket should be independently actionable and belong in the plan column.
 - Prefer the smallest useful number of tickets that still separates major implementation concerns cleanly.
 - Do not write full implementation-ready descriptions yet.
-- Language rules:
-${ENGLISH_OUTPUT_RULES}
 - For each ticket, include:
 ${OUTLINE_DETAIL_REQUIREMENTS}
 - Use stable unique keys in kebab-case.
@@ -948,8 +855,8 @@ ${description}
 ${projectMemoryBlock ? `${projectMemoryBlock}
 
 ` : ''}
-${linkedResearchContext}`;
-const buildPlanningAgentExpansionPrompt = (description, outline, linkedResearchContext = '', projectMemoryBlock = '') => `You are helping expand a previously decomposed software development initiative into implementation-ready tickets for a kanban board.
+${linkedResearchContext}`);
+const buildPlanningAgentExpansionPrompt = (description, outline, linkedResearchContext = '', projectMemoryBlock = '') => appendAgentOutputLanguagePrompt(`You are helping expand a previously decomposed software development initiative into implementation-ready tickets for a kanban board.
 
 Each generated ticket will later be implemented by a separate AI agent, so every ticket description must be self-contained and implementation-ready without needing any further context or clarification.
 
@@ -987,8 +894,6 @@ Rules:
 - Preserve every ticket key exactly as provided.
 - Preserve every ticket title exactly as provided.
 - Preserve the dependency list exactly as provided.
-- Language rules:
-${ENGLISH_OUTPUT_RULES}
 - Each description must be valid markdown and include:
 ${IMPLEMENTATION_READY_DESCRIPTION_REQUIREMENTS}
 ${INDENTED_IMPLEMENTATION_READY_DESCRIPTION_SECTION_TEMPLATE}
@@ -1016,7 +921,7 @@ ${description}
 ${linkedResearchContext}
 
 Outline to expand:
-${JSON.stringify(outline, null, 2)}`;
+${JSON.stringify(outline, null, 2)}`);
 const resolvePlannerCwd = (project, branch) => {
     if (!project) {
         return undefined;
@@ -1098,9 +1003,23 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
         ? appendClaudeHeadlessPlanPrompt(prompt)
         : prompt;
     const sessionTracking = options.sessionTracking;
+    const sessionDirectory = cwd ?? process.cwd();
     const opencodeSessionOperations = options.executionProvider
         ? options.executionProvider.sessionOperations.opencode
         : hostOpencodeSessionOperations;
+    const resolvedOpencodeCompatibility = (() => {
+        if (tool !== 'opencode') {
+            return null;
+        }
+        if (options.executionProvider?.kind === 'docker_sandbox') {
+            if (!options.opencodeRuntimeIdentity) {
+                throw new Error('The selected OpenCode execution environment has no validated runtime compatibility.');
+            }
+            return requireSupportedOpencodeCompatibility(inspectOpencodeRelease(options.opencodeRuntimeIdentity.version));
+        }
+        return requireSupportedOpencodeCompatibility(getOpencodeCliCompatibility({ force: true }));
+    })();
+    const resolvedOpencodeRuntimeIdentity = resolvedOpencodeCompatibility?.runtimeIdentity ?? null;
     let sessionId = null;
     let spawnTimestamp = null;
     let sessionLookupTimer = null;
@@ -1140,21 +1059,21 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                 });
                 return [invocation.command, [...invocation.args], invocation.stdio];
             })()
-            : [
-                'opencode',
-                [
-                    'run',
-                    '--agent',
-                    'plan',
-                    '--format',
-                    'json',
-                    ...(sessionTracking?.resumeSessionId ? ['--session', sessionTracking.resumeSessionId] : []),
-                    ...(resolvedModel ? ['--model', resolvedModel] : []),
-                    ...(variant ? ['--variant', variant] : []),
-                    finalPrompt,
-                ],
-                ['ignore', 'pipe', 'pipe'],
-            ];
+            : (() => {
+                const invocation = opencodeAgentProvider.buildStreamingInvocation({
+                    cwd: cwd ?? process.cwd(),
+                    prompt: finalPrompt,
+                    model: resolvedModel || null,
+                    variant,
+                    skills: options.skills,
+                    mode: 'plan',
+                    resumeSessionId: sessionTracking?.resumeSessionId ?? null,
+                    sessionId: randomUUID(),
+                    opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
+                    opencodeCompatibility: resolvedOpencodeCompatibility,
+                });
+                return [invocation.command, [...invocation.args], invocation.stdio];
+            })();
     return new Promise((resolve, reject) => {
         let settled = false;
         let completionForced = false;
@@ -1169,6 +1088,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                 executionContext: options.executionContext,
                 mainRun: options.mainRun,
                 deferMainFinalization: Boolean(options.mainRun),
+                opencodeRuntimeIdentity: resolvedOpencodeRuntimeIdentity,
             })
             : null;
         let opencodeSubagentMonitor = null;
@@ -1207,12 +1127,13 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
             if (!normalized) {
                 return;
             }
+            const sessionChanged = resolvedSessionId !== normalized;
             resolvedSessionId = normalized;
             opencodeSubagentMonitor?.setParentSessionId(normalized);
             if (options.mainRun) {
-                updateAgentRunSessionId(options.mainRun.id, normalized);
+                updateAgentRunSessionId(options.mainRun.id, normalized, resolvedOpencodeRuntimeIdentity);
             }
-            if (sessionTracking && !hasResolvedSessionId) {
+            if (sessionTracking && (!hasResolvedSessionId || sessionChanged)) {
                 hasResolvedSessionId = true;
                 updatePlanningSessionId(sessionTracking.ticketId, normalized, tool, sessionTracking.io, opencodeSessionOperations ?? undefined);
             }
@@ -1222,7 +1143,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                 return false;
             }
             try {
-                const session = await opencodeSessionOperations.findLatestSessionAfter(spawnTimestamp ?? 0, cwd);
+                const session = await opencodeSessionOperations.findLatestSessionAfter(spawnTimestamp ?? 0, { directory: sessionDirectory });
                 if (!hasResolvedSessionId && session?.id) {
                     bindResolvedProviderSession(session.id);
                 }
@@ -1330,7 +1251,7 @@ const runPlannerPromptOnce = (tool, model, variant, prompt, cwd, options = {}) =
                     bindResolvedProviderSession(discoveredSessionId);
                 },
                 taskSessionReader: opencodeSessionOperations
-                    ? createOpencodeTaskSessionReader(opencodeSessionOperations)
+                    ? createOpencodeTaskSessionReader(opencodeSessionOperations, { directory: sessionDirectory })
                     : null,
             });
             opencodeSubagentMonitor.start();
@@ -2021,6 +1942,7 @@ export const prepareLinkedPlanningResearch = async (taskDescription, options = {
                 executionTarget,
                 executionLauncherEnvironment: childEnvironment.launcherEnvironment,
                 executionRuntimeEnvironment: childEnvironment.runtimeEnvironment,
+                opencodeRuntimeIdentity: childEnvironment.opencodeRuntimeIdentity ?? null,
                 ...(invocation ? { mainRun: invocation } : {}),
             });
             const result = normalizeLinkedResearchResponse(extractFirstJsonObject(output), linkedProject, request);
@@ -2353,7 +2275,24 @@ export const startPlan = (ticket, io, options = {}) => {
                     workload: 'plan',
                     signal: cancellationState.abortController?.signal,
                 });
-                const planningSessionId = options.providerContinuation === 'fresh' ? null : ticket.planning_session_id;
+                let planningSessionId = options.providerContinuation === 'fresh' ? null : ticket.planning_session_id;
+                const historicalProviderSession = planningSessionId
+                    ? resolveHistoricalProviderSessionForParent({
+                        projectId: project.id,
+                        currentExecutionRunId: executionContext.runId,
+                        parentType: 'ticket',
+                        parentId: ticket.id,
+                        sessionId: planningSessionId,
+                    })
+                    : null;
+                if (shouldStartFreshProviderSession({
+                    tool: runTool,
+                    sessionId: planningSessionId,
+                    historicalRuntimeIdentity: historicalProviderSession?.runtimeIdentity ?? null,
+                    currentRuntimeIdentity: workloadEnvironment.opencodeRuntimeIdentity ?? null,
+                })) {
+                    planningSessionId = null;
+                }
                 if (planningSessionId) {
                     assertProviderSessionAuthorityMatches({
                         projectId: project.id,
@@ -2383,6 +2322,7 @@ export const startPlan = (ticket, io, options = {}) => {
                     executionTarget,
                     executionLauncherEnvironment: workloadEnvironment.launcherEnvironment,
                     executionRuntimeEnvironment: workloadEnvironment.runtimeEnvironment,
+                    opencodeRuntimeIdentity: workloadEnvironment.opencodeRuntimeIdentity ?? null,
                     onProgress: progress => {
                         updatePlanningProgress(ticket.id, progress.log, progress.response, io);
                     },