@dudousxd/nestjs-agent-store-drizzle 0.11.1 → 0.13.0

package/README.md

@@ -119,6 +119,10 @@ ALTER TABLE agent_run ADD COLUMN parent_run_id TEXT;
 ALTER TABLE agent_message ADD COLUMN reasoning TEXT;
 ALTER TABLE agent_message ADD COLUMN reasoning_ms INTEGER;
 ALTER TABLE agent_message ADD COLUMN ui TEXT;
+ALTER TABLE agent_tool_call ADD COLUMN approver TEXT;
+ALTER TABLE agent_tool_call ADD COLUMN expires_at INTEGER;
+ALTER TABLE agent_tool_call ADD COLUMN remember INTEGER;
+ALTER TABLE agent_tool_call ADD COLUMN decided_via TEXT;
 CREATE INDEX agent_tool_call_message_idx ON agent_tool_call (message_id);
 ```
 

package/dist/index.cjs

@@ -127,7 +127,19 @@ var agentToolCall = (0, import_sqlite_core.sqliteTable)("agent_tool_call", {
     mode: "timestamp_ms"
   }),
   /** The run (turn) this call belongs to, for a trace deep-link; null for a pre-rollout row. */
-  runId: (0, import_sqlite_core.text)("run_id")
+  runId: (0, import_sqlite_core.text)("run_id"),
+  /** Who had to approve it (`requester` or a role); null for a call no policy put to anyone. */
+  approver: (0, import_sqlite_core.text)("approver"),
+  /** When the approval request lapses; null → never. */
+  expiresAt: (0, import_sqlite_core.integer)("expires_at", {
+    mode: "timestamp_ms"
+  }),
+  /** The approval covers later calls of this tool in this thread. */
+  remember: (0, import_sqlite_core.integer)("remember", {
+    mode: "boolean"
+  }),
+  /** The surface the decision came through (`web`, `slack`, `remembered`, …). */
+  decidedVia: (0, import_sqlite_core.text)("decided_via")
 }, (table) => [
   (0, import_sqlite_core.index)("agent_tool_call_message_idx").on(table.messageId)
 ]);
@@ -313,7 +325,11 @@ var statements = [
     error TEXT,
     created_at INTEGER NOT NULL,
     executed_at INTEGER,
-    run_id TEXT
+    run_id TEXT,
+    approver TEXT,
+    expires_at INTEGER,
+    remember INTEGER,
+    decided_via TEXT
   )`,
   `CREATE INDEX IF NOT EXISTS agent_tool_call_message_idx
     ON agent_tool_call (message_id)`,
@@ -430,6 +446,26 @@ var additiveColumns = [
     table: "agent_message",
     column: "ui",
     ddl: "ALTER TABLE agent_message ADD COLUMN ui TEXT"
+  },
+  {
+    table: "agent_tool_call",
+    column: "approver",
+    ddl: "ALTER TABLE agent_tool_call ADD COLUMN approver TEXT"
+  },
+  {
+    table: "agent_tool_call",
+    column: "expires_at",
+    ddl: "ALTER TABLE agent_tool_call ADD COLUMN expires_at INTEGER"
+  },
+  {
+    table: "agent_tool_call",
+    column: "remember",
+    ddl: "ALTER TABLE agent_tool_call ADD COLUMN remember INTEGER"
+  },
+  {
+    table: "agent_tool_call",
+    column: "decided_via",
+    ddl: "ALTER TABLE agent_tool_call ADD COLUMN decided_via TEXT"
   }
 ];
 async function ensureAgentSchema(db) {
@@ -446,6 +482,7 @@ async function ensureAgentSchema(db) {
 __name(ensureAgentSchema, "ensureAgentSchema");
 
 // src/drizzle-agent-store.ts
+var import_nestjs_agent_core = require("@dudousxd/nestjs-agent-core");
 var import_drizzle_orm2 = require("drizzle-orm");
 var TURN_MESSAGE_COLUMNS = {
   id: agentMessage.id,
@@ -489,9 +526,17 @@ var DrizzleAgentStore = class {
     }
     const messages = await this.db.select().from(agentMessage).where((0, import_drizzle_orm2.eq)(agentMessage.threadId, threadId)).orderBy((0, import_drizzle_orm2.asc)(agentMessage.createdAt), (0, import_drizzle_orm2.asc)(agentMessage.id));
     const last = messages[messages.length - 1];
+    const approvals = await this.approvalsFor(messages.map((message) => message.id));
     return {
       ...this.toSummary(thread, last?.content),
-      messages: messages.map((message) => this.toStoredMessage(message)),
+      messages: messages.map((message) => {
+        const stored = this.toStoredMessage(message);
+        const onMessage = approvals.get(message.id);
+        return onMessage !== void 0 ? {
+          ...stored,
+          approvals: onMessage
+        } : stored;
+      }),
       ...thread.activeStreamId != null ? {
         activeStreamId: thread.activeStreamId
       } : {}
@@ -620,6 +665,69 @@ var DrizzleAgentStore = class {
     }).from(agentToolCall).innerJoin(agentMessage, (0, import_drizzle_orm2.eq)(agentToolCall.messageId, agentMessage.id)).innerJoin(agentThread, (0, import_drizzle_orm2.eq)(agentMessage.threadId, agentThread.id)).where((0, import_drizzle_orm2.eq)(agentToolCall.id, toolCallId));
     return row?.runId ?? row?.activeStreamId ?? null;
   }
+  /**
+  * The approval record of every call on `messageIds` that a policy put to a person, grouped by
+  * message. One query over the calls that carry an approver — a thread whose calls never asked
+  * anyone reads nothing back.
+  */
+  async approvalsFor(messageIds) {
+    const byMessage = /* @__PURE__ */ new Map();
+    if (messageIds.length === 0) {
+      return byMessage;
+    }
+    const rows = await this.db.select({
+      id: agentToolCall.id,
+      messageId: agentToolCall.messageId,
+      status: agentToolCall.status,
+      approver: agentToolCall.approver,
+      expiresAt: agentToolCall.expiresAt,
+      remember: agentToolCall.remember,
+      executedByRef: agentToolCall.executedByRef,
+      decidedVia: agentToolCall.decidedVia,
+      error: agentToolCall.error
+    }).from(agentToolCall).where((0, import_drizzle_orm2.and)((0, import_drizzle_orm2.inArray)(agentToolCall.messageId, messageIds), (0, import_drizzle_orm2.isNotNull)(agentToolCall.approver))).orderBy((0, import_drizzle_orm2.asc)(agentToolCall.createdAt), (0, import_drizzle_orm2.asc)(agentToolCall.id));
+    for (const row of rows) {
+      const approval = (0, import_nestjs_agent_core.toolCallApprovalFromRow)({
+        ...row,
+        toolCallId: row.id
+      });
+      if (approval === null) {
+        continue;
+      }
+      const list = byMessage.get(row.messageId) ?? [];
+      list.push(approval);
+      byMessage.set(row.messageId, list);
+    }
+    return byMessage;
+  }
+  /** Tools whose approval someone asked to remember in this thread. */
+  async rememberedApprovals(threadId) {
+    const rows = await this.db.selectDistinct({
+      toolName: agentToolCall.toolName
+    }).from(agentToolCall).innerJoin(agentMessage, (0, import_drizzle_orm2.eq)(agentToolCall.messageId, agentMessage.id)).where((0, import_drizzle_orm2.and)((0, import_drizzle_orm2.eq)(agentMessage.threadId, threadId), (0, import_drizzle_orm2.eq)(agentToolCall.remember, true)));
+    return rows.map((row) => row.toolName);
+  }
+  async toolCallInput(toolCallId) {
+    const [row] = await this.db.select({
+      input: agentToolCall.input
+    }).from(agentToolCall).where((0, import_drizzle_orm2.eq)(agentToolCall.id, toolCallId));
+    return row?.input ?? null;
+  }
+  async toolCallApproval(toolCallId) {
+    const [row] = await this.db.select({
+      status: agentToolCall.status,
+      approver: agentToolCall.approver,
+      expiresAt: agentToolCall.expiresAt
+    }).from(agentToolCall).where((0, import_drizzle_orm2.eq)(agentToolCall.id, toolCallId));
+    if (row === void 0) {
+      return null;
+    }
+    return {
+      status: row.status,
+      approver: row.approver,
+      expiresAt: row.expiresAt?.toISOString() ?? null
+    };
+  }
   async ownerOfActiveStream(runId) {
     const [thread] = await this.db.select({
       actorRef: agentThread.actorRef
@@ -779,7 +887,11 @@ var DrizzleAgentStore = class {
       error: null,
       createdAt: /* @__PURE__ */ new Date(),
       executedAt: null,
-      runId: input.runId ?? null
+      runId: input.runId ?? null,
+      approver: input.approver ?? null,
+      expiresAt: input.expiresAt !== void 0 ? new Date(input.expiresAt) : null,
+      remember: null,
+      decidedVia: null
     });
   }
   async updateToolCall(input) {
@@ -798,6 +910,12 @@ var DrizzleAgentStore = class {
     if (input.executedByRef !== void 0) {
       updates.executedByRef = input.executedByRef;
     }
+    if (input.remember !== void 0) {
+      updates.remember = input.remember;
+    }
+    if (input.decidedVia !== void 0) {
+      updates.decidedVia = input.decidedVia;
+    }
     if (input.status === "executed" || input.status === "auto_executed") {
       updates.executedAt = /* @__PURE__ */ new Date();
     }
@@ -917,7 +1035,7 @@ var DrizzleAgentStore = class {
 };
 
 // src/drizzle-governance-queries.ts
-var import_nestjs_agent_core = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core2 = require("@dudousxd/nestjs-agent-core");
 var import_drizzle_orm3 = require("drizzle-orm");
 var UNCLASSIFIED_ERROR_CODE = "unknown";
 var DEFAULT_AGENT_BUCKET = "(default)";
@@ -926,7 +1044,8 @@ var TOOL_CALL_STATUSES = [
   "pending_approval",
   "executed",
   "rejected",
-  "failed"
+  "failed",
+  "expired"
 ];
 function isToolCallStatus(value) {
   return TOOL_CALL_STATUSES.includes(value);
@@ -952,14 +1071,14 @@ function isRunStatus(value) {
 }
 __name(isRunStatus, "isRunStatus");
 function dayStartUtc(day) {
-  return (0, import_nestjs_agent_core.dayBoundsUtc)({
+  return (0, import_nestjs_agent_core2.dayBoundsUtc)({
     fromDay: day,
     toDay: day
   }).start;
 }
 __name(dayStartUtc, "dayStartUtc");
 function dayEndUtc(day) {
-  return (0, import_nestjs_agent_core.dayBoundsUtc)({
+  return (0, import_nestjs_agent_core2.dayBoundsUtc)({
     fromDay: day,
     toDay: day
   }).end;
@@ -1050,17 +1169,17 @@ var DrizzleGovernanceQueries = class {
     return pricing;
   }
   async usageInRange(range) {
-    const { start, end } = (0, import_nestjs_agent_core.dayBoundsUtc)(range);
+    const { start, end } = (0, import_nestjs_agent_core2.dayBoundsUtc)(range);
     const rows = await this.db.select().from(agentTokenUsage).where((0, import_drizzle_orm3.and)((0, import_drizzle_orm3.gte)(agentTokenUsage.createdAt, start), (0, import_drizzle_orm3.lte)(agentTokenUsage.createdAt, end)));
     return rows.map(toUsageInput);
   }
   async spendByModel(range) {
     const pricing = await this.loadPricing();
-    return (0, import_nestjs_agent_core.bucketByModel)(await this.usageInRange(range), pricing);
+    return (0, import_nestjs_agent_core2.bucketByModel)(await this.usageInRange(range), pricing);
   }
   async spendByActor(range) {
     const pricing = await this.loadPricing();
-    return (0, import_nestjs_agent_core.bucketByActor)(await this.usageInRange(range), pricing);
+    return (0, import_nestjs_agent_core2.bucketByActor)(await this.usageInRange(range), pricing);
   }
   /**
   * Top threads by spend within the range, highest cost first, capped at `limit`. Usage rows for a
@@ -1084,14 +1203,14 @@ var DrizzleGovernanceQueries = class {
         actorRef: thread.actorRef
       }
     ]));
-    return (0, import_nestjs_agent_core.bucketByThread)(rows, pricing, threadsById, {
+    return (0, import_nestjs_agent_core2.bucketByThread)(rows, pricing, threadsById, {
       limit,
       includeUnknownThreads: false
     });
   }
   async usageTrend(range) {
     const pricing = await this.loadPricing();
-    return (0, import_nestjs_agent_core.bucketUsageTrend)(await this.usageInRange(range), pricing);
+    return (0, import_nestjs_agent_core2.bucketUsageTrend)(await this.usageInRange(range), pricing);
   }
   async recentToolCalls(limit) {
     const rows = await this.db.select({
@@ -1172,7 +1291,7 @@ var DrizzleGovernanceQueries = class {
     return this.toThreadActivityRows(threads);
   }
   async runsInRange(range) {
-    const { start, end } = (0, import_nestjs_agent_core.dayBoundsUtc)(range);
+    const { start, end } = (0, import_nestjs_agent_core2.dayBoundsUtc)(range);
     return this.db.select().from(agentRun).where((0, import_drizzle_orm3.and)((0, import_drizzle_orm3.gte)(agentRun.startedAt, start), (0, import_drizzle_orm3.lte)(agentRun.startedAt, end)));
   }
   async runMetrics(range) {
@@ -1229,7 +1348,7 @@ var DrizzleGovernanceQueries = class {
     return result;
   }
   async runErrors(range) {
-    const { start, end } = (0, import_nestjs_agent_core.dayBoundsUtc)(range);
+    const { start, end } = (0, import_nestjs_agent_core2.dayBoundsUtc)(range);
     const runs = await this.db.select().from(agentRun).where((0, import_drizzle_orm3.and)((0, import_drizzle_orm3.gte)(agentRun.startedAt, start), (0, import_drizzle_orm3.lte)(agentRun.startedAt, end), (0, import_drizzle_orm3.eq)(agentRun.status, "failed")));
     const byError = /* @__PURE__ */ new Map();
     for (const run of runs) {
@@ -1310,7 +1429,7 @@ var DrizzleGovernanceQueries = class {
   * `PERCENTILE_CONT` and one portable implementation beats three dialect-specific ones.
   */
   async toolStats(range) {
-    const { start, end } = (0, import_nestjs_agent_core.dayBoundsUtc)(range);
+    const { start, end } = (0, import_nestjs_agent_core2.dayBoundsUtc)(range);
     const calls = await this.db.select().from(agentToolCall).where((0, import_drizzle_orm3.and)((0, import_drizzle_orm3.gte)(agentToolCall.createdAt, start), (0, import_drizzle_orm3.lte)(agentToolCall.createdAt, end)));
     const byTool = /* @__PURE__ */ new Map();
     for (const call of calls) {
@@ -1513,7 +1632,7 @@ var DrizzleGovernanceQueries = class {
     }
     const pricing = await this.loadPricing();
     const usageRows = await this.db.select().from(agentTokenUsage).where((0, import_drizzle_orm3.eq)(agentTokenUsage.threadId, thread.id));
-    const usage = (0, import_nestjs_agent_core.rollupThreadUsage)(usageRows.map(toUsageInput), pricing);
+    const usage = (0, import_nestjs_agent_core2.rollupThreadUsage)(usageRows.map(toUsageInput), pricing);
     const [messageCountRow] = await this.db.select({
       value: (0, import_drizzle_orm3.count)()
     }).from(agentMessage).where((0, import_drizzle_orm3.eq)(agentMessage.threadId, thread.id));
@@ -1537,7 +1656,7 @@ var DrizzleGovernanceQueries = class {
       runs: runs.map(toRecentRunRow),
       runTotal: runTotalRow?.value ?? 0,
       messages: messages.map((message) => {
-        const { content, truncated } = (0, import_nestjs_agent_core.truncateDetailContent)(message.content);
+        const { content, truncated } = (0, import_nestjs_agent_core2.truncateDetailContent)(message.content);
         return {
           messageId: message.id,
           role: message.role,
@@ -1568,7 +1687,7 @@ var DrizzleGovernanceQueries = class {
 };
 
 // src/drizzle-memory-provider.ts
-var import_nestjs_agent_core2 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core3 = require("@dudousxd/nestjs-agent-core");
 var import_drizzle_orm4 = require("drizzle-orm");
 function toRecord(row) {
   return {
@@ -1629,7 +1748,7 @@ var DrizzleMemoryProvider = class {
   * answer cannot be used to find out which memories exist about other people.
   */
   async forget({ id, ctx }) {
-    const deleted = await this.db.delete(agentMemory).where((0, import_drizzle_orm4.and)((0, import_drizzle_orm4.eq)(agentMemory.id, id), (0, import_drizzle_orm4.eq)(agentMemory.scope, (0, import_nestjs_agent_core2.actorScope)(ctx.actor)))).returning({
+    const deleted = await this.db.delete(agentMemory).where((0, import_drizzle_orm4.and)((0, import_drizzle_orm4.eq)(agentMemory.id, id), (0, import_drizzle_orm4.eq)(agentMemory.scope, (0, import_nestjs_agent_core3.actorScope)(ctx.actor)))).returning({
       id: agentMemory.id
     });
     return deleted.length > 0;
@@ -1702,7 +1821,7 @@ var DrizzleMemoryProvider = class {
   }
 };
 function assertAuthorMayWriteScope({ scope, origin, ctx }) {
-  const own = (0, import_nestjs_agent_core2.actorScope)(ctx.actor);
+  const own = (0, import_nestjs_agent_core3.actorScope)(ctx.actor);
   if (origin.author !== "human" && scope !== own) {
     throw new Error(`DrizzleMemoryProvider: refusing to write an agent-authored memory at "${scope}"; an agent may write only at "${own}"`);
   }
@@ -2081,7 +2200,7 @@ DrizzleRagIngestionLog = _ts_decorate([
 ], DrizzleRagIngestionLog);
 
 // src/drizzle-agent-store.module.ts
-var import_nestjs_agent_core3 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core4 = 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;
@@ -2118,7 +2237,7 @@ var DrizzleAgentStoreModule = class _DrizzleAgentStoreModule {
           useFactory: /* @__PURE__ */ __name(() => new DrizzleAgentStore(options.db), "useFactory")
         },
         {
-          provide: import_nestjs_agent_core3.AGENT_STORE,
+          provide: import_nestjs_agent_core4.AGENT_STORE,
           useExisting: DrizzleAgentStore
         },
         // Exported, never bound to AGENT_MEMORY: that token's PRESENCE is what turns memory on, so
@@ -2135,21 +2254,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_core3.AGENT_PRICING_STORE,
+          provide: import_nestjs_agent_core4.AGENT_PRICING_STORE,
           useClass: options.pricingStore
         } : {
-          provide: import_nestjs_agent_core3.AGENT_PRICING_STORE,
+          provide: import_nestjs_agent_core4.AGENT_PRICING_STORE,
           useExisting: DrizzlePricingStore
         },
         {
           provide: DrizzleGovernanceQueries,
           useFactory: /* @__PURE__ */ __name((pricingStore) => new DrizzleGovernanceQueries(options.db, pricingStore), "useFactory"),
           inject: [
-            import_nestjs_agent_core3.AGENT_PRICING_STORE
+            import_nestjs_agent_core4.AGENT_PRICING_STORE
           ]
         },
         {
-          provide: import_nestjs_agent_core3.AGENT_GOVERNANCE_QUERIES,
+          provide: import_nestjs_agent_core4.AGENT_GOVERNANCE_QUERIES,
           useExisting: DrizzleGovernanceQueries
         }
       ],
@@ -2158,12 +2277,12 @@ var DrizzleAgentStoreModule = class _DrizzleAgentStoreModule {
           DrizzleRagIngestionLog
         ],
         DrizzleAgentStore,
-        import_nestjs_agent_core3.AGENT_STORE,
+        import_nestjs_agent_core4.AGENT_STORE,
         DrizzleMemoryProvider,
         DrizzleGovernanceQueries,
-        import_nestjs_agent_core3.AGENT_GOVERNANCE_QUERIES,
+        import_nestjs_agent_core4.AGENT_GOVERNANCE_QUERIES,
         DrizzlePricingStore,
-        import_nestjs_agent_core3.AGENT_PRICING_STORE
+        import_nestjs_agent_core4.AGENT_PRICING_STORE
       ]
     };
   }