dominds 0.6.2 → 0.6.4

package/dist/llm/driver.js

@@ -65,6 +65,7 @@ const dialog_run_state_1 = require("../dialog-run-state");
 const evt_registry_1 = require("../evt-registry");
 const log_1 = require("../log");
 const load_1 = require("../minds/load");
+const system_prompt_parts_1 = require("../minds/system-prompt-parts");
 const persistence_1 = require("../persistence");
 const problems_1 = require("../problems");
 const async_fifo_mutex_1 = require("../shared/async-fifo-mutex");
@@ -77,6 +78,7 @@ const time_1 = require("../shared/utils/time");
 const team_1 = require("../team");
 const tellask_1 = require("../tellask");
 const tool_1 = require("../tool");
+const pending_tellask_reminder_1 = require("../tools/pending-tellask-reminder");
 const id_2 = require("../utils/id");
 const taskdoc_1 = require("../utils/taskdoc");
 const client_1 = require("./client");
@@ -93,6 +95,22 @@ function resolveMemberDiligencePushMax(team, agentId) {
     }
     return DEFAULT_KEEP_GOING_MAX_NUM_PROMPTS;
 }
+async function syncPendingTellaskReminderBestEffort(dlg, where) {
+    try {
+        const changed = await (0, pending_tellask_reminder_1.syncPendingTellaskReminderState)(dlg);
+        if (!changed)
+            return;
+        await dlg.processReminderUpdates();
+    }
+    catch (err) {
+        log_1.log.warn('Failed to sync pending tellask reminder', {
+            where,
+            dialogId: dlg.id.selfId,
+            rootId: dlg.id.rootId,
+            error: err instanceof Error ? err.message : String(err),
+        });
+    }
+}
 function stripMarkdownFrontmatter(raw) {
     // We no longer honor frontmatter config in diligence files.
     // If frontmatter exists, strip it to preserve backward compatibility with old files.
@@ -148,7 +166,7 @@ async function maybePrepareDiligenceAutoContinuePrompt(options) {
     if (!options.isRootDialog) {
         return { kind: 'disabled', nextRemainingBudget: options.remainingBudget };
     }
-    if (options.dlg.disableDiligencePush) {
+    if (options.dlg.disableDiligencePush || options.suppressDiligencePush === true) {
         const normalizedRemaining = typeof options.remainingBudget === 'number' && Number.isFinite(options.remainingBudget)
             ? Math.max(0, Math.floor(options.remainingBudget))
             : 0;
@@ -838,6 +856,22 @@ async function withSuspensionStateLock(dialogId, fn) {
         release();
     }
 }
+async function hasQueuedSubdialogResponses(dialogId) {
+    try {
+        const queued = await withSuspensionStateLock(dialogId, async () => {
+            return await persistence_1.DialogPersistence.loadSubdialogResponsesQueue(dialogId);
+        });
+        return queued.length > 0;
+    }
+    catch (err) {
+        log_1.log.warn('Failed to check queued subdialog responses; suppressing diligence as safe default', {
+            dialogId: dialogId.valueOf(),
+            error: err,
+        });
+        // Fail safe: if we cannot verify queue emptiness, do not inject diligence prompts.
+        return true;
+    }
+}
 // TODO: certain scenarios should pass `waitInQue=true`:
 //        - supdialog call for clarification
 /**
@@ -875,7 +909,7 @@ async function withSuspensionStateLock(dialogId, fn) {
  *   - Continue loop if new function calls or tool outputs exist
  *   - Break and release lock when complete
  */
-async function driveDialogStream(dlg, humanPrompt, waitInQue = false) {
+async function driveDialogStream(dlg, humanPrompt, waitInQue = false, driveOptions) {
     if (!waitInQue && dlg.isLocked()) {
         throw new Error(`Dialog busy driven, see how it proceeded and try again.`);
     }
@@ -905,7 +939,7 @@ async function driveDialogStream(dlg, humanPrompt, waitInQue = false) {
         if (effectivePrompt && effectivePrompt.userLanguageCode) {
             dlg.setLastUserLanguageCode(effectivePrompt.userLanguageCode);
         }
-        driveResult = await _driveDialogStream(dlg, effectivePrompt);
+        driveResult = await _driveDialogStream(dlg, effectivePrompt, driveOptions);
         // Do not auto-chain upNext when this drive ended in interrupted state
         // (user/emergency/system stop). upNext remains queued for explicit manual resume.
         if (!driveResult.interrupted) {
@@ -1047,7 +1081,8 @@ async function checkQ4HAnswered(dialogId) {
         return false;
     }
 }
-async function _driveDialogStream(dlg, humanPrompt) {
+async function _driveDialogStream(dlg, humanPrompt, driveOptions) {
+    const suppressDiligencePushForDrive = driveOptions?.suppressDiligencePush === true;
     const abortSignal = (0, dialog_run_state_1.createActiveRun)(dlg.id);
     let finalRunState;
     let shouldEmitResumedMarker = false;
@@ -1090,18 +1125,20 @@ async function _driveDialogStream(dlg, humanPrompt) {
             let systemPrompt = minds.systemPrompt;
             const memories = minds.memories;
             let agentTools = minds.agentTools;
-            const isToollessFbr = isToollessFbrSelfSubdialog(dlg);
-            if (isToollessFbr) {
-                // Tool-less FBR: technically supply zero tools to the LLM.
-                agentTools = [];
-                systemPrompt = withFbrToollessSystemPrompt(systemPrompt, (0, runtime_language_1.getWorkLanguage)());
-                // FBR-only model params override (deep merge onto effective member model_params).
-                if (agent.fbr_model_params) {
-                    const fbrAgent = Object.create(agent);
-                    fbrAgent.model_params = mergeModelParams(agent.model_params, agent.fbr_model_params);
-                    agent = fbrAgent;
-                }
+            const drivePolicy = buildDrivePolicy({
+                dlg,
+                agent,
+                systemPrompt,
+                agentTools,
+                language: (0, runtime_language_1.getWorkLanguage)(),
+            });
+            const drivePolicyValidation = validateDrivePolicyInvariants(drivePolicy, (0, runtime_language_1.getWorkLanguage)());
+            if (!drivePolicyValidation.ok) {
+                throw new Error(`FBR policy isolation violation: ${drivePolicyValidation.detail}`);
             }
+            agent = drivePolicy.effectiveAgent;
+            systemPrompt = drivePolicy.effectiveSystemPrompt;
+            agentTools = drivePolicy.effectiveAgentTools;
             // reload cfgs every course, in case it's been updated by human or ai meanwhile
             // Validate streaming configuration
             try {
@@ -1193,7 +1230,7 @@ async function _driveDialogStream(dlg, humanPrompt) {
                 if (currentPrompt) {
                     const promptOrigin = currentPrompt.origin ?? 'user';
                     const isDiligencePrompt = promptOrigin === 'diligence_push';
-                    if (isDiligencePrompt && dlg.disableDiligencePush) {
+                    if (isDiligencePrompt && (dlg.disableDiligencePush || suppressDiligencePushForDrive)) {
                         log_1.log.info('Skip diligence prompt after disable toggle', {
                             dialogId: dlg.id.valueOf(),
                             msgId: currentPrompt.msgId,
@@ -1310,12 +1347,13 @@ async function _driveDialogStream(dlg, humanPrompt) {
                         return false;
                     return true;
                 });
-                const ctxMsgs = [
-                    ...memories,
-                    ...(taskDocMsg ? [taskDocMsg] : []),
-                    ...coursePrefixMsgs,
-                    ...dialogMsgsForContext,
-                ];
+                const ctxMsgs = buildDriveContextMessages({
+                    prependedContextMessages: drivePolicy.prependedContextMessages,
+                    memories,
+                    taskDocMsg,
+                    coursePrefixMsgs,
+                    dialogMsgsForContext,
+                });
                 if (genIterNo === 1 && takenSubdialogResponses.length > 0) {
                     for (const response of takenSubdialogResponses) {
                         ctxMsgs.push({
@@ -1495,34 +1533,27 @@ async function _driveDialogStream(dlg, humanPrompt) {
                             }
                         }
                     }
-                    if (isToollessFbr && collectedAssistantCalls.length > 0) {
-                        const hasDisallowedTellask = collectedAssistantCalls.some((call) => {
-                            if (call.validation.kind !== 'valid')
-                                return true;
-                            return call.validation.firstMention !== 'tellasker';
+                    const nonStreamingTellaskViolation = resolveDrivePolicyViolationKind({
+                        policy: drivePolicy,
+                        tellaskCalls: collectedAssistantCalls,
+                        functionCallCount: 0,
+                    });
+                    if (nonStreamingTellaskViolation === 'tellask') {
+                        const violationText = (0, driver_messages_1.formatDomindsNoteFbrToollessViolation)((0, runtime_language_1.getWorkLanguage)(), {
+                            kind: 'tellask',
                         });
-                        if (!hasDisallowedTellask) {
-                            // Tool-less FBR: allow TellaskBack only (`!?@tellasker`) for critical clarification.
-                        }
-                        else {
-                            const violationText = (0, driver_messages_1.formatDomindsNoteFbrToollessViolation)((0, runtime_language_1.getWorkLanguage)(), {
-                                kind: 'tellask',
-                            });
-                            const genseq = dlg.activeGenSeq ?? 0;
-                            await dlg.addChatMessages({
-                                type: 'saying_msg',
-                                role: 'assistant',
-                                genseq,
-                                content: violationText,
-                            });
-                            lastAssistantSayingContent = violationText;
-                            await dlg.persistAgentMessage(violationText, genseq, 'saying_msg');
-                            return { lastAssistantSayingContent, interrupted: false };
-                        }
+                        const genseq = dlg.activeGenSeq ?? 0;
+                        await dlg.addChatMessages({
+                            type: 'saying_msg',
+                            role: 'assistant',
+                            genseq,
+                            content: violationText,
+                        });
+                        lastAssistantSayingContent = violationText;
+                        await dlg.persistAgentMessage(violationText, genseq, 'saying_msg');
+                        return { lastAssistantSayingContent, interrupted: false };
                     }
-                    let assistantValidCallCount = 0;
                     if (collectedAssistantCalls.length > 0) {
-                        assistantValidCallCount = collectedAssistantCalls.filter((call) => call.validation.kind === 'valid').length;
                         throwIfAborted(abortSignal, dlg.id);
                         const assistantResult = await executeTellaskCalls(dlg, agent, collectedAssistantCalls);
                         if (dlg.hasUpNext()) {
@@ -1536,7 +1567,12 @@ async function _driveDialogStream(dlg, humanPrompt) {
                         }
                     }
                     const funcCalls = nonStreamMsgs.filter((m) => m.type === 'func_call_msg');
-                    if (isToollessFbr && funcCalls.length > 0) {
+                    const nonStreamingToolViolation = resolveDrivePolicyViolationKind({
+                        policy: drivePolicy,
+                        tellaskCalls: [],
+                        functionCallCount: funcCalls.length,
+                    });
+                    if (nonStreamingToolViolation === 'tool') {
                         const violationText = (0, driver_messages_1.formatDomindsNoteFbrToollessViolation)((0, runtime_language_1.getWorkLanguage)(), {
                             kind: 'tool',
                         });
@@ -1694,11 +1730,9 @@ async function _driveDialogStream(dlg, humanPrompt) {
                         }
                         break;
                     }
-                    // Continue only when the assistant actually emitted executable calls this round.
-                    // Do not auto-continue on malformed tellask diagnostics alone.
-                    const shouldContinue = funcCalls.length > 0 ||
-                        assistantValidCallCount > 0 ||
-                        (funcResults.length > 0 && funcCalls.length === 0);
+                    // Continue only when this round executed function tools.
+                    // Tellask-only rounds must stop and wait for sideline/backfill feedback.
+                    const shouldContinue = funcCalls.length > 0 || (funcResults.length > 0 && funcCalls.length === 0);
                     if (!shouldContinue) {
                         // Diligence Push (root dialog only): prevent ALL stopping except legitimate suspension.
                         // If disabled (empty diligence file) or budget exhausted, we suspend via Q4H.
@@ -1722,11 +1756,19 @@ async function _driveDialogStream(dlg, humanPrompt) {
                                 }
                                 break;
                             }
+                            const hasQueuedResponses = await hasQueuedSubdialogResponses(dlg.id);
+                            if (hasQueuedResponses) {
+                                log_1.log.info('Skip diligence prompt while subdialog responses are still queued', {
+                                    dialogId: dlg.id.valueOf(),
+                                });
+                                break;
+                            }
                             const prepared = await maybePrepareDiligenceAutoContinuePrompt({
                                 dlg,
                                 isRootDialog: true,
                                 remainingBudget: dlg.diligencePushRemainingBudget,
                                 diligencePushMax: resolveMemberDiligencePushMax(team, dlg.agentId),
+                                suppressDiligencePush: suppressDiligencePushForDrive,
                             });
                             dlg.diligencePushRemainingBudget = prepared.nextRemainingBudget;
                             void persistence_1.DialogPersistence.mutateDialogLatest(dlg.id, () => ({
@@ -1739,7 +1781,7 @@ async function _driveDialogStream(dlg, humanPrompt) {
                                     maxInjectCount: prepared.maxInjectCount,
                                     injectedCount: Math.max(0, prepared.maxInjectCount - prepared.nextRemainingBudget),
                                     remainingCount: Math.max(0, prepared.nextRemainingBudget),
-                                    disableDiligencePush: dlg.disableDiligencePush,
+                                    disableDiligencePush: dlg.disableDiligencePush || suppressDiligencePushForDrive,
                                 });
                             }
                             if (prepared.kind === 'budget_exhausted') {
@@ -1892,6 +1934,11 @@ async function _driveDialogStream(dlg, humanPrompt) {
                                             arguments: args,
                                         });
                                     },
+                                    webSearchCall: async (call) => {
+                                        throwIfAborted(abortSignal, dlg.id);
+                                        sawAnyStreamContent = true;
+                                        await dlg.webSearchCall(call);
+                                    },
                                 }, dlg.activeGenSeq, abortSignal);
                             },
                         });
@@ -1927,33 +1974,26 @@ async function _driveDialogStream(dlg, humanPrompt) {
                         throw new Error('Collected calls missing callId - parser should have allocated one per call');
                     }
                     const validCalls = collectedCalls.filter((call) => call.validation.kind === 'valid');
-                    if (isToollessFbr && (collectedCalls.length > 0 || streamedFuncCalls.length > 0)) {
-                        const hasDisallowedTellask = collectedCalls.some((call) => {
-                            if (call.validation.kind !== 'valid')
-                                return true;
-                            return call.validation.firstMention !== 'tellasker';
+                    const streamingPolicyViolation = resolveDrivePolicyViolationKind({
+                        policy: drivePolicy,
+                        tellaskCalls: collectedCalls,
+                        functionCallCount: streamedFuncCalls.length,
+                    });
+                    if (streamingPolicyViolation) {
+                        const violationText = (0, driver_messages_1.formatDomindsNoteFbrToollessViolation)((0, runtime_language_1.getWorkLanguage)(), {
+                            kind: streamingPolicyViolation,
                         });
-                        const shouldBlock = streamedFuncCalls.length > 0 || hasDisallowedTellask;
-                        if (shouldBlock) {
-                            const violationText = (0, driver_messages_1.formatDomindsNoteFbrToollessViolation)((0, runtime_language_1.getWorkLanguage)(), {
-                                kind: collectedCalls.length > 0 && streamedFuncCalls.length > 0
-                                    ? 'tellask_and_tool'
-                                    : collectedCalls.length > 0
-                                        ? 'tellask'
-                                        : 'tool',
-                            });
-                            const genseq = dlg.activeGenSeq ?? 0;
-                            newMsgs.push({
-                                type: 'saying_msg',
-                                role: 'assistant',
-                                genseq,
-                                content: violationText,
-                            });
-                            lastAssistantSayingContent = violationText;
-                            await dlg.addChatMessages(...newMsgs);
-                            await dlg.persistAgentMessage(violationText, genseq, 'saying_msg');
-                            return { lastAssistantSayingContent, interrupted: false };
-                        }
+                        const genseq = dlg.activeGenSeq ?? 0;
+                        newMsgs.push({
+                            type: 'saying_msg',
+                            role: 'assistant',
+                            genseq,
+                            content: violationText,
+                        });
+                        lastAssistantSayingContent = violationText;
+                        await dlg.addChatMessages(...newMsgs);
+                        await dlg.persistAgentMessage(violationText, genseq, 'saying_msg');
+                        return { lastAssistantSayingContent, interrupted: false };
                     }
                     throwIfAborted(abortSignal, dlg.id);
                     const results = await Promise.all(validCalls.map((call) => executeTellaskCall(dlg, agent, call.validation.firstMention, call.tellaskHead, call.body, call.callId)));
@@ -2124,9 +2164,9 @@ async function _driveDialogStream(dlg, humanPrompt) {
                         }
                         break;
                     }
-                    // Continue only when this round had executable calls.
-                    // Invalid/malformed tellask diagnostics should not trigger implicit extra generations.
-                    const shouldContinue = validCalls.length > 0 || streamedFuncCalls.length > 0 || funcResults.length > 0;
+                    // Continue only when this round executed function tools.
+                    // Tellask-only rounds must stop and wait for sideline/backfill feedback.
+                    const shouldContinue = streamedFuncCalls.length > 0 || funcResults.length > 0;
                     if (!shouldContinue) {
                         // Diligence Push (root dialog only): prevent ALL stopping except legitimate suspension.
                         if (dlg instanceof dialog_1.RootDialog) {
@@ -2149,11 +2189,19 @@ async function _driveDialogStream(dlg, humanPrompt) {
                                 }
                                 break;
                             }
+                            const hasQueuedResponses = await hasQueuedSubdialogResponses(dlg.id);
+                            if (hasQueuedResponses) {
+                                log_1.log.info('Skip diligence prompt while subdialog responses are still queued', {
+                                    dialogId: dlg.id.valueOf(),
+                                });
+                                break;
+                            }
                             const prepared = await maybePrepareDiligenceAutoContinuePrompt({
                                 dlg,
                                 isRootDialog: true,
                                 remainingBudget: dlg.diligencePushRemainingBudget,
                                 diligencePushMax: resolveMemberDiligencePushMax(team, dlg.agentId),
+                                suppressDiligencePush: suppressDiligencePushForDrive,
                             });
                             dlg.diligencePushRemainingBudget = prepared.nextRemainingBudget;
                             void persistence_1.DialogPersistence.mutateDialogLatest(dlg.id, () => ({
@@ -2166,7 +2214,7 @@ async function _driveDialogStream(dlg, humanPrompt) {
                                     maxInjectCount: prepared.maxInjectCount,
                                     injectedCount: Math.max(0, prepared.maxInjectCount - prepared.nextRemainingBudget),
                                     remainingCount: Math.max(0, prepared.nextRemainingBudget),
-                                    disableDiligencePush: dlg.disableDiligencePush,
+                                    disableDiligencePush: dlg.disableDiligencePush || suppressDiligencePushForDrive,
                                 });
                             }
                             if (prepared.kind === 'budget_exhausted') {
@@ -2411,33 +2459,141 @@ function mergeModelParams(base, overlay) {
         anthropic: { ...(base.anthropic ?? {}), ...(overlay.anthropic ?? {}) },
     };
 }
-function withFbrToollessSystemPrompt(systemPrompt, language) {
+function buildDrivePolicy(args) {
+    const { dlg, agent, systemPrompt, agentTools, language } = args;
+    if (!isToollessFbrSelfSubdialog(dlg)) {
+        return {
+            mode: 'default',
+            effectiveAgent: agent,
+            effectiveSystemPrompt: systemPrompt,
+            effectiveAgentTools: agentTools,
+            prependedContextMessages: [],
+            tellaskPolicy: 'allow_any',
+            allowFunctionCalls: true,
+        };
+    }
+    const effectiveAgent = Object.assign(Object.create(agent), {
+        model_params: mergeModelParams(agent.model_params, agent.fbr_model_params),
+    });
+    return {
+        mode: 'fbr_toolless',
+        effectiveAgent,
+        effectiveSystemPrompt: buildFbrSystemPrompt(language),
+        effectiveAgentTools: [],
+        prependedContextMessages: [
+            {
+                type: 'environment_msg',
+                role: 'user',
+                content: (0, system_prompt_parts_1.buildNoToolsNotice)(language),
+            },
+        ],
+        tellaskPolicy: 'tellasker_only',
+        allowFunctionCalls: false,
+    };
+}
+function buildDriveContextMessages(args) {
+    return [
+        ...args.prependedContextMessages,
+        ...args.memories,
+        ...(args.taskDocMsg ? [args.taskDocMsg] : []),
+        ...args.coursePrefixMsgs,
+        ...args.dialogMsgsForContext,
+    ];
+}
+function hasTellaskPolicyViolation(policy, calls) {
+    if (policy.tellaskPolicy === 'allow_any') {
+        return false;
+    }
+    return calls.some((call) => {
+        if (call.validation.kind !== 'valid') {
+            return true;
+        }
+        return call.validation.firstMention !== 'tellasker';
+    });
+}
+function resolveDrivePolicyViolationKind(args) {
+    const tellaskViolation = hasTellaskPolicyViolation(args.policy, args.tellaskCalls);
+    const toolViolation = !args.policy.allowFunctionCalls && args.functionCallCount > 0;
+    if (tellaskViolation && toolViolation) {
+        return 'tellask_and_tool';
+    }
+    if (tellaskViolation) {
+        return 'tellask';
+    }
+    if (toolViolation) {
+        return 'tool';
+    }
+    return null;
+}
+function validateDrivePolicyInvariants(policy, language) {
+    if (policy.mode !== 'fbr_toolless') {
+        return { ok: true };
+    }
+    const expectedSystemPrompt = buildFbrSystemPrompt(language);
+    if (policy.effectiveSystemPrompt !== expectedSystemPrompt) {
+        return {
+            ok: false,
+            detail: 'FBR must use buildFbrSystemPrompt(language) exactly.',
+        };
+    }
+    if (policy.effectiveAgentTools.length > 0) {
+        return {
+            ok: false,
+            detail: 'FBR effectiveAgentTools must be empty.',
+        };
+    }
+    if (policy.allowFunctionCalls) {
+        return {
+            ok: false,
+            detail: 'FBR allowFunctionCalls must be false.',
+        };
+    }
+    if (policy.tellaskPolicy !== 'tellasker_only') {
+        return {
+            ok: false,
+            detail: 'FBR tellaskPolicy must be tellasker_only.',
+        };
+    }
+    const expectedNoToolsNotice = (0, system_prompt_parts_1.buildNoToolsNotice)(language);
+    if (policy.prependedContextMessages.length !== 1) {
+        return {
+            ok: false,
+            detail: 'FBR must prepend exactly one no-tools notice message.',
+        };
+    }
+    const [notice] = policy.prependedContextMessages;
+    if (!notice ||
+        notice.type !== 'environment_msg' ||
+        notice.role !== 'user' ||
+        notice.content !== expectedNoToolsNotice) {
+        return {
+            ok: false,
+            detail: 'FBR prepended notice must exactly match buildNoToolsNotice(language).',
+        };
+    }
+    return { ok: true };
+}
+function buildFbrSystemPrompt(language) {
     const prefix = language === 'zh'
         ? [
-            '# 扪心自问（FBR）支线对话：无工具模式',
-            '',
-            '- 你正在处理一次 `!?@self` 扪心自问（FBR）诉请。',
-            '- **本对话无任何工具**：禁止函数工具调用；禁止除 `!?@tellasker` 外的一切队友诉请。',
-            '- 仅当你需要澄清关键上下文时，允许使用 `!?@tellasker` 向诉请者回问；除此之外不要发起任何诉请。',
-            '- 你只能基于诉请正文（以及本支线对话自身的会话历史，如有）进行推理与总结；不要假设你能访问诉请者线程的对话历史。',
-            '- 若上下文不足，请在输出中列出缺失信息与原因；必要时可用 `!?@tellasker` 回问澄清。除 `!?@tellasker` 外不要发起任何诉请/工具调用。',
-            '',
-            '---',
+            '# 扪心自问（FBR）支线对话',
             '',
+            '- 你正在处理一次由 `!?@self` 发起的 FBR 支线对话。',
+            '- 诉请正文是主要任务上下文；不要假设能访问诉请者对话历史。',
+            '- 若使用可恢复的 `!tellaskSession` 形式，你可以使用本支线对话自身的 `tellaskSession` 历史作为显式上下文。',
+            '- 若诉请正文缺少关键上下文，请在输出中列出缺失信息与阻塞原因。',
+            '- 仅当必须澄清关键缺失上下文时，允许用 `!?@tellasker` 回问诉请者；除此之外不要发起任何诉请。',
         ].join('\n')
         : [
-            '# Tool-less @self FBR sideline dialog',
+            '# Fresh Boots Reasoning (FBR) sideline dialog',
             '',
-            '- This is a Fresh Boots Reasoning session created by `!?@self`.',
-            '- **No tools are available**: do not emit function tool calls; do not emit any tellasks except `!?@tellasker`.',
+            '- This is an FBR sideline dialog created by `!?@self`.',
+            '- The tellask body is the primary task context; do not assume access to tellasker dialog history.',
+            '- If this is the resumable `!tellaskSession` form, you may use this sideline dialog’s own tellaskSession history as explicit context.',
+            '- If the tellask body is missing critical context, list what is missing and why it blocks reasoning.',
             '- `!?@tellasker` is allowed only when you must clarify critical missing context; otherwise do not emit any tellasks.',
-            '- Use only the tellask body (and this sideline dialog’s own tellaskSession history, if any) as context. Do not assume access to the caller-thread dialog history.',
-            '- If the tellask body is missing critical context, list the missing info and why it blocks reasoning; if truly necessary you may ask back via `!?@tellasker` (and only that). Do not fetch via tools/other tellasks.',
-            '',
-            '---',
-            '',
         ].join('\n');
-    return `${prefix}${systemPrompt}`.trim();
+    return prefix.trim();
 }
 function isToollessFbrSelfSubdialog(dlg) {
     return dlg instanceof dialog_1.SubDialog && isFbrSelfTellaskHeadLine(dlg.assignmentFromSup.tellaskHead);
@@ -2707,6 +2863,7 @@ async function createSubdialogForSupdialog(supdialog, targetAgentId, tellaskHead
         await withSuspensionStateLock(supdialog.id, async () => {
             await persistence_1.DialogPersistence.appendPendingSubdialog(supdialog.id, pendingRecord);
         });
+        await syncPendingTellaskReminderBestEffort(supdialog, 'createSubdialogForSupdialog:appendPending');
         // Drive the subdialog asynchronously
         void (async () => {
             try {
@@ -2862,6 +3019,7 @@ async function supplyResponseToSupdialog(parentDialog, subdialogId, responseText
         const resolvedAgentId = result.responderAgentId ?? result.responderId;
         const resolvedOriginMemberId = result.originMemberId ?? parentDialog.agentId;
         const resolvedCallId = callId ?? '';
+        await syncPendingTellaskReminderBestEffort(parentDialog, 'supplyResponseToSupdialog:savePending');
         await parentDialog.receiveTeammateResponse(result.responderId, result.tellaskHead, status, subdialogId, {
             response: responseText,
             agentId: resolvedAgentId,
@@ -2873,7 +3031,10 @@ async function supplyResponseToSupdialog(parentDialog, subdialogId, responseText
             if (parentDialog instanceof dialog_1.RootDialog) {
                 dialog_global_registry_1.globalDialogRegistry.markNeedsDrive(parentDialog.id.rootId);
             }
-            void driveDialogStream(parentDialog, undefined, true);
+            const suppressDiligencePushForReviveDrive = parentDialog.disableDiligencePush;
+            void driveDialogStream(parentDialog, undefined, true, {
+                suppressDiligencePush: suppressDiligencePushForReviveDrive,
+            });
         }
     }
     catch (error) {
@@ -2938,6 +3099,7 @@ async function incorporateSubdialogResponses(rootDialog) {
         const respondedIds = new Set(responses.map((r) => r.subdialogId));
         const filteredPending = pendingSubdialogs.filter((p) => !respondedIds.has(p.subdialogId));
         await persistence_1.DialogPersistence.savePendingSubdialogs(rootDialog.id, filteredPending);
+        await syncPendingTellaskReminderBestEffort(rootDialog, 'incorporateSubdialogResponses:savePending');
         return responses;
     }
     catch (error) {
@@ -3127,6 +3289,15 @@ async function executeTellaskCall(dlg, agent, firstMention, tellaskHead, body, c
         }
         catch (q4hErr) {
             const errMsg = q4hErr instanceof Error ? q4hErr.message : String(q4hErr);
+            const streamErr = `Q4H register invariant violation: dialog=${dlg.id.selfId} callId=${callId.trim()} reason=${errMsg}`;
+            try {
+                await dlg.streamError(streamErr);
+            }
+            catch (streamErrPost) {
+                log_1.log.warn('Q4H: failed to emit stream_error_evt', streamErrPost, {
+                    dialogId: dlg.id.selfId,
+                });
+            }
             log_1.log.error('Q4H: Failed to register question', q4hErr, {
                 dialogId: dlg.id.selfId,
                 tellaskHead: tellaskHead.substring(0, 100),
@@ -3267,6 +3438,7 @@ async function executeTellaskCall(dlg, agent, firstMention, tellaskHead, body, c
                         records: [...previous, ...pendingRecords],
                     }));
                 });
+                await syncPendingTellaskReminderBestEffort(dlg, 'executeTellaskCall:FBR-TypeC:replacePending');
                 for (const sub of createdSubs) {
                     void (async () => {
                         try {
@@ -3417,6 +3589,7 @@ async function executeTellaskCall(dlg, agent, firstMention, tellaskHead, body, c
                         return { kind: 'replace', records: next };
                     });
                 });
+                await syncPendingTellaskReminderBestEffort(pendingOwner, 'executeTellaskCall:FBR-TypeB:replacePending');
                 for (const r of createdOrExisting) {
                     void (async () => {
                         try {
@@ -3592,6 +3765,7 @@ async function executeTellaskCall(dlg, agent, firstMention, tellaskHead, body, c
                     await withSuspensionStateLock(dlg.id, async () => {
                         await persistence_1.DialogPersistence.appendPendingSubdialog(dlg.id, pendingRecord);
                     });
+                    await syncPendingTellaskReminderBestEffort(dlg, 'executeTellaskCall:TypeB-fallback:appendPending');
                     const task = (async () => {
                         try {
                             const initPrompt = {
@@ -3673,6 +3847,7 @@ async function executeTellaskCall(dlg, agent, firstMention, tellaskHead, body, c
                         return { kind: 'replace', records: next };
                     });
                 });
+                await syncPendingTellaskReminderBestEffort(pendingOwner, 'executeTellaskCall:TypeB:replacePending');
                 const task = (async () => {
                     try {
                         if (result.kind === 'existing') {
@@ -3745,6 +3920,7 @@ async function executeTellaskCall(dlg, agent, firstMention, tellaskHead, body, c
                 await withSuspensionStateLock(dlg.id, async () => {
                     await persistence_1.DialogPersistence.appendPendingSubdialog(dlg.id, pendingRecord);
                 });
+                await syncPendingTellaskReminderBestEffort(dlg, 'executeTellaskCall:TypeC:appendPending');
                 const task = (async () => {
                     try {
                         const initPrompt = {