@straiffi/archon 1.10.7 → 1.10.8

package/dist/server/workers/specSession.js

@@ -1,9 +1,9 @@
-import { formatAgentErrorForTranscript, getAgentErrorTranscriptRuns, registerSpecProcessPlaceholder, runSpecAgent, untrackSpecProcessById } from '../lib/agent.js';
-import { createAgentRun, emitAgentRunsUpdated, finalizeAgentRun, getNextAgentRunIndex, terminalizeAgentRunsForExecutionRun } from '../lib/agentRuns.js';
+import { formatAgentErrorForTranscript, getAgentErrorTranscriptRuns, isAgentContinuationRejectedError, registerSpecProcessPlaceholder, runSpecAgent, untrackSpecProcessById } from '../lib/agent.js';
+import { createAgentRun, emitAgentRunsUpdated, finalizeAgentRun, getNextAgentRunIndex, resolveHistoricalProviderSession, setAgentRunContinuationResponse, terminalizeAgentRunsForExecutionRun } from '../lib/agentRuns.js';
 import { deleteStagedSpecAttachments, linkSpecAttachmentsToMessage, stageSpecAttachmentsForAgent } from '../lib/attachments.js';
 import { createSpecMessage, listSpecMessages } from '../lib/specMessages.js';
 import { beginSpecSessionThinkingRun, bindSpecSessionThinkingMessage } from '../lib/thinkingState.js';
-import { createSpecSnapshot, deriveSpecSessionTitle, getDefaultSpecSessionTitle, getSpecSession, getSpecSnapshot, resolveSpecModeValue, updateSpecSessionMode, updateSpecSessionRunConfig, updateSpecSessionStatus, updateSpecSessionTitle, updateSpecSessionUsageSnapshot, } from '../lib/specs.js';
+import { createSpecSnapshot, deriveSpecSessionTitle, getDefaultSpecSessionTitle, getSpecSession, getSpecSnapshot, resolveSpecModeValue, updateSpecSessionMode, updateSpecSessionRunConfig, updateSpecSessionResumeSourceRunId, updateSpecSessionStatus, updateSpecSessionTitle, updateSpecSessionUsageSnapshot, } from '../lib/specs.js';
 import { normalizeClaudeModelId, normalizeModelId } from '../lib/models.js';
 import { HttpError } from '../lib/httpError.js';
 import { appendPlanModeQuestionPromptRules, PLAN_MODE_RUNTIME_PROMPT_RULES } from '../lib/planModeQuestions.js';
@@ -13,7 +13,7 @@ import { persistSpecSessionProjectMemorySuggestions } from '../lib/projectMemory
 import { extractProjectMemorySuggestionsFromOutput, getProjectMemorySuggestionPromptRules, } from '../lib/projectMemorySuggestions.js';
 import { enqueue, isRunning } from '../lib/queue.js';
 import { getProjectById } from '../lib/projects.js';
-import { addExecutionRunLink, transitionExecutionRun } from '../lib/executionRuns.js';
+import { addExecutionRunLink, appendLifecycleEvent, getExecutionRun, transitionExecutionRun, withExecutionRunTransaction } from '../lib/executionRuns.js';
 import { TurnStartError } from '../lib/turnExecutionErrors.js';
 import { buildLinkedResearchContext, prepareLinkedPlanningResearch } from './plan.js';
 import { extractGrillQuestionFromOutput, extractSpecArtifactFromOutput, projectPlannerOwnedLikelyFiles, resolveCarriedForwardArtifacts, resolveCarriedForwardStructuredFields, stripFileRelationGraphBlocks, stripMermaidBlocks } from '../lib/specArtifact.js';
@@ -23,7 +23,7 @@ import { collectSpecResourceUrls } from '../lib/specResources.js';
 import { resolveImportedSpecBundleName } from '../lib/specBundleGroups.js';
 import { resolveSessionExecutionTarget, resolveSessionTargetForExecution } from '../lib/sessionTargets.js';
 import { resolveWorkloadExecutionEnvironment } from '../lib/workloadExecutionEnvironment.js';
-import { assertProviderSessionAuthorityMatches } from '../lib/executionRunAuthority.js';
+import { assertProviderSessionAuthorityMatches, getExecutionRunAuthority } from '../lib/executionRunAuthority.js';
 import { getModelProvider } from '../lib/models.js';
 import { unavailableSpecSnapshotRepositoryEvidence } from '../lib/specSnapshotEvidenceSerialization.js';
 import { SPEC_REPOSITORY_GRAPH_DISABLED_REASON } from '../lib/specGraphFeature.js';
@@ -414,7 +414,7 @@ const emitUpdatedSpecSession = (specSessionId, io, skipTargetResolution = false)
         io.emit('spec-session:updated', specSession);
     }
 };
-const failSpecTurn = ({ specSessionId, executionContext, existingTriggerMessageId, providerContinuation, conversationContext, priorSnapshotId, turnMode, mainRunId, error, io, skipTargetResolution = false, }) => {
+const failSpecTurn = ({ specSessionId, executionContext, existingTriggerMessageId, providerContinuation, conversationContext, priorSnapshotId, turnMode, providerSessionId, internalContinuation, mainRunId, error, io, skipTargetResolution = false, }) => {
     const failureMessage = getErrorMessage(error);
     untrackSpecProcessById(specSessionId);
     try {
@@ -427,7 +427,7 @@ const failSpecTurn = ({ specSessionId, executionContext, existingTriggerMessageI
         // Preserve the top-level execution even if detail finalization fails.
     }
     try {
-        const errorContent = formatAgentErrorForTranscript(error);
+        const errorContent = internalContinuation ? null : formatAgentErrorForTranscript(error);
         if (errorContent) {
             const errorMessageId = createSpecMessage({
                 specSessionId,
@@ -464,12 +464,19 @@ const failSpecTurn = ({ specSessionId, executionContext, existingTriggerMessageI
         runId: executionContext.runId,
         status: 'failed',
         domainStatus: 'error',
-        failure: { code: 'spec_turn_failed', message: failureMessage },
-        eventType: 'spec_turn_failed',
+        failure: {
+            code: internalContinuation
+                ? isAgentContinuationRejectedError(error)
+                    ? 'resume_provider_continuation_rejected'
+                    : 'resume_continuation_failed'
+                : 'spec_turn_failed',
+            message: failureMessage,
+        },
+        eventType: internalContinuation ? 'resume_failed' : 'spec_turn_failed',
     }, io);
     emitAgentRunsUpdated(io, 'spec', specSessionId);
 };
-export const startSpecSessionTurn = ({ specSessionId, instruction, attachments = [], tool, model, variant, skills = [], io, executionContext, existingTriggerMessageId, providerContinuation, conversationContext, priorSnapshotId, turnMode, }) => {
+export const startSpecSessionTurn = ({ specSessionId, instruction, attachments = [], tool, model, variant, skills = [], io, executionContext, existingTriggerMessageId, providerContinuation, conversationContext, priorSnapshotId, turnMode, providerSessionId, internalContinuation, }) => {
     const specSession = getSpecSession(specSessionId, { includeMessages: true });
     if (!specSession) {
         return false;
@@ -488,13 +495,13 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
     if (specSession.agent_status === 'running' || isRunning(jobKey)) {
         return false;
     }
-    const userMessageId = existingTriggerMessageId ?? createSpecMessage({
+    const userMessageId = existingTriggerMessageId ?? (internalContinuation ? null : createSpecMessage({
         specSessionId,
         role: 'user',
         kind: 'prompt',
         content: trimmedInstruction,
-    });
-    if (!existingTriggerMessageId) {
+    }));
+    if (!existingTriggerMessageId && userMessageId) {
         addExecutionRunLink({
             projectId: executionContext.projectId,
             runId: executionContext.runId,
@@ -506,7 +513,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
             },
         });
     }
-    if (!existingTriggerMessageId && attachments.length > 0) {
+    if (!existingTriggerMessageId && userMessageId && attachments.length > 0) {
         linkSpecAttachmentsToMessage({
             specMessageId: userMessageId,
             attachments,
@@ -520,14 +527,16 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
             : null;
     const resolvedVariant = resolvedTool === 'opencode' && resolvedModel ? variant ?? null : null;
     const resolvedSkills = skills;
-    updateSpecSessionRunConfig({
-        specSessionId,
-        tool: resolvedTool,
-        model: resolvedModel,
-        variant: resolvedVariant,
-        skills: resolvedSkills,
-    });
-    if (resolvedTool !== 'opencode' && specSession.title === getDefaultSpecSessionTitle()) {
+    if (!internalContinuation) {
+        updateSpecSessionRunConfig({
+            specSessionId,
+            tool: resolvedTool,
+            model: resolvedModel,
+            variant: resolvedVariant,
+            skills: resolvedSkills,
+        });
+    }
+    if (!internalContinuation && resolvedTool !== 'opencode' && specSession.title === getDefaultSpecSessionTitle()) {
         updateSpecSessionTitle(specSessionId, deriveSpecSessionTitle(trimmedInstruction));
     }
     beginSpecSessionThinkingRun(specSessionId);
@@ -578,6 +587,12 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     workspacePath: canonicalTarget.target.workspacePath,
                     workspaceEvidence: canonicalTarget.target.workspaceEvidence,
                 };
+                const sourceAuthority = internalContinuation
+                    ? getExecutionRunAuthority(latestProject.id, internalContinuation.sourceRunId)
+                    : null;
+                if (internalContinuation && !sourceAuthority) {
+                    throw new Error('The exact Resume execution authority is unavailable.');
+                }
                 workloadEnvironment = await resolveWorkloadExecutionEnvironment({
                     project: latestProject,
                     executionRunId: executionContext.runId,
@@ -586,17 +601,26 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     skills: resolvedSkills,
                     target: executionTarget,
                     workload: 'spec',
+                    pinnedProvider: sourceAuthority?.effective.provider,
+                    pinnedEnvironmentId: sourceAuthority?.effective.environment_id ?? undefined,
+                    pinnedEnvironmentRevision: sourceAuthority?.effective.environment_revision ?? undefined,
+                    pinnedEnvironmentValidationFingerprint: sourceAuthority?.effective.environment_validation_fingerprint ?? undefined,
                     signal: specCancellation.abortController?.signal,
                     onLeaseAcquired: release => {
                         leasedEnvironmentRelease = release;
                     },
                 });
                 leasedEnvironmentRelease = null;
-                const resumeSessionId = providerContinuation === 'fresh'
-                    ? null
-                    : resolvedTool === 'claude'
-                        ? latestSession.claude_session_id
-                        : latestSession.opencode_session_id;
+                const resumeSessionId = providerSessionId !== undefined
+                    ? providerSessionId
+                    : providerContinuation === 'fresh'
+                        ? null
+                        : resolvedTool === 'claude'
+                            ? latestSession.claude_session_id
+                            : latestSession.opencode_session_id;
+                if (internalContinuation && resumeSessionId !== internalContinuation.providerSessionId) {
+                    throw new Error('The exact Resume provider session is unavailable.');
+                }
                 if (resumeSessionId) {
                     assertProviderSessionAuthorityMatches({
                         projectId: latestProject.id,
@@ -648,7 +672,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     currentInstruction: trimmedInstruction,
                     invocation: { parentType: 'spec', parentId: specSessionId, agentRunId: mainRunId },
                 });
-                const preResponseContext = await raceAgainstSpecCancellation(trimmedInstruction
+                const preResponseContext = await raceAgainstSpecCancellation(trimmedInstruction && !internalContinuation
                     ? prepareLinkedPlanningResearch(trimmedInstruction, {
                         projectId: latestProject.id,
                         cwd,
@@ -671,16 +695,18 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                 // to 'stopped' (worker-owned, mirroring how Chat finalizes after a stop).
                 if (specCancellation.stopRequested) {
                     untrackSpecProcessById(specSessionId);
-                    finalizeAgentRun(mainRunId, 'stopped', null);
-                    updateSpecSessionStatus(specSessionId, 'stopped', null, null);
-                    emitUpdatedSpecSession(specSessionId, io);
-                    transitionExecutionRun({
-                        projectId: executionContext.projectId,
-                        runId: executionContext.runId,
-                        status: 'cancelled',
-                        domainStatus: 'stopped',
-                        eventType: 'spec_turn_cancelled',
+                    withExecutionRunTransaction(transaction => {
+                        finalizeAgentRun(mainRunId, 'stopped', null);
+                        updateSpecSessionStatus(specSessionId, 'stopped', null, null);
+                        transaction.transitionExecutionRun({
+                            projectId: executionContext.projectId,
+                            runId: executionContext.runId,
+                            status: 'cancelled',
+                            domainStatus: 'stopped',
+                            eventType: internalContinuation ? 'resume_interrupted' : 'spec_turn_cancelled',
+                        });
                     }, io);
+                    emitUpdatedSpecSession(specSessionId, io);
                     emitAgentRunsUpdated(io, 'spec', specSessionId);
                     return;
                 }
@@ -709,30 +735,64 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     targetBundleName: latestSession.target_branch_snapshot,
                     externalKey: latestSession.external_source?.external_key ?? null,
                 });
-                const specRunResult = await runSpecAgent({
-                    specSessionId,
-                    tool: resolvedTool,
-                    prompt: specPrompt,
-                    cwd,
-                    files: stagedAgentAttachments.files,
-                    io,
-                    model: resolvedModel,
-                    variant: resolvedVariant,
-                    resumeSessionId,
-                    executionContext,
-                    mainRun: { id: mainRunId, label: 'Main agent', role: 'main', runIndex: mainRunIndex },
-                    executionProvider: workloadEnvironment.provider,
-                    executionTarget,
-                    executionLauncherEnvironment: workloadEnvironment.launcherEnvironment,
-                    executionRuntimeEnvironment: workloadEnvironment.runtimeEnvironment,
-                });
+                if (internalContinuation) {
+                    appendLifecycleEvent({
+                        projectId: executionContext.projectId,
+                        runId: executionContext.runId,
+                        domainStatus: 'running',
+                        eventType: 'provider_continuation_requested',
+                        metadata: { source_run_id: internalContinuation.sourceRunId },
+                    }, io);
+                }
+                let specRunResult;
+                try {
+                    specRunResult = await runSpecAgent({
+                        specSessionId,
+                        tool: resolvedTool,
+                        prompt: specPrompt,
+                        cwd,
+                        files: stagedAgentAttachments.files,
+                        io,
+                        model: resolvedModel,
+                        variant: resolvedVariant,
+                        resumeSessionId,
+                        executionContext,
+                        mainRun: { id: mainRunId, label: 'Main agent', role: 'main', runIndex: mainRunIndex },
+                        executionProvider: workloadEnvironment.provider,
+                        executionTarget,
+                        executionLauncherEnvironment: workloadEnvironment.launcherEnvironment,
+                        executionRuntimeEnvironment: workloadEnvironment.runtimeEnvironment,
+                    });
+                    if (internalContinuation) {
+                        appendLifecycleEvent({
+                            projectId: executionContext.projectId,
+                            runId: executionContext.runId,
+                            domainStatus: 'running',
+                            eventType: 'provider_continuation_resumed',
+                        }, io);
+                    }
+                }
+                catch (error) {
+                    if (internalContinuation) {
+                        appendLifecycleEvent({
+                            projectId: executionContext.projectId,
+                            runId: executionContext.runId,
+                            domainStatus: isAgentContinuationRejectedError(error) ? 'continuation_rejected_before_execution' : 'continuation_failed',
+                            eventType: isAgentContinuationRejectedError(error) ? 'provider_continuation_rejected_before_execution' : 'provider_continuation_unsafe_failure',
+                        }, io);
+                    }
+                    throw error;
+                }
                 if (specRunResult.completionStatus === 'stopped') {
                     const interruptedSession = getSpecSession(specSessionId);
-                    const interruptedResponse = stripSpecFileGraph(interruptedSession?.streaming_response ?? '')
-                        || stripSpecFileGraph(specRunResult.finalResponse ?? '')
-                        || stripSpecFileGraph(getTranscriptContentFallback(specRunResult.transcriptRuns))
+                    const rawInterruptedResponse = specRunResult.finalResponse?.trim()
+                        ? specRunResult.finalResponse
+                        : interruptedSession?.streaming_response?.trim()
+                            ? interruptedSession.streaming_response
+                            : getTranscriptContentFallback(specRunResult.transcriptRuns);
+                    const interruptedResponse = stripSpecFileGraph(rawInterruptedResponse ?? '')
                         || '';
-                    if (resolvedTool === 'opencode' && interruptedSession?.title === getDefaultSpecSessionTitle()) {
+                    if (!internalContinuation && resolvedTool === 'opencode' && interruptedSession?.title === getDefaultSpecSessionTitle()) {
                         updateSpecSessionTitle(specSessionId, deriveSpecSessionTitle(trimmedInstruction));
                     }
                     if (interruptedResponse) {
@@ -759,16 +819,29 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                         }
                     }
                     updateSpecSessionUsageSnapshot(specSessionId, specRunResult.usageSnapshot);
-                    updateSpecSessionStatus(specSessionId, 'stopped', interruptedSession?.agent_log ?? null, null);
-                    emitUpdatedSpecSession(specSessionId, io);
-                    finalizeAgentRun(mainRunId, 'stopped', interruptedResponse || null);
-                    transitionExecutionRun({
-                        projectId: executionContext.projectId,
-                        runId: executionContext.runId,
-                        status: 'cancelled',
-                        domainStatus: 'stopped',
-                        eventType: 'spec_turn_cancelled',
+                    withExecutionRunTransaction(transaction => {
+                        updateSpecSessionStatus(specSessionId, 'stopped', interruptedSession?.agent_log ?? null, null);
+                        setAgentRunContinuationResponse(mainRunId, rawInterruptedResponse ?? '');
+                        finalizeAgentRun(mainRunId, 'stopped', rawInterruptedResponse || null);
+                        transaction.transitionExecutionRun({
+                            projectId: executionContext.projectId,
+                            runId: executionContext.runId,
+                            status: 'cancelled',
+                            domainStatus: 'stopped',
+                            eventType: internalContinuation ? 'resume_interrupted' : 'spec_turn_cancelled',
+                        });
+                        if (getExecutionRun(executionContext.projectId, executionContext.runId)?.initiated_by === 'user') {
+                            try {
+                                if (resolveHistoricalProviderSession(executionContext.runId).sessionId) {
+                                    updateSpecSessionResumeSourceRunId(specSessionId, executionContext.runId);
+                                }
+                            }
+                            catch {
+                                updateSpecSessionResumeSourceRunId(specSessionId, null);
+                            }
+                        }
                     }, io);
+                    emitUpdatedSpecSession(specSessionId, io);
                     emitAgentRunsUpdated(io, 'spec', specSessionId);
                     return;
                 }
@@ -781,7 +854,14 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     streamingResponse: streamedAssistantMessage,
                     transcriptRuns: specRunResult.transcriptRuns,
                 };
-                const rawResponse = resolveCompletedAssistantOutput(completedOutputOptions);
+                const completedOutput = resolveCompletedAssistantOutput(completedOutputOptions);
+                const currentRawResponse = specRunResult.finalResponse?.trim()
+                    ? specRunResult.finalResponse
+                    : completedOutput;
+                const rawResponse = `${internalContinuation?.priorResponseText ?? ''}${currentRawResponse}`;
+                const parsingOutputOptions = internalContinuation
+                    ? { finalResponse: rawResponse }
+                    : completedOutputOptions;
                 // Resolve the session mode at the moment the turn completed. NULL/legacy
                 // values normalize to 'standard'. The worker's per-mode output branch is
                 // decided here, not from a re-read after the artifact path, so an
@@ -798,7 +878,8 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                         throw new Error(`Invalid Grill question envelope: ${grillResult.error}`);
                     }
                     if (grillResult.grillQuestion) {
-                        const cleanedGrillText = stripSpecFileGraph(grillResult.cleanedOutput)
+                        const currentGrillResult = internalContinuation ? extractGrillQuestionFromOutput(currentRawResponse) : grillResult;
+                        const cleanedGrillText = stripSpecFileGraph(currentGrillResult.error ? '' : currentGrillResult.cleanedOutput)
                             || grillResult.grillQuestion.question
                             || stripSpecFileGraph(streamedAssistantMessage);
                         const grillMessageId = createSpecMessage({
@@ -823,7 +904,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                                 },
                             });
                         }
-                        if (resolvedTool === 'opencode' && latestCompletedSession?.title === getDefaultSpecSessionTitle()) {
+                        if (!internalContinuation && resolvedTool === 'opencode' && latestCompletedSession?.title === getDefaultSpecSessionTitle()) {
                             updateSpecSessionTitle(specSessionId, deriveSpecSessionTitle(trimmedInstruction));
                         }
                         updateSpecSessionUsageSnapshot(specSessionId, specRunResult.usageSnapshot);
@@ -835,14 +916,14 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                             runId: executionContext.runId,
                             status: 'completed',
                             domainStatus: 'done',
-                            eventType: 'spec_turn_completed',
+                            eventType: internalContinuation ? 'resume_completed' : 'spec_turn_completed',
                         }, io);
                         emitAgentRunsUpdated(io, 'spec', specSessionId);
                         return;
                     }
                 }
                 const completedQuestionOutput = sessionMode !== 'grill'
-                    ? resolveCompletedQuestionOutput(completedOutputOptions)
+                    ? resolveCompletedQuestionOutput(parsingOutputOptions)
                     : null;
                 const askQuestionResult = completedQuestionOutput
                     ? completedQuestionOutput.extraction
@@ -851,7 +932,11 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     throw new Error(`Invalid question envelope: ${askQuestionResult.error}`);
                 }
                 if (askQuestionResult.questionSet) {
-                    const questionMessage = stripSpecFileGraph(askQuestionResult.cleanedOutput) || formatAskQuestionMessage(askQuestionResult.questionSet);
+                    const currentQuestionResult = internalContinuation
+                        ? resolveCompletedQuestionOutput(completedOutputOptions).extraction
+                        : askQuestionResult;
+                    const questionMessage = stripSpecFileGraph(currentQuestionResult.error ? '' : currentQuestionResult.cleanedOutput)
+                        || formatAskQuestionMessage(askQuestionResult.questionSet);
                     const messageId = createSpecMessage({
                         specSessionId,
                         role: 'assistant',
@@ -872,7 +957,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                             expectedParent: { entityType: 'spec_session', entityId: specSessionId },
                         },
                     });
-                    if (resolvedTool === 'opencode' && latestCompletedSession?.title === getDefaultSpecSessionTitle()) {
+                    if (!internalContinuation && resolvedTool === 'opencode' && latestCompletedSession?.title === getDefaultSpecSessionTitle()) {
                         updateSpecSessionTitle(specSessionId, deriveSpecSessionTitle(trimmedInstruction));
                     }
                     updateSpecSessionUsageSnapshot(specSessionId, specRunResult.usageSnapshot);
@@ -883,7 +968,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                         runId: executionContext.runId,
                         status: 'completed',
                         domainStatus: 'done',
-                        eventType: 'spec_turn_completed',
+                        eventType: internalContinuation ? 'resume_completed' : 'spec_turn_completed',
                     }, io);
                     emitUpdatedSpecSession(specSessionId, io);
                     emitAgentRunsUpdated(io, 'spec', specSessionId);
@@ -917,7 +1002,17 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                 const cleanPlannerResponse = (value) => stripSpecFileGraph(stripMermaidBlocks(value));
                 const cleanedPlanText = cleanPlannerResponse(parsedResponse.cleanedOutput)
                     || cleanPlannerResponse(streamedAssistantMessage);
-                let assistantMessage = cleanedPlanText
+                const currentQuestionResult = internalContinuation
+                    ? resolveCompletedQuestionOutput(completedOutputOptions).extraction
+                    : askQuestionResult;
+                const currentArtifactResult = internalContinuation
+                    ? extractSpecArtifactFromOutput(currentQuestionResult.error ? currentRawResponse : currentQuestionResult.cleanedOutput)
+                    : artifactResult;
+                const currentParsedResponse = internalContinuation
+                    ? extractProjectMemorySuggestionsFromOutput(currentArtifactResult.cleanedOutput)
+                    : parsedResponse;
+                let assistantMessage = cleanPlannerResponse(currentParsedResponse.cleanedOutput)
+                    || (internalContinuation ? cleanPlannerResponse(currentRawResponse) : '')
                     || stripSpecFileGraph(getTranscriptContentFallback(specRunResult.transcriptRuns))
                     || (attachments.length > 0 ? ATTACHMENT_ONLY_EMPTY_RESPONSE_FALLBACK : '');
                 let artifactValidationError = artifactResult.error;
@@ -1030,7 +1125,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                         });
                     }
                 }
-                if (resolvedTool === 'opencode' && latestCompletedSession?.title === getDefaultSpecSessionTitle()) {
+                if (!internalContinuation && resolvedTool === 'opencode' && latestCompletedSession?.title === getDefaultSpecSessionTitle()) {
                     updateSpecSessionTitle(specSessionId, deriveSpecSessionTitle(trimmedInstruction));
                 }
                 updateSpecSessionUsageSnapshot(specSessionId, specRunResult.usageSnapshot);
@@ -1045,33 +1140,45 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
                     runId: executionContext.runId,
                     status: 'completed',
                     domainStatus: 'done',
-                    eventType: 'spec_turn_completed',
+                    eventType: internalContinuation ? 'resume_completed' : 'spec_turn_completed',
                 }, io);
                 emitAgentRunsUpdated(io, 'spec', specSessionId);
             }
             catch (error) {
                 if (specCancellation.stopRequested) {
                     untrackSpecProcessById(specSessionId);
-                    if (mainRunId) {
-                        finalizeAgentRun(mainRunId, 'stopped', null);
-                    }
-                    updateSpecSessionStatus(specSessionId, 'stopped', null, null);
-                    emitUpdatedSpecSession(specSessionId, io);
-                    transitionExecutionRun({
-                        projectId: executionContext.projectId,
-                        runId: executionContext.runId,
-                        status: 'cancelled',
-                        domainStatus: 'stopped',
-                        eventType: 'spec_turn_cancelled',
+                    withExecutionRunTransaction(transaction => {
+                        if (mainRunId) {
+                            finalizeAgentRun(mainRunId, 'stopped', null);
+                        }
+                        updateSpecSessionStatus(specSessionId, 'stopped', null, null);
+                        transaction.transitionExecutionRun({
+                            projectId: executionContext.projectId,
+                            runId: executionContext.runId,
+                            status: 'cancelled',
+                            domainStatus: 'stopped',
+                            eventType: internalContinuation ? 'resume_interrupted' : 'spec_turn_cancelled',
+                        });
+                        if (getExecutionRun(executionContext.projectId, executionContext.runId)?.initiated_by === 'user') {
+                            try {
+                                if (resolveHistoricalProviderSession(executionContext.runId).sessionId) {
+                                    updateSpecSessionResumeSourceRunId(specSessionId, executionContext.runId);
+                                }
+                            }
+                            catch {
+                                updateSpecSessionResumeSourceRunId(specSessionId, null);
+                            }
+                        }
                     }, io);
+                    emitUpdatedSpecSession(specSessionId, io);
                     emitAgentRunsUpdated(io, 'spec', specSessionId);
                     return;
                 }
                 const latestSession = getSpecSession(specSessionId, hasValidatedTarget ? {} : { skipTargetResolution: true });
-                if (resolvedTool === 'opencode' && latestSession?.title === getDefaultSpecSessionTitle()) {
+                if (!internalContinuation && resolvedTool === 'opencode' && latestSession?.title === getDefaultSpecSessionTitle()) {
                     updateSpecSessionTitle(specSessionId, deriveSpecSessionTitle(trimmedInstruction));
                 }
-                failSpecTurn({ specSessionId, executionContext, mainRunId, error, io, skipTargetResolution: !hasValidatedTarget });
+                failSpecTurn({ specSessionId, executionContext, mainRunId, error, io, skipTargetResolution: !hasValidatedTarget, internalContinuation });
             }
             finally {
                 try {
@@ -1097,7 +1204,7 @@ export const startSpecSessionTurn = ({ specSessionId, instruction, attachments =
     }
     queuedJob.catch(error => {
         try {
-            failSpecTurn({ specSessionId, executionContext, mainRunId: null, error, io });
+            failSpecTurn({ specSessionId, executionContext, mainRunId: null, error, io, internalContinuation });
         }
         catch {
             // Startup reconciliation remains the final repair boundary for database failures.