dominds 0.7.4 → 0.7.6

package/README.md

@@ -108,6 +108,16 @@ https://github.com/longrun-ai/dominds-feat-dev
 2. Clone your dominds fork into dominds-feat-dev/dominds/
 3. Open PRs against [longrun-ai/dominds](https://github.com/longrun-ai/dominds) from that inner repo
 
+### Contributor Test Rule (Script rtws Isolation)
+
+When running script tests inside the Dominds repo (for example `pnpm -C tests run rtws -- ...`):
+
+- Start with `pnpm -C tests run` to list available scripts, then run target suites via `pnpm -C tests run <script-name>`.
+- Default mode is **isolated rtws**: each run copies `tests/script-rtws` into a unique temp rtws before execution.
+- Because isolation is default, script tests are safe to run in parallel; do not rely on shared-rtws serial assumptions.
+- Use `--shared-rtws` for debugging only; it runs directly in `tests/script-rtws` and must not be used concurrently.
+- Set `DOMINDS_TEST_RTWS_KEEP_TMP=1` if you want to keep temporary rtws artifacts for post-failure debugging.
+
 ### rtws Setup
 
 There are two common ways to create an rtws:

package/README.zh.md

@@ -65,6 +65,16 @@ https://github.com/longrun-ai/dominds-feat-dev
 2. 在 dominds-feat-dev/dominds/ 目录下，克隆你自己的 Dominds fork 仓库
 3. 在内层 dominds/ 目录中，向 longrun-ai/dominds 提交 PR
 
+### 贡献者测试约定（脚本测试 rtws 隔离）
+
+当你在 Dominds 仓库里运行脚本测试（如 `pnpm -C tests run rtws -- ...`）时：
+
+- 可先用 `pnpm -C tests run` 查看可用测试脚本，再用 `pnpm -C tests run <script-name>` 运行目标用例。
+- 默认是**隔离 rtws**：每次运行都会把 `tests/script-rtws` 复制到独立临时目录后执行。
+- 因为默认隔离，脚本测试可安全并发运行，不再依赖共享 `script-rtws` 的串行假设。
+- `--shared-rtws` 仅用于调试，会直接使用 `tests/script-rtws`，禁止并发运行多个用例。
+- 需要保留失败现场时，设置 `DOMINDS_TEST_RTWS_KEEP_TMP=1`，测试 CLI 会保留临时 rtws 路径。
+
 ## 快速上手（推荐：通过模板创建运行时工作区）
 
 ```bash

package/dist/dialog-global-registry.js

@@ -6,6 +6,7 @@ const evt_1 = require("./shared/evt");
 class GlobalDialogRegistry {
     constructor() {
         this.entries = new Map();
+        this.lastDriveTriggerByRootId = new Map();
         this.driveTriggerPubChan = (0, evt_1.createPubChan)();
         this.driveTriggerSubChan = (0, evt_1.createSubChan)(this.driveTriggerPubChan);
     }
@@ -48,7 +49,7 @@ class GlobalDialogRegistry {
         this.entries.delete(rootId);
     }
     publishDriveTrigger(args) {
-        this.driveTriggerPubChan.write({
+        const trigger = {
             type: 'drive_trigger_evt',
             action: args.action,
             rootId: args.rootId,
@@ -58,7 +59,9 @@ class GlobalDialogRegistry {
             source: args.meta.source,
             reason: args.meta.reason,
             emittedAtMs: Date.now(),
-        });
+        };
+        this.lastDriveTriggerByRootId.set(args.rootId, trigger);
+        this.driveTriggerPubChan.write(trigger);
     }
     async waitForDriveTrigger() {
         for (;;) {
@@ -113,6 +116,9 @@ class GlobalDialogRegistry {
             .filter((entry) => entry.needsDrive)
             .map((entry) => entry.rootDialog);
     }
+    getLastDriveTrigger(rootId) {
+        return this.lastDriveTriggerByRootId.get(rootId);
+    }
     getAll() {
         return Array.from(this.entries.values()).map((entry) => entry.rootDialog);
     }

package/dist/dialog.js

@@ -790,24 +790,15 @@ class SubDialog extends Dialog {
         this.assignmentFromSup = assignmentFromSup;
         const resolvedSupdialog = rootDialog.lookupDialog(assignmentFromSup.callerDialogId);
         if (resolvedSupdialog && resolvedSupdialog.id.selfId === this.id.selfId) {
-            log_1.log.warn('SubDialog assignmentFromSup.callerDialogId resolved to self; falling back to root', {
-                dialogId: this.id.selfId,
-                callerDialogId: assignmentFromSup.callerDialogId,
-            });
-            this._supdialog = rootDialog;
+            throw new Error(`SubDialog supdialog invariant violation: caller resolved to self ` +
+                `(rootId=${rootDialog.id.rootId}, selfId=${this.id.selfId}, callerDialogId=${assignmentFromSup.callerDialogId})`);
         }
         else if (resolvedSupdialog) {
             this._supdialog = resolvedSupdialog;
         }
         else {
-            // If we can't resolve the caller dialog in the in-memory registry, fall back to root.
-            // This can happen when restoring a dialog tree without restoring the full parent chain.
-            log_1.log.warn('SubDialog failed to resolve callerDialogId in root registry; falling back to root', {
-                dialogId: this.id.selfId,
-                callerDialogId: assignmentFromSup.callerDialogId,
-                rootId: rootDialog.id.rootId,
-            });
-            this._supdialog = rootDialog;
+            throw new Error(`SubDialog supdialog invariant violation: caller missing from root registry ` +
+                `(rootId=${rootDialog.id.rootId}, selfId=${this.id.selfId}, callerDialogId=${assignmentFromSup.callerDialogId})`);
         }
         this.rootDialog.registerDialog(this);
     }

package/dist/llm/driver-v2/context-health.js

@@ -1,6 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS = void 0;
+exports.resetContextHealthRoundState = resetContextHealthRoundState;
+exports.resolveCriticalCountdownRemaining = resolveCriticalCountdownRemaining;
+exports.consumeCriticalCountdown = consumeCriticalCountdown;
 exports.decideDriverV2ContextHealth = decideDriverV2ContextHealth;
+exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS = 5;
+const contextHealthRoundStateByDialogKey = new Map();
+function getContextHealthRoundState(dialogKey) {
+    const existing = contextHealthRoundStateByDialogKey.get(dialogKey);
+    if (existing) {
+        return existing;
+    }
+    const created = {};
+    contextHealthRoundStateByDialogKey.set(dialogKey, created);
+    return created;
+}
+function resetContextHealthRoundState(dialogKey) {
+    contextHealthRoundStateByDialogKey.delete(dialogKey);
+}
+function resolveCriticalCountdownRemaining(dialogKey, snapshot) {
+    if (!snapshot || snapshot.kind !== 'available') {
+        resetContextHealthRoundState(dialogKey);
+        return exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS;
+    }
+    if (snapshot.level !== 'critical') {
+        if (snapshot.level === 'healthy') {
+            resetContextHealthRoundState(dialogKey);
+            return exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS;
+        }
+        const state = getContextHealthRoundState(dialogKey);
+        state.lastSeenLevel = snapshot.level;
+        state.criticalCountdownRemaining = undefined;
+        return exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS;
+    }
+    const state = getContextHealthRoundState(dialogKey);
+    if (state.lastSeenLevel !== 'critical' ||
+        typeof state.criticalCountdownRemaining !== 'number' ||
+        !Number.isFinite(state.criticalCountdownRemaining)) {
+        state.lastSeenLevel = 'critical';
+        state.criticalCountdownRemaining = exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS;
+    }
+    const remaining = Math.floor(state.criticalCountdownRemaining);
+    return remaining > 0 ? remaining : 0;
+}
+function consumeCriticalCountdown(dialogKey) {
+    const state = getContextHealthRoundState(dialogKey);
+    const currentRaw = typeof state.criticalCountdownRemaining === 'number' &&
+        Number.isFinite(state.criticalCountdownRemaining)
+        ? Math.floor(state.criticalCountdownRemaining)
+        : exports.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS;
+    const current = currentRaw > 0 ? currentRaw : 0;
+    const next = Math.max(0, current - 1);
+    state.lastSeenLevel = 'critical';
+    state.criticalCountdownRemaining = next;
+    return next;
+}
 function decideDriverV2ContextHealth(args) {
     const { snapshot } = args;
     if (!snapshot || snapshot.kind !== 'available') {

package/dist/llm/driver-v2/core.js

@@ -10,12 +10,14 @@ const persistence_1 = require("../../persistence");
 const diligence_1 = require("../../shared/diligence");
 const driver_messages_1 = require("../../shared/i18n/driver-messages");
 const runtime_language_1 = require("../../shared/runtime-language");
+const id_1 = require("../../shared/utils/id");
 const tellask_1 = require("../../tellask");
 const taskdoc_1 = require("../../utils/taskdoc");
 const client_1 = require("../client");
 const registry_1 = require("../gen/registry");
 const tools_projection_1 = require("../tools-projection");
 const context_1 = require("./context");
+const context_health_1 = require("./context-health");
 const policy_1 = require("./policy");
 const runtime_utils_1 = require("./runtime-utils");
 const saying_events_1 = require("./saying-events");
@@ -58,6 +60,12 @@ function resolveUpNextPrompt(dlg) {
         userLanguageCode: upNext.userLanguageCode,
     };
 }
+function isUserOriginPrompt(prompt) {
+    if (!prompt) {
+        return false;
+    }
+    return (prompt.origin ?? 'user') === 'user';
+}
 async function emitUserMarkdown(dlg, content) {
     if (!content.trim()) {
         return;
@@ -428,6 +436,63 @@ async function driveDialogStreamCoreV2(dlg, humanPrompt, driveOptions, callbacks
             const canonicalFuncTools = agentTools.filter((t) => t.type === 'func');
             const projected = (0, tools_projection_1.projectFuncToolsForProvider)(providerCfg.apiType, canonicalFuncTools);
             const funcTools = projected.tools;
+            if (genIterNo > 1) {
+                const snapshot = dlg.getLastContextHealth();
+                const hasQueuedUpNext = dlg.hasUpNext() || pendingPrompt !== undefined;
+                const criticalCountdownRemaining = (0, context_health_1.resolveCriticalCountdownRemaining)(dlg.id.key(), snapshot);
+                const healthDecision = (0, context_health_1.decideDriverV2ContextHealth)({
+                    snapshot,
+                    hadUserPromptThisGen: isUserOriginPrompt(pendingPrompt),
+                    criticalCountdownRemaining,
+                });
+                if (healthDecision.kind === 'suspend') {
+                    log_1.log.info('driver-v2 suspend iterative generation due to critical context while waiting for human prompt', undefined, {
+                        dialogId: dlg.id.valueOf(),
+                        rootId: dlg.id.rootId,
+                        selfId: dlg.id.selfId,
+                        genIterNo,
+                        pendingPromptOrigin: pendingPrompt?.origin ?? null,
+                    });
+                    break;
+                }
+                if (healthDecision.kind === 'continue') {
+                    if (healthDecision.reason === 'critical_force_new_course') {
+                        const language = (0, runtime_language_1.getWorkLanguage)();
+                        const newCoursePrompt = language === 'zh'
+                            ? '系统因上下文已告急（critical）而自动开启新一程对话，请继续推进任务。'
+                            : 'System auto-started a new dialog course because context health is critical. Please continue the task.';
+                        await dlg.startNewCourse(newCoursePrompt);
+                        dlg.setLastContextHealth({ kind: 'unavailable', reason: 'usage_unavailable' });
+                        (0, context_health_1.resetContextHealthRoundState)(dlg.id.key());
+                        const nextPrompt = resolveUpNextPrompt(dlg);
+                        if (!nextPrompt) {
+                            throw new Error(`driver-v2 critical force-new-course invariant violation: missing upNext prompt after startNewCourse for dialog=${dlg.id.valueOf()}`);
+                        }
+                        pendingPrompt = nextPrompt;
+                        skipTaskdocForThisDrive = false;
+                    }
+                    else if (!hasQueuedUpNext) {
+                        const language = (0, runtime_language_1.getWorkLanguage)();
+                        const guideText = healthDecision.reason === 'caution_soft_remediation'
+                            ? (0, driver_messages_1.formatAgentFacingContextHealthV3RemediationGuide)(language, {
+                                kind: 'caution',
+                                mode: 'soft',
+                            })
+                            : (0, driver_messages_1.formatAgentFacingContextHealthV3RemediationGuide)(language, {
+                                kind: 'critical',
+                                mode: 'countdown',
+                                promptsRemainingAfterThis: (0, context_health_1.consumeCriticalCountdown)(dlg.id.key()),
+                                promptsTotal: context_health_1.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS,
+                            });
+                        pendingPrompt = {
+                            content: guideText,
+                            msgId: (0, id_1.generateShortId)(),
+                            grammar: 'markdown',
+                            userLanguageCode: language,
+                        };
+                    }
+                }
+            }
             let suspendForHuman = false;
             let llmGenModelForGen = model;
             let contextHealthForGen;
@@ -439,7 +504,7 @@ async function driveDialogStreamCoreV2(dlg, humanPrompt, driveOptions, callbacks
                     const promptOrigin = currentPrompt.origin ?? 'user';
                     const isDiligencePrompt = promptOrigin === 'diligence_push';
                     if (isDiligencePrompt && (dlg.disableDiligencePush || suppressDiligencePushForDrive)) {
-                        log_1.log.info('driver-v2 skip diligence prompt after disable toggle', {
+                        log_1.log.info('driver-v2 skip diligence prompt after disable toggle', undefined, {
                             dialogId: dlg.id.valueOf(),
                             msgId: currentPrompt.msgId,
                         });
@@ -551,7 +616,7 @@ async function driveDialogStreamCoreV2(dlg, humanPrompt, driveOptions, callbacks
                 const guideMsg = {
                     type: 'transient_guide_msg',
                     role: 'assistant',
-                    content: (0, driver_messages_1.formatUserFacingLanguageGuide)(workingLanguage, uiLanguage),
+                    content: (0, driver_messages_1.formatCurrentUserLanguagePreference)(workingLanguage, uiLanguage),
                 };
                 const ctxMsgs = (0, context_1.assembleDriveContextMessages)({
                     base: {

package/dist/llm/driver-v2/orchestrator.js

@@ -88,11 +88,47 @@ async function driveQueuedDialogsOnce() {
                 });
                 await persistence_1.DialogPersistence.setNeedsDrive(rootDialog.id, false, rootDialog.status);
             }
+            const lastTrigger = dialog_global_registry_1.globalDialogRegistry.getLastDriveTrigger(rootDialog.id.rootId);
+            const lastTriggerAgeMs = lastTrigger !== undefined ? Math.max(0, Date.now() - lastTrigger.emittedAtMs) : undefined;
             if (status.subdialogs) {
-                log_1.log.info(`Dialog ${rootDialog.id.rootId} suspended, waiting for subdialogs`);
+                log_1.log.info(`Dialog ${rootDialog.id.rootId} suspended, waiting for subdialogs`, undefined, {
+                    rootId: rootDialog.id.rootId,
+                    waitingQ4H: status.q4h,
+                    waitingSubdialogs: status.subdialogs,
+                    hasQueuedUpNext: rootDialog.hasUpNext(),
+                    lastDriveTrigger: lastTrigger
+                        ? {
+                            action: lastTrigger.action,
+                            source: lastTrigger.source,
+                            reason: lastTrigger.reason,
+                            emittedAtMs: lastTrigger.emittedAtMs,
+                            ageMs: lastTriggerAgeMs,
+                            entryFound: lastTrigger.entryFound,
+                            previousNeedsDrive: lastTrigger.previousNeedsDrive,
+                            nextNeedsDrive: lastTrigger.nextNeedsDrive,
+                        }
+                        : null,
+                });
             }
             if (status.q4h) {
-                log_1.log.info(`Dialog ${rootDialog.id.rootId} awaiting Q4H answer`);
+                log_1.log.info(`Dialog ${rootDialog.id.rootId} awaiting Q4H answer`, undefined, {
+                    rootId: rootDialog.id.rootId,
+                    waitingQ4H: status.q4h,
+                    waitingSubdialogs: status.subdialogs,
+                    hasQueuedUpNext: rootDialog.hasUpNext(),
+                    lastDriveTrigger: lastTrigger
+                        ? {
+                            action: lastTrigger.action,
+                            source: lastTrigger.source,
+                            reason: lastTrigger.reason,
+                            emittedAtMs: lastTrigger.emittedAtMs,
+                            ageMs: lastTriggerAgeMs,
+                            entryFound: lastTrigger.entryFound,
+                            previousNeedsDrive: lastTrigger.previousNeedsDrive,
+                            nextNeedsDrive: lastTrigger.nextNeedsDrive,
+                        }
+                        : null,
+                });
             }
         }
         catch (err) {

package/dist/llm/driver-v2/round.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDriveRound = executeDriveRound;
 const dialog_1 = require("../../dialog");
+const dialog_global_registry_1 = require("../../dialog-global-registry");
 const dialog_run_state_1 = require("../../dialog-run-state");
 const log_1 = require("../../log");
 const load_1 = require("../../minds/load");
@@ -13,7 +14,6 @@ const context_health_1 = require("./context-health");
 const core_1 = require("./core");
 const policy_1 = require("./policy");
 const supdialog_response_1 = require("./supdialog-response");
-const defaultCriticalCountdownGenerations = 5;
 async function loadPendingDiagnosticsSnapshot(args) {
     const ownerDialogIdObj = new dialog_1.DialogID(args.ownerDialogId, args.rootId);
     try {
@@ -44,57 +44,6 @@ async function loadPendingDiagnosticsSnapshot(args) {
         };
     }
 }
-const contextHealthRoundStateByDialogKey = new Map();
-function getContextHealthRoundState(dialog) {
-    const key = dialog.id.key();
-    const existing = contextHealthRoundStateByDialogKey.get(key);
-    if (existing) {
-        return existing;
-    }
-    const created = {};
-    contextHealthRoundStateByDialogKey.set(key, created);
-    return created;
-}
-function resetContextHealthRoundState(dialog) {
-    contextHealthRoundStateByDialogKey.delete(dialog.id.key());
-}
-function resolveCriticalCountdownRemaining(dialog, snapshot) {
-    if (!snapshot || snapshot.kind !== 'available') {
-        resetContextHealthRoundState(dialog);
-        return defaultCriticalCountdownGenerations;
-    }
-    if (snapshot.level !== 'critical') {
-        if (snapshot.level === 'healthy') {
-            resetContextHealthRoundState(dialog);
-            return defaultCriticalCountdownGenerations;
-        }
-        const state = getContextHealthRoundState(dialog);
-        state.lastSeenLevel = snapshot.level;
-        state.criticalCountdownRemaining = undefined;
-        return defaultCriticalCountdownGenerations;
-    }
-    const state = getContextHealthRoundState(dialog);
-    if (state.lastSeenLevel !== 'critical' ||
-        typeof state.criticalCountdownRemaining !== 'number' ||
-        !Number.isFinite(state.criticalCountdownRemaining)) {
-        state.lastSeenLevel = 'critical';
-        state.criticalCountdownRemaining = defaultCriticalCountdownGenerations;
-    }
-    const remaining = Math.floor(state.criticalCountdownRemaining);
-    return remaining > 0 ? remaining : 0;
-}
-function consumeCriticalCountdown(dialog) {
-    const state = getContextHealthRoundState(dialog);
-    const currentRaw = typeof state.criticalCountdownRemaining === 'number' &&
-        Number.isFinite(state.criticalCountdownRemaining)
-        ? Math.floor(state.criticalCountdownRemaining)
-        : defaultCriticalCountdownGenerations;
-    const current = currentRaw > 0 ? currentRaw : 0;
-    const next = Math.max(0, current - 1);
-    state.lastSeenLevel = 'critical';
-    state.criticalCountdownRemaining = next;
-    return next;
-}
 function resolveEffectivePrompt(dialog, humanPrompt) {
     if (humanPrompt) {
         return humanPrompt;
@@ -167,7 +116,9 @@ async function executeDriveRound(args) {
         if (!humanPrompt) {
             const suspension = await dialog.getSuspensionStatus();
             if (!suspension.canDrive) {
-                log_1.log.info('driver-v2 skip queued auto-drive while dialog is suspended', {
+                const lastTrigger = dialog_global_registry_1.globalDialogRegistry.getLastDriveTrigger(dialog.id.rootId);
+                const lastTriggerAgeMs = lastTrigger !== undefined ? Math.max(0, Date.now() - lastTrigger.emittedAtMs) : undefined;
+                log_1.log.info('driver-v2 skip queued auto-drive while dialog is suspended', undefined, {
                     dialogId: dialog.id.valueOf(),
                     rootId: dialog.id.rootId,
                     selfId: dialog.id.selfId,
@@ -175,6 +126,18 @@ async function executeDriveRound(args) {
                     hasQueuedUpNext: dialog.hasUpNext(),
                     waitingQ4H: suspension.q4h,
                     waitingSubdialogs: suspension.subdialogs,
+                    lastDriveTrigger: lastTrigger
+                        ? {
+                            action: lastTrigger.action,
+                            source: lastTrigger.source,
+                            reason: lastTrigger.reason,
+                            emittedAtMs: lastTrigger.emittedAtMs,
+                            ageMs: lastTriggerAgeMs,
+                            entryFound: lastTrigger.entryFound,
+                            previousNeedsDrive: lastTrigger.previousNeedsDrive,
+                            nextNeedsDrive: lastTrigger.nextNeedsDrive,
+                        }
+                        : null,
                 });
                 return;
             }
@@ -193,7 +156,7 @@ async function executeDriveRound(args) {
         }
         const snapshot = dialog.getLastContextHealth();
         const hasQueuedUpNext = dialog.hasUpNext();
-        const criticalCountdownRemaining = resolveCriticalCountdownRemaining(dialog, snapshot);
+        const criticalCountdownRemaining = (0, context_health_1.resolveCriticalCountdownRemaining)(dialog.id.key(), snapshot);
         const healthDecision = (0, context_health_1.decideDriverV2ContextHealth)({
             snapshot,
             hadUserPromptThisGen: humanPrompt !== undefined,
@@ -211,20 +174,20 @@ async function executeDriveRound(args) {
                     : 'System auto-started a new dialog course because context health is critical. Please continue the task.';
                 await dialog.startNewCourse(newCoursePrompt);
                 dialog.setLastContextHealth({ kind: 'unavailable', reason: 'usage_unavailable' });
-                resetContextHealthRoundState(dialog);
+                (0, context_health_1.resetContextHealthRoundState)(dialog.id.key());
             }
             else if (!hasQueuedUpNext) {
                 const language = (0, runtime_language_1.getWorkLanguage)();
                 const guideText = healthDecision.reason === 'caution_soft_remediation'
-                    ? (0, driver_messages_1.formatUserFacingContextHealthV3RemediationGuide)(language, {
+                    ? (0, driver_messages_1.formatAgentFacingContextHealthV3RemediationGuide)(language, {
                         kind: 'caution',
                         mode: 'soft',
                     })
-                    : (0, driver_messages_1.formatUserFacingContextHealthV3RemediationGuide)(language, {
+                    : (0, driver_messages_1.formatAgentFacingContextHealthV3RemediationGuide)(language, {
                         kind: 'critical',
                         mode: 'countdown',
-                        promptsRemainingAfterThis: consumeCriticalCountdown(dialog),
-                        promptsTotal: defaultCriticalCountdownGenerations,
+                        promptsRemainingAfterThis: (0, context_health_1.consumeCriticalCountdown)(dialog.id.key()),
+                        promptsTotal: context_health_1.DRIVER_V2_DEFAULT_CRITICAL_COUNTDOWN_GENERATIONS,
                     });
                 healthPrompt = {
                     content: guideText,

package/dist/llm/driver-v2/supdialog-response.js

@@ -135,17 +135,32 @@ async function supplyResponseToSupdialogV2(args) {
         };
         await parentDialog.addChatMessages(immediateMirror);
         if (result.shouldRevive) {
-            log_1.log.info(`All Type ${callType} subdialogs complete, parent ${parentDialog.id.selfId} auto-reviving`);
-            if (parentDialog instanceof dialog_1.RootDialog) {
+            const isRoot = parentDialog instanceof dialog_1.RootDialog;
+            const hasRegistryEntry = isRoot
+                ? dialog_global_registry_1.globalDialogRegistry.get(parentDialog.id.rootId) !== undefined
+                : false;
+            log_1.log.info(`All Type ${callType} subdialogs complete, parent ${parentDialog.id.selfId} scheduling auto-revive`, undefined, {
+                rootId: parentDialog.id.rootId,
+                selfId: parentDialog.id.selfId,
+                via: isRoot && hasRegistryEntry ? 'backend_loop_trigger' : 'direct_schedule_drive',
+                isRoot,
+                hasRegistryEntry,
+            });
+            if (isRoot) {
                 dialog_global_registry_1.globalDialogRegistry.markNeedsDrive(parentDialog.id.rootId, {
                     source: 'driver_v2_supply_response',
                     reason: `all_pending_subdialogs_resolved:type_${callType}`,
                 });
             }
-            scheduleDrive(parentDialog, {
-                waitInQue: true,
-                driveOptions: { suppressDiligencePush: parentDialog.disableDiligencePush },
-            });
+            // Root dialogs should normally be resumed by backend loop drive-trigger.
+            // Direct schedule is kept only as fallback for non-root callers or when registry
+            // entry is not available yet (e.g., transient bootstrap windows).
+            if (!isRoot || !hasRegistryEntry) {
+                scheduleDrive(parentDialog, {
+                    waitInQue: true,
+                    driveOptions: { suppressDiligencePush: parentDialog.disableDiligencePush },
+                });
+            }
         }
     }
     catch (error) {

package/dist/llm/driver-v2/tellask-bridge.js

@@ -1121,7 +1121,7 @@ async function executeTellaskCalls(args) {
             body: mergedBody,
             q4hRemainingCallIds: remainingCallIds.length > 0 ? remainingCallIds : undefined,
         };
-        log_1.log.info('Q4H multi-question normalized into a single prompt', {
+        log_1.log.info('Q4H multi-question normalized into a single prompt', undefined, {
             rootId: dlg.id.rootId,
             selfId: dlg.id.selfId,
             mergedCount: q4hCalls.length,

package/dist/llm/driver.js

@@ -626,7 +626,7 @@ async function applyContextHealthV3Remediation(args) {
         if (activeGenSeq === undefined) {
             return { kind: 'proceed', ctxMsgs: args.ctxMsgs };
         }
-        const guideText = (0, driver_messages_1.formatUserFacingContextHealthV3RemediationGuide)((0, runtime_language_1.getWorkLanguage)(), {
+        const guideText = (0, driver_messages_1.formatAgentFacingContextHealthV3RemediationGuide)((0, runtime_language_1.getWorkLanguage)(), {
             kind: 'caution',
             mode: 'soft',
         });
@@ -692,7 +692,7 @@ async function applyContextHealthV3Remediation(args) {
             const nextPrompt = resolveUpNextPrompt(dlg);
             return { kind: 'continue', nextPrompt };
         }
-        const guideText = (0, driver_messages_1.formatUserFacingContextHealthV3RemediationGuide)((0, runtime_language_1.getWorkLanguage)(), {
+        const guideText = (0, driver_messages_1.formatAgentFacingContextHealthV3RemediationGuide)((0, runtime_language_1.getWorkLanguage)(), {
             kind: 'critical',
             mode: 'countdown',
             promptsRemainingAfterThis: promptsBeforeAutoClear - 1,
@@ -1432,7 +1432,7 @@ async function _driveDialogStream(dlg, humanPrompt, driveOptions) {
                 const guideMsg = {
                     type: 'transient_guide_msg',
                     role: 'assistant',
-                    content: (0, driver_messages_1.formatUserFacingLanguageGuide)(workingLanguage, uiLanguage),
+                    content: (0, driver_messages_1.formatCurrentUserLanguagePreference)(workingLanguage, uiLanguage),
                 };
                 const ctxMsgs = (0, context_1.assembleDriveContextMessages)({
                     base: {