@dexto/core 1.7.2 → 1.8.0

package/dist/session/message-queue.cjs

@@ -21,39 +21,44 @@ __export(message_queue_exports, {
   MessageQueueService: () => MessageQueueService
 });
 module.exports = __toCommonJS(message_queue_exports);
+var import_queue_clone = require("./queue-clone.js");
 class EphemeralMessageQueueStore {
-  async load(sessionId) {
-    void sessionId;
+  async listSessionIds() {
     return [];
   }
-  async save(sessionId, queue) {
-    void sessionId;
-    void queue;
+  async load(input) {
+    void input;
+    return [];
+  }
+  async save(input) {
+    void input;
   }
-  async delete(sessionId) {
-    void sessionId;
+  async delete(input) {
+    void input;
   }
 }
 function generateId() {
   return `msg_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
 }
 class MessageQueueService {
-  constructor(eventBus, logger, sessionId, store) {
+  constructor(eventBus, logger, sessionId, store, queueKind = "steer") {
     this.eventBus = eventBus;
     this.logger = logger;
     this.sessionId = sessionId;
     this.store = store;
+    this.queueKind = queueKind;
   }
   queue = [];
   mutationLock = Promise.resolve();
   initialized = false;
   initializationPromise = null;
-  static createEphemeral(eventBus, logger, sessionId) {
+  static createEphemeral(eventBus, logger, sessionId, queueKind = "steer") {
     return new MessageQueueService(
       eventBus,
       logger,
       sessionId,
-      new EphemeralMessageQueueStore()
+      new EphemeralMessageQueueStore(),
+      queueKind
     );
   }
   async initialize() {
@@ -61,7 +66,7 @@ class MessageQueueService {
       if (this.initialized) {
         return;
       }
-      this.queue = await this.store.load(this.sessionId);
+      this.queue = await this.store.load({ sessionId: this.sessionId });
       if (this.queue.length > 0) {
         this.logger.debug(
           `Restored ${this.queue.length} queued message(s) for session ${this.sessionId}`
@@ -75,7 +80,21 @@ class MessageQueueService {
     await this.initializationPromise;
   }
   async persistQueue() {
-    await this.store.save(this.sessionId, this.queue);
+    await this.store.save({ sessionId: this.sessionId, queue: this.queue });
+  }
+  async refreshFromStore() {
+    const storedQueue = await this.store.load({ sessionId: this.sessionId });
+    const existingIds = new Set(this.queue.map((message) => message.id));
+    const externalMessages = storedQueue.filter((message) => !existingIds.has(message.id));
+    if (externalMessages.length === 0) {
+      return;
+    }
+    this.queue = [...this.queue, ...(0, import_queue_clone.cloneQueuedMessages)(externalMessages)].sort(
+      (left, right) => left.queuedAt - right.queuedAt
+    );
+    this.logger.debug(
+      `Loaded ${externalMessages.length} externally queued message(s) for session ${this.sessionId}`
+    );
   }
   runWithMutationLock(fn) {
     const currentResult = this.mutationLock.catch(() => {
@@ -99,10 +118,13 @@ class MessageQueueService {
         id: generateId(),
         content: message.content,
         queuedAt: Date.now(),
-        ...message.metadata !== void 0 && { metadata: message.metadata },
+        ...message.metadata !== void 0 && {
+          metadata: message.metadata
+        },
         ...message.kind !== void 0 && { kind: message.kind }
       };
-      this.queue.push(queuedMsg);
+      const copiedQueuedMsg = (0, import_queue_clone.cloneQueuedMessage)(queuedMsg);
+      this.queue.push(copiedQueuedMsg);
       try {
         await this.persistQueue();
       } catch (error) {
@@ -112,7 +134,8 @@ class MessageQueueService {
       this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
       this.eventBus.emit("message:queued", {
         position: this.queue.length,
-        id: queuedMsg.id
+        id: queuedMsg.id,
+        queue: this.queueKind
       });
       return {
         queued: true,
@@ -131,19 +154,22 @@ class MessageQueueService {
    * If 3 messages are queued: "stop", "try X instead", "also check Y"
    * They become:
    * ```
-   * [1]: stop
+   * Additional user input received:
+   *
+   * - stop
    *
-   * [2]: try X instead
+   * - try X instead
    *
-   * [3]: also check Y
+   * - also check Y
    * ```
    *
    * @returns Coalesced message or null if queue is empty
    */
   async dequeueAll() {
     return await this.runWithMutationLock(async () => {
+      await this.refreshFromStore();
       if (this.queue.length === 0) return null;
-      const messages = [...this.queue];
+      const messages = (0, import_queue_clone.cloneQueuedMessages)(this.queue);
       this.queue = [];
       try {
         await this.persistQueue();
@@ -158,9 +184,10 @@ class MessageQueueService {
       this.eventBus.emit("message:dequeued", {
         count: messages.length,
         ids: messages.map((m) => m.id),
+        queue: this.queueKind,
         coalesced: messages.length > 1,
-        content: combined.combinedContent,
-        messages
+        content: (0, import_queue_clone.cloneCoalescedMessage)(combined).combinedContent,
+        messages: (0, import_queue_clone.cloneQueuedMessages)(messages)
       });
       return combined;
     });
@@ -182,32 +209,30 @@ class MessageQueueService {
         lastQueuedAt: firstMsg.queuedAt
       };
     }
-    const getMessageKind = (message) => message.kind ?? "default";
-    const totalUserMessages = messages.filter(
-      (message) => getMessageKind(message) !== "background"
-    ).length;
-    const hasBackgroundMessages = messages.some(
-      (message) => getMessageKind(message) === "background"
-    );
-    const getUserPrefix = (index, total, mixed) => {
-      if (mixed) {
-        return `User follow-up ${index + 1}`;
-      }
-      if (total <= 1) return null;
-      if (total === 2) {
-        return index === 0 ? "First" : "Also";
-      }
-      return `[${index + 1}]`;
-    };
     const combinedContent = [];
-    let userIndex = 0;
-    for (const [i, msg] of messages.entries()) {
-      const kind = getMessageKind(msg);
-      const prefix = kind === "background" ? null : getUserPrefix(userIndex, totalUserMessages, hasBackgroundMessages);
-      if (kind !== "background") {
-        userIndex += 1;
+    let hasEntries = false;
+    let inUserSection = false;
+    for (const msg of messages) {
+      const isUserMessage = msg.kind !== "background";
+      if (isUserMessage && !inUserSection) {
+        if (hasEntries) {
+          combinedContent.push({ type: "text", text: "\n\n" });
+        }
+        combinedContent.push({ type: "text", text: "Additional user input received:" });
+        combinedContent.push({ type: "text", text: "\n\n" });
+        inUserSection = true;
+        hasEntries = false;
+      }
+      let prefixText = isUserMessage ? "- " : "";
+      if (hasEntries && !isUserMessage) {
+        combinedContent.push({ type: "text", text: "\n\n" });
+        inUserSection = false;
+      } else if (hasEntries && isUserMessage) {
+        prefixText = `
+
+${prefixText}`;
       }
-      let prefixText = prefix ? `${prefix}: ` : "";
+      const entryStartIndex = combinedContent.length;
       for (const part of msg.content) {
         if (part.type === "text") {
           if (prefixText) {
@@ -227,8 +252,8 @@ class MessageQueueService {
       if (prefixText && msg.content.length === 0) {
         combinedContent.push({ type: "text", text: prefixText + "[empty message]" });
       }
-      if (i < messages.length - 1) {
-        combinedContent.push({ type: "text", text: "\n\n" });
+      if (combinedContent.length > entryStartIndex) {
+        hasEntries = true;
       }
     }
     const firstMessage = messages[0];
@@ -249,6 +274,11 @@ class MessageQueueService {
   hasPending() {
     return this.queue.length > 0;
   }
+  async refresh() {
+    await this.runWithMutationLock(async () => {
+      await this.refreshFromStore();
+    });
+  }
   /**
    * Get the number of pending messages.
    */
@@ -276,16 +306,17 @@ class MessageQueueService {
   }
   /**
    * Get all queued messages (for UI display).
-   * Returns a shallow copy to prevent external mutation.
+   * Returns defensive copies to prevent external mutation.
    */
   getAll() {
-    return [...this.queue];
+    return (0, import_queue_clone.cloneQueuedMessages)(this.queue);
   }
   /**
    * Get a single queued message by ID.
    */
   get(id) {
-    return this.queue.find((m) => m.id === id);
+    const message = this.queue.find((m) => m.id === id);
+    return message ? (0, import_queue_clone.cloneQueuedMessage)(message) : void 0;
   }
   /**
    * Remove a single queued message by ID.
@@ -308,7 +339,7 @@ class MessageQueueService {
         throw error;
       }
       this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
-      this.eventBus.emit("message:removed", { id });
+      this.eventBus.emit("message:removed", { id, queue: this.queueKind });
       return true;
     });
   }

package/dist/session/message-queue.d.ts

@@ -2,8 +2,8 @@ import type { SessionEventBus } from '../events/index.js';
 import type { QueuedMessage, CoalescedMessage } from './types.js';
 import type { ContentPart } from '../context/types.js';
 import type { Logger } from '../logger/v2/types.js';
-import type { MessageQueueStore } from './message-queue-store.js';
-type MessageQueueBackingStore = Pick<MessageQueueStore, 'load' | 'save' | 'delete'>;
+import type { SessionMessageQueueStore } from '../storage/message-queue/types.js';
+type MessageQueueBackingStore = SessionMessageQueueStore;
 /**
  * Input for enqueuing a user message to the queue.
  * (Not to be confused with UserMessage from context/types.ts which represents
@@ -50,14 +50,16 @@ export declare class MessageQueueService {
     private logger;
     private sessionId;
     private store;
+    private queueKind;
     private queue;
     private mutationLock;
     private initialized;
     private initializationPromise;
-    static createEphemeral(eventBus: SessionEventBus, logger: Logger, sessionId: string): MessageQueueService;
-    constructor(eventBus: SessionEventBus, logger: Logger, sessionId: string, store: MessageQueueBackingStore);
+    static createEphemeral(eventBus: SessionEventBus, logger: Logger, sessionId: string, queueKind?: 'steer' | 'follow-up'): MessageQueueService;
+    constructor(eventBus: SessionEventBus, logger: Logger, sessionId: string, store: MessageQueueBackingStore, queueKind?: 'steer' | 'follow-up');
     initialize(): Promise<void>;
     private persistQueue;
+    private refreshFromStore;
     private runWithMutationLock;
     /**
      * Add a message to the queue.
@@ -81,11 +83,13 @@ export declare class MessageQueueService {
      * If 3 messages are queued: "stop", "try X instead", "also check Y"
      * They become:
      * ```
-     * [1]: stop
+     * Additional user input received:
      *
-     * [2]: try X instead
+     * - stop
      *
-     * [3]: also check Y
+     * - try X instead
+     *
+     * - also check Y
      * ```
      *
      * @returns Coalesced message or null if queue is empty
@@ -100,6 +104,7 @@ export declare class MessageQueueService {
      * Check if there are pending messages in the queue.
      */
     hasPending(): boolean;
+    refresh(): Promise<void>;
     /**
      * Get the number of pending messages.
      */
@@ -111,7 +116,7 @@ export declare class MessageQueueService {
     clear(): Promise<void>;
     /**
      * Get all queued messages (for UI display).
-     * Returns a shallow copy to prevent external mutation.
+     * Returns defensive copies to prevent external mutation.
      */
     getAll(): QueuedMessage[];
     /**

package/dist/session/message-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../../src/session/message-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,KAAK,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC,CAAC;AAyBpF;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,2DAA2D;IAC3D,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,sCAAsC;IACtC,IAAI,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,mBAAmB;IAoBxB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IAtBjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,YAAY,CAAoC;IACxD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,qBAAqB,CAA8B;IAE3D,MAAM,CAAC,eAAe,CAClB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAClB,mBAAmB;gBAUV,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,wBAAwB;IAGrC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAsBnB,YAAY;IAI1B,OAAO,CAAC,mBAAmB;IAS3B;;;;;;OAMG;IACG,OAAO,CACT,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAkC1D;;;;;;;;;;;;;;;;;;OAkBG;IACG,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAgCpD;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAuGhB;;OAEG;IACH,UAAU,IAAI,OAAO;IAIrB;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB5B;;;OAGG;IACH,MAAM,IAAI,aAAa,EAAE;IAIzB;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1C;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAwB7C"}
+{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../../src/session/message-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAElF,KAAK,wBAAwB,GAAG,wBAAwB,CAAC;AA4BzD;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,2DAA2D;IAC3D,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,sCAAsC;IACtC,IAAI,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,mBAAmB;IAsBxB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,SAAS;IAzBrB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,YAAY,CAAoC;IACxD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,qBAAqB,CAA8B;IAE3D,MAAM,CAAC,eAAe,CAClB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAO,GAAG,WAAqB,GAC3C,mBAAmB;gBAWV,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,wBAAwB,EAC/B,SAAS,GAAE,OAAO,GAAG,WAAqB;IAGhD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAsBnB,YAAY;YAIZ,gBAAgB;IAiB9B,OAAO,CAAC,mBAAmB;IAS3B;;;;;;OAMG;IACG,OAAO,CACT,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAsC1D;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAkCpD;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAoFhB;;OAEG;IACH,UAAU,IAAI,OAAO;IAIf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB5B;;;OAGG;IACH,MAAM,IAAI,aAAa,EAAE;IAIzB;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAK1C;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAwB7C"}

package/dist/session/message-queue.js

@@ -1,37 +1,42 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
+import { cloneCoalescedMessage, cloneQueuedMessage, cloneQueuedMessages } from "./queue-clone.js";
 class EphemeralMessageQueueStore {
-  async load(sessionId) {
-    void sessionId;
+  async listSessionIds() {
     return [];
   }
-  async save(sessionId, queue) {
-    void sessionId;
-    void queue;
+  async load(input) {
+    void input;
+    return [];
+  }
+  async save(input) {
+    void input;
   }
-  async delete(sessionId) {
-    void sessionId;
+  async delete(input) {
+    void input;
   }
 }
 function generateId() {
   return `msg_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
 }
 class MessageQueueService {
-  constructor(eventBus, logger, sessionId, store) {
+  constructor(eventBus, logger, sessionId, store, queueKind = "steer") {
     this.eventBus = eventBus;
     this.logger = logger;
     this.sessionId = sessionId;
     this.store = store;
+    this.queueKind = queueKind;
   }
   queue = [];
   mutationLock = Promise.resolve();
   initialized = false;
   initializationPromise = null;
-  static createEphemeral(eventBus, logger, sessionId) {
+  static createEphemeral(eventBus, logger, sessionId, queueKind = "steer") {
     return new MessageQueueService(
       eventBus,
       logger,
       sessionId,
-      new EphemeralMessageQueueStore()
+      new EphemeralMessageQueueStore(),
+      queueKind
     );
   }
   async initialize() {
@@ -39,7 +44,7 @@ class MessageQueueService {
       if (this.initialized) {
         return;
       }
-      this.queue = await this.store.load(this.sessionId);
+      this.queue = await this.store.load({ sessionId: this.sessionId });
       if (this.queue.length > 0) {
         this.logger.debug(
           `Restored ${this.queue.length} queued message(s) for session ${this.sessionId}`
@@ -53,7 +58,21 @@ class MessageQueueService {
     await this.initializationPromise;
   }
   async persistQueue() {
-    await this.store.save(this.sessionId, this.queue);
+    await this.store.save({ sessionId: this.sessionId, queue: this.queue });
+  }
+  async refreshFromStore() {
+    const storedQueue = await this.store.load({ sessionId: this.sessionId });
+    const existingIds = new Set(this.queue.map((message) => message.id));
+    const externalMessages = storedQueue.filter((message) => !existingIds.has(message.id));
+    if (externalMessages.length === 0) {
+      return;
+    }
+    this.queue = [...this.queue, ...cloneQueuedMessages(externalMessages)].sort(
+      (left, right) => left.queuedAt - right.queuedAt
+    );
+    this.logger.debug(
+      `Loaded ${externalMessages.length} externally queued message(s) for session ${this.sessionId}`
+    );
   }
   runWithMutationLock(fn) {
     const currentResult = this.mutationLock.catch(() => {
@@ -77,10 +96,13 @@ class MessageQueueService {
         id: generateId(),
         content: message.content,
         queuedAt: Date.now(),
-        ...message.metadata !== void 0 && { metadata: message.metadata },
+        ...message.metadata !== void 0 && {
+          metadata: message.metadata
+        },
         ...message.kind !== void 0 && { kind: message.kind }
       };
-      this.queue.push(queuedMsg);
+      const copiedQueuedMsg = cloneQueuedMessage(queuedMsg);
+      this.queue.push(copiedQueuedMsg);
       try {
         await this.persistQueue();
       } catch (error) {
@@ -90,7 +112,8 @@ class MessageQueueService {
       this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
       this.eventBus.emit("message:queued", {
         position: this.queue.length,
-        id: queuedMsg.id
+        id: queuedMsg.id,
+        queue: this.queueKind
       });
       return {
         queued: true,
@@ -109,19 +132,22 @@ class MessageQueueService {
    * If 3 messages are queued: "stop", "try X instead", "also check Y"
    * They become:
    * ```
-   * [1]: stop
+   * Additional user input received:
+   *
+   * - stop
    *
-   * [2]: try X instead
+   * - try X instead
    *
-   * [3]: also check Y
+   * - also check Y
    * ```
    *
    * @returns Coalesced message or null if queue is empty
    */
   async dequeueAll() {
     return await this.runWithMutationLock(async () => {
+      await this.refreshFromStore();
       if (this.queue.length === 0) return null;
-      const messages = [...this.queue];
+      const messages = cloneQueuedMessages(this.queue);
       this.queue = [];
       try {
         await this.persistQueue();
@@ -136,9 +162,10 @@ class MessageQueueService {
       this.eventBus.emit("message:dequeued", {
         count: messages.length,
         ids: messages.map((m) => m.id),
+        queue: this.queueKind,
         coalesced: messages.length > 1,
-        content: combined.combinedContent,
-        messages
+        content: cloneCoalescedMessage(combined).combinedContent,
+        messages: cloneQueuedMessages(messages)
       });
       return combined;
     });
@@ -160,32 +187,30 @@ class MessageQueueService {
         lastQueuedAt: firstMsg.queuedAt
       };
     }
-    const getMessageKind = (message) => message.kind ?? "default";
-    const totalUserMessages = messages.filter(
-      (message) => getMessageKind(message) !== "background"
-    ).length;
-    const hasBackgroundMessages = messages.some(
-      (message) => getMessageKind(message) === "background"
-    );
-    const getUserPrefix = (index, total, mixed) => {
-      if (mixed) {
-        return `User follow-up ${index + 1}`;
-      }
-      if (total <= 1) return null;
-      if (total === 2) {
-        return index === 0 ? "First" : "Also";
-      }
-      return `[${index + 1}]`;
-    };
     const combinedContent = [];
-    let userIndex = 0;
-    for (const [i, msg] of messages.entries()) {
-      const kind = getMessageKind(msg);
-      const prefix = kind === "background" ? null : getUserPrefix(userIndex, totalUserMessages, hasBackgroundMessages);
-      if (kind !== "background") {
-        userIndex += 1;
+    let hasEntries = false;
+    let inUserSection = false;
+    for (const msg of messages) {
+      const isUserMessage = msg.kind !== "background";
+      if (isUserMessage && !inUserSection) {
+        if (hasEntries) {
+          combinedContent.push({ type: "text", text: "\n\n" });
+        }
+        combinedContent.push({ type: "text", text: "Additional user input received:" });
+        combinedContent.push({ type: "text", text: "\n\n" });
+        inUserSection = true;
+        hasEntries = false;
+      }
+      let prefixText = isUserMessage ? "- " : "";
+      if (hasEntries && !isUserMessage) {
+        combinedContent.push({ type: "text", text: "\n\n" });
+        inUserSection = false;
+      } else if (hasEntries && isUserMessage) {
+        prefixText = `
+
+${prefixText}`;
       }
-      let prefixText = prefix ? `${prefix}: ` : "";
+      const entryStartIndex = combinedContent.length;
       for (const part of msg.content) {
         if (part.type === "text") {
           if (prefixText) {
@@ -205,8 +230,8 @@ class MessageQueueService {
       if (prefixText && msg.content.length === 0) {
         combinedContent.push({ type: "text", text: prefixText + "[empty message]" });
       }
-      if (i < messages.length - 1) {
-        combinedContent.push({ type: "text", text: "\n\n" });
+      if (combinedContent.length > entryStartIndex) {
+        hasEntries = true;
       }
     }
     const firstMessage = messages[0];
@@ -227,6 +252,11 @@ class MessageQueueService {
   hasPending() {
     return this.queue.length > 0;
   }
+  async refresh() {
+    await this.runWithMutationLock(async () => {
+      await this.refreshFromStore();
+    });
+  }
   /**
    * Get the number of pending messages.
    */
@@ -254,16 +284,17 @@ class MessageQueueService {
   }
   /**
    * Get all queued messages (for UI display).
-   * Returns a shallow copy to prevent external mutation.
+   * Returns defensive copies to prevent external mutation.
    */
   getAll() {
-    return [...this.queue];
+    return cloneQueuedMessages(this.queue);
   }
   /**
    * Get a single queued message by ID.
    */
   get(id) {
-    return this.queue.find((m) => m.id === id);
+    const message = this.queue.find((m) => m.id === id);
+    return message ? cloneQueuedMessage(message) : void 0;
   }
   /**
    * Remove a single queued message by ID.
@@ -286,7 +317,7 @@ class MessageQueueService {
         throw error;
       }
       this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
-      this.eventBus.emit("message:removed", { id });
+      this.eventBus.emit("message:removed", { id, queue: this.queueKind });
       return true;
     });
   }

package/dist/session/queue-clone.cjs

@@ -0,0 +1,50 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var queue_clone_exports = {};
+__export(queue_clone_exports, {
+  cloneCoalescedMessage: () => cloneCoalescedMessage,
+  cloneQueuedMessage: () => cloneQueuedMessage,
+  cloneQueuedMessages: () => cloneQueuedMessages
+});
+module.exports = __toCommonJS(queue_clone_exports);
+var import_content_clone = require("../context/content-clone.js");
+function cloneQueuedMessage(message) {
+  return {
+    ...message,
+    content: (0, import_content_clone.cloneContentParts)(message.content),
+    ...message.metadata !== void 0 ? { metadata: structuredClone(message.metadata) } : {}
+  };
+}
+function cloneQueuedMessages(messages) {
+  return messages.map(cloneQueuedMessage);
+}
+function cloneCoalescedMessage(message) {
+  return {
+    messages: cloneQueuedMessages(message.messages),
+    combinedContent: (0, import_content_clone.cloneContentParts)(message.combinedContent),
+    firstQueuedAt: message.firstQueuedAt,
+    lastQueuedAt: message.lastQueuedAt
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cloneCoalescedMessage,
+  cloneQueuedMessage,
+  cloneQueuedMessages
+});

package/dist/session/queue-clone.d.ts

@@ -0,0 +1,5 @@
+import type { CoalescedMessage, QueuedMessage } from './types.js';
+export declare function cloneQueuedMessage(message: QueuedMessage): QueuedMessage;
+export declare function cloneQueuedMessages(messages: QueuedMessage[]): QueuedMessage[];
+export declare function cloneCoalescedMessage(message: CoalescedMessage): CoalescedMessage;
+//# sourceMappingURL=queue-clone.d.ts.map

package/dist/session/queue-clone.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue-clone.d.ts","sourceRoot":"","sources":["../../src/session/queue-clone.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAMxE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAE9E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB,CAOjF"}

package/dist/session/queue-clone.js

@@ -0,0 +1,25 @@
+import "../chunk-C6A6W6XS.js";
+import { cloneContentParts } from "../context/content-clone.js";
+function cloneQueuedMessage(message) {
+  return {
+    ...message,
+    content: cloneContentParts(message.content),
+    ...message.metadata !== void 0 ? { metadata: structuredClone(message.metadata) } : {}
+  };
+}
+function cloneQueuedMessages(messages) {
+  return messages.map(cloneQueuedMessage);
+}
+function cloneCoalescedMessage(message) {
+  return {
+    messages: cloneQueuedMessages(message.messages),
+    combinedContent: cloneContentParts(message.combinedContent),
+    firstQueuedAt: message.firstQueuedAt,
+    lastQueuedAt: message.lastQueuedAt
+  };
+}
+export {
+  cloneCoalescedMessage,
+  cloneQueuedMessage,
+  cloneQueuedMessages
+};