@dudousxd/nestjs-agent-store-drizzle 0.5.1 → 0.7.0

package/dist/index.js

@@ -72,7 +72,9 @@ var agentToolCall = sqliteTable("agent_tool_call", {
   }).notNull(),
   executedAt: integer("executed_at", {
     mode: "timestamp_ms"
-  })
+  }),
+  /** The run (turn) this call belongs to, for a trace deep-link; null for a pre-rollout row. */
+  runId: text("run_id")
 });
 var agentTokenUsage = sqliteTable("agent_token_usage", {
   id: text("id").primaryKey(),
@@ -187,7 +189,8 @@ var statements = [
     execution_ms INTEGER,
     error TEXT,
     created_at INTEGER NOT NULL,
-    executed_at INTEGER
+    executed_at INTEGER,
+    run_id TEXT
   )`,
   `CREATE TABLE IF NOT EXISTS agent_token_usage (
     id TEXT PRIMARY KEY NOT NULL,
@@ -460,7 +463,8 @@ var DrizzleAgentStore = class {
       executionMs: null,
       error: null,
       createdAt: /* @__PURE__ */ new Date(),
-      executedAt: null
+      executedAt: null,
+      runId: input.runId ?? null
     });
   }
   async updateToolCall(input) {
@@ -550,9 +554,61 @@ var DrizzleAgentStore = class {
 
 // src/drizzle-governance-queries.ts
 import { bucketByActor, bucketByModel, bucketByThread, bucketUsageTrend, dayBoundsUtc } from "@dudousxd/nestjs-agent-core";
-import { and as and2, count, desc as desc2, eq as eq2, gte as gte2, inArray as inArray2, isNull as isNull2, lte as lte2 } from "drizzle-orm";
+import { and as and2, count, desc as desc2, eq as eq2, gte as gte2, inArray as inArray2, isNull as isNull2, like, lte as lte2, sql as sql3 } from "drizzle-orm";
 var UNCLASSIFIED_ERROR_CODE = "unknown";
 var DEFAULT_AGENT_BUCKET = "(default)";
+var TOOL_CALL_STATUSES = [
+  "auto_executed",
+  "pending_approval",
+  "executed",
+  "rejected",
+  "failed"
+];
+function isToolCallStatus(value) {
+  return TOOL_CALL_STATUSES.includes(value);
+}
+__name(isToolCallStatus, "isToolCallStatus");
+var TOOL_KINDS = [
+  "read",
+  "action",
+  "agent"
+];
+function isToolKind(value) {
+  return TOOL_KINDS.includes(value);
+}
+__name(isToolKind, "isToolKind");
+var RUN_STATUSES = [
+  "running",
+  "completed",
+  "failed"
+];
+function isRunStatus(value) {
+  return RUN_STATUSES.includes(value);
+}
+__name(isRunStatus, "isRunStatus");
+function dayStartUtc(day) {
+  return dayBoundsUtc({
+    fromDay: day,
+    toDay: day
+  }).start;
+}
+__name(dayStartUtc, "dayStartUtc");
+function dayEndUtc(day) {
+  return dayBoundsUtc({
+    fromDay: day,
+    toDay: day
+  }).end;
+}
+__name(dayEndUtc, "dayEndUtc");
+function emptyPage(query) {
+  return {
+    rows: [],
+    total: 0,
+    page: query.page,
+    pageSize: query.pageSize
+  };
+}
+__name(emptyPage, "emptyPage");
 function toUsageInput(row) {
   return {
     modelId: row.modelId,
@@ -649,7 +705,8 @@ var DrizzleGovernanceQueries = class {
       toolType: agentToolCall.toolType,
       status: agentToolCall.status,
       threadId: agentMessage.threadId,
-      createdAt: agentToolCall.createdAt
+      createdAt: agentToolCall.createdAt,
+      runId: agentToolCall.runId
     }).from(agentToolCall).innerJoin(agentMessage, eq2(agentToolCall.messageId, agentMessage.id)).orderBy(desc2(agentToolCall.createdAt), desc2(agentToolCall.id)).limit(limit);
     return rows.map((row) => ({
       toolCallId: row.toolCallId,
@@ -657,7 +714,8 @@ var DrizzleGovernanceQueries = class {
       toolType: row.toolType,
       status: row.status,
       threadId: row.threadId,
-      createdAt: row.createdAt.toISOString()
+      createdAt: row.createdAt.toISOString(),
+      runId: row.runId
     }));
   }
   async recentThreads(limit) {
@@ -808,7 +866,8 @@ var DrizzleGovernanceQueries = class {
       threadTitle: agentThread.title,
       actorRef: agentThread.actorRef,
       agentName: agentMessage.agentName,
-      requestedAt: agentToolCall.createdAt
+      requestedAt: agentToolCall.createdAt,
+      runId: agentToolCall.runId
     }).from(agentToolCall).innerJoin(agentMessage, eq2(agentToolCall.messageId, agentMessage.id)).innerJoin(agentThread, eq2(agentMessage.threadId, agentThread.id)).where(eq2(agentToolCall.status, "pending_approval")).orderBy(agentToolCall.createdAt, agentToolCall.id).limit(limit);
     return rows.map((row) => ({
       toolCallId: row.toolCallId,
@@ -818,7 +877,8 @@ var DrizzleGovernanceQueries = class {
       threadTitle: row.threadTitle,
       actorRef: row.actorRef,
       agentName: row.agentName ?? null,
-      requestedAt: row.requestedAt.toISOString()
+      requestedAt: row.requestedAt.toISOString(),
+      runId: row.runId
     }));
   }
   /**
@@ -863,6 +923,117 @@ var DrizzleGovernanceQueries = class {
     result.sort((left, right) => right.calls - left.calls || left.toolName.localeCompare(right.toolName));
     return result;
   }
+  /**
+  * Paged, filterable tool-call activity, newest-first (same ordering as {@link recentToolCalls}).
+  * `toolType`/`status` values outside the known literals can never match a row — short-circuits to
+  * an empty page rather than issuing a query. Joins `agent_message` unconditionally (like
+  * `recentToolCalls`) to resolve `threadId` and to support the `threadId` filter.
+  */
+  async toolCallsPage(query) {
+    const filters = query.where;
+    if (filters?.status !== void 0 && !isToolCallStatus(filters.status)) {
+      return emptyPage(query);
+    }
+    if (filters?.toolType !== void 0 && !isToolKind(filters.toolType)) {
+      return emptyPage(query);
+    }
+    const whereClause = and2(filters?.toolName !== void 0 ? eq2(agentToolCall.toolName, filters.toolName) : void 0, filters?.toolType !== void 0 && isToolKind(filters.toolType) ? eq2(agentToolCall.toolType, filters.toolType) : void 0, filters?.status !== void 0 && isToolCallStatus(filters.status) ? eq2(agentToolCall.status, filters.status) : void 0, filters?.threadId !== void 0 ? eq2(agentMessage.threadId, filters.threadId) : void 0, filters?.fromDay !== void 0 ? gte2(agentToolCall.createdAt, dayStartUtc(filters.fromDay)) : void 0, filters?.toDay !== void 0 ? lte2(agentToolCall.createdAt, dayEndUtc(filters.toDay)) : void 0);
+    const [totalRow] = await this.db.select({
+      value: count()
+    }).from(agentToolCall).innerJoin(agentMessage, eq2(agentToolCall.messageId, agentMessage.id)).where(whereClause);
+    const rows = await this.db.select({
+      toolCallId: agentToolCall.id,
+      toolName: agentToolCall.toolName,
+      toolType: agentToolCall.toolType,
+      status: agentToolCall.status,
+      threadId: agentMessage.threadId,
+      createdAt: agentToolCall.createdAt,
+      runId: agentToolCall.runId
+    }).from(agentToolCall).innerJoin(agentMessage, eq2(agentToolCall.messageId, agentMessage.id)).where(whereClause).orderBy(desc2(agentToolCall.createdAt), desc2(agentToolCall.id)).limit(query.pageSize).offset((query.page - 1) * query.pageSize);
+    return {
+      rows: rows.map((row) => ({
+        toolCallId: row.toolCallId,
+        toolName: row.toolName,
+        toolType: row.toolType,
+        status: row.status,
+        threadId: row.threadId,
+        createdAt: row.createdAt.toISOString(),
+        runId: row.runId
+      })),
+      total: totalRow?.value ?? 0,
+      page: query.page,
+      pageSize: query.pageSize
+    };
+  }
+  /**
+  * Paged, filterable thread activity, newest-first (same ordering as {@link recentThreads}).
+  * `title` is a case-insensitive substring match via `lower(...)` on both sides (portable across
+  * dialects, regardless of the underlying column collation). Soft-deleted threads are excluded,
+  * mirroring `recentThreads`.
+  */
+  async threadsPage(query) {
+    const filters = query.where;
+    const whereClause = and2(isNull2(agentThread.deletedAt), filters?.actorRef !== void 0 ? eq2(agentThread.actorRef, filters.actorRef) : void 0, filters?.title !== void 0 ? like(sql3`lower(${agentThread.title})`, `%${filters.title.toLowerCase()}%`) : void 0, filters?.fromDay !== void 0 ? gte2(agentThread.updatedAt, dayStartUtc(filters.fromDay)) : void 0, filters?.toDay !== void 0 ? lte2(agentThread.updatedAt, dayEndUtc(filters.toDay)) : void 0);
+    const [totalRow] = await this.db.select({
+      value: count()
+    }).from(agentThread).where(whereClause);
+    const threads = await this.db.select().from(agentThread).where(whereClause).orderBy(desc2(agentThread.updatedAt), desc2(agentThread.id)).limit(query.pageSize).offset((query.page - 1) * query.pageSize);
+    const rows = [];
+    for (const thread of threads) {
+      const [messageCountRow] = await this.db.select({
+        value: count()
+      }).from(agentMessage).where(eq2(agentMessage.threadId, thread.id));
+      const usageRows = await this.db.select().from(agentTokenUsage).where(eq2(agentTokenUsage.threadId, thread.id));
+      const totalTokens = usageRows.reduce((sum, row) => sum + row.inputTokens + row.outputTokens, 0);
+      rows.push({
+        threadId: thread.id,
+        title: thread.title,
+        actorRef: thread.actorRef,
+        messageCount: messageCountRow?.value ?? 0,
+        totalTokens,
+        lastActivityAt: thread.updatedAt.toISOString()
+      });
+    }
+    return {
+      rows,
+      total: totalRow?.value ?? 0,
+      page: query.page,
+      pageSize: query.pageSize
+    };
+  }
+  /**
+  * Paged, filterable run activity, newest-first (same ordering as {@link recentRuns}). `status`
+  * values outside the known literals can never match a row — short-circuits to an empty page.
+  */
+  async runsPage(query) {
+    const filters = query.where;
+    if (filters?.status !== void 0 && !isRunStatus(filters.status)) {
+      return emptyPage(query);
+    }
+    const whereClause = and2(filters?.agentName !== void 0 ? eq2(agentRun.agentName, filters.agentName) : void 0, filters?.status !== void 0 && isRunStatus(filters.status) ? eq2(agentRun.status, filters.status) : void 0, filters?.errorCode !== void 0 ? eq2(agentRun.errorCode, filters.errorCode) : void 0, filters?.threadId !== void 0 ? eq2(agentRun.threadId, filters.threadId) : void 0, filters?.fromDay !== void 0 ? gte2(agentRun.startedAt, dayStartUtc(filters.fromDay)) : void 0, filters?.toDay !== void 0 ? lte2(agentRun.startedAt, dayEndUtc(filters.toDay)) : void 0);
+    const [totalRow] = await this.db.select({
+      value: count()
+    }).from(agentRun).where(whereClause);
+    const runs = await this.db.select().from(agentRun).where(whereClause).orderBy(desc2(agentRun.startedAt), desc2(agentRun.id)).limit(query.pageSize).offset((query.page - 1) * query.pageSize);
+    return {
+      rows: runs.map((run) => ({
+        runId: run.id,
+        threadId: run.threadId,
+        actorRef: run.actorRef,
+        agentName: run.agentName ?? null,
+        status: run.status,
+        durationMs: run.durationMs ?? null,
+        errorCode: run.errorCode ?? null,
+        errorMessage: run.errorMessage ?? null,
+        retries: run.retries,
+        startedAt: run.startedAt.toISOString(),
+        promptHash: run.promptHash ?? null
+      })),
+      total: totalRow?.value ?? 0,
+      page: query.page,
+      pageSize: query.pageSize
+    };
+  }
 };
 
 // src/drizzle-pricing-store.ts