dominds 1.17.7 → 1.18.1

package/dist/dialog-fork.js

@@ -115,6 +115,7 @@ function isPersistedMessageRecord(record) {
         case 'web_search_call_record':
         case 'native_tool_call_record':
         case 'tool_result_image_ingest_record':
+        case 'user_image_ingest_record':
         case 'quest_for_sup_record':
         case 'tellask_reply_resolution_record':
         case 'tellask_call_anchor_record':
@@ -153,7 +154,7 @@ function normalizeDraftUserText(events, targetGenseq) {
         return null;
     return texts.join('\n\n');
 }
-function rewriteFuncResultContentItems(items, newRootId) {
+function rewriteContentItemsForFork(items, newRootId) {
     if (!items)
         return undefined;
     return items.map((item) => {
@@ -187,21 +188,26 @@ function rewriteRecordForFork(record, newRootId) {
         // not part of baseline state reconciliation and must not make forking fail.
         case 'web_search_call_record':
         case 'native_tool_call_record':
-        case 'human_text_record':
         case 'quest_for_sup_record':
-        case 'tellask_result_record':
         case 'tellask_reply_resolution_record':
         case 'tellask_call_anchor_record':
-        case 'tellask_carryover_record':
         case 'gen_start_record':
         case 'gen_finish_record':
             return record;
+        case 'human_text_record':
+        case 'tellask_result_record':
+        case 'tellask_carryover_record':
+            return {
+                ...record,
+                contentItems: rewriteContentItemsForFork(record.contentItems, newRootId),
+            };
         case 'func_result_record':
             return {
                 ...record,
-                contentItems: rewriteFuncResultContentItems(record.contentItems, newRootId),
+                contentItems: rewriteContentItemsForFork(record.contentItems, newRootId),
             };
         case 'tool_result_image_ingest_record':
+        case 'user_image_ingest_record':
             return {
                 ...record,
                 artifact: {

package/dist/dialog-instance-registry.js

@@ -38,24 +38,7 @@ async function resolvePendingCourseStartPromptForRestore(args) {
         }
         return { pendingCourseStartPrompt: undefined };
     }
-    return {
-        pendingCourseStartPrompt: {
-            content: pending.content,
-            msgId: pending.msgId,
-            grammar: 'markdown',
-            origin: 'runtime',
-            ...(pending.userLanguageCode === undefined
-                ? {}
-                : { userLanguageCode: pending.userLanguageCode }),
-            ...(pending.tellaskReplyDirective === undefined
-                ? {}
-                : { tellaskReplyDirective: pending.tellaskReplyDirective }),
-            ...(pending.skipTaskdoc === undefined ? {} : { skipTaskdoc: pending.skipTaskdoc }),
-            ...(pending.subdialogReplyTarget === undefined
-                ? {}
-                : { subdialogReplyTarget: pending.subdialogReplyTarget }),
-        },
-    };
+    return { pendingCourseStartPrompt: pending };
 }
 async function getOrRestoreRootDialog(rootId, status) {
     const existing = dialog_global_registry_1.globalDialogRegistry.get(rootId);

package/dist/dialog.d.ts

@@ -14,36 +14,23 @@
  */
 import type { ContextHealthSnapshot } from '@longrun-ai/kernel/types/context-health';
 import type { DialogEvent, NativeToolCallPayload, ReminderContent, WebSearchCallAction, WebSearchCallSource } from '@longrun-ai/kernel/types/dialog';
-import type { DialogPrompt, DialogRunControlSpec, DialogSubdialogReplyTarget, DriveIntent } from '@longrun-ai/kernel/types/drive-intent';
+import type { DialogQueuedDeferredQ4HAnswerState, DialogQueuedPromptState, DialogQueuedUserGenerationBoundaryState, DialogRunControlSpec, DialogRuntimePrompt, DialogSubdialogReplyTarget, DialogUserPrompt, DriveIntent } from '@longrun-ai/kernel/types/drive-intent';
 import type { LanguageCode } from '@longrun-ai/kernel/types/language';
 import type { CalleeCourseNumber, CalleeGenerationSeqNumber, CallingCourseNumber, CallingGenerationSeqNumber, DialogMetadataFile, HumanQuestion, ProviderData, ReasoningPayload, TellaskCallRecordName, TellaskReplyDirective } from '@longrun-ai/kernel/types/storage';
 import { ChatMessage, FuncResultMsg, TellaskCarryoverMsg, TellaskResultMsg } from './llm/client';
-import type { ToolResultImageIngest } from './llm/gen';
+import type { ToolResultImageIngest, UserImageIngest } from './llm/gen';
 import type { JsonValue } from './tool';
 import { Reminder, ReminderOptions, ReminderOwner } from './tool';
 type NewCourseHookResult = {
     kind: 'continue';
-    prompt: DialogPrompt;
+    prompt: DialogRuntimePrompt;
 } | {
     kind: 'reject';
     errorText: string;
 };
-type UpNextPromptState = {
-    kind: 'user_generation_boundary' | 'deferred_q4h_answer' | 'registered_assignment_update' | 'new_course_start';
-    prompt: string;
-    msgId: string;
-    grammar?: 'markdown';
-    userLanguageCode?: LanguageCode;
-    origin: 'user' | 'diligence_push' | 'runtime';
-    q4hAnswerCallId?: string;
-    tellaskReplyDirective?: TellaskReplyDirective;
-    skipTaskdoc?: boolean;
-    subdialogReplyTarget?: DialogSubdialogReplyTarget;
-    runControl?: DialogRunControlSpec;
-};
 type NewCourseHook = (args: {
     dialog: Dialog;
-    prompt: DialogPrompt;
+    prompt: DialogRuntimePrompt;
     runControl?: DialogRunControlSpec;
 }) => Promise<NewCourseHookResult>;
 export type DialogSuspensionStatusOptions = Readonly<{
@@ -106,7 +93,7 @@ export interface DialogInitParams {
         createdAt?: string;
         updatedAt?: string;
         contextHealth?: ContextHealthSnapshot;
-        pendingCourseStartPrompt?: DialogPrompt;
+        pendingCourseStartPrompt?: DialogRuntimePrompt;
     };
 }
 export type VisibleReminderTarget = Readonly<{
@@ -153,7 +140,7 @@ export declare abstract class Dialog {
     protected _lastUserLanguageCode: LanguageCode;
     protected _lastContextHealth?: ContextHealthSnapshot;
     protected _lastContextHealthGenseq?: number;
-    protected _upNextQueue: UpNextPromptState[];
+    protected _upNextQueue: DialogQueuedPromptState[];
     protected _driveIntents: DriveIntent[];
     protected _activeRunControlSpec?: DialogRunControlSpec;
     protected _newCourseHook?: NewCourseHook;
@@ -322,7 +309,6 @@ export declare abstract class Dialog {
     setSuspensionState(state: 'active' | 'suspended' | 'resumed'): void;
     get createdAt(): string;
     get updatedAt(): string;
-    private buildUpNextPromptState;
     private replaceQueuedPromptState;
     private setNewCourseStartPrompt;
     private mergePromptQ4HAnswerCallId;
@@ -330,31 +316,32 @@ export declare abstract class Dialog {
     private peekLatestUpNext;
     queueUserPromptAtGenerationBoundary(options: {
         prompt: string;
+        contentItems?: DialogQueuedUserGenerationBoundaryState['contentItems'];
         msgId: string;
         grammar: 'markdown';
         userLanguageCode?: LanguageCode;
         q4hAnswerCallId?: string;
-    }): UpNextPromptState;
+    }): DialogQueuedPromptState;
     queueDeferredQ4HAnswerPrompt(options: {
         prompt: string;
+        contentItems?: DialogQueuedDeferredQ4HAnswerState['contentItems'];
         msgId: string;
         grammar: 'markdown';
         userLanguageCode?: LanguageCode;
         q4hAnswerCallId?: string;
-    }): UpNextPromptState;
+    }): DialogQueuedPromptState;
     queueRegisteredAssignmentUpdatePrompt(options: {
         prompt: string;
         msgId: string;
         grammar: 'markdown';
         userLanguageCode?: LanguageCode;
-        q4hAnswerCallId?: string;
-        tellaskReplyDirective?: TellaskReplyDirective;
+        tellaskReplyDirective: TellaskReplyDirective;
         skipTaskdoc?: boolean;
-        subdialogReplyTarget?: DialogSubdialogReplyTarget;
-    }): UpNextPromptState;
+        subdialogReplyTarget: DialogSubdialogReplyTarget;
+    }): DialogQueuedPromptState;
     hasUpNext(): boolean;
-    peekUpNext(): UpNextPromptState | undefined;
-    takeUpNext(): UpNextPromptState | undefined;
+    peekUpNext(): DialogQueuedPromptState | undefined;
+    takeUpNext(): DialogQueuedPromptState | undefined;
     setActiveRunControlSpec(spec?: DialogRunControlSpec): void;
     getActiveRunControlSpec(): DialogRunControlSpec | undefined;
     setNewCourseHook(hook?: NewCourseHook): void;
@@ -388,6 +375,7 @@ export declare abstract class Dialog {
         originCourse?: CallingCourseNumber;
         calling_genseq?: CallingGenerationSeqNumber;
         carryoverContent?: string;
+        contentItems?: DialogUserPrompt['contentItems'];
         sessionSlug?: string;
         calleeCourse?: CalleeCourseNumber;
         calleeGenseq?: CalleeGenerationSeqNumber;
@@ -414,6 +402,7 @@ export declare abstract class Dialog {
     }): Promise<void>;
     nativeToolCall(payload: NativeToolCallPayload): Promise<void>;
     toolResultImageIngest(payload: ToolResultImageIngest): Promise<void>;
+    userImageIngest(payload: UserImageIngest): Promise<void>;
     callingStart(payload: {
         callName: 'tellaskBack' | 'tellask' | 'tellaskSessionless' | 'askHuman' | 'freshBootsReasoning';
         callId: string;
@@ -422,7 +411,7 @@ export declare abstract class Dialog {
         tellaskContent: string;
     }): Promise<void>;
     updateQuestions4Human(questions: HumanQuestion[]): Promise<void>;
-    persistUserMessage(content: string, msgId: string, grammar: 'markdown', origin: 'user' | 'diligence_push' | 'runtime' | undefined, userLanguageCode?: LanguageCode, q4hAnswerCallId?: string, tellaskReplyDirective?: TellaskReplyDirective): Promise<void>;
+    persistUserMessage(content: string, msgId: string, grammar: 'markdown', origin: 'user' | 'diligence_push' | 'runtime' | undefined, userLanguageCode?: LanguageCode, q4hAnswerCallId?: string, tellaskReplyDirective?: TellaskReplyDirective, contentItems?: DialogUserPrompt['contentItems']): Promise<void>;
     receiveHumanReply(args: {
         content: string;
         userLanguageCode?: LanguageCode;
@@ -633,6 +622,7 @@ export declare abstract class DialogStore {
     }): Promise<void>;
     nativeToolCall(_dialog: Dialog, _payload: NativeToolCallPayload): Promise<void>;
     toolResultImageIngest(_dialog: Dialog, _payload: ToolResultImageIngest): Promise<void>;
+    userImageIngest(_dialog: Dialog, _payload: UserImageIngest): Promise<void>;
     /**
      * Load current course number from persisted metadata
      * This method should be implemented by subclasses to read from storage
@@ -650,7 +640,7 @@ export declare abstract class DialogStore {
     /**
      * Persist a user message to storage
      */
-    persistUserMessage(_dialog: Dialog, _content: string, _msgId: string, _grammar: 'markdown', _origin: 'user' | 'diligence_push' | 'runtime' | undefined, _userLanguageCode?: LanguageCode, _q4hAnswerCallId?: string, _tellaskReplyDirective?: TellaskReplyDirective): Promise<void>;
+    persistUserMessage(_dialog: Dialog, _content: string, _msgId: string, _grammar: 'markdown', _origin: 'user' | 'diligence_push' | 'runtime' | undefined, _userLanguageCode?: LanguageCode, _q4hAnswerCallId?: string, _tellaskReplyDirective?: TellaskReplyDirective, _contentItems?: DialogUserPrompt['contentItems']): Promise<void>;
     appendTellaskReplyResolution(_dialog: Dialog, _payload: {
         callId: string;
         replyCallName: 'replyTellask' | 'replyTellaskSessionless' | 'replyTellaskBack';
@@ -684,7 +674,7 @@ export declare abstract class DialogStore {
     /**
      * Start a new course in storage
      */
-    startNewCourse(_dialog: Dialog, _newCoursePrompt: DialogPrompt): Promise<void>;
+    startNewCourse(_dialog: Dialog, _newCoursePrompt: DialogRuntimePrompt): Promise<void>;
     /**
      * Handle stream error
      */

package/dist/dialog.js

@@ -632,21 +632,6 @@ class Dialog {
     get updatedAt() {
         return this._updatedAt;
     }
-    buildUpNextPromptState(prompt, kind, runControl) {
-        return {
-            kind,
-            prompt: prompt.content,
-            msgId: prompt.msgId,
-            grammar: prompt.grammar,
-            userLanguageCode: prompt.userLanguageCode,
-            origin: prompt.origin,
-            q4hAnswerCallId: prompt.q4hAnswerCallId,
-            tellaskReplyDirective: prompt.tellaskReplyDirective,
-            skipTaskdoc: prompt.skipTaskdoc,
-            subdialogReplyTarget: prompt.subdialogReplyTarget,
-            runControl,
-        };
-    }
     replaceQueuedPromptState(existingMsgId, nextPrompt) {
         const queueIndex = this._upNextQueue.findIndex((prompt) => prompt.msgId === existingMsgId);
         if (queueIndex < 0) {
@@ -657,19 +642,68 @@ class Dialog {
             const intent = this._driveIntents[index];
             if (intent.kind !== 'prompt' || intent.prompt.msgId !== existingMsgId)
                 continue;
+            const promptCommon = {
+                content: nextPrompt.prompt,
+                ...(nextPrompt.contentItems === undefined ? {} : { contentItems: nextPrompt.contentItems }),
+                msgId: nextPrompt.msgId,
+                grammar: nextPrompt.grammar ?? 'markdown',
+                userLanguageCode: nextPrompt.userLanguageCode ?? this._lastUserLanguageCode,
+            };
             this._driveIntents[index] = {
                 ...intent,
-                prompt: {
-                    ...intent.prompt,
-                    content: nextPrompt.prompt,
-                    msgId: nextPrompt.msgId,
-                    grammar: nextPrompt.grammar ?? 'markdown',
-                    userLanguageCode: nextPrompt.userLanguageCode,
-                    q4hAnswerCallId: nextPrompt.q4hAnswerCallId,
-                    tellaskReplyDirective: nextPrompt.tellaskReplyDirective,
-                    skipTaskdoc: nextPrompt.skipTaskdoc,
-                    subdialogReplyTarget: nextPrompt.subdialogReplyTarget,
-                },
+                prompt: (() => {
+                    switch (nextPrompt.kind) {
+                        case 'user_generation_boundary':
+                        case 'deferred_q4h_answer': {
+                            const prompt = {
+                                ...promptCommon,
+                                origin: 'user',
+                                ...(nextPrompt.q4hAnswerCallId === undefined
+                                    ? {}
+                                    : { q4hAnswerCallId: nextPrompt.q4hAnswerCallId }),
+                            };
+                            return prompt;
+                        }
+                        case 'registered_assignment_update':
+                        case 'new_course_runtime_subdialog': {
+                            const prompt = {
+                                ...promptCommon,
+                                origin: 'runtime',
+                                ...(nextPrompt.skipTaskdoc === undefined
+                                    ? {}
+                                    : { skipTaskdoc: nextPrompt.skipTaskdoc }),
+                                tellaskReplyDirective: nextPrompt.tellaskReplyDirective,
+                                subdialogReplyTarget: nextPrompt.subdialogReplyTarget,
+                            };
+                            return prompt;
+                        }
+                        case 'new_course_runtime_reply': {
+                            const prompt = {
+                                ...promptCommon,
+                                origin: 'runtime',
+                                ...(nextPrompt.skipTaskdoc === undefined
+                                    ? {}
+                                    : { skipTaskdoc: nextPrompt.skipTaskdoc }),
+                                tellaskReplyDirective: nextPrompt.tellaskReplyDirective,
+                            };
+                            return prompt;
+                        }
+                        case 'new_course_runtime_guide': {
+                            const prompt = {
+                                ...promptCommon,
+                                origin: 'runtime',
+                                ...(nextPrompt.skipTaskdoc === undefined
+                                    ? {}
+                                    : { skipTaskdoc: nextPrompt.skipTaskdoc }),
+                            };
+                            return prompt;
+                        }
+                        default: {
+                            const _exhaustive = nextPrompt;
+                            throw new Error(`UpNext prompt replacement invariant violation: unsupported queued prompt`);
+                        }
+                    }
+                })(),
                 runControl: nextPrompt.runControl,
             };
             return nextPrompt;
@@ -690,14 +724,69 @@ class Dialog {
         if (!trimmed) {
             throw new Error('Prompt is required to start a new course');
         }
-        const normalized = {
-            ...prepared,
+        const runtimeCommon = {
             content: trimmed,
             msgId: prepared.msgId.trim() || (0, id_1.generateShortId)(),
             grammar: 'markdown',
             userLanguageCode: prepared.userLanguageCode ?? this._lastUserLanguageCode,
+            origin: 'runtime',
+            ...(prepared.skipTaskdoc === undefined ? {} : { skipTaskdoc: prepared.skipTaskdoc }),
         };
-        this._upNextQueue = [this.buildUpNextPromptState(normalized, 'new_course_start')];
+        const normalized = prepared.subdialogReplyTarget !== undefined
+            ? (() => {
+                const prompt = {
+                    ...runtimeCommon,
+                    tellaskReplyDirective: prepared.tellaskReplyDirective,
+                    subdialogReplyTarget: prepared.subdialogReplyTarget,
+                };
+                return prompt;
+            })()
+            : prepared.tellaskReplyDirective !== undefined
+                ? (() => {
+                    const prompt = {
+                        ...runtimeCommon,
+                        tellaskReplyDirective: prepared.tellaskReplyDirective,
+                    };
+                    return prompt;
+                })()
+                : (() => {
+                    const prompt = runtimeCommon;
+                    return prompt;
+                })();
+        this._upNextQueue = [
+            normalized.subdialogReplyTarget !== undefined
+                ? {
+                    kind: 'new_course_runtime_subdialog',
+                    prompt: normalized.content,
+                    msgId: normalized.msgId,
+                    grammar: normalized.grammar,
+                    userLanguageCode: normalized.userLanguageCode,
+                    origin: 'runtime',
+                    tellaskReplyDirective: normalized.tellaskReplyDirective,
+                    skipTaskdoc: normalized.skipTaskdoc,
+                    subdialogReplyTarget: normalized.subdialogReplyTarget,
+                }
+                : normalized.tellaskReplyDirective !== undefined
+                    ? {
+                        kind: 'new_course_runtime_reply',
+                        prompt: normalized.content,
+                        msgId: normalized.msgId,
+                        grammar: normalized.grammar,
+                        userLanguageCode: normalized.userLanguageCode,
+                        origin: 'runtime',
+                        tellaskReplyDirective: normalized.tellaskReplyDirective,
+                        skipTaskdoc: normalized.skipTaskdoc,
+                    }
+                    : {
+                        kind: 'new_course_runtime_guide',
+                        prompt: normalized.content,
+                        msgId: normalized.msgId,
+                        grammar: normalized.grammar,
+                        userLanguageCode: normalized.userLanguageCode,
+                        origin: 'runtime',
+                        skipTaskdoc: normalized.skipTaskdoc,
+                    },
+        ];
         return normalized;
     }
     mergePromptQ4HAnswerCallId(existing, incoming) {
@@ -717,19 +806,62 @@ class Dialog {
     }
     enqueueQueuedPromptState(state) {
         this._upNextQueue.push(state);
+        const promptCommon = {
+            content: state.prompt,
+            ...(state.contentItems === undefined ? {} : { contentItems: state.contentItems }),
+            msgId: state.msgId,
+            grammar: state.grammar ?? 'markdown',
+            userLanguageCode: state.userLanguageCode ?? this._lastUserLanguageCode,
+        };
         this._driveIntents.push({
             kind: 'prompt',
-            prompt: {
-                content: state.prompt,
-                msgId: state.msgId,
-                grammar: state.grammar ?? 'markdown',
-                userLanguageCode: state.userLanguageCode ?? this._lastUserLanguageCode,
-                origin: state.origin,
-                q4hAnswerCallId: state.q4hAnswerCallId,
-                tellaskReplyDirective: state.tellaskReplyDirective,
-                skipTaskdoc: state.skipTaskdoc,
-                subdialogReplyTarget: state.subdialogReplyTarget,
-            },
+            prompt: (() => {
+                switch (state.kind) {
+                    case 'user_generation_boundary':
+                    case 'deferred_q4h_answer': {
+                        const prompt = {
+                            ...promptCommon,
+                            origin: 'user',
+                            ...(state.q4hAnswerCallId === undefined
+                                ? {}
+                                : { q4hAnswerCallId: state.q4hAnswerCallId }),
+                        };
+                        return prompt;
+                    }
+                    case 'registered_assignment_update':
+                    case 'new_course_runtime_subdialog': {
+                        const prompt = {
+                            ...promptCommon,
+                            origin: 'runtime',
+                            ...(state.skipTaskdoc === undefined ? {} : { skipTaskdoc: state.skipTaskdoc }),
+                            tellaskReplyDirective: state.tellaskReplyDirective,
+                            subdialogReplyTarget: state.subdialogReplyTarget,
+                        };
+                        return prompt;
+                    }
+                    case 'new_course_runtime_reply': {
+                        const prompt = {
+                            ...promptCommon,
+                            origin: 'runtime',
+                            ...(state.skipTaskdoc === undefined ? {} : { skipTaskdoc: state.skipTaskdoc }),
+                            tellaskReplyDirective: state.tellaskReplyDirective,
+                        };
+                        return prompt;
+                    }
+                    case 'new_course_runtime_guide': {
+                        const prompt = {
+                            ...promptCommon,
+                            origin: 'runtime',
+                            ...(state.skipTaskdoc === undefined ? {} : { skipTaskdoc: state.skipTaskdoc }),
+                        };
+                        return prompt;
+                    }
+                    default: {
+                        const _exhaustive = state;
+                        throw new Error(`UpNext enqueue invariant violation: unsupported queued prompt`);
+                    }
+                }
+            })(),
             runControl: state.runControl,
         });
         this._updatedAt = (0, time_1.formatUnifiedTimestamp)(new Date());
@@ -746,7 +878,7 @@ class Dialog {
         if (!trimmed) {
             throw new Error('Prompt is required to queue generation-boundary user prompt');
         }
-        if (existing?.kind !== 'user_generation_boundary' || existing.origin !== 'user') {
+        if (existing?.kind !== 'user_generation_boundary') {
             const created = {
                 kind: 'user_generation_boundary',
                 prompt: trimmed,
@@ -754,6 +886,7 @@ class Dialog {
                 grammar: options.grammar,
                 userLanguageCode: options.userLanguageCode ?? this._lastUserLanguageCode,
                 origin: 'user',
+                contentItems: options.contentItems,
                 q4hAnswerCallId: options.q4hAnswerCallId,
             };
             this.enqueueQueuedPromptState(created);
@@ -762,6 +895,9 @@ class Dialog {
         const merged = {
             ...existing,
             prompt: `${existing.prompt}\n\n---\n\n${trimmed}`,
+            contentItems: existing.contentItems || options.contentItems
+                ? [...(existing.contentItems ?? []), ...(options.contentItems ?? [])]
+                : undefined,
             grammar: options.grammar,
             userLanguageCode: options.userLanguageCode ?? existing.userLanguageCode ?? this._lastUserLanguageCode,
             q4hAnswerCallId: this.mergePromptQ4HAnswerCallId(existing.q4hAnswerCallId, options.q4hAnswerCallId),
@@ -780,6 +916,7 @@ class Dialog {
         const created = {
             kind: 'deferred_q4h_answer',
             prompt: trimmed,
+            contentItems: options.contentItems,
             msgId: options.msgId,
             grammar: options.grammar,
             userLanguageCode: options.userLanguageCode ?? this._lastUserLanguageCode,
@@ -804,7 +941,6 @@ class Dialog {
                 grammar: options.grammar,
                 userLanguageCode: options.userLanguageCode ?? this._lastUserLanguageCode,
                 origin: 'runtime',
-                q4hAnswerCallId: options.q4hAnswerCallId,
                 tellaskReplyDirective: options.tellaskReplyDirective,
                 skipTaskdoc: options.skipTaskdoc,
                 subdialogReplyTarget: options.subdialogReplyTarget,
@@ -819,10 +955,9 @@ class Dialog {
             msgId: options.msgId,
             grammar: options.grammar,
             userLanguageCode: options.userLanguageCode ?? existing.userLanguageCode ?? this._lastUserLanguageCode,
-            q4hAnswerCallId: this.mergePromptQ4HAnswerCallId(existing.q4hAnswerCallId, options.q4hAnswerCallId),
-            tellaskReplyDirective: options.tellaskReplyDirective ?? existing.tellaskReplyDirective,
+            tellaskReplyDirective: options.tellaskReplyDirective,
             skipTaskdoc: options.skipTaskdoc ?? existing.skipTaskdoc,
-            subdialogReplyTarget: options.subdialogReplyTarget ?? existing.subdialogReplyTarget,
+            subdialogReplyTarget: options.subdialogReplyTarget,
             runControl: undefined,
         };
         this.replaceQueuedPromptState(existing.msgId, merged);
@@ -881,14 +1016,22 @@ class Dialog {
                 collectiveTargets: this.assignmentFromSup.collectiveTargets ?? [this.agentId],
             })}\n---\n${trimmedPrompt}`
             : trimmedPrompt;
-        const basePrompt = {
-            content: combinedPrompt,
-            msgId: (0, id_1.generateShortId)(),
-            grammar: 'markdown',
-            userLanguageCode: this._lastUserLanguageCode,
-            origin: 'runtime',
-            ...(this instanceof SubDialog ? buildSubdialogAssignmentPromptMeta(this) : {}),
-        };
+        const basePrompt = this instanceof SubDialog
+            ? {
+                content: combinedPrompt,
+                msgId: (0, id_1.generateShortId)(),
+                grammar: 'markdown',
+                userLanguageCode: this._lastUserLanguageCode,
+                origin: 'runtime',
+                ...buildSubdialogAssignmentPromptMeta(this),
+            }
+            : {
+                content: combinedPrompt,
+                msgId: (0, id_1.generateShortId)(),
+                grammar: 'markdown',
+                userLanguageCode: this._lastUserLanguageCode,
+                origin: 'runtime',
+            };
         const runControlSpec = options?.runControl ?? this._activeRunControlSpec;
         let nextPrompt = basePrompt;
         if (this._newCourseHook && options?.skipRunControlHook !== true) {
@@ -1034,6 +1177,7 @@ class Dialog {
                 role: 'user',
                 genseq: this.activeGenSeqOrUndefined ?? 1,
                 content: options.carryoverContent,
+                ...(options.contentItems === undefined ? {} : { contentItems: options.contentItems }),
                 originCourse: carryoverOriginCourse,
                 carryoverCourse: currentCourse,
                 responderId,
@@ -1067,6 +1211,7 @@ class Dialog {
                 callName,
                 status,
                 content: options.response,
+                ...(options.contentItems === undefined ? {} : { contentItems: options.contentItems }),
                 ...(options.originCourse !== undefined ? { originCourse: options.originCourse } : {}),
                 ...(options.calling_genseq !== undefined
                     ? { calling_genseq: options.calling_genseq }
@@ -1091,6 +1236,7 @@ class Dialog {
                     callName,
                     status,
                     content: options.response,
+                    ...(options.contentItems === undefined ? {} : { contentItems: options.contentItems }),
                     ...(options.originCourse !== undefined ? { originCourse: options.originCourse } : {}),
                     ...(options.calling_genseq !== undefined
                         ? { calling_genseq: options.calling_genseq }
@@ -1113,6 +1259,7 @@ class Dialog {
                     callName,
                     status,
                     content: options.response,
+                    ...(options.contentItems === undefined ? {} : { contentItems: options.contentItems }),
                     ...(options.originCourse !== undefined ? { originCourse: options.originCourse } : {}),
                     ...(options.calling_genseq !== undefined
                         ? { calling_genseq: options.calling_genseq }
@@ -1213,6 +1360,9 @@ class Dialog {
     async toolResultImageIngest(payload) {
         await this.dlgStore.toolResultImageIngest(this, payload);
     }
+    async userImageIngest(payload) {
+        await this.dlgStore.userImageIngest(this, payload);
+    }
     // Tellask-special call lifecycle events
     async callingStart(payload) {
         // Store callId for inline call-result correlation
@@ -1222,8 +1372,8 @@ class Dialog {
     async updateQuestions4Human(questions) {
         return await this.dlgStore.updateQuestions4Human(this, questions);
     }
-    async persistUserMessage(content, msgId, grammar, origin, userLanguageCode, q4hAnswerCallId, tellaskReplyDirective) {
-        return await this.dlgStore.persistUserMessage(this, content, msgId, grammar, origin, userLanguageCode, q4hAnswerCallId, tellaskReplyDirective);
+    async persistUserMessage(content, msgId, grammar, origin, userLanguageCode, q4hAnswerCallId, tellaskReplyDirective, contentItems) {
+        return await this.dlgStore.persistUserMessage(this, content, msgId, grammar, origin, userLanguageCode, q4hAnswerCallId, tellaskReplyDirective, contentItems);
     }
     async receiveHumanReply(args) {
         if (args.content.trim() === '') {
@@ -1645,6 +1795,7 @@ class DialogStore {
     async webSearchCall(_dialog, _payload) { }
     async nativeToolCall(_dialog, _payload) { }
     async toolResultImageIngest(_dialog, _payload) { }
+    async userImageIngest(_dialog, _payload) { }
     /**
      * Load current course number from persisted metadata
      * This method should be implemented by subclasses to read from storage
@@ -1668,7 +1819,7 @@ class DialogStore {
     /**
      * Persist a user message to storage
      */
-    async persistUserMessage(_dialog, _content, _msgId, _grammar, _origin, _userLanguageCode, _q4hAnswerCallId, _tellaskReplyDirective) { }
+    async persistUserMessage(_dialog, _content, _msgId, _grammar, _origin, _userLanguageCode, _q4hAnswerCallId, _tellaskReplyDirective, _contentItems) { }
     async appendTellaskReplyResolution(_dialog, _payload) { }
     /**
      * Persist an assistant message to storage

package/dist/docs/dialog-system.md

@@ -247,7 +247,8 @@ flowchart TD
 
 - If a sideline dialog has completed all assigned goals and can deliver the final result, it MUST reply directly with the response body; do not use `tellaskBack` to send final delivery.
 - Runtime treats that direct reply as the completion delivery to the tellasker dialog and injects the work-language marker automatically (`【Completed】` in English work language, `【最终完成】` in Chinese work language).
-- If any goal is incomplete, the dialog is blocked, or critical context is missing, it MUST issue `tellaskBack({ tellaskContent: "..." })` to request clarification or next-step confirmation before proceeding.
+- If the work is unfinished, do not default to `tellaskBack`; first use team SOP / role ownership to judge whether a responsible owner is already clear, and if yes for execution work, directly use `tellask` / `tellaskSessionless` for that owner.
+- Use `tellaskBack({ tellaskContent: "..." })` only when the upstream requester must clarify the request, decide a tradeoff, confirm acceptance criteria, provide missing input, or current SOP cannot determine ownership.
 - **FBR exception**: FBR sideline dialogs forbid all tellask calls (including `tellaskBack` / `tellask` / `tellaskSessionless` / `askHuman`); they must list missing context and return.
 
 **Inter-dialog transfer and markers (normative)**:
@@ -268,7 +269,7 @@ flowchart TD
 
 **Protocol clarification**:
 
-- Ask-back must be emitted via `tellaskBack({ tellaskContent: "..." })`; do not post plain-text intermediate status updates while unfinished.
+- When you truly need to ask upstream back, emit it via `tellaskBack({ tellaskContent: "..." })`; first judge whether team SOP already identifies another responsible owner. Do not post plain-text intermediate status updates while unfinished.
 - A direct plain-text reply is correct when the sideline is already complete and is delivering the final result upstream.
 
 Note: no extra "Status: ..." line is required; the first-line marker is the stage reminder.