@dudousxd/nestjs-agent-store-drizzle 0.21.0 → 0.22.1

package/README.md

@@ -150,7 +150,7 @@ reader's `IN (…)` and `truncateFrom`'s delete) filter on it.
 ## Attachment housekeeping
 
 `referencedMediaIds(actorRef, mediaIds)` answers which of a set of media ids a message that still
-exists carries, for one actor — the inverse of the host's own staged-media inventory, and the half a
+exists — or one still waiting in a thread's queue (`agent_queued_message`) — carries, for one actor — the inverse of the host's own staged-media inventory, and the half a
 sweep cannot work out for itself. It needs **no schema change**: it reads the `attachments` JSON
 column messages have carried since attachments shipped, so an existing database answers correctly
 the moment you upgrade, with nothing to backfill.

package/dist/index.cjs

@@ -28,6 +28,8 @@ __export(index_exports, {
   DrizzleMemoryProvider: () => DrizzleMemoryProvider,
   DrizzlePricingStore: () => DrizzlePricingStore,
   DrizzleRagIngestionLog: () => DrizzleRagIngestionLog,
+  DrizzleStreamFrameTable: () => DrizzleStreamFrameTable,
+  DrizzleTokenStreamSink: () => DrizzleTokenStreamSink,
   RAG_INGESTION_LOG_PAGE_ORDER: () => RAG_INGESTION_LOG_PAGE_ORDER,
   agentConfirmToken: () => agentConfirmToken,
   agentMemory: () => agentMemory,
@@ -36,6 +38,7 @@ __export(index_exports, {
   agentQueuedMessage: () => agentQueuedMessage,
   agentRun: () => agentRun,
   agentSchema: () => agentSchema,
+  agentStreamFrame: () => agentStreamFrame,
   agentThread: () => agentThread,
   agentTokenUsage: () => agentTokenUsage,
   agentToolCall: () => agentToolCall,
@@ -318,6 +321,20 @@ var agentConfirmToken = (0, import_sqlite_core.sqliteTable)("agent_confirm_token
 }, (table) => [
   (0, import_sqlite_core.index)("agent_confirm_token_expires_idx").on(table.expiresAt)
 ]);
+var agentStreamFrame = (0, import_sqlite_core.sqliteTable)("agent_stream_frame", {
+  runId: (0, import_sqlite_core.text)("run_id").notNull(),
+  seq: (0, import_sqlite_core.integer)("seq").notNull(),
+  frame: (0, import_sqlite_core.text)("frame"),
+  error: (0, import_sqlite_core.text)("error"),
+  createdAt: (0, import_sqlite_core.integer)("created_at").notNull()
+}, (table) => [
+  (0, import_sqlite_core.primaryKey)({
+    columns: [
+      table.runId,
+      table.seq
+    ]
+  })
+]);
 var agentSchema = {
   agentThread,
   agentMessage,
@@ -484,6 +501,14 @@ var statements = [
   )`,
   `CREATE INDEX IF NOT EXISTS rag_ingestion_log_collection_idx
     ON rag_ingestion_log (collection, updated_at)`,
+  `CREATE TABLE IF NOT EXISTS agent_stream_frame (
+    run_id TEXT NOT NULL,
+    seq INTEGER NOT NULL,
+    frame TEXT,
+    error TEXT,
+    created_at INTEGER NOT NULL,
+    PRIMARY KEY (run_id, seq)
+  )`,
   `CREATE TABLE IF NOT EXISTS agent_confirm_token (
     hash TEXT PRIMARY KEY NOT NULL,
     actor_ref TEXT NOT NULL,
@@ -1210,7 +1235,8 @@ var DrizzleAgentStore = class {
     return rows.length;
   }
   /**
-  * Of `mediaIds`, the ones a surviving message in one of this actor's threads still carries.
+  * Of `mediaIds`, the ones a surviving message — or a message waiting in the queue — in one of
+  * this actor's threads still carries.
   *
   * Reads the `attachments` JSON back out and matches in memory rather than pushing the match into
   * SQL: the column holds an array of objects, and every dialect this adapter's sibling targets
@@ -1229,9 +1255,15 @@ var DrizzleAgentStore = class {
     const rows = await this.db.select({
       attachments: agentMessage.attachments
     }).from(agentMessage).innerJoin(agentThread, (0, import_drizzle_orm2.eq)(agentMessage.threadId, agentThread.id)).where((0, import_drizzle_orm2.and)((0, import_drizzle_orm2.eq)(agentThread.actorRef, actorRef), (0, import_drizzle_orm2.isNotNull)(agentMessage.attachments)));
+    const queued = await this.db.select({
+      attachments: agentQueuedMessage.attachments
+    }).from(agentQueuedMessage).innerJoin(agentThread, (0, import_drizzle_orm2.eq)(agentQueuedMessage.threadId, agentThread.id)).where((0, import_drizzle_orm2.and)((0, import_drizzle_orm2.eq)(agentThread.actorRef, actorRef), (0, import_drizzle_orm2.isNotNull)(agentQueuedMessage.attachments)));
     const wanted = new Set(mediaIds);
     const found = /* @__PURE__ */ new Set();
-    for (const row of rows) {
+    for (const row of [
+      ...rows,
+      ...queued
+    ]) {
       for (const attachment of row.attachments ?? []) {
         if (wanted.has(attachment.mediaId)) {
           found.add(attachment.mediaId);
@@ -2193,8 +2225,71 @@ var DrizzlePricingStore = class {
   }
 };
 
-// src/drizzle-confirm-token-store.ts
+// src/drizzle-token-stream-sink.ts
+var import_nestjs_agent_core4 = require("@dudousxd/nestjs-agent-core");
 var import_drizzle_orm6 = require("drizzle-orm");
+function isUniqueViolation(error) {
+  for (let current = error; current !== null && typeof current === "object"; ) {
+    const code = current.code;
+    if (typeof code === "string" && code.startsWith("SQLITE_CONSTRAINT")) return true;
+    current = current.cause;
+  }
+  return false;
+}
+__name(isUniqueViolation, "isUniqueViolation");
+var DrizzleStreamFrameTable = class {
+  static {
+    __name(this, "DrizzleStreamFrameTable");
+  }
+  db;
+  constructor(db) {
+    this.db = db;
+  }
+  async append(runId, row) {
+    await this.db.run(import_drizzle_orm6.sql`INSERT INTO agent_stream_frame (run_id, seq, frame, error, created_at)
+          SELECT ${runId}, COALESCE(MAX(seq), 0) + 1, ${row.frame}, ${row.error}, ${row.createdAt}
+          FROM agent_stream_frame WHERE run_id = ${runId}`);
+  }
+  async read(runId, after, limit) {
+    return this.db.select({
+      seq: agentStreamFrame.seq,
+      frame: agentStreamFrame.frame,
+      error: agentStreamFrame.error
+    }).from(agentStreamFrame).where((0, import_drizzle_orm6.and)((0, import_drizzle_orm6.eq)(agentStreamFrame.runId, runId), (0, import_drizzle_orm6.gt)(agentStreamFrame.seq, after))).orderBy((0, import_drizzle_orm6.asc)(agentStreamFrame.seq)).limit(limit);
+  }
+  async has(runId) {
+    const rows = await this.db.select({
+      seq: agentStreamFrame.seq
+    }).from(agentStreamFrame).where((0, import_drizzle_orm6.eq)(agentStreamFrame.runId, runId)).limit(1);
+    return rows.length > 0;
+  }
+  async remove(runIds) {
+    if (runIds.length === 0) return;
+    await this.db.delete(agentStreamFrame).where((0, import_drizzle_orm6.inArray)(agentStreamFrame.runId, [
+      ...runIds
+    ]));
+  }
+  async lapsedRuns(cutoff) {
+    const rows = await this.db.select({
+      runId: agentStreamFrame.runId
+    }).from(agentStreamFrame).groupBy(agentStreamFrame.runId).having((0, import_drizzle_orm6.lt)((0, import_drizzle_orm6.max)(agentStreamFrame.createdAt), cutoff));
+    return rows.map((row) => row.runId);
+  }
+  isUniqueViolation(error) {
+    return isUniqueViolation(error);
+  }
+};
+var DrizzleTokenStreamSink = class extends import_nestjs_agent_core4.SqlTokenStreamSink {
+  static {
+    __name(this, "DrizzleTokenStreamSink");
+  }
+  constructor(db, options = {}) {
+    super(new DrizzleStreamFrameTable(db), options);
+  }
+};
+
+// src/drizzle-confirm-token-store.ts
+var import_drizzle_orm7 = require("drizzle-orm");
 var DrizzleConfirmTokenStore = class {
   static {
     __name(this, "DrizzleConfirmTokenStore");
@@ -2216,10 +2311,10 @@ var DrizzleConfirmTokenStore = class {
     return inserted.length === 1;
   }
   async release(hash) {
-    await this.db.delete(agentConfirmToken).where((0, import_drizzle_orm6.eq)(agentConfirmToken.hash, hash));
+    await this.db.delete(agentConfirmToken).where((0, import_drizzle_orm7.eq)(agentConfirmToken.hash, hash));
   }
   async purgeExpired(now = Date.now()) {
-    const purged = await this.db.delete(agentConfirmToken).where((0, import_drizzle_orm6.lt)(agentConfirmToken.expiresAt, now)).returning({
+    const purged = await this.db.delete(agentConfirmToken).where((0, import_drizzle_orm7.lt)(agentConfirmToken.expiresAt, now)).returning({
       hash: agentConfirmToken.hash
     });
     return purged.length;
@@ -2229,7 +2324,7 @@ var DrizzleConfirmTokenStore = class {
 // src/drizzle-rag-ingestion-log.ts
 var import_node_diagnostics_channel = require("diagnostics_channel");
 var import_common = require("@nestjs/common");
-var import_drizzle_orm7 = require("drizzle-orm");
+var import_drizzle_orm8 = require("drizzle-orm");
 function _ts_decorate(decorators, target, key, desc4) {
   var c = arguments.length, r = c < 3 ? target : desc4 === null ? desc4 = Object.getOwnPropertyDescriptor(target, key) : desc4, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
@@ -2277,8 +2372,8 @@ function num(value) {
 }
 __name(num, "num");
 var RAG_INGESTION_LOG_PAGE_ORDER = [
-  (0, import_drizzle_orm7.desc)(ragIngestionLog.updatedAt),
-  (0, import_drizzle_orm7.asc)(ragIngestionLog.documentId)
+  (0, import_drizzle_orm8.desc)(ragIngestionLog.updatedAt),
+  (0, import_drizzle_orm8.asc)(ragIngestionLog.documentId)
 ];
 var DEFAULT_PAGE_SIZE = 200;
 var DEFAULT_BATCH_SIZE = 200;
@@ -2342,7 +2437,7 @@ var DrizzleRagIngestionLog = class _DrizzleRagIngestionLog {
   */
   async listPage(query = {}) {
     const [totalRow] = await this.db.select({
-      value: (0, import_drizzle_orm7.count)()
+      value: (0, import_drizzle_orm8.count)()
     }).from(ragIngestionLog).where(this.where(query));
     return {
       rows: await this.list(query),
@@ -2421,19 +2516,19 @@ var DrizzleRagIngestionLog = class _DrizzleRagIngestionLog {
   }
   /** The latest recorded outcome for one document, or null if it was never attempted. */
   async get(documentId) {
-    const [row] = await this.db.select().from(ragIngestionLog).where((0, import_drizzle_orm7.eq)(ragIngestionLog.documentId, documentId));
+    const [row] = await this.db.select().from(ragIngestionLog).where((0, import_drizzle_orm8.eq)(ragIngestionLog.documentId, documentId));
     return row ?? null;
   }
   /** Forget one document's record. Returns whether a row was actually removed. */
   async remove(documentId) {
-    const removed = await this.db.delete(ragIngestionLog).where((0, import_drizzle_orm7.eq)(ragIngestionLog.documentId, documentId)).returning({
+    const removed = await this.db.delete(ragIngestionLog).where((0, import_drizzle_orm8.eq)(ragIngestionLog.documentId, documentId)).returning({
       documentId: ragIngestionLog.documentId
     });
     return removed.length > 0;
   }
   /** Forget every record for a collection — for when the collection itself is deleted. */
   async removeByCollection(collection) {
-    const removed = await this.db.delete(ragIngestionLog).where((0, import_drizzle_orm7.eq)(ragIngestionLog.collection, collection)).returning({
+    const removed = await this.db.delete(ragIngestionLog).where((0, import_drizzle_orm8.eq)(ragIngestionLog.collection, collection)).returning({
       documentId: ragIngestionLog.documentId
     });
     return removed.length;
@@ -2465,7 +2560,7 @@ var DrizzleRagIngestionLog = class _DrizzleRagIngestionLog {
     }
   }
   where(query) {
-    return (0, import_drizzle_orm7.and)(query.collection !== void 0 ? (0, import_drizzle_orm7.eq)(ragIngestionLog.collection, query.collection) : void 0, query.status !== void 0 ? (0, import_drizzle_orm7.eq)(ragIngestionLog.status, query.status) : void 0);
+    return (0, import_drizzle_orm8.and)(query.collection !== void 0 ? (0, import_drizzle_orm8.eq)(ragIngestionLog.collection, query.collection) : void 0, query.status !== void 0 ? (0, import_drizzle_orm8.eq)(ragIngestionLog.status, query.status) : void 0);
   }
   /**
   * The coordinates filter AND'd with "strictly after `cursor` in
@@ -2480,7 +2575,7 @@ var DrizzleRagIngestionLog = class _DrizzleRagIngestionLog {
     if (cursor === void 0) {
       return base;
     }
-    return (0, import_drizzle_orm7.and)(base, (0, import_drizzle_orm7.or)((0, import_drizzle_orm7.lt)(ragIngestionLog.updatedAt, cursor.updatedAt), (0, import_drizzle_orm7.and)((0, import_drizzle_orm7.eq)(ragIngestionLog.updatedAt, cursor.updatedAt), (0, import_drizzle_orm7.gt)(ragIngestionLog.documentId, cursor.documentId))));
+    return (0, import_drizzle_orm8.and)(base, (0, import_drizzle_orm8.or)((0, import_drizzle_orm8.lt)(ragIngestionLog.updatedAt, cursor.updatedAt), (0, import_drizzle_orm8.and)((0, import_drizzle_orm8.eq)(ragIngestionLog.updatedAt, cursor.updatedAt), (0, import_drizzle_orm8.gt)(ragIngestionLog.documentId, cursor.documentId))));
   }
   /**
   * Upsert one outcome. Keyed by document id so the row always reflects the *current* state — a
@@ -2556,7 +2651,7 @@ DrizzleRagIngestionLog = _ts_decorate([
 ], DrizzleRagIngestionLog);
 
 // src/drizzle-agent-store.module.ts
-var import_nestjs_agent_core4 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core5 = require("@dudousxd/nestjs-agent-core");
 var import_common2 = require("@nestjs/common");
 function _ts_decorate2(decorators, target, key, desc4) {
   var c = arguments.length, r = c < 3 ? target : desc4 === null ? desc4 = Object.getOwnPropertyDescriptor(target, key) : desc4, d;
@@ -2593,7 +2688,7 @@ var DrizzleAgentStoreModule = class _DrizzleAgentStoreModule {
           useFactory: /* @__PURE__ */ __name(() => new DrizzleAgentStore(options.db), "useFactory")
         },
         {
-          provide: import_nestjs_agent_core4.AGENT_STORE,
+          provide: import_nestjs_agent_core5.AGENT_STORE,
           useExisting: DrizzleAgentStore
         },
         // Exported, never bound to AGENT_MEMORY: that token's PRESENCE is what turns memory on, so
@@ -2610,21 +2705,21 @@ var DrizzleAgentStoreModule = class _DrizzleAgentStoreModule {
         // AGENT_PRICING_STORE: the host's own store when supplied, else the default Drizzle one.
         // DrizzleGovernanceQueries prices usage against whatever is bound here.
         options.pricingStore ? {
-          provide: import_nestjs_agent_core4.AGENT_PRICING_STORE,
+          provide: import_nestjs_agent_core5.AGENT_PRICING_STORE,
           useClass: options.pricingStore
         } : {
-          provide: import_nestjs_agent_core4.AGENT_PRICING_STORE,
+          provide: import_nestjs_agent_core5.AGENT_PRICING_STORE,
           useExisting: DrizzlePricingStore
         },
         {
           provide: DrizzleGovernanceQueries,
           useFactory: /* @__PURE__ */ __name((pricingStore) => new DrizzleGovernanceQueries(options.db, pricingStore), "useFactory"),
           inject: [
-            import_nestjs_agent_core4.AGENT_PRICING_STORE
+            import_nestjs_agent_core5.AGENT_PRICING_STORE
           ]
         },
         {
-          provide: import_nestjs_agent_core4.AGENT_GOVERNANCE_QUERIES,
+          provide: import_nestjs_agent_core5.AGENT_GOVERNANCE_QUERIES,
           useExisting: DrizzleGovernanceQueries
         },
         // What makes a `defineConfirmedTool` confirmation single use across replicas.
@@ -2633,7 +2728,7 @@ var DrizzleAgentStoreModule = class _DrizzleAgentStoreModule {
           useFactory: /* @__PURE__ */ __name(() => new DrizzleConfirmTokenStore(options.db), "useFactory")
         },
         {
-          provide: import_nestjs_agent_core4.AGENT_CONFIRM_TOKEN_STORE,
+          provide: import_nestjs_agent_core5.AGENT_CONFIRM_TOKEN_STORE,
           useExisting: DrizzleConfirmTokenStore
         }
       ],
@@ -2642,14 +2737,14 @@ var DrizzleAgentStoreModule = class _DrizzleAgentStoreModule {
           DrizzleRagIngestionLog
         ],
         DrizzleAgentStore,
-        import_nestjs_agent_core4.AGENT_STORE,
+        import_nestjs_agent_core5.AGENT_STORE,
         DrizzleMemoryProvider,
         DrizzleGovernanceQueries,
-        import_nestjs_agent_core4.AGENT_GOVERNANCE_QUERIES,
+        import_nestjs_agent_core5.AGENT_GOVERNANCE_QUERIES,
         DrizzlePricingStore,
-        import_nestjs_agent_core4.AGENT_PRICING_STORE,
+        import_nestjs_agent_core5.AGENT_PRICING_STORE,
         DrizzleConfirmTokenStore,
-        import_nestjs_agent_core4.AGENT_CONFIRM_TOKEN_STORE
+        import_nestjs_agent_core5.AGENT_CONFIRM_TOKEN_STORE
       ]
     };
   }
@@ -2666,6 +2761,8 @@ DrizzleAgentStoreModule = _ts_decorate2([
   DrizzleMemoryProvider,
   DrizzlePricingStore,
   DrizzleRagIngestionLog,
+  DrizzleStreamFrameTable,
+  DrizzleTokenStreamSink,
   RAG_INGESTION_LOG_PAGE_ORDER,
   agentConfirmToken,
   agentMemory,
@@ -2674,6 +2771,7 @@ DrizzleAgentStoreModule = _ts_decorate2([
   agentQueuedMessage,
   agentRun,
   agentSchema,
+  agentStreamFrame,
   agentThread,
   agentTokenUsage,
   agentToolCall,