dominds 1.25.0 → 1.25.2

package/dist/persistence.d.ts

@@ -88,7 +88,6 @@ export declare class DiskFileDialogStore extends DialogStore {
      * to ensure proper event ordering on the frontend.
      */
     notifyGeneratingStart(dialog: Dialog, msgId?: string): Promise<readonly DialogNextStepTrigger[]>;
-    private getResultArrivalBatchIdsFromAcceptedTriggers;
     /**
      * Notify end of LLM generation for frontend bubble management
      */
@@ -516,7 +515,6 @@ export declare class DialogPersistence {
      * Load active callee dispatches projected from active-callees.json.
      */
     static loadActiveCalleeDispatches(mainDialogId: DialogID, status?: DialogStatusKind): Promise<ActiveCalleeDispatchRecord[]>;
-    private static isActiveCalleeDispatchRecord;
     private static activeCalleeDispatchCalleeDialogId;
     private static buildActiveCalleeRecordFromDispatch;
     private static isActiveCalleeCompletion;
@@ -530,7 +528,7 @@ export declare class DialogPersistence {
     static appendActiveCalleeDispatch(mainDialogId: DialogID, record: ActiveCalleeDispatchRecord, rootAnchor?: RootGenerationAnchor, status?: DialogStatusKind): Promise<void>;
     static saveActiveCalleeDispatches(mainDialogId: DialogID, dispatches: ActiveCalleeDispatchRecord[], rootAnchor?: RootGenerationAnchor, status?: DialogStatusKind): Promise<void>;
     static mutateActiveCalleeDispatches(mainDialogId: DialogID, mutator: (previous: ActiveCalleeDispatchRecord[]) => ActiveCalleeDispatchRecord[], rootAnchor?: RootGenerationAnchor, status?: DialogStatusKind): Promise<ActiveCalleeDispatchRecord[]>;
-    static removeActiveCalleeDispatch(mainDialogId: DialogID, calleeDialogId: string, rootAnchor?: RootGenerationAnchor, status?: DialogStatusKind): Promise<void>;
+    static removeActiveCalleeDispatch(mainDialogId: DialogID, calleeDialogId: string, callId: string, rootAnchor?: RootGenerationAnchor, status?: DialogStatusKind): Promise<void>;
     static clearActiveCalleeDispatches(mainDialogId: DialogID, rootAnchor?: RootGenerationAnchor, status?: DialogStatusKind): Promise<void>;
     private static loadActiveCalleesFromDisk;
     static loadActiveCallees(dialogId: DialogID, status?: DialogStatusKind): Promise<ActiveCalleesFile>;
@@ -561,10 +559,6 @@ export declare class DialogPersistence {
         deliveryMode: 'reply_tool' | 'direct_fallback';
         directFallbackSource?: 'saying' | 'thinking_only';
     }>, status?: DialogStatusKind): Promise<ActiveCalleeResolveOutcome>;
-    static removeActiveCallee(dialogId: DialogID, args: Readonly<{
-        batchId: string;
-        callId: string;
-    }>, status?: DialogStatusKind): Promise<void>;
     static removeActiveCalleeBatch(dialogId: DialogID, batchId: string, status?: DialogStatusKind): Promise<void>;
     /**
      * Get the path for storing sideDialog responses (supports both main dialog and sideDialog tellaskers).

package/dist/persistence.js

@@ -180,6 +180,9 @@ function emitInvariantWarning(message, details) {
         ...details,
         diagnosticJson,
     });
+    if (process.env.DOMINDS_FULL_INVARIANT_DIAGNOSTICS !== '1') {
+        return;
+    }
     if (diagnosticJson !== null) {
         const parts = chunkInvariantDiagnosticJson(diagnosticJson, 1600);
         for (const [index, part] of parts.entries()) {
@@ -264,7 +267,7 @@ async function normalizeSideDialogIdleWhileReplyObligationPending(dialogId, stat
         return latest;
     }
     const top = askerStackState?.askerStack[askerStackState.askerStack.length - 1];
-    emitInvariantWarning('Dialog latest projection invariant warning: sideDialog awaiting Q4H attempted to enter idle displayState; healing from persistence facts', {
+    log_1.log.debug('Dialog latest projection invariant warning: sideDialog awaiting Q4H attempted to enter idle displayState; healing from persistence facts', undefined, {
         trigger: context.trigger,
         mutationKind: context.mutationKind,
         latestSource: context.latestSource,
@@ -2270,7 +2273,7 @@ function isReminderPriority(value) {
     return value === 'high' || value === 'medium' || value === 'low';
 }
 function isReminderScope(value) {
-    return value === 'dialog' || value === 'personal' || value === 'agent_shared';
+    return value === 'dialog' || value === 'task' || value === 'agent' || value === 'runtime';
 }
 function isReminderRenderMode(value) {
     return value === 'plain' || value === 'markdown';
@@ -2791,11 +2794,34 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
         (0, evt_registry_1.postDialogEvent)(dialog, genStartEvt);
         // Update generating flag in latest.yaml
         await DialogPersistence.mutateDialogLatest(this.dialogId, (previous) => {
-            acceptedTriggers = sortNextStepTriggersForConsumption(previous.nextStep.triggers);
+            const triggerSelection = filterNextStepTriggersForGenerationStart({
+                dialogId: this.dialogId,
+                currentCourse: (0, storage_1.toDialogCourseNumber)(course),
+                msgId,
+                triggers: previous.nextStep.triggers,
+            });
+            acceptedTriggers = triggerSelection.acceptedTriggers;
+            if (triggerSelection.supersededTriggers.length > 0) {
+                log_1.log.debug('Superseded stale next-step triggers while starting queued runtime prompt generation', undefined, {
+                    dialogId: this.dialogId.valueOf(),
+                    rootId: this.dialogId.rootId,
+                    selfId: this.dialogId.selfId,
+                    course,
+                    genseq,
+                    msgId: msgId ?? null,
+                    acceptedTriggerIds: acceptedTriggers.map((trigger) => trigger.triggerId),
+                    supersededTriggerIds: triggerSelection.supersededTriggers.map((trigger) => trigger.triggerId),
+                    reason: 'queued_runtime_prompt_new_course_takes_precedence',
+                });
+            }
             const acceptedTriggerIds = acceptedTriggers.map((trigger) => trigger.triggerId);
-            const nextStep = acceptedTriggerIds.length === 0
+            const consumedTriggerIds = new Set([
+                ...acceptedTriggerIds,
+                ...triggerSelection.supersededTriggers.map((trigger) => trigger.triggerId),
+            ]);
+            const nextStep = consumedTriggerIds.size === 0
                 ? previous.nextStep
-                : removeNextStepTrigger(previous.nextStep, (trigger) => acceptedTriggerIds.includes(trigger.triggerId));
+                : removeNextStepTrigger(previous.nextStep, (trigger) => consumedTriggerIds.has(trigger.triggerId));
             return {
                 kind: 'patch',
                 patch: {
@@ -2828,16 +2854,6 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
         }
         return acceptedTriggers;
     }
-    getResultArrivalBatchIdsFromAcceptedTriggers(triggerIds) {
-        const batchIds = [];
-        for (const triggerId of triggerIds) {
-            const prefix = 'result-arrival:';
-            if (triggerId.startsWith(prefix) && triggerId.length > prefix.length) {
-                batchIds.push(triggerId.slice(prefix.length));
-            }
-        }
-        return batchIds;
-    }
     /**
      * Notify end of LLM generation for frontend bubble management
      */
@@ -2848,7 +2864,6 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
             throw new Error('Missing active genseq for notifyGeneratingFinish');
         }
         const finishedAt = (0, time_1.formatUnifiedTimestamp)(new Date());
-        let acceptedTriggerIds = [];
         const ev = {
             ts: finishedAt,
             type: 'gen_finish_record',
@@ -2876,10 +2891,6 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
         }
         // Update generating flag in latest.yaml
         await DialogPersistence.mutateDialogLatest(this.dialogId, (previous) => {
-            acceptedTriggerIds =
-                previous.generationRunState?.kind === 'open'
-                    ? previous.generationRunState.acceptedTriggerIds
-                    : [];
             return {
                 kind: 'patch',
                 patch: {
@@ -2893,9 +2904,6 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
                 },
             };
         });
-        for (const batchId of this.getResultArrivalBatchIdsFromAcceptedTriggers(acceptedTriggerIds)) {
-            await DialogPersistence.removeActiveCalleeBatch(this.dialogId, batchId);
-        }
     }
     async sayingStart(dialog) {
         const course = dialog.activeGenCourseOrUndefined ?? dialog.currentCourse;
@@ -3753,7 +3761,7 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
     async loadSideDialogRegistry(mainDialog, status) {
         const entries = await DialogPersistence.loadSideDialogRegistry(mainDialog.id, status);
         const shouldPruneDead = status === 'running';
-        let prunedDeadRegistryEntries = false;
+        let prunedRegistryEntries = false;
         const restoringSideDialogs = new Map();
         const ensureSideDialogLoaded = async (sideDialogId, ancestry = new Set()) => {
             if (ancestry.has(sideDialogId.selfId)) {
@@ -3852,39 +3860,64 @@ class DiskFileDialogStore extends dialog_1.DialogStore {
         for (const entry of entries) {
             if (!entry.sessionSlug)
                 continue;
-            if (shouldPruneDead) {
-                const latest = await DialogPersistence.loadDialogLatest(entry.sideDialogId, status);
-                const executionMarker = latest?.executionMarker;
-                if (executionMarker && executionMarker.kind === 'dead') {
-                    prunedDeadRegistryEntries = true;
-                    mainDialog.unregisterSideDialog(entry.agentId, entry.sessionSlug);
-                    log_1.log.debug('Skip dead sideDialog while loading Type B registry', undefined, {
-                        rootId: mainDialog.id.rootId,
-                        sideDialogId: entry.sideDialogId.selfId,
-                        agentId: entry.agentId,
-                        sessionSlug: entry.sessionSlug,
-                    });
-                    continue;
+            try {
+                if (shouldPruneDead) {
+                    const latest = await DialogPersistence.loadDialogLatest(entry.sideDialogId, status);
+                    const executionMarker = latest?.executionMarker;
+                    if (executionMarker && executionMarker.kind === 'dead') {
+                        prunedRegistryEntries = true;
+                        mainDialog.unregisterSideDialog(entry.agentId, entry.sessionSlug);
+                        log_1.log.debug('Skip dead sideDialog while loading Type B registry', undefined, {
+                            rootId: mainDialog.id.rootId,
+                            sideDialogId: entry.sideDialogId.selfId,
+                            agentId: entry.agentId,
+                            sessionSlug: entry.sessionSlug,
+                        });
+                        continue;
+                    }
                 }
+                const sideDialog = await ensureSideDialogLoaded(entry.sideDialogId);
+                if (!sideDialog.sessionSlug) {
+                    throw new Error(`SideDialog registry invariant violation: missing sessionSlug on loaded sideDialog ` +
+                        `(rootId=${mainDialog.id.rootId}, selfId=${entry.sideDialogId.selfId}, expectedSessionSlug=${entry.sessionSlug})`);
+                }
+                if (sideDialog.sessionSlug !== entry.sessionSlug) {
+                    throw new Error(`SideDialog registry invariant violation: sessionSlug mismatch ` +
+                        `(rootId=${mainDialog.id.rootId}, selfId=${entry.sideDialogId.selfId}, ` +
+                        `expected=${entry.sessionSlug}, actual=${sideDialog.sessionSlug})`);
+                }
+                if (sideDialog.agentId !== entry.agentId) {
+                    throw new Error(`SideDialog registry invariant violation: agentId mismatch ` +
+                        `(rootId=${mainDialog.id.rootId}, selfId=${entry.sideDialogId.selfId}, ` +
+                        `expected=${entry.agentId}, actual=${sideDialog.agentId})`);
+                }
+                mainDialog.registerSideDialog(sideDialog);
             }
-            const sideDialog = await ensureSideDialogLoaded(entry.sideDialogId);
-            if (!sideDialog.sessionSlug) {
-                throw new Error(`SideDialog registry invariant violation: missing sessionSlug on loaded sideDialog ` +
-                    `(rootId=${mainDialog.id.rootId}, selfId=${entry.sideDialogId.selfId}, expectedSessionSlug=${entry.sessionSlug})`);
-            }
-            if (sideDialog.sessionSlug !== entry.sessionSlug) {
-                throw new Error(`SideDialog registry invariant violation: sessionSlug mismatch ` +
-                    `(rootId=${mainDialog.id.rootId}, selfId=${entry.sideDialogId.selfId}, ` +
-                    `expected=${entry.sessionSlug}, actual=${sideDialog.sessionSlug})`);
-            }
-            if (sideDialog.agentId !== entry.agentId) {
-                throw new Error(`SideDialog registry invariant violation: agentId mismatch ` +
-                    `(rootId=${mainDialog.id.rootId}, selfId=${entry.sideDialogId.selfId}, ` +
-                    `expected=${entry.agentId}, actual=${sideDialog.agentId})`);
+            catch (error) {
+                if ((0, persistence_errors_1.findDomindsPersistenceFileError)(error)) {
+                    throw error;
+                }
+                prunedRegistryEntries = true;
+                const loadedDialog = mainDialog.lookupDialog(entry.sideDialogId.selfId);
+                if (loadedDialog instanceof dialog_1.SideDialog &&
+                    loadedDialog.sessionSlug &&
+                    (loadedDialog.agentId !== entry.agentId || loadedDialog.sessionSlug !== entry.sessionSlug)) {
+                    mainDialog.unregisterSideDialog(loadedDialog.agentId, loadedDialog.sessionSlug);
+                }
+                mainDialog.unregisterDialog(entry.sideDialogId.selfId);
+                if (entry.sessionSlug) {
+                    mainDialog.unregisterSideDialog(entry.agentId, entry.sessionSlug);
+                }
+                log_1.log.error('Pruned invalid sideDialog registry entry while loading Type B registry', error, {
+                    rootId: mainDialog.id.rootId,
+                    sideDialogId: entry.sideDialogId.selfId,
+                    agentId: entry.agentId,
+                    sessionSlug: entry.sessionSlug,
+                    status,
+                });
             }
-            mainDialog.registerSideDialog(sideDialog);
         }
-        if (prunedDeadRegistryEntries) {
+        if (prunedRegistryEntries) {
             await mainDialog.saveSideDialogRegistry();
         }
     }
@@ -4792,6 +4825,47 @@ function sortNextStepTriggersForConsumption(triggers) {
         return left.triggerId.localeCompare(right.triggerId);
     });
 }
+function filterNextStepTriggersForGenerationStart(args) {
+    const orderedTriggers = sortNextStepTriggersForConsumption(args.triggers);
+    if (typeof args.msgId !== 'string' || args.msgId.trim() === '') {
+        return { acceptedTriggers: orderedTriggers, supersededTriggers: [] };
+    }
+    const promptTrigger = orderedTriggers.find((trigger) => trigger.kind === 'queued_prompt' &&
+        trigger.promptId === args.msgId &&
+        trigger.course === args.currentCourse);
+    if (promptTrigger === undefined) {
+        return { acceptedTriggers: orderedTriggers, supersededTriggers: [] };
+    }
+    const acceptedTriggers = [];
+    const supersededTriggers = [];
+    for (const trigger of orderedTriggers) {
+        const belongsToPromptCourse = (() => {
+            switch (trigger.kind) {
+                case 'queued_prompt':
+                case 'user_input':
+                case 'open_generation_recovery':
+                    return trigger.course === args.currentCourse;
+                case 'followup':
+                    return trigger.sourceGeneration.course === args.currentCourse;
+                case 'mainline_diligence':
+                case 'result_arrival':
+                case 'reply_delivery_recovery':
+                    return true;
+                default: {
+                    const _exhaustive = trigger;
+                    throw new Error(`next-step trigger filtering invariant violation: unsupported trigger kind for dialog=${args.dialogId.valueOf()}`);
+                }
+            }
+        })();
+        if (belongsToPromptCourse) {
+            acceptedTriggers.push(trigger);
+        }
+        else {
+            supersededTriggers.push(trigger);
+        }
+    }
+    return { acceptedTriggers, supersededTriggers };
+}
 function buildReplyDeliveryId(dialogId, replyCallId) {
     return `reply-delivery:${dialogId.rootId}:${dialogId.selfId}:${replyCallId}`;
 }
@@ -6425,66 +6499,6 @@ class DialogPersistence {
             throw new Error('unreachable after loadActiveCalleeDispatches persistence rethrow');
         }
     }
-    static isActiveCalleeDispatchRecord(value) {
-        if (!isRecord(value))
-            return false;
-        if (typeof value.calleeDialogId !== 'string')
-            return false;
-        if (value.calleeDialogId.trim() === '')
-            return false;
-        if (typeof value.createdAt !== 'string')
-            return false;
-        if (typeof value.batchId !== 'string')
-            return false;
-        if (value.batchId.trim() === '')
-            return false;
-        if (value.callName !== 'tellask' &&
-            value.callName !== 'tellaskSessionless' &&
-            value.callName !== 'freshBootsReasoning') {
-            return false;
-        }
-        switch (value.callName) {
-            case 'tellask':
-            case 'tellaskSessionless':
-                if (!Array.isArray(value.mentionList))
-                    return false;
-                if (!value.mentionList.every((item) => typeof item === 'string'))
-                    return false;
-                if (value.mentionList.length < 1)
-                    return false;
-                break;
-            case 'freshBootsReasoning':
-                if (value.mentionList !== undefined)
-                    return false;
-                break;
-        }
-        if (typeof value.tellaskContent !== 'string')
-            return false;
-        if (typeof value.targetAgentId !== 'string')
-            return false;
-        if (typeof value.callId !== 'string')
-            return false;
-        if (typeof value.callSiteCourse !== 'number')
-            return false;
-        if (!Number.isInteger(value.callSiteCourse))
-            return false;
-        if (value.callSiteCourse <= 0)
-            return false;
-        if (typeof value.callSiteGenseq !== 'number')
-            return false;
-        if (!Number.isInteger(value.callSiteGenseq))
-            return false;
-        if (value.callSiteGenseq <= 0)
-            return false;
-        if (value.callType !== 'A' && value.callType !== 'B' && value.callType !== 'C')
-            return false;
-        if ('sessionSlug' in value) {
-            const sessionSlug = value.sessionSlug;
-            if (sessionSlug !== undefined && typeof sessionSlug !== 'string')
-                return false;
-        }
-        return true;
-    }
     static activeCalleeDispatchCalleeDialogId(record) {
         const calleeDialogId = record.calleeDialogId;
         if (calleeDialogId.trim() === '') {
@@ -6617,10 +6631,16 @@ class DialogPersistence {
         if (!value.batches.every((batch) => this.isActiveCalleeBatch(batch)))
             return false;
         const seenBatchIds = new Set();
+        const seenCallIds = new Set();
         for (const batch of value.batches) {
             if (seenBatchIds.has(batch.batchId))
                 return false;
             seenBatchIds.add(batch.batchId);
+            for (const callee of batch.callees) {
+                if (seenCallIds.has(callee.callId))
+                    return false;
+                seenCallIds.add(callee.callId);
+            }
         }
         return true;
     }
@@ -6679,7 +6699,13 @@ class DialogPersistence {
     }
     static buildActiveCalleesFileFromDispatches(dispatches) {
         const batchesById = new Map();
+        const callIds = new Set();
         for (const dispatch of dispatches) {
+            if (callIds.has(dispatch.callId)) {
+                throw new Error(`active-callees dispatch invariant violation: duplicate callId ` +
+                    `(calleeDialogId=${dispatch.calleeDialogId}, batchId=${dispatch.batchId}, callId=${dispatch.callId})`);
+            }
+            callIds.add(dispatch.callId);
             const existingBatch = batchesById.get(dispatch.batchId);
             const callee = this.buildActiveCalleeRecordFromDispatch(dispatch);
             if (!existingBatch) {
@@ -6700,9 +6726,6 @@ class DialogPersistence {
                 throw new Error(`active-callees dispatch invariant violation: batch call-site mismatch ` +
                     `(calleeDialogId=${dispatch.calleeDialogId}, batchId=${dispatch.batchId})`);
             }
-            if (existingBatch.callees.some((entry) => entry.callId === dispatch.callId)) {
-                continue;
-            }
             batchesById.set(dispatch.batchId, {
                 ...existingBatch,
                 callees: [...existingBatch.callees, callee],
@@ -6734,15 +6757,30 @@ class DialogPersistence {
         }
         return next;
     }
-    static async removeActiveCalleeDispatch(mainDialogId, calleeDialogId, rootAnchor, status = 'running') {
-        await this.mutateActiveCallees(mainDialogId, (previous) => ({
-            batches: previous.batches
-                .map((batch) => ({
-                ...batch,
-                callees: batch.callees.filter((callee) => callee.calleeDialogId !== calleeDialogId),
-            }))
-                .filter((batch) => batch.callees.length > 0),
-        }), status);
+    static async removeActiveCalleeDispatch(mainDialogId, calleeDialogId, callId, rootAnchor, status = 'running') {
+        const normalizedCallId = callId.trim();
+        if (normalizedCallId === '') {
+            throw new Error(`active-callees remove invariant violation: callId is required ` +
+                `(rootId=${mainDialogId.rootId}, selfId=${mainDialogId.selfId}, calleeDialogId=${calleeDialogId})`);
+        }
+        await this.mutateActiveCallees(mainDialogId, (previous) => {
+            const removedCount = previous.batches.reduce((count, batch) => {
+                return (count +
+                    batch.callees.filter((callee) => callee.calleeDialogId === calleeDialogId && callee.callId === normalizedCallId).length);
+            }, 0);
+            if (removedCount !== 1) {
+                throw new Error(`active-callees remove invariant violation: expected exactly one dispatch ` +
+                    `(rootId=${mainDialogId.rootId}, selfId=${mainDialogId.selfId}, calleeDialogId=${calleeDialogId}, callId=${normalizedCallId}, removedCount=${removedCount})`);
+            }
+            const batches = [];
+            for (const batch of previous.batches) {
+                const callees = batch.callees.filter((callee) => !(callee.calleeDialogId === calleeDialogId && callee.callId === normalizedCallId));
+                if (callees.length > 0) {
+                    batches.push({ ...batch, callees });
+                }
+            }
+            return { batches };
+        }, status);
         if (rootAnchor) {
             await this.appendActiveCalleesReconciledRecord(mainDialogId, await this.loadActiveCalleeDispatches(mainDialogId, status), rootAnchorWriteTarget(rootAnchor), status);
         }
@@ -6774,6 +6812,11 @@ class DialogPersistence {
                     filePath,
                 });
             }
+            this.assertNoDuplicateSessionedTellaskPendingRecords(this.projectActiveCalleeDispatches(parsed), {
+                rootId: dialogId.rootId,
+                selfId: dialogId.selfId,
+                status,
+            });
             return parsed;
         }
         catch (error) {
@@ -7225,6 +7268,13 @@ class DialogPersistence {
     }
     static async upsertActiveCalleeFromPendingRecord(dialogId, record, status = 'running') {
         await this.mutateActiveCallees(dialogId, (previous) => {
+            const duplicateCallId = previous.batches.some((batch) => batch.batchId === record.batchId
+                ? false
+                : batch.callees.some((entry) => entry.callId === record.callId));
+            if (duplicateCallId) {
+                throw new Error(`active-callees duplicate call invariant violation ` +
+                    `(rootId=${dialogId.rootId}, selfId=${dialogId.selfId}, batchId=${record.batchId}, callId=${record.callId})`);
+            }
             const existingBatch = previous.batches.find((batch) => batch.batchId === record.batchId);
             const callee = this.buildActiveCalleeRecordFromDispatch(record);
             if (existingBatch === undefined) {
@@ -7255,12 +7305,8 @@ class DialogPersistence {
             }
             const existingCallee = existingBatch.callees.find((entry) => entry.callId === record.callId);
             if (existingCallee !== undefined) {
-                if (existingCallee.calleeDialogId !== callee.calleeDialogId ||
-                    existingCallee.callName !== record.callName) {
-                    throw new Error(`active-callees duplicate call invariant violation ` +
-                        `(rootId=${dialogId.rootId}, selfId=${dialogId.selfId}, batchId=${record.batchId}, callId=${record.callId})`);
-                }
-                return previous;
+                throw new Error(`active-callees duplicate call invariant violation ` +
+                    `(rootId=${dialogId.rootId}, selfId=${dialogId.selfId}, batchId=${record.batchId}, callId=${record.callId})`);
             }
             return {
                 batches: previous.batches.map((batch) => batch.batchId === record.batchId
@@ -7323,27 +7369,18 @@ class DialogPersistence {
         }
         return outcome;
     }
-    static async removeActiveCallee(dialogId, args, status = 'running') {
+    static async removeActiveCalleeBatch(dialogId, batchId, status = 'running') {
         await this.mutateActiveCallees(dialogId, (previous) => {
-            const batches = [];
-            for (const batch of previous.batches) {
-                if (batch.batchId !== args.batchId) {
-                    batches.push(batch);
-                    continue;
-                }
-                const callees = batch.callees.filter((callee) => callee.callId !== args.callId);
-                if (callees.length > 0) {
-                    batches.push({ ...batch, callees });
-                }
+            const removedCount = previous.batches.filter((batch) => batch.batchId === batchId).length;
+            if (removedCount !== 1) {
+                throw new Error(`active-callees remove batch invariant violation: expected exactly one batch ` +
+                    `(rootId=${dialogId.rootId}, selfId=${dialogId.selfId}, batchId=${batchId}, removedCount=${removedCount})`);
             }
-            return { batches };
+            return {
+                batches: previous.batches.filter((batch) => batch.batchId !== batchId),
+            };
         }, status);
     }
-    static async removeActiveCalleeBatch(dialogId, batchId, status = 'running') {
-        await this.mutateActiveCallees(dialogId, (previous) => ({
-            batches: previous.batches.filter((batch) => batch.batchId !== batchId),
-        }), status);
-    }
     /**
      * Get the path for storing sideDialog responses (supports both main dialog and sideDialog tellaskers).
      * For Type C sideDialogs created inside another sideDialog, responses are stored at the parent's level.
@@ -8561,7 +8598,7 @@ class DialogPersistence {
                             }),
                             callStack: captureInvariantWarningStack(),
                         };
-                        emitInvariantWarning('clearPendingRuntimePrompt invariant warning: generating dialog still projected as pending_runtime_prompt; healing displayState to proceeding', warningDetails);
+                        log_1.log.debug('clearPendingRuntimePrompt invariant warning: generating dialog still projected as pending_runtime_prompt; healing displayState to proceeding', undefined, warningDetails);
                         return { kind: 'proceeding' };
                     })()
                     : { kind: 'idle_waiting_user' }