@memberjunction/ng-conversations 6.2.0-edge.2 → 6.2.0-edge.4

package/dist/lib/components/message/message-input.component.js

@@ -12,8 +12,10 @@ import { ConversationUtility, agentFailureDisposition, agentFailureMessage } fro
 import { MentionAutocompleteService } from '../../services/mention-autocomplete.service';
 import { PlanModePreference } from '../../utils/plan-mode-preference';
 import { MJNotificationService } from '@memberjunction/ng-notifications';
+import { ConversationCallStartOptions } from '../realtime/capture/realtime-capture-channel';
 import { BuildRealtimeConfigOverridesJson, FilterRealtimeCoAgents, LoadCoAgentPairings, PairingsAllowTarget } from '../../services/realtime-pairing';
 import { UUIDsEqual } from '@memberjunction/global';
+import { InjectFrameZone } from '../../util/frame-zone';
 import * as i0 from "@angular/core";
 import * as i1 from "../../services/dialog.service";
 import * as i2 from "../../services/toast.service";
@@ -49,6 +51,8 @@ function MessageInputComponent_ng_template_5_Template(rf, ctx) { if (rf & 1) {
     const ctx_r0 = i0.ɵɵnextContext();
     i0.ɵɵproperty("Provider", ctx_r0.ProviderToUse)("CurrentUser", ctx_r0.currentUser)("Agents", ctx_r0.voicePickerAgents)("DefaultAgentId", ctx_r0.voicePickerDefaultAgentId)("CoAgents", ctx_r0.voicePickerCoAgents)("DefaultCoAgentId", ctx_r0.voicePickerDefaultCoAgentId);
 } }
