dominds 1.24.2 → 1.24.4

package/dist/llm/kernel-driver/drive.js

@@ -138,6 +138,40 @@ function buildInterruptedFuncResult(args) {
         genseq: args.callGenseq,
     };
 }
+function sameDialogBusinessContinuation(left, right) {
+    if (left.kind !== right.kind)
+        return false;
+    switch (left.kind) {
+        case 'none':
+            return true;
+        case 'inter_dialog_reply': {
+            if (right.kind !== 'inter_dialog_reply')
+                return false;
+            return (sameTellaskReplyDirective(left.tellaskReplyDirective, right.tellaskReplyDirective) &&
+                sameDialogCalleeReplyTarget(left.calleeDialogReplyTarget, right.calleeDialogReplyTarget));
+        }
+        default: {
+            const _exhaustive = left;
+            throw new Error(`Unhandled business continuation kind: ${String(_exhaustive)}`);
+        }
+    }
+}
+function sameTellaskReplyDirective(left, right) {
+    return (left.expectedReplyCallName === right.expectedReplyCallName &&
+        left.targetDialogId === right.targetDialogId &&
+        left.targetCallId === right.targetCallId &&
+        left.tellaskContent === right.tellaskContent);
+}
+function sameDialogCalleeReplyTarget(left, right) {
+    if (left === undefined || right === undefined) {
+        return left === right;
+    }
+    return (left.callerDialogId === right.callerDialogId &&
+        left.callType === right.callType &&
+        left.callId === right.callId &&
+        left.callSiteCourse === right.callSiteCourse &&
+        left.callSiteGenseq === right.callSiteGenseq);
+}
 function isFbrSideDialog(dlg) {
     return dlg instanceof dialog_1.SideDialog && dlg.assignmentFromAsker.callName === 'freshBootsReasoning';
 }
@@ -1171,6 +1205,7 @@ async function upsertImmediateFollowupTrigger(args) {
             genseq: (0, storage_1.toCallSiteGenseqNo)(genseq),
         },
         reasons,
