newmark-agent 0.6.2 → 0.6.4

package/dist/core/conversationKernel.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConversationKernel = void 0;
 const agent_1 = require("./agent");
+const store_1 = require("./continuation/store");
 const crypto_1 = require("crypto");
 const conversationTarget_1 = require("./conversationTarget");
 function changedLineCount(value) {
@@ -73,20 +74,131 @@ class ConversationKernel {
         return runtimes.map(runtime => runtime.runtimeKey);
     }
     /** A Flow and its queue share one Agent; no second history writer is created. */
-    beginExternalRun(targetInput, options, createOwner, previousQueuePaused) {
+    beginExternalRun(targetInput, options, createOwner, previousQueuePaused, buildInput) {
         const target = this.normalizeTarget(targetInput);
         const existing = this.findRuntime(target);
         if (existing?.activePromise || existing?.externalOwner?.active)
             throw new Error('Target conversation is already running');
         const runtime = existing || this.runtime(target, options, createOwner());
+        this.reconcilePendingContinuations(runtime);
         runtime.options = { ...options };
         runtime.externalOwner = { active: true, wasPaused: runtime.externalOwner?.wasPaused ?? previousQueuePaused ?? runtime.queuePaused };
         runtime.queuePaused = true;
         runtime.runId ||= (0, crypto_1.randomUUID)();
         runtime.stopRequestedRunId = '';
+        if (buildInput) {
+            const continuation = this.continuationStore(runtime);
+            if (continuation) {
+                if (buildInput.existingBuildId) {
+                    runtime.externalBuildId = buildInput.existingBuildId;
+                    runtime.externalScope = continuation.store.claimExternalBuild({
+                        workspaceId: continuation.workspaceId,
+                        rootId: continuation.rootId,
+                        branchId: continuation.branchId,
+                        buildId: buildInput.existingBuildId,
+                        workerCapability: 'flow-external',
+                    });
+                }
+                else if (buildInput.resume && runtime.externalBuildId) {
+                    runtime.externalScope = continuation.store.claimExternalBuild({
+                        workspaceId: continuation.workspaceId,
+                        rootId: continuation.rootId,
+                        branchId: continuation.branchId,
+                        buildId: runtime.externalBuildId,
+                        workerCapability: 'flow-external',
+                    });
+                }
+                else {
+                    const authoritative = continuation.store.snapshot({
+                        workspaceId: continuation.workspaceId,
+                        rootId: continuation.rootId,
+                        branchId: continuation.branchId,
+                    });
+                    const receipt = continuation.store.enqueueBuild({
+                        schemaVersion: 1,
+                        type: 'ENQUEUE_BUILD',
+                        commandId: buildInput.commandId || (0, crypto_1.randomUUID)(),
+                        actorId: 'flow',
+                        target: {
+                            workspaceId: continuation.workspaceId,
+                            expectedRootId: continuation.rootId,
+                            branchId: continuation.branchId,
+                        },
+                        expectedTailBuildId: authoritative.tailBuildId,
+                        expectedQueueRevision: authoritative.queueRevision,
+                        input: {
+                            text: buildInput.text,
+                            requestedMode: buildInput.requestedMode || 'flow',
+                            goalObjective: buildInput.goalObjective,
+                            modelSelection: buildInput.modelSelection || runtime.options.model,
+                            branchNodeId: buildInput.branchNodeId,
+                            branchPath: buildInput.branchPath,
+                        },
+                        recipeSnapshotId: `${continuation.rootId}:${continuation.branchId}:flow`,
+                        createdAt: new Date().toISOString(),
+                    });
+                    runtime.externalBuildId = receipt.buildId;
+                    runtime.externalScope = continuation.store.claimExternalBuild({
+                        workspaceId: continuation.workspaceId,
+                        rootId: continuation.rootId,
+                        branchId: continuation.branchId,
+                        buildId: receipt.buildId,
+                        workerCapability: 'flow-external',
+                    });
+                }
+            }
+        }
         this.emitQueueUpdate(runtime);
         return runtime.runner;
     }
+    /**
+     * Admit a Flow build at command-acceptance time. The Flow may wait behind a
+     * running Build, but its queue position (and therefore the parent of every
+     * later Next item) is fixed now, not when the Flow finally starts.
+     */
+    admitExternalBuild(targetInput, buildInput) {
+        const target = this.normalizeTarget(targetInput);
+        const existing = this.findRuntime(target);
+        const runtime = existing || this.runtime(target, {
+            mode: 'flow',
+            model: buildInput.modelSelection || this.host.modelSelectionValue(),
+            intelligence: this.host.intelligence,
+            inputMode: this.host.inputMode,
+            engine: this.host.engine,
+        }, this.createRunner(target));
+        const continuation = this.continuationStore(runtime);
+        if (!continuation)
+            return null;
+        const authoritative = continuation.store.snapshot({
+            workspaceId: continuation.workspaceId,
+            rootId: continuation.rootId,
+            branchId: continuation.branchId,
+        });
+        const receipt = continuation.store.enqueueBuild({
+            schemaVersion: 1,
+            type: 'ENQUEUE_BUILD',
+            commandId: buildInput.commandId,
+            actorId: 'flow',
+            target: {
+                workspaceId: continuation.workspaceId,
+                expectedRootId: continuation.rootId,
+                branchId: continuation.branchId,
+            },
+            expectedTailBuildId: authoritative.tailBuildId,
+            expectedQueueRevision: authoritative.queueRevision,
+            input: {
+                text: buildInput.text,
+                requestedMode: buildInput.requestedMode || 'flow',
+                goalObjective: buildInput.goalObjective,
+                modelSelection: buildInput.modelSelection || runtime.options.model,
+                branchNodeId: buildInput.branchNodeId,
+                branchPath: buildInput.branchPath,
+            },
+            recipeSnapshotId: `${continuation.rootId}:${continuation.branchId}:flow`,
+            createdAt: new Date().toISOString(),
+        });
+        return receipt.buildId;
+    }
     settleExternalRun(target, completed) {
         const runtime = this.findRuntime(target);
         if (!runtime?.externalOwner)
@@ -96,6 +208,46 @@ class ConversationKernel {
             runtime.externalOwner = undefined;
         else
             runtime.externalOwner.active = false;
+        if (runtime.externalBuildId) {
+            const continuation = this.continuationStore(runtime);
+            if (continuation) {
+                if (completed) {
+                    if (runtime.externalScope) {
+                        continuation.store.commitFinal({
+                            scope: runtime.externalScope,
+                            text: runtime.externalFinalText || '',
+                        });
+                    }
+                    else {
+                        continuation.store.commitExternalBuild({
+                            workspaceId: continuation.workspaceId,
+                            rootId: continuation.rootId,
+                            branchId: continuation.branchId,
+                            buildId: runtime.externalBuildId,
+                            text: runtime.externalFinalText || '',
+                        });
+                    }
+                    runtime.externalBuildId = undefined;
+                    runtime.externalScope = undefined;
+                    runtime.externalFinalText = undefined;
+                }
+                else {
+                    // Suspend/resume keeps the same durable build identity. Release the
+                    // current attempt back to QUEUED so the resume can claim a new
+                    // attempt/fence without creating a second Flow build.
+                    try {
+                        continuation.store.requeueBuild({
+                            workspaceId: continuation.workspaceId,
+                            rootId: continuation.rootId,
+                            branchId: continuation.branchId,
+                            buildId: runtime.externalBuildId,
+                        });
+                    }
+                    catch { /* an external failure may already have terminated the build */ }
+                    runtime.externalScope = undefined;
+                }
+            }
+        }
         runtime.queuePaused = completed && !runtime.preparingArchive ? wasPaused : true;
         runtime.runner.saveWorkspaceConversationState(true);
         this.emitQueueUpdate(runtime);
@@ -108,6 +260,27 @@ class ConversationKernel {
             return;
         if (runtime.externalOwner?.active)
             throw new Error('Wait for the Flow to stop before releasing its queue');
+        if (runtime.externalBuildId) {
+            const continuation = this.continuationStore(runtime);
+            if (continuation) {
+                // The user explicitly exited the paused Flow and resumed the queue.
+                // Record that decision as the Flow build's final instead of leaving a
+                // cancelled parent that would permanently block its queued successor.
+                try {
+                    continuation.store.commitExternalBuild({
+                        workspaceId: continuation.workspaceId,
+                        rootId: continuation.rootId,
+                        branchId: continuation.branchId,
+                        buildId: runtime.externalBuildId,
+                        text: 'Flow exited by the user; the conversation queue resumed.',
+                    });
+                }
+                catch { /* the Flow build may already be committed or explicitly cancelled */ }
+            }
+            runtime.externalBuildId = undefined;
+            runtime.externalScope = undefined;
+            runtime.externalFinalText = undefined;
+        }
         runtime.externalOwner = undefined;
         this.setQueuePaused(target, paused);
     }
@@ -215,6 +388,23 @@ class ConversationKernel {
         const runtime = this.findRuntime(target);
         if (!runtime)
             return [];
+        // dev-0.6.4 hotfix: 把账本里的受阻原因带进队列投影，界面才能显示
+        // “被失败前置阻断”而不是无声卡住。
+        let waitingByBuildId = new Map();
+        const continuation = this.continuationStore(runtime);
+        if (continuation) {
+            try {
+                const snapshot = continuation.store.snapshot({
+                    workspaceId: continuation.workspaceId,
+                    rootId: continuation.rootId,
+                    branchId: continuation.branchId,
+                });
+                waitingByBuildId = new Map(snapshot.builds
+                    .filter(build => !!build.waitingReason)
+                    .map(build => [build.buildId, String(build.waitingReason)]));
+            }
+            catch { /* the projection stays usable without ledger diagnostics */ }
+        }
         return runtime.pendingNextTurn.flatMap(item => {
             if (item.queueMode !== 'followUp')
                 return [];
@@ -223,8 +413,10 @@ class ConversationKernel {
             const id = String(item.message.clientMessageId || '');
             if (!id)
                 return [];
+            const buildId = String(item.message.buildId || '');
             return [{
                     id,
+                    buildId: item.message.buildId,
                     text: String(item.message.visibleUserInput || item.message.text || '').replace(/^\[Next queued while current turn is running\]\n/, ''),
                     queueMode: item.queueMode,
                     requestedMode: item.message.visibleMode,
@@ -232,9 +424,58 @@ class ConversationKernel {
                     runId: item.message.runId,
                     createdAt: String(item.message.createdAt || ''),
                     images: item.message.images?.map(image => ({ ...image })),
+                    branchNodeId: item.message.branchNodeId,
+                    branchPath: item.message.branchPath?.slice(),
+                    modelSelection: item.message.modelSelection,
+                    waitingReason: waitingByBuildId.get(buildId),
+                    blocked: waitingByBuildId.has(buildId),
                 }];
         });
     }
+    /**
+     * Capture the exact runtime branch that owns a queued user turn. A queued
+     * Next is a new user turn, but it must still land on the branch the user was
+     * viewing when they enqueued it, not on whatever branch happens to be active
+     * when the previous Build settles.
+     */
+    runtimeBranchIdentity(runtime) {
+        try {
+            const snapshot = runtime.runner.getConversationSnapshot(runtime.id);
+            const path = Array.isArray(snapshot.runtimeBranchNodePath)
+                ? snapshot.runtimeBranchNodePath.map(id => String(id || '')).filter(Boolean)
+                : [];
+            const branchNodeId = String(snapshot.runtimeBranchId || snapshot.activeBranchId || path[path.length - 1] || '');
+            return {
+                branchNodeId,
+                branchPath: path.length ? path : (branchNodeId ? [branchNodeId] : []),
+            };
+        }
+        catch {
+            return { branchNodeId: '', branchPath: [] };
+        }
+    }
+    /**
+     * Map the current conversation/branch model onto the continuation-v1
+     * Root/Branch identity. The ledger is workspace-scoped and shared by the
+     * PC GUI, hosted mobile API and isolated runtimes.
+     */
+    continuationStore(runtime, branchNodeIdOverride = '') {
+        const workspace = runtime.target.workspace;
+        if (!workspace?.path)
+            return null;
+        const workspaceId = String(workspace.id || workspace.path);
+        const branchIdentity = this.runtimeBranchIdentity(runtime);
+        const rootId = runtime.target.conversationId;
+        // Ledger branch ids are workspace-global, while a runtime branch node id
+        // is only unique inside its conversation/root. Namespace it by root so two
+        // conversations cannot share one authoritative branch record.
+        const branchId = branchNodeIdOverride.includes('::')
+            ? branchNodeIdOverride
+            : `${rootId}::${branchNodeIdOverride || branchIdentity.branchNodeId || 'main'}`;
+        const store = new store_1.GuardedContinuationStore(workspace.path, workspaceId);
+        store.ensureRoot(rootId, branchId);
+        return { store, workspaceId, rootId, branchId };
+    }
     enqueueNext(target, input) {
         const runtime = this.findRuntime(target);
         if (!runtime)
@@ -249,8 +490,56 @@ class ConversationKernel {
             return existing;
         const prompt = `[Next queued while current turn is running]\n${text}`;
         const createdAt = String(input.createdAt || new Date().toISOString());
+        const capturedBranch = this.runtimeBranchIdentity(runtime);
+        const branchPath = Array.isArray(input.branchPath) && input.branchPath.length
+            ? input.branchPath.map(id => String(id || '')).filter(Boolean)
+            : capturedBranch.branchPath;
+        const branchNodeId = String(input.branchNodeId || branchPath[branchPath.length - 1] || capturedBranch.branchNodeId || '');
+        const targetRuntimeKey = String(input.targetRuntimeKey || runtime.target.runtimeKey).trim() || runtime.target.runtimeKey;
+        const workspaceKey = runtime.target.workspaceKey;
+        const modelSelection = String(input.modelSelection || runtime.options.model || '').trim() || undefined;
+        // Gate B/C: admission is an authoritative CAS transaction. The in-memory
+        // pendingNextTurn list is only a projection of this durable build.
+        const continuation = this.continuationStore(runtime, branchNodeId);
+        const ledgerBranchId = continuation?.branchId;
+        let buildId = '';
+        if (continuation) {
+            // 入队严格保持 0.6.3 语义：新命令接在当前队尾之后。被失败前置阻断的行不会
+            // 被静默跳过；用户可通过界面上的“修复受阻队列”显式动作重建可执行链。
+            const authoritative = continuation.store.snapshot({
+                workspaceId: continuation.workspaceId,
+                rootId: continuation.rootId,
+                branchId: continuation.branchId,
+            });
+            const receipt = continuation.store.enqueueBuild({
+                schemaVersion: 1,
+                type: 'ENQUEUE_BUILD',
+                commandId: id,
+                actorId: 'kernel',
+                target: {
+                    workspaceId: continuation.workspaceId,
+                    expectedRootId: continuation.rootId,
+                    branchId: continuation.branchId,
+                },
+                expectedTailBuildId: authoritative.tailBuildId,
+                expectedQueueRevision: authoritative.queueRevision,
+                input: {
+                    text,
+                    images: input.images,
+                    requestedMode: input.requestedMode,
+                    goalObjective: input.goalObjective,
+                    modelSelection,
+                    branchNodeId: branchNodeId || undefined,
+                    branchPath: branchPath.length ? branchPath : undefined,
+                },
+                recipeSnapshotId: `${continuation.rootId}:${continuation.branchId}:${modelSelection || 'auto'}`,
+                createdAt,
+            });
+            buildId = receipt.buildId;
+        }
         runtime.pendingNextTurn.push({
             message: {
+                buildId: buildId || undefined,
                 text: prompt,
                 visibleUserInput: text,
                 visibleMode: String(input.requestedMode || 'build'),
@@ -258,11 +547,18 @@ class ConversationKernel {
                 images: Array.isArray(input.images) ? input.images.slice(0, 6).map(image => ({ ...image })) : undefined,
                 clientMessageId: id,
                 runId: runtime.runId,
+                branchNodeId: branchNodeId || undefined,
+                branchPath: branchPath.length ? branchPath : undefined,
+                ledgerBranchId,
+                targetRuntimeKey,
+                workspaceKey,
+                modelSelection,
                 createdAt,
             },
             queueMode: 'followUp',
         });
         runtime.runner.retainConversationContinuations([{
+                buildId: buildId || undefined,
                 content: prompt,
                 queueMode: 'followUp',
                 clientMessageId: id,
@@ -272,6 +568,12 @@ class ConversationKernel {
                 visibleUserInput: text,
                 visibleMode: String(input.requestedMode || 'build'),
                 goalObjective: input.goalObjective,
+                branchNodeId: branchNodeId || undefined,
+                branchPath: branchPath.length ? branchPath : undefined,
+                ledgerBranchId,
+                targetRuntimeKey,
+                workspaceKey,
+                modelSelection,
             }]);
         this.trackQueuedMessage(runtime, prompt, 'followUp');
         this.emitQueueUpdate(runtime);
@@ -291,14 +593,35 @@ class ConversationKernel {
         if (!pending || typeof pending.message === 'string')
             throw new Error('Queue item is no longer editable');
         const previous = runtime.runner.conversationContinuations().find(item => item.clientMessageId === id);
-        pending.message.text = `[Next queued while current turn is running]\n${text}`;
+        const nextText = `[Next queued while current turn is running]\n${text}`;
+        const nextVisibleMode = input.requestedMode !== undefined ? input.requestedMode : pending.message.visibleMode;
+        const nextGoalObjective = input.goalObjective !== undefined ? input.goalObjective : pending.message.goalObjective;
+        const nextImages = input.images !== undefined
+            ? input.images.map(image => ({ ...image }))
+            : pending.message.images?.map(image => ({ ...image }));
+        const continuation = this.continuationStore(runtime, pending.message.ledgerBranchId || pending.message.branchNodeId);
+        if (continuation && pending.message.buildId) {
+            continuation.store.updateQueuedBuild({
+                workspaceId: continuation.workspaceId,
+                rootId: continuation.rootId,
+                branchId: continuation.branchId,
+                buildId: pending.message.buildId,
+                input: {
+                    text,
+                    images: nextImages,
+                    requestedMode: nextVisibleMode,
+                    goalObjective: nextGoalObjective,
+                    modelSelection: pending.message.modelSelection,
+                    branchNodeId: pending.message.branchNodeId,
+                    branchPath: pending.message.branchPath,
+                },
+            });
+        }
+        pending.message.text = nextText;
         pending.message.visibleUserInput = text;
-        if (input.requestedMode !== undefined)
-            pending.message.visibleMode = input.requestedMode;
-        if (input.goalObjective !== undefined)
-            pending.message.goalObjective = input.goalObjective;
-        if (input.images !== undefined)
-            pending.message.images = input.images.map(image => ({ ...image }));
+        pending.message.visibleMode = nextVisibleMode;
+        pending.message.goalObjective = nextGoalObjective;
+        pending.message.images = nextImages;
         runtime.runner.retainConversationContinuations([{
                 ...previous,
                 content: pending.message.text,
@@ -309,6 +632,11 @@ class ConversationKernel {
                 visibleUserInput: text,
                 visibleMode: pending.message.visibleMode,
                 goalObjective: pending.message.goalObjective,
+                branchNodeId: pending.message.branchNodeId,
+                branchPath: pending.message.branchPath,
+                targetRuntimeKey: pending.message.targetRuntimeKey,
+                workspaceKey: pending.message.workspaceKey,
+                modelSelection: pending.message.modelSelection,
             }]);
         this.emitQueueUpdate(runtime);
         return this.queueItems(runtime.target).find(item => item.id === id);
@@ -321,7 +649,19 @@ class ConversationKernel {
         const index = runtime.pendingNextTurn.findIndex(item => typeof item.message !== 'string' && item.message.clientMessageId === id);
         if (index < 0)
             return false;
-        const [removed] = runtime.pendingNextTurn.splice(index, 1);
+        const removed = runtime.pendingNextTurn[index];
+        if (typeof removed.message !== 'string') {
+            const continuation = this.continuationStore(runtime, removed.message.ledgerBranchId || removed.message.branchNodeId);
+            if (continuation && removed.message.buildId) {
+                continuation.store.deleteQueuedBuild({
+                    workspaceId: continuation.workspaceId,
+                    rootId: continuation.rootId,
+                    branchId: continuation.branchId,
+                    buildId: removed.message.buildId,
+                });
+            }
+        }
+        runtime.pendingNextTurn.splice(index, 1);
         if (typeof removed.message !== 'string') {
             runtime.runner.consumeConversationContinuation({ content: removed.message.text, queueMode: removed.queueMode, clientMessageId: id });
         }
@@ -355,6 +695,27 @@ class ConversationKernel {
                 return [];
             return [[String(item.message.clientMessageId), item]];
         }));
+        const firstOrdered = pendingById.get(orderedIds[0] || '');
+        const continuation = this.continuationStore(runtime, firstOrdered && typeof firstOrdered.message !== 'string'
+            ? (firstOrdered.message.ledgerBranchId || firstOrdered.message.branchNodeId || '')
+            : '');
+        if (continuation) {
+            const orderedBuildIds = orderedIds
+                .map(id => {
+                const item = pendingById.get(id);
+                return item && typeof item.message !== 'string' ? item.message.buildId : undefined;
+            })
+                .filter((id) => !!id);
+            if (orderedBuildIds.length !== orderedIds.length) {
+                throw new Error('A queued build id is missing from the authoritative ledger projection');
+            }
+            continuation.store.reorderQueuedBuilds({
+                workspaceId: continuation.workspaceId,
+                rootId: continuation.rootId,
+                branchId: continuation.branchId,
+                orderedBuildIds,
+            });
+        }
         const reorderedPending = orderedIds.map(id => pendingById.get(id));
         let nextIndex = 0;
         runtime.pendingNextTurn = runtime.pendingNextTurn.map(item => {
@@ -369,6 +730,10 @@ class ConversationKernel {
         return this.queueItems(runtime.target);
     }
     setQueuePaused(target, paused) {
+        // 队列策略只作用于已经存在的 runtime：在这里按需重建 runtime 会让空闲会话
+        // 重新变成“持有排队工作”的所有者，破坏工作区清理契约
+        // （`Cannot release a conversation with running or queued work`）。界面路径统一
+        // 走 queueAction，它已经负责按需创建 runtime。
         const runtime = this.findRuntime(target);
         if (!runtime)
             throw new Error('Target conversation runtime is unavailable');
@@ -381,6 +746,35 @@ class ConversationKernel {
         }
         return runtime.queuePaused;
     }
+    /**
+     * dev-0.6.4 hotfix: 显式修复被失败前置阻断的排队行。
+     *
+     * 0.6.3 的合约是「失败/取消阻断后继，且不静默跳过」，所以这里不挂在恢复动作上
+     * 自动执行；它必须由用户的显式动作触发（界面上的“修复受阻队列”按钮）。每一次
+     * 改挂都写入 `BuildQueueRepaired` 事件并发布可见状态，触发者与原因可审计。
+     */
+    repairBlockedQueueNow(runtime) {
+        const continuation = this.continuationStore(runtime);
+        if (!continuation)
+            return 0;
+        try {
+            const result = continuation.store.repairBlockedQueue({
+                workspaceId: continuation.workspaceId,
+                rootId: continuation.rootId,
+                branchId: continuation.branchId,
+                reason: 'explicit-user-repair',
+            });
+            if (result.repaired.length) {
+                runtime.runner.recordWorkStatus(`${result.repaired.length} queued row(s) blocked by a failed predecessor were re-anchored to the last committed build; the queue resumes in order.`);
+                this.schedulePendingRuntimeContinuation(runtime, runtime.runId);
+            }
+            return result.repaired.length;
+        }
+        catch (error) {
+            runtime.runner.recordWorkStatus(`Queue repair failed: ${error instanceof Error ? error.message : String(error)}`);
+            return 0;
+        }
+    }
     queueAction(target, action, input = {}) {
         const normalized = this.normalizeTarget(target);
         const runtime = this.findRuntime(normalized) || this.runtime(normalized, {
@@ -397,6 +791,10 @@ class ConversationKernel {
                 goalObjective: input.goalObjective,
                 createdAt: input.createdAt,
                 images: input.images,
+                branchNodeId: input.branchNodeId,
+                branchPath: input.branchPath,
+                modelSelection: input.modelSelection,
+                targetRuntimeKey: input.targetRuntimeKey,
             });
         }
         else if (action === 'update') {
@@ -415,6 +813,10 @@ class ConversationKernel {
         else if (action === 'set_pause') {
             this.setQueuePaused(runtime.target, input.paused === true);
         }
+        else if (action === 'repair_blocked') {
+            // 显式修复：把被失败前置阻断的排队行重新挂到最后一个已提交 Build。
+            this.repairBlockedQueueNow(runtime);
+        }
         else if (action === 'guide') {
             if (input.text !== undefined)
                 this.updateQueueItem(runtime.target, String(input.id || ''), input.text, input);
@@ -948,7 +1350,7 @@ class ConversationKernel {
             // carry no send-time model/mode; the running block keeps its settings and
             // the next dequeue follows the current conversation selection (which
             // setModel/setMode already recorded on runtime.options).
-            this.enqueueSameSession(active, message, queueMode);
+            this.enqueueSameSession(active, message, queueMode, options.model);
             this.activateAcceptedGoal(active, typeof message === 'string' ? '' : message.goalObjective);
             return active.activePromise;
         }
@@ -1071,11 +1473,17 @@ class ConversationKernel {
             return this.result(runtime, lastTokens);
         }
         for (;;) {
-            while (!runtime.queuePaused && runtime.pendingNextTurn.length > 0) {
+            while (!runtime.queuePaused) {
                 if (runtime.stopRequestedRunId === runtime.runId)
                     return this.result(runtime, lastTokens);
-                const next = runtime.pendingNextTurn.shift();
-                if (next.queueMode === 'steer' && typeof next.message !== 'string' && !!next.message.clientMessageId) {
+                // Only intervening Guides run inside the current Build. A Next item
+                // is a new user turn and stays exactly where the user placed it; the
+                // run finalizer starts a fresh Build for it after this one settles.
+                const steerIndex = runtime.pendingNextTurn.findIndex(item => item.queueMode === 'steer');
+                if (steerIndex < 0)
+                    break;
+                const next = runtime.pendingNextTurn.splice(steerIndex, 1)[0];
+                if (typeof next.message !== 'string' && !!next.message.clientMessageId) {
                     const batchGuides = [];
                     const pushGuide = (message) => {
                         batchGuides.push({
@@ -1087,11 +1495,13 @@ class ConversationKernel {
                         });
                     };
                     pushGuide(next.message);
-                    while (runtime.pendingNextTurn.length > 0
-                        && runtime.pendingNextTurn[0].queueMode === 'steer'
-                        && typeof runtime.pendingNextTurn[0].message !== 'string'
-                        && !!runtime.pendingNextTurn[0].message.clientMessageId) {
-                        const guide = runtime.pendingNextTurn.shift();
+                    while (true) {
+                        const guideIndex = runtime.pendingNextTurn.findIndex(item => item.queueMode === 'steer'
+                            && typeof item.message !== 'string'
+                            && !!item.message.clientMessageId);
+                        if (guideIndex < 0)
+                            break;
+                        const guide = runtime.pendingNextTurn.splice(guideIndex, 1)[0];
                         pushGuide(guide.message);
                     }
                     if (batchGuides.length === 1) {
@@ -1111,17 +1521,10 @@ class ConversationKernel {
                         break;
                 }
                 else {
-                    const drained = this.drainQueuedFollowUpMessage(next.message);
-                    lastTokens = await this.runPendingQueueItem(runtime, next, async () => {
-                        if (typeof drained !== 'string' && drained.visibleMode && ['build', 'chat', 'plan', 'goal'].includes(drained.visibleMode)) {
-                            runtime.runner.setMode(drained.visibleMode);
-                            runtime.options.mode = drained.visibleMode;
-                        }
-                        this.activateAcceptedGoal(runtime, typeof drained === 'string' ? '' : drained.goalObjective);
-                        return this.runSingle(runtime, drained, next.queueMode, typeof next.message === 'string' ? undefined : next.message.clientMessageId);
-                    });
-                    if (this.repeatedAutomaticAssistant(runtime, drained, next.queueMode))
+                    lastTokens = await this.runSingle(runtime, next.message, next.queueMode);
+                    if (this.repeatedAutomaticAssistant(runtime, next.message, next.queueMode))
                         break;
+                    continue;
                 }
             }
             const rootMessage = runtime.runner.subagents.readRootInbox()[0];
@@ -1144,7 +1547,7 @@ class ConversationKernel {
                 if (runtime.runId === completedRunId
                     && runtime.stopRequestedRunId !== completedRunId
                     && !runtime.queuePaused
-                    && runtime.pendingNextTurn.length > 0) {
+                    && runtime.pendingNextTurn.some(item => item.queueMode === 'steer')) {
                     runtime.guideAcceptanceClosedRunId = '';
                     if (!runtime.runner.resumeConversationWorkRun(completedRunId)) {
                         throw new Error(`Unable to resume deferred Guide work run ${completedRunId}`);
@@ -1331,6 +1734,9 @@ class ConversationKernel {
                 && runtime.queued.followUp.length === 0
                 && runner.subagents.readRootInbox().length === 0;
         });
+        // 执行投影严格跟随当前激活分支节点：新分支绝不接管另一条分页的排队输入
+        // （dev-0.6.3 的既有契约）。界面上跨分页的排队行可见性由渲染层负责，
+        // 执行始终属于受理时捕获的那条分支。
         for (const continuation of runner.conversationContinuations()) {
             runtime.pendingNextTurn.push({
                 message: continuation.clientMessageId || continuation.images?.length || continuation.hiddenUserInput
@@ -1343,6 +1749,12 @@ class ConversationKernel {
                         visibleUserInput: continuation.visibleUserInput,
                         visibleMode: continuation.visibleMode,
                         goalObjective: continuation.goalObjective,
+                        buildId: continuation.buildId,
+                        modelSelection: continuation.modelSelection,
+                        branchNodeId: continuation.branchNodeId,
+                        branchPath: continuation.branchPath?.slice(),
+                        targetRuntimeKey: continuation.targetRuntimeKey,
+                        workspaceKey: continuation.workspaceKey,
                         createdAt: continuation.createdAt,
                         hiddenUserInput: continuation.hiddenUserInput,
                     }
@@ -1454,13 +1866,110 @@ class ConversationKernel {
             runtime.pendingContinuationRunId = undefined;
             if (runtime.preparingArchive || runtime.runId !== runId || runtime.activePromise || runtime.externalOwner || runtime.stopRequestedRunId === runId || runtime.queuePaused)
                 return;
-            const next = runtime.pendingNextTurn.shift();
+            const next = runtime.pendingNextTurn[0];
             if (!next)
                 return;
-            const delivery = next.queueMode === 'followUp' ? this.drainQueuedFollowUpMessage(next.message) : next.message;
-            const message = typeof delivery === 'string'
-                ? { text: delivery, runId }
-                : { ...delivery, runId: delivery.runId || runId };
+            const queued = typeof next.message === 'string' ? null : next.message;
+            if (queued?.targetRuntimeKey && queued.targetRuntimeKey !== runtime.target.runtimeKey) {
+                runtime.queuePaused = true;
+                runtime.runner.recordWorkStatus('Queued turn target mismatch; the queue is paused instead of running in another conversation.');
+                this.emitQueueUpdate(runtime);
+                return;
+            }
+            runtime.pendingNextTurn.shift();
+            if (next.queueMode === 'followUp') {
+                // A Next item is a fresh user turn. It must start a new Build in this
+                // exact conversation after the previous one has fully settled, and it
+                // must land on the branch that owned it when the user enqueued it.
+                // Never carry the completed runId into the new turn.
+                const delivery = this.drainQueuedFollowUpMessage(next.message);
+                const message = typeof delivery === 'string'
+                    ? { text: delivery }
+                    : { ...delivery, runId: undefined };
+                const continuation = this.continuationStore(runtime);
+                let scope = null;
+                void this.runPendingQueueItem(runtime, next, async () => {
+                    this.bindQueuedTurnBranch(runtime, queued);
+                    if (queued?.modelSelection)
+                        runtime.options.model = queued.modelSelection;
+                    if (message.visibleMode && ['build', 'chat', 'plan', 'goal'].includes(message.visibleMode)) {
+                        this.setMode(runtime.target, message.visibleMode);
+                    }
+                    this.activateAcceptedGoal(runtime, message.goalObjective || '');
+                    if (continuation && queued?.buildId) {
+                        const authoritative = continuation.store.snapshot({
+                            workspaceId: continuation.workspaceId,
+                            rootId: continuation.rootId,
+                            branchId: continuation.branchId,
+                        });
+                        const ready = authoritative.builds
+                            .filter(build => build.status === 'QUEUED')
+                            .sort((a, b) => a.queueSequence - b.queueSequence)[0];
+                        if (ready && ready.buildId !== queued.buildId) {
+                            // The in-memory projection is not the authoritative next build.
+                            // Keep this row queued instead of executing out of order.
+                            runtime.pendingNextTurn.unshift(next);
+                            runtime.runner.recordWorkStatus('Queued turn is waiting for the authoritative predecessor.');
+                            this.emitQueueUpdate(runtime);
+                            return this.result(runtime, []);
+                        }
+                        scope = continuation.store.claimBuild({
+                            workspaceId: continuation.workspaceId,
+                            rootId: continuation.rootId,
+                            branchId: continuation.branchId,
+                            workerCapability: `kernel:${process.pid}`,
+                        });
+                        if (scope && scope.buildId !== queued.buildId) {
+                            continuation.store.failBuild({ scope, reason: 'Authoritative build mismatch during claim' });
+                            scope = null;
+                        }
+                        if (!scope) {
+                            runtime.pendingNextTurn.unshift(next);
+                            runtime.runner.recordWorkStatus('Queued turn is not ready for execution yet.');
+                            this.emitQueueUpdate(runtime);
+                            return this.result(runtime, []);
+                        }
+                    }
+                    const result = await this.prompt(message, runtime.target, runtime.options, 'followUp');
+                    if (continuation && scope) {
+                        continuation.store.commitFinal({
+                            scope,
+                            text: result.tokens.map(token => token.text || '').join(''),
+                        });
+                    }
+                    return result;
+                }, (accepted, error) => {
+                    if (!continuation || !scope)
+                        return;
+                    const reason = error instanceof Error ? error.message : String(error);
+                    if (accepted) {
+                        try {
+                            continuation.store.failBuild({ scope, reason });
+                        }
+                        catch { /* stop/archive may have already released the guard */ }
+                    }
+                    else {
+                        // The input was never accepted. Stop/archive may already have
+                        // released the guard, so use the idempotent requeue path: the same
+                        // durable build id stays available for an explicit resume.
+                        try {
+                            continuation.store.requeueBuild({
+                                workspaceId: continuation.workspaceId,
+                                rootId: continuation.rootId,
+                                branchId: continuation.branchId,
+                                buildId: scope.buildId,
+                            });
+                        }
+                        catch { /* the build may already be committed or explicitly cancelled */ }
+                    }
+                }).catch(() => {
+                    // Agent.process and the work-run finalizer already publish the error.
+                });
+                return;
+            }
+            const message = typeof next.message === 'string'
+                ? { text: next.message, runId }
+                : { ...next.message, runId: next.message.runId || runId };
             void this.runPendingQueueItem(runtime, next, async () => {
                 if (message.visibleMode && ['build', 'chat', 'plan', 'goal'].includes(message.visibleMode)) {
                     this.setMode(runtime.target, message.visibleMode);
@@ -1471,7 +1980,27 @@ class ConversationKernel {
             });
         });
     }
-    async runPendingQueueItem(runtime, next, execute) {
+    /**
+     * Restore the runtime branch captured by a queued user turn. If the branch
+     * disappeared (manual deletion/rewind), fail the queued item into the
+     * existing pause/retry path instead of appending it to a different branch.
+     */
+    bindQueuedTurnBranch(runtime, message) {
+        const branchNodeId = String(message?.branchNodeId || '').trim();
+        if (!branchNodeId)
+            return;
+        const snapshot = runtime.runner.getConversationSnapshot(runtime.id);
+        const currentBranch = String(snapshot.runtimeBranchId || snapshot.activeBranchId || '');
+        if (currentBranch === branchNodeId)
+            return;
+        try {
+            runtime.runner.switchConversationBranch(runtime.id, branchNodeId);
+        }
+        catch (error) {
+            throw new Error(`Queued turn branch ${branchNodeId} is unavailable: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    async runPendingQueueItem(runtime, next, execute, onFailure) {
         const queuedMessage = typeof next.message === 'string' ? undefined : next.message;
         const id = queuedMessage?.clientMessageId;
         if (next.queueMode !== 'followUp' || !id)
@@ -1491,6 +2020,10 @@ class ConversationKernel {
             // the same row manageable. A provider failure after acceptance must
             // never replay the already submitted user input after restart/resume.
             runtime.queuePaused = true;
+            try {
+                onFailure?.(accepted, error);
+            }
+            catch { /* the original failure is authoritative */ }
             throw error;
         }
         finally {
@@ -1669,13 +2202,26 @@ class ConversationKernel {
             guides: (run.guides || []).map(bindGuide),
         }));
     }
-    enqueueSameSession(runtime, message, queueMode) {
+    enqueueSameSession(runtime, message, queueMode, requestedModel = '') {
         const isSteer = queueMode === 'steer';
         const text = typeof message === 'string' ? message : message.text;
         const prompt = isSteer ? text : `[Next queued while current turn is running]\n${text}`;
         if (!isSteer) {
             const structured = typeof message === 'string' ? null : message;
+            const requestedRuntimeKey = String(structured?.targetRuntimeKey || '').trim();
+            if (requestedRuntimeKey && requestedRuntimeKey !== runtime.target.runtimeKey) {
+                throw new Error(`Queued message target mismatch: expected ${requestedRuntimeKey}, received ${runtime.target.runtimeKey}`);
+            }
             const clientMessageId = String(structured?.clientMessageId || (0, crypto_1.randomUUID)());
+            const capturedBranch = this.runtimeBranchIdentity(runtime);
+            const branchPath = Array.isArray(structured?.branchPath) && structured.branchPath.length
+                ? structured.branchPath.map(id => String(id || '')).filter(Boolean)
+                : capturedBranch.branchPath;
+            const branchNodeId = String(structured?.branchNodeId || branchPath[branchPath.length - 1] || capturedBranch.branchNodeId || '');
+            const targetRuntimeKey = runtime.target.runtimeKey;
+            const workspaceKey = runtime.target.workspaceKey;
+            const modelSelection = String((structured?.modelSelection) || requestedModel || runtime.options.model || '').trim() || undefined;
+            const ledgerBranchId = this.continuationStore(runtime, branchNodeId)?.branchId;
             const queuedMessage = {
                 ...(structured || {}),
                 text: prompt,
@@ -1683,6 +2229,12 @@ class ConversationKernel {
                 visibleMode: structured?.visibleMode || runtime.options.mode,
                 clientMessageId,
                 runId: structured?.runId || runtime.runId,
+                branchNodeId: branchNodeId || undefined,
+                branchPath: branchPath.length ? branchPath : undefined,
+                ledgerBranchId,
+                targetRuntimeKey,
+                workspaceKey,
+                modelSelection,
                 createdAt: String(structured?.createdAt || new Date().toISOString()),
             };
             if (!runtime.pendingNextTurn.some(item => typeof item.message !== 'string' && item.message.clientMessageId === clientMessageId)) {
@@ -1699,6 +2251,12 @@ class ConversationKernel {
                     visibleUserInput: queuedMessage.visibleUserInput,
                     visibleMode: queuedMessage.visibleMode,
                     goalObjective: queuedMessage.goalObjective,
+                    branchNodeId: queuedMessage.branchNodeId,
+                    branchPath: queuedMessage.branchPath,
+                    ledgerBranchId: queuedMessage.ledgerBranchId,
+                    targetRuntimeKey,
+                    workspaceKey,
+                    modelSelection,
                 }]);
             this.trackQueuedMessage(runtime, prompt, 'followUp');
             runtime.runner.recordWorkStatus(runtime.stopRequestedRunId === runtime.runId
@@ -1799,6 +2357,60 @@ class ConversationKernel {
             .map(item => typeof item.message === 'string' ? item.message : item.message.text);
         return runtime;
     }
+    /**
+     * Merge queue continuations persisted by another owner/kernel into this
+     * runtime's in-memory projection. Flow takeover, cold restore and a pool
+     * hand-off must not lose an already-admitted Next row. Deduplication is by
+     * the stable clientMessageId, never by text.
+     */
+    reconcilePendingContinuations(runtime) {
+        // The other owner (pool/flow/cold restore) commits queue continuations to
+        // the workspace state file. Reload this runner's durable view before
+        // merging so a takeover cannot miss a row persisted after the runner was
+        // first created.
+        runtime.runner.setConversationFromStorage(runtime.id);
+        const persisted = runtime.runner.conversationContinuations();
+        const existingIds = new Set();
+        for (const item of runtime.pendingNextTurn) {
+            if (typeof item.message === 'string')
+                continue;
+            const id = String(item.message.clientMessageId || '').trim();
+            if (id)
+                existingIds.add(id);
+        }
+        let changed = false;
+        for (const continuation of persisted) {
+            if (continuation.queueMode !== 'followUp' || !continuation.clientMessageId)
+                continue;
+            if (existingIds.has(continuation.clientMessageId))
+                continue;
+            runtime.pendingNextTurn.push({
+                message: {
+                    text: continuation.content,
+                    visibleUserInput: continuation.visibleUserInput,
+                    visibleMode: continuation.visibleMode,
+                    goalObjective: continuation.goalObjective,
+                    images: continuation.images?.map(image => ({ ...image })),
+                    attachments: continuation.attachments?.map(attachment => ({ ...attachment })),
+                    clientMessageId: continuation.clientMessageId,
+                    buildId: continuation.buildId,
+                    branchNodeId: continuation.branchNodeId,
+                    branchPath: continuation.branchPath?.slice(),
+                    targetRuntimeKey: continuation.targetRuntimeKey,
+                    workspaceKey: continuation.workspaceKey,
+                    modelSelection: continuation.modelSelection,
+                    createdAt: continuation.createdAt,
+                },
+                queueMode: 'followUp',
+            });
+            existingIds.add(continuation.clientMessageId);
+            changed = true;
+        }
+        if (changed) {
+            this.queueState(runtime);
+            this.emitQueueUpdate(runtime);
+        }
+    }
     normalizeTarget(input) {
         if (typeof input !== 'string') {
             const withWorkspace = input.workspace ? input : { ...input, workspace: this.workspaceForId(input.workspaceId) };