+/** Streamed-delta render cadence where no animation frame will come (hidden tab, no rAF). */
+const STREAMED_FRAME_FALLBACK_MS = 50;
 export class MessageInputComponent extends BaseAngularComponent {
     dialogService;
     toastService;
@@ -102,6 +106,17 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Blocks sending. Distinct from {@link Disabled}, which means the composer is busy.
      */
     ReadOnly = false;
+    // ── The send slot as a stop control (pass-through to the composer; the chat area decides) ──
+    /** What the send slot is doing; see `SendSlotMode` in `@memberjunction/ng-composer`. */
+    SendSlotMode = 'send';
+    /** How many things a stop would stop; above 1 the slot reads "Stop all". */
+    StopCount = 0;
+    /** Tooltip and accessible name of the slot in `stop` mode. */
+    StopLabel = 'Stop';
+    /** Status line shown bottom-left inside the composer while non-null. */
+    StatusText = null;
+    /** Elapsed time after the status text, kept out of the live region and dropped on narrow screens. */
+    StatusElapsed = null;
     Placeholder = 'Type a message... (Ctrl+Enter to send)';
     /** @deprecated Use {@link Placeholder}. */
     set placeholder(value) {
@@ -498,6 +513,16 @@ export class MessageInputComponent extends BaseAngularComponent {
      * reading past the floor). Null (the default) reads the whole conversation.
      */
     AgentHistoryFrom = null;
+    /**
+     * The fork new messages from this composer go to; null (the default) is Main. The agent turn of a
+     * message, and the agent-history reads it makes, use the message's branch.
+     */
+    TargetBranchID = null;
+    /**
+     * When set, called once at the start of each send to get the branch of the new user row; undefined
+     * stops the send and nothing is written. A host uses it to create a draft fork on its first send.
+     */
+    ResolveTargetBranch = null;
     /**
      * Runs agent turns on the host's server instead of MJ's own path. The chat area still picks
      * the agent and fires {@link BeforeAgentTurn}; it then calls the handler once per turn, before
@@ -525,6 +550,8 @@ export class MessageInputComponent extends BaseAngularComponent {
      * `MJ: AI Prompt Runs` row, even when the answer comes too late to be used.
      */
     EnableDecisionRouting = false;
+    /** The send slot was clicked in `stop` mode; the chat area stops the run(s). */
+    StopClicked = new EventEmitter();
     MessageSent = new EventEmitter();
     /**
      * @deprecated Use {@link MessageSent}.
@@ -534,6 +561,14 @@ export class MessageInputComponent extends BaseAngularComponent {
      * initialise in order, and the other way round this captures undefined.
      */
     messageSent = this.MessageSent;
+    /**
+     * A streamed final-response delta was applied to an in-progress message: `Message` holds the
+     * full reply so far. Informational, so no Before/After pair; coalesced to at most one emission
+     * per animation frame; silent once the message has settled, because the completion path owns
+     * the final render. Hosts refresh the bubble in place on this, while {@link MessageSent} keeps
+     * announcing new and status-changed messages.
+     */
+    MessageStreamed = new EventEmitter();
     AgentResponse = new EventEmitter();
     /**
      * @deprecated Use {@link AgentResponse}.
@@ -850,6 +885,14 @@ export class MessageInputComponent extends BaseAngularComponent {
             setTimeout(() => this.InputBox?.focus(), 50);
         }
     }
+    /**
+     * Puts the text of a send that did not go out back into the composer. Text the composer holds
+     * already stays first, and the returned text follows it on a new line.
+     */
+    restoreUnsentText(text) {
+        const current = this.GetSerializedDraft();
+        this.SetDraft(current ? `${current}\n${text}` : text);
+    }
     IsSending = false;
     /** @deprecated Use {@link IsSending}. */
     get isSending() {
@@ -906,6 +949,7 @@ export class MessageInputComponent extends BaseAngularComponent {
     }
     // Track completion timestamps to prevent race conditions with late progress updates
     completionTimestamps = new Map();
+    ngZone = InjectFrameZone();
     // Track registered streaming callbacks for cleanup
     registeredCallbacks = new Map();
     // After a post-ACK disconnect, keep observing ConversationDetail.Status until
@@ -1277,11 +1321,11 @@ export class MessageInputComponent extends BaseAngularComponent {
         this.VoicePickerDefaultCoAgentId = await this.loadPersistedCoAgentId();
         this.ShowRealtimeAgentPicker = true;
     }
-    /** User confirmed an agent (+ optional co-agent / voice model) in the voice picker — start the call. */
+    /** User confirmed an agent (+ optional co-agent / voice model / voice and its avatar) in the voice picker — start the call. */
     async OnRealtimeAgentPicked(pick) {
         this.ShowRealtimeAgentPicker = false;
         this.persistCoAgentChoice(pick.CoAgentId);
-        await this.startRealtimeWithAgent(pick.Agent.ID, pick.Agent.Name || this.resolveRealtimeAgentName(), pick.PreferredModelId, pick.CoAgentId, BuildRealtimeConfigOverridesJson(pick.PreferredModelId, pick.PreferredVoice), pick.RecordingConsent);
+        await this.startRealtimeWithAgent(pick.Agent.ID, pick.Agent.Name || this.resolveRealtimeAgentName(), pick.PreferredModelId, pick.CoAgentId, BuildRealtimeConfigOverridesJson(pick.PreferredModelId, pick.PreferredVoice, pick.PreferredAvatarId), pick.RecordingConsent);
     }
     /** @deprecated Use {@link OnRealtimeAgentPicked}. */
     async onRealtimeAgentPicked(pick) {
@@ -1352,7 +1396,7 @@ export class MessageInputComponent extends BaseAngularComponent {
      * uses exactly that model or fails with a clear reason (no silent fallback) — and is
      * mirrored into `configOverridesJson` (`{"realtime":{"modelPreference":…}}`, the
      * pinned override envelope). An explicit co-agent choice (picker pick or persisted
-     * preference) rides along as `coAgentId`.
+     * preference) rides along as `coAgentId`. The session runs on {@link TargetBranchID}.
      *
      * Interactive-channel tools (e.g. the live whiteboard's `Whiteboard_*` set) are NOT
      * passed here — the session service resolves the active channel plugins from the
@@ -1364,7 +1408,9 @@ export class MessageInputComponent extends BaseAngularComponent {
             // App awareness: the app the session runs in + the live app-context snapshot (where the
             // user is, what they see, capability manifest) — drives the server-side app cascade + the
             // mint-time prompt injection, and seeds the ClientContextChannel's streaming.
-            this.ApplicationId, this.AppContext);
+            this.ApplicationId, this.AppContext, 
+            // The channels this UI brings to its calls (the camera and screen share), on the fork it posts to.
+            { ...ConversationCallStartOptions(), ConversationBranchID: this.TargetBranchID });
         }
         catch (error) {
             console.error('Failed to start voice session:', error);
@@ -1414,11 +1460,51 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Create a progress callback for a specific message ID.
      * This callback will be invoked by the streaming service when progress updates arrive.
      */
+    /**
+     * Emits {@link MessageStreamed} for a coalesced frame of streamed deltas, unless the message
+     * settled in the meantime: then the completion path has already reconciled the bubble and a
+     * late frame has nothing to add. Settled is read off the captured entity's status and off the
+     * callback registration, which markMessageComplete drops: a frame can sleep through completion
+     * in a hidden tab, and the registration outlasts every other trace of it.
+     */
+    emitStreamedUpdate(messageId, message) {
+        if (message.Status !== 'In-Progress' || !this.registeredCallbacks.has(messageId)) {
+            return;
+        }
+        if (this.MessageStreamed.observed) {
+            this.MessageStreamed.emit(message);
+        }
+        else {
+            // TRANSITIONAL: a host that still binds only the old output keeps streaming on MessageSent at
+            // the coalesced cadence. Remove once direct hosts bind MessageStreamed. Re-enters the zone
+            // because MessageSent handlers replace template-bound state.
+            this.ngZone.run(() => this.MessageSent.emit(message));
+        }
+    }
+    /**
+     * Runs `callback` on the next animation frame, outside Angular: the in-place render checks its
+     * own child view, so a zone-triggered application tick per frame would be pure waste, and the
+     * paths that do touch template-bound state re-enter the zone themselves. A hidden tab never
+     * paints a frame, so there (and without requestAnimationFrame) a short timer stands in; the
+     * browser throttles it in the background, the right cadence for a bubble nobody is looking at.
+     */
+    scheduleFrame(callback) {
+        this.ngZone.runOutsideAngular(() => {
+            if (typeof requestAnimationFrame === 'function' && !document.hidden) {
+                requestAnimationFrame(callback);
+            }
+            else {
+                setTimeout(callback, STREAMED_FRAME_FALLBACK_MS);
+            }
+        });
+    }
     createMessageProgressCallback(messageId) {
         // Resolve the message once and reuse it for the callback's lifetime: streamed
         // final-response updates arrive per content delta, and re-awaiting the cache on
         // every delta both wastes work and (on a cold cache) races concurrent loads.
         let resolvedMessage = null;
+        // One pending frame per message: deltas arriving inside a frame collapse into one emission.
+        let streamedFramePending = false;
         return async (progress) => {
             try {
                 // Get message from cache (single source of truth)
@@ -1444,9 +1530,15 @@ export class MessageInputComponent extends BaseAngularComponent {
                 // bubble with the server-saved final message, so no append/merge is needed here.
                 if (progress.streaming) {
                     message.Message = progress.streaming.content;
-                    this.MessageSent.emit(message);
-                    // Keep the tasks dropdown on a stable status line rather than the growing reply text.
-                    this.activeTasks.updateStatusByConversationDetailId(message.ID, 'Responding…');
+                    if (!streamedFramePending) {
+                        streamedFramePending = true;
+                        this.scheduleFrame(() => {
+                            streamedFramePending = false;
+                            this.emitStreamedUpdate(messageId, message);
+                        });
+                        // Keep the tasks dropdown on a stable status line rather than the growing reply text.
+                        this.activeTasks.updateStatusByConversationDetailId(message.ID, 'Responding…');
+                    }
                     return;
                 }
                 // Default: plain message (used by RunAIAgentResolver and TaskOrchestrator without step info)
@@ -1538,7 +1630,12 @@ export class MessageInputComponent extends BaseAngularComponent {
         // Store attachments locally since we'll clear them after send
         const attachmentsToSave = [...this.pendingAttachments];
         try {
-            const messageDetail = await this.createMessageDetailFromText(text?.trim() || '');
+            const branchId = await this.resolveSendBranch(undefined);
+            if (branchId === undefined) {
+                this.restoreUnsentText(text);
+                return;
+            }
+            const messageDetail = await this.createMessageDetailFromText(text?.trim() || '', branchId);
             const saved = await messageDetail.Save();
             if (saved) {
                 // Save attachments if any were pending
@@ -1614,7 +1711,11 @@ export class MessageInputComponent extends BaseAngularComponent {
             return;
         this.IsSending = true;
         try {
-            const messageDetail = await this.createMessageDetail();
+            const branchId = await this.resolveSendBranch(undefined);
+            if (branchId === undefined) {
+                return;
+            }
+            const messageDetail = await this.createMessageDetail(branchId);
             const saved = await messageDetail.Save();
             if (saved) {
                 await this.handleSuccessfulSend(messageDetail);
@@ -1644,18 +1745,28 @@ export class MessageInputComponent extends BaseAngularComponent {
      * tick — the `attachmentsChanged` event chain hasn't propagated yet, so
      * `this.pendingAttachments` may not contain the attachment. Pass it in
      * explicitly and we merge + dedupe (by `id`) before saving.
+     *
+     * `options.IsResend` sends an edited copy of an earlier message. The composer's draft is left
+     * alone: only `extraAttachments` are saved with the message, and the pending attachments and
+     * editor text are not cleared. The send never counts as the conversation's first message, so
+     * it does not name the conversation or claim a pending Plan Mode choice.
+     *
+     * `options.TargetBranchID` writes the message to that fork (null is Main) instead of the
+     * composer's own target.
      */
-    async SendMessageWithText(text, extraAttachments) {
+    async SendMessageWithText(text, extraAttachments, options) {
         if (this.ReadOnly) {
             return false;
         }
+        const isResend = options?.IsResend === true;
+        const draftAttachments = isResend ? [] : this.pendingAttachments;
         const merged = (() => {
             if (!extraAttachments || extraAttachments.length === 0) {
-                return [...this.pendingAttachments];
+                return [...draftAttachments];
             }
             const seen = new Set();
             const out = [];
-            for (const a of [...this.pendingAttachments, ...extraAttachments]) {
+            for (const a of [...draftAttachments, ...extraAttachments]) {
                 if (seen.has(a.id))
                     continue;
                 seen.add(a.id);
@@ -1674,11 +1785,16 @@ export class MessageInputComponent extends BaseAngularComponent {
         this.IsSending = true;
         const attachmentsToSave = merged;
         try {
+            const branchId = await this.resolveSendBranch(options?.TargetBranchID);
+            if (branchId === undefined) {
+                return false;
+            }
             const detail = await this.dataCache.createConversationDetail(this.CurrentUser);
             detail.ConversationID = this.ConversationId;
             detail.Message = text?.trim() || '';
             detail.Role = 'User';
             detail.UserID = this.CurrentUser.ID; // Set the user who sent the message
+            detail.BranchID = branchId;
             if (this.ParentMessageId) {
                 detail.ParentID = this.ParentMessageId;
             }
@@ -1719,16 +1835,18 @@ export class MessageInputComponent extends BaseAngularComponent {
                         return false;
                     }
                 }
-                // Clear pending attachments after successful send
-                this.pendingAttachments = [];
-                // Also clear the mention editor's content + its own attachments list.
-                // The user-initiated send path (MessageInputBoxComponent.onSendClick)
-                // calls mentionEditor.clear() — we bypass that path here, so the chips
-                // would otherwise stay on screen after the message goes out.
-                this.InputBox?.mentionEditor?.clear();
+                if (!isResend) {
+                    // Clear pending attachments after successful send
+                    this.pendingAttachments = [];
+                    // Also clear the mention editor's content + its own attachments list.
+                    // The user-initiated send path (MessageInputBoxComponent.onSendClick)
+                    // calls mentionEditor.clear() — we bypass that path here, so the chips
+                    // would otherwise stay on screen after the message goes out.
+                    this.InputBox?.mentionEditor?.clear();
+                }
                 this.MessageSent.emit(detail);
                 const mentionResult = this.parseMentionsFromMessage(detail.Message);
-                const isFirstMessage = this.ConversationHistory.length === 0;
+                const isFirstMessage = !isResend && this.ConversationHistory.length === 0;
                 await this.routeMessage(detail, mentionResult, isFirstMessage);
                 return true;
             }
@@ -1750,28 +1868,86 @@ export class MessageInputComponent extends BaseAngularComponent {
         return this.SendMessageWithText(text, extraAttachments);
     }
     /**
-     * Creates and configures a new conversation detail message
+     * Routes an existing user message through the agent path again, so the agent writes a new reply
+     * on `targetBranchId` (default: the message's own branch). No message is saved, and the
+     * composer's draft and pending attachments are left alone. The rerun never counts as the
+     * conversation's first message. `IsSending` stays true until the agent turn ends, so no other
+     * send starts meanwhile.
+     *
+     * @returns false, with no agent turn, when the composer is read-only or already sending.
+     */
+    async RerunAgentForMessage(userMessage, targetBranchId) {
+        if (this.ReadOnly || this.IsSending) {
+            return false;
+        }
+        this.IsSending = true;
+        try {
+            const mentionResult = this.parseMentionsFromMessage(userMessage.Message || '');
+            await this.routeMessage(userMessage, mentionResult, false, targetBranchId !== undefined ? targetBranchId : (userMessage.BranchID ?? null));
+            return true;
+        }
+        finally {
+            this.IsSending = false;
+        }
+    }
+    /**
+     * The branch of a new user row: `explicit` when given, else the {@link ResolveTargetBranch} answer
+     * when set, else {@link TargetBranchID}. Undefined when the resolver declined or failed.
+     */
+    async resolveSendBranch(explicit) {
+        if (explicit !== undefined) {
+            return explicit;
+        }
+        const resolve = this.ResolveTargetBranch;
+        if (!resolve) {
+            return this.TargetBranchID ?? null;
+        }
+        try {
+            return await resolve();
+        }
+        catch (error) {
+            console.error('Could not resolve the fork of the message:', error);
+            return undefined;
+        }
+    }
+    /**
+     * A new AI row of an agent turn: in `conversationId`, on the turn's branch `branchId` (null is
+     * Main), visible. The caller sets Message, ParentID, Status and AgentID, then saves it.
+     */
+    async createTurnRow(conversationId, branchId) {
+        const row = await this.dataCache.createConversationDetail(this.CurrentUser);
+        row.ConversationID = conversationId;
+        row.BranchID = branchId;
+        row.Role = 'AI';
+        row.HiddenToUser = false;
+        return row;
+    }
+    /**
+     * Creates and configures a new conversation detail message on `branchId` (null is Main)
      */
-    async createMessageDetail() {
+    async createMessageDetail(branchId) {
         const detail = await this.dataCache.createConversationDetail(this.CurrentUser);
         detail.ConversationID = this.ConversationId;
         detail.Message = this.MessageText.trim();
         detail.Role = 'User';
         detail.UserID = this.CurrentUser.ID; // Set the user who sent the message
+        detail.BranchID = branchId;
         if (this.ParentMessageId) {
             detail.ParentID = this.ParentMessageId;
         }
         return detail;
     }
     /**
-     * Creates and configures a new conversation detail message from provided text
+     * Creates and configures a new conversation detail message from provided text, on `branchId`
+     * (null is Main)
      */
-    async createMessageDetailFromText(text) {
+    async createMessageDetailFromText(text, branchId) {
         const detail = await this.dataCache.createConversationDetail(this.CurrentUser);
         detail.ConversationID = this.ConversationId;
         detail.Message = text;
         detail.Role = 'User';
         detail.UserID = this.CurrentUser.ID; // Set the user who sent the message
+        detail.BranchID = branchId;
         if (this.ParentMessageId) {
             detail.ParentID = this.ParentMessageId;
         }
@@ -1805,8 +1981,13 @@ export class MessageInputComponent extends BaseAngularComponent {
      * last agent's place ({@link decideAgentRouting}).
      * {@link BeforeAgentTurn} is then fired once, before any reply row exists, and the turn runs on
      * MJ's path or through the host's {@link AgentTurnHandler}.
+     *
+     * `turnBranchId` overrides the turn's branch (a rerun into a new fork); else the turn runs on
+     * the message's branch. The branch is fixed here and passed down the turn, so every row and
+     * agent-history read of this turn uses it, whatever the composer targets later.
      */
-    async routeMessage(messageDetail, mentionResult, isFirstMessage) {
+    async routeMessage(messageDetail, mentionResult, isFirstMessage, turnBranchId) {
+        const branchId = turnBranchId !== undefined ? turnBranchId : (messageDetail.BranchID ?? null);
         // A Plan Mode choice made on the new-conversation composer (no conversation yet) lives in a
         // pending bucket — the FIRST routed message claims it onto the real conversation so the
         // toggle carries across the empty-state → chat-area transition without bleeding into other
@@ -1832,7 +2013,7 @@ export class MessageInputComponent extends BaseAngularComponent {
         // another conversation, and the chat area then rebinds its history and pinned agent, so a
         // read after the routing decision could see another conversation's state (or none).
         const candidates = this.agentTurnCandidates(this.agentMentionIds(mentionResult));
-        const routing = await this.decideAgentRouting(messageDetail, candidates);
+        const routing = await this.decideAgentRouting(messageDetail, candidates, branchId);
         const target = this.resolveAgentTurnTarget(candidates, routing);
         if (!target) {
             await this.finishWithoutAgentTurn(messageDetail, 'NoAgent');
@@ -1843,7 +2024,7 @@ export class MessageInputComponent extends BaseAngularComponent {
             await this.finishWithoutAgentTurn(messageDetail, 'Declined');
             return;
         }
-        await this.runAgentTurn(messageDetail, mentionResult, turn, routing);
+        await this.runAgentTurn(messageDetail, mentionResult, turn, branchId, routing);
     }
     /**
      * Asks the routing decision for this message when {@link EnableDecisionRouting} is on and the
@@ -1851,8 +2032,9 @@ export class MessageInputComponent extends BaseAngularComponent {
      * when anything fails: the message then keeps today's routing.
      *
      * @param candidates The turn's candidates, read before any await (see {@link routeMessage}).
+     * @param branchId The turn's branch (null is Main); the artifact versions are read on its path.
      */
-    async decideAgentRouting(message, candidates) {
+    async decideAgentRouting(message, candidates, branchId) {
         const continuityAgentId = candidates.ContinuityAgentId;
         const qualifies = ShouldRunRoutingDecision({
             Enabled: this.EnableDecisionRouting,
@@ -1870,7 +2052,7 @@ export class MessageInputComponent extends BaseAngularComponent {
             if (!CanAskRoutingDecision(input)) {
                 return null;
             }
-            input.ArtifactVersions = await this.loadRoutingArtifactVersions(message.ConversationID, input.Participants);
+            input.ArtifactVersions = await this.loadRoutingArtifactVersions(message.ConversationID, branchId, input.Participants);
             const outcome = await RunRoutingDecision(input, params => this.agentService.RunDecision(params));
             LogStatusEx({
                 message: `Decision routing: ${outcome.Verdict}, ${outcome.Reason} (prompt run ${outcome.PromptRunID ?? 'none'})`,
@@ -1911,11 +2093,11 @@ export class MessageInputComponent extends BaseAngularComponent {
             AllowedAgentIDs: this.AllowedAgentIDs
         };
     }
-    /** Every participant's artifact versions in this conversation, for the artifact question. */
-    async loadRoutingArtifactVersions(conversationId, participants) {
+    /** Every participant's artifact versions on the path of `branchId` in this conversation, for the artifact question. */
+    async loadRoutingArtifactVersions(conversationId, branchId, participants) {
         const artifactsByAgent = await Promise.all(participants.map(async (participant) => ({
             Agent: participant.Agent,
-            Artifacts: await this.agentService.FindAgentArtifacts(conversationId, participant.Agent.ID, this.AgentHistoryFrom)
+            Artifacts: await this.agentService.FindAgentArtifacts(conversationId, participant.Agent.ID, this.AgentHistoryFrom, branchId)
         })));
         return BuildRoutingArtifactVersions(artifactsByAgent);
     }
@@ -1983,23 +2165,26 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Runs a turn that {@link BeforeAgentTurn} let through, on the host's handler or MJ's path.
      * The routing decision, when there was one, supplies the artifact version the turn's agent
      * continues from; a host's handler receives it as `TargetArtifactVersionId`.
+     *
+     * @param branchId The turn's branch (null is Main): every row the turn writes and every
+     *   agent-history read it makes uses it.
      */
-    async runAgentTurn(userMessage, mentionResult, turn, routing = null) {
+    async runAgentTurn(userMessage, mentionResult, turn, branchId, routing = null) {
         const mention = turn.Route === 'Mention' ? this.findAgentMention(mentionResult, turn.AgentId) : null;
         const targetArtifactVersionId = ArtifactVersionForTurn(routing, turn.AgentId);
         if (this.AgentTurnHandler) {
-            await this.runHostAgentTurn(this.AgentTurnHandler, userMessage, turn, mention, targetArtifactVersionId);
+            await this.runHostAgentTurn(this.AgentTurnHandler, userMessage, turn, mention, targetArtifactVersionId, branchId);
             return;
         }
         if (mention) {
-            await this.invokeAgentDirectly(userMessage, mention, userMessage.ConversationID);
+            await this.invokeAgentDirectly(userMessage, mention, userMessage.ConversationID, branchId);
         }
         else if (turn.Route === 'ConversationManager' || (turn.Route === 'Redirect' && this.isConversationManager(turn.AgentId))) {
-            await this.runConversationManagerTurn(userMessage, mentionResult);
+            await this.runConversationManagerTurn(userMessage, mentionResult, branchId);
         }
         else {
             // Pinned and host defaults keep their direct call even when they name the manager, as before.
-            await this.handleAgentContinuity(userMessage, turn.AgentId, targetArtifactVersionId);
+            await this.handleAgentContinuity(userMessage, turn.AgentId, branchId, targetArtifactVersionId);
         }
     }
     /**
@@ -2044,30 +2229,33 @@ export class MessageInputComponent extends BaseAngularComponent {
      * ({@link decideAgentRouting}); the prompt-based check stays unused. A confident answer from it
      * may name the artifact version this agent should continue from.
      *
+     * @param branchId The turn's branch (null is Main).
      * @param targetArtifactVersionId The artifact version the routing decision named, or null.
      */
-    async handleAgentContinuity(messageDetail, agentId, targetArtifactVersionId = null) {
-        await this.continueWithAgent(messageDetail, agentId, messageDetail.ConversationID, targetArtifactVersionId ?? undefined // set only by a confident routing decision
+    async handleAgentContinuity(messageDetail, agentId, branchId, targetArtifactVersionId = null) {
+        await this.continueWithAgent(messageDetail, agentId, messageDetail.ConversationID, branchId, targetArtifactVersionId ?? undefined // set only by a confident routing decision
         );
     }
     /**
      * The conversation manager's turn. When an earlier message @mentioned the manager with a
      * configuration preset, the preset keeps applying and the manager answers directly;
      * otherwise it evaluates the message and may delegate.
+     *
+     * @param branchId The turn's branch (null is Main).
      */
-    async runConversationManagerTurn(messageDetail, mentionResult) {
+    async runConversationManagerTurn(messageDetail, mentionResult, branchId) {
         const manager = this.ConverationManagerAgent;
         const managerPreset = manager?.ID && messageDetail.ConversationID
-            ? await this.agentService.FindConfigurationPresetForAgent(messageDetail.ConversationID, manager.ID)
+            ? await this.agentService.FindConfigurationPresetForAgent(messageDetail.ConversationID, manager.ID, branchId)
             : undefined;
         if (manager?.ID && managerPreset) {
-            await this.executeAgentContinuation(messageDetail, manager.ID, manager.Name || 'Sage', messageDetail.ConversationID, null, // Sage doesn't use payload continuity
+            await this.executeAgentContinuation(messageDetail, manager.ID, manager.Name || 'Sage', messageDetail.ConversationID, branchId, null, // Sage doesn't use payload continuity
             null, // Sage doesn't use artifact info
             managerPreset // Pass the already-found config preset
             );
             return;
         }
-        await this.processMessageThroughAgent(messageDetail, mentionResult);
+        await this.processMessageThroughAgent(messageDetail, mentionResult, branchId);
     }
     /**
      * The newest reply from an agent other than the conversation manager — among the replies a
@@ -2132,9 +2320,11 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Runs the turn through the host's {@link AgentTurnHandler} instead of MJ's path. Nothing is
      * written here: the host writes the reply rows and reports them, and each is shown like a row
      * MJ wrote — one still In-Progress is followed like any other in-progress reply.
+     *
+     * @param branchId The turn's branch (null is Main), sent to the handler as `BranchID`.
      */
-    async runHostAgentTurn(handler, userMessage, turn, mention, targetArtifactVersionId) {
-        const request = this.buildAgentTurnRequest(userMessage, turn, mention, targetArtifactVersionId);
+    async runHostAgentTurn(handler, userMessage, turn, mention, targetArtifactVersionId, branchId) {
+        const request = this.buildAgentTurnRequest(userMessage, turn, mention, targetArtifactVersionId, branchId);
         const result = await this.callAgentTurnHandler(handler, request);
         if (!result.Success) {
             this.notifyAgentTurnProblem(result.ErrorMessage || 'The agent could not answer this message.', 'error');
@@ -2162,10 +2352,12 @@ export class MessageInputComponent extends BaseAngularComponent {
      *
      * @param targetArtifactVersionId The artifact version the routing decision named for this
      *   turn's agent, or null.
+     * @param branchId The turn's branch (null is Main).
      */
-    buildAgentTurnRequest(userMessage, turn, mention, targetArtifactVersionId) {
+    buildAgentTurnRequest(userMessage, turn, mention, targetArtifactVersionId, branchId) {
         return {
             ConversationId: userMessage.ConversationID,
+            BranchID: branchId,
             UserMessageId: userMessage.ID,
             MessageText: userMessage.Message ?? '',
             AgentId: turn.AgentId,
@@ -2198,10 +2390,10 @@ export class MessageInputComponent extends BaseAngularComponent {
         this.AfterAgentTurn.emit(new AfterAgentTurnEventArgs(conversationId, agentRunId ?? result.agentRun?.ID ?? '', result));
     }
     /**
-     * Checks if message should continue with the previous agent
-     * Emits events to show temporary intent checking message in conversation
+     * Checks if message should continue with the previous agent, reading the path of `branchId`
+     * (null is Main). Emits events to show temporary intent checking message in conversation
      */
-    async checkContinuityIntent(agentId, message) {
+    async checkContinuityIntent(agentId, message, branchId) {
         // FAST PATH: If message contains form response syntax, skip the intent check entirely
         // Form responses always continue with the agent that requested the form
         // Don't show "Analyzing intent..." message for this obvious case
@@ -2223,7 +2415,7 @@ export class MessageInputComponent extends BaseAngularComponent {
                 console.warn('⚠️ No conversation id available for intent check');
                 return { decision: 'UNSURE', reasoning: 'Conversation not available' };
             }
-            const intent = await this.agentService.checkAgentContinuityIntent(this.ConversationId, agentId, message, this.ConversationHistory);
+            const intent = await this.agentService.checkAgentContinuityIntent(this.ConversationId, agentId, message, this.ConversationHistory, branchId);
             return intent;
         }
         catch (error) {
@@ -2334,8 +2526,10 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Process the message through agents (multi-stage: Sage -> possible sub-agent)
      * Only called when there's no @mention and no implicit agent context.
      * {@link BeforeAgentTurn} has already fired — routing announces the turn before any row exists.
+     *
+     * @param branchId The turn's branch (null is Main).
      */
-    async processMessageThroughAgent(userMessage, mentionResult) {
+    async processMessageThroughAgent(userMessage, mentionResult, branchId) {
         let taskId = null;
         let conversationManagerMessage = null;
         // CRITICAL: Capture conversationId from user message at start
@@ -2343,13 +2537,10 @@ export class MessageInputComponent extends BaseAngularComponent {
         const conversationId = userMessage.ConversationID;
         try {
             // Create AI message for Sage BEFORE invoking
-            conversationManagerMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-            conversationManagerMessage.ConversationID = conversationId;
-            conversationManagerMessage.Role = 'AI';
+            conversationManagerMessage = await this.createTurnRow(conversationId, branchId);
             conversationManagerMessage.Message = '⏳ Starting...';
             conversationManagerMessage.ParentID = userMessage.ID;
             conversationManagerMessage.Status = 'In-Progress';
-            conversationManagerMessage.HiddenToUser = false;
             // Use the preloaded Sage agent instead of looking it up
             if (this.ConverationManagerAgent?.ID) {
                 conversationManagerMessage.AgentID = this.ConverationManagerAgent.ID;
@@ -2386,7 +2577,7 @@ export class MessageInputComponent extends BaseAngularComponent {
             }
             // Stage 2: Check for task graph (multi-step orchestration)
             if (result.payload?.taskGraph) {
-                await this.handleTaskGraphExecution(userMessage, result, conversationId, conversationManagerMessage);
+                await this.handleTaskGraphExecution(userMessage, result, conversationId, branchId, conversationManagerMessage);
                 // Remove CM from active tasks
                 if (taskId) {
                     // Task removed in markMessageComplete() - this.activeTasks.remove(taskId);
@@ -2395,7 +2586,7 @@ export class MessageInputComponent extends BaseAngularComponent {
             // Stage 3: Check for sub-agent invocation (single-step delegation)
             else if (result.agentRun.FinalStep === 'Success' && result.payload?.invokeAgent) {
                 // Reuse the existing conversationManagerMessage instead of creating new ones
-                await this.handleSubAgentInvocation(userMessage, result, conversationId, conversationManagerMessage);
+                await this.handleSubAgentInvocation(userMessage, result, conversationId, branchId, conversationManagerMessage);
                 // Remove CM from active tasks
                 if (taskId) {
                     // Task removed in markMessageComplete() - this.activeTasks.remove(taskId);
@@ -2442,7 +2633,7 @@ export class MessageInputComponent extends BaseAngularComponent {
                     // use update helper to ensure that if there is a race condition with more streaming updates we don't allow that to override this final message
                     await this.updateConversationDetail(conversationManagerMessage, conversationManagerMessage.Message, 'Complete', result);
                     this.MessageSent.emit(conversationManagerMessage);
-                    await this.handleSilentObservation(userMessage, conversationId);
+                    await this.handleSilentObservation(userMessage, conversationId, branchId);
                     // Clean up completion timestamp after delay
                     this.cleanupCompletionTimestamp(conversationManagerMessage.ID);
                 }
@@ -2494,8 +2685,10 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Single-task graphs are no longer special-cased here. The old client-side fork ran them through
      * a different code path entirely; they now submit like any other graph, and the decision about
      * whether a one-node graph is worth durable machinery moves server-side where it can be recorded.
+     *
+     * @param branchId The turn's branch (null is Main); the task-graph message is written there.
      */
-    async handleTaskGraphExecution(userMessage, managerResult, conversationId, conversationManagerMessage) {
+    async handleTaskGraphExecution(userMessage, managerResult, conversationId, branchId, conversationManagerMessage) {
         // `payload` is untyped by construction (an agent's payload shape is agent-specific), so pin the
         // graph to the operation's own input contract at the boundary rather than letting it stay loose.
         const taskGraph = managerResult.payload?.taskGraph;
@@ -2512,13 +2705,10 @@ export class MessageInputComponent extends BaseAngularComponent {
         const reasoning = taskGraph.reasoning || 'Executing multi-step workflow';
         const taskCount = Array.isArray(taskGraph.tasks) ? taskGraph.tasks.length : 0;
         // A message the user can watch. Progress frames from the dispatcher land against this ID.
-        const taskExecutionMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-        taskExecutionMessage.ConversationID = conversationId;
-        taskExecutionMessage.Role = 'AI';
+        const taskExecutionMessage = await this.createTurnRow(conversationId, branchId);
         taskExecutionMessage.Message = `⏳ **${workflowName}**\n\n${reasoning}\n\nSubmitting ${taskCount} task(s)…`;
         taskExecutionMessage.ParentID = conversationManagerMessage.ID;
         taskExecutionMessage.Status = 'In-Progress';
-        taskExecutionMessage.HiddenToUser = false;
         await taskExecutionMessage.Save();
         this.MessageSent.emit(taskExecutionMessage);
         const callback = this.createMessageProgressCallback(taskExecutionMessage.ID);
@@ -2617,13 +2807,13 @@ export class MessageInputComponent extends BaseAngularComponent {
      * artifact below the window's oldest row — and a null payload is a legal agent input, so
      * the miss surfaces as the agent regenerating from scratch instead of modifying. Covers
      * system-visibility artifacts (Agent Manager and friends) for free: the query filters on
-     * Direction, not on Visibility.
+     * Direction, not on Visibility. Only the path of `branchId` (null is Main) is read.
      */
-    async loadPreviousPayloadForAgent(agentId) {
+    async loadPreviousPayloadForAgent(agentId, branchId) {
         if (!this.ConversationId) {
             return { payload: null, artifactInfo: null };
         }
-        const source = await this.agentService.FindLatestAgentOutputVersion(this.ConversationId, agentId, this.AgentHistoryFrom);
+        const source = await this.agentService.FindLatestAgentOutputVersion(this.ConversationId, agentId, this.AgentHistoryFrom, branchId);
         if (!source || source.payload == null) {
             console.log(`📦 No previous payload found for agent ${agentId}`);
             return { payload: null, artifactInfo: null };
@@ -2641,8 +2831,10 @@ export class MessageInputComponent extends BaseAngularComponent {
     /**
      * Handle sub-agent invocation based on Sage's payload
      * Reuses the existing conversationManagerMessage to avoid creating multiple records
+     *
+     * @param branchId The turn's branch (null is Main).
      */
-    async handleSubAgentInvocation(userMessage, managerResult, conversationId, conversationManagerMessage) {
+    async handleSubAgentInvocation(userMessage, managerResult, conversationId, branchId, conversationManagerMessage) {
         const payload = managerResult.payload;
         const agentName = payload.invokeAgent;
         const reasoning = payload.reasoning || 'Delegating to specialist agent';
@@ -2658,13 +2850,10 @@ export class MessageInputComponent extends BaseAngularComponent {
                 return;
             }
             // Create AI response message BEFORE invoking agent (for duration tracking)
-            agentResponseMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-            agentResponseMessage.ConversationID = conversationId;
-            agentResponseMessage.Role = 'AI';
+            agentResponseMessage = await this.createTurnRow(conversationId, branchId);
             agentResponseMessage.Message = '⏳ Starting...'; // Initial message
             agentResponseMessage.ParentID = conversationManagerMessage.ID; // Thread under delegation message
             agentResponseMessage.Status = 'In-Progress';
-            agentResponseMessage.HiddenToUser = false;
             // Set AgentID immediately for proper attribution
             if (agent?.ID) {
                 agentResponseMessage.AgentID = agent.ID;
@@ -2683,11 +2872,11 @@ export class MessageInputComponent extends BaseAngularComponent {
             });
             // Load previous payload if agent has been invoked before
             const { payload: previousPayload, artifactInfo } = agent?.ID
-                ? await this.loadPreviousPayloadForAgent(agent.ID)
+                ? await this.loadPreviousPayloadForAgent(agent.ID, branchId)
                 : { payload: null, artifactInfo: null };
             // Find configuration preset from previous @mention in conversation history
             const configurationPresetId = agent?.ID
-                ? await this.agentService.FindConfigurationPresetForAgent(conversationId, agent.ID)
+                ? await this.agentService.FindConfigurationPresetForAgent(conversationId, agent.ID, branchId)
                 : undefined;
             // Invoke the sub-agent with progress callback
             const subResult = await this.agentService.invokeSubAgent(agentName, conversationId, userMessage, this.ConversationHistory, reasoning, agentResponseMessage.ID, previousPayload, // Pass previous payload for continuity
@@ -2777,8 +2966,10 @@ export class MessageInputComponent extends BaseAngularComponent {
     /**
      * Handle silent observation - when Sage stays silent,
      * check if we should continue with the last agent for iterative refinement
+     *
+     * @param branchId The turn's branch (null is Main).
      */
-    async handleSilentObservation(userMessage, conversationId) {
+    async handleSilentObservation(userMessage, conversationId, branchId) {
         // Find the last AI message (excluding Sage) this turn may read
         const lastAIMessage = this.findLastNonSageReply();
         if (!lastAIMessage || !lastAIMessage.AgentID) {
@@ -2805,7 +2996,7 @@ export class MessageInputComponent extends BaseAngularComponent {
         // Resolved by QUERY, not from the window's artifact maps: `lastAIMessage` can sit inside
         // the loaded window while its artifact does not, and this path silently degrades to a
         // null payload when the lookup misses.
-        const source = await this.agentService.FindLatestAgentOutputVersion(conversationId, lastAIMessage.AgentID, this.AgentHistoryFrom);
+        const source = await this.agentService.FindLatestAgentOutputVersion(conversationId, lastAIMessage.AgentID, this.AgentHistoryFrom, branchId);
         if (source && source.payload != null) {
             previousPayload = source.payload;
             previousArtifactInfo = {
@@ -2816,13 +3007,10 @@ export class MessageInputComponent extends BaseAngularComponent {
             console.log('📦 Loaded previous OUTPUT artifact as payload for continuity', previousArtifactInfo);
         }
         // Create status message showing agent continuity
-        const statusMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-        statusMessage.ConversationID = conversationId;
-        statusMessage.Role = 'AI';
+        const statusMessage = await this.createTurnRow(conversationId, branchId);
         statusMessage.Message = `Continuing with **${agentName}** for refinement...`;
         statusMessage.ParentID = userMessage.ID;
         statusMessage.Status = 'Complete';
-        statusMessage.HiddenToUser = false;
         statusMessage.AgentID = this.ConverationManagerAgent?.ID || null;
         await statusMessage.Save();
         this.MessageSent.emit(statusMessage);
@@ -2846,13 +3034,10 @@ export class MessageInputComponent extends BaseAngularComponent {
             // Task removed in markMessageComplete() - this.activeTasks.remove(taskId);
             if (continuityResult && continuityResult.success) {
                 // Create response message
-                const agentResponseMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-                agentResponseMessage.ConversationID = conversationId;
-                agentResponseMessage.Role = 'AI';
+                const agentResponseMessage = await this.createTurnRow(conversationId, branchId);
                 agentResponseMessage.Message = continuityResult.agentRun?.Message || `✅ **${agentName}** completed refinement`;
                 agentResponseMessage.ParentID = statusMessage.ID;
                 agentResponseMessage.Status = 'Complete';
-                agentResponseMessage.HiddenToUser = false;
                 agentResponseMessage.AgentID = lastAIMessage.AgentID;
                 await agentResponseMessage.Save();
                 this.MessageSent.emit(agentResponseMessage);
@@ -2878,8 +3063,10 @@ export class MessageInputComponent extends BaseAngularComponent {
     /**
      * Invoke an agent directly when mentioned with @ symbol
      * Bypasses Sage completely - no status messages
+     *
+     * @param branchId The turn's branch (null is Main).
      */
-    async invokeAgentDirectly(userMessage, agentMention, conversationId) {
+    async invokeAgentDirectly(userMessage, agentMention, conversationId, branchId) {
         const agentName = agentMention.name;
         // Add agent to active tasks
         const taskId = this.activeTasks.add({
@@ -2901,13 +3088,10 @@ export class MessageInputComponent extends BaseAngularComponent {
             // Look up the agent to get its ID
             const agent = AIEngineBase.Instance.Agents.find(a => a.Name === agentName);
             // Create AI response message BEFORE invoking agent (for duration tracking)
-            agentResponseMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-            agentResponseMessage.ConversationID = conversationId;
-            agentResponseMessage.Role = 'AI';
+            agentResponseMessage = await this.createTurnRow(conversationId, branchId);
             agentResponseMessage.Message = '⏳ Starting...'; // Initial message
             agentResponseMessage.ParentID = userMessage.ID;
             agentResponseMessage.Status = 'In-Progress';
-            agentResponseMessage.HiddenToUser = false;
             // Set AgentID immediately for proper attribution
             if (agent?.ID) {
                 agentResponseMessage.AgentID = agent.ID;
@@ -2917,7 +3101,7 @@ export class MessageInputComponent extends BaseAngularComponent {
             this.MessageSent.emit(agentResponseMessage);
             // Load previous payload if agent has been invoked before
             const { payload: previousPayload, artifactInfo } = agent?.ID
-                ? await this.loadPreviousPayloadForAgent(agent.ID)
+                ? await this.loadPreviousPayloadForAgent(agent.ID, branchId)
                 : { payload: null, artifactInfo: null };
             // Invoke the agent directly
             const result = await this.agentService.invokeSubAgent(agentName, conversationId, userMessage, this.ConversationHistory, `User mentioned agent directly with @${agentName}`, agentResponseMessage.ID, previousPayload, // Pass previous payload for continuity
@@ -2937,12 +3121,12 @@ export class MessageInputComponent extends BaseAngularComponent {
                 // Stage 1: Check for task graph (multi-step orchestration)
                 if (result.payload?.taskGraph) {
                     console.log('📋 Task graph detected from @mention, starting task orchestration');
-                    await this.handleTaskGraphExecution(userMessage, result, conversationId, agentResponseMessage);
+                    await this.handleTaskGraphExecution(userMessage, result, conversationId, branchId, agentResponseMessage);
                 }
                 // Stage 2: Check for sub-agent invocation (single-step delegation)
                 else if (result.agentRun.FinalStep === 'Success' && result.payload?.invokeAgent) {
                     console.log('🎯 Sub-agent invocation detected from @mention');
-                    await this.handleSubAgentInvocation(userMessage, result, conversationId, agentResponseMessage);
+                    await this.handleSubAgentInvocation(userMessage, result, conversationId, branchId, agentResponseMessage);
                 }
                 // Stage 3: Normal chat response
                 else {
@@ -2974,9 +3158,10 @@ export class MessageInputComponent extends BaseAngularComponent {
      * Continue with the same agent from previous message (implicit continuation)
      * Bypasses Sage - no status messages
      *
+     * @param branchId The turn's branch (null is Main).
      * @param targetArtifactVersionId Optional specific artifact version to use as payload (from intent check)
      */
-    async continueWithAgent(userMessage, agentId, conversationId, targetArtifactVersionId) {
+    async continueWithAgent(userMessage, agentId, conversationId, branchId, targetArtifactVersionId) {
         // Load the agent entity to get its name
         const agent = AIEngineBase.Instance.Agents.find(a => UUIDsEqual(a.ID, agentId));
         if (!agent) {
@@ -2986,7 +3171,7 @@ export class MessageInputComponent extends BaseAngularComponent {
                 return;
             }
             console.warn('⚠️ Could not load agent for continuation - falling back to Sage');
-            await this.processMessageThroughAgent(userMessage, { mentions: [], agentMention: null, userMentions: [], entityMentions: [], skillMentions: [] });
+            await this.processMessageThroughAgent(userMessage, { mentions: [], agentMention: null, userMentions: [], entityMentions: [], skillMentions: [] }, branchId);
             return;
         }
         const agentName = agent.Name || 'Agent';
@@ -3014,7 +3199,7 @@ export class MessageInputComponent extends BaseAngularComponent {
         }
         // Extract configuration preset from the User message that @mentioned this agent
         // Uses the shared helper method in the agent service
-        previousConfigurationId = await this.agentService.FindConfigurationPresetForAgent(conversationId, agentId);
+        previousConfigurationId = await this.agentService.FindConfigurationPresetForAgent(conversationId, agentId, branchId);
         // Fall back to the chat header's mode-picker selection when nothing
         // in the message history pinned a preset. The picker reflects the
         // user's persistent per-agent mode preference (Draft / Standard /
@@ -3031,7 +3216,7 @@ export class MessageInputComponent extends BaseAngularComponent {
         // used to walk is the loaded window, so the artifact it is looking for is exactly the
         // one most likely to be missing from it.
         if (!previousPayload) {
-            const source = await this.agentService.FindLatestAgentOutputVersion(conversationId, agentId, this.AgentHistoryFrom);
+            const source = await this.agentService.FindLatestAgentOutputVersion(conversationId, agentId, this.AgentHistoryFrom, branchId);
             if (source && source.payload != null) {
                 previousPayload = source.payload;
                 previousArtifactInfo = {
@@ -3046,7 +3231,7 @@ export class MessageInputComponent extends BaseAngularComponent {
             }
         }
         // Execute the agent with the gathered context
-        await this.executeAgentContinuation(userMessage, agentId, agentName, conversationId, previousPayload, previousArtifactInfo, previousConfigurationId);
+        await this.executeAgentContinuation(userMessage, agentId, agentName, conversationId, branchId, previousPayload, previousArtifactInfo, previousConfigurationId);
     }
     /**
      * Executes agent continuation with all context already gathered.
@@ -3056,11 +3241,12 @@ export class MessageInputComponent extends BaseAngularComponent {
      * @param agentId The agent ID to invoke
      * @param agentName The agent's display name
      * @param conversationId The conversation ID
+     * @param branchId The turn's branch (null is Main); the reply row is written there
      * @param previousPayload Optional payload from previous artifact
      * @param previousArtifactInfo Optional artifact info (id, versionId, versionNumber)
      * @param configurationId Optional configuration preset ID to use
      */
-    async executeAgentContinuation(userMessage, agentId, agentName, conversationId, previousPayload, previousArtifactInfo, configurationId) {
+    async executeAgentContinuation(userMessage, agentId, agentName, conversationId, branchId, previousPayload, previousArtifactInfo, configurationId) {
         // Add agent to active tasks
         const taskId = this.activeTasks.add({
             agentName: agentName,
@@ -3079,13 +3265,10 @@ export class MessageInputComponent extends BaseAngularComponent {
             await userMessage.Save();
             this.MessageSent.emit(userMessage);
             // Create AI response message BEFORE invoking agent (for duration tracking)
-            agentResponseMessage = await this.dataCache.createConversationDetail(this.CurrentUser);
-            agentResponseMessage.ConversationID = conversationId;
-            agentResponseMessage.Role = 'AI';
+            agentResponseMessage = await this.createTurnRow(conversationId, branchId);
             agentResponseMessage.Message = '⏳ Starting...'; // Initial message
             agentResponseMessage.ParentID = userMessage.ID;
             agentResponseMessage.Status = 'In-Progress';
-            agentResponseMessage.HiddenToUser = false;
             agentResponseMessage.AgentID = agentId;
             // Save the record to establish __mj_CreatedAt timestamp
             await agentResponseMessage.Save();
@@ -3342,11 +3525,11 @@ export class MessageInputComponent extends BaseAngularComponent {
         } if (rf & 2) {
             let _t;
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.InputBox = _t.first);
-        } }, inputs: { ConversationId: "ConversationId", conversationId: "conversationId", ConversationName: "ConversationName", conversationName: "conversationName", CurrentUser: "CurrentUser", currentUser: "currentUser", Disabled: "Disabled", disabled: "disabled", ReadOnly: "ReadOnly", Placeholder: "Placeholder", placeholder: "placeholder", ParentMessageId: "ParentMessageId", parentMessageId: "parentMessageId", EnableAttachments: "EnableAttachments", enableAttachments: "enableAttachments", EnableMentions: "EnableMentions", enableMentions: "enableMentions", EnableAgentMentions: "EnableAgentMentions", enableAgentMentions: "enableAgentMentions", EnableEntityMentions: "EnableEntityMentions", enableEntityMentions: "enableEntityMentions", EnableSkillCommands: "EnableSkillCommands", enableSkillCommands: "enableSkillCommands", EnablePlanMode: "EnablePlanMode", enablePlanMode: "enablePlanMode", EnableRealtime: "EnableRealtime", enableRealtime: "enableRealtime", MaxAttachments: "MaxAttachments", maxAttachments: "maxAttachments", MaxAttachmentSizeBytes: "MaxAttachmentSizeBytes", maxAttachmentSizeBytes: "maxAttachmentSizeBytes", AcceptedFileTypes: "AcceptedFileTypes", acceptedFileTypes: "acceptedFileTypes", ArtifactsByDetailId: "ArtifactsByDetailId", artifactsByDetailId: "artifactsByDetailId", SystemArtifactsByDetailId: "SystemArtifactsByDetailId", systemArtifactsByDetailId: "systemArtifactsByDetailId", AgentRunsByDetailId: "AgentRunsByDetailId", agentRunsByDetailId: "agentRunsByDetailId", EmptyStateMode: "EmptyStateMode", emptyStateMode: "emptyStateMode", AppContext: "AppContext", appContext: "appContext", DefaultAgentId: "DefaultAgentId", defaultAgentId: "defaultAgentId", ConversationDefaultAgentId: "ConversationDefaultAgentId", conversationDefaultAgentId: "conversationDefaultAgentId", AgentConfigurationPresetId: "AgentConfigurationPresetId", agentConfigurationPresetId: "agentConfigurationPresetId", InitialMessage: "InitialMessage", initialMessage: "initialMessage", InitialAttachments: "InitialAttachments", initialAttachments: "initialAttachments", ConversationHistory: "ConversationHistory", conversationHistory: "conversationHistory", InProgressMessageIds: "InProgressMessageIds", inProgressMessageIds: "inProgressMessageIds", ApplicationId: "ApplicationId", applicationId: "applicationId", AgentReplyMode: "AgentReplyMode", AllowedAgentIDs: "AllowedAgentIDs", MentionPeople: "MentionPeople", AgentHistoryFrom: "AgentHistoryFrom", AgentTurnHandler: "AgentTurnHandler", AutoNameConversation: "AutoNameConversation", EnableDecisionRouting: "EnableDecisionRouting", InitialDraft: "InitialDraft", initialDraft: "initialDraft" }, outputs: { MessageSent: "MessageSent", messageSent: "messageSent", AgentResponse: "AgentResponse", agentResponse: "agentResponse", BeforeAgentTurn: "BeforeAgentTurn", beforeAgentTurn: "beforeAgentTurn", AfterAgentTurn: "AfterAgentTurn", afterAgentTurn: "afterAgentTurn", AgentRunDetected: "AgentRunDetected", agentRunDetected: "agentRunDetected", AgentRunUpdate: "AgentRunUpdate", agentRunUpdate: "agentRunUpdate", MessageComplete: "MessageComplete", messageComplete: "messageComplete", ArtifactCreated: "ArtifactCreated", artifactCreated: "artifactCreated", ConversationRenamed: "ConversationRenamed", conversationRenamed: "conversationRenamed", IntentCheckStarted: "IntentCheckStarted", intentCheckStarted: "intentCheckStarted", IntentCheckCompleted: "IntentCheckCompleted", intentCheckCompleted: "intentCheckCompleted", InitialMessageAutoSendStarted: "InitialMessageAutoSendStarted", initialMessageAutoSendStarted: "initialMessageAutoSendStarted", InitialMessageAutoSendFailed: "InitialMessageAutoSendFailed", initialMessageAutoSendFailed: "initialMessageAutoSendFailed", EmptyStateSubmit: "EmptyStateSubmit", emptyStateSubmit: "emptyStateSubmit", UploadStateChanged: "UploadStateChanged", uploadStateChanged: "uploadStateChanged", InitialDraftApplied: "InitialDraftApplied", initialDraftApplied: "initialDraftApplied", DraftStateChanged: "DraftStateChanged", ComposerBlurred: "ComposerBlurred" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], decls: 6, vars: 29, consts: [["pickerOrigin", "cdkOverlayOrigin"], ["inputBox", ""], ["cdkOverlayOrigin", "", 1, "message-input-wrapper"], [1, "processing-indicator"], [3, "valueChange", "blurred", "textSubmitted", "attachmentsChanged", "attachmentError", "voiceRequested", "voiceOptionsRequested", "planModeToggle", "placeholder", "disabled", "showCharacterCount", "enableMentions", "EnableAgentMentions", "EnableEntityMentions", "EnableSkillCommands", "TargetAgentId", "AllowedAgentIDs", "MentionPeople", "enableAttachments", "maxAttachments", "maxAttachmentSizeBytes", "acceptedFileTypes", "currentUser", "Provider", "rows", "enableRealtime", "voiceActive", "canStartRealtime", "enablePlanMode", "planModeActive", "value"], ["cdkConnectedOverlay", "", "cdkConnectedOverlayBackdropClass", "cdk-overlay-transparent-backdrop", 3, "backdropClick", "detach", "cdkConnectedOverlayOrigin", "cdkConnectedOverlayOpen", "cdkConnectedOverlayPositions", "cdkConnectedOverlayPush", "cdkConnectedOverlayHasBackdrop"], [1, "fas", "fa-circle-notch", "fa-spin"], [3, "AgentPicked", "Cancelled", "Provider", "CurrentUser", "Agents", "DefaultAgentId", "CoAgents", "DefaultCoAgentId"]], template: function MessageInputComponent_Template(rf, ctx) { if (rf & 1) {
+        } }, inputs: { ConversationId: "ConversationId", conversationId: "conversationId", ConversationName: "ConversationName", conversationName: "conversationName", CurrentUser: "CurrentUser", currentUser: "currentUser", Disabled: "Disabled", disabled: "disabled", ReadOnly: "ReadOnly", SendSlotMode: "SendSlotMode", StopCount: "StopCount", StopLabel: "StopLabel", StatusText: "StatusText", StatusElapsed: "StatusElapsed", Placeholder: "Placeholder", placeholder: "placeholder", ParentMessageId: "ParentMessageId", parentMessageId: "parentMessageId", EnableAttachments: "EnableAttachments", enableAttachments: "enableAttachments", EnableMentions: "EnableMentions", enableMentions: "enableMentions", EnableAgentMentions: "EnableAgentMentions", enableAgentMentions: "enableAgentMentions", EnableEntityMentions: "EnableEntityMentions", enableEntityMentions: "enableEntityMentions", EnableSkillCommands: "EnableSkillCommands", enableSkillCommands: "enableSkillCommands", EnablePlanMode: "EnablePlanMode", enablePlanMode: "enablePlanMode", EnableRealtime: "EnableRealtime", enableRealtime: "enableRealtime", MaxAttachments: "MaxAttachments", maxAttachments: "maxAttachments", MaxAttachmentSizeBytes: "MaxAttachmentSizeBytes", maxAttachmentSizeBytes: "maxAttachmentSizeBytes", AcceptedFileTypes: "AcceptedFileTypes", acceptedFileTypes: "acceptedFileTypes", ArtifactsByDetailId: "ArtifactsByDetailId", artifactsByDetailId: "artifactsByDetailId", SystemArtifactsByDetailId: "SystemArtifactsByDetailId", systemArtifactsByDetailId: "systemArtifactsByDetailId", AgentRunsByDetailId: "AgentRunsByDetailId", agentRunsByDetailId: "agentRunsByDetailId", EmptyStateMode: "EmptyStateMode", emptyStateMode: "emptyStateMode", AppContext: "AppContext", appContext: "appContext", DefaultAgentId: "DefaultAgentId", defaultAgentId: "defaultAgentId", ConversationDefaultAgentId: "ConversationDefaultAgentId", conversationDefaultAgentId: "conversationDefaultAgentId", AgentConfigurationPresetId: "AgentConfigurationPresetId", agentConfigurationPresetId: "agentConfigurationPresetId", InitialMessage: "InitialMessage", initialMessage: "initialMessage", InitialAttachments: "InitialAttachments", initialAttachments: "initialAttachments", ConversationHistory: "ConversationHistory", conversationHistory: "conversationHistory", InProgressMessageIds: "InProgressMessageIds", inProgressMessageIds: "inProgressMessageIds", ApplicationId: "ApplicationId", applicationId: "applicationId", AgentReplyMode: "AgentReplyMode", AllowedAgentIDs: "AllowedAgentIDs", MentionPeople: "MentionPeople", AgentHistoryFrom: "AgentHistoryFrom", TargetBranchID: "TargetBranchID", ResolveTargetBranch: "ResolveTargetBranch", AgentTurnHandler: "AgentTurnHandler", AutoNameConversation: "AutoNameConversation", EnableDecisionRouting: "EnableDecisionRouting", InitialDraft: "InitialDraft", initialDraft: "initialDraft" }, outputs: { StopClicked: "StopClicked", MessageSent: "MessageSent", messageSent: "messageSent", MessageStreamed: "MessageStreamed", AgentResponse: "AgentResponse", agentResponse: "agentResponse", BeforeAgentTurn: "BeforeAgentTurn", beforeAgentTurn: "beforeAgentTurn", AfterAgentTurn: "AfterAgentTurn", afterAgentTurn: "afterAgentTurn", AgentRunDetected: "AgentRunDetected", agentRunDetected: "agentRunDetected", AgentRunUpdate: "AgentRunUpdate", agentRunUpdate: "agentRunUpdate", MessageComplete: "MessageComplete", messageComplete: "messageComplete", ArtifactCreated: "ArtifactCreated", artifactCreated: "artifactCreated", ConversationRenamed: "ConversationRenamed", conversationRenamed: "conversationRenamed", IntentCheckStarted: "IntentCheckStarted", intentCheckStarted: "intentCheckStarted", IntentCheckCompleted: "IntentCheckCompleted", intentCheckCompleted: "intentCheckCompleted", InitialMessageAutoSendStarted: "InitialMessageAutoSendStarted", initialMessageAutoSendStarted: "initialMessageAutoSendStarted", InitialMessageAutoSendFailed: "InitialMessageAutoSendFailed", initialMessageAutoSendFailed: "initialMessageAutoSendFailed", EmptyStateSubmit: "EmptyStateSubmit", emptyStateSubmit: "emptyStateSubmit", UploadStateChanged: "UploadStateChanged", uploadStateChanged: "uploadStateChanged", InitialDraftApplied: "InitialDraftApplied", initialDraftApplied: "initialDraftApplied", DraftStateChanged: "DraftStateChanged", ComposerBlurred: "ComposerBlurred" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], decls: 6, vars: 34, consts: [["pickerOrigin", "cdkOverlayOrigin"], ["inputBox", ""], ["cdkOverlayOrigin", "", 1, "message-input-wrapper"], [1, "processing-indicator"], [3, "StopClicked", "valueChange", "blurred", "textSubmitted", "attachmentsChanged", "attachmentError", "voiceRequested", "voiceOptionsRequested", "planModeToggle", "placeholder", "disabled", "showCharacterCount", "enableMentions", "EnableAgentMentions", "EnableEntityMentions", "EnableSkillCommands", "TargetAgentId", "AllowedAgentIDs", "MentionPeople", "enableAttachments", "maxAttachments", "maxAttachmentSizeBytes", "acceptedFileTypes", "currentUser", "Provider", "rows", "enableRealtime", "voiceActive", "canStartRealtime", "enablePlanMode", "planModeActive", "SendSlotMode", "StopCount", "StopLabel", "StatusText", "StatusElapsed", "value"], ["cdkConnectedOverlay", "", "cdkConnectedOverlayBackdropClass", "cdk-overlay-transparent-backdrop", 3, "backdropClick", "detach", "cdkConnectedOverlayOrigin", "cdkConnectedOverlayOpen", "cdkConnectedOverlayPositions", "cdkConnectedOverlayPush", "cdkConnectedOverlayHasBackdrop"], [1, "fas", "fa-circle-notch", "fa-spin"], [3, "AgentPicked", "Cancelled", "Provider", "CurrentUser", "Agents", "DefaultAgentId", "CoAgents", "DefaultCoAgentId"]], template: function MessageInputComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 2, 0);
             i0.ɵɵconditionalCreate(2, MessageInputComponent_Conditional_2_Template, 4, 1, "div", 3);
             i0.ɵɵelementStart(3, "mj-ai-composer", 4, 1);
-            i0.ɵɵlistener("valueChange", function MessageInputComponent_Template_mj_ai_composer_valueChange_3_listener($event) { return ctx.OnComposerValueChanged($event); })("blurred", function MessageInputComponent_Template_mj_ai_composer_blurred_3_listener() { return ctx.ComposerBlurred.emit(); })("textSubmitted", function MessageInputComponent_Template_mj_ai_composer_textSubmitted_3_listener($event) { return ctx.onTextSubmitted($event); })("attachmentsChanged", function MessageInputComponent_Template_mj_ai_composer_attachmentsChanged_3_listener($event) { return ctx.onAttachmentsChanged($event); })("attachmentError", function MessageInputComponent_Template_mj_ai_composer_attachmentError_3_listener($event) { return ctx.onAttachmentError($event); })("voiceRequested", function MessageInputComponent_Template_mj_ai_composer_voiceRequested_3_listener() { return ctx.onStartRealtime(); })("voiceOptionsRequested", function MessageInputComponent_Template_mj_ai_composer_voiceOptionsRequested_3_listener() { return ctx.onRealtimeOptions(); })("planModeToggle", function MessageInputComponent_Template_mj_ai_composer_planModeToggle_3_listener() { return ctx.TogglePlanMode(); });
+            i0.ɵɵlistener("StopClicked", function MessageInputComponent_Template_mj_ai_composer_StopClicked_3_listener() { return ctx.StopClicked.emit(); })("valueChange", function MessageInputComponent_Template_mj_ai_composer_valueChange_3_listener($event) { return ctx.OnComposerValueChanged($event); })("blurred", function MessageInputComponent_Template_mj_ai_composer_blurred_3_listener() { return ctx.ComposerBlurred.emit(); })("textSubmitted", function MessageInputComponent_Template_mj_ai_composer_textSubmitted_3_listener($event) { return ctx.onTextSubmitted($event); })("attachmentsChanged", function MessageInputComponent_Template_mj_ai_composer_attachmentsChanged_3_listener($event) { return ctx.onAttachmentsChanged($event); })("attachmentError", function MessageInputComponent_Template_mj_ai_composer_attachmentError_3_listener($event) { return ctx.onAttachmentError($event); })("voiceRequested", function MessageInputComponent_Template_mj_ai_composer_voiceRequested_3_listener() { return ctx.onStartRealtime(); })("voiceOptionsRequested", function MessageInputComponent_Template_mj_ai_composer_voiceOptionsRequested_3_listener() { return ctx.onRealtimeOptions(); })("planModeToggle", function MessageInputComponent_Template_mj_ai_composer_planModeToggle_3_listener() { return ctx.TogglePlanMode(); });
             i0.ɵɵelementEnd();
             i0.ɵɵtemplate(5, MessageInputComponent_ng_template_5_Template, 1, 6, "ng-template", 5);
             i0.ɵɵlistener("backdropClick", function MessageInputComponent_Template_ng_template_backdropClick_5_listener() { return ctx.onRealtimeAgentPickerCancelled(); })("detach", function MessageInputComponent_Template_ng_template_detach_5_listener() { return ctx.onRealtimeAgentPickerCancelled(); });
@@ -3356,14 +3539,14 @@ export class MessageInputComponent extends BaseAngularComponent {
             i0.ɵɵadvance(2);
             i0.ɵɵconditional(ctx.isProcessing ? 2 : -1);
             i0.ɵɵadvance();
-            i0.ɵɵproperty("placeholder", ctx.placeholder)("disabled", ctx.disabled || ctx.isProcessing)("showCharacterCount", false)("enableMentions", ctx.enableMentions)("EnableAgentMentions", ctx.enableAgentMentions)("EnableEntityMentions", ctx.enableEntityMentions)("EnableSkillCommands", ctx.enableSkillCommands)("TargetAgentId", ctx.pickerTargetAgentId)("AllowedAgentIDs", ctx.AllowedAgentIDs)("MentionPeople", ctx.MentionPeople)("enableAttachments", ctx.enableAttachments)("maxAttachments", ctx.maxAttachments)("maxAttachmentSizeBytes", ctx.maxAttachmentSizeBytes)("acceptedFileTypes", ctx.acceptedFileTypes)("currentUser", ctx.currentUser)("Provider", ctx.Provider)("rows", 3)("enableRealtime", ctx.enableRealtime)("voiceActive", ctx.voiceActive)("canStartRealtime", ctx.canStartRealtime)("enablePlanMode", ctx.enablePlanMode)("planModeActive", ctx.PlanModeEnabled)("value", ctx.messageText);
+            i0.ɵɵproperty("placeholder", ctx.placeholder)("disabled", ctx.disabled || ctx.isProcessing)("showCharacterCount", false)("enableMentions", ctx.enableMentions)("EnableAgentMentions", ctx.enableAgentMentions)("EnableEntityMentions", ctx.enableEntityMentions)("EnableSkillCommands", ctx.enableSkillCommands)("TargetAgentId", ctx.pickerTargetAgentId)("AllowedAgentIDs", ctx.AllowedAgentIDs)("MentionPeople", ctx.MentionPeople)("enableAttachments", ctx.enableAttachments)("maxAttachments", ctx.maxAttachments)("maxAttachmentSizeBytes", ctx.maxAttachmentSizeBytes)("acceptedFileTypes", ctx.acceptedFileTypes)("currentUser", ctx.currentUser)("Provider", ctx.Provider)("rows", 3)("enableRealtime", ctx.enableRealtime)("voiceActive", ctx.voiceActive)("canStartRealtime", ctx.canStartRealtime)("enablePlanMode", ctx.enablePlanMode)("planModeActive", ctx.PlanModeEnabled)("SendSlotMode", ctx.SendSlotMode)("StopCount", ctx.StopCount)("StopLabel", ctx.StopLabel)("StatusText", ctx.StatusText)("StatusElapsed", ctx.StatusElapsed)("value", ctx.messageText);
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("cdkConnectedOverlayOrigin", pickerOrigin_r3)("cdkConnectedOverlayOpen", ctx.showRealtimeAgentPicker)("cdkConnectedOverlayPositions", ctx.pickerOverlayPositions)("cdkConnectedOverlayPush", true)("cdkConnectedOverlayHasBackdrop", true);
         } }, dependencies: [i11.CdkConnectedOverlay, i11.CdkOverlayOrigin, i12.RealtimeAgentPickerComponent, i13.AiComposerComponent], styles: [".message-input-wrapper[_ngcontent-%COMP%] {\n  position: relative;\n  width: 100%;\n}\n\n\n\n\n.processing-indicator[_ngcontent-%COMP%] {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  display: flex;\n  align-items: center;\n  gap: 0.5rem;\n  padding: 0.75rem 1.25rem;\n  background: color-mix(in srgb, var(--mj-bg-surface-card) 95%, transparent);\n  border-radius: 8px;\n  box-shadow: var(--mj-shadow-sm);\n  z-index: 10;\n  pointer-events: none;\n}\n.processing-indicator[_ngcontent-%COMP%]   i[_ngcontent-%COMP%] {\n  color: var(--mj-brand-primary);\n}\n.processing-indicator[_ngcontent-%COMP%]   span[_ngcontent-%COMP%] {\n  font-size: 0.9rem;\n  color: var(--mj-text-primary);\n}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MessageInputComponent, [{
         type: Component,
-        args: [{ standalone: false, selector: 'mj-message-input', template: "<div class=\"message-input-wrapper\" cdkOverlayOrigin #pickerOrigin=\"cdkOverlayOrigin\">\n  <!-- Processing Indicator Overlay -->\n  @if (isProcessing) {\n    <div class=\"processing-indicator\">\n      <i class=\"fas fa-circle-notch fa-spin\"></i>\n      <span>{{ processingMessage }}</span>\n    </div>\n  }\n\n  <!-- AI composer (mic + Plan Mode buttons live in its in-composer toolbar): wraps the\n       generic mj-message-input-box with the '@' agent / '#' record / '/' skill trigger\n       plugins built in \u2014 all three on by default, preserving the standard chat behavior. -->\n  <mj-ai-composer\n    #inputBox\n    [placeholder]=\"placeholder\"\n    [disabled]=\"disabled || isProcessing\"\n    [showCharacterCount]=\"false\"\n    [enableMentions]=\"enableMentions\"\n    [EnableAgentMentions]=\"enableAgentMentions\"\n    [EnableEntityMentions]=\"enableEntityMentions\"\n    [EnableSkillCommands]=\"enableSkillCommands\"\n    [TargetAgentId]=\"pickerTargetAgentId\"\n    [AllowedAgentIDs]=\"AllowedAgentIDs\"\n    [MentionPeople]=\"MentionPeople\"\n    [enableAttachments]=\"enableAttachments\"\n    [maxAttachments]=\"maxAttachments\"\n    [maxAttachmentSizeBytes]=\"maxAttachmentSizeBytes\"\n    [acceptedFileTypes]=\"acceptedFileTypes\"\n    [currentUser]=\"currentUser\"\n    [Provider]=\"Provider\"\n    [rows]=\"3\"\n    [enableRealtime]=\"enableRealtime\"\n    [voiceActive]=\"voiceActive\"\n    [canStartRealtime]=\"canStartRealtime\"\n    [enablePlanMode]=\"enablePlanMode\"\n    [planModeActive]=\"PlanModeEnabled\"\n    [value]=\"messageText\"\n    (valueChange)=\"OnComposerValueChanged($event)\"\n    (blurred)=\"ComposerBlurred.emit()\"\n    (textSubmitted)=\"onTextSubmitted($event)\"\n    (attachmentsChanged)=\"onAttachmentsChanged($event)\"\n    (attachmentError)=\"onAttachmentError($event)\"\n    (voiceRequested)=\"onStartRealtime()\"\n    (voiceOptionsRequested)=\"onRealtimeOptions()\"\n    (planModeToggle)=\"TogglePlanMode()\">\n  </mj-ai-composer>\n\n  <!-- Voice agent/co-agent/model picker \u2014 shown when starting a call on a conversation\n       with NO prior agent participation, or on demand via the caret next to the phone\n       button (any conversation). Rendered in a body-level CDK overlay anchored above the\n       composer so it POPS OUT of the chat overlay's clipping border instead of being cut\n       off at the top of a narrow (~390px) overlay. -->\n  <ng-template\n    cdkConnectedOverlay\n    [cdkConnectedOverlayOrigin]=\"pickerOrigin\"\n    [cdkConnectedOverlayOpen]=\"showRealtimeAgentPicker\"\n    [cdkConnectedOverlayPositions]=\"pickerOverlayPositions\"\n    [cdkConnectedOverlayPush]=\"true\"\n    [cdkConnectedOverlayHasBackdrop]=\"true\"\n    cdkConnectedOverlayBackdropClass=\"cdk-overlay-transparent-backdrop\"\n    (backdropClick)=\"onRealtimeAgentPickerCancelled()\"\n    (detach)=\"onRealtimeAgentPickerCancelled()\">\n    <mj-realtime-agent-picker\n      [Provider]=\"ProviderToUse\"\n      [CurrentUser]=\"currentUser\"\n      [Agents]=\"voicePickerAgents\"\n      [DefaultAgentId]=\"voicePickerDefaultAgentId\"\n      [CoAgents]=\"voicePickerCoAgents\"\n      [DefaultCoAgentId]=\"voicePickerDefaultCoAgentId\"\n      (AgentPicked)=\"onRealtimeAgentPicked($event)\"\n      (Cancelled)=\"onRealtimeAgentPickerCancelled()\">\n    </mj-realtime-agent-picker>\n  </ng-template>\n</div>\n\n<!-- The voice \"call mode\" overlay is hosted by <mj-conversation-chat-area> (it fills the\n     whole conversation panel in place); this component only owns the trigger wiring. -->\n", styles: [".message-input-wrapper {\n  position: relative;\n  width: 100%;\n}\n\n/* Plan Mode moved into the in-composer toolbar (message-input-box) as a toggle icon button\n   next to the attachment/voice buttons \u2014 see .plan-mode-button-icon there. */\n\n.processing-indicator {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  display: flex;\n  align-items: center;\n  gap: 0.5rem;\n  padding: 0.75rem 1.25rem;\n  background: color-mix(in srgb, var(--mj-bg-surface-card) 95%, transparent);\n  border-radius: 8px;\n  box-shadow: var(--mj-shadow-sm);\n  z-index: 10;\n  pointer-events: none;\n}\n.processing-indicator i {\n  color: var(--mj-brand-primary);\n}\n.processing-indicator span {\n  font-size: 0.9rem;\n  color: var(--mj-text-primary);\n}\n"] }]
+        args: [{ standalone: false, selector: 'mj-message-input', template: "<div class=\"message-input-wrapper\" cdkOverlayOrigin #pickerOrigin=\"cdkOverlayOrigin\">\n  <!-- Processing Indicator Overlay -->\n  @if (isProcessing) {\n    <div class=\"processing-indicator\">\n      <i class=\"fas fa-circle-notch fa-spin\"></i>\n      <span>{{ processingMessage }}</span>\n    </div>\n  }\n\n  <!-- AI composer (mic + Plan Mode buttons live in its in-composer toolbar): wraps the\n       generic mj-message-input-box with the '@' agent / '#' record / '/' skill trigger\n       plugins built in \u2014 all three on by default, preserving the standard chat behavior. -->\n  <mj-ai-composer\n    #inputBox\n    [placeholder]=\"placeholder\"\n    [disabled]=\"disabled || isProcessing\"\n    [showCharacterCount]=\"false\"\n    [enableMentions]=\"enableMentions\"\n    [EnableAgentMentions]=\"enableAgentMentions\"\n    [EnableEntityMentions]=\"enableEntityMentions\"\n    [EnableSkillCommands]=\"enableSkillCommands\"\n    [TargetAgentId]=\"pickerTargetAgentId\"\n    [AllowedAgentIDs]=\"AllowedAgentIDs\"\n    [MentionPeople]=\"MentionPeople\"\n    [enableAttachments]=\"enableAttachments\"\n    [maxAttachments]=\"maxAttachments\"\n    [maxAttachmentSizeBytes]=\"maxAttachmentSizeBytes\"\n    [acceptedFileTypes]=\"acceptedFileTypes\"\n    [currentUser]=\"currentUser\"\n    [Provider]=\"Provider\"\n    [rows]=\"3\"\n    [enableRealtime]=\"enableRealtime\"\n    [voiceActive]=\"voiceActive\"\n    [canStartRealtime]=\"canStartRealtime\"\n    [enablePlanMode]=\"enablePlanMode\"\n    [planModeActive]=\"PlanModeEnabled\"\n    [SendSlotMode]=\"SendSlotMode\"\n    [StopCount]=\"StopCount\"\n    [StopLabel]=\"StopLabel\"\n    [StatusText]=\"StatusText\"\n    [StatusElapsed]=\"StatusElapsed\"\n    (StopClicked)=\"StopClicked.emit()\"\n    [value]=\"messageText\"\n    (valueChange)=\"OnComposerValueChanged($event)\"\n    (blurred)=\"ComposerBlurred.emit()\"\n    (textSubmitted)=\"onTextSubmitted($event)\"\n    (attachmentsChanged)=\"onAttachmentsChanged($event)\"\n    (attachmentError)=\"onAttachmentError($event)\"\n    (voiceRequested)=\"onStartRealtime()\"\n    (voiceOptionsRequested)=\"onRealtimeOptions()\"\n    (planModeToggle)=\"TogglePlanMode()\">\n  </mj-ai-composer>\n\n  <!-- Voice agent/co-agent/model picker \u2014 shown when starting a call on a conversation\n       with NO prior agent participation, or on demand via the caret next to the phone\n       button (any conversation). Rendered in a body-level CDK overlay anchored above the\n       composer so it POPS OUT of the chat overlay's clipping border instead of being cut\n       off at the top of a narrow (~390px) overlay. -->\n  <ng-template\n    cdkConnectedOverlay\n    [cdkConnectedOverlayOrigin]=\"pickerOrigin\"\n    [cdkConnectedOverlayOpen]=\"showRealtimeAgentPicker\"\n    [cdkConnectedOverlayPositions]=\"pickerOverlayPositions\"\n    [cdkConnectedOverlayPush]=\"true\"\n    [cdkConnectedOverlayHasBackdrop]=\"true\"\n    cdkConnectedOverlayBackdropClass=\"cdk-overlay-transparent-backdrop\"\n    (backdropClick)=\"onRealtimeAgentPickerCancelled()\"\n    (detach)=\"onRealtimeAgentPickerCancelled()\">\n    <mj-realtime-agent-picker\n      [Provider]=\"ProviderToUse\"\n      [CurrentUser]=\"currentUser\"\n      [Agents]=\"voicePickerAgents\"\n      [DefaultAgentId]=\"voicePickerDefaultAgentId\"\n      [CoAgents]=\"voicePickerCoAgents\"\n      [DefaultCoAgentId]=\"voicePickerDefaultCoAgentId\"\n      (AgentPicked)=\"onRealtimeAgentPicked($event)\"\n      (Cancelled)=\"onRealtimeAgentPickerCancelled()\">\n    </mj-realtime-agent-picker>\n  </ng-template>\n</div>\n\n<!-- The voice \"call mode\" overlay is hosted by <mj-conversation-chat-area> (it fills the\n     whole conversation panel in place); this component only owns the trigger wiring. -->\n", styles: [".message-input-wrapper {\n  position: relative;\n  width: 100%;\n}\n\n/* Plan Mode moved into the in-composer toolbar (message-input-box) as a toggle icon button\n   next to the attachment/voice buttons \u2014 see .plan-mode-button-icon there. */\n\n.processing-indicator {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  display: flex;\n  align-items: center;\n  gap: 0.5rem;\n  padding: 0.75rem 1.25rem;\n  background: color-mix(in srgb, var(--mj-bg-surface-card) 95%, transparent);\n  border-radius: 8px;\n  box-shadow: var(--mj-shadow-sm);\n  z-index: 10;\n  pointer-events: none;\n}\n.processing-indicator i {\n  color: var(--mj-brand-primary);\n}\n.processing-indicator span {\n  font-size: 0.9rem;\n  color: var(--mj-text-primary);\n}\n"] }]
     }], () => [{ type: i1.DialogService }, { type: i2.ToastService }, { type: i3.ConversationAgentService }, { type: i4.DataCacheService }, { type: i5.ActiveTasksService }, { type: i6.ConversationStreamingService }, { type: i7.MentionParserService }, { type: i8.ConversationAttachmentService }, { type: i9.ConversationBridgeService }, { type: i10.RealtimeSessionService }], { ConversationId: [{
             type: Input
         }], conversationId: [{
@@ -3382,6 +3565,16 @@ export class MessageInputComponent extends BaseAngularComponent {
             type: Input
         }], ReadOnly: [{
             type: Input
+        }], SendSlotMode: [{
+            type: Input
+        }], StopCount: [{
+            type: Input
+        }], StopLabel: [{
+            type: Input
+        }], StatusText: [{
+            type: Input
+        }], StatusElapsed: [{
+            type: Input
         }], Placeholder: [{
             type: Input
         }], placeholder: [{
@@ -3490,16 +3683,24 @@ export class MessageInputComponent extends BaseAngularComponent {
             type: Input
         }], AgentHistoryFrom: [{
             type: Input
+        }], TargetBranchID: [{
+            type: Input
+        }], ResolveTargetBranch: [{
+            type: Input
         }], AgentTurnHandler: [{
             type: Input
         }], AutoNameConversation: [{
             type: Input
         }], EnableDecisionRouting: [{
             type: Input
+        }], StopClicked: [{
+            type: Output
         }], MessageSent: [{
             type: Output
         }], messageSent: [{
             type: Output
+        }], MessageStreamed: [{
+            type: Output
         }], AgentResponse: [{
             type: Output
         }], agentResponse: [{
@@ -3572,5 +3773,5 @@ export class MessageInputComponent extends BaseAngularComponent {
         }], ComposerBlurred: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(MessageInputComponent, { className: "MessageInputComponent", filePath: "src/lib/components/message/message-input.component.ts", lineNumber: 66 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(MessageInputComponent, { className: "MessageInputComponent", filePath: "src/lib/components/message/message-input.component.ts", lineNumber: 71 }); })();
 //# sourceMappingURL=message-input.component.js.map