+        continuation: args.continuation,
     });
 }
 function shouldImmediatelyFollowUpSuccessfulToolResult(tool) {
@@ -1449,6 +1484,7 @@ async function executeFunctionRound(args) {
             immediateFollowupCallIds: [],
             immediateTellaskOutputCallIds: [],
             shouldStopAfterReplyTool: false,
+            shouldStopAfterPendingTellaskWait: false,
             pairedMessages: [],
             tellaskToolOutputs: [],
         };
@@ -1558,6 +1594,7 @@ async function executeFunctionRound(args) {
         immediateFollowupCallIds,
         immediateTellaskOutputCallIds: tellaskRound.immediateTellaskOutputCallIds,
         shouldStopAfterReplyTool: tellaskRound.shouldStopAfterReplyTool,
+        shouldStopAfterPendingTellaskWait: tellaskRound.shouldStopAfterPendingTellaskWait,
         pairedMessages,
         tellaskToolOutputs: [...tellaskRound.toolOutputs],
     };
@@ -1751,20 +1788,20 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
     const suppressDiligencePushForDrive = driveOptions?.suppressDiligencePush === true && dlg.disableDiligencePush;
     const abortSignal = (0, dialog_display_state_1.getActiveRunSignal)(dlg.id) ?? (0, dialog_display_state_1.createActiveRun)(dlg.id);
     let finalDisplayState;
-    let criticalUserInterjectionRuntimeGuide = driveOptions?.criticalUserInterjectionRuntimeGuide;
     let lastAssistantSayingContent = null;
     let lastAssistantSayingGenseq = null;
     let lastAssistantThinkingContent = null;
     let lastAssistantThinkingGenseq = null;
     let lastFunctionCallGenseq = null;
     let lastAssistantReplyTarget;
+    let lastBusinessContinuation = { kind: 'none' };
     let fbrConclusion;
     let pubRemindersVer = dlg.remindersVer;
     let pendingPrompt = humanPrompt;
     let resolvingImmediateToolResultForUserPrompt = false;
     let resolvingImmediateToolResultUserPromptMsgId;
-    let criticalRemediationAppliedUserPromptMsgId = driveOptions?.criticalUserInterjectionRuntimeGuide !== undefined &&
-        humanPrompt?.origin === 'user'
+    let criticalRemediationAppliedUserPromptMsgId = humanPrompt?.origin === 'user' &&
+        (0, driver_messages_1.isAgentFacingCriticalUserInterjectionRemediationGuideContent)(humanPrompt.content)
         ? humanPrompt.msgId
         : undefined;
     let retryStoppedRecoveryPrompt;
@@ -1899,8 +1936,10 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                         snapshot,
                         hadUserPromptThisGen: currentGenerationBelongsToUserPrompt,
                         hadUserPromptInImmediateToolChain: currentGenerationBelongsToUserToolChain,
-                        userPromptCriticalRemediationAlreadyApplied: criticalRemediationAppliedUserPromptMsgId !== undefined &&
-                            criticalRemediationAppliedUserPromptMsgId === currentUserPromptMsgId,
+                        userPromptCriticalRemediationAlreadyApplied: (criticalRemediationAppliedUserPromptMsgId !== undefined &&
+                            criticalRemediationAppliedUserPromptMsgId === currentUserPromptMsgId) ||
+                            (currentPendingPrompt?.origin === 'user' &&
+                                (0, driver_messages_1.isAgentFacingCriticalUserInterjectionRemediationGuideContent)(currentPendingPrompt.content)),
                         canInjectPromptThisGen: !hasQueuedUpNext,
                         cautionRemediationCadenceGenerations,
                         criticalCountdownRemaining,
@@ -1923,13 +1962,13 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                             skipTaskdocForThisDrive = false;
                         }
                         else if (healthDecision.reason === 'critical_user_prompt_remediation') {
-                            const language = (0, work_language_1.getWorkLanguage)();
-                            const dialogScope = dlg instanceof dialog_1.SideDialog ? 'sideDialog' : 'mainDialog';
-                            criticalUserInterjectionRuntimeGuide =
-                                (0, driver_messages_1.formatAgentFacingCriticalUserInterjectionRemediationGuide)(language, {
-                                    dialogScope,
-                                    promptsRemainingAfterThis: (0, context_health_1.consumeCriticalCountdown)(dlg.id.key()),
+                            if (currentPendingPrompt === undefined ||
+                                !(0, driver_messages_1.isAgentFacingCriticalUserInterjectionRemediationGuideContent)(currentPendingPrompt.content)) {
+                                log_1.log.warn('kernel-driver observed unwrapped critical user prompt; critical user interjection wrapping must happen at ingress', undefined, {
+                                    dialogId: dlg.id.valueOf(),
+                                    msgId: currentUserPromptMsgId ?? null,
                                 });
+                            }
                             criticalRemediationAppliedUserPromptMsgId = currentUserPromptMsgId;
                         }
                         else if (!hasQueuedUpNext) {
@@ -1962,6 +2001,16 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                 let llmGenModelForGen = model;
                 const currentPrompt = pendingPrompt;
                 const currentReplyTarget = currentPrompt?.calleeDialogReplyTarget;
+                let currentBusinessContinuation = driveOptions?.businessContinuation ?? { kind: 'none' };
+                if (currentPrompt?.tellaskReplyDirective !== undefined) {
+                    currentBusinessContinuation = {
+                        kind: 'inter_dialog_reply',
+                        tellaskReplyDirective: currentPrompt.tellaskReplyDirective,
+                        ...(currentPrompt.calleeDialogReplyTarget === undefined
+                            ? {}
+                            : { calleeDialogReplyTarget: currentPrompt.calleeDialogReplyTarget }),
+                    };
+                }
                 const currentFbrState = await loadDialogFbrState(dlg);
                 let currentRuntimeGuideMsg;
                 const currentPromptFromFbrState = currentPrompt !== undefined &&
@@ -1983,12 +2032,20 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                         break;
                     }
                 }
-                await dlg.notifyGeneratingStart(currentPrompt?.msgId);
-                try {
-                    if (criticalUserInterjectionRuntimeGuide !== undefined) {
-                        await persistAndEmitRuntimeGuide(dlg, criticalUserInterjectionRuntimeGuide);
-                        criticalUserInterjectionRuntimeGuide = undefined;
+                const acceptedTriggers = await dlg.notifyGeneratingStart(currentPrompt?.msgId);
+                for (const trigger of acceptedTriggers) {
+                    if (trigger.kind === 'followup' && trigger.continuation !== undefined) {
+                        if (currentBusinessContinuation.kind !== 'none' &&
+                            !sameDialogBusinessContinuation(currentBusinessContinuation, trigger.continuation)) {
+                            throw new Error(`Business continuation invariant violation: conflicting accepted followup continuations ` +
+                                `(dialog=${dlg.id.valueOf()}, course=${String(dlg.activeGenCourseOrUndefined ?? dlg.currentCourse)}, ` +
+                                `genseq=${String(dlg.activeGenSeq)}, triggerId=${trigger.triggerId})`);
+                        }
+                        currentBusinessContinuation = trigger.continuation;
                     }
+                }
+                lastBusinessContinuation = currentBusinessContinuation;
+                try {
                     if (currentPrompt) {
                         if (currentPrompt.skipTaskdoc === true) {
                             skipTaskdocForThisDrive = true;
@@ -2680,6 +2737,7 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                                 lastAssistantThinkingGenseq,
                                 lastFunctionCallGenseq,
                                 lastAssistantReplyTarget,
+                                lastBusinessContinuation,
                             };
                         }
                         const nextFbrState = (0, fbr_1.advanceFbrState)(persistedFbrState);
@@ -2832,6 +2890,14 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                         routed.hasImmediateTellaskOutputs ||
                         invalidFuncCallCount > 0;
                     if (!shouldStartImmediatePostToolGeneration) {
+                        if (routed.shouldStopAfterPendingTellaskWait) {
+                            log_1.log.debug('kernel-driver stop round after pending tellask wait boundary', undefined, {
+                                dialogId: dlg.id.valueOf(),
+                                rootId: dlg.id.rootId,
+                                selfId: dlg.id.selfId,
+                            });
+                            break;
+                        }
                         const healthFirst = await maybeContinueWithHealthPromptBeforeDiligence({
                             dlg,
                             providerCfg,
@@ -2861,6 +2927,7 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
                             routed,
                             invalidFuncCallCount,
                             streamedFuncCalls,
+                            continuation: currentBusinessContinuation,
                         });
                         resolvingImmediateToolResultForUserPrompt =
                             currentGenerationBelongsToUserPrompt ||
@@ -3013,6 +3080,7 @@ async function driveDialogStreamCore(dlg, callbacks, humanPrompt, driveOptions)
         lastAssistantThinkingGenseq,
         lastFunctionCallGenseq,
         lastAssistantReplyTarget,
+        lastBusinessContinuation,
         fbrConclusion,
     };
 }