@dexto/core 1.6.25 → 1.6.27

package/dist/session/message-queue.cjs

@@ -21,15 +21,71 @@ __export(message_queue_exports, {
   MessageQueueService: () => MessageQueueService
 });
 module.exports = __toCommonJS(message_queue_exports);
+class EphemeralMessageQueueStore {
+  async load(sessionId) {
+    void sessionId;
+    return [];
+  }
+  async save(sessionId, queue) {
+    void sessionId;
+    void queue;
+  }
+  async delete(sessionId) {
+    void sessionId;
+  }
+}
 function generateId() {
   return `msg_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
 }
 class MessageQueueService {
-  constructor(eventBus, logger) {
+  constructor(eventBus, logger, sessionId, store) {
     this.eventBus = eventBus;
     this.logger = logger;
+    this.sessionId = sessionId;
+    this.store = store;
   }
   queue = [];
+  mutationLock = Promise.resolve();
+  initialized = false;
+  initializationPromise = null;
+  static createEphemeral(eventBus, logger, sessionId) {
+    return new MessageQueueService(
+      eventBus,
+      logger,
+      sessionId,
+      new EphemeralMessageQueueStore()
+    );
+  }
+  async initialize() {
+    this.initializationPromise ??= this.runWithMutationLock(async () => {
+      if (this.initialized) {
+        return;
+      }
+      this.queue = await this.store.load(this.sessionId);
+      if (this.queue.length > 0) {
+        this.logger.debug(
+          `Restored ${this.queue.length} queued message(s) for session ${this.sessionId}`
+        );
+      }
+      this.initialized = true;
+    }).catch((error) => {
+      this.initializationPromise = null;
+      throw error;
+    });
+    await this.initializationPromise;
+  }
+  async persistQueue() {
+    await this.store.save(this.sessionId, this.queue);
+  }
+  runWithMutationLock(fn) {
+    const currentResult = this.mutationLock.catch(() => {
+    }).then(() => fn());
+    this.mutationLock = currentResult.then(
+      () => void 0,
+      () => void 0
+    );
+    return currentResult;
+  }
   /**
    * Add a message to the queue.
    * Called by API endpoint - returns immediately with queue position.
@@ -37,25 +93,33 @@ class MessageQueueService {
    * @param message The user message to queue
    * @returns Queue position and message ID
    */
-  enqueue(message) {
-    const queuedMsg = {
-      id: generateId(),
-      content: message.content,
-      queuedAt: Date.now(),
-      ...message.metadata !== void 0 && { metadata: message.metadata },
-      ...message.kind !== void 0 && { kind: message.kind }
-    };
-    this.queue.push(queuedMsg);
-    this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
-    this.eventBus.emit("message:queued", {
-      position: this.queue.length,
-      id: queuedMsg.id
+  async enqueue(message) {
+    return await this.runWithMutationLock(async () => {
+      const queuedMsg = {
+        id: generateId(),
+        content: message.content,
+        queuedAt: Date.now(),
+        ...message.metadata !== void 0 && { metadata: message.metadata },
+        ...message.kind !== void 0 && { kind: message.kind }
+      };
+      this.queue.push(queuedMsg);
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        this.queue.pop();
+        throw error;
+      }
+      this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
+      this.eventBus.emit("message:queued", {
+        position: this.queue.length,
+        id: queuedMsg.id
+      });
+      return {
+        queued: true,
+        position: this.queue.length,
+        id: queuedMsg.id
+      };
     });
-    return {
-      queued: true,
-      position: this.queue.length,
-      id: queuedMsg.id
-    };
   }
   /**
    * Dequeue ALL pending messages and coalesce into single injection.
@@ -76,22 +140,30 @@ class MessageQueueService {
    *
    * @returns Coalesced message or null if queue is empty
    */
-  dequeueAll() {
-    if (this.queue.length === 0) return null;
-    const messages = [...this.queue];
-    this.queue = [];
-    const combined = this.coalesce(messages);
-    this.logger.debug(
-      `Dequeued ${messages.length} message(s): ${messages.map((m) => m.id).join(", ")}`
-    );
-    this.eventBus.emit("message:dequeued", {
-      count: messages.length,
-      ids: messages.map((m) => m.id),
-      coalesced: messages.length > 1,
-      content: combined.combinedContent,
-      messages
+  async dequeueAll() {
+    return await this.runWithMutationLock(async () => {
+      if (this.queue.length === 0) return null;
+      const messages = [...this.queue];
+      this.queue = [];
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        this.queue = messages;
+        throw error;
+      }
+      const combined = this.coalesce(messages);
+      this.logger.debug(
+        `Dequeued ${messages.length} message(s): ${messages.map((m) => m.id).join(", ")}`
+      );
+      this.eventBus.emit("message:dequeued", {
+        count: messages.length,
+        ids: messages.map((m) => m.id),
+        coalesced: messages.length > 1,
+        content: combined.combinedContent,
+        messages
+      });
+      return combined;
     });
-    return combined;
   }
   /**
    * Coalesce multiple messages into one (multimodal-aware).
@@ -187,8 +259,20 @@ class MessageQueueService {
    * Clear all pending messages without processing.
    * Used during cleanup/abort.
    */
-  clear() {
-    this.queue = [];
+  async clear() {
+    await this.runWithMutationLock(async () => {
+      if (this.queue.length === 0) {
+        return;
+      }
+      const previousQueue = [...this.queue];
+      this.queue = [];
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        this.queue = previousQueue;
+        throw error;
+      }
+    });
   }
   /**
    * Get all queued messages (for UI display).
@@ -207,16 +291,26 @@ class MessageQueueService {
    * Remove a single queued message by ID.
    * @returns true if message was found and removed; false otherwise
    */
-  remove(id) {
-    const index = this.queue.findIndex((m) => m.id === id);
-    if (index === -1) {
-      this.logger.debug(`Remove failed: message ${id} not found in queue`);
-      return false;
-    }
-    this.queue.splice(index, 1);
-    this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
-    this.eventBus.emit("message:removed", { id });
-    return true;
+  async remove(id) {
+    return await this.runWithMutationLock(async () => {
+      const index = this.queue.findIndex((m) => m.id === id);
+      if (index === -1) {
+        this.logger.debug(`Remove failed: message ${id} not found in queue`);
+        return false;
+      }
+      const [removed] = this.queue.splice(index, 1);
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        if (removed) {
+          this.queue.splice(index, 0, removed);
+        }
+        throw error;
+      }
+      this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
+      this.eventBus.emit("message:removed", { id });
+      return true;
+    });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -2,6 +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'>;
 /**
  * Input for enqueuing a user message to the queue.
  * (Not to be confused with UserMessage from context/types.ts which represents
@@ -46,8 +48,17 @@ export interface UserMessageInput {
 export declare class MessageQueueService {
     private eventBus;
     private logger;
+    private sessionId;
+    private store;
     private queue;
-    constructor(eventBus: SessionEventBus, logger: Logger);
+    private mutationLock;
+    private initialized;
+    private initializationPromise;
+    static createEphemeral(eventBus: SessionEventBus, logger: Logger, sessionId: string): MessageQueueService;
+    constructor(eventBus: SessionEventBus, logger: Logger, sessionId: string, store: MessageQueueBackingStore);
+    initialize(): Promise<void>;
+    private persistQueue;
+    private runWithMutationLock;
     /**
      * Add a message to the queue.
      * Called by API endpoint - returns immediately with queue position.
@@ -55,11 +66,11 @@ export declare class MessageQueueService {
      * @param message The user message to queue
      * @returns Queue position and message ID
      */
-    enqueue(message: UserMessageInput): {
+    enqueue(message: UserMessageInput): Promise<{
         queued: true;
         position: number;
         id: string;
-    };
+    }>;
     /**
      * Dequeue ALL pending messages and coalesce into single injection.
      * Called by executor between steps.
@@ -79,7 +90,7 @@ export declare class MessageQueueService {
      *
      * @returns Coalesced message or null if queue is empty
      */
-    dequeueAll(): CoalescedMessage | null;
+    dequeueAll(): Promise<CoalescedMessage | null>;
     /**
      * Coalesce multiple messages into one (multimodal-aware).
      * Strategy: Combine with per-kind formatting, preserve all media.
@@ -97,7 +108,7 @@ export declare class MessageQueueService {
      * Clear all pending messages without processing.
      * Used during cleanup/abort.
      */
-    clear(): void;
+    clear(): Promise<void>;
     /**
      * Get all queued messages (for UI display).
      * Returns a shallow copy to prevent external mutation.
@@ -111,6 +122,7 @@ export declare class MessageQueueService {
      * Remove a single queued message by ID.
      * @returns true if message was found and removed; false otherwise
      */
-    remove(id: string): boolean;
+    remove(id: string): Promise<boolean>;
 }
+export {};
 //# sourceMappingURL=message-queue.d.ts.map

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;AASpD;;;;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;IAIxB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IAJlB,OAAO,CAAC,KAAK,CAAuB;gBAGxB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM;IAG1B;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE;IAyBlF;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,IAAI,gBAAgB,GAAG,IAAI;IAuBrC;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAuGhB;;OAEG;IACH,UAAU,IAAI,OAAO;IAIrB;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;;OAGG;IACH,KAAK,IAAI,IAAI;IAIb;;;OAGG;IACH,MAAM,IAAI,aAAa,EAAE;IAIzB;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1C;;;OAGG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;CAY9B"}
+{"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"}

package/dist/session/message-queue.js

@@ -1,13 +1,69 @@
 import "../chunk-PTJYTZNU.js";
+class EphemeralMessageQueueStore {
+  async load(sessionId) {
+    void sessionId;
+    return [];
+  }
+  async save(sessionId, queue) {
+    void sessionId;
+    void queue;
+  }
+  async delete(sessionId) {
+    void sessionId;
+  }
+}
 function generateId() {
   return `msg_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
 }
 class MessageQueueService {
-  constructor(eventBus, logger) {
+  constructor(eventBus, logger, sessionId, store) {
     this.eventBus = eventBus;
     this.logger = logger;
+    this.sessionId = sessionId;
+    this.store = store;
   }
   queue = [];
+  mutationLock = Promise.resolve();
+  initialized = false;
+  initializationPromise = null;
+  static createEphemeral(eventBus, logger, sessionId) {
+    return new MessageQueueService(
+      eventBus,
+      logger,
+      sessionId,
+      new EphemeralMessageQueueStore()
+    );
+  }
+  async initialize() {
+    this.initializationPromise ??= this.runWithMutationLock(async () => {
+      if (this.initialized) {
+        return;
+      }
+      this.queue = await this.store.load(this.sessionId);
+      if (this.queue.length > 0) {
+        this.logger.debug(
+          `Restored ${this.queue.length} queued message(s) for session ${this.sessionId}`
+        );
+      }
+      this.initialized = true;
+    }).catch((error) => {
+      this.initializationPromise = null;
+      throw error;
+    });
+    await this.initializationPromise;
+  }
+  async persistQueue() {
+    await this.store.save(this.sessionId, this.queue);
+  }
+  runWithMutationLock(fn) {
+    const currentResult = this.mutationLock.catch(() => {
+    }).then(() => fn());
+    this.mutationLock = currentResult.then(
+      () => void 0,
+      () => void 0
+    );
+    return currentResult;
+  }
   /**
    * Add a message to the queue.
    * Called by API endpoint - returns immediately with queue position.
@@ -15,25 +71,33 @@ class MessageQueueService {
    * @param message The user message to queue
    * @returns Queue position and message ID
    */
-  enqueue(message) {
-    const queuedMsg = {
-      id: generateId(),
-      content: message.content,
-      queuedAt: Date.now(),
-      ...message.metadata !== void 0 && { metadata: message.metadata },
-      ...message.kind !== void 0 && { kind: message.kind }
-    };
-    this.queue.push(queuedMsg);
-    this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
-    this.eventBus.emit("message:queued", {
-      position: this.queue.length,
-      id: queuedMsg.id
+  async enqueue(message) {
+    return await this.runWithMutationLock(async () => {
+      const queuedMsg = {
+        id: generateId(),
+        content: message.content,
+        queuedAt: Date.now(),
+        ...message.metadata !== void 0 && { metadata: message.metadata },
+        ...message.kind !== void 0 && { kind: message.kind }
+      };
+      this.queue.push(queuedMsg);
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        this.queue.pop();
+        throw error;
+      }
+      this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
+      this.eventBus.emit("message:queued", {
+        position: this.queue.length,
+        id: queuedMsg.id
+      });
+      return {
+        queued: true,
+        position: this.queue.length,
+        id: queuedMsg.id
+      };
     });
-    return {
-      queued: true,
-      position: this.queue.length,
-      id: queuedMsg.id
-    };
   }
   /**
    * Dequeue ALL pending messages and coalesce into single injection.
@@ -54,22 +118,30 @@ class MessageQueueService {
    *
    * @returns Coalesced message or null if queue is empty
    */
-  dequeueAll() {
-    if (this.queue.length === 0) return null;
-    const messages = [...this.queue];
-    this.queue = [];
-    const combined = this.coalesce(messages);
-    this.logger.debug(
-      `Dequeued ${messages.length} message(s): ${messages.map((m) => m.id).join(", ")}`
-    );
-    this.eventBus.emit("message:dequeued", {
-      count: messages.length,
-      ids: messages.map((m) => m.id),
-      coalesced: messages.length > 1,
-      content: combined.combinedContent,
-      messages
+  async dequeueAll() {
+    return await this.runWithMutationLock(async () => {
+      if (this.queue.length === 0) return null;
+      const messages = [...this.queue];
+      this.queue = [];
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        this.queue = messages;
+        throw error;
+      }
+      const combined = this.coalesce(messages);
+      this.logger.debug(
+        `Dequeued ${messages.length} message(s): ${messages.map((m) => m.id).join(", ")}`
+      );
+      this.eventBus.emit("message:dequeued", {
+        count: messages.length,
+        ids: messages.map((m) => m.id),
+        coalesced: messages.length > 1,
+        content: combined.combinedContent,
+        messages
+      });
+      return combined;
     });
-    return combined;
   }
   /**
    * Coalesce multiple messages into one (multimodal-aware).
@@ -165,8 +237,20 @@ class MessageQueueService {
    * Clear all pending messages without processing.
    * Used during cleanup/abort.
    */
-  clear() {
-    this.queue = [];
+  async clear() {
+    await this.runWithMutationLock(async () => {
+      if (this.queue.length === 0) {
+        return;
+      }
+      const previousQueue = [...this.queue];
+      this.queue = [];
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        this.queue = previousQueue;
+        throw error;
+      }
+    });
   }
   /**
    * Get all queued messages (for UI display).
@@ -185,16 +269,26 @@ class MessageQueueService {
    * Remove a single queued message by ID.
    * @returns true if message was found and removed; false otherwise
    */
-  remove(id) {
-    const index = this.queue.findIndex((m) => m.id === id);
-    if (index === -1) {
-      this.logger.debug(`Remove failed: message ${id} not found in queue`);
-      return false;
-    }
-    this.queue.splice(index, 1);
-    this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
-    this.eventBus.emit("message:removed", { id });
-    return true;
+  async remove(id) {
+    return await this.runWithMutationLock(async () => {
+      const index = this.queue.findIndex((m) => m.id === id);
+      if (index === -1) {
+        this.logger.debug(`Remove failed: message ${id} not found in queue`);
+        return false;
+      }
+      const [removed] = this.queue.splice(index, 1);
+      try {
+        await this.persistQueue();
+      } catch (error) {
+        if (removed) {
+          this.queue.splice(index, 0, removed);
+        }
+        throw error;
+      }
+      this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
+      this.eventBus.emit("message:removed", { id });
+      return true;
+    });
   }
 }
 